chore(gui-v2): rebase

packages/nc-gui-v2/components.d.ts

@@ -40,6 +40,8 @@ declare module '@vue/runtime-core' {
     AModal: typeof import('ant-design-vue/es')['Modal']
     APagination: typeof import('ant-design-vue/es')['Pagination']
     APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
+    ARadio: typeof import('ant-design-vue/es')['Radio']
+    ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
     ARate: typeof import('ant-design-vue/es')['Rate']
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']

packages/nc-gui-v2/components/smartsheet-column/DateOptions.vue

@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import { useColumnCreateStoreOrThrow } from '#imports'
+import { dateFormats } from '~/utils'
+
+const { formState } = $(useColumnCreateStoreOrThrow())
+
+if (!formState.meta?.date_format) {
+  if (!formState.meta) formState.meta = {}
+  formState.meta.date_format = dateFormats[0]
+}
+</script>
+
+<template>
+  <a-form-item label="Date Format">
+    <a-select v-model:value="formState.meta.date_format" size="small">
+      <a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format">
+        <div class="flex flex-row items-center">
+          <div class="text-xs">
+            {{ format }}
+          </div>
+        </div>
+      </a-select-option>
+    </a-select>
+  </a-form-item>
+</template>

packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { UITypes } from 'nocodb-sdk'
+import { UITypes, isVirtualCol } from 'nocodb-sdk'
 import { computed, inject, useColumnCreateStoreOrThrow, useMetas, watchEffect } from '#imports'
 import { MetaInj } from '~/context'
 import { uiTypes } from '~/utils/columnUtils'
@@ -123,16 +123,20 @@ watch(
       <SmartsheetColumnRatingOptions v-if="formState.uidt === UITypes.Rating" />
       <SmartsheetColumnCheckboxOptions v-if="formState.uidt === UITypes.Checkbox" />
       <SmartsheetColumnLookupOptions v-if="formState.uidt === UITypes.Lookup" />
-
-      <div>
-        <div
-          class="text-xs cursor-pointer text-grey nc-more-options my-2 flex align-center gap-1 justify-end"
-          @click="advancedOptions = !advancedOptions"
-        >
-          {{ advancedOptions ? $t('general.hideAll') : $t('general.showMore') }}
-          <component :is="advancedOptions ? MdiMinusIcon : MdiPlusIcon" />
-        </div>
+      <SmartsheetColumnDateOptions v-if="formState.uidt === UITypes.Date" />
+      <SmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" />
+      <SmartsheetColumnLinkedToAnotherRecordOptions v-if="formState.uidt === UITypes.LinkToAnotherRecord" />
+      <SmartsheetColumnSpecificDBTypeOptions v-if="formState.uidt === UITypes.SpecificDBType" />
+
+      <div
+        v-if="!isVirtualCol(formState.uidt)"
+        class="text-xs cursor-pointer text-grey nc-more-options my-2 flex align-center gap-1 justify-end"
+        @click="advancedOptions = !advancedOptions"
+      >
+        {{ advancedOptions ? $t('general.hideAll') : $t('general.showMore') }}
+        <component :is="advancedOptions ? MdiMinusIcon : MdiPlusIcon" />
       </div>
+
       <div class="overflow-hidden" :class="advancedOptions ? 'h-min' : 'h-0'">
         <a-checkbox
           v-if="formState.meta && columnToValidate.includes(formState.uidt)"

packages/nc-gui-v2/components/smartsheet-column/LinkedToAnotherRecordOptions.vue

@@ -0,0 +1,107 @@
+<script setup lang="ts">
+import type { TableType } from 'nocodb-sdk'
+import { ModelTypes, MssqlUi, SqliteUi } from 'nocodb-sdk'
+import { useColumnCreateStoreOrThrow } from '#imports'
+import { MetaInj } from '~/context'
+import MdiPlusIcon from '~icons/mdi/plus-circle-outline'
+import MdiMinusIcon from '~icons/mdi/minus-circle-outline'
+
+const { formState, validateInfos, onDataTypeChange, setAdditionalValidations } = $(useColumnCreateStoreOrThrow())
+const { tables, sqlUi } = $(useProject())
+const meta: TableType = $(inject(MetaInj))
+
+setAdditionalValidations({
+  childId: [{ required: true, message: 'Required' }],
+})
+
+const onUpdateDeleteOptions = sqlUi === MssqlUi ? ['NO ACTION'] : ['NO ACTION', 'CASCADE', 'RESTRICT', 'SET NULL', 'SET DEFAULT']
+
+if (!formState.parentId) formState.parentId = meta.id
+if (!formState.childId) formState.childId = null
+if (!formState.childColumn) formState.childColumn = `${meta.table_name}_id`
+if (!formState.childTable) formState.childTable = meta.table_name
+if (!formState.parentTable) formState.parentTable = formState.rtn || ''
+if (!formState.parentColumn) formState.parentColumn = formState.rcn || ''
+
+if (!formState.type) formState.type = 'hm'
+if (!formState.onUpdate) formState.onUpdate = onUpdateDeleteOptions[0]
+if (!formState.onDelete) formState.onDelete = onUpdateDeleteOptions[0]
+if (!formState.virtual) formState.virtual = sqlUi === SqliteUi
+if (!formState.alias) formState.alias = formState.column_name
+
+const advancedOptions = $(ref(false))
+
+const refTables = $computed(() => {
+  if (!tables || !tables.length) {
+    return []
+  }
+
+  return tables.filter((t) => t.type === ModelTypes.TABLE)
+})
+</script>
+
+<template>
+  <div class="w-full flex flex-col mb-2 mt-4">
+    <div class="border-2 p-4">
+      <a-form-item v-bind="validateInfos.type">
+        <a-radio-group v-model:value="formState.type" name="type" v-bind="validateInfos.type">
+          <a-radio value="hm">Has Many</a-radio>
+          <a-radio value="mm">Many To Many</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item class="flex w-full pb-2 mt-4" :label="$t('labels.childTable')" v-bind="validateInfos.childId">
+        <a-select v-model:value="formState.childId" size="small" @change="onDataTypeChange">
+          <a-select-option v-for="(table, index) in refTables" :key="index" :value="table.id">
+            {{ table.title }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+    </div>
+
+    <div
+      class="text-xs cursor-pointer text-grey nc-more-options my-2 flex align-center gap-1 justify-end"
+      @click="advancedOptions = !advancedOptions"
+    >
+      {{ advancedOptions ? $t('general.hideAll') : $t('general.showMore') }}
+      <component :is="advancedOptions ? MdiMinusIcon : MdiPlusIcon" />
+    </div>
+
+    <div v-if="advancedOptions" class="flex flex-col p-4 border-2 mt-2">
+      <div class="flex flex-row space-x-2">
+        <a-form-item class="flex w-1/2" :label="$t('labels.onUpdate')">
+          <a-select
+            v-model:value="formState.onUpdate"
+            :disabled="formState.virtual"
+            name="onUpdate"
+            size="small"
+            @change="onDataTypeChange"
+          >
+            <a-select-option v-for="(option, index) in onUpdateDeleteOptions" :key="index" :value="option">
+              {{ option }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item class="flex w-1/2" :label="$t('labels.onDelete')">
+          <a-select
+            v-model:value="formState.onDelete"
+            :disabled="formState.virtual"
+            name="onDelete"
+            size="small"
+            @change="onDataTypeChange"
+          >
+            <a-select-option v-for="(option, index) in onUpdateDeleteOptions" :key="index" :value="option">
+              {{ option }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </div>
+      <div class="flex flex-row">
+        <a-form-item>
+          <a-checkbox v-model:checked="formState.virtual" name="virtual" @change="onDataTypeChange">Virtual Relation</a-checkbox>
+        </a-form-item>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>

packages/nc-gui-v2/components/smartsheet-column/RollupOptions.vue

@@ -0,0 +1,98 @@
+<script setup lang="ts">
+import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { useColumnCreateStoreOrThrow } from '#imports'
+import { MetaInj } from '~/context'
+
+const { formState, validateInfos, onDataTypeChange, setAdditionalValidations } = $(useColumnCreateStoreOrThrow())
+const { tables } = $(useProject())
+const meta = $(inject(MetaInj))
+const { metas } = $(useMetas())
+
+setAdditionalValidations({
+  fk_relation_column_id: [{ required: true, message: 'Required' }],
+  fk_rollup_column_id: [{ required: true, message: 'Required' }],
+  rollup_function: [{ required: true, message: 'Required' }],
+})
+
+const relationNames = {
+  mm: 'Many To Many',
+  hm: 'Has Many',
+}
+
+const aggrFunctionsList = [
+  { text: 'count', value: 'count' },
+  { text: 'min', value: 'min' },
+  { text: 'max', value: 'max' },
+  { text: 'avg', value: 'avg' },
+  { text: 'min', value: 'min' },
+  { text: 'sum', value: 'sum' },
+  { text: 'countDistinct', value: 'countDistinct' },
+  { text: 'sumDistinct', value: 'sumDistinct' },
+  { text: 'avgDistinct', value: 'avgDistinct' },
+]
+
+if (!formState.fk_relation_column_id) formState.fk_relation_column_id = null
+if (!formState.fk_rollup_column_id) formState.fk_rollup_column_id = null
+if (!formState.rollup_function) formState.rollup_function = null
+
+const refTables = $computed(() => {
+  if (!tables || !tables.length) {
+    return []
+  }
+
+  return meta.columns
+    .filter((c) => c.uidt === UITypes.LinkToAnotherRecord && c.colOptions.type !== 'bt' && !c.system)
+    .map((c) => ({
+      col: c.colOptions,
+      column: c,
+      ...tables.find((t) => t.id === c.colOptions.fk_related_model_id),
+    }))
+})
+
+const columns = $computed(() => {
+  const selectedTable = refTables.find((t) => t.column.id === formState.fk_relation_column_id)
+  if (!selectedTable?.id) {
+    return []
+  }
+
+  return metas[selectedTable.id].columns.filter((c) => !isVirtualCol(c.uidt) && !isSystemColumn(c))
+})
+</script>
+
+<template>
+  <div class="p-4 w-full flex flex-col border-2 mb-2 mt-4">
+    <div class="w-full flex flex-row space-x-2">
+      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.childTable')" v-bind="validateInfos.fk_relation_column_id">
+        <a-select v-model:value="formState.fk_relation_column_id" size="small" @change="onDataTypeChange">
+          <a-select-option v-for="(table, index) in refTables" :key="index" :value="table.col.fk_column_id">
+            <div class="flex flex-row items-center space-x-0.5">
+              <div class="font-weight-bold text-xs">{{ table.column.title }}</div>
+              <div class="text-[0.45rem]">({{ relationNames[table.col.type] }} {{ table.title || table.table_name }})</div>
+            </div>
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item class="flex w-1/2" :label="$t('labels.childColumn')" v-bind="validateInfos.fk_rollup_column_id">
+        <a-select
+          v-model:value="formState.fk_rollup_column_id"
+          name="fk_rollup_column_id"
+          size="small"
+          @change="onDataTypeChange"
+        >
+          <a-select-option v-for="(column, index) in columns" :key="index" :value="column.id">
+            {{ column.title }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+    </div>
+    <a-form-item label="Aggregate function" v-bind="validateInfos.rollup_function">
+      <a-select v-model:value="formState.rollup_function" size="small" @change="onDataTypeChange">
+        <a-select-option v-for="(func, index) in aggrFunctionsList" :key="index" :value="func.value">
+          {{ func.text }}
+        </a-select-option>
+      </a-select>
+    </a-form-item>
+  </div>
+</template>
+
+<style scoped></style>

packages/nc-gui-v2/components/smartsheet-column/SpecificDBTypeOptions.vue

@@ -0,0 +1,3 @@
+<template>
+  <SmartsheetColumnAdvancedOptions class="mt-4" />
+</template>

packages/nc-gui-v2/composables/useColumnCreateStore.ts

@@ -198,7 +198,8 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
       }
       onSuccess()
     } catch (e: any) {
-      toast.error(await extractSdkResponseErrorMsg(e))
+      const error = await extractSdkResponseErrorMsg(e)
+      if (error) toast.error(await extractSdkResponseErrorMsg(e))
     }
   }
 

packages/nc-gui-v2/utils/columnUtils.ts

@@ -4,6 +4,7 @@ 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 SpecificDBTypeIcon from '~icons/mdi/database-settings'
 import Attachment from '~icons/mdi/attachment'
 import CheckboxMarkedOutline from '~icons/mdi/checkbox-marked-outline'
 import FormatListBulletedSquare from '~icons/mdi/format-list-bulleted-square'
@@ -25,7 +26,6 @@ import MovieRoll from '~icons/mdi/movie-roll'
 import Counter from '~icons/mdi/counter'
 import CalendarClock from '~icons/mdi/calendar-clock'
 import ID from '~icons/mdi/identifier'
-import DatabaseSettings from '~icons/mdi/database-settings'
 import RulerSquareCompass from '~icons/mdi/ruler-square-compass'
 
 const uiTypes = [
@@ -143,7 +143,7 @@ const uiTypes = [
   },
   {
     name: UITypes.SpecificDBType,
-    icon: DatabaseSettings,
+    icon: SpecificDBTypeIcon,
   },
 ]
 

packages/nc-gui-v2/utils/dateTimeUtils.ts

@@ -6,6 +6,18 @@ export const timeAgo = (date: any) => {
   return dayjs.utc(date).fromNow()
 }
 
+export const dateFormats = [
+  'DD-MM-YYYY',
+  'MM-DD-YYYY',
+  'YYYY-MM-DD',
+  'DD/MM/YYYY',
+  'MM/DD/YYYY',
+  'YYYY/MM/DD',
+  'DD MM YYYY',
+  'MM DD YYYY',
+  'YYYY MM DD',
+]
+
 export const handleTZ = (val: any) => {
   if (!val) {
     return
@@ -21,25 +33,13 @@ export const handleTZ = (val: any) => {
   )
 }
 
-export const dateFormat = [
-  'DD-MM-YYYY',
-  'MM-DD-YYYY',
-  'YYYY-MM-DD',
-  'DD/MM/YYYY',
-  'MM/DD/YYYY',
-  'YYYY/MM/DD',
-  'DD MM YYYY',
-  'MM DD YYYY',
-  'YYYY MM DD',
-]
-
 export function validateDateFormat(v: string) {
-  return dateFormat.includes(v)
+  return dateFormats.includes(v)
 }
 
 export function validateDateWithUnknownFormat(v: string) {
   let res = 0
-  for (const format of dateFormat) {
+  for (const format of dateFormats) {
     res |= dayjs(v, format, true).isValid() as any
   }
   return res