diff --git a/src/layout/AppLayout.vue b/src/layout/AppLayout.vue
index 455f61b..ce821be 100644
--- a/src/layout/AppLayout.vue
+++ b/src/layout/AppLayout.vue
@@ -8,7 +8,7 @@ import AppSidebar from './AppSidebar.vue';
import AppTopbar from './AppTopbar.vue';
-const { layoutConfig, layoutState, isSidebarActive, resetMenu } = useLayout();
+const { hideMenu, layoutConfig, layoutState, isSidebarActive, resetMenu } = useLayout();
const outsideClickListener = ref(null);
const page = ref("progetti");
@@ -16,6 +16,7 @@ const userPrefStore = UserPrefStore();
const route = useRoute();
onMounted(() => {
+
userPrefStore.fetchUserData();
});
@@ -28,6 +29,12 @@ watch(isSidebarActive, (newVal) => {
}
});
+watch(route, (newRoute) => {
+ if (newRoute.path === '/projects') {
+ hideMenu();
+ }
+});
+
const containerClass = computed(() => {
return {
'layout-theme-light': !layoutConfig.darkTheme,
diff --git a/src/layout/AppMenu.vue b/src/layout/AppMenu.vue
index 23fe5b6..4669582 100644
--- a/src/layout/AppMenu.vue
+++ b/src/layout/AppMenu.vue
@@ -8,17 +8,17 @@ const userPrefStore = UserPrefStore();
const model = ref([
- {
- label: '',
- items: []
- //items: [{ label: 'ATF-Notifier', icon: 'pi pi-fw pi-id-card', to: '/app-browser' }]
- } ,
+
{
label: 'Scenarios',
items: [
{ label: 'Available Scenarios', icon: 'pi pi-fw pi-id-card', to: '/' },
- { label: 'Executions List', icon: 'pi pi-fw pi-id-card', to: '/executions' }]
- }, {
+ { label: 'Executions List', icon: 'pi pi-fw pi-id-card', to: '/executions' },
+ ] },
+ {
+ label: '',
+ items: [] } ,
+ {
label: 'Canvas',
items: [{ label: 'New Canvas', icon: 'pi pi-fw pi-id-card', to: '/mdcanvas' }]
}
@@ -32,24 +32,24 @@ function updateApplicationsMenu() {
if (selectedApp!=null) {
// Se selectedApp non è nullo, aggiorna gli item
- model.value[0].label = selectedApp.fe_name;
+ model.value[1].label = selectedApp.fe_name;
// Aggiorna gli item dell'app selezionata
- model.value[0].items = [
+ model.value[1].items = [
{ label: 'Rev Eng Code', icon: 'pi pi-fw pi-id-card', to: '/app-browser' }
];
if( selectedApp.available_scenarios.length > 0) {
selectedApp.available_scenarios.forEach(app => {
- model.value[0].items.push({ label: app.label, icon: 'pi pi-fw pi-id-card', to: `/scenario/exec/${app.scenario_id}` });
+ model.value[1].items.push({ label: app.label, icon: 'pi pi-fw pi-id-card', to: `/scenario/exec/${app.scenario_id}` });
});
}
} else {
// Se selectedApp è nullo, svuota gli item
- model.value[0].label = '';
- model.value[0].items = [];
+ model.value[1].label = '';
+ model.value[1].items = [];
}
}
@@ -63,6 +63,7 @@ watch(() => userPrefStore.getSelApp, updateApplicationsMenu, { immediate: true }
diff --git a/src/layout/AppTopbar.vue b/src/layout/AppTopbar.vue
index db31234..5bd36ce 100644
--- a/src/layout/AppTopbar.vue
+++ b/src/layout/AppTopbar.vue
@@ -97,13 +97,20 @@ watch(() => userPrefStore.getSelApp, appUpdated, { immediate: true });