From bcf3b621e88cfa6d91ae0ebc67ae6977bcafcb7a Mon Sep 17 00:00:00 2001
From: Cees Voesenek <cees.voesenek@vortech.nl>
Date: Wed, 17 Apr 2024 14:27:59 +0200
Subject: [PATCH] Move hierarchical menu type selection to user settings

---
 src/assets/DefaultUserSettings.json         | 21 +++++++++++++++
 src/components/general/HierarchicalMenu.vue | 18 ++++++++++---
 src/views/SchematicStatusDisplayView.vue    | 28 +++++++------------
 src/views/SpatialDisplayView.vue            | 30 +++++++--------------
 src/views/TopologyDisplayView.vue           | 28 ++++++-------------
 5 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/src/assets/DefaultUserSettings.json b/src/assets/DefaultUserSettings.json
index 4b3b9bc79..c58d6d0ab 100644
--- a/src/assets/DefaultUserSettings.json
+++ b/src/assets/DefaultUserSettings.json
@@ -64,5 +64,26 @@
       }
     ],
     "group": "UI"
+  },
+  {
+    "id": "ui.hierarchical-menu-style",
+    "type": "oneOfMultiple",
+    "label": "Menu style",
+    "value": "auto",
+    "items": [
+      {
+        "value": "auto",
+        "icon": "mdi-responsive"
+      },
+      {
+        "value": "tree",
+        "icon": "mdi-file-tree"
+      },
+      {
+        "value": "column",
+        "icon": "mdi-view-week"
+      }
+    ],
+    "group": "UI"
   }
 ]
diff --git a/src/components/general/HierarchicalMenu.vue b/src/components/general/HierarchicalMenu.vue
index 10926b950..f94581c4b 100644
--- a/src/components/general/HierarchicalMenu.vue
+++ b/src/components/general/HierarchicalMenu.vue
@@ -1,12 +1,12 @@
 <template>
   <TreeMenu
-    v-if="type === 'tree'"
+    v-if="finalType === 'tree'"
     v-model:active="active"
     :items="items"
     :open="open"
   />
   <ColumnMenu
-    v-else-if="type === 'column'"
+    v-else-if="finalType === 'column'"
     v-model:active="active"
     v-model:open="open"
     :items="items"
@@ -14,6 +14,9 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
+import { useDisplay } from 'vuetify'
+
 import ColumnMenu from '@/components/general/ColumnMenu.vue'
 import TreeMenu from '@/components/general/TreeMenu.vue'
 import { ColumnItem } from './ColumnItem'
@@ -22,8 +25,17 @@ interface Props {
   type: string
   items: ColumnItem[]
 }
-defineProps<Props>()
+const props = defineProps<Props>()
 
 const open = defineModel<string[]>('open')
 const active = defineModel<string>('active')
+
+const { mobile } = useDisplay()
+
+const finalType = computed(() => {
+  if (props.type === 'auto') {
+    return mobile.value ? 'column' : 'tree'
+  }
+  return props.type
+})
 </script>
diff --git a/src/views/SchematicStatusDisplayView.vue b/src/views/SchematicStatusDisplayView.vue
index dd65a46b1..43c33a238 100644
--- a/src/views/SchematicStatusDisplayView.vue
+++ b/src/views/SchematicStatusDisplayView.vue
@@ -1,25 +1,9 @@
 <template>
   <Teleport to="#web-oc-sidebar-target">
-    <v-toolbar v-if="!mobile" density="compact">
-      <v-btn-toggle
-        v-model="menuType"
-        variant="tonal"
-        divided
-        density="compact"
-        class="ma-2"
-      >
-        <v-btn variant="text" value="tree">
-          <v-icon>mdi-file-tree</v-icon>
-        </v-btn>
-        <v-btn variant="text" value="column">
-          <v-icon>mdi-view-week</v-icon>
-        </v-btn>
-      </v-btn-toggle>
-    </v-toolbar>
     <HierarchicalMenu
       v-model:active="active"
       v-model:open="open"
-      :type="mobile ? 'column' : menuType"
+      :type="menuType"
       :items="items"
     />
   </Teleport>
