From 7e1a419b2716d73d829abac77cffc7c33131698a Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Fri, 6 Sep 2024 19:16:45 +0100
Subject: [PATCH] feat: Improve Top and Left Menu Tree View - MEED-7436 -
 Meeds-io/meeds#2371 (#4008)

This change will make the first level of Sites Tree displayed as same
level as the root node when the only root navigation to enhance UX.
---
 .../SpacePanelHamburgerNavigation.vue         | 13 ++--
 .../site-details/components/SiteDetails.vue   |  5 +-
 .../components/SiteNavigationTree.vue         | 42 ++++++++++-
 .../components/NavigationMenuItem.vue         | 69 +++++++++++-------
 .../components/NavigationMenuSubItem.vue      | 72 ++++++++++++-------
 .../components/TopBarNavigationMenu.vue       | 23 +++---
 6 files changed, 152 insertions(+), 72 deletions(-)

diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue b/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue
index 50567eefd90..88b1e32cfb5 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue
@@ -145,11 +145,13 @@
       </v-list-item-action>
     </v-flex>
     <v-flex>
-      <v-list>
+      <v-list v-if="spaceNavigations">
         <site-navigation-tree
           :navigations="spaceNavigations"
           :site-name="spaceGroupId"
-          :space-unread-items="spaceUnreadItems" />
+          :space-unread-items="spaceUnreadItems"
+          :selected-name="selectedNavigationName"
+          collapsed />
       </v-list>
     </v-flex>
   </v-container>
