From aedc06dd61c33cbf51492b19db865ccc6f5883b5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 12:26:47 +0800
Subject: [PATCH 1/6] refactor(gui-v2): rename durationHelper -> durationUtils

---
 packages/nc-gui-v2/components/cell/Duration.vue                 | 2 +-
 .../nc-gui-v2/utils/{durationHelper.ts => durationUtils.ts}     | 0
 packages/nc-gui-v2/utils/index.ts                               | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename packages/nc-gui-v2/utils/{durationHelper.ts => durationUtils.ts} (100%)

diff --git a/packages/nc-gui-v2/components/cell/Duration.vue b/packages/nc-gui-v2/components/cell/Duration.vue
index 00a46e0847..149d3af316 100644
--- a/packages/nc-gui-v2/components/cell/Duration.vue
+++ b/packages/nc-gui-v2/components/cell/Duration.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, inject, ref } from '#imports'
 import { ColumnInj } from '~/context'
-import { convertDurationToSeconds, convertMS2Duration, durationOptions } from '~/utils/durationHelper'
+import { convertDurationToSeconds, convertMS2Duration, durationOptions } from '~/utils/durationUtils'
 
 interface Props {
   modelValue: number | string
diff --git a/packages/nc-gui-v2/utils/durationHelper.ts b/packages/nc-gui-v2/utils/durationUtils.ts
similarity index 100%
rename from packages/nc-gui-v2/utils/durationHelper.ts
rename to packages/nc-gui-v2/utils/durationUtils.ts
diff --git a/packages/nc-gui-v2/utils/index.ts b/packages/nc-gui-v2/utils/index.ts
index 670b4eda04..fb9968a96f 100644
--- a/packages/nc-gui-v2/utils/index.ts
+++ b/packages/nc-gui-v2/utils/index.ts
@@ -1,7 +1,7 @@
 export * from './colorsUtils'
 export * from './dateTimeUtils'
 export * from './deepCompare'
-export * from './durationHelper'
+export * from './durationUtils'
 export * from './errorUtils'
 export * from './fileUtils'
 export * from './filterUtils'

From da0d2617669b149da0b2a4efbfcd8b69b6be97a5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 12:27:13 +0800
Subject: [PATCH 2/6] feat(gui-v2): include SmartsheetColumnDurationOptions

---
 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..659238e984 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'
@@ -84,6 +85,8 @@ watchEffect(() => {
         </a-select>
       </a-form-item>
 
+      <SmartsheetColumnDurationOptions v-if="formState.uidt === UITypes.Duration" />
+
       <div>
         <div
           class="text-xs cursor-pointer text-grey nc-more-options my-2 flex align-center gap-1 justify-end"

From ba31b2a44d32ddd51d5a3f37757899360c2bf69a Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 12:39:31 +0800
Subject: [PATCH 3/6] feat(gui-v2): add duration options

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

diff --git a/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
new file mode 100644
index 0000000000..8e891f137e
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import { useColumnCreateStoreOrThrow } from '#imports'
+import { durationOptions } from '@/utils/durationUtils'
+
+const { formState, validateInfos, setAdditionalValidations, sqlUi, onDataTypeChange, onAlter } = useColumnCreateStoreOrThrow()
+
+const durationOptionList = computed(() =>
+  durationOptions.map((o: Record<string, any>) => ({
+    ...o,
+    // h:mm:ss (e.g. 3:45, 1:23:40)
+    title: `${o.title} ${o.example}`,
+  })),
+)
+</script>
+
+<template>
+  <a-row>
+    <a-col :span="24">
+      <span class="prose-sm mt-2">A duration of time in minutes or seconds (e.g. 1:23).</span>
+    </a-col>
+    <a-col :span="24">
+      <a-form-item label="Duration Format">
+        <a-select v-model:value="formState.meta.duration" size="small" class="w-52">
+          <a-select-option v-for="(duration, i) in durationOptionList ?? []" :key="i" :value="duration.id">
+            {{ duration.title }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+    </a-col>
+  </a-row>
+</template>

From 385eff9c1356bc9fa58209691054b032cefbd94e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 13:30:18 +0800
Subject: [PATCH 4/6] refactor(gui-v2): replace @/utils/durationUtils by
 @/utils

---
 .../nc-gui-v2/components/smartsheet-column/DurationOptions.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
index 8e891f137e..97b9f38cad 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useColumnCreateStoreOrThrow } from '#imports'
-import { durationOptions } from '@/utils/durationUtils'
+import { durationOptions } from '@/utils'
 
 const { formState, validateInfos, setAdditionalValidations, sqlUi, onDataTypeChange, onAlter } = useColumnCreateStoreOrThrow()
 

From e9301451a8966433a495ff65d74ca051c19dbe62 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 16:11:56 +0800
Subject: [PATCH 5/6] fix(gui-v2): reduce to just ~/utils

---
 packages/nc-gui-v2/components/cell/Duration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/cell/Duration.vue b/packages/nc-gui-v2/components/cell/Duration.vue
index 149d3af316..9a19351556 100644
--- a/packages/nc-gui-v2/components/cell/Duration.vue
+++ b/packages/nc-gui-v2/components/cell/Duration.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, inject, ref } from '#imports'
 import { ColumnInj } from '~/context'
-import { convertDurationToSeconds, convertMS2Duration, durationOptions } from '~/utils/durationUtils'
+import { convertDurationToSeconds, convertMS2Duration, durationOptions } from '~/utils'
 
 interface Props {
   modelValue: number | string

From 290d3d36b1f8a4d67778c03046b9d84e38fd1702 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 3 Aug 2022 16:13:47 +0800
Subject: [PATCH 6/6] fix(gui-v2): remove unnecessary computed & type

---
 .../components/smartsheet-column/DurationOptions.vue     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
index 97b9f38cad..09bb007926 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/DurationOptions.vue
@@ -4,13 +4,12 @@ import { durationOptions } from '@/utils'
 
 const { formState, validateInfos, setAdditionalValidations, sqlUi, onDataTypeChange, onAlter } = useColumnCreateStoreOrThrow()
 
-const durationOptionList = computed(() =>
-  durationOptions.map((o: Record<string, any>) => ({
+const durationOptionList =
+  durationOptions.map((o) => ({
     ...o,
     // h:mm:ss (e.g. 3:45, 1:23:40)
     title: `${o.title} ${o.example}`,
-  })),
-)
+  })) || []
 </script>
 
 <template>
@@ -21,7 +20,7 @@ const durationOptionList = computed(() =>
     <a-col :span="24">
       <a-form-item label="Duration Format">
         <a-select v-model:value="formState.meta.duration" size="small" class="w-52">
-          <a-select-option v-for="(duration, i) in durationOptionList ?? []" :key="i" :value="duration.id">
+          <a-select-option v-for="(duration, i) of durationOptionList" :key="i" :value="duration.id">
             {{ duration.title }}
           </a-select-option>
         </a-select>