From c1871a9d10292c1ceb8736921623a9b189704250 Mon Sep 17 00:00:00 2001
From: Sara Boutej <40363501+SaraBoutej@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:32:02 +0100
Subject: [PATCH] feat: Review UI of Navigation drawer - MEED-6831 -
 Meeds-io/MIPs#137 (#125)

This PR adds UI/Ux adjustment to the site navigation drawer
---
 .../site-navigation/SiteNavigationDrawer.vue  | 35 +++++++++----------
 .../SiteNavigationNodeDrawer.vue              |  2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationDrawer.vue
index e38cae7f8..cc063400d 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationDrawer.vue
@@ -25,11 +25,7 @@
     allow-expand
     @closed="close">
     <template slot="title">
-      <span>{{ $t('siteNavigation.drawer.title') }}<v-chip
-        v-if="isMetaSite"
-        class="ms-4 primary">
-        {{ siteName }}
-      </v-chip></span> 
+      <span>{{ $t('siteNavigation.drawer.title') }}</span>
     </template>
     <template slot="content">
       <div :class="$refs.siteNavigationDrawer?.expand ? 'singlePageApplication' : ' ' ">
@@ -37,18 +33,18 @@
           color="white"
           flat
           dense>
-          <v-btn
-            v-if="isMetaSite"
-            @click="createNode"
-            class="btn btn-primary ms-2">
-            {{ $t('siteNavigation.label.btn.createNode') }}
-          </v-btn>
-          <v-chip
-            v-else
-            class="ms-4 mt-3 mb-4 primary">
-            {{ siteName }}
-          </v-chip>
-          <v-spacer />
+            <span
+              class="font-weight-bold">
+              {{ siteName }}
+            </span>
+            <v-spacer v-if="!$refs.siteNavigationDrawer?.expand" />
+            <v-btn
+              v-if="isMetaSite"
+              @click="createNode"
+              class="btn btn-primary ms-2">
+              {{ $t('siteNavigation.label.btn.createNode') }}
+            </v-btn>
+          <v-spacer v-if="$refs.siteNavigationDrawer?.expand" />
           <select
             id="siteNavigationDrawerFilterSelect"
             v-model="filter"
@@ -107,6 +103,9 @@ export default {
     },
     isMetaSite() {
       return this.site?.metaSite;
+    },
+    activeNode() {
+      return this.navigationNodesToDisplay.find(node => node.uri === eXo.env.portal.selectedNodeUri || this.site.rootNode);
     }
   },
   watch: {
@@ -151,7 +150,7 @@ export default {
         .finally(() => this.loading = false);
     },
     createNode() {
-      this.$root.$emit('open-site-navigation-add-node-drawer', this.site.rootNode);
+      this.$root.$emit('open-site-navigation-add-node-drawer', this.activeNode);
     },
     filterNavigationNodes(){
       this.navigationNodesToDisplay = [];
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
index 5e1083245..0828420cc 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue
@@ -497,4 +497,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>