From 9378a5341317ade14f390e0141ccc9b428407ccf Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 19:28:58 +0800
Subject: [PATCH 1/3] fix(gui-v2): make meta as {}

---
 packages/nc-gui-v2/composables/useColumnCreateStore.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/composables/useColumnCreateStore.ts b/packages/nc-gui-v2/composables/useColumnCreateStore.ts
index 50328a7b0e..b384e9f6d7 100644
--- a/packages/nc-gui-v2/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui-v2/composables/useColumnCreateStore.ts
@@ -33,6 +33,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
   const formState = ref<Partial<Record<string, any>>>({
     title: 'title',
     uidt: UITypes.SingleLineText,
+    meta: {},
     ...(column || {}),
   })
 
@@ -92,7 +93,7 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
     const colProp = sqlUi?.value.getDataTypeForUiType(formState?.value as any, idType as any)
     formState.value = {
       ...formState.value,
-      meta: null,
+      meta: {},
       rqd: false,
       pk: false,
       ai: false,

From 24809e3c06c702b7aa5456b1c8d6f698d721646a Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 19:29:17 +0800
Subject: [PATCH 2/3] fix(gui-v2): set default value for each option

---
 .../components/smartsheet-column/CurrencyOptions.vue  |  7 +++++++
 .../components/smartsheet-column/DurationOptions.vue  |  6 ++++++
 .../components/smartsheet-column/RatingOptions.vue    | 11 +++++++++++
 3 files changed, 24 insertions(+)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index 29cf63b9e4..0ac430a8f0 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -57,6 +57,13 @@ const message = computed(() => {
 function filterOption(input: string, option: Option) {
   return option.value.toUpperCase().includes(input.toUpperCase())
 }
+
+// set default value
+formState.value.meta = {
+  currency_locale: 'en-US',
+  currency_code: 'USD',
+  ...formState.value.meta,
+}
 </script>
 
 <template>
diff --git a/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
index 09bb007926..6c9c4d2047 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
@@ -10,6 +10,12 @@ const durationOptionList =
     // h:mm:ss (e.g. 3:45, 1:23:40)
     title: `${o.title} ${o.example}`,
   })) || []
+
+// set default value
+formState.value.meta = {
+  duration: 0,
+  ...formState.value.meta,
+}
 </script>
 
 <template>
diff --git a/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
index b54495321f..7907a710e6 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/RatingOptions.vue
@@ -32,6 +32,17 @@ const iconList = [
 const advanced = ref(true)
 
 const picked = ref(formState.value.meta.color || enumColor.light[0])
+
+// set default value
+formState.value.meta = {
+  icons: {
+    full: 'mdi-star',
+    empty: 'mdi-star-outline',
+  },
+  color: '#fcb401',
+  max: 5,
+  ...formState.value.meta,
+}
 </script>
 
 <template>

From 88a553efe0bd8f00729f7befcb9c25842f8a9c6a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 3 Aug 2022 19:42:31 +0530
Subject: [PATCH 3/3] fix(gui-v2): reset validators on new column meta
 generation and include meta prop

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../composables/useColumnCreateStore.ts       | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useColumnCreateStore.ts b/packages/nc-gui-v2/composables/useColumnCreateStore.ts
index b384e9f6d7..cdf2b78063 100644
--- a/packages/nc-gui-v2/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui-v2/composables/useColumnCreateStore.ts
@@ -33,8 +33,9 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
   const formState = ref<Partial<Record<string, any>>>({
     title: 'title',
     uidt: UITypes.SingleLineText,
-    meta: {},
     ...(column || {}),
+    // todo: swagger json update - include meta
+    meta: (column as any)?.meta || {},
   })
 
   const additionalValidations = ref<Record<string, any>>({})
@@ -78,14 +79,16 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
 
   const { resetFields, validate, validateInfos } = useForm(formState, validators)
 
+  const setAdditionalValidations = (validations: Record<string, any>) => {
+    additionalValidations.value = validations
+  }
+
   // actions
   const generateNewColumnMeta = () => {
-    formState.value = sqlUi.value.getNewColumn((meta.value.columns?.length || 0) + 1)
+    setAdditionalValidations({})
+    formState.value = { meta: {}, ...sqlUi.value.getNewColumn((meta.value.columns?.length || 0) + 1) }
   }
 
-  const setAdditionalValidations = (validations: Record<string, any>) => {
-    additionalValidations.value = validations
-  }
 
   const onUidtOrIdTypeChange = () => {
     const { isCurrency } = useColumn(formState.value as ColumnType)
@@ -171,11 +174,13 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
   }
 
   const addOrUpdate = async (onSuccess: () => {}) => {
-    if (!(await validate())) return
 
-    formState.value.table_name = meta.value.table_name
-    formState.value.title = formState.value.column_name
     try {
+      console.log(formState, validators)
+      if (!(await validate())) return
+
+      formState.value.table_name = meta.value.table_name
+      formState.value.title = formState.value.column_name
       if (column) {
         await $api.dbTableColumn.update(column.id as string, formState.value)
         toast.success('Column updated')