From 67dc725385c43f9b4803ce589affa0f83b1945f8 Mon Sep 17 00:00:00 2001
From: Axolotle <nchesnais@mailoo.org>
Date: Thu, 8 Oct 2020 14:07:44 +0200
Subject: [PATCH] set 'required' only for 'InputItem', set base value as null,
 removed test

---
 .../globals/formItems/FormItemHelper.vue         | 16 ++--------------
 app/src/helpers/yunohostArguments.js             |  6 ++++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/src/components/globals/formItems/FormItemHelper.vue b/app/src/components/globals/formItems/FormItemHelper.vue
index bd57446a..24a9840a 100644
--- a/app/src/components/globals/formItems/FormItemHelper.vue
+++ b/app/src/components/globals/formItems/FormItemHelper.vue
@@ -4,10 +4,7 @@
     :label="label" :label-for="'form-item-' + props.id"
   >
     <slot name="default">
-      <component
-        :is="component" v-bind="props"
-        v-model="props.value" @input="test"
-      />
+      <component :is="component" v-bind="props" v-model="props.value" />
     </slot>
 
     <template v-if="description || example || link" v-slot:description>
@@ -19,9 +16,7 @@
         </b-link>
       </div>
 
-      <template v-if="description">
-        {{ description }}
-      </template>
+      <span v-if="description" v-html="description" />
     </template>
 
     <b-form-invalid-feedback v-if="'isValid' in props" :id="props.id + '-feedback'" :state="props.value.isValid">
@@ -47,13 +42,6 @@ export default {
     return {
       content: this.value
     }
-  },
-
-  methods: {
-    test () {
-      console.log(this.props.value)
-      // this.props.isValid = false
-    }
   }
 }
 </script>
diff --git a/app/src/helpers/yunohostArguments.js b/app/src/helpers/yunohostArguments.js
index 8df318bf..dd0e7338 100644
--- a/app/src/helpers/yunohostArguments.js
+++ b/app/src/helpers/yunohostArguments.js
@@ -11,7 +11,7 @@ export function formatYunoHostArgument (_arg) {
   const arg = {
     component: undefined,
     label: formatI18nField(_arg.ask),
-    props: { id: _arg.name }
+    props: { id: _arg.name, value: null }
   }
 
   // Some apps has `string` as type but expect a select since it has `choices`
@@ -43,7 +43,9 @@ export function formatYunoHostArgument (_arg) {
   }
 
   // Required
-  arg.props.required = _arg.optional !== true
+  if (arg.component === 'InputItem') {
+    arg.props.required = _arg.optional !== true
+  }
   // Default value
   if (_arg.default) {
     arg.props.value = _arg.default