@@ -53,7 +37,8 @@ import debounce from 'lodash-es/debounce'
 import { ref, onMounted, computed, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
-import { useAlertsStore } from '../stores/alerts.ts'
+import { useAlertsStore } from '@/stores/alerts.ts'
+import { useUserSettingsStore } from '@/stores/userSettings.ts'
 
 import { configManager } from '../services/application-config/index.ts'
 import type { ColumnItem } from '../components/general/ColumnItem'
@@ -82,6 +67,7 @@ const sliderDebounceInterval = 500
 
 const baseUrl = configManager.get('VITE_FEWS_WEBSERVICES_URL')
 const alertsStore = useAlertsStore()
+const settings = useUserSettingsStore()
 const route = useRoute()
 const router = useRouter()
 
@@ -101,13 +87,17 @@ const selectedDate = ref<Date>(new Date())
 const selectedDateSlider = ref<Date>(selectedDate.value)
 
 const { mobile } = useDisplay()
-const menuType = ref('tree')
 
 onMounted(() => {
   onGroupIdChange()
   onPanelIdChange()
 })
 
+const menuType = computed(() => {
+  const configured = settings.get('ui.hierarchical-menu-style')?.value as string
+  return configured ?? 'auto'
+})
+
 const selectedDateString = computed(() => {
   if (selectedDate.value === undefined) return ''
   const dateString = selectedDate.value.toISOString()
diff --git a/src/views/SpatialDisplayView.vue b/src/views/SpatialDisplayView.vue
index 83ef71084..c25547677 100644
--- a/src/views/SpatialDisplayView.vue
+++ b/src/views/SpatialDisplayView.vue
@@ -1,25 +1,9 @@
 <template>
   <Teleport to="#web-oc-sidebar-target">
-    <v-toolbar v-if="!mobile" density="compact">
-      <v-btn-toggle
-        v-model="menuType"
-        variant="tonal"
-        divided
-        density="compact"
-        class="ma-2"
-      >
-        <v-btn variant="text" value="tree">
-          <v-icon>mdi-file-tree</v-icon>
-        </v-btn>
-        <v-btn variant="text" value="column">
-          <v-icon>mdi-view-week</v-icon>
-        </v-btn>
-      </v-btn-toggle>
-    </v-toolbar>
     <HierarchicalMenu
       v-model:active="active"
       v-model:open="open"
-      :type="mobile ? 'column' : menuType"
+      :type="menuType"
       :items="items"
     />
   </Teleport>
@@ -32,13 +16,13 @@
 
 <script setup lang="ts">
 import HierarchicalMenu from '@/components/general/HierarchicalMenu.vue'
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { ColumnItem } from '../components/general/ColumnItem'
 import { useWmsCapilities } from '@/services/useWms'
 import { configManager } from '@/services/application-config'
 import { Layer, LayerGroup } from '@deltares/fews-wms-requests'
 import SpatialDisplay from '@/components/spatialdisplay/SpatialDisplay.vue'
-import { useDisplay } from 'vuetify'
+import { useUserSettingsStore } from '@/stores/userSettings'
 
 interface Props {
   layerName?: string
@@ -53,12 +37,16 @@ const props = withDefaults(defineProps<Props>(), {
 const baseUrl = configManager.get('VITE_FEWS_WEBSERVICES_URL')
 const capabilities = useWmsCapilities(baseUrl)
 
+const settings = useUserSettingsStore()
+
 const active = ref<string>('root')
 const open = ref<string[]>([])
 const items = ref<ColumnItem[]>([])
-const menuType = ref('tree')
 
-const { mobile } = useDisplay()
+const menuType = computed(() => {
+  const configured = settings.get('ui.hierarchical-menu-style')?.value as string
+  return configured ?? 'auto'
+})
 
 watch(capabilities, () => {
   if (capabilities.value === undefined) return []
diff --git a/src/views/TopologyDisplayView.vue b/src/views/TopologyDisplayView.vue
index 6c1964d75..ade70c45d 100644
--- a/src/views/TopologyDisplayView.vue
+++ b/src/views/TopologyDisplayView.vue
@@ -1,25 +1,9 @@
 <template>
   <Teleport to="#web-oc-sidebar-target">
-    <v-toolbar v-if="!mobile" density="compact">
-      <v-btn-toggle
-        v-model="menuType"
-        variant="tonal"
-        divided
-        density="compact"
-        class="ma-2"
-      >
-        <v-btn variant="text" value="tree">
-          <v-icon>mdi-file-tree</v-icon>
-        </v-btn>
-        <v-btn variant="text" value="column">
-          <v-icon>mdi-view-week</v-icon>
-        </v-btn>
-      </v-btn-toggle>
-    </v-toolbar>
     <HierarchicalMenu
       v-model:active="active"
       v-model:open="open"
-      :type="mobile ? 'column' : menuType"
+      :type="menuType"
       :items="items"
     />
   </Teleport>
@@ -118,6 +102,7 @@ import HierarchicalMenu from '@/components/general/HierarchicalMenu.vue'
 import type { ColumnItem } from '@/components/general/ColumnItem'
 import { createTopologyMap, getTopologyNodes } from '@/lib/topology'
 import { useConfigStore } from '@/stores/config'
+import { useUserSettingsStore } from '@/stores/userSettings'
 
 import type {
   SecondaryWorkflowGroupItem,
@@ -133,7 +118,6 @@ import {
   useRoute,
   useRouter,
 } from 'vue-router'
-import { useDisplay } from 'vuetify'
 
 interface Props {
   nodeId?: string | string[]
@@ -156,7 +140,12 @@ interface DisplayTab {
 const props = defineProps<Props>()
 
 const configStore = useConfigStore()
-const { mobile } = useDisplay()
+const settings = useUserSettingsStore()
+
+const menuType = computed(() => {
+  const configured = settings.get('ui.hierarchical-menu-style')?.value as string
+  return configured ?? 'auto'
+})
 
 const active = ref<string | undefined>(undefined)
 const activeNode = computed(() => {
@@ -177,7 +166,6 @@ const secondaryWorkflows = computed<SecondaryWorkflowGroupItem[] | undefined>(
 )
 const open = ref<string[]>([])
 const items = ref<ColumnItem[]>([])
-const menuType = ref('tree')
 
 const filterIds = ref<string[]>([])
 const topologyNode = ref<TopologyNode | undefined>(undefined)