Merge PWA - Meeds-io/MIPs#134 (#514)

Meeds-io · Aug 22, 2024 · f37c25a · f37c25a
2 parents 26be621 + c0e849d
commit f37c25a
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 8 deletions.
diff --git a/kudos-services/src/main/java/io/meeds/kudos/listener/KudosSentNotificationListener.java b/kudos-services/src/main/java/io/meeds/kudos/listener/KudosSentNotificationListener.java
@@ -36,6 +36,7 @@
 
 import io.meeds.kudos.model.Kudos;
 import io.meeds.kudos.service.KudosService;
+import io.meeds.kudos.service.utils.Utils;
 
 import jakarta.annotation.PostConstruct;
 
@@ -52,7 +53,7 @@ public class KudosSentNotificationListener extends Listener<KudosService, Kudos>
 
   @PostConstruct
   public void init() {
-    listenerService.addListener("exo.kudos.sent", this);
+    listenerService.addListener(Utils.KUDOS_ACTIVITY_EVENT, this);
   }
 
   @Override

diff --git a/...ces/src/main/java/io/meeds/kudos/notification/plugin/KudosReceiverNotificationPlugin.java b/...ces/src/main/java/io/meeds/kudos/notification/plugin/KudosReceiverNotificationPlugin.java
@@ -23,6 +23,8 @@
 
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
+
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.model.NotificationInfo;
 import org.exoplatform.commons.api.notification.plugin.BaseNotificationPlugin;
@@ -66,13 +68,13 @@ public NotificationInfo makeNotification(NotificationContext ctx) {
     }
     ActivityManager activityManager = ExoContainerContext.getService(ActivityManager.class);
     ExoSocialActivity activity = activityManager.getActivity(String.valueOf(kudos.getActivityId()));
-    if (activity.isComment()) {
+    if (activity != null && activity.isComment()) {
       activity = activityManager.getActivity(activity.getParentId());
     }
 
     return NotificationInfo.instance()
                            .to(toList)
-                           .setSpaceId(activity == null ? 0l : Long.parseLong(activity.getSpaceId()))
+                           .setSpaceId(activity == null || StringUtils.isBlank(activity.getSpaceId()) ? 0l : Long.parseLong(activity.getSpaceId()))
                            .with(SocialNotificationUtils.ACTIVITY_ID.getKey(), String.valueOf(kudos.getActivityId()))
                            .with("ENTITY_ID", kudos.getEntityId())
                            .with("ENTITY_TYPE", kudos.getEntityType())

diff --git a/kudos-webapps/src/main/webapp/WEB-INF/gatein-resources.xml b/kudos-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -1,12 +1,34 @@
-<gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_resources_1_4 http://www.exoplatform.org/xml/ns/gatein_resources_1_4" xmlns="http://www.exoplatform.org/xml/ns/gatein_resources_1_4">
+<gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_resources_1_5 http://www.exoplatform.org/xml/ns/gatein_resources_1_5" xmlns="http://www.exoplatform.org/xml/ns/gatein_resources_1_5">
 
   <portal-skin>
     <skin-name>Enterprise</skin-name>
     <skin-module>kudos</skin-module>
     <css-path>/skin/css/main.css</css-path>
     <css-priority>120</css-priority>
+    <filtered>true</filtered>
   </portal-skin>
 
+  <portlet-skin>
+    <application-name>kudos</application-name>
+    <portlet-name>Kudos</portlet-name>
+    <skin-name>Enterprise</skin-name>
+    <additional-module>kudos</additional-module>
+  </portlet-skin>
+
+  <portlet-skin>
+    <application-name>kudos</application-name>
+    <portlet-name>KudosOverview</portlet-name>
+    <skin-name>Enterprise</skin-name>
+    <additional-module>kudos</additional-module>
+  </portlet-skin>
+
+  <portlet-skin>
+    <application-name>kudos</application-name>
+    <portlet-name>KudosAdmin</portlet-name>
+    <skin-name>Enterprise</skin-name>
+    <additional-module>kudos</additional-module>
+  </portlet-skin>
+
   <portlet>
     <name>Kudos</name>
     <module>

diff --git a/kudos-webapps/src/main/webapp/WEB-INF/web.xml b/kudos-webapps/src/main/webapp/WEB-INF/web.xml
@@ -24,6 +24,7 @@
     <url-pattern>*.css</url-pattern>
     <url-pattern>*.js</url-pattern>
     <url-pattern>*.html</url-pattern>
+    <url-pattern>/i18n/*</url-pattern>
     <url-pattern>/images/*</url-pattern>
   </filter-mapping>
 

diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos-admin/main.js b/kudos-webapps/src/main/webapp/vue-app/kudos-admin/main.js
@@ -31,7 +31,7 @@ if (extensionRegistry) {
 }
 
 const lang = eXo && eXo.env.portal.language || 'en';
-const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.addon.Kudos-${lang}.json`;
+const url = `/kudos/i18n/locale.addon.Kudos?lang=${lang}`;
 const appId = 'KudosAdminApp';
 
 export function init() {

diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos-overview/main.js b/kudos-webapps/src/main/webapp/vue-app/kudos-overview/main.js
@@ -15,7 +15,7 @@ const cacheId = `${appId}_${eXo.env.portal.profileOwnerIdentityId}`;
 
 //should expose the locale ressources as REST API 
 const lang = (eXo && eXo.env && eXo.env.portal && eXo.env.portal.language) || 'en';
-const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.addon.Kudos-${lang}.json`;
+const url = `/kudos/i18n/locale.addon.Kudos?lang=${lang}`;
 
 export function init() {
   exoi18n.loadLanguageAsync(lang, url).then(i18n => {

diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/main.js b/kudos-webapps/src/main/webapp/vue-app/kudos/main.js
@@ -27,7 +27,7 @@ const appId = 'KudosApp';
 
 //should expose the locale ressources as REST API
 const lang = (eXo && eXo.env && eXo.env.portal && eXo.env.portal.language) || 'en';
-const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.addon.Kudos-${lang}.json`;
+const url = `/kudos/i18n/locale.addon.Kudos?lang=${lang}`;
 
 exoi18n.loadLanguageAsync(lang, url).then(i18n => {
 // init Vue app when locale ressources are ready

diff --git a/kudos-webapps/src/main/webapp/vue-app/notification-extension/main.js b/kudos-webapps/src/main/webapp/vue-app/notification-extension/main.js
@@ -21,7 +21,7 @@ import './initComponents.js';
 import './extensions.js';
 
 const lang = eXo.env.portal.language;
-const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.notification.KudosNotification-${lang}.json`;
+const url = `/kudos/i18n/locale.notification.KudosNotification?lang=${lang}`;
 
 export function init() {
   return exoi18n.loadLanguageAsync(lang, url)