Input-widgets: Label: Flag component as 'no variable element'

Signed-off-by: Arturo Manzoli <arturomanzoli@gmail.com>
bluerobotics · Jan 15, 2025 · 9db9628 · 9db9628
1 parent 72b3d8e
commit 9db9628
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 34 deletions.
diff --git a/src/components/InputElementConfig.vue b/src/components/InputElementConfig.vue
@@ -231,7 +231,7 @@
         </template>
       </ExpansiblePanel>
       <ExpansiblePanel
-        v-if="currentElement"
+        v-if="currentElement && currentElement.options.variableType"
         :key="currentElement.hash"
         no-bottom-divider
         no-top-divider

diff --git a/src/components/custom-widget-elements/Label.vue b/src/components/custom-widget-elements/Label.vue
@@ -19,15 +19,14 @@
         margin: '1px',
       }"
     >
-      {{ miniWidget.options.text || 'Label' }}
+      {{ miniWidget.options.layout?.text || 'Label' }}
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, toRefs, watch } from 'vue'
+import { onMounted, toRefs, watch } from 'vue'
 
-import { deleteDataLakeVariable, listenDataLakeVariable, unlistenDataLakeVariable } from '@/libs/actions/data-lake'
 import { useWidgetManagerStore } from '@/stores/widgetManager'
 import { CustomWidgetElementOptions, CustomWidgetElementType } from '@/types/widgets'
 
@@ -41,7 +40,6 @@ const props = defineProps<{
 }>()
 
 const miniWidget = toRefs(props).miniWidget
-let listenerId: string | undefined
 
 watch(
   () => widgetStore.miniWidgetManagerVars(miniWidget.value.hash).configMenuOpen,
@@ -60,33 +58,17 @@ onMounted(() => {
   if (!props.miniWidget.options || Object.keys(props.miniWidget.options).length === 0) {
     miniWidget.value.isCustomElement = true
     widgetStore.updateElementOptions(props.miniWidget.hash, {
-      text: 'Label',
       layout: {
+        text: 'Label',
         textSize: 20,
         weight: 'normal',
         decoration: 'none',
         color: '#FFFFFF',
         align: 'center',
       },
-      variableType: 'string',
-      dataLakeVariable: undefined,
+      variableType: null,
     })
   }
-  if (props.miniWidget.options.dataLakeVariable) {
-    listenerId = listenDataLakeVariable(props.miniWidget.options.dataLakeVariable?.name, (value) => {
-      miniWidget.value.options.text = value as string
-    })
-    miniWidget.value.options.text = widgetStore.getMiniWidgetLastValue(miniWidget.value.hash) as string
-  }
-})
-
-onUnmounted(() => {
-  if (miniWidget.value.options.dataLakeVariable) {
-    deleteDataLakeVariable(miniWidget.value.options.dataLakeVariable.id)
-    if (listenerId) {
-      unlistenDataLakeVariable(miniWidget.value.options.dataLakeVariable.name, listenerId)
-    }
-  }
 })
 </script>
 

diff --git a/src/types/widgets.ts b/src/types/widgets.ts
@@ -186,19 +186,19 @@ export type CustomWidgetElementOptions = {
       /**
        * Variable type
        */
-      variableType: 'string' | 'boolean' | 'number'
+      variableType: DataLakeVariable | null
       /**
        * Action parameter
        */
       dataLakeVariable: DataLakeVariable
-      /**
-       * The label text
-       */
-      text: string
       /**
        * Layout options
        */
       layout: {
+        /**
+         * The label text
+         */
+        text: string
         /**
          * The size of the label's font (in pixels)
          */
@@ -245,7 +245,7 @@ export type CustomWidgetElementOptions = {
       /**
        * Variable type
        */
-      variableType: 'string' | 'boolean' | 'number'
+      variableType: DataLakeVariable['type'] | null
       /**
        * Action parameter
        */
@@ -304,7 +304,7 @@ export type CustomWidgetElementOptions = {
       /**
        * Variable type
        */
-      variableType: 'string' | 'boolean' | 'number'
+      variableType: DataLakeVariable['type'] | null
       /**
        * Action parameter
        */
@@ -351,7 +351,7 @@ export type CustomWidgetElementOptions = {
       /**
        * Variable type
        */
-      variableType: 'string' | 'boolean' | 'number'
+      variableType: DataLakeVariable['type'] | null
       /**
        * Action parameter
        */
@@ -414,7 +414,7 @@ export type CustomWidgetElementOptions = {
       /**
        * Variable type
        */
-      variableType: 'string' | 'boolean' | 'number'
+      variableType: DataLakeVariable['type'] | null
       /**
        * Action parameter
        */
@@ -465,7 +465,7 @@ export type CustomWidgetElementOptions = {
       /**
        * Variable type
        */
-      variableType: 'string' | 'boolean' | 'number'
+      variableType: DataLakeVariable['type'] | null
       /**
        * Action parameter
        */
@@ -536,7 +536,7 @@ export type CustomWidgetElementOptions = {
       /**
        * Variable type
        */
-      variableType: 'string' | 'boolean' | 'number'
+      variableType: DataLakeVariable['type'] | null
       /**
        * Action parameter
        */