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

[GH-108]: Developed the UI for Admin setting console #15

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+22,814 −4
Open

[GH-108]: Developed the UI for Admin setting console #15

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5d7dd60
`[MI-3173]` Setup webapp to the plugin (#4)
Kshitij-Katiyar Sep 1, 2023
b269b3f
[MM-108]: Fixed some reviews by raghav
Kshitij-Katiyar Sep 6, 2023
369219f
[MM-108]: Removed extra commetns
Kshitij-Katiyar Sep 6, 2023
ee44476
[MM-108]
Kshitij-Katiyar Sep 14, 2023
fd1e5f4
Update plugin.json
Kshitij-Katiyar Sep 19, 2023
595cfc7
[MM-108]: Removed extra comment and legacy-peer-deps
Kshitij-Katiyar Oct 4, 2023
835f874
Merge branch 'master' of github.com:Brightscout/mattermost-plugin-wel…
raghavaggarwal2308 Jan 8, 2024
b542197
[MM-132] Fix issue reported by QA and code refactoring
raghavaggarwal2308 Jan 15, 2024
17d5d1c
[MM-108] Add validations, update styling, fix issue of not able to ad…
ayusht2810 Jan 24, 2024
7f5774e
[MM-108] Review fixes: Fix classname, use existing constant, create n…
ayusht2810 Feb 2, 2024
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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this

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).",
Kshitij-Katiyar marked this conversation as resolved.
Show resolved Hide resolved
"settings": [
{
"key": "WelcomeMessages",
"type": "custom",
"default": []
avas27JTG marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
}
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
Loading