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] 
 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,