@@ -171,9 +173,10 @@ export default {
     },
   },
   data: () => ({
-    spaceNavigations: [],
+    spaceNavigations: null,
     externalExtensions: [],
     spaceUnreadItems: null,
+    selectedNavigationName: null,
     loading: false,
   }),
   computed: {
@@ -248,7 +251,7 @@ export default {
       handler(newVal, oldVal) {
         if (newVal !== oldVal) {
           if (this.spaceId) {
-            this.spaceNavigations = [];
+            this.spaceNavigations = null;
             this.retrieveSpaceNavigations()
               .then(() => this.refreshExtensions());
           }
@@ -266,6 +269,8 @@ export default {
   created() {
     document.addEventListener('space-unread-activities-updated', this.applySpaceUnreadChanges);
     this.retrieveSpaceNavigations(this.spaceId);
+    this.selectedNavigationName = eXo.env.portal.siteKeyName === this.spaceGroupId
+      && eXo.env.portal.selectedNodeUri?.split?.('/')?.reverse?.()?.[0];
   },
   methods: {
     applySpaceUnreadChanges(event) {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue b/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue
index 622ba8437b2..0b6547a6aae 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue
@@ -53,7 +53,8 @@
         :navigations="site.siteNavigations"
         :site-name="site?.name"
         :enable-change-home="enableChangeHome"
-        :selected-name="expandSelectionOnly && selectedNavigationName" />
+        :selected-name="selectedNavigationName"
+        collapsed />
     </v-card>
     <exo-confirm-dialog
       ref="confirmDialog"
@@ -106,7 +107,7 @@ export default {
   created() {
     this.$root.$on('update-home-link', this.selectHome);
     document.addEventListener('homeLinkUpdated', () => this.homeLink = eXo.env.portal.homeLink);
-    this.selectedNavigationName = eXo.env.portal.selectedNodeUri?.split?.('/')?.reverse?.()?.[0];
+    this.selectedNavigationName = eXo.env.portal.siteKeyName === this.site.name && eXo.env.portal.selectedNodeUri?.split?.('/')?.reverse?.()?.[0];
   },
   methods: {
     navigationUri(navigation) {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue b/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue
index 5217934259e..b73ce8c07b5 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue
@@ -17,9 +17,10 @@
 
 <template>
   <v-treeview
+    v-if="navigationTree"
     id="siteNavigationTree"
     :open.sync="openLevel"
-    :items="navigations"
+    :items="navigationTree"
     :active="active"
     active-class="v-item--active v-list-item--active"
     class="treeView-item my-2"
@@ -53,6 +54,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    collapsed: {
+      type: Boolean,
+      default: false,
+    },
     spaceUnreadItems: {
       type: Object,
       default: null
@@ -64,15 +69,17 @@ export default {
   },
   data: () => ({
     selectedNodeUri: eXo.env.portal.selectedNodeUri,
-    currentSite: eXo.env.portal.portalName,
+    currentSite: eXo.env.portal.siteKeyName,
   }),
   computed: {
     openLevel() {
       if (this.selectedName) {
         const ids = [this.selectedName];
         const splittedCurrentUri = this.selectedNodeUri.split('/');
-        ids.push (...splittedCurrentUri);
+        ids.push (...splittedCurrentUri.slice(1));
         return ids;
+      } else if (this.collapsed) {
+        return [];
       } else {
         const ids = [];
         if (this.navigations?.length) {
@@ -86,6 +93,17 @@ export default {
         return ids;
       }
     },
+    navigationTree() {
+      if (this.navigations?.length === 1) {
+        const navigations = JSON.parse(JSON.stringify(this.navigations));
+        const rootNavigation = navigations[0];
+        const rootNavigationChildren = navigations[0]?.children || [];
+        rootNavigation.children = [];
+        return this.filterNodes([rootNavigation, ...rootNavigationChildren]);
+      } else {
+        return this.navigations;
+      }
+    },
     firstNavigationId() {
       return this.navigations?.[0]?.id;
     },
@@ -97,5 +115,23 @@ export default {
       return [splittedCurrentUri[splittedCurrentUri.length -1]];
     },
   },
+  methods: {
+    filterNodes(navigations) {
+      if (navigations?.length) {
+        return navigations.map(n => {
+          n.children = this.filterNodes(n.children);
+          if (n.children?.length
+              || n.pageLink
+              || n.pageKey) {
+            return n;
+          } else {
+            return [];
+          }
+        }).filter(n => n.children?.length || n.pageLink || n.pageKey);
+      } else {
+        return [];
+      }
+    },
+  },
 };
 </script>
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue b/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue
index ee9f4142763..5ecf51761c5 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue
@@ -27,21 +27,23 @@
     :left="$vuetify.rtl"
     :open-on-hover="isOpenedOnHover"
     bottom
-    offset-y>
+    offset-y
+    eager>
     <template #activator="{ on, attrs }">
       <v-tab
         v-if="hasPage || hasChildren && childrenHasPage"
-        :class="`mx-auto text-break ${notClickable}`"
-        v-on="on"
-        v-bind="attrs"
         :href="navigationNodeUri"
         :target="navigationNodeTarget"
         :link="hasPage"
         :aria-label="navigation.label"
+        :class="`mx-auto text-break ${notClickable}`"
+        :value="navigationNodeUri"
+        v-on="on"
+        v-bind="attrs"
         role="tab"
         @click.stop="checkLink(navigation, $event)"
         @click="openUrl(navigationNodeUri, navigationNodeTarget)"
-        @change="updateNavigationState(navigation.uri)">
+        @change="updateNavigationState">
         <span
           class="text-truncate-3">
           {{ navigation.label }}
@@ -63,18 +65,14 @@
       :navigation="children"
       :base-site-uri="baseSiteUri"
       :parent-navigation-uri="navigation.uri"
-      @update-navigation-state="updateNavigationState" />
+      :selected-path="selectedPath"
+      @update-navigation-state="updateNavigationState"
+      @select="updateNavigationState" />
   </v-menu>
 </template>
 
 <script>
 export default {
-  data () {
-    return {
-      showMenu: false,
-      isOpenedOnHover: true,
-    };
-  },
   props: {
     navigation: {
       type: Object,
@@ -83,19 +81,22 @@ export default {
     baseSiteUri: {
       type: String,
       default: null
-    }
-  },
-  watch: {
-    showMenu() {
-      this.isOpenedOnHover = !this.showMenu;
-      this.$root.$emit('close-sibling-drop-menus', this); 
-    }
+    },
+    selectedPath: {
+      type: String,
+      default: null
+    },
   },
-  created() {
-    document.addEventListener('click', this.handleCloseMenu);
-    this.$root.$on('close-sibling-drop-menus', this.handleCloseSiblingMenus);
+  data () {
+    return {
+      showMenu: false,
+      isOpenedOnHover: true,
+    };
   },
   computed: {
+    isSelected() {
+      return this.selectedPath === this.navigationNodeUri;
+    },
     notClickable() {
       return `${this.hasPage ? ' ' : ' not-clickable ' }`;
     },
@@ -113,11 +114,29 @@ export default {
     },
     childrenHasPage() {
       return this.checkChildrenHasPage(this.navigation);
-    }
+    },
+  },
+  watch: {
+    showMenu() {
+      this.isOpenedOnHover = !this.showMenu;
+      this.$root.$emit('close-sibling-drop-menus', this); 
+    },
+    isSelected: {
+      immediate: true,
+      handler() {
+        if (this.isSelected) {
+          this.updateNavigationState();
+        }
+      }
+    },
+  },
+  created() {
+    document.addEventListener('click', this.handleCloseMenu);
+    this.$root.$on('close-sibling-drop-menus', this.handleCloseSiblingMenus);
   },
   methods: {
-    updateNavigationState(value) {
-      this.$emit('update-navigation-state', `${this.baseSiteUri}${value}`);
+    updateNavigationState() {
+      this.$emit('update-navigation-state', this.navigationNodeUri);
     },
     checkLink(navigation, e) {
       if (!navigation.pageKey) {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue b/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue
index 75b7641097b..3644d93a54f 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue
@@ -25,20 +25,21 @@
     dense>
     <v-list-item
       v-if="hasPage || hasChildren && childrenHasPage"
-      class="pt-0 pb-0"
       :href="navigationNodeUri"
       :target="navigationNodeTarget"
-      @click.stop="checkLink(navigation, $event)"
-      :link="!!hasPage">
+      :link="!!hasPage"
+      class="pt-0 pb-0"
+      @click.stop="checkLink(navigation, $event)">
       <v-menu
         v-model="showMenu"
         rounded
         :position-x="positionX"
         :position-y="positionY"
         transition="slide-x-reverse-transition"
-        absolute
         :left="$vuetify.rtl"
         :open-on-hover="isOpenedOnHover"
+        absolute
+        eager
         offset-x>
         <template #activator="{ attrs, on }">
           <v-list-item-title
@@ -70,7 +71,9 @@
           :navigation="children"
           :parent-navigation-uri="parentNavigationUri"
           :base-site-uri="baseSiteUri"
-          @update-navigation-state="updateNavigationState" />
+          :selected-path="selectedPath"
+          @update-navigation-state="updateNavigationState"
+          @select="$emit('select')" />
       </v-menu>
     </v-list-item>
   </v-list>
@@ -78,14 +81,6 @@
 
 <script>
 export default {
-  data() {
-    return {
-      isOpenedOnHover: true,
-      showMenu: false,
-      positionX: 0,
-      positionY: 0,
-    };
-  },
   props: {
     navigation: {
       type: Object,
@@ -98,19 +93,19 @@ export default {
     parentNavigationUri: {
       type: String,
       default: null
-    }
-  },
-  watch: {
-    showMenu() {
-      this.isOpenedOnHover = !this.showMenu;
-      this.positionX = window.innerWidth - (window.innerWidth - this.$el.getBoundingClientRect().right);
-      this.positionY = this.$el.getBoundingClientRect().top;
-      this.$root.$emit('close-sibling-drop-menus-children', this);
-    }
+    },
+    selectedPath: {
+      type: String,
+      default: null
+    },
   },
-  created() {
-    window.addEventListener('resize', this.updateSize);
-    this.$root.$on('close-sibling-drop-menus-children', this.handleCloseSiblingMenus);
+  data() {
+    return {
+      isOpenedOnHover: true,
+      showMenu: false,
+      positionX: 0,
+      positionY: 0,
+    };
   },
   computed: {
     hasChildren() {
@@ -123,12 +118,37 @@ export default {
       return this.checkChildrenHasPage(this.navigation);
     },
     navigationNodeUri() {
-      return this.navigation?.pageLink && this.urlVerify(this.navigation?.pageLink) || `${this.baseSiteUri}${this.navigation.uri}`;
+      return this.navigation?.pageLink
+        && this.urlVerify(this.navigation?.pageLink)
+        || `${this.baseSiteUri}${this.navigation.uri}`;
+    },
+    isSelected() {
+      return this.navigationNodeUri === this.selectedPath;
     },
     navigationNodeTarget() {
       return this.navigation?.target === 'SAME_TAB' && '_self' || '_blank';
     },
   },
+  watch: {
+    isSelected: {
+      immediate: true,
+      handler() {
+        if (this.isSelected) {
+          this.$emit('select');
+        }
+      }
+    },
+    showMenu() {
+      this.isOpenedOnHover = !this.showMenu;
+      this.positionX = window.innerWidth - (window.innerWidth - this.$el.getBoundingClientRect().right);
+      this.positionY = this.$el.getBoundingClientRect().top;
+      this.$root.$emit('close-sibling-drop-menus-children', this);
+    },
+  },
+  created() {
+    window.addEventListener('resize', this.updateSize);
+    this.$root.$on('close-sibling-drop-menus-children', this.handleCloseSiblingMenus);
+  },
   methods: {
     checkLink(navigation, e) {
       if (!navigation.pageKey) {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue b/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue
index 6052899f738..6dcae03dabe 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue
@@ -55,6 +55,7 @@
         :key="navigation.id"
         :navigation="navigation"
         :base-site-uri="getNavigationBaseUri(index)"
+        :selected-path="selectedPath"
         @update-navigation-state="updateNavigationState" />
     </v-tabs>
   </v-app>
@@ -96,6 +97,15 @@ export default {
     siteUri() {
       return this.siteType === 'GROUP' ? `g/${this.siteName?.replaceAll('/', ':')}` : this.siteName;
     },
+    selectedPath() {
+      const pathname = window.location.pathname;
+      if (pathname.toLowerCase() === `${eXo.env.portal.context}/${this.siteUri}/`.toLowerCase()
+          || pathname.toLowerCase() === `${eXo.env.portal.context}/${this.siteUri}`.toLowerCase()) {
+        return `${eXo.env.portal.context}/${this.siteUri}/${eXo.env.portal.selectedNodeUri}`;
+      } else {
+        return pathname;
+      }
+    },
     baseSiteUri() {
       return `${eXo.env.portal.context}/${this.siteUri}/`;
     },
@@ -128,7 +138,6 @@ export default {
   methods: {
     init() {
       return this.getNavigations()
-        .then(() => this.getActiveTab())
         .finally(() => this.initialized = true);
     },
     cacheMenuContent() {
@@ -162,6 +171,7 @@ export default {
     },
     updateNavigationState(value) {
       sessionStorage.setItem(this.navigationTabState,  value);
+      this.tab = value;
     },
     constructNavigations() {
       if (this.navigations.length && this.navigations[0].children?.length) {
@@ -190,17 +200,6 @@ export default {
       }
       this.computeSiteBodyMargin();
     },
-    getActiveTab() {
-      let pathname = location.pathname;
-      if (pathname === `${eXo.env.portal.context}/${this.siteUri}/`) {
-        pathname = `${eXo.env.portal.context}/${this.siteUri}/${eXo.env.portal.selectedNodeUri}`;
-        this.updateNavigationState(pathname);
-      }
-      this.tab = sessionStorage.getItem(this.navigationTabState);
-      if (pathname !== this.tab && !pathname.startsWith(this.tab)) {
-        this.tab = pathname;
-      }
-    },
     computeSiteBodyMargin() {
       if (this.isMobile && this.navigationsLength > 0) {
         window.setTimeout(() => {