diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index 4943ac92f..e5057ebba 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -21,7 +21,7 @@
v-tooltip="{ content: $t('notifications.post'), placement: 'right' }"
/>
{{
- $t(`notifications.reason.${notificationData.reason}` + notificationData.reasonExtention)
+ $t(`notifications.reason.${notificationData.reason}` + notificationData.reasonTranslationExtention)
}}
diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index 288337a11..55c9c133b 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -35,7 +35,7 @@
- {{ $t(`notifications.reason.${scope.row.reason}` + scope.row.reasonExtention) }}
+ {{ $t(`notifications.reason.${scope.row.reason}` + scope.row.reasonTranslationExtention) }}
@@ -43,7 +43,7 @@
data-test="notification-title-link"
:class="{ 'notification-status': scope.row.read }"
:to="scope.row.linkTo"
- @click.native="markNotificationAsRead(scope.row.id)"
+ @click.native="markNotificationAsRead(scope.row.notificationSourceId)"
>
{{ scope.row.title | truncate(50) }}
diff --git a/webapp/components/utils/Notifications.js b/webapp/components/utils/Notifications.js
index 9472136c4..2c39b13f7 100644
--- a/webapp/components/utils/Notifications.js
+++ b/webapp/components/utils/Notifications.js
@@ -69,7 +69,7 @@ export const extractNotificationDataOfCurrentUser = (notification, currentUser)
let comment = null
let contentExcerpt = null
let report = null
- let reasonExtention = ''
+ let reasonTranslationExtention = ''
let triggerer
let title
let author
@@ -101,16 +101,16 @@ export const extractNotificationDataOfCurrentUser = (notification, currentUser)
switch (filed.reportedResource.__typename) {
case 'User':
user = filed.reportedResource
- reasonExtention = '.user'
+ reasonTranslationExtention = '.user'
break
case 'Comment':
comment = filed.reportedResource
post = filed.reportedResource.post
- reasonExtention = '.comment'
+ reasonTranslationExtention = '.comment'
break
case 'Post':
post = filed.reportedResource
- reasonExtention = '.post'
+ reasonTranslationExtention = '.post'
break
}
}
@@ -146,7 +146,7 @@ export const extractNotificationDataOfCurrentUser = (notification, currentUser)
createdAt: notification.createdAt,
read: notification.read,
reason: notification.reason,
- id: from.id,
+ notificationSourceId: from.id,
triggerer,
user,
comment,
@@ -155,7 +155,7 @@ export const extractNotificationDataOfCurrentUser = (notification, currentUser)
title,
contentExcerpt,
report,
- reasonExtention,
+ reasonTranslationExtention,
linkTo: { name: linkName, params: linkParams, ...linkHashParam },
}
return data