MM-15462 Basic subscribe to jira events. #61

crspeller · 2019-05-16T20:40:10Z

Basic channel subscriptions. Supports 1 subscription per channel.
Supports 3 events (Create, Update, Delete)
Supports fields of project and issue type only. (custom fields needs holistic support across both create and this)
Needs UI work.

jasonblais · 2019-05-16T21:07:18Z

Awesome! Quick questions

Supports 3 events (Create, Update, Delete)

1 - Is this for "issue" events, or also "comment" events? (from reading the diff file, looks like "issue" events only)

Supports fields of project and issue type only. (custom fields needs holistic support across both create and this)

2 - Can this be resolved after https://mattermost.atlassian.net/browse/MM-15589 is fixed? Or to be determined once MM-15589 is being worked on.

Needs UI work.

3 - Confirming that this be for @asaadmahmood in a separate ticket rather than this PR?

4 - Confirming that when a notification is posted to a Mattermost channel, is this using the same UI as for webhook-based notifications?

crspeller · 2019-05-16T21:10:16Z

Issue events only. After https://mattermost.atlassian.net/browse/MM-15439 should be trivial to add.
Yes essentially these are the same issue.
I asked @asaadmahmood to do some modifications on this PR. There is also the known problem with dropdowns going below the modal.
Correct. No additional UI work was done here.

jasonblais · 2019-05-16T21:14:45Z

1 + 2: Sounds good and noted
3: Okay, also added to his "Jira UI update" ticket for tracking
4: +1

cpoile

wow, nice work Christopher

One thing -- I have it on my local server, and it's mostly working, except that I'm getting notifications regardless of what issue type is selected for the channel (if I change the priority on a Story, and I only have Bug selected for the channel, I'll still get an update to the channel).

server/http.go

webapp/src/components/modals/channel_settings/channel_settings_internal.jsx

webapp/src/actions/index.js

server/subscribe.go

webapp/src/components/modals/channel_settings/channel_settings_internal.jsx

server/http.go

server/subscribe.go

crspeller · 2019-05-17T20:38:07Z

@cpoile Ready for re-review!

cpoile

Looks good, I tried it out and the channel filter works now.
Like we chatted about, I'm 1/5 on using map[string]map[string]bool instead of map[string][]string -- not just for performance (that's not really an issue until we profile) -- but I think it might simplify the code in subscribe.go. But you know this better than I do. :)

asaadmahmood · 2019-05-19T10:07:22Z

Updated the icon @crspeller Need to look at the other UI stuff but it's not working fine for me locally.
The icon also is not vertically centered, but I have submitted a PR for that on the webapp.
mattermost/mattermost-webapp#2818

levb

Went over the Go part, webapp still todo

Makefile

server/Gopkg.toml

server/subscribe.go

levb · 2019-05-20T22:40:22Z

server/subscribe.go

