From b003e966304717c662d23b6632d51eb4d158ea10 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 15:42:09 +0800
Subject: [PATCH 01/35] feat(gui-v2): add SpecificDBType to virtual

---
 packages/nocodb-sdk/src/lib/UITypes.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index c3b315f218..c15064db0b 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -46,6 +46,7 @@ export function isVirtualCol(
     | ColumnType
 ) {
   return [
+    UITypes.SpecificDBType,
     UITypes.LinkToAnotherRecord,
     UITypes.Formula,
     UITypes.Rollup,

From 31ac5d0260e60a0a131d7d2d1ae2ed33d96627dd Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 15:42:20 +0800
Subject: [PATCH 02/35] feat(gui-v2): render SpecificDBType icon

---
 .../nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue
index 9d91c76f80..d9aadc6811 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue
@@ -8,6 +8,7 @@ import BTIcon from '~icons/mdi/table-arrow-left'
 import MMIcon from '~icons/mdi/table-network'
 import FormulaIcon from '~icons/mdi/math-integral'
 import RollupIcon from '~icons/mdi/movie-roll'
+import SpecificDBTypeIcon from '~icons/mdi/database-settings'
 
 const { columnMeta } = defineProps<{ columnMeta?: ColumnType }>()
 
@@ -25,6 +26,8 @@ const icon = computed(() => {
           return BTIcon
       }
       break
+    case UITypes.SpecificDBType:
+      return SpecificDBTypeIcon
     case UITypes.Formula:
       return FormulaIcon
     case UITypes.Lookup:

From 6c7d33d16a776f67723009141ada363b4ea90744 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 17:03:43 +0800
Subject: [PATCH 03/35] feat(gui-v2): SingleLineText Cell

---
 packages/nc-gui-v2/components/cell/Text.vue | 89 +++------------------
 1 file changed, 12 insertions(+), 77 deletions(-)

diff --git a/packages/nc-gui-v2/components/cell/Text.vue b/packages/nc-gui-v2/components/cell/Text.vue
index b1de025b8d..65fac3f5bc 100644
--- a/packages/nc-gui-v2/components/cell/Text.vue
+++ b/packages/nc-gui-v2/components/cell/Text.vue
@@ -1,100 +1,35 @@
 <script setup lang="ts">
-import { computed, inject, onMounted, ref } from '#imports'
+import { inject, onMounted, ref } from '#imports'
 
 interface Props {
   modelValue: any
 }
 
-const { modelValue: value } = defineProps<Props>()
+const props = defineProps<Props>()
 
-const emit = defineEmits(['update:modelValue'])
+const emits = defineEmits(['update:modelValue'])
 
 const editEnabled = inject<boolean>('editEnabled', false)
 
 const root = ref<HTMLInputElement>()
 
-const localState = computed({
-  get: () => value,
-  set: (val) => emit('update:modelValue', val),
-})
+const vModel = useVModel(props, 'modelValue', emits)
 
 onMounted(() => {
   root.value?.focus()
 })
 
-/* export default {
-  name: 'TextCell',
-  props: {
-    value: [String, Object, Number, Boolean, Array],
+watch(
+  () => root.value,
+  (el) => {
+    el?.focus()
   },
-  computed: {
-    localState: {
-      get() {
-        return this.value
-      },
-      set(val) {
-        this.$emit('input', val)
-      },
-    },
-    parentListeners() {
-      const $listeners = {}
-
-      if (this.$listeners.blur) {
-        $listeners.blur = this.$listeners.blur
-      }
-      if (this.$listeners.focus) {
-        $listeners.focus = this.$listeners.focus
-      }
-
-      if (this.$listeners.cancel) {
-        $listeners.cancel = this.$listeners.cancel
-      }
-
-      return $listeners
-    },
-  },
-  mounted() {
-    this.$el.focus()
-  },
-} */
+)
 </script>
 
 <template>
-  <input v-if="editEnabled" ref="root" v-model="localState" />
-  <span v-else>{{ localState }}</span>
-  <!--  v-on="parentListeners" /> -->
+  <input v-if="editEnabled" ref="root" v-model="vModel" class="h-full w-full outline-none" />
+  <span v-else>{{ vModel }}</span>
 </template>
 
-<style scoped>
-input,
-textarea {
-  width: 100%;
-  height: 100%;
-  color: var(--v-textColor-base);
-  outline: none;
-}
-</style>
-<!--
-/**
- * @copyright Copyright (c) 2021, Xgene Cloud Ltd
- *
- * @author Naveen MR <oof1lab@gmail.com>
- * @author Pranav C Balan <pranavxc@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
--->
+<style scoped></style>

From 09fce8086140ac6d6b6937455328711a6d1aebf9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 17:18:10 +0800
Subject: [PATCH 04/35] feat(gui-v2): LongText Cell

---
 .../nc-gui-v2/components/cell/TextArea.vue    | 67 ++++++-------------
 1 file changed, 20 insertions(+), 47 deletions(-)

diff --git a/packages/nc-gui-v2/components/cell/TextArea.vue b/packages/nc-gui-v2/components/cell/TextArea.vue
index d27590877d..4552706231 100644
--- a/packages/nc-gui-v2/components/cell/TextArea.vue
+++ b/packages/nc-gui-v2/components/cell/TextArea.vue
@@ -5,70 +5,43 @@ interface Props {
   modelValue?: string
 }
 
-const { modelValue: value } = defineProps<Props>()
+const props = defineProps<Props>()
 
-const emit = defineEmits(['update:modelValue'])
+const emits = defineEmits(['update:modelValue'])
 
 const editEnabled = inject<boolean>('editEnabled', false)
 
 const root = ref<HTMLInputElement>()
 
-const localState = computed({
-  get: () => value,
-  set: (val) => emit('update:modelValue', val),
-})
+const vModel = useVModel(props, 'modelValue', emits)
 
 onMounted(() => {
   root.value?.focus()
 })
 
-/* export default {
-  name: 'TextAreaCell',
-  props: {
-    value: String,
-  },
-  computed: {
-    localState: {
-      get() {
-        return this.value
-      },
-      set(val) {
-        this.$emit('input', val)
-      },
-    },
-    parentListeners() {
-      const $listeners = {}
-
-      if (this.$listeners.blur) {
-        $listeners.blur = this.$listeners.blur
-      }
-      if (this.$listeners.focus) {
-        $listeners.focus = this.$listeners.focus
-      }
-
-      return $listeners
-    },
-  },
-  created() {
-    this.localState = this.value
-  },
-  mounted() {
-    this.$refs.textarea && this.$refs.textarea.focus()
+watch(
+  () => root.value,
+  (el) => {
+    el?.focus()
   },
-} */
+)
 </script>
 
 <template>
-  <textarea v-if="editEnabled" ref="root" v-model="localState" rows="4" @keydown.alt.enter.stop @keydown.shift.enter.stop />
-  <span v-else>{{ localState }}</span>
+  <textarea
+    v-if="editEnabled"
+    ref="root"
+    v-model="vModel"
+    rows="4"
+    class="h-full w-full min-h-[60px] outline-none"
+    @keydown.alt.enter.stop
+    @keydown.shift.enter.stop
+  />
+  <span v-else>{{ vModel }}</span>
 </template>
 
 <style scoped>
-input,
-textarea {
-  width: 100%;
-  min-height: 60px;
-  height: 100%;
-  color: var(--v-textColor-base);
+textarea:focus {
+  @apply ring-transparent;
 }
 </style>

From 810f7ceb655f635c80bd4b5743b1abf9eccafbfd Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 17:51:33 +0800
Subject: [PATCH 05/35] feat(gui-v2): add locale-codes

---
 packages/nc-gui-v2/package-lock.json | 60 ++++++++++++++++++++++++++++
 packages/nc-gui-v2/package.json      |  1 +
 2 files changed, 61 insertions(+)

diff --git a/packages/nc-gui-v2/package-lock.json b/packages/nc-gui-v2/package-lock.json
index 8f0a2e375d..33942a1dde 100644
--- a/packages/nc-gui-v2/package-lock.json
+++ b/packages/nc-gui-v2/package-lock.json
@@ -11,6 +11,7 @@
         "dayjs": "^1.11.3",
         "file-saver": "^2.0.5",
         "jwt-decode": "^3.1.2",
+        "locale-codes": "^1.3.1",
         "monaco-editor": "^0.33.0",
         "nocodb-sdk": "file:../nocodb-sdk",
         "papaparse": "^5.3.2",
@@ -8554,6 +8555,14 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "node_modules/iso639-codes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/iso639-codes/-/iso639-codes-1.0.1.tgz",
+      "integrity": "sha512-jdTSv8yn6D7GODDrRtuWG7y3du3aoa+ki5H8h/Y48/NleNAd7Fw/M2niTTLXGH4QnqhJ98hg1JMQtP9csQ31Lg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-worker": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
@@ -8801,6 +8810,11 @@
       "integrity": "sha512-lxpCM3HTvquGxKGzHeknB/sUjuVoUElLlfYnXZT73K8geR9jQbroGlSCFBax9/0mpGoD3kzcMLnOlGQPJJNyqQ==",
       "dev": true
     },
+    "node_modules/langs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/langs/-/langs-2.0.0.tgz",
+      "integrity": "sha512-v4pxOBEQVN1WBTfB1crhTtxzNLZU9HPWgadlwzWKISJtt6Ku/CnpBrwVy+jFv8StjxsPfwPFzO0CMwdZLJ0/BA=="
+    },
     "node_modules/lazystream": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
