From 32dad020ddc2c3f903b51a12b175f38ab0a6cb58 Mon Sep 17 00:00:00 2001
From: Arturo Manzoli <arturomanzoli@gmail.com>
Date: Wed, 19 Feb 2025 11:00:36 -0300
Subject: [PATCH] Input-widgets: Change order of data-lake listener function
 call

Signed-off-by: Arturo Manzoli <arturomanzoli@gmail.com>
---
 .../custom-widget-elements/Checkbox.vue       | 18 ++++++++---------
 .../custom-widget-elements/Dial.vue           | 20 +++++++++----------
 .../custom-widget-elements/Dropdown.vue       | 18 ++++++++---------
 .../custom-widget-elements/Slider.vue         | 18 ++++++++---------
 .../custom-widget-elements/Switch.vue         | 18 ++++++++---------
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/components/custom-widget-elements/Checkbox.vue b/src/components/custom-widget-elements/Checkbox.vue
index b3a6cfc81..e4fee222b 100644
--- a/src/components/custom-widget-elements/Checkbox.vue
+++ b/src/components/custom-widget-elements/Checkbox.vue
@@ -70,6 +70,15 @@ watch(
   { immediate: true, deep: true }
 )
 
+const startListeningDataLakeVariable = (): void => {
+  if (miniWidget.value.options.dataLakeVariable) {
+    listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable.name, (value) => {
+      isChecked.value = value as boolean
+    })
+    isChecked.value = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as boolean
+  }
+}
+
 watch(
   () => miniWidget.value.options.dataLakeVariable?.name,
   (newVal) => {
@@ -80,15 +89,6 @@ watch(
   { immediate: true }
 )
 
-const startListeningDataLakeVariable = (): void => {
-  if (miniWidget.value.options.dataLakeVariable) {
-    listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable.name, (value) => {
-      isChecked.value = value as boolean
-    })
-    isChecked.value = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as boolean
-  }
-}
-
 onMounted(() => {
   if (!miniWidget.value.options || Object.keys(miniWidget.value.options).length === 0) {
     miniWidget.value.isCustomElement = true
diff --git a/src/components/custom-widget-elements/Dial.vue b/src/components/custom-widget-elements/Dial.vue
index 9dda1fa35..483fa1566 100644
--- a/src/components/custom-widget-elements/Dial.vue
+++ b/src/components/custom-widget-elements/Dial.vue
@@ -89,16 +89,6 @@ const setDialValue = (value: number | string | undefined): void => {
   rotationAngle.value = ((numValue - miniWidget.value.options.layout?.minValue) / valueRange) * rotationRange - 150
 }
 
-watch(
-  () => miniWidget.value.options.dataLakeVariable?.name,
-  (newVal) => {
-    if (newVal) {
-      startListeningDataLakeVariable()
-    }
-  },
-  { immediate: true }
-)
-
 const startListeningDataLakeVariable = (): void => {
   if (miniWidget.value.options.dataLakeVariable) {
     listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable?.name, (value) => {
@@ -109,6 +99,16 @@ const startListeningDataLakeVariable = (): void => {
   }
 }
 
+watch(
+  () => miniWidget.value.options.dataLakeVariable?.name,
+  (newVal) => {
+    if (newVal) {
+      startListeningDataLakeVariable()
+    }
+  },
+  { immediate: true }
+)
+
 onMounted(() => {
   if (!miniWidget.value.options || Object.keys(miniWidget.value.options).length === 0) {
     miniWidget.value.isCustomElement = true
diff --git a/src/components/custom-widget-elements/Dropdown.vue b/src/components/custom-widget-elements/Dropdown.vue
index f40454199..1fa6f241c 100644
--- a/src/components/custom-widget-elements/Dropdown.vue
+++ b/src/components/custom-widget-elements/Dropdown.vue
@@ -99,6 +99,15 @@ const handleSelection = (value: string | number | boolean): void => {
   widgetStore.setMiniWidgetLastValue(miniWidget.value.hash, selected.value)
 }
 
+const startListeningDataLakeVariable = (): void => {
+  if (miniWidget.value.options.dataLakeVariable) {
+    listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable.name, (value) => {
+      selectedValue.value = value as string
+    })
+    selectedValue.value = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as string
+  }
+}
+
 watch(
   () => miniWidget.value.options.dataLakeVariable?.name,
   (newVal) => {
@@ -109,15 +118,6 @@ watch(
   { immediate: true }
 )
 
-const startListeningDataLakeVariable = (): void => {
-  if (miniWidget.value.options.dataLakeVariable) {
-    listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable.name, (value) => {
-      selectedValue.value = value as string
-    })
-    selectedValue.value = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as string
-  }
-}
-
 onMounted(() => {
   if (!miniWidget.value.options || Object.keys(miniWidget.value.options).length === 0) {
     miniWidget.value.isCustomElement = true
diff --git a/src/components/custom-widget-elements/Slider.vue b/src/components/custom-widget-elements/Slider.vue
index 6149dad92..c1dc2e439 100644
--- a/src/components/custom-widget-elements/Slider.vue
+++ b/src/components/custom-widget-elements/Slider.vue
@@ -74,6 +74,15 @@ watch(
   { immediate: true, deep: true }
 )
 
+const startListeningDataLakeVariable = (): void => {
+  if (miniWidget.value.options.dataLakeVariable) {
+    listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable?.name, (value) => {
+      sliderValue.value = value as number
+    })
+    sliderValue.value = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as number
+  }
+}
+
 watch(
   () => miniWidget.value.options.dataLakeVariable?.name,
   (newVal) => {
@@ -84,15 +93,6 @@ watch(
   { immediate: true }
 )
 
-const startListeningDataLakeVariable = (): void => {
-  if (miniWidget.value.options.dataLakeVariable) {
-    listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable?.name, (value) => {
-      sliderValue.value = value as number
-    })
-    sliderValue.value = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as number
-  }
-}
-
 const handleSliderChange = (): void => {
   if (widgetStore.editingMode) return
   if (miniWidget.value.options.dataLakeVariable) {
diff --git a/src/components/custom-widget-elements/Switch.vue b/src/components/custom-widget-elements/Switch.vue
index 4fc445d07..595739691 100644
--- a/src/components/custom-widget-elements/Switch.vue
+++ b/src/components/custom-widget-elements/Switch.vue
@@ -60,6 +60,15 @@ watch(
   { immediate: true, deep: true }
 )
 
+const startListeningDataLakeVariable = (): void => {
+  if (miniWidget.value.options.dataLakeVariable) {
+    listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable.name, (value) => {
+      switchValue.value = value as boolean
+    })
+    switchValue.value = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as boolean
+  }
+}
+
 watch(
   () => miniWidget.value.options.dataLakeVariable?.name,
   (newVal) => {
@@ -70,15 +79,6 @@ watch(
   { immediate: true }
 )
 
-const startListeningDataLakeVariable = (): void => {
-  if (miniWidget.value.options.dataLakeVariable) {
-    listenerId = listenDataLakeVariable(miniWidget.value.options.dataLakeVariable.name, (value) => {
-      switchValue.value = value as boolean
-    })
-    switchValue.value = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as boolean
-  }
-}
-
 const handleToggleAction = (): void => {
   if (widgetStore.editingMode) return
   if (miniWidget.value.options.dataLakeVariable) {