Copilot workflow changes #89
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,6 +101,34 @@ const getNotificationsForMentionedUser = (eventConfig, content) => { | |
| }); | ||
| }; | ||
|
|
||
| /** | ||
| * Get notifications for users obtained from originator | ||
| * | ||
| * @param {Object} eventConfig event configuration | ||
| * @param {String} originator originator userId | ||
| * | ||
| * @return {Promise} resolves to a list of notifications | ||
| */ | ||
| const getNotificationsForOriginator = (eventConfig, originator) => { | ||
| // if event doesn't have to be notified to creator, just ignore | ||
| if (!eventConfig.creator) { | ||
| return Promise.resolve([]); | ||
| } | ||
|
|
||
| // if we have to send notification to the creator, | ||
| // but it's not provided in the message, then throw error | ||
| if (!originator) { | ||
| return Promise.reject(new Error('Missing originator in the event message.')); | ||
| } | ||
|
|
||
| return Promise.resolve([{ | ||
| userId: originator.toString(), | ||
| contents: { | ||
| originator: true, | ||
| }, | ||
| }]); | ||
| }; | ||
|
|
||
| /** | ||
| * Get project members notifications | ||
| * | ||
|
|
@@ -307,6 +335,7 @@ const handler = (topic, message, logger, callback) => { | |
| // - check that event has everything required or throw error | ||
| getNotificationsForTopicStarter(eventConfig, message.topicId), | ||
|
There was a problem hiding this comment. @gondzo we might reuse the logic of |
||
| getNotificationsForUserId(eventConfig, message.userId), | ||
| getNotificationsForOriginator(eventConfig, message.originator), | ||
| getNotificationsForMentionedUser(eventConfig, message.postContent), | ||
| getProjectMembersNotifications(eventConfig, project), | ||
| getTopCoderMembersNotifications(eventConfig), | ||
|
|
@@ -321,7 +350,7 @@ const handler = (topic, message, logger, callback) => { | |
| )).then((notifications) => { | ||
| allNotifications = _.filter(notifications, notification => notification.userId !== `${message.initiatorUserId}`); | ||
|
|
||
| if (eventConfig.includeUsers && message[eventConfig.includeUsers] && message[eventConfig.includeUsers].length > 0) { | ||
| allNotifications = _.filter(allNotifications, notification => message[eventConfig.includeUsers].contains(notification.userId)); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ | |
| <td class="main-td"> | ||
| <table class="main-child"> | ||
| <tr><td></td></tr> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
|
|
||
|
|
@@ -60,12 +60,25 @@ | |
| {{#if [notifications.connect.project.member.invite.created]}} | ||
| Hi <strong>{{userFullName}}</strong>, you are invited to join the project {{projectName}}. Please click on the button ("View project on Connect") below to join. | ||
| {{/if}} | ||
| {{#if [notifications.connect.project.member.invite.requested]}} | ||
| You are requested to add <strong>{{userFullName}}</strong> as a copilot | ||
| {{/if}} | ||
| {{#if [notifications.connect.project.member.invite.approved]}} | ||
| {{#if [creator]}} | ||
|
||
| Your request to add invite the member was approved | ||
| {{else}} | ||
| Hi <strong>{{userFullName}}</strong>, you are added as a copilot | ||
| {{/if}} | ||
| {{/if}} | ||
| {{#if [notifications.connect.project.member.invite.rejected]}} | ||
| Your request to add the member was refused | ||
| {{/if}} | ||
| </td> | ||
| </tr> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| {{/each}} | ||
|
|
@@ -76,7 +89,7 @@ | |
| <td class="main-td"> | ||
| <table class="main-child"> | ||
| <tr><td></td></tr> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| <tr class="button-row button-one"> | ||
|
|
@@ -98,7 +111,7 @@ | |
| <td class="main-td"> | ||
| <table class="main-child"> | ||
| <tr><td></td></tr> | ||
| </table> | ||
| </td> | ||
| </tr> | ||
| {{/if}} | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gondzo I forgot how do we manage these ids when we test the application in dev env?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We just use what is set in the admin app - role ids should be consistent between dev and prod