+ s.IdByChannelId[sub.ChannelId][iToRemove] = s.IdByChannelId[sub.ChannelId][len(s.IdByChannelId[sub.ChannelId])-1]
+ s.IdByChannelId[sub.ChannelId] = s.IdByChannelId[sub.ChannelId][:len(s.IdByChannelId[sub.ChannelId])-1]
+
+ for _, event := range sub.Filters["events"] {


server/subscribe.go

levb · 2019-05-20T23:06:21Z

server/subscribe.go

+ }
+
+ success := false
+ for !success {


1/5 should have a retry limit

Want to make this a helper, will add fancy features like that then.

server/subscribe.go

crspeller · 2019-05-21T19:18:47Z

@levb Ready for re-review.

levb · 2019-05-22T12:22:29Z

Cherry-picked into master

This reverts commit bd283bd.

@hanzei

* JIRAv2 initial PR (#36) * Refactored the JIRA plugin to support more events * Removed Enabled config setting * PR feedback * PR feedback from @hanzei * Added back webhook tests, updated for MD * coverage * Added back formatting as Slack attachments * Add atlassian connect functionality * Updated plugin.json * merged the minimal webapp from hackathon * Updated .gitignore * wip Merged plugin.go from hackathon * wip oauth failures * wip oauth2 with a static clientid seems to work * wip /jira connect seems to work * wip trying JWT webhook setup * wiop * wip * wip connect auth and the beginning of issue * Added webapp from hackathon * Create JIRA Issue is showing up * wip create issue with semi-fakeuser mapping * JWT verification in user-config page * moved JWT verification into auth.go * WIP WIP WIP in the middle of something * wip flow works, need to add encryption * User mapping works * added /jira-disconnect * Fix websocket event handling for connect and add disconnect * WIP fixed websocket initialization * WIP - TODO encrypt Atl account ID in config * Secured the auth flow, passing mm_token and jwt to the final endpoint * Restored legacy webhook support * Process mentions in Webhooks, rearrange files * Point Gopkg.toml at mattermost-server/master for now * Adding comments for posts mentioning JIRA issues * Some error logging * Cleanup * 5.8 compatibility: replace GetBundlePath with old-style config hacking * go test cleanup * Removed unused files * Fixed MM-15004, no lnger requires admin to connect user * wip prefixing and instances - appears to work with connect * MM-15003 Prefix KV keys with the JIRA instance ID - Reworked the kv store functions to use the JIRA BaseURL as a part of the key. - Other cleanup * Added JIRA Server and OAuth1 - Added back OAuth1 functionality - Added `type JIRAInstance` and moved a lot of instance-specific data there - Added "cloud" and "server" instance types, for now with switches - Added `/jira add server url` command to add JIRA Server instances * wip style/naming * JIRA Server auth appears to work * Cosmetic PR feedback, fixed atlassian-connect.json * Fixed a crash if no current JIRAInsttance exists * GetJIRAClient refactor * GetJIRACLient appears to work * CreateIssue works in server and cloud * Added (encoded) URL to Atlassian-connect.json `key` value (e.g. `"mattermost-https-e1ba36fb-ngrok-io"`), making it unique per Mattermost instance. Now can add multiple Mattermost instances to the same JIRA Cloud instance * Removed caching of the project keys in anticipation of the new cache * Webapp CreateIssue: use f.schema.system rather than f.key to identify field keys, this works with JIRA Server and Cloud versions. * Webapp: CreateIssue renderFields: initialize `description` to an empty value to avoid JS errors * PR feedback: ephf -> responsef * Cleanup, /jira command improvements - added `/jira help` - added instance numbers to `/jira instance list`, ability to do `/jira instance select {number}` - style: refactored command.go - style: http naming, and using constants for all routes - style: updated webapp to match - style: eliminated unused oauth2.code * Fixed 2 typos in 1 URL * WIP prep to having a revoke button on the confirm page - fixed a typo in `/jira instance listt` output - removed unused routeOAuth1Connect and related code - renamed StoreOAuth1RequestToken to StoreOneTimeSecret and such * PR feedback (style), expire OTS * PR feedback: Do not change original posts - Do not change the original posts when creating issues - require MM server 5.6 to build - Style, error handling * Fixed "Connect to JIRA" URL in post menu item * PR feedback: added explicit Gopkg.toml deps * PR feedback: style and error handling * PR feedback: more style * Fix tests. * Fix linting. * Removed notify() from webhooks for now, to pass the tests * Uncommented the tests @cristopher took out * Uncommented the test I missed * Minor fixes * Update README.md * Revert accidental commit * Update README.md (#38) * Update README.md * Update README.md * Update README.md * Update README.md * quick fix of url * correct the menu item used in Jira * Proposed text updates for /jira slash commands (#41) * Proposed text updates for /jira slash commands Feedback welcome * Address review feedback on command.go * Some cleanup for Jira plugin (#42) * Update instance_server.go * JIRA -> Jira in error text * JIRA > Jira, text update for Jira Server URL help text * Update kv.go * Update message_posted.go * JIRA > Jira * Update user_oauth1.go * Update utils.go * JIRA > Jira * JIRA > Jira * Update create_issue.jsx * Update http.go * JIRA > Jira * MM-15244 Jira Cloud user connect security (#39) * Adjusted the cloud auth flow as per spec - changed cloud user mapping flow: 1. serve a page that retrieves mm_token and auto-resubmits (`/ac/user_redirect.html`) 2. (skipped/not implemented) a confirm page that would displat both usernames, and have a submit button 3. connect the accounts, and serve a summary page with a "Disconnect" button (`/ac/user_connected.html`) 4. disconnect the accounts if the above button is clicked, (`/ac/user_disconnected.html`) - refactored http to use withXxxInstance - refactored use of templates * Added OTS to Jira Cloud user connect flow - Added `Secret` field to `type AuthToken` - Populate `Secret` with a random md5(256bytes) secret - Verify and remove OTS - Added a missing ./server/templates/ac/user_connected.html * Added a confirm page in tthe flow * Cleanup of Jira server connect flow * PR feedback: style * Careful with that lock, Eugene * Style, govet, added a template I missed * CAREFUL with that lock, Eugene * resolved merge conflicts * PR feedback: clarified respondWithTemplate * PR feedback: md5->sha256 * PR feedback: separated Store[Current]JIRAInstance functions * PR feedback: Like _really_ careful with that lock, Eugene * Doc updates for roadmap and Jira Server install docs (#40) * WIP: Doc updates for roadmap and Jira Server install docs * Update README.md * Update README.md * Update based on feedback * MM-15101 Adding /jira transition (#46) * Adding /jira transition * Moving transitionJiraIssue to a better home. * MM-15253 Refactor of create-issue modal. (#44) * Refactor of create-issue modal. * Names feeback. * Fixed /jira subcommand parsing consistency (#45) * Fixed creating server/dist/templates/templates on a 2nd make (#50) * Fixed creating server/dist/templates/templates on 2nd make * make the cp switch portable ref: https://unix.stackexchange.com/questions/18712/difference-between-cp-r-and-cp-r-copy-command * small fixes to /jira instance delete (#52) * Some improvments to cloud connect flow. (#55) * MM-15096 UI fixes for template pages and menu item (#54) * UI fixes for template and menu item * Updating flexparent * Updating templates * Update Jira application link for Cloud (#48) * (no ticket?) Fixed a bug in unescaping webhook secret (#53) Also added `/jira webhook` command to see a URL custom-fit to the current channel * MM-15400 Added some protections to /installed link (#47) * Added some protections to /installed link * Forgot to reset the timeout back to 15min * PR feedback: Installed flag * Fixed s in URLs * PR feedback: use more consistently * PR feedback: return a 403, not a 401 if already installed * Update README.md * Update README.md * Add 'subject to change' for timeline in README * Added response logging for Jira API errors (#59) * * notifications working, added issue_created * wip * * new make lifecycle commands: debug, webapp-debug, reset, stop * [MM-14773] [MM-15440] - simplify settings and setup (#57) * [MM-14773] [MM-15440] - simplify settings and setup * * restrict `/jira webhook` to system admins; some cleanup * * remove public webhook instructions, remove generate webhook secret * fixups * Update server/command.go Co-Authored-By: Jason Blais <[email protected]> * Update server/command.go Co-Authored-By: Jason Blais <[email protected]> * PR comments * * notification setting persisted, command line updated * * disable notifications working * Revert "* new make lifecycle commands: debug, webapp-debug, reset, stop" This reverts commit 92b691d * Fix govet * Adding new CI * Updating Makefile and moving to go modules * Temporarily use jira2 as CI branch. * fixing tests * PR comments * fixes needed after The Great Merge * updated for firehose webhook (#61) now on master * PR comments

) * Fixed websocket update on user disconnect * Revert "Fixed websocket update on user disconnect" This reverts commit 84ca4b27ca2a3ed55408bf359786b3162dc1b29a. * Fixed empty set refresh, defaulting in commands * fixed instance status update

* iterate through instances when printing out the channel subscriptions update tests for new printing output format don't require --intance for subscribelist * Update tests * shorten field name * several PR feedback fixes * remove unused variable rename map variable * Disconnect users on instance uninstall (#41) * [GH-4] add EE license check (#22) * restrict plugin activation based on license * run go mod tidy -v * wip * add enterprise package * rename license naming to enterprise if user does not have enterprise license, check number of instances installed before allowed to install another cloud or server instance * remove function * fix review feedback * Add license checking tests * wip * wip by Lev * wip * wip * remove comments * remove function to return pointer to true bool value * getMockInstanceStoreKV(0) should return initialized empty store was returning instance store with one instance correct all occurences call of getMockInstanceStoreKV(0) to call with 1 instanance. This fixes many failing tests Add tests for InstallInstance function with extensive license checking * fix linting Co-authored-by: Lev Brouk <[email protected]> * Fixed #31, #33 (#54) - Use plugin URL as the "home" for app links - Added extra logging for suspicious callbacks - Use templates for `/jira instance install` output * Fix test (#64) * GH-21 Fixed websocket update on user disconnect, instance uninstall (#61) * Fixed websocket update on user disconnect * Revert "Fixed websocket update on user disconnect" This reverts commit 84ca4b27ca2a3ed55408bf359786b3162dc1b29a. * Fixed empty set refresh, defaulting in commands * fixed instance status update * GH-49: Fixed webhook, transition commands (#67) * Use connectInstances array for userConnected redux selector (#71) * Use connectInstances array for userConnected redux selector * add null check * [GH-45] Make sure frontend has up-to-date default instance data (#65) * fetch instances on modal open * Fix errors regarding redux update and missing channelId prop * Get instances when subscribe modal opens * fix tests * Handle case where default instance value in frontend is stale (uninstalled) * Make if statement more safe * Make if statement more safe * fix test * lint * GH-60: Fixed multi-work command alias parsing in webapp (#72) * Fixed --instance Co-authored-by: Lev <[email protected]> Co-authored-by: Lev Brouk <[email protected]> Co-authored-by: Michael Kochell <[email protected]>

* [MI-3338]:Fixed issue #954 'DM comment notifications not working' (#61) * [MI-3338]:Fixed issue #954 'DM comment notifications not working' * [MI-3338]:Fixed CI * [MI-3337]:Fixed review comment of PR #961 and added TC (#63) * [MI-3337]:Fixed review comment of PR #961 and added TC * [MI-3337]:Added EOF * [MI-3337]:Fixed review comments of #961 (#64) * [MI-3337]:Fixed review comment of PR #961 and added TC * [MI-3337]:Added EOF * [MI-3337]:Fixed review comments of #961

Subscribe to jira events.

32df135

crspeller added the 2: Dev Review Requires review by a core committer label May 16, 2019

crspeller requested review from levb and jfrerich May 16, 2019 20:40

cpoile requested review from cpoile and removed request for jfrerich May 17, 2019 14:08

cpoile requested changes May 17, 2019

View reviewed changes

cpoile reviewed May 17, 2019

View reviewed changes

server/subscribe.go Show resolved Hide resolved

crspeller added 2 commits May 17, 2019 13:30

Feedback fixes

8f349ac

Moving tests to use KVSet

a9abcf7

hanzei requested a review from cpoile May 17, 2019 21:29

cpoile mentioned this pull request May 18, 2019

[MM 15099] direct message notifications on off #62

Merged

cpoile approved these changes May 18, 2019

View reviewed changes

Updating jira icon

7fdda42

asaadmahmood added 2 commits May 20, 2019 18:49

Updating jira icon

c6857fa

Updating jira icon

da1a508

levb suggested changes May 20, 2019

View reviewed changes

asaadmahmood mentioned this pull request May 21, 2019

[ MM-15015] Add jira Icons to create and attach post menu items #65

Merged

Updatng jira icon

be79136

jasonblais added this to the v2.1 milestone May 21, 2019

crspeller added 3 commits May 21, 2019 11:15

Merge branch 'jira2' into jira-subscribe

91f3440

Some review feedback.

cdd9a61

More review fixes.

61af266

hanzei requested a review from levb May 21, 2019 20:50

Updating syntax

074aa92

levb approved these changes May 22, 2019

View reviewed changes

levb added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core committer labels May 22, 2019

levb merged commit bd283bd into jira2 May 22, 2019

levb pushed a commit that referenced this pull request May 22, 2019

Revert "MM-15462 Basic subscribe to jira events. (#61)"

e074b69

This reverts commit bd283bd.

hanzei deleted the jira-subscribe branch May 22, 2019 12:28

cpoile added a commit to cpoile/mattermost-plugin-jira that referenced this pull request May 23, 2019

updated for firehose webhook (mattermost#61) now on master

35b6550

This was referenced May 27, 2019

allow non-Mattermost admins to setup integration #25

Closed

Add Support Additional Events #6

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MM-15462 Basic subscribe to jira events. #61

MM-15462 Basic subscribe to jira events. #61

crspeller commented May 16, 2019

jasonblais commented May 16, 2019

crspeller commented May 16, 2019

jasonblais commented May 16, 2019

cpoile left a comment •

edited

Loading

crspeller commented May 17, 2019

cpoile left a comment

asaadmahmood commented May 19, 2019

levb left a comment

levb May 20, 2019

levb May 20, 2019

crspeller May 21, 2019

crspeller commented May 21, 2019

levb commented May 22, 2019

MM-15462 Basic subscribe to jira events. #61

MM-15462 Basic subscribe to jira events. #61

Conversation

crspeller commented May 16, 2019

jasonblais commented May 16, 2019

crspeller commented May 16, 2019

jasonblais commented May 16, 2019

cpoile left a comment • edited Loading

Choose a reason for hiding this comment

crspeller commented May 17, 2019

cpoile left a comment

Choose a reason for hiding this comment

asaadmahmood commented May 19, 2019

levb left a comment

Choose a reason for hiding this comment

levb May 20, 2019

Choose a reason for hiding this comment

levb May 20, 2019

Choose a reason for hiding this comment

crspeller May 21, 2019

Choose a reason for hiding this comment

crspeller commented May 21, 2019

levb commented May 22, 2019

cpoile left a comment •

edited

Loading