feat: allow editing rollup and lookup column

Signed-off-by: Pranav C <pranavxc@gmail.com>

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

@@ -181,10 +181,10 @@ useEventListener('keydown', (e: KeyboardEvent) => {
         <LazySmartsheetColumnDurationOptions v-if="formState.uidt === UITypes.Duration" v-model:value="formState" />
         <LazySmartsheetColumnRatingOptions v-if="formState.uidt === UITypes.Rating" v-model:value="formState" />
         <LazySmartsheetColumnCheckboxOptions v-if="formState.uidt === UITypes.Checkbox" v-model:value="formState" />
-        <LazySmartsheetColumnLookupOptions v-if="!isEdit && formState.uidt === UITypes.Lookup" v-model:value="formState" />
+        <LazySmartsheetColumnLookupOptions v-if="formState.uidt === UITypes.Lookup" v-model:value="formState" />
         <LazySmartsheetColumnDateOptions v-if="formState.uidt === UITypes.Date" v-model:value="formState" />
         <LazySmartsheetColumnDateTimeOptions v-if="formState.uidt === UITypes.DateTime" v-model:value="formState" />
-        <LazySmartsheetColumnRollupOptions v-if="!isEdit && formState.uidt === UITypes.Rollup" v-model:value="formState" />
+        <LazySmartsheetColumnRollupOptions v-if="formState.uidt === UITypes.Rollup" v-model:value="formState" />
         <LazySmartsheetColumnLinkedToAnotherRecordOptions
           v-if="!isEdit && formState.uidt === UITypes.LinkToAnotherRecord"
           v-model:value="formState"

packages/nc-gui/components/smartsheet/column/LookupOptions.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
 import { UITypes, isSystemColumn } from 'nocodb-sdk'
 import { getRelationName } from './utils'
@@ -14,7 +15,7 @@ const vModel = useVModel(props, 'value', emit)
 
 const meta = $(inject(MetaInj, ref()))
 
-const { setAdditionalValidations, validateInfos, onDataTypeChange } = useColumnCreateStoreOrThrow()
+const { setAdditionalValidations, validateInfos, onDataTypeChange, isEdit } = useColumnCreateStoreOrThrow()
 
 const { tables } = $(useProject())
 
@@ -51,12 +52,23 @@ const columns = $computed<ColumnType[]>(() => {
   }
   return metas[selectedTable.id].columns.filter((c: ColumnType) => !isSystemColumn(c))
 })
+
+
+onMounted(() => {
+  if (isEdit.value) {
+    vModel.value.fk_lookup_column_id = vModel.value.colOptions?.fk_lookup_column_id
+    vModel.value.fk_relation_column_id = vModel.value.colOptions?.fk_relation_column_id
+    // delete vModel.value.colOptions
+  }
+})
+
 </script>
 
 <template>
   <div class="p-6 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.linkToAnotherRecord')" v-bind="validateInfos.fk_relation_column_id">
+      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.linkToAnotherRecord')"
+                   v-bind="validateInfos.fk_relation_column_id">
         <a-select
           v-model:value="vModel.fk_relation_column_id"
           dropdown-class-name="!w-64 nc-dropdown-relation-table"

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

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { onMounted } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
 import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { getRelationName } from './utils'
@@ -14,7 +15,7 @@ const vModel = useVModel(props, 'value', emit)
 
 const meta = $(inject(MetaInj, ref()))
 
-const { setAdditionalValidations, validateInfos, onDataTypeChange } = useColumnCreateStoreOrThrow()
+const { setAdditionalValidations, validateInfos, onDataTypeChange, isEdit } = useColumnCreateStoreOrThrow()
 
 const { tables } = $(useProject())
 
@@ -71,6 +72,16 @@ const columns = $computed(() => {
 
   return metas[selectedTable.id].columns.filter((c: ColumnType) => !isVirtualCol(c.uidt as UITypes) && !isSystemColumn(c))
 })
+
+
+onMounted(() => {
+  if (isEdit.value) {
+    vModel.value.fk_relation_column_id = vModel.value.colOptions?.fk_relation_column_id
+    vModel.value.fk_rollup_column_id = vModel.value.colOptions?.fk_rollup_column_id
+    vModel.value.rollup_function = vModel.value.colOptions?.rollup_function
+    // delete vModel.value.colOptions
+  }
+})
 </script>
 
 <template>

packages/nocodb/src/lib/meta/api/columnApis.ts

@@ -121,38 +121,9 @@ export async function columnGet(req: Request, res: Response) {
   res.json(await Column.get({ colId: req.params.columnId }));
 }
 
-export async function columnAdd(
+async function validateRollupPayload(
-  req: Request<any, any, ColumnReqType & { uidt: UITypes }>,
+  payload: ColumnReqType & { uidt: UITypes }
-  res: Response<TableType>
-) {
-  const table = await Model.getWithInfo({
-    id: req.params.tableId,
-  });
-  const base = await Base.get(table.base_id);
-  const project = await base.getProject();
-
-  if (
-    !isVirtualCol(req.body) &&
-    !(await Column.checkTitleAvailable({
-      column_name: req.body.column_name,
-      fk_model_id: req.params.tableId,
-    }))
-  ) {
-    NcError.badRequest('Duplicate column name');
-  }
-  if (
-    !(await Column.checkAliasAvailable({
-      title: req.body.title || req.body.column_name,
-      fk_model_id: req.params.tableId,
-    }))
 ) {
-    NcError.badRequest('Duplicate column alias');
-  }
-
-  let colBody: any = req.body;
-  switch (colBody.uidt) {
-    case UITypes.Rollup:
-      {
   validateParams(
     [
       'title',
@@ -160,12 +131,12 @@ export async function columnAdd(
       'fk_rollup_column_id',
       'rollup_function',
     ],
-          req.body
+    payload
   );
 
   const relation = await (
     await Column.get({
-            colId: (req.body as RollupColumnReqType).fk_relation_column_id,
+      colId: (payload as RollupColumnReqType).fk_relation_column_id,
     })
   ).getColOptions<LinkToAnotherRecordType>();
 
@@ -191,28 +162,23 @@ export async function columnAdd(
   const relatedTable = await relatedColumn.getModel();
   if (
     !(await relatedTable.getColumns()).find(
-            (c) =>
+      (c) => c.id === (payload as RollupColumnReqType).fk_rollup_column_id
-              c.id === (req.body as RollupColumnReqType).fk_rollup_column_id
     )
   )
     throw new Error('Rollup column not found in related table');
-
-        await Column.insert({
-          ...colBody,
-          fk_model_id: table.id,
-        });
 }
-      break;
+
-    case UITypes.Lookup:
+async function validateLookupPayload(
-      {
+  payload: ColumnReqType & { uidt: UITypes }
+) {
   validateParams(
     ['title', 'fk_relation_column_id', 'fk_lookup_column_id'],
-          req.body
+    payload
   );
 
   const relation = await (
     await Column.get({
-            colId: (req.body as LookupColumnReqType).fk_relation_column_id,
+      colId: (payload as LookupColumnReqType).fk_relation_column_id,
     })
   ).getColOptions<LinkToAnotherRecordType>();
 
@@ -238,11 +204,55 @@ export async function columnAdd(
   const relatedTable = await relatedColumn.getModel();
   if (
     !(await relatedTable.getColumns()).find(
-            (c) =>
+      (c) => c.id === (payload as LookupColumnReqType).fk_lookup_column_id
-              c.id === (req.body as LookupColumnReqType).fk_lookup_column_id
     )
   )
     throw new Error('Lookup column not found in related table');
+}
+
+export async function columnAdd(
+  req: Request<any, any, ColumnReqType & { uidt: UITypes }>,
+  res: Response<TableType>
+) {
+  const table = await Model.getWithInfo({
+    id: req.params.tableId,
+  });
+  const base = await Base.get(table.base_id);
+  const project = await base.getProject();
+
+  if (
+    !isVirtualCol(req.body) &&
+    !(await Column.checkTitleAvailable({
+      column_name: req.body.column_name,
+      fk_model_id: req.params.tableId,
+    }))
+  ) {
+    NcError.badRequest('Duplicate column name');
+  }
+  if (
+    !(await Column.checkAliasAvailable({
+      title: req.body.title || req.body.column_name,
+      fk_model_id: req.params.tableId,
+    }))
+  ) {
+    NcError.badRequest('Duplicate column alias');
+  }
+
+  let colBody: any = req.body;
+  switch (colBody.uidt) {
+    case UITypes.Rollup:
+      {
+        await validateRollupPayload(req.body);
+
+        await Column.insert({
+          ...colBody,
+          fk_model_id: table.id,
+        });
+      }
+      break;
+    case UITypes.Lookup:
+      {
+        await validateLookupPayload(req.body);
 
         await Column.insert({
           ...colBody,
@@ -753,6 +763,30 @@ export async function columnSetAsPrimary(req: Request, res: Response) {
   res.json(await Model.updatePrimaryColumn(column.fk_model_id, column.id));
 }
 
+const isAllPropsPresent = (obj: Record<string, any>, props: string[]) => {
+  return props.every((prop) => obj[prop]);
+};
+
+async function updateRollupOrLookup(colBody: any, column: Column<any>) {
+  if (
+    UITypes.Lookup === column.uidt &&
+    isAllPropsPresent(colBody, ['fk_lookup_column_id', 'fk_relation_column_id'])
+  ) {
+    await validateLookupPayload(colBody);
+    await Column.update(column.id, colBody);
+  } else if (
+    UITypes.Rollup === column.uidt &&
+    isAllPropsPresent(colBody, [
+      'fk_relation_column_id',
+      'fk_rollup_column_id',
+      'rollup_function',
+    ])
+  ) {
+    await validateRollupPayload(colBody);
+    await Column.update(column.id, colBody);
+  }
+}
+
 export async function columnUpdate(req: Request, res: Response<TableType>) {
   const column = await Column.get({ colId: req.params.columnId });
 
@@ -824,6 +858,7 @@ export async function columnUpdate(req: Request, res: Response<TableType>) {
           title: colBody.title,
         });
       }
+      await updateRollupOrLookup(colBody, column);
     } else {
       NcError.notImplemented(
         `Updating ${colBody.uidt} => ${colBody.uidt} is not implemented`