Components: Very-generic-input-widget: Fix selector not persistent

Signed-off-by: Arturo Manzoli <[email protected]>
bluerobotics · Oct 21, 2024 · 798d9c5 · 798d9c5
1 parent 5cca995
commit 798d9c5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 37 deletions.
diff --git a/src/components/custom-widget-elements/Dropdown.vue b/src/components/custom-widget-elements/Dropdown.vue
@@ -37,7 +37,7 @@ import {
   unlistenCockpitActionVariable,
 } from '@/libs/actions/data-lake'
 import { useWidgetManagerStore } from '@/stores/widgetManager'
-import { CustomWidgetElementOptions, CustomWidgetElementType } from '@/types/widgets'
+import { CustomWidgetElementOptions, CustomWidgetElementType, SelectorOption } from '@/types/widgets'
 
 const widgetStore = useWidgetManagerStore()
 
@@ -49,8 +49,7 @@ const props = defineProps<{
 }>()
 
 const element = toRefs(props).element
-const lastSelectedOption = ref()
-const selectedOption = ref()
+const selectedOption = ref<SelectorOption | undefined>(props.element.options.lastSelected || undefined)
 
 const options = computed(() => {
   return (
@@ -60,27 +59,12 @@ const options = computed(() => {
   )
 })
 
-watch(
-  () => element.value.options,
-  (newValue) => {
-    if (newValue.layout?.selectorOptions) {
-      selectedOption.value = newValue.layout.selectorOptions.find((option) => option.value === selectedOption.value)
-    }
-  },
-  { deep: true, immediate: true }
-)
-
-watch(
-  () => widgetStore.editingMode,
-  (newValue) => {
-    if (newValue) {
-      lastSelectedOption.value = selectedOption.value
-      selectedOption.value = null
-      return
-    }
-    selectedOption.value = lastSelectedOption.value
-  }
-)
+watch(selectedOption, (newValue) => {
+  widgetStore.updateElementOptions(element.value.hash, {
+    ...element.value.options,
+    lastSelected: newValue,
+  })
+})
 
 const handleSelection = (value: string | number | boolean): void => {
   if (element.value.options.actionParameter?.id) {
@@ -93,6 +77,7 @@ onMounted(() => {
     widgetStore.updateElementOptions(element.value.hash, {
       cockpitAction: undefined,
       actionParameter: undefined,
+      lastSelected: { name: '', value: '' },
       layout: {
         selectorOptions: [{ name: '', value: '' }],
         align: 'start',
@@ -102,9 +87,12 @@ onMounted(() => {
   }
   if (element.value.options.actionParameter) {
     listenCockpitActionVariable(element.value.options.actionParameter.name, (value) => {
-      selectedOption.value = value
+      selectedOption.value = options.value.find((option) => option.value === value)
     })
   }
+  if (element.value.options.lastSelected?.name !== '') {
+    selectedOption.value = element.value.options.lastSelected
+  }
 })
 
 onUnmounted(() => {

diff --git a/src/types/widgets.ts b/src/types/widgets.ts
@@ -97,6 +97,17 @@ export enum CustomWidgetElementContainers {
   Right9 = '9-right',
 }
 
+export type SelectorOption = {
+  /**
+   * The name of the option
+   */
+  name: string
+  /**
+   * The value of the option
+   */
+  value: string
+}
+
 /**
  * Options for the Cockpit Actions parameters
  */
@@ -359,25 +370,18 @@ export type CustomWidgetElementOptions = {
        * Action parameter
        */
       actionParameter: CockpitActionParameter
+      /**
+       * Last selected value
+       */
+      lastSelected: SelectorOption
       /**
        * Layout options
        */
       layout: {
         /**
          * Alignment of the element
          */
-        selectorOptions: [
-          {
-            /**
-             * The name of the option
-             */
-            name: string
-            /**
-             * The value of the option
-             */
-            value: string
-          }
-        ]
+        selectorOptions: SelectorOption[]
         /**
          * Alignment of the element
          */