From 61ca4be3acf5adbb7c0399b3c9c267cfa0ed9e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Wed, 4 Dec 2024 13:59:12 +0100
Subject: [PATCH] Fix inputValue not being respected in Input Prompt

---
 .../src/components/Configurator/Function.vue  |  2 +-
 lib/vue/src/components/prompts/definitions.ts | 42 ++++++++++++-------
 .../components/prompts/kinds/CPromptInput.vue | 22 ++++++----
 lib/vue/src/components/prompts/kinds/base.vue |  5 ++-
 4 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/client/web/workflow/src/components/Configurator/Function.vue b/client/web/workflow/src/components/Configurator/Function.vue
index 982c727d54..5da69221ea 100644
--- a/client/web/workflow/src/components/Configurator/Function.vue
+++ b/client/web/workflow/src/components/Configurator/Function.vue
@@ -132,7 +132,7 @@
                     @input="$root.$emit('change-detected')"
                     @search="searchWorkflows"
                   />
-                  <!-- Clearable -->
+
                   <c-input-select
                     v-else-if="a.input.type === 'select'"
                     v-model="a.value"
diff --git a/lib/vue/src/components/prompts/definitions.ts b/lib/vue/src/components/prompts/definitions.ts
index b27b4fda86..f1cfdc5d6d 100644
--- a/lib/vue/src/components/prompts/definitions.ts
+++ b/lib/vue/src/components/prompts/definitions.ts
@@ -57,7 +57,7 @@ export const prompts = Object.freeze([
   },
   {
     ref: 'refetchRecords',
-    meta: { short: 'Refreshes all record values on the page' },
+    meta: { short: 'Refresh all record values on the page' },
   },
   {
     ref: 'notification',
@@ -123,7 +123,7 @@ export const prompts = Object.freeze([
     parameters: [
       { name: 'owner', types: ['User', 'ID'], required: false },
       { name: 'title', types: ['String'] },
-      { name: 'variant', types: ['String'], meta: { visual: { input: { type: 'select', properties: { options: variants } } } } },
+      { name: 'variant', types: ['String'], meta: { visual: { input: { type: 'select', properties: { options: variants }, default: 'primary' } } } },
       { name: 'message', types: ['String'], required: true },
       { name: 'label', types: ['String'] },
       {
@@ -131,15 +131,21 @@ export const prompts = Object.freeze([
         types: ['String'],
         meta: {
           visual: {
-            options: [
-              { value: 'text', text: 'Text' },
-              { value: 'number', text: 'Number' },
-              { value: 'email', text: 'Email' },
-              { value: 'password', text: 'Password' },
-              { value: 'search', text: 'Search' },
-              { value: 'date', text: 'Date' },
-              { value: 'time', text: 'Time' },
-            ],
+            input: {
+              type: 'select',
+              properties: {
+                options: [
+                  { value: 'text', text: 'Text' },
+                  { value: 'number', text: 'Number' },
+                  { value: 'email', text: 'Email' },
+                  { value: 'password', text: 'Password' },
+                  { value: 'search', text: 'Search' },
+                  { value: 'date', text: 'Date' },
+                  { value: 'time', text: 'Time' },
+                ],
+              },
+              default: 'text',
+            },
           },
         },
       },
@@ -163,10 +169,16 @@ export const prompts = Object.freeze([
         types: ['String'],
         meta: {
           visual: {
-            options: [
-              { value: 'select', text: 'Select' },
-              { value: 'radio', text: 'Radio' },
-            ],
+            input: {
+              type: 'select',
+              properties: {
+                options: [
+                  { value: 'select', text: 'Select' },
+                  { value: 'radio', text: 'Radio' },
+                ],
+              },
+              default: 'select',
+            },
           },
         },
       },
diff --git a/lib/vue/src/components/prompts/kinds/CPromptInput.vue b/lib/vue/src/components/prompts/kinds/CPromptInput.vue
index da69039722..1e11c6ed29 100644
--- a/lib/vue/src/components/prompts/kinds/CPromptInput.vue
+++ b/lib/vue/src/components/prompts/kinds/CPromptInput.vue
@@ -1,15 +1,18 @@
 <template>
   <div>
-    <p v-if="!!message" v-html="message" />
+    <p
+      v-if="!!message"
+      v-html="message"
+    />
 
     <b-form-group
       :label="label"
       label-class="text-primary"
     >
       <b-input
+        v-model="value"
         :type="type"
         :disabled="loading"
-        v-model="value"
       />
     </b-form-group>
     <b-button
@@ -35,19 +38,16 @@ const validTypes = [
 ]
 
 export default {
+  name: 'CPromptInput',
+
   extends: base,
-  name: 'c-prompt-input',
 
   data () {
     return {
-      value: undefined
+      value: undefined,
     }
   },
 
-  beforeMount() {
-    this.value = this.pVal('value')
-  },
-
   computed: {
     type () {
       const t = this.pVal('type', 'text')
@@ -60,7 +60,11 @@ export default {
 
     label () {
       return this.pVal('label', '')
-    }
+    },
+  },
+
+  beforeMount () {
+    this.value = this.pVal('inputValue')
   },
 
 }
diff --git a/lib/vue/src/components/prompts/kinds/base.vue b/lib/vue/src/components/prompts/kinds/base.vue
index bff189612d..18bc4b3c0d 100644
--- a/lib/vue/src/components/prompts/kinds/base.vue
+++ b/lib/vue/src/components/prompts/kinds/base.vue
@@ -10,6 +10,7 @@ export default {
 
     payload: {
       type: Object,
+      default: () => ({}),
     },
   },
 
@@ -33,8 +34,8 @@ export default {
         return this.payload[k]
       }
 
-      return { '@type': defType, '@value': defValue}
-    }
+      return { '@type': defType, '@value': defValue }
+    },
   },
 }
 </script>