@@ -9001,6 +9015,19 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/locale-codes": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/locale-codes/-/locale-codes-1.3.1.tgz",
+      "integrity": "sha512-C7fxGkU4jAuHqavtKj4IhSD2yPEzChFMRfNHjzwIAz9JTbYHtBJDcQQgmJDezBogk9/vvgS7chKMhpVEKavk5A==",
+      "dependencies": {
+        "iso639-codes": "^1.0.1",
+        "langs": "^2.0.0",
+        "windows-locale": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -14214,6 +14241,14 @@
       "integrity": "sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==",
       "dev": true
     },
+    "node_modules/windows-locale": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/windows-locale/-/windows-locale-1.1.3.tgz",
+      "integrity": "sha512-0OlMOPNGj7GTB6C7WmqS3o4eydjnoYj0uwot2KJf7E0JUucwYwzkcvCWQwnuOV60WqDMeGJpSankgveNMj5r0g==",
+      "engines": {
+        "node": ">=v10.24.1"
+      }
+    },
     "node_modules/wmf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
@@ -20699,6 +20734,11 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "iso639-codes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/iso639-codes/-/iso639-codes-1.0.1.tgz",
+      "integrity": "sha512-jdTSv8yn6D7GODDrRtuWG7y3du3aoa+ki5H8h/Y48/NleNAd7Fw/M2niTTLXGH4QnqhJ98hg1JMQtP9csQ31Lg=="
+    },
     "jest-worker": {
       "version": "26.6.2",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
@@ -20893,6 +20933,11 @@
       "integrity": "sha512-lxpCM3HTvquGxKGzHeknB/sUjuVoUElLlfYnXZT73K8geR9jQbroGlSCFBax9/0mpGoD3kzcMLnOlGQPJJNyqQ==",
       "dev": true
     },
+    "langs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/langs/-/langs-2.0.0.tgz",
+      "integrity": "sha512-v4pxOBEQVN1WBTfB1crhTtxzNLZU9HPWgadlwzWKISJtt6Ku/CnpBrwVy+jFv8StjxsPfwPFzO0CMwdZLJ0/BA=="
+    },
     "lazystream": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
@@ -21050,6 +21095,16 @@
       "integrity": "sha512-lL87ytIGP2FU5PWwNDo0w3WhIo2gopIAxPg9RxDYF7m4rr5ahuZxP22xnJHIvaLTe4Z9P6uKKY2UHiwyB4pcrw==",
       "dev": true
     },
+    "locale-codes": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/locale-codes/-/locale-codes-1.3.1.tgz",
+      "integrity": "sha512-C7fxGkU4jAuHqavtKj4IhSD2yPEzChFMRfNHjzwIAz9JTbYHtBJDcQQgmJDezBogk9/vvgS7chKMhpVEKavk5A==",
+      "requires": {
+        "iso639-codes": "^1.0.1",
+        "langs": "^2.0.0",
+        "windows-locale": "^1.1.0"
+      }
+    },
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -24944,6 +24999,11 @@
         }
       }
     },
+    "windows-locale": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/windows-locale/-/windows-locale-1.1.3.tgz",
+      "integrity": "sha512-0OlMOPNGj7GTB6C7WmqS3o4eydjnoYj0uwot2KJf7E0JUucwYwzkcvCWQwnuOV60WqDMeGJpSankgveNMj5r0g=="
+    },
     "wmf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
diff --git a/packages/nc-gui-v2/package.json b/packages/nc-gui-v2/package.json
index c038b5bb59..d954b68033 100644
--- a/packages/nc-gui-v2/package.json
+++ b/packages/nc-gui-v2/package.json
@@ -17,6 +17,7 @@
     "dayjs": "^1.11.3",
     "file-saver": "^2.0.5",
     "jwt-decode": "^3.1.2",
+    "locale-codes": "^1.3.1",
     "monaco-editor": "^0.33.0",
     "nocodb-sdk": "file:../nocodb-sdk",
     "papaparse": "^5.3.2",

From e96c043ea1c03cb810a8e30035a14d9b39c0e9fd Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 17:58:37 +0800
Subject: [PATCH 06/35] feat(gui-v2): add currency utils

---
 packages/nc-gui-v2/utils/currencyUtils.ts | 220 ++++++++++++++++++++++
 1 file changed, 220 insertions(+)
 create mode 100644 packages/nc-gui-v2/utils/currencyUtils.ts

diff --git a/packages/nc-gui-v2/utils/currencyUtils.ts b/packages/nc-gui-v2/utils/currencyUtils.ts
new file mode 100644
index 0000000000..5ac1ccb46f
--- /dev/null
+++ b/packages/nc-gui-v2/utils/currencyUtils.ts
@@ -0,0 +1,220 @@
+import locale from 'locale-codes'
+
+export const currencyCodes = [
+  'AED',
+  'AFN',
+  'ALL',
+  'AMD',
+  'ANG',
+  'AOA',
+  'ARS',
+  'AUD',
+  'AWG',
+  'AZN',
+  'BAM',
+  'BBD',
+  'BDT',
+  'BGN',
+  'BHD',
+  'BIF',
+  'BMD',
+  'BND',
+  'BOB',
+  'BOV',
+  'BRL',
+  'BSD',
+  'BTN',
+  'BWP',
+  'BYR',
+  'BZD',
+  'CAD',
+  'CDF',
+  'CHE',
+  'CHF',
+  'CHW',
+  'CLF',
+  'CLP',
+  'CNY',
+  'COP',
+  'COU',
+  'CRC',
+  'CUP',
+  'CVE',
+  'CYP',
+  'CZK',
+  'DJF',
+  'DKK',
+  'DOP',
+  'DZD',
+  'EEK',
+  'EGP',
+  'ERN',
+  'ETB',
+  'EUR',
+  'FJD',
+  'FKP',
+  'GBP',
+  'GEL',
+  'GHC',
+  'GIP',
+  'GMD',
+  'GNF',
+  'GTQ',
+  'GYD',
+  'HKD',
+  'HNL',
+  'HRK',
+  'HTG',
+  'HUF',
+  'IDR',
+  'ILS',
+  'INR',
+  'IQD',
+  'IRR',
+  'ISK',
+  'JMD',
+  'JOD',
+  'JPY',
+  'KES',
+  'KGS',
+  'KHR',
+  'KMF',
+  'KPW',
+  'KRW',
+  'KWD',
+  'KYD',
+  'KZT',
+  'LAK',
+  'LBP',
+  'LKR',
+  'LRD',
+  'LSL',
+  'LTL',
+  'LVL',
+  'LYD',
+  'MAD',
+  'MDL',
+  'MGA',
+  'MKD',
+  'MMK',
+  'MNT',
+  'MOP',
+  'MRO',
+  'MTL',
+  'MUR',
+  'MVR',
+  'MWK',
+  'MXN',
+  'MXV',
+  'MYR',
+  'MZN',
+  'NAD',
+  'NGN',
+  'NIO',
+  'NOK',
+  'NPR',
+  'NZD',
+  'OMR',
+  'PAB',
+  'PEN',
+  'PGK',
+  'PHP',
+  'PKR',
+  'PLN',
+  'PYG',
+  'QAR',
+  'ROL',
+  'RON',
+  'RSD',
+  'RUB',
+  'RWF',
+  'SAR',
+  'SBD',
+  'SCR',
+  'SDD',
+  'SEK',
+  'SGD',
+  'SHP',
+  'SIT',
+  'SKK',
+  'SLL',
+  'SOS',
+  'SRD',
+  'STD',
+  'SYP',
+  'SZL',
+  'THB',
+  'TJS',
+  'TMM',
+  'TND',
+  'TOP',
+  'TRY',
+  'TTD',
+  'TWD',
+  'TZS',
+  'UAH',
+  'UGX',
+  'USD',
+  'USN',
+  'USS',
+  'UYU',
+  'UZS',
+  'VEB',
+  'VND',
+  'VUV',
+  'WST',
+  'XAF',
+  'XAG',
+  'XAU',
+  'XBA',
+  'XBB',
+  'XBC',
+  'XBD',
+  'XCD',
+  'XDR',
+  'XFO',
+  'XFU',
+  'XOF',
+  'XPD',
+  'XPF',
+  'XPT',
+  'XTS',
+  'XXX',
+  'YER',
+  'ZAR',
+  'ZMK',
+  'ZWD',
+]
+
+export function validateCurrencyCode(v: string) {
+  return currencyCodes.includes(v)
+}
+
+export function currencyLocales() {
+  const localeList = locale.all
+    .filter((l: Record<string, any>) => {
+      try {
+        if (Intl.NumberFormat.supportedLocalesOf(l.tag).length > 0) {
+          return true
+        }
+        return false
+      } catch (e) {
+        return false
+      }
+    })
+    .map((l: Record<string, any>) => {
+      return {
+        text: `${l.name} (${l.tag})`,
+        value: l.tag,
+      }
+    })
+  return localeList
+}
+
+export function validateCurrencyLocale(v: string) {
+  try {
+    return Intl.NumberFormat.supportedLocalesOf(v).length > 0
+  } catch (e) {
+    return false
+  }
+}

