feat: Adjust get sites query - EXO-66028 - Meeds-io/MIPs#72

Meeds-io · Sep 7, 2023 · a3c5461 · a3c5461
1 parent c424b87
commit a3c5461
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/impl/site/SiteRest.java b/component/service/src/main/java/org/exoplatform/social/rest/impl/site/SiteRest.java
@@ -16,6 +16,7 @@
  */
 package org.exoplatform.social.rest.impl.site;
 
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.security.RolesAllowed;
@@ -65,9 +66,9 @@ public SiteRest(LayoutService layoutService) {
       @ApiResponse(responseCode = "500", description = "Internal server error"), })
   public Response getSites(@Context
   HttpServletRequest request,
-                           @Parameter(description = "Portal site type, possible values: PORTAL, GROUP or USER", required = true)
-                           @QueryParam("siteType")
-                           String siteTypeName,
+                           @Parameter(description = "Portal site types, possible values: PORTAL, GROUP or USER", required = true)
+                           @QueryParam("siteTypes")
+                           String siteTypeNames,
                            @Parameter(description = "Site name to be excluded")
                            @QueryParam("excludedSiteName")
                            String excludedSiteName,
@@ -97,8 +98,9 @@ public Response getSites(@Context
                            int limit) {
     try {
       SiteFilter siteFilter = new SiteFilter();
-      if (siteTypeName != null) {
-        siteFilter.setSiteType(SiteType.valueOf(siteTypeName.toUpperCase()));
+      if (siteTypeNames != null) {
+        List<SiteType> siteTypes = Arrays.asList(siteTypeNames.split(",")).stream().map(siteTypeName -> SiteType.valueOf(siteTypeName.toUpperCase())).toList();
+        siteFilter.setSiteTypes(siteTypes);
       }
       if (excludedSiteName != null) {
         siteFilter.setExcludedSiteName(excludedSiteName);

diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/SiteService.js b/webapp/portlet/src/main/webapp/vue-apps/common/js/SiteService.js
@@ -1,7 +1,7 @@
-export function getSites(siteType, excludedSiteName, expandNavigations, displayed, allSites, filterByPermissions) {
+export function getSites(siteTypes, excludedSiteName, expandNavigations, displayed, allSites, filterByPermissions) {
   const formData = new FormData();
-  if (siteType) {
-    formData.append('siteType', siteType);
+  if (siteTypes) {
+    formData.append('siteTypes', siteTypes);
   }
   if (excludedSiteName) {
     formData.append('excludedSiteName', excludedSiteName);