feat: Implement left navigation level 1 for sites - EXO-65477 - Meeds…

…-io/MIPs#72
Meeds-io · Sep 5, 2023 · 0e9cf06 · 0e9cf06
1 parent 167143b
commit 0e9cf06
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java b/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java
@@ -1745,7 +1745,7 @@ private static SiteEntity buildSiteEntity(PortalConfig site, HttpServletRequest
                                                                                           userPortalContext);
         UserPortal userPortal = userPortalCfg.getUserPortal();
         UserNavigation navigation = userPortal.getNavigation(new SiteKey(siteType.getName(), site.getName()));
-        rootNode = userPortal.getNode(navigation, Scope.ALL, UserNodeFilterConfig.builder().build(), null);
+        rootNode = userPortal.getNode(navigation, Scope.ALL, UserNodeFilterConfig.builder().withReadWriteCheck().build(), null);
       } catch (Exception e) {
         LOG.error("Error while getting site {} navigations for user {}", site.getName(), currentUser, e);
       }

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
@@ -5,7 +5,7 @@ export function getSites(siteType, displayed, allSites, excludedSiteName, expand
   }
   formData.append('displayed', displayed);
   formData.append('allSites', allSites);
-  formData.append('filterByPermission', filterByPermission);
+  formData.append('filterByPermissions', filterByPermission);
   if (excludedSiteName) {
     formData.append('excludedSiteName', excludedSiteName);
   }

diff --git a/...c/main/webapp/vue-apps/hamburger-menu/components/site/MetaSiteHamburgerNavigationItem.vue b/...c/main/webapp/vue-apps/hamburger-menu/components/site/MetaSiteHamburgerNavigationItem.vue
@@ -21,15 +21,14 @@
 <template>
   <v-list-item
     :href="uri"
-    :target="target"
-    class="ps-0">
+    :target="target">
     <v-list-item-icon class-name="flex align-center flex-grow-0">
       <v-icon v-if="navigation.icon"> {{ icon }}</v-icon>
       <i v-else :class="iconClass"></i>
     </v-list-item-icon>
     <v-list-item-content>
       <v-list-item-title
-        class-name="subtitle-2"
+        class="subtitle-2"
         v-text="navigation.label" />
     </v-list-item-content>
   </v-list-item>

diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerItem.vue b/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerItem.vue
@@ -19,7 +19,7 @@
 
 -->
 <template>
-  <v-list-item :href="uri" class="ps-0">
+  <v-list-item :href="uri">
     <v-list-item-icon class="flex align-center flex-grow-0 my-2">
       <v-icon v-if="siteRootNode.icon"> {{ icon }}</v-icon>
       <i v-else :class="iconClass"></i>

diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SitesHamburger.vue b/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SitesHamburger.vue
@@ -23,15 +23,15 @@
     dense
     min-width="90%"
     class="pb-0">
-    <v-list-item
+    <v-list-item-group
       v-for="site in sites"
       :key="site.name"
       link>
       <meta-site-hamburger-navigation v-if="site.metaSite" :navigations="site.siteNavigations" />
       <site-hamburger-item
         v-else
         :site="site" />
-    </v-list-item>
+    </v-list-item-group> 
   </v-list>
 </template>