Skip to content

Commit da9135e

Browse files
committed
originator notifications update
1 parent b1a91ec commit da9135e

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/routes/notifications/constants/notifications.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export const NOTIFICATIONS = [
237237
goTo: GOTO.PROJECT_DASHBOARD
238238
}, {
239239
text: 'Your request to add invite the copilot was approved',
240-
creator: true,
240+
originator: true,
241241
goTo: GOTO.PROJECT_DASHBOARD
242242
}]
243243
},
@@ -247,7 +247,7 @@ export const NOTIFICATIONS = [
247247
type: NOTIFICATION_TYPE.MEMBER_ADDED,
248248
rules: [{
249249
text: 'Your request to add invite the member was refused',
250-
creator: true,
250+
originator: true,
251251
goTo: GOTO.PROJECT_DASHBOARD
252252
}]
253253
},

src/routes/notifications/helpers/notifications.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ const getNotificationRule = (notification) => {
290290
match = match && _notificationRule.toUserHandle
291291
}
292292

293-
if (notification.contents.creator) {
294-
match = match && _notificationRule.creator
293+
if (notification.contents.originator) {
294+
match = match && _notificationRule.originator
295295
}
296296

297297
if (notification.contents.projectRole) {
@@ -322,7 +322,7 @@ const isNotificationRuleEqual = (rule1, rule2) => {
322322
*
323323
* @type {Array<String>}
324324
*/
325-
const ESSENTIAL_RULE_PROPERTIES = ['eventType', 'toTopicStarter', 'toUserHandle', 'projectRole', 'topcoderRole', 'creator']
325+
const ESSENTIAL_RULE_PROPERTIES = ['eventType', 'toTopicStarter', 'toUserHandle', 'projectRole', 'topcoderRole', 'originator']
326326
const essentialRule1 = _.pick(rule1, ESSENTIAL_RULE_PROPERTIES)
327327
const essentialRule2 = _.pick(rule2, ESSENTIAL_RULE_PROPERTIES)
328328

src/routes/settings/routes/notifications/components/NotificationSettingsForm.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ const topics = [
7676
EVENT_TYPE.MEMBER.COPILOT_JOINED,
7777
EVENT_TYPE.MEMBER.ASSIGNED_AS_OWNER,
7878
EVENT_TYPE.MEMBER.INVITE_REQUESTED,
79+
EVENT_TYPE.MEMBER.INVITE_APPROVED,
80+
EVENT_TYPE.MEMBER.INVITE_REFUSED,
7981
EVENT_TYPE.MEMBER.COPILOT_ADDED,
8082
EVENT_TYPE.MEMBER.COPILOT_REFUSED,
8183
]

0 commit comments

Comments
 (0)