From 9bc12eaee3cb73ceb72a81d3e6190f328ba022ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D5=A1=C9=A8=D5=BC=C9=A2=D3=84=D5=A1=D6=85=D5=BC=C9=A2?=
 <wingkwong.code@gmail.com>
Date: Sun, 5 Nov 2023 14:55:50 +0800
Subject: [PATCH] refactor(nc-gui): move common datetime utils functions to sdk

---
 .../nc-gui/components/cell/DatePicker.vue     |  2 +-
 .../nc-gui/components/cell/DateTimePicker.vue |  4 +-
 .../dashboard/settings/AuditTab.vue           |  3 +-
 .../dashboard/settings/BaseAudit.vue          |  3 +-
 .../components/notification/Item/Wrapper.vue  |  2 +-
 .../components/project/AccessSettings.vue     | 11 ++-
 .../smartsheet/column/DateOptions.vue         |  3 +-
 .../smartsheet/column/DateTimeOptions.vue     |  3 +-
 .../smartsheet/column/FormulaOptions.vue      |  3 +-
 .../smartsheet/expanded-form/Comments.vue     |  3 +-
 .../nc-gui/components/template/Editor.vue     |  5 +-
 .../components/virtual-cell/Formula.vue       |  3 +-
 .../nc-gui/components/webhook/CallLog.vue     |  3 +-
 .../workspace/CollaboratorsList.vue           |  4 +-
 .../components/workspace/ProjectList.vue      |  3 +-
 .../composables/useMultiSelect/index.ts       |  5 +-
 .../helpers/parsers/CSVTemplateAdapter.ts     |  3 +-
 .../helpers/parsers/ExcelTemplateAdapter.ts   |  3 +-
 packages/nc-gui/utils/dateTimeUtils.ts        | 94 -------------------
 packages/nc-gui/utils/index.ts                |  1 -
 20 files changed, 34 insertions(+), 127 deletions(-)
 delete mode 100644 packages/nc-gui/utils/dateTimeUtils.ts

diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
index 9c81d6842a..6bc13e7a06 100644
--- a/packages/nc-gui/components/cell/DatePicker.vue
+++ b/packages/nc-gui/components/cell/DatePicker.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import dayjs from 'dayjs'
+import { isDateMonthFormat } from 'nocodb-sdk'
 import {
   ActiveCellInj,
   CellClickHookInj,
@@ -10,7 +11,6 @@ import {
   ReadonlyInj,
   computed,
   inject,
-  isDateMonthFormat,
   isDrawerOrModalExist,
   onClickOutside,
   onMounted,
diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index 984806908e..5396e9a513 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -1,18 +1,16 @@
 <script setup lang="ts">
 import dayjs from 'dayjs'
-import { isSystemColumn } from 'nocodb-sdk'
+import { dateFormats, isSystemColumn, timeFormats } from 'nocodb-sdk'
 import {
   ActiveCellInj,
   CellClickHookInj,
   ColumnInj,
   EditColumnInj,
   ReadonlyInj,
-  dateFormats,
   inject,
   isDrawerOrModalExist,
   parseProp,
   ref,
-  timeFormats,
   useBase,
   useSelectedCellKeyupListener,
   watch,
diff --git a/packages/nc-gui/components/dashboard/settings/AuditTab.vue b/packages/nc-gui/components/dashboard/settings/AuditTab.vue
index 186e3c9b75..e88f221d43 100644
--- a/packages/nc-gui/components/dashboard/settings/AuditTab.vue
+++ b/packages/nc-gui/components/dashboard/settings/AuditTab.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { Tooltip as ATooltip, Empty } from 'ant-design-vue'
 import type { AuditType } from 'nocodb-sdk'
-import { ProjectIdInj, h, iconMap, onMounted, storeToRefs, timeAgo, useBase, useGlobal, useI18n, useNuxtApp } from '#imports'
+import { timeAgo } from 'nocodb-sdk'
+import { ProjectIdInj, h, iconMap, onMounted, storeToRefs, useBase, useGlobal, useI18n, useNuxtApp } from '#imports'
 
 const { $api } = useNuxtApp()
 
diff --git a/packages/nc-gui/components/dashboard/settings/BaseAudit.vue b/packages/nc-gui/components/dashboard/settings/BaseAudit.vue
index dd811312aa..bee7acd8a4 100644
--- a/packages/nc-gui/components/dashboard/settings/BaseAudit.vue
+++ b/packages/nc-gui/components/dashboard/settings/BaseAudit.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { Tooltip as ATooltip, Empty } from 'ant-design-vue'
 import type { AuditType } from 'nocodb-sdk'
-import { h, iconMap, onMounted, storeToRefs, timeAgo, useBase, useGlobal, useI18n, useNuxtApp } from '#imports'
+import { timeAgo } from 'nocodb-sdk'
+import { h, iconMap, onMounted, storeToRefs, useBase, useGlobal, useI18n, useNuxtApp } from '#imports'
 
 interface Props {
   sourceId: string
diff --git a/packages/nc-gui/components/notification/Item/Wrapper.vue b/packages/nc-gui/components/notification/Item/Wrapper.vue
index 695ca90889..be36b9f75b 100644
--- a/packages/nc-gui/components/notification/Item/Wrapper.vue
+++ b/packages/nc-gui/components/notification/Item/Wrapper.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { timeAgo } from '#imports'
+import { timeAgo } from 'nocodb-sdk'
 
 const props = defineProps<{
   item: {
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 2bb41eda78..c08b9cb134 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -1,8 +1,15 @@
 <script lang="ts" setup>
+import {
+  OrderedProjectRoles,
+  OrgUserRoles,
+  ProjectRoles,
+  WorkspaceRolesToProjectRoles,
+  extractRolesObj,
+  timeAgo,
+} from 'nocodb-sdk'
 import type { WorkspaceUserRoles } from 'nocodb-sdk'
-import { OrderedProjectRoles, OrgUserRoles, ProjectRoles, WorkspaceRolesToProjectRoles, extractRolesObj } from 'nocodb-sdk'
 import InfiniteLoading from 'v3-infinite-loading'
-import { isEeUI, storeToRefs, timeAgo } from '#imports'
+import { isEeUI, storeToRefs } from '#imports'
 
 const basesStore = useBases()
 const { getProjectUsers, createProjectUser, updateProjectUser, removeProjectUser } = basesStore
diff --git a/packages/nc-gui/components/smartsheet/column/DateOptions.vue b/packages/nc-gui/components/smartsheet/column/DateOptions.vue
index 9d620a5a60..d54bd9e3c0 100644
--- a/packages/nc-gui/components/smartsheet/column/DateOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DateOptions.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { dateFormats, useVModel } from '#imports'
+import { dateFormats } from 'nocodb-sdk'
+import { useVModel } from '#imports'
 
 const props = defineProps<{
   value: any
diff --git a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
index 90386141d3..5ff6875bf1 100644
--- a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { dateFormats, timeFormats, useVModel } from '#imports'
+import { dateFormats, timeFormats } from 'nocodb-sdk'
+import { useVModel } from '#imports'
 
 const props = defineProps<{
   value: any
diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
index c82bb5d4ba..ee7a5ee00d 100644
--- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
@@ -3,7 +3,7 @@ import type { Ref } from 'vue'
 import type { ListItem as AntListItem } from 'ant-design-vue'
 import jsep from 'jsep'
 import type { ColumnType, FormulaType } from 'nocodb-sdk'
-import { UITypes, jsepCurlyHook, substituteColumnIdWithAliasInFormula } from 'nocodb-sdk'
+import { UITypes, jsepCurlyHook, substituteColumnIdWithAliasInFormula, validateDateWithUnknownFormat } from 'nocodb-sdk'
 import {
   MetaInj,
   NcAutocompleteTree,
@@ -18,7 +18,6 @@ import {
   useColumnCreateStoreOrThrow,
   useDebounceFn,
   useVModel,
-  validateDateWithUnknownFormat,
 } from '#imports'
 
 const props = defineProps<{
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 9d6ded8d2b..b8b7c05ba5 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
 import type { AuditType } from 'nocodb-sdk'
+import { timeAgo } from 'nocodb-sdk'
 import { Icon } from '@iconify/vue'
-import { ref, timeAgo, useExpandedFormStoreOrThrow, useGlobal, useRoles, watch } from '#imports'
+import { ref, useExpandedFormStoreOrThrow, useGlobal, useRoles, watch } from '#imports'
 
 const props = defineProps<{
   isLoading: boolean
diff --git a/packages/nc-gui/components/template/Editor.vue b/packages/nc-gui/components/template/Editor.vue
index e0b452b6ae..d88da0e116 100644
--- a/packages/nc-gui/components/template/Editor.vue
+++ b/packages/nc-gui/components/template/Editor.vue
@@ -2,7 +2,7 @@
 import dayjs from 'dayjs'
 import utc from 'dayjs/plugin/utc'
 import type { ColumnType, TableType } from 'nocodb-sdk'
-import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { UITypes, getDateFormat, getDateTimeFormat, isSystemColumn, isVirtualCol, parseStringDate } from 'nocodb-sdk'
 import type { CheckboxChangeEvent } from 'ant-design-vue/es/checkbox/interface'
 import { srcDestMappingColumns, tableColumns } from './utils'
 import {
@@ -18,15 +18,12 @@ import {
   extractSdkResponseErrorMsg,
   fieldLengthValidator,
   fieldRequiredValidator,
-  getDateFormat,
-  getDateTimeFormat,
   getUIDTIcon,
   iconMap,
   inject,
   message,
   nextTick,
   onMounted,
-  parseStringDate,
   reactive,
   ref,
   storeToRefs,
diff --git a/packages/nc-gui/components/virtual-cell/Formula.vue b/packages/nc-gui/components/virtual-cell/Formula.vue
index ba79ea8ed8..164c0f3b48 100644
--- a/packages/nc-gui/components/virtual-cell/Formula.vue
+++ b/packages/nc-gui/components/virtual-cell/Formula.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
+import { handleTZ } from 'nocodb-sdk'
 import type { ColumnType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-import { CellValueInj, ColumnInj, computed, handleTZ, inject, renderValue, replaceUrlsWithLink, useBase } from '#imports'
+import { CellValueInj, ColumnInj, computed, inject, renderValue, replaceUrlsWithLink, useBase } from '#imports'
 
 // todo: column type doesn't have required property `error` - throws in typecheck
 const column = inject(ColumnInj) as Ref<ColumnType & { colOptions: { error: any } }>
diff --git a/packages/nc-gui/components/webhook/CallLog.vue b/packages/nc-gui/components/webhook/CallLog.vue
index fdd1a2183a..9dbe8c3922 100644
--- a/packages/nc-gui/components/webhook/CallLog.vue
+++ b/packages/nc-gui/components/webhook/CallLog.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { HookLogType, HookType } from 'nocodb-sdk'
-import { AutomationLogLevel, extractSdkResponseErrorMsg, onBeforeMount, parseProp, timeAgo, useApi, useGlobal } from '#imports'
+import { timeAgo } from 'nocodb-sdk'
+import { AutomationLogLevel, extractSdkResponseErrorMsg, onBeforeMount, parseProp, useApi, useGlobal } from '#imports'
 
 interface Props {
   hook: HookType
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 5d49a594ed..bc654f4d09 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { OrderedWorkspaceRoles, WorkspaceUserRoles } from 'nocodb-sdk'
-import { storeToRefs, timeAgo, useWorkspace } from '#imports'
+import { OrderedWorkspaceRoles, WorkspaceUserRoles, timeAgo } from 'nocodb-sdk'
+import { storeToRefs, useWorkspace } from '#imports'
 
 const { workspaceRoles, loadRoles } = useRoles()
 
diff --git a/packages/nc-gui/components/workspace/ProjectList.vue b/packages/nc-gui/components/workspace/ProjectList.vue
index 472accbe2f..e3dc21002e 100644
--- a/packages/nc-gui/components/workspace/ProjectList.vue
+++ b/packages/nc-gui/components/workspace/ProjectList.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { Empty } from 'ant-design-vue'
 import type { BaseType } from 'nocodb-sdk'
-import { ProjectRoles, ProjectStatus, WorkspaceUserRoles } from 'nocodb-sdk'
+import { ProjectRoles, ProjectStatus, WorkspaceUserRoles, timeAgo } from 'nocodb-sdk'
 import { nextTick } from '@vue/runtime-core'
 import {
   NcProjectType,
@@ -12,7 +12,6 @@ import {
   navigateTo,
   ref,
   storeToRefs,
-  timeAgo,
   useBases,
   useGlobal,
   useRoles,
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index af4e76add9..17625b9f93 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -3,17 +3,15 @@ import dayjs from 'dayjs'
 import type { Ref } from 'vue'
 import type { MaybeRef } from '@vueuse/core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, dateFormats, isDateMonthFormat, isSystemColumn, isVirtualCol, timeFormats } from 'nocodb-sdk'
 import { parse } from 'papaparse'
 import type { Cell } from './cellRange'
 import { CellRange } from './cellRange'
 import convertCellData from './convertCellData'
 import type { Nullable, Row } from '#imports'
 import {
-  dateFormats,
   extractPkFromRow,
   extractSdkResponseErrorMsg,
-  isDateMonthFormat,
   isDrawerOrModalExist,
   isExpandedCellInputExist,
   isMac,
@@ -21,7 +19,6 @@ import {
   message,
   reactive,
   ref,
-  timeFormats,
   unref,
   useBase,
   useCopy,
diff --git a/packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts b/packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts
index 002e8b0e87..522dc75dfc 100644
--- a/packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts
+++ b/packages/nc-gui/helpers/parsers/CSVTemplateAdapter.ts
@@ -1,7 +1,6 @@
 import { parse } from 'papaparse'
 import type { UploadFile } from 'ant-design-vue'
-import { UITypes } from 'nocodb-sdk'
-import { getDateFormat, validateDateWithUnknownFormat } from '../../utils/dateTimeUtils'
+import { UITypes, getDateFormat, validateDateWithUnknownFormat } from 'nocodb-sdk'
 import {
   extractMultiOrSingleSelectProps,
   getCheckboxValue,
diff --git a/packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts b/packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts
index 80aa8daa58..ba50f84d50 100644
--- a/packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts
+++ b/packages/nc-gui/helpers/parsers/ExcelTemplateAdapter.ts
@@ -1,5 +1,4 @@
-import { UITypes } from 'nocodb-sdk'
-import { getDateFormat } from '../../utils/dateTimeUtils'
+import { UITypes, getDateFormat } from 'nocodb-sdk'
 import TemplateGenerator from './TemplateGenerator'
 import {
   extractMultiOrSingleSelectProps,
diff --git a/packages/nc-gui/utils/dateTimeUtils.ts b/packages/nc-gui/utils/dateTimeUtils.ts
deleted file mode 100644
index 997941d471..0000000000
--- a/packages/nc-gui/utils/dateTimeUtils.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import dayjs from 'dayjs'
-
-export const timeAgo = (date: any) => {
-  if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date)) {
-    // if there is no timezone info, consider as UTC
-    // e.g. 2023-01-01 08:00:00 (MySQL)
-    date += '+00:00'
-  }
-  // show in local time
-  return dayjs(date).fromNow()
-}
-
-export const dateMonthFormats = ['YYYY-MM', 'YYYY MM']
-
-export const isDateMonthFormat = (format: string) => dateMonthFormats.includes(format)
-
-export const dateFormats = [
-  'YYYY-MM-DD',
-  'YYYY/MM/DD',
-  'DD-MM-YYYY',
-  'MM-DD-YYYY',
-  'DD/MM/YYYY',
-  'MM/DD/YYYY',
-  'DD MM YYYY',
-  'MM DD YYYY',
-  'YYYY MM DD',
-  ...dateMonthFormats,
-]
-
-export const timeFormats = ['HH:mm', 'HH:mm:ss']
-
-export const handleTZ = (val: any) => {
-  if (val === undefined || val === null) {
-    return
-  }
-  if (typeof val !== 'string') {
-    return val
-  }
-  return val.replace(
-    /((?:-?(?:[1-9][0-9]*)?[0-9]{4})-(?:1[0-2]|0[1-9])-(?:3[01]|0[1-9]|[12][0-9])T(?:2[0-3]|[01][0-9]):(?:[0-5][0-9]):(?:[0-5][0-9])(?:\.[0-9]+)?(?:Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9]))/g,
-    (i, v) => {
-      return dayjs(v).format('YYYY-MM-DD HH:mm')
-    },
-  )
-}
-
-export function validateDateFormat(v: string) {
-  return dateFormats.includes(v)
-}
-
-export function validateDateWithUnknownFormat(v: string) {
-  for (const format of dateFormats) {
-    if (dayjs(v, format, true).isValid() as any) {
-      return true
-    }
-    for (const timeFormat of ['HH:mm', 'HH:mm:ss', 'HH:mm:ss.SSS']) {
-      if (dayjs(v, `${format} ${timeFormat}`, true).isValid() as any) {
-        return true
-      }
-    }
-  }
-  return false
-}
-
-export function getDateFormat(v: string) {
-  for (const format of dateFormats) {
-    if (dayjs(v, format, true).isValid()) {
-      return format
-    }
-  }
-  return 'YYYY/MM/DD'
-}
-
-export function getDateTimeFormat(v: string) {
-  for (const format of dateFormats) {
-    for (const timeFormat of timeFormats) {
-      const dateTimeFormat = `${format} ${timeFormat}`
-      if (dayjs(v, dateTimeFormat, true).isValid() as any) {
-        return dateTimeFormat
-      }
-    }
-  }
-  return 'YYYY/MM/DD'
-}
-
-export function parseStringDate(v: string, dateFormat: string) {
-  const dayjsObj = dayjs(v)
-  if (dayjsObj.isValid()) {
-    v = dayjsObj.format('YYYY-MM-DD')
-  } else {
-    v = dayjs(v, dateFormat).format('YYYY-MM-DD')
-  }
-  return v
-}
diff --git a/packages/nc-gui/utils/index.ts b/packages/nc-gui/utils/index.ts
index 3683188645..afcd69c42a 100644
--- a/packages/nc-gui/utils/index.ts
+++ b/packages/nc-gui/utils/index.ts
@@ -1,6 +1,5 @@
 export * from './NcAutocompleteTree'
 export * from './colorsUtils'
-export * from './dateTimeUtils'
 export * from './deepCompare'
 export * from './formulaUtils'
 export * from './durationUtils'