From 28dbff9ecf96ceefa380e55bf92516ad2c9a5e64 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 15 Sep 2023 09:46:41 +0100 Subject: [PATCH] feat: Add Perks Notification Type - MEED-2450 - Meeds-io/MIPs#80 (#354) --- .../kudos/notification/builder/KudosTemplateBuilder.java | 4 ---- .../locale/notification/KudosNotification_en.properties | 1 + .../webapp/vue-app/notification-extension/extensions.js | 8 ++++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kudos-services/src/main/java/org/exoplatform/kudos/notification/builder/KudosTemplateBuilder.java b/kudos-services/src/main/java/org/exoplatform/kudos/notification/builder/KudosTemplateBuilder.java index 06c8f248e..289e4a29f 100644 --- a/kudos-services/src/main/java/org/exoplatform/kudos/notification/builder/KudosTemplateBuilder.java +++ b/kudos-services/src/main/java/org/exoplatform/kudos/notification/builder/KudosTemplateBuilder.java @@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.api.notification.NotificationContext; -import org.exoplatform.commons.api.notification.NotificationMessageUtils; import org.exoplatform.commons.api.notification.channel.template.AbstractTemplateBuilder; import org.exoplatform.commons.api.notification.channel.template.TemplateProvider; import org.exoplatform.commons.api.notification.model.MessageInfo; @@ -64,9 +63,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { // NOSONAR Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(notification.getLastModifiedDate()); - templateContext.put("READ", - Boolean.parseBoolean(notification.getValueOwnerParameter(NotificationMessageUtils.READ_PORPERTY.getKey())) ? "read" - : "unread"); templateContext.put("NOTIFICATION_ID", notification.getId()); templateContext.put("LAST_UPDATED_TIME", TimeConvertUtils.convertXTimeAgoByTimeServer(cal.getTime(), diff --git a/kudos-services/src/main/resources/locale/notification/KudosNotification_en.properties b/kudos-services/src/main/resources/locale/notification/KudosNotification_en.properties index c3f283b2f..2e38e288f 100644 --- a/kudos-services/src/main/resources/locale/notification/KudosNotification_en.properties +++ b/kudos-services/src/main/resources/locale/notification/KudosNotification_en.properties @@ -11,3 +11,4 @@ Notification.kudos.spaceReceived=Space {0} has received a kudos from {1} Notification.label.SayHello=Hi Notification.label.ViewFullDiscussion=View the full discussion Notification.plugin.NewUserKudosButtonTitle=Say welcome +Notification.label.types.kudos=Kudos diff --git a/kudos-webapps/src/main/webapp/vue-app/notification-extension/extensions.js b/kudos-webapps/src/main/webapp/vue-app/notification-extension/extensions.js index 23cd2e36a..5b32615a3 100644 --- a/kudos-webapps/src/main/webapp/vue-app/notification-extension/extensions.js +++ b/kudos-webapps/src/main/webapp/vue-app/notification-extension/extensions.js @@ -17,6 +17,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +extensionRegistry.registerExtension('WebNotification', 'notification-group-extension', { + rank: 40, + name: 'kudos', + plugins: [ + 'KudosActivityReceiverNotificationPlugin' + ], + icon: 'fa-award', +}); extensionRegistry.registerExtension('WebNotification', 'notification-content-extension', { type: 'KudosActivityReceiverNotificationPlugin', rank: 10,