Add changes to select configurator and editor

cortezaproject · Jul 7, 2023 · 35933db · 35933db
1 parent 11c01c2
commit 35933db
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 22 deletions.
diff --git a/client/web/compose/src/components/ModuleFields/Configurator/Record.vue b/client/web/compose/src/components/ModuleFields/Configurator/Record.vue
@@ -79,12 +79,14 @@
         stacked
         @change="onUpdateIsUniqueMultiValue"
       />
+    </b-form-group>
+
+    <b-form-group>
       <b-form-checkbox
         v-if="f.options.selectType !== 'multiple'"
         v-model="f.options.isUniqueMultiValue"
         :value="false"
         :unchecked-value="true"
-        class="mt-2"
       >
         {{ $t('kind.select.allow-duplicates') }}
       </b-form-checkbox>

diff --git a/client/web/compose/src/components/ModuleFields/Configurator/Select.vue b/client/web/compose/src/components/ModuleFields/Configurator/Select.vue
@@ -114,9 +114,11 @@
           v-model="f.options.selectType"
           :options="selectOptions"
           stacked
-          @change="onUpdateIsUniqueMultiValue"
+          @change="updateIsUniqueMultiValue"
         />
+      </b-form-group>
 
+      <b-form-group>
         <b-form-checkbox
           v-if="shouldAllowDuplicates"
           v-model="f.options.isUniqueMultiValue"
@@ -151,11 +153,12 @@ export default {
   data () {
     return {
       newOption: { value: undefined, text: undefined, new: true },
-      selectOptionss: [
-        { text: this.$t('kind.select.optionType.default'), value: 'default' },
+
+      options: [
+        { text: this.$t('kind.select.optionType.default'), value: 'default', allowMulti: true, allowDuplicates: true },
         { text: this.$t('kind.select.optionType.multiple'), value: 'multiple' },
-        { text: this.$t('kind.select.optionType.each'), value: 'each' },
-        { text: this.$t('kind.select.optionType.list'), value: 'list' },
+        { text: this.$t('kind.select.optionType.each'), value: 'each', allowDuplicates: true },
+        { value: 'list', allowMulti: true },
       ],
     }
   },
@@ -186,20 +189,26 @@ export default {
     },
 
     selectOptions () {
-      const options = [
-        { text: this.$t('kind.select.optionType.default'), value: 'default' },
-        { text: this.$t('kind.select.optionType.multiple'), value: 'multiple' },
-        { text: this.$t('kind.select.optionType.each'), value: 'each' },
-        { text: this.$t('kind.select.optionType.list'), value: 'list' },
-      ]
-      if (!this.f.isMulti) {
-        return options.filter(o => o.value === 'list' || o.value === 'default')
+      const selectOptions = this.options.map((o) => {
+        if (o.value === 'list') {
+          o.text = this.$t(`kind.select.optionType.${this.f.isMulti ? 'checkbox' : 'radio'}`)
+        }
+
+        return o
+      })
+
+      if (this.f.isMulti) {
+        return selectOptions
       }
-      return options
+
+      return selectOptions.filter(({ allowMulti }) => allowMulti)
     },
 
     shouldAllowDuplicates () {
-      return this.f.options.selectType !== 'multiple' && this.f.isMulti && this.f.options.selectType !== 'list'
+      if (!this.f.isMulti) return false
+
+      const { allowDuplicates } = this.options.find(({ value }) => value === this.f.options.selectType) || {}
+      return !!allowDuplicates
     },
   },
 
@@ -220,10 +229,10 @@ export default {
       })
     },
 
-    onUpdateIsUniqueMultiValue () {
-      if (this.f.options.selectType === 'multiple') {
-        this.f.options.isUniqueMultiValue = true
-      }
+    updateIsUniqueMultiValue (value) {
+      const { allowDuplicates = false } = this.options.find(({ value: v }) => v === value) || {}
+      if (this.f.options.selectType !== 'multiple') return
+      this.f.options.isUniqueMultiValue = !allowDuplicates
     },
   },
 }

diff --git a/client/web/compose/src/components/ModuleFields/Configurator/User.vue b/client/web/compose/src/components/ModuleFields/Configurator/User.vue
@@ -37,12 +37,14 @@
         stacked
         @change="onUpdateIsUniqueMultiValue"
       />
+    </b-form-group>
+
+    <b-form-group>
       <b-form-checkbox
         v-if="f.options.selectType !== 'multiple'"
         v-model="f.options.isUniqueMultiValue"
         :value="false"
         :unchecked-value="true"
-        class="mt-2"
       >
         {{ $t('kind.select.allow-duplicates') }}
       </b-form-checkbox>

diff --git a/locale/en/corteza-webapp-compose/field.yaml b/locale/en/corteza-webapp-compose/field.yaml
@@ -119,7 +119,8 @@ kind:
       each: Input for each value
       label: Select type
       multiple: Multiple select
-      list: List View
+      checkbox: Checkbox Group
+      radio: Radio Group
     optionValuePlaceholder: Value
     optionsLabel: Options to select from
     placeholder: Select an option by clicking here