Merge Space Templates - Meeds-io/MIPs#150 (#547)

Meeds-io · Nov 4, 2024 · bfcf1db · bfcf1db
2 parents 8771cfb + 30d8e27
commit bfcf1db
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/kudos-services/src/main/java/io/meeds/kudos/service/utils/Utils.java b/kudos-services/src/main/java/io/meeds/kudos/service/utils/Utils.java
@@ -124,12 +124,6 @@ public static Space getSpace(String id) {
       space = spaceService.getSpaceByPrettyName(id);
       if (space == null) {
         space = spaceService.getSpaceByGroupId("/spaces/" + id);
-        if (space == null) {
-          space = spaceService.getSpaceByDisplayName(id);
-          if (space == null) {
-            space = spaceService.getSpaceByUrl(id);
-          }
-        }
       }
     }
     return space;

diff --git a/...s-services/src/test/java/io/meeds/kudos/listener/GamificationIntegrationListenerTest.java b/...s-services/src/test/java/io/meeds/kudos/listener/GamificationIntegrationListenerTest.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.commons.codec.binary.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/kudos-services/src/test/java/io/meeds/test/kudos/mock/IdentityManagerMock.java b/kudos-services/src/test/java/io/meeds/test/kudos/mock/IdentityManagerMock.java
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.codec.binary.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.utils.ListAccess;
 import org.exoplatform.social.core.identity.IdentityProvider;

diff --git a/kudos-services/src/test/java/io/meeds/test/kudos/mock/SpaceServiceMock.java b/kudos-services/src/test/java/io/meeds/test/kudos/mock/SpaceServiceMock.java
@@ -27,7 +27,6 @@
 import org.exoplatform.commons.utils.ListAccess;
 import org.exoplatform.social.core.application.PortletPreferenceRequiredPlugin;
 import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.social.core.space.SpaceApplicationConfigPlugin;
 import org.exoplatform.social.core.space.SpaceException;
 import org.exoplatform.social.core.space.SpaceFilter;
 import org.exoplatform.social.core.space.SpaceListAccess;

diff --git a/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosIdentityLink.vue b/kudos-webapps/src/main/webapp/vue-app/kudos/components/KudosIdentityLink.vue
@@ -48,7 +48,7 @@ export default {
       if (this.type === 'user' || this.type === 'organization') {
         return `${eXo.env.portal.context}/${eXo.env.portal.portalName}/profile/${this.id}`;
       } else {
-        return `${eXo.env.portal.context}/g/:spaces:${this.id}/`;
+        return `${eXo.env.portal.context}/s/${this.technicalId}`;
       }
     }
   },