Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MI-3173] Setup webapp to the plugin #4

Merged
merged 16 commits into from
Sep 1, 2023
Merged

[MI-3173] Setup webapp to the plugin #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
26f7d11
setup webapp to the plugin
Kshitij-Katiyar Jun 20, 2023
1bfffc4
Added else statement to cmd switch case in manifest/main.go
Kshitij-Katiyar Jun 21, 2023
69f2375
[MI-3173]:Fixed the webapp registering
Kshitij-Katiyar Jun 21, 2023
3180146
[MI-3173]:Pushed node_modules
Kshitij-Katiyar Jun 21, 2023
540648a
[MI-3173]: Removed node_modules
Kshitij-Katiyar Jun 28, 2023
7bc9c26
[MI-3173]: Removed node_modules
Kshitij-Katiyar Jun 28, 2023
81650f5
Removed yarn from webapp
Kshitij-Katiyar Jul 3, 2023
b30cc0b
Removed RHS from the plugin and other minor changes
Kshitij-Katiyar Jul 4, 2023
e8fb700
[MI-3173]: Fixed pluginId variable name in manifest_test.tsx
Kshitij-Katiyar Jul 7, 2023
672a038
[MI-3173]: Removed error handling files from webapp/util for now
Kshitij-Katiyar Jul 10, 2023
b61d463
[MI-3173]: resolved unused imports in utils
Kshitij-Katiyar Jul 10, 2023
f056f07
[MI-3173]: Removed extra blank line from utils/index.ts
Kshitij-Katiyar Jul 10, 2023
093b939
[MI-3173]: Removed some extra unnecessary files
Kshitij-Katiyar Jul 11, 2023
99467b7
Removed unnecessary files
Kshitij-Katiyar Jul 18, 2023
b4b95b3
[MI-3173]: Removed extra dependencies
Kshitij-Katiyar Aug 1, 2023
3a892ff
[MI-3199]: Developed a table to display the existing config of plugin…
Kshitij-Katiyar Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ ifneq ($(HAS_SERVER),)
endif

## Ensures NPM dependencies are installed without having to run this all the time.
.PHONY: webapp/.npminstall
webapp/.npminstall:
ifneq ($(HAS_WEBAPP),)
cd webapp && $(NPM) install
cd webapp && $(NPM) install --legacy-peer-deps
Kshitij-Katiyar marked this conversation as resolved.
Show resolved Hide resolved
touch $@
endif

Expand Down
4 changes: 2 additions & 2 deletions build/manifest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ func applyManifest(manifest *model.Manifest) error {

if manifest.HasWebapp() {
if err := ioutil.WriteFile(
"webapp/src/manifest.js",
"webapp/src/manifest.ts",
[]byte(fmt.Sprintf(pluginIDJSFileTemplate, manifest.Id, manifest.Version)),
0600,
); err != nil {
return errors.Wrap(err, "failed to open webapp/src/manifest.js")
return errors.Wrap(err, "failed to open webapp/src/manifest.ts")
}
}

Expand Down
12 changes: 11 additions & 1 deletion plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@
"windows-amd64": "server/dist/plugin-windows-amd64.exe"
}
},
"webapp": {
"bundle_path": "webapp/dist/main.js"
},
"settings_schema": {
"header": "Configure this plugin directly in the config.json file. Learn more [in our documentation](https://github.com/mattermost/mattermost-plugin-welcomebot/blob/master/README.md).\n\n To report an issue, make a suggestion, or submit a contribution, [check the plugin repository](https://github.com/mattermost/mattermost-plugin-welcomebot)."
"header": "Configure this plugin directly in the config.json file. Learn more [in our documentation](https://github.com/mattermost/mattermost-plugin-welcomebot/blob/master/README.md).\n\n To report an issue, make a suggestion, or submit a contribution, [check the plugin repository](https://github.com/mattermost/mattermost-plugin-welcomebot).",
"settings": [
{
"key": "WelcomeMessages",
"type": "custom",
"default": []
}
]
}
}
2 changes: 1 addition & 1 deletion server/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ type ConfigMessage struct {

// Configuration from config.json
type Configuration struct {
WelcomeMessages []*ConfigMessage
WelcomeMessages []*ConfigMessage `json:"WelcomeMessages"`
}

// List of the welcome messages from the configuration
Expand Down
Loading