From 737449233b1d7433c6fbc74e5b2ba1798c349069 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 18:02:05 +0800
Subject: [PATCH 07/35] wip(gui-v2): currency option

---
 .../smartsheet-column/CurrencyOptions.vue     | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
new file mode 100644
index 0000000000..c0860336a6
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import { useColumnCreateStoreOrThrow, useProject } from '#imports'
+import { currencyCodes, currencyLocales, validateCurrencyCode, validateCurrencyLocale } from '@/utils/currencyUtils'
+
+const { formState, validateInfos, setAdditionalValidations, sqlUi, onDataTypeChange, onAlter } = useColumnCreateStoreOrThrow()
+
+const { isPg } = useProject()
+
+const colMeta = ref({
+  currency_locale: 'en-US',
+  currency_code: 'USD',
+})
+
+const currencyList = ref(currencyCodes)
+
+const currencyLocaleList = ref(currencyLocales())
+
+function isValidCurrencyLocale(locale: string) {
+  return validateCurrencyLocale(locale) || 'Invalid locale'
+}
+
+function isValidCurrencyCode(currencyCode: string) {
+  return validateCurrencyLocale(currencyCode) || 'Invalid Currency Code'
+}
+
+const isMoney = computed(() => formState.value.dt === 'money')
+
+const message = computed(() => {
+  if (isMoney && isPg) return "PostgreSQL 'money' type has own currency settings"
+  return ''
+})
+</script>
+
+<template>
+  <a-tooltip>
+    <template #title>
+      <span> {{ message }} </span>
+    </template>
+    <a-row>
+      <a-col :span="12">
+        <!--label="Format Locale"-->
+      </a-col>
+      <a-col :span="12">
+        <!--label="Currency Code"-->
+      </a-col>
+    </a-row>
+  </a-tooltip>
+</template>
\ No newline at end of file

From 070f72587d7761c11e52bfc6c0b314fa644e2694 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 18:07:46 +0800
Subject: [PATCH 08/35] feat(gui-v2): include SmartsheetColumnCurrencyOptions

---
 packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
index 1481f6294a..e41f4acfa5 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
@@ -2,6 +2,7 @@
 import { computed, inject, useColumnCreateStoreOrThrow, useMetas, watchEffect } from '#imports'
 import { MetaInj } from '~/context'
 import { uiTypes } from '~/utils/columnUtils'
+import { UITypes } from 'nocodb-sdk'
 import MdiPlusIcon from '~icons/mdi/plus-circle-outline'
 import MdiMinusIcon from '~icons/mdi/minus-circle-outline'
 
