Skip to content

Commit

Permalink
[MI-3173] Setup webapp to the plugin (#4)
Browse files Browse the repository at this point in the history 
* setup webapp to the plugin

* Added else statement to cmd switch case in manifest/main.go

* [MI-3173]:Fixed the webapp registering

* [MI-3173]:Pushed node_modules

* [MI-3173]: Removed node_modules

* [MI-3173]: Removed node_modules

* Removed yarn from webapp

* Removed RHS from the plugin and other minor changes

* [MI-3173]: Fixed pluginId variable name in manifest_test.tsx

* [MI-3173]: Removed error handling files from webapp/util for now

* [MI-3173]: resolved unused imports in utils

* [MI-3173]: Removed extra blank line from utils/index.ts

* [MI-3173]: Removed some extra unnecessary files

* Removed unnecessary files

* [MI-3173]: Removed extra dependencies

* [MI-3199]: Developed a table to display the existing config of plugin (#5)

* Developed table to display existing configs of plugin

* Updated .gitignore to exclude node_modules

* Fixed .gitignore to exclude node_modules

* Developed a table to display existing config

* Developed a table to show existing plugin config

* setup redux store and add reducer to show/hide attachment message modal

* Added modal to show attachment message of config

* Removed node modules

* [MI-3199]: Removed node modules

* [MI-3199]: Removed extra todo comments

* [MI-3199]: Resolved missing imports in existingConfigTable

* [MI-3199]: removed extra folders

* [MI-3199]: Added eod to styles.css

* [MI-3199]: Fixed review comments by abhishek

* [MI-3230]: Developed a modal which opens on click of view button in config table (#6)

* [MI-3230]: Developed a modal which opens on click of view button in config table

* Added form in modal to accept the action details

* [MI-3230]: Added view Action modal

* [MI-3230]: FIxed indentation in existingConfigTable

* [MI-3230: Fixed indentation in existingConfigTable

* [MI-3230]: fixed indentation in existingConfigTable

* [MI-3230]: Fixed indentation in existingConfigTable

* [MI-3230]: Removed unwanted files from webapp

* [MI-3230]: Fixed indentation

* [MI-3230]: Removed extra padding from existingConfigTable

* [MI-3230]: Improved the name of variables

* [MI-3230]: Added eod, use type instead of interface

* [MI-3230]: Used fat arrow function instead of normal function

* [MI-3230]: Improved name of variable in editActionModal

* [MI-3230]: Fixed some review changes by Abhishek

* [MI-3230]: Added div to </> in existingConfigTable

* [MI-3230]: Added curly braces to css file

* [MI-3241] : Added delete config modal to the webapp (#7)

* [MI-3241]: Added delete config modal

* [MI-3241]: fixed indent in table

* [MI-3241]: Fixed indent in existingConfigtable

* [MI-3241]: Removed extra files from webapp

* [MI-3241]: Resolved import not found

* [MI-3241]: removed extra empty lines

* [MI-3241]: Added corejs as dependency

* [MI-3241]: removed duplicate react-dom dependency

* [MI-3242]: Improved variable name in modal

* [MI-3241]: add eod to modal files

* [MI-3241]: removed extra div wrappers

* [MI-3241]: Used fat arrow function instead of normal function

* [MI-3241]: Fixed a syntax error in existingConfigTable

* [MI-3241]: Fixed CI in existingConfigTable

* [MI-3241]: Added curly brace to css file

* [MI-3255]: Added svg icon and Tooltip (#8)

* [MI-3255]: Added svg icon as button and added tooltip

* [MI-3254]: Added add/edit config modal and add config button

* [MI-3254]: Added add config button in existing config table

* [MI-3254]: Added config and action edit modal

* [MI-3254]: Fixed css of config modal and existing config table

* [MI-3254]: Added services and utils file for plugin

* [MI-3254]: added service and util files

* [MI-3255]: Fixed some indentation

* [MI-3255]: Removed some extra lines

* [MI-3254]: Removed extra files from webapp

* [MI-3255]: removed extra files from webapp

* [MI-3255]: Fixed indentation

* [MI-3255]: Fixed indentation

* [MI-3255]: Removed extra lines and updated variable names

* [MI-3255]: added null to config variable

* [MI-3255]: Improved variable name in DeleteModal

* [MI-3255]: Improved base URL fetching

* [MI-3255]: Improved variable name to increase understandability

* [MI-3274]: Integrated config table, view action modal & delete config modal (#10)

* [MI-3275]: Fixed indentation and other lint errors

* [MI-3274]: Integrated config table, view action & delete config modal

* [MI-3274]: Used camelcase in type

* [MI-3274]: Resolved the import order issue

* [MI-3274]: Resolved import order

* [MI-3274]: Used types instead of interface

* [MI-3274]: Fixed indentation for CI

* [MI-3274]: Fixed lint CI

* [MI-3274]: Fixed conflict resolution error

* [MI-3274]: Fixed error in plugin.json

* [MI-3275]: Integrated config modal (#11)

* [MI-3275]: Integrated config modal

* [MI-3275]: destructured props in modal

* [MI-3275]: Fixed message in delete modal

* [MI-3275]: Fixed import order in modal

* [MI-3275]: Resolved missing closing tag errors

* [MI-3275]: Fixed indent for CI

* [MI-3275]: Fixed indentation errors in CI

* [MI-3275]: Removed evtra variables

* [MI-3317]: Added validations to forms and enhancements (#12)

* [MI-3317]: Added validations to forms

* [MI-3317]: added EOD to style.css

* [MI-3316]: Fixed some css

* [MI-3317]: Fixed grammar of validation messages

* [MI-3317]: Fixed grammar of validation message in action modal

* [MI-3317]: added classname to each modal

* [MI-3316]: added css to make modals stationary

* [MI-3316]: Removed some extra files

* [MI-3317]: removed some extra files

* [MI-3317]: reduced the icon size of svg icons

* [MI-3317]: Fixed grammar in actionModal message

* [MI-3317]: removed an extra comment

* [MI-3317]: Improved grammar of statements in config modal

* [MI-3317]: Fixed grammar of message

* [MI-3317]: Fixed import order

* [MI-3317]: Fixed redundant if conditions and removed extra empty lines

* [MI-3317]: Used fat-arrow function instead of normal function

* [MI-3317]: Removed camelcase from css

* [MI-3317]: Resolved conflicts and fixed CI

* [MI-3317]: Fixed indentation errors

* [MI-3317]: Improved the name of variables

* [MI-3317]: Removed else and used return with if

* [MI-3317]: Fixed the variable name in table

* [MI-3317]: Fixed CSS according to abhishek's review

* [MI-3355]: Added dropdown to choose teams and channels (#14)

* [MI-3355]: Removed extra types

* [MI-3355]: Improved message of view action modal

* [MI-3355]: removed extra packages

* [MI-3355]: Added eod to files

* [MI-3355]: Fixed adding action functionality

* [MI-3355]: Fixed the jump in UI during validation warnings

* [MI-3355]: fixed maximum nested callback in useEffect

* [MI-3355]: Fixed validation warnings in Add action modal

* [MI-3355]: Added ellipses to the tables

* [MI-3355]: updated API to fetch data in batches

* [MI-3355]: Removed comment and fixed empty lines

* [MI-3355]: Fixed css of modal visibility

* [MI-3355]: Added svg icons to different file

* [MI-3355]: Improvised the folder structure

* [MI-3355]: Improved the variable name in existingConfigTable

* [MI-3355]: Fixed error in adding new action to config with index zero

* [MI-3355]: Fixed import issue of .d.ts files

* [MI-3355]: Used fat-arrow function instead of normal functions

* [MI-3355]: Installed types and packages for js-cookie

* [MI-3355]: Setup reduxstore

* [MI-3355]: Disabled dropdown during loading state

* [MI-3355]: Improved getBaseUrl method

* [MI-3355]: Improved the API call

* [MI-3355]: Added constants and used baseUrl from redux state

* [MI-3355]: Fixed jump in UI in edit action modal

* [MI-3355]: Joined array of string with comma for messages & disabled dropdown incase of API failure

* [MI-3355]: Added type of onChange function

* [MI-3355]: Removed extra variables

* [MI-3355]: Improved the validation conditions

* [MI-3355]: Fixed css according to reviews by abhishek

* [MI-3355]: Improved visibility of action successfull message

* [MI-3355]: Used scss instead of css

* [MI-3355]: Fixed the CSS of channel-added-to content

* [MI-3355]: Added semicolons to types in common.d.ts

* Update webapp/src/components/modals/actionModal.tsx

Co-authored-by: Abhishek Verma <[email protected]>

* Update webapp/src/components/tables/existingConfigTable.tsx

Co-authored-by: Abhishek Verma <[email protected]>

* Update webapp/src/components/svgIcons/svg.tsx

Co-authored-by: Abhishek Verma <[email protected]>

* [MI-3355]: Used px instead of % in css

* [MI-3355]: Fixed some minor css

* [MI-3355]: Removed extra spaces from existingConfigTable

---------

Co-authored-by: Abhishek Verma <[email protected]>

---------

Co-authored-by: Abhishek Verma <[email protected]>

---------

Co-authored-by: Abhishek Verma <[email protected]>

---------

Co-authored-by: Abhishek Verma <[email protected]>

---------

Co-authored-by: Abhishek Verma <[email protected]>

---------

Co-authored-by: Abhishek Verma <[email protected]>

---------

Co-authored-by: Abhishek Verma <[email protected]>

---------

Co-authored-by: Abhishek Verma <[email protected]>

---------

Co-authored-by: Abhishek Verma <[email protected]>
  • Loading branch information
@Kshitij-Katiyar @avas27JTG
Kshitij-Katiyar and avas27JTG authored Sep 1, 2023
1 parent 344cddf commit 5d7dd60
Show file tree
Hide file tree
Showing 32 changed files with 23,130 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Makefile
View file
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
touch $@
endif

Expand Down
4 changes: 2 additions & 2 deletions build/manifest/main.go
View file
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
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
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

0 comments on commit 5d7dd60

Please sign in to comment.