fix some default arg setting bugs

AlexVipond · May 17, 2021 · b7ccc9f · b7ccc9f
1 parent d089305
commit b7ccc9f
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 21 deletions.
diff --git a/src/interface/components/BaseRadioGroup.vue b/src/interface/components/BaseRadioGroup.vue
@@ -3,7 +3,7 @@
     class="flex flex-col gap-3"
     v-model="selectedOption"
   >
-    <RadioGroupLabel class="input-label text-blue-gray-300">{{ label }}</RadioGroupLabel>
+    <RadioGroupLabel class="ml-3 input-label text-blue-gray-900">{{ label }}</RadioGroupLabel>
     <div class="flex gap-4">
       <RadioGroupOption
         v-for="option in options"

diff --git a/src/interface/components/FormArg.vue b/src/interface/components/FormArg.vue
@@ -10,6 +10,7 @@
     type="text"
     :placeholder="label"
     v-model="arg"
+    :required="required"
   />
   <FormConditions
     v-model="arg"
@@ -43,7 +44,12 @@ import InputAttributeCaseSensitivity from './InputAttributeCaseSensitivity.vue'
 import InputAttributeOperator from './InputAttributeOperator.vue'
 import InputDirectionality from './InputDirectionality.vue'
 import InputNthPattern from './InputNthPattern.vue'
-import { attributeCaseSensitivityDefault, attributeOperatorDefault, nthPatternDefault, directionalityDefault } from '../options'
+import {
+  attributeCaseSensitivityDefault,
+  attributeOperatorDefault,
+  nthPatternDefault,
+  directionalityDefault
+} from '../options'
 
 export default defineComponent({
   components: {

diff --git a/src/interface/components/FormCondition.vue b/src/interface/components/FormCondition.vue
@@ -5,7 +5,7 @@
       <InputPipe
         class="w-full"
         :modelValue="pipeOption"
-        @update:modelValue="option => condition = ({ ...condition, args: [], pipe: option.value })"
+        @update:modelValue="option => condition = ({ ...condition, args: toDefaultValues(option.value), pipe: option.value })"
       />
       <button
         type="button"
@@ -49,6 +49,7 @@ export default defineComponent({
     const condition = computed<Condition>({
             get: () => props.modelValue,
             set: value => {
+              console.log({ pipe:  pipe.value, value })
               emit('update:modelValue', value)
             }
           }),
@@ -67,7 +68,12 @@ export default defineComponent({
       pipeOption,
       createReplace,
       emitDelete,
+      toDefaultValues,
     }
   }
 })
+
+function toDefaultValues (label) {
+  return pipeMetadata.find(({ label: l }) => l === label).args.map(({ defaultValue }) => defaultValue)
+}
 </script>
diff --git a/src/interface/options.ts b/src/interface/options.ts
@@ -1,6 +1,6 @@
 export const directionalities = [
   { label: 'left to right', value: 'ltr' },
-  { label: 'right to left', value: 'ltr' }
+  { label: 'right to left', value: 'rtl' }
 ]
 
 export const directionalityDefault = directionalities[0]
@@ -37,9 +37,9 @@ export const attributeOperatorDefault = attributeOperators[0]
 
 
 export const attributeCaseSensitivities = [
+  { label: 'unspecified', value: 'unspecified' },
   { label: 'sensitive', value: true },
   { label: 'insensitive', value: false },
-  { label: 'unspecified', value: 'unspecified' },
 ]
 export const attributeCaseSensitivityDefault = attributeCaseSensitivities[0]