@@ -84,6 +85,8 @@ watchEffect(() => {
         </a-select>
       </a-form-item>
 
+      <SmartsheetColumnCurrencyOptions v-if="formState.uidt === UITypes.Currency" />
+
       <div>
         <div
           class="text-xs cursor-pointer text-grey nc-more-options my-2 flex align-center gap-1 justify-end"

From 88b7ea51ad4876642af355ee9401c0a9d8244579 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 19:08:16 +0800
Subject: [PATCH 09/35] feat(gui-v2): add currency locale & currency code

---
 .../smartsheet-column/CurrencyOptions.vue     | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index c0860336a6..fec1497bf6 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -2,8 +2,19 @@
 import { useColumnCreateStoreOrThrow, useProject } from '#imports'
 import { currencyCodes, currencyLocales, validateCurrencyCode, validateCurrencyLocale } from '@/utils/currencyUtils'
 
+interface Option {
+  label: string
+  value: string
+}
+
 const { formState, validateInfos, setAdditionalValidations, sqlUi, onDataTypeChange, onAlter } = useColumnCreateStoreOrThrow()
 
+// set additional validations
+setAdditionalValidations({
+  'meta.currency_locale': [isValidCurrencyLocale],
+  'meta.currency_code': [isValidCurrencyCode],
+})
+
 const { isPg } = useProject()
 
 const colMeta = ref({
@@ -29,6 +40,10 @@ const message = computed(() => {
   if (isMoney && isPg) return "PostgreSQL 'money' type has own currency settings"
   return ''
 })
+
+function filterOption(input: string, option: Option) {
+  return option.value.toUpperCase().includes(input.toUpperCase())
+}
 </script>
 
 <template>
@@ -38,11 +53,29 @@ const message = computed(() => {
     </template>
     <a-row>
       <a-col :span="12">
-        <!--label="Format Locale"-->
+        <!--label="Currency Locale"-->
+        <a-form-item v-bind="validateInfos.meta.currency_locale">
+          <a-select
+            v-model:value="formState.meta.currency_locale"
+            class="w-52"
+            show-search
+            :options="currencyLocaleList"
+            :filter-option="filterOption"
+          />
+        </a-form-item>
       </a-col>
       <a-col :span="12">
         <!--label="Currency Code"-->
+        <a-form-item v-bind="validateInfos.meta.currency_code">
+          <a-select
+            v-model:value="formState.meta.currency_code"
+            class="w-52"
+            show-search
+            :options="currencyList"
+            :filter-option="filterOption"
+          />
+        </a-form-item>
       </a-col>
     </a-row>
   </a-tooltip>
-</template>
\ No newline at end of file
+</template>

From 0e33b36fb98df4371c6ca916997d49d95535b6e3 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 20:08:52 +0800
Subject: [PATCH 10/35] fix(gui-v2): remove setAdditionalValidations

---
 .../nc-gui-v2/components/smartsheet-column/AdvancedOptions.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/AdvancedOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/AdvancedOptions.vue
index 043982561c..26bf40e44f 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/AdvancedOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/AdvancedOptions.vue
@@ -5,9 +5,6 @@ const { formState, validateInfos, setAdditionalValidations, sqlUi, onDataTypeCha
 
 const dataTypes = computed(() => sqlUi?.value?.getDataTypeListForUiType(formState))
 
-// set additional validations
-setAdditionalValidations({})
-
 // to avoid type error with checkbox
 formState.value.rqd = !!formState.value.rqd
 formState.value.pk = !!formState.value.pk

From be240083be91b79c11f315153db665820d5ee211 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 20:09:30 +0800
Subject: [PATCH 11/35] feat(gui-v2): add validators, locale & currency code
 dropdown

---
 .../smartsheet-column/CurrencyOptions.vue     | 70 +++++++++++--------
 1 file changed, 41 insertions(+), 29 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index fec1497bf6..1fd62206e5 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -9,35 +9,51 @@ interface Option {
 
 const { formState, validateInfos, setAdditionalValidations, sqlUi, onDataTypeChange, onAlter } = useColumnCreateStoreOrThrow()
 
+const validators = computed(() => {
+  return {
+    'meta.currency_locale': [
+      {
+        validator: (_: any, locale: any) => {
+          return new Promise<void>((resolve, reject) => {
+            if (!validateCurrencyLocale(locale)) {
+              return reject(new Error('Invalid locale'))
+            }
+            resolve()
+          })
+        },
+      },
+    ],
+    'meta.currency_code': [
+      {
+        validator: (_: any, currencyCode: any) => {
+          return new Promise<void>((resolve, reject) => {
+            console.log("currencyCode=" + currencyCode)
+            if (!validateCurrencyCode(currencyCode)) {
+              return reject(new Error('Invalid Currency Code'))
+            }
+            resolve()
+          })
+        },
+      },
+    ],
+  }
+})
+
 // set additional validations
 setAdditionalValidations({
-  'meta.currency_locale': [isValidCurrencyLocale],
-  'meta.currency_code': [isValidCurrencyCode],
+  ...validators.value,
 })
 
 const { isPg } = useProject()
 
-const colMeta = ref({
-  currency_locale: 'en-US',
-  currency_code: 'USD',
-})
-
 const currencyList = ref(currencyCodes)
 
 const currencyLocaleList = ref(currencyLocales())
 
-function isValidCurrencyLocale(locale: string) {
-  return validateCurrencyLocale(locale) || 'Invalid locale'
-}
-
-function isValidCurrencyCode(currencyCode: string) {
-  return validateCurrencyLocale(currencyCode) || 'Invalid Currency Code'
-}
-
 const isMoney = computed(() => formState.value.dt === 'money')
 
 const message = computed(() => {
-  if (isMoney && isPg) return "PostgreSQL 'money' type has own currency settings"
+  if (isMoney.value && isPg) return "PostgreSQL 'money' type has own currency settings"
   return ''
 })
 
@@ -53,29 +69,25 @@ function filterOption(input: string, option: Option) {
     </template>
     <a-row>
       <a-col :span="12">
-        <!--label="Currency Locale"-->
-        <a-form-item v-bind="validateInfos.meta.currency_locale">
+        <a-form-item v-bind="validateInfos['meta.currency_locale']">
           <a-select
             v-model:value="formState.meta.currency_locale"
             class="w-52"
             show-search
-            :options="currencyLocaleList"
+            :options="currencyLocaleList ?? []"
             :filter-option="filterOption"
           />
         </a-form-item>
       </a-col>
       <a-col :span="12">
-        <!--label="Currency Code"-->
-        <a-form-item v-bind="validateInfos.meta.currency_code">
-          <a-select
-            v-model:value="formState.meta.currency_code"
-            class="w-52"
-            show-search
-            :options="currencyList"
-            :filter-option="filterOption"
-          />
+        <a-form-item v-bind="validateInfos['meta.currency_code']">
+          <a-select v-model:value="formState.meta.currency_code" class="w-52" show-search :filter-option="filterOption">
+            <a-select-option v-for="(currencyCode, i) in currencyList ?? []" :key="i" :value="currencyCode">
+              {{ currencyCode }}
+            </a-select-option>
+          </a-select>
         </a-form-item>
       </a-col>
     </a-row>
   </a-tooltip>
-</template>
+</template>
\ No newline at end of file

From 964fb3258987229ea0068dc51829d98a1790a496 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 23:53:47 +0800
Subject: [PATCH 12/35] feat(gui-v2): add label for currency locale & code

---
 .../smartsheet-column/CurrencyOptions.vue        | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index 1fd62206e5..7b886168b0 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -27,7 +27,6 @@ const validators = computed(() => {
       {
         validator: (_: any, currencyCode: any) => {
           return new Promise<void>((resolve, reject) => {
-            console.log("currencyCode=" + currencyCode)
             if (!validateCurrencyCode(currencyCode)) {
               return reject(new Error('Invalid Currency Code'))
             }
@@ -69,9 +68,10 @@ function filterOption(input: string, option: Option) {
     </template>
     <a-row>
       <a-col :span="12">
-        <a-form-item v-bind="validateInfos['meta.currency_locale']">
+        <a-form-item v-bind="validateInfos['meta.currency_locale']" label="Currency Locale">
           <a-select
             v-model:value="formState.meta.currency_locale"
+            size="small"
             class="w-52"
             show-search
             :options="currencyLocaleList ?? []"
@@ -80,8 +80,14 @@ function filterOption(input: string, option: Option) {
         </a-form-item>
       </a-col>
       <a-col :span="12">
-        <a-form-item v-bind="validateInfos['meta.currency_code']">
-          <a-select v-model:value="formState.meta.currency_code" class="w-52" show-search :filter-option="filterOption">
+        <a-form-item v-bind="validateInfos['meta.currency_code']" label="Currency Code">
+          <a-select
+            v-model:value="formState.meta.currency_code"
+            class="w-52"
+            show-search
+            :filter-option="filterOption"
+            size="small"
+          >
             <a-select-option v-for="(currencyCode, i) in currencyList ?? []" :key="i" :value="currencyCode">
               {{ currencyCode }}
             </a-select-option>
@@ -90,4 +96,4 @@ function filterOption(input: string, option: Option) {
       </a-col>
     </a-row>
   </a-tooltip>
-</template>
\ No newline at end of file
+</template>

From d1ef8bbb45e0aeb33ef16a6c3c207873e882ec94 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Tue, 2 Aug 2022 23:42:17 +0530
Subject: [PATCH 13/35] 
 chore/gui-v2-improved-email-json-phonenumber-url-year-time-column

---
 .../components/smartsheet-column/EditOrAdd.vue       | 12 ++++++++++++
 .../components/smartsheet-header/CellIcon.vue        | 10 ++++++++--
 packages/nc-gui-v2/utils/columnUtils.ts              |  3 ++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
index 1481f6294a..835b3d789d 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { UITypes } from 'nocodb-sdk'
 import { computed, inject, useColumnCreateStoreOrThrow, useMetas, watchEffect } from '#imports'
 import { MetaInj } from '~/context'
 import { uiTypes } from '~/utils/columnUtils'
@@ -22,6 +23,8 @@ const {
   isEdit,
 } = useColumnCreateStoreOrThrow()
 
+const columnToValidate = [UITypes.Email, UITypes.URL, UITypes.PhoneNumber]
+
 const uiTypesOptions = computed<typeof uiTypes>(() => {
   return [
     ...uiTypes.filter((t) => !isEdit || !t.virtual),
@@ -94,6 +97,15 @@ watchEffect(() => {
         </div>
       </div>
       <div class="overflow-hidden" :class="advancedOptions ? 'h-min' : 'h-0'">
+        <a-checkbox
+          v-if="formState.meta && columnToValidate.includes(formState.uidt)"
+          v-model:checked="formState.meta.validate"
+          class="ml-1 mb-1"
+        >
+          <span class="text-xs text-gray-600">
+            {{ `Accept only valid ${formState.uidt}` }}
+          </span>
+        </a-checkbox>
         <SmartsheetColumnAdvancedOptions />
       </div>
       <a-form-item>
diff --git a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
index 0c05c1a8a5..367beb5458 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
@@ -5,10 +5,13 @@ import FilePhoneIcon from '~icons/mdi/file-phone'
 import { useColumn } from '#imports'
 import KeyIcon from '~icons/mdi/key-variant'
 import JSONIcon from '~icons/mdi/code-json'
+import ClockIcon from '~icons/mdi/clock-time-five'
 // import FKIcon from '~icons/mdi/link-variant'
+import Web from '~icons/mdi/web'
 import TextAreaIcon from '~icons/mdi/card-text-outline'
 import StringIcon from '~icons/mdi/alpha-a-box-outline'
 import BooleanIcon from '~icons/mdi/check-box-outline'
+import YearIcon from '~icons/mdi/calendar'
 import SingleSelectIcon from '~icons/mdi/radiobox-marked'
 import MultiSelectIcon from '~icons/mdi/checkbox-multiple-marked'
 import DatetimeIcon from '~icons/mdi/calendar-clock'
@@ -17,7 +20,6 @@ import RatingIcon from '~icons/mdi/star'
 import GenericIcon from '~icons/mdi/square-rounded'
 import NumericIcon from '~icons/mdi/numeric'
 import AttachmentIcon from '~icons/mdi/image-multiple-outline'
-import URLIcon from '~icons/mdi/link'
 import EmailIcon from '~icons/mdi/email'
 import CurrencyIcon from '~icons/mdi/currency-usd-circle-outline'
 import PercentIcon from '~icons/mdi/percent-outline'
@@ -48,6 +50,10 @@ const icon = computed(() => {
     return TextAreaIcon
   } else if (additionalColMeta.isEmail) {
     return EmailIcon
+  } else if (additionalColMeta.isYear) {
+    return YearIcon
+  } else if (additionalColMeta.isTime) {
+    return ClockIcon
   } else if (additionalColMeta.isRating) {
     return RatingIcon
   } else if (additionalColMeta.isAttachment) {
@@ -63,7 +69,7 @@ const icon = computed(() => {
   //   return FKIcon
   // }
   else if (additionalColMeta.isURL) {
-    return URLIcon
+    return Web
   } else if (additionalColMeta.isCurrency) {
     return CurrencyIcon
   } else if (additionalColMeta.isPercent) {
diff --git a/packages/nc-gui-v2/utils/columnUtils.ts b/packages/nc-gui-v2/utils/columnUtils.ts
index 3db1717e66..1020e60851 100644
--- a/packages/nc-gui-v2/utils/columnUtils.ts
+++ b/packages/nc-gui-v2/utils/columnUtils.ts
@@ -3,6 +3,7 @@ import LinkVariant from '~icons/mdi/link-variant'
 import TableColumnPlusBefore from '~icons/mdi/table-column-plus-before'
 import FormatColorText from '~icons/mdi/format-color-text'
 import TextSubject from '~icons/mdi/text-subject'
+import JSONIcon from '~icons/mdi/code-json'
 import Attachment from '~icons/mdi/attachment'
 import CheckboxMarkedOutline from '~icons/mdi/checkbox-marked-outline'
 import FormatListBulletedSquare from '~icons/mdi/format-list-bulleted-square'
@@ -135,7 +136,7 @@ const uiTypes = [
   },
   {
     name: UITypes.JSON,
-    icon: 'mdi-code-json',
+    icon: JSONIcon,
   },
   {
     name: UITypes.SpecificDBType,

From 514ebf518a30ed68ff168fa1126d3e8d2aff864d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 11:32:07 +0800
Subject: [PATCH 14/35] fix(gui-v2): conditionally display tooltip on currency
 option

---
 .../components/smartsheet-column/CurrencyOptions.vue        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index 7b886168b0..0624320408 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -62,9 +62,9 @@ function filterOption(input: string, option: Option) {
 </script>
 
 <template>
-  <a-tooltip>
+  <a-tooltip :visible="isMoney && isPg">
     <template #title>
-      <span> {{ message }} </span>
+      <span>{{ message }}</span>
     </template>
     <a-row>
       <a-col :span="12">
@@ -76,6 +76,7 @@ function filterOption(input: string, option: Option) {
             show-search
             :options="currencyLocaleList ?? []"
             :filter-option="filterOption"
+            :disabled="isMoney && isPg"
           />
         </a-form-item>
       </a-col>
@@ -87,6 +88,7 @@ function filterOption(input: string, option: Option) {
             show-search
             :filter-option="filterOption"
             size="small"
+            :disabled="isMoney && isPg"
           >
             <a-select-option v-for="(currencyCode, i) in currencyList ?? []" :key="i" :value="currencyCode">
               {{ currencyCode }}

From d2212d7519441a47be8747bfa587920e518e88ae Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 11:32:24 +0800
Subject: [PATCH 15/35] chore(gui-v2): lint

---
 packages/nc-gui-v2/components/dlg/AirtableImport.vue          | 3 ++-
 packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue | 2 +-
 packages/nc-gui-v2/composables/useTableCreate.ts              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui-v2/components/dlg/AirtableImport.vue b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
index 390c4a4511..6b5ce40636 100644
--- a/packages/nc-gui-v2/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
@@ -336,7 +336,8 @@ onBeforeUnmount(() => {
           </div>
         </a-card>
         <div class="flex justify-center items-center">
-          <a-button v-if="showGoToDashboardButton" class="mt-4" size="large" @click="dialogShow = false">Go to Dashboard</a-button
+          <a-button v-if="showGoToDashboardButton" class="mt-4" size="large" @click="dialogShow = false"
+            >Go to Dashboard</a-button
           >
         </div>
       </div>
diff --git a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
index e41f4acfa5..c699e52e0b 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
+import { UITypes } from 'nocodb-sdk'
 import { computed, inject, useColumnCreateStoreOrThrow, useMetas, watchEffect } from '#imports'
 import { MetaInj } from '~/context'
 import { uiTypes } from '~/utils/columnUtils'
-import { UITypes } from 'nocodb-sdk'
 import MdiPlusIcon from '~icons/mdi/plus-circle-outline'
 import MdiMinusIcon from '~icons/mdi/minus-circle-outline'
 
diff --git a/packages/nc-gui-v2/composables/useTableCreate.ts b/packages/nc-gui-v2/composables/useTableCreate.ts
index 24c7b46943..eba3318570 100644
--- a/packages/nc-gui-v2/composables/useTableCreate.ts
+++ b/packages/nc-gui-v2/composables/useTableCreate.ts
@@ -1,8 +1,8 @@
 import type { TableType } from 'nocodb-sdk'
 import { UITypes } from 'nocodb-sdk'
+import { useToast } from 'vue-toastification'
 import { useProject } from './useProject'
 import { useNuxtApp } from '#app'
-import { useToast } from 'vue-toastification'
 import { extractSdkResponseErrorMsg } from '~/utils/errorUtils'
 
 export function useTableCreate(onTableCreate?: (tableMeta: TableType) => void) {

From daeb024df849ae2ce20edf405548e2993e536f21 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 11:45:01 +0800
Subject: [PATCH 16/35] feat(gui-v2): show the text for currency locale

---
 .../components/smartsheet-column/CurrencyOptions.vue       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index 0624320408..e8e11dbdd9 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -74,10 +74,13 @@ function filterOption(input: string, option: Option) {
             size="small"
             class="w-52"
             show-search
-            :options="currencyLocaleList ?? []"
             :filter-option="filterOption"
             :disabled="isMoney && isPg"
-          />
+          >
+            <a-select-option v-for="(currencyLocale, i) in currencyLocaleList ?? []" :key="i" :value="currencyLocale.value">
+              {{ currencyLocale.text }}
+            </a-select-option>
+          </a-select>
         </a-form-item>
       </a-col>
       <a-col :span="12">

From 46bb71114f69ad9c32d06911a0b43a0cb37360ab Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 12:05:12 +0800
Subject: [PATCH 17/35] feat(gui-v2): ditch a-tooltip in currency option

---
 .../smartsheet-column/CurrencyOptions.vue     | 76 +++++++++----------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index e8e11dbdd9..e993d80c26 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -62,43 +62,41 @@ function filterOption(input: string, option: Option) {
 </script>
 
 <template>
-  <a-tooltip :visible="isMoney && isPg">
-    <template #title>
-      <span>{{ message }}</span>
-    </template>
-    <a-row>
-      <a-col :span="12">
-        <a-form-item v-bind="validateInfos['meta.currency_locale']" label="Currency Locale">
-          <a-select
-            v-model:value="formState.meta.currency_locale"
-            size="small"
-            class="w-52"
-            show-search
-            :filter-option="filterOption"
-            :disabled="isMoney && isPg"
-          >
-            <a-select-option v-for="(currencyLocale, i) in currencyLocaleList ?? []" :key="i" :value="currencyLocale.value">
-              {{ currencyLocale.text }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-      <a-col :span="12">
-        <a-form-item v-bind="validateInfos['meta.currency_code']" label="Currency Code">
-          <a-select
-            v-model:value="formState.meta.currency_code"
-            class="w-52"
-            show-search
-            :filter-option="filterOption"
-            size="small"
-            :disabled="isMoney && isPg"
-          >
-            <a-select-option v-for="(currencyCode, i) in currencyList ?? []" :key="i" :value="currencyCode">
-              {{ currencyCode }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-    </a-row>
-  </a-tooltip>
+  <a-row>
+    <a-col :span="12">
+      <a-form-item v-bind="validateInfos['meta.currency_locale']" label="Currency Locale">
+        <a-select
+          v-model:value="formState.meta.currency_locale"
+          size="small"
+          class="w-52"
+          show-search
+          :filter-option="filterOption"
+          :disabled="isMoney && isPg"
+        >
+          <a-select-option v-for="(currencyLocale, i) in currencyLocaleList ?? []" :key="i" :value="currencyLocale.value">
+            {{ currencyLocale.text }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+    </a-col>
+    <a-col :span="12">
+      <a-form-item v-bind="validateInfos['meta.currency_code']" label="Currency Code">
+        <a-select
+          v-model:value="formState.meta.currency_code"
+          class="w-52"
+          show-search
+          :filter-option="filterOption"
+          size="small"
+          :disabled="isMoney && isPg"
+        >
+          <a-select-option v-for="(currencyCode, i) in currencyList ?? []" :key="i" :value="currencyCode">
+            {{ currencyCode }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+    </a-col>
+    <a-col v-if="isMoney && isPg">
+      <span class="text-[#FB8C00]">{{ message }}</span>
+    </a-col>
+  </a-row>
 </template>

From 238bab2ebaff5db29a89e709ecfe4c8dc833f64d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 12:54:05 +0800
Subject: [PATCH 18/35] fix(gui-v2): fix icon precedence issue

---
 packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
index 0c05c1a8a5..b288da87d3 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
@@ -54,8 +54,6 @@ const icon = computed(() => {
     return AttachmentIcon
   } else if (additionalColMeta.isDecimal) {
     return DecimalIcon
-  } else if (additionalColMeta.isInt || additionalColMeta.isFloat) {
-    return NumericIcon
   } else if (additionalColMeta.isPhoneNumber) {
     return FilePhoneIcon
   }
@@ -68,6 +66,8 @@ const icon = computed(() => {
     return CurrencyIcon
   } else if (additionalColMeta.isPercent) {
     return PercentIcon
+  } else if (additionalColMeta.isInt || additionalColMeta.isFloat) {
+    return NumericIcon
   } else if (additionalColMeta.isString) {
     return StringIcon
   } else {

From 37e45ac53a05a1e5f101a59f75203d0e7cac2884 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 13:08:15 +0800
Subject: [PATCH 19/35] refactor(gui-v2): use onSetRef

---
 packages/nc-gui-v2/components/cell/Text.vue | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui-v2/components/cell/Text.vue b/packages/nc-gui-v2/components/cell/Text.vue
index 65fac3f5bc..653842a105 100644
--- a/packages/nc-gui-v2/components/cell/Text.vue
+++ b/packages/nc-gui-v2/components/cell/Text.vue
@@ -15,20 +15,13 @@ const root = ref<HTMLInputElement>()
 
 const vModel = useVModel(props, 'modelValue', emits)
 
-onMounted(() => {
-  root.value?.focus()
-})
-
-watch(
-  () => root.value,
-  (el) => {
-    el?.focus()
-  },
-)
+const onSetRef = (el: HTMLInputElement) => {
+  el.focus()
+}
 </script>
 
 <template>
-  <input v-if="editEnabled" ref="root" v-model="vModel" class="h-full w-full outline-none" />
+  <input v-if="editEnabled" :ref="onSetRef" v-model="vModel" class="h-full w-full outline-none" />
   <span v-else>{{ vModel }}</span>
 </template>
 

From 761cf48ec46104d01fa37492c298d7f0542ac7c6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 15:13:16 +0800
Subject: [PATCH 20/35] feat(gui-v2): include Count

---
 packages/nocodb-sdk/src/lib/UITypes.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index c3b315f218..6689b5f6dc 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -50,6 +50,7 @@ export function isVirtualCol(
     UITypes.Formula,
     UITypes.Rollup,
     UITypes.Lookup,
+    UITypes.Count,
   ].includes(<UITypes>(typeof col === 'object' ? col?.uidt : col));
 }
 

From f5c078f7c3e748448d0d7258198315c52df566f9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 15:13:25 +0800
Subject: [PATCH 21/35] feat(gui-v2): add isCount

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

diff --git a/packages/nc-gui-v2/composables/useVirtualCell.ts b/packages/nc-gui-v2/composables/useVirtualCell.ts
index 06bb61d318..1c8a06c44d 100644
--- a/packages/nc-gui-v2/composables/useVirtualCell.ts
+++ b/packages/nc-gui-v2/composables/useVirtualCell.ts
@@ -20,6 +20,7 @@ export function useVirtualCell(column: ColumnType) {
   const isLookup = computed(() => column.uidt === UITypes.Lookup)
   const isRollup = computed(() => column.uidt === UITypes.Rollup)
   const isFormula = computed(() => column.uidt === UITypes.Formula)
+  const isCount = computed(() => column.uidt === UITypes.Count)
 
   return {
     isHm,
@@ -28,5 +29,6 @@ export function useVirtualCell(column: ColumnType) {
     isLookup,
     isRollup,
     isFormula,
+    isCount,
   }
 }

From b1ec9c189519eb81ca1d699cbd92d77d7c1840b6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 15:13:35 +0800
Subject: [PATCH 22/35] feat(gui-v2): add VirtualCellCount

---
 packages/nc-gui-v2/components/smartsheet/VirtualCell.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/VirtualCell.vue b/packages/nc-gui-v2/components/smartsheet/VirtualCell.vue
index 4c8a4725ea..47eb8e5cc1 100644
--- a/packages/nc-gui-v2/components/smartsheet/VirtualCell.vue
+++ b/packages/nc-gui-v2/components/smartsheet/VirtualCell.vue
@@ -15,7 +15,7 @@ const emit = defineEmits(['update:modelValue'])
 provide(ColumnInj, column)
 provide('value', value)
 
-const { isLookup, isBt, isRollup, isMm, isHm, isFormula } = useVirtualCell(column)
+const { isLookup, isBt, isRollup, isMm, isHm, isFormula, isCount } = useVirtualCell(column)
 </script>
 
 <template>
@@ -25,6 +25,7 @@ const { isLookup, isBt, isRollup, isMm, isHm, isFormula } = useVirtualCell(colum
     <VirtualCellBelongsTo v-else-if="isBt" />
     <VirtualCellRollup v-else-if="isRollup" />
     <VirtualCellFormula v-else-if="isFormula" />
+    <VirtualCellCount v-else-if="isCount" />
 
     <!--    <v-lazy> -->
     <!--      <has-many-cell

From b6e841b5cd62523fd106390f9e2336161ee788aa Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 15:13:43 +0800
Subject: [PATCH 23/35] feat(gui-v2): add count icon

---
 .../nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue
index 9d91c76f80..bad6fd56b3 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/VirtualCellIcon.vue
@@ -8,6 +8,7 @@ import BTIcon from '~icons/mdi/table-arrow-left'
 import MMIcon from '~icons/mdi/table-network'
 import FormulaIcon from '~icons/mdi/math-integral'
 import RollupIcon from '~icons/mdi/movie-roll'
+import CountIcon from '~icons/mdi/counter'
 
 const { columnMeta } = defineProps<{ columnMeta?: ColumnType }>()
 
@@ -31,6 +32,8 @@ const icon = computed(() => {
       return GenericIcon
     case UITypes.Rollup:
       return RollupIcon
+    case UITypes.Count:
+      return CountIcon
   }
   return GenericIcon
 })

From af9b9d7c070fd710bdde989f9ef1880da6d2a87c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 15:13:58 +0800
Subject: [PATCH 24/35] wip(gui-v2): add count draft

---
 packages/nc-gui-v2/components/virtual-cell/Count.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/nc-gui-v2/components/virtual-cell/Count.vue

diff --git a/packages/nc-gui-v2/components/virtual-cell/Count.vue b/packages/nc-gui-v2/components/virtual-cell/Count.vue
new file mode 100644
index 0000000000..ab28802ee2
--- /dev/null
+++ b/packages/nc-gui-v2/components/virtual-cell/Count.vue
@@ -0,0 +1,10 @@
+<script setup lang="ts">
+// TODO: wait for Count Column implementation
+</script>
+
+<template>
+  <span class="prose-sm"></span>
+</template>
+
+<style scoped lang="scss">
+</style>

From f449444103f1e0c67cc42847e6d307e70b12eca5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 2 Aug 2022 15:14:25 +0800
Subject: [PATCH 25/35] chore(gui-v2): lint

---
 packages/nc-gui-v2/components/virtual-cell/Count.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/virtual-cell/Count.vue b/packages/nc-gui-v2/components/virtual-cell/Count.vue
index ab28802ee2..29d0c7176a 100644
--- a/packages/nc-gui-v2/components/virtual-cell/Count.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/Count.vue
@@ -6,5 +6,4 @@
   <span class="prose-sm"></span>
 </template>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

From 77e794bfe9e7e5881fae6c3fb12cdbfa1d39247d Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 05:18:57 +0000
Subject: [PATCH 26/35] docs: update README.md [skip ci]

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d6dfb705db..03af937ccd 100644
--- a/README.md
+++ b/README.md
@@ -449,6 +449,7 @@ Our mission is to provide the most powerful no-code interface for databases whic
   </tr>
   <tr>
     <td align="center"><a href="https://yohanboniface.me"><img src="https://avatars.githubusercontent.com/u/146023?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yohan Boniface</b></sub></a><br /><a href="#translation-yohanboniface" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/drsantam"><img src="https://avatars.githubusercontent.com/u/10681456?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Santam Chakraborty</b></sub></a><br /><a href="#translation-drsantam" title="Translation">🌍</a></td>
   </tr>
 </table>
 

From 9407a7038a06a7e242f7ed6cf88d2d1d1f97435d Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 05:18:58 +0000
Subject: [PATCH 27/35] docs: update .all-contributorsrc [skip ci]

---
 .all-contributorsrc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 08a707910f..fead53513c 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -837,6 +837,15 @@
       "contributions": [
         "translation"
       ]
+    },
+    {
+      "login": "drsantam",
+      "name": "Santam Chakraborty",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10681456?v=4",
+      "profile": "https://github.com/drsantam",
+      "contributions": [
+        "translation"
+      ]
     }
   ],
   "contributorsPerLine": 7,

From fa11ac70c4b987867f2bfad1950d4bb930a633e9 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 13:22:42 +0800
Subject: [PATCH 28/35] refactor(gui-v2): use onSetRef

---
 .../nc-gui-v2/components/cell/TextArea.vue    | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui-v2/components/cell/TextArea.vue b/packages/nc-gui-v2/components/cell/TextArea.vue
index 4552706231..25a6d98b26 100644
--- a/packages/nc-gui-v2/components/cell/TextArea.vue
+++ b/packages/nc-gui-v2/components/cell/TextArea.vue
@@ -11,26 +11,17 @@ const emits = defineEmits(['update:modelValue'])
 
 const editEnabled = inject<boolean>('editEnabled', false)
 
-const root = ref<HTMLInputElement>()
-
 const vModel = useVModel(props, 'modelValue', emits)
 
-onMounted(() => {
-  root.value?.focus()
-})
-
-watch(
-  () => root.value,
-  (el) => {
-    el?.focus()
-  },
-)
+const onSetRef = (el: HTMLInputElement) => {
+  el.focus()
+}
 </script>
 
 <template>
   <textarea
     v-if="editEnabled"
-    ref="root"
+    :ref="onSetRef"
     v-model="vModel"
     rows="4"
     class="h-full w-full min-h-[60px] outline-none"
@@ -44,4 +35,4 @@ watch(
 textarea:focus {
   @apply ring-transparent;
 }
-</style>
+</style>
\ No newline at end of file

From 55a52216c5c02b318181916e0d3ff25797554586 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 13:27:45 +0800
Subject: [PATCH 29/35] refactor(gui-v2): export currencyUtils

---
 .../nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue  | 2 +-
 packages/nc-gui-v2/utils/index.ts                               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index e993d80c26..ae4a95d2a1 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useColumnCreateStoreOrThrow, useProject } from '#imports'
-import { currencyCodes, currencyLocales, validateCurrencyCode, validateCurrencyLocale } from '@/utils/currencyUtils'
+import { currencyCodes, currencyLocales, validateCurrencyCode, validateCurrencyLocale } from '@/utils'
 
 interface Option {
   label: string
diff --git a/packages/nc-gui-v2/utils/index.ts b/packages/nc-gui-v2/utils/index.ts
index 670b4eda04..c5ed685d09 100644
--- a/packages/nc-gui-v2/utils/index.ts
+++ b/packages/nc-gui-v2/utils/index.ts
@@ -10,3 +10,4 @@ export * from './projectCreateUtils'
 export * from './urlUtils'
 export * from './validation'
 export * from './viewUtils'
+export * from './currencyUtils'

From 8020665e0a9b749943cd41714cb010ea21405626 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Wed, 3 Aug 2022 11:01:43 +0530
Subject: [PATCH 30/35] chore/gui-v2-count-cell-added-icon-to-cell-header

---
 packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue | 3 +++
 packages/nc-gui-v2/composables/useColumn.ts                  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
index b288da87d3..4c2be0dd7f 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
@@ -6,6 +6,7 @@ import { useColumn } from '#imports'
 import KeyIcon from '~icons/mdi/key-variant'
 import JSONIcon from '~icons/mdi/code-json'
 // import FKIcon from '~icons/mdi/link-variant'
+import CountIcon from '~icons/mdi/counter'
 import TextAreaIcon from '~icons/mdi/card-text-outline'
 import StringIcon from '~icons/mdi/alpha-a-box-outline'
 import BooleanIcon from '~icons/mdi/check-box-outline'
@@ -56,6 +57,8 @@ const icon = computed(() => {
     return DecimalIcon
   } else if (additionalColMeta.isPhoneNumber) {
     return FilePhoneIcon
+  } else if (additionalColMeta.isCount) {
+    return CountIcon
   }
   // else if(additionalColMeta.isForeignKey) {
   //   return FKIcon
diff --git a/packages/nc-gui-v2/composables/useColumn.ts b/packages/nc-gui-v2/composables/useColumn.ts
index 07d82ea9a5..3bdd4d4934 100644
--- a/packages/nc-gui-v2/composables/useColumn.ts
+++ b/packages/nc-gui-v2/composables/useColumn.ts
@@ -34,6 +34,7 @@ export function useColumn(column: ColumnType) {
   const isDecimal = uiDatatype === UITypes.Decimal
   const isDuration = uiDatatype === UITypes.Duration
   const isPercent = uiDatatype === UITypes.Percent
+  const isCount = uiDatatype === UITypes.Count
   const isAutoSaved = [
     UITypes.SingleLineText,
     UITypes.LongText,
@@ -66,6 +67,7 @@ export function useColumn(column: ColumnType) {
     isEnum,
     isSet,
     isURL,
+    isCount,
     isEmail,
     isAttachment,
     isRating,

From c90c1bab331be31fc51fc220970fd1df15e58070 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Wed, 3 Aug 2022 11:07:45 +0530
Subject: [PATCH 31/35] 
 chore/reverted-gui-v2-count-cell-added-icon-to-cell-header

---
 packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue | 3 ---
 packages/nc-gui-v2/composables/useColumn.ts                  | 2 --
 2 files changed, 5 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
index 4c2be0dd7f..b288da87d3 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
@@ -6,7 +6,6 @@ import { useColumn } from '#imports'
 import KeyIcon from '~icons/mdi/key-variant'
 import JSONIcon from '~icons/mdi/code-json'
 // import FKIcon from '~icons/mdi/link-variant'
-import CountIcon from '~icons/mdi/counter'
 import TextAreaIcon from '~icons/mdi/card-text-outline'
 import StringIcon from '~icons/mdi/alpha-a-box-outline'
 import BooleanIcon from '~icons/mdi/check-box-outline'
@@ -57,8 +56,6 @@ const icon = computed(() => {
     return DecimalIcon
   } else if (additionalColMeta.isPhoneNumber) {
     return FilePhoneIcon
-  } else if (additionalColMeta.isCount) {
-    return CountIcon
   }
   // else if(additionalColMeta.isForeignKey) {
   //   return FKIcon
diff --git a/packages/nc-gui-v2/composables/useColumn.ts b/packages/nc-gui-v2/composables/useColumn.ts
index 3bdd4d4934..07d82ea9a5 100644
--- a/packages/nc-gui-v2/composables/useColumn.ts
+++ b/packages/nc-gui-v2/composables/useColumn.ts
@@ -34,7 +34,6 @@ export function useColumn(column: ColumnType) {
   const isDecimal = uiDatatype === UITypes.Decimal
   const isDuration = uiDatatype === UITypes.Duration
   const isPercent = uiDatatype === UITypes.Percent
-  const isCount = uiDatatype === UITypes.Count
   const isAutoSaved = [
     UITypes.SingleLineText,
     UITypes.LongText,
@@ -67,7 +66,6 @@ export function useColumn(column: ColumnType) {
     isEnum,
     isSet,
     isURL,
-    isCount,
     isEmail,
     isAttachment,
     isRating,

From 335458176ae5ae6c476944d06141e8745c3babaa Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 3 Aug 2022 11:21:42 +0530
Subject: [PATCH 32/35] fix(gui-v2): return type correction of provider

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/composables/useInjectionState/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/composables/useInjectionState/index.ts b/packages/nc-gui-v2/composables/useInjectionState/index.ts
index 6cd0f3dbd9..a714fd5f3c 100644
--- a/packages/nc-gui-v2/composables/useInjectionState/index.ts
+++ b/packages/nc-gui-v2/composables/useInjectionState/index.ts
@@ -3,7 +3,7 @@ import type { InjectionKey } from 'vue'
 export function useInjectionState<Arguments extends any[], Return>(
   composable: (...args: Arguments) => Return,
   keyName = 'InjectionState',
-): readonly [useProvidingState: (...args: Arguments) => void, useInjectedState: () => Return | undefined] {
+): readonly [useInjectionState: (...args: Arguments) => Return, useInjectedState: () => Return | undefined] {
   const key: string | InjectionKey<Return> = Symbol(keyName)
 
   const useProvidingState = (...args: Arguments) => {

From 6bab6683d47c0f26abebc709bc2925ca35b21022 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 13:55:10 +0800
Subject: [PATCH 33/35] chore(gui-v2): run lint

---
 packages/nc-gui-v2/components/cell/TextArea.vue      | 2 +-
 packages/nc-gui-v2/components/dlg/AirtableImport.vue | 3 ++-
 packages/nc-gui-v2/composables/useTableCreate.ts     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui-v2/components/cell/TextArea.vue b/packages/nc-gui-v2/components/cell/TextArea.vue
index 25a6d98b26..e02de3d753 100644
--- a/packages/nc-gui-v2/components/cell/TextArea.vue
+++ b/packages/nc-gui-v2/components/cell/TextArea.vue
@@ -35,4 +35,4 @@ const onSetRef = (el: HTMLInputElement) => {
 textarea:focus {
   @apply ring-transparent;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/nc-gui-v2/components/dlg/AirtableImport.vue b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
index 390c4a4511..6b5ce40636 100644
--- a/packages/nc-gui-v2/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui-v2/components/dlg/AirtableImport.vue
@@ -336,7 +336,8 @@ onBeforeUnmount(() => {
           </div>
         </a-card>
         <div class="flex justify-center items-center">
-          <a-button v-if="showGoToDashboardButton" class="mt-4" size="large" @click="dialogShow = false">Go to Dashboard</a-button
+          <a-button v-if="showGoToDashboardButton" class="mt-4" size="large" @click="dialogShow = false"
+            >Go to Dashboard</a-button
           >
         </div>
       </div>
diff --git a/packages/nc-gui-v2/composables/useTableCreate.ts b/packages/nc-gui-v2/composables/useTableCreate.ts
index 24c7b46943..eba3318570 100644
--- a/packages/nc-gui-v2/composables/useTableCreate.ts
+++ b/packages/nc-gui-v2/composables/useTableCreate.ts
@@ -1,8 +1,8 @@
 import type { TableType } from 'nocodb-sdk'
 import { UITypes } from 'nocodb-sdk'
+import { useToast } from 'vue-toastification'
 import { useProject } from './useProject'
 import { useNuxtApp } from '#app'
-import { useToast } from 'vue-toastification'
 import { extractSdkResponseErrorMsg } from '~/utils/errorUtils'
 
 export function useTableCreate(onTableCreate?: (tableMeta: TableType) => void) {

From 048815d6507158866ca365b383484d821af9cb39 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 16:10:14 +0800
Subject: [PATCH 34/35] fix(gui-v2): revise based on PR comments

---
 .../smartsheet-column/CurrencyOptions.vue     | 60 +++++++++----------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
index ae4a95d2a1..29cf63b9e4 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/CurrencyOptions.vue
@@ -9,45 +9,43 @@ interface Option {
 
 const { formState, validateInfos, setAdditionalValidations, sqlUi, onDataTypeChange, onAlter } = useColumnCreateStoreOrThrow()
 
-const validators = computed(() => {
-  return {
-    'meta.currency_locale': [
-      {
-        validator: (_: any, locale: any) => {
-          return new Promise<void>((resolve, reject) => {
-            if (!validateCurrencyLocale(locale)) {
-              return reject(new Error('Invalid locale'))
-            }
-            resolve()
-          })
-        },
+const validators = {
+  'meta.currency_locale': [
+    {
+      validator: (_: any, locale: any) => {
+        return new Promise<void>((resolve, reject) => {
+          if (!validateCurrencyLocale(locale)) {
+            return reject(new Error('Invalid locale'))
+          }
+          resolve()
+        })
       },
-    ],
-    'meta.currency_code': [
-      {
-        validator: (_: any, currencyCode: any) => {
-          return new Promise<void>((resolve, reject) => {
-            if (!validateCurrencyCode(currencyCode)) {
-              return reject(new Error('Invalid Currency Code'))
-            }
-            resolve()
-          })
-        },
+    },
+  ],
+  'meta.currency_code': [
+    {
+      validator: (_: any, currencyCode: any) => {
+        return new Promise<void>((resolve, reject) => {
+          if (!validateCurrencyCode(currencyCode)) {
+            return reject(new Error('Invalid Currency Code'))
+          }
+          resolve()
+        })
       },
-    ],
-  }
-})
+    },
+  ],
+}
 
 // set additional validations
 setAdditionalValidations({
-  ...validators.value,
+  ...validators,
 })
 
 const { isPg } = useProject()
 
-const currencyList = ref(currencyCodes)
+const currencyList = currencyCodes || []
 
-const currencyLocaleList = ref(currencyLocales())
+const currencyLocaleList = currencyLocales() || []
 
 const isMoney = computed(() => formState.value.dt === 'money')
 
@@ -73,7 +71,7 @@ function filterOption(input: string, option: Option) {
           :filter-option="filterOption"
           :disabled="isMoney && isPg"
         >
-          <a-select-option v-for="(currencyLocale, i) in currencyLocaleList ?? []" :key="i" :value="currencyLocale.value">
+          <a-select-option v-for="(currencyLocale, i) of currencyLocaleList" :key="i" :value="currencyLocale.value">
             {{ currencyLocale.text }}
           </a-select-option>
         </a-select>
@@ -89,7 +87,7 @@ function filterOption(input: string, option: Option) {
           size="small"
           :disabled="isMoney && isPg"
         >
-          <a-select-option v-for="(currencyCode, i) in currencyList ?? []" :key="i" :value="currencyCode">
+          <a-select-option v-for="(currencyCode, i) of currencyList" :key="i" :value="currencyCode">
             {{ currencyCode }}
           </a-select-option>
         </a-select>

From d001a29d560dff800c52c7ceb61f4b804323c7e4 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Wed, 3 Aug 2022 13:54:42 +0530
Subject: [PATCH 35/35] chore/improved-web-icon-naming

---
 packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
index 367beb5458..9bc14966a6 100644
--- a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
+++ b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
@@ -7,7 +7,7 @@ import KeyIcon from '~icons/mdi/key-variant'
 import JSONIcon from '~icons/mdi/code-json'
 import ClockIcon from '~icons/mdi/clock-time-five'
 // import FKIcon from '~icons/mdi/link-variant'
-import Web from '~icons/mdi/web'
+import WebIcon from '~icons/mdi/web'
 import TextAreaIcon from '~icons/mdi/card-text-outline'
 import StringIcon from '~icons/mdi/alpha-a-box-outline'
 import BooleanIcon from '~icons/mdi/check-box-outline'
@@ -69,7 +69,7 @@ const icon = computed(() => {
   //   return FKIcon
   // }
   else if (additionalColMeta.isURL) {
-    return Web
+    return WebIcon
   } else if (additionalColMeta.isCurrency) {
     return CurrencyIcon
   } else if (additionalColMeta.isPercent) {