From b1157126982f9a58e16b78bfea70699fa0576907 Mon Sep 17 00:00:00 2001
From: Florinda <dalia.florinda@accenture.com>
Date: Wed, 23 Oct 2024 16:57:55 +0200
Subject: [PATCH] visualization fix pro/scen

---
 src/layout/AppLayout.vue         | 5 ++++-
 src/layout/AppProfileMenu.vue    | 2 +-
 src/layout/AppSidebar.vue        | 3 +++
 src/layout/AppTopbar.vue         | 7 ++++++-
 src/stores/UserPrefStore.js      | 3 +++
 src/views/pages/ScenarioList.vue | 2 ++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/layout/AppLayout.vue b/src/layout/AppLayout.vue
index 16b70ed..455f61b 100644
--- a/src/layout/AppLayout.vue
+++ b/src/layout/AppLayout.vue
@@ -1,16 +1,19 @@
 <script setup>
 import { useLayout } from '@/layout/composables/layout';
 import { computed, onMounted, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
 import { UserPrefStore } from '../stores/UserPrefStore.js';
 import AppFooter from './AppFooter.vue';
 import AppSidebar from './AppSidebar.vue';
 import AppTopbar from './AppTopbar.vue';
 
+
 const { layoutConfig, layoutState, isSidebarActive, resetMenu } = useLayout();
 
 const outsideClickListener = ref(null);
 const page = ref("progetti");
 const userPrefStore = UserPrefStore();
+const route = useRoute();
 
 onMounted(() => {
     userPrefStore.fetchUserData();
@@ -65,7 +68,7 @@ const isOutsideClicked = (event) => {
         <app-topbar :page="page"></app-topbar>
        <div class="layout-sidebar">
 
-            <app-sidebar></app-sidebar>
+            <app-sidebar v-if="route.path !== '/projects'"></app-sidebar>
         </div>
         <div class="layout-main-container">
             <div  class="layout-main">
diff --git a/src/layout/AppProfileMenu.vue b/src/layout/AppProfileMenu.vue
index eae6876..a69c798 100644
--- a/src/layout/AppProfileMenu.vue
+++ b/src/layout/AppProfileMenu.vue
@@ -5,7 +5,7 @@
             <span v-if="user">
                 {{ user.name + " " + user.surname }}
             </span> 
-            <button @click="redirectProject()" class="p-button p-button-danger p-button-outlined">Projects</button>
+            <button @click="redirectProject()" class="p-button p-button-outlined">Projects</button>
             <button @click="auth.logout()" class="p-button p-button-danger p-button-outlined">Logout</button>
         </div>
     </div>
diff --git a/src/layout/AppSidebar.vue b/src/layout/AppSidebar.vue
index c372e27..10b950c 100644
--- a/src/layout/AppSidebar.vue
+++ b/src/layout/AppSidebar.vue
@@ -1,11 +1,14 @@
 <script setup>
 import { onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import { UserPrefStore } from '../stores/UserPrefStore.js';
 import AppMenu from './AppMenu.vue';
 const userPrefStore = UserPrefStore();
+const route = useRoute();
 
 onMounted(() => {
     userPrefStore.fetchUserData();
+    console.log("route path", route);
 });
 </script>
 
diff --git a/src/layout/AppTopbar.vue b/src/layout/AppTopbar.vue
index d4bb6a9..2fd5814 100644
--- a/src/layout/AppTopbar.vue
+++ b/src/layout/AppTopbar.vue
@@ -8,10 +8,14 @@ import { LoadingStore } from '../stores/LoadingStore.js';
 import { ScenarioStore } from '../stores/ScenarioStore.js';
 import { UserPrefStore } from '../stores/UserPrefStore.js';
 
+import { useRoute } from 'vue-router';
 import AppConfigurator from './AppConfigurator.vue';
 import AppProfileMenu from './AppProfileMenu.vue';
 
+
 const auth     = useAuth();
+const route = useRoute();
+
 
 const  router = useRouter();
 const props = defineProps(['page']);
@@ -49,7 +53,7 @@ const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
             </router-link>
         </div>
 
-        <button class="layout-menu-button layout-topbar-action" @click="onMenuToggle">
+        <button v-if="route.path !== '/projects'" class="layout-menu-button layout-topbar-action" @click="onMenuToggle">
             <i class="pi pi-bars"></i>
         </button>
 
@@ -87,6 +91,7 @@ const { onMenuToggle, toggleDarkMode, isDarkTheme } = useLayout();
                         placeholder="Select an Option"
                         class="dropdown-list"
                         @change="scenario_store.fetchApplicationScenarios()"
+                        :disabled="route.path === '/projects'"
                     />
             <button
                 class="layout-topbar-menu-button layout-topbar-action"
diff --git a/src/stores/UserPrefStore.js b/src/stores/UserPrefStore.js
index 2bd90f6..152425e 100644
--- a/src/stores/UserPrefStore.js
+++ b/src/stores/UserPrefStore.js
@@ -28,9 +28,12 @@ export const UserPrefStore = defineStore('userpref_store', () => {
     async function updateSelectedProject(project) {
       try {
           loadingStore.user_loading = true;
+          selectedApp.value = null;
           
           // Aspetta che l'aggiornamento del progetto finisca
           await ProjectService.updateSelectedProject(project);
+
+
           
       } catch (error) {
           console.error("Errore durante l'aggiornamento del progetto:", error);
diff --git a/src/views/pages/ScenarioList.vue b/src/views/pages/ScenarioList.vue
index d9bf71c..44ef34f 100644
--- a/src/views/pages/ScenarioList.vue
+++ b/src/views/pages/ScenarioList.vue
@@ -98,8 +98,10 @@ const scenarioTypeOp = ref([
     onMounted(() => {
             userPrefStore.fetchUserData().then(() => {
 
+
                 scenario_store.fetchScenarios();
                 scenario_store.fetchScenariosCross();
+
             });
         });