From db760af901fb86e2a5497d4ea3b0e90f68229c5d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 14 Feb 2023 13:23:33 +0530
Subject: [PATCH] feat: allow editing rollup and lookup column

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../smartsheet/column/EditOrAdd.vue           |   4 +-
 .../smartsheet/column/LookupOptions.vue       |  16 +-
 .../smartsheet/column/RollupOptions.vue       |  13 +-
 .../nocodb/src/lib/meta/api/columnApis.ts     | 197 +++++++++++-------
 4 files changed, 144 insertions(+), 86 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 845f74d574..91004c235b 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/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"
diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index abd1ebaa0f..a24e9dc9bb 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/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"
diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index 1fbe5b9e93..5264e52eeb 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/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>
diff --git a/packages/nocodb/src/lib/meta/api/columnApis.ts b/packages/nocodb/src/lib/meta/api/columnApis.ts
index 69b9e1f962..269a9e73df 100644
--- a/packages/nocodb/src/lib/meta/api/columnApis.ts
+++ b/packages/nocodb/src/lib/meta/api/columnApis.ts
@@ -121,6 +121,95 @@ export async function columnGet(req: Request, res: Response) {
   res.json(await Column.get({ colId: req.params.columnId }));
 }
 
+async function validateRollupPayload(
+  payload: ColumnReqType & { uidt: UITypes }
+) {
+  validateParams(
+    [
+      'title',
+      'fk_relation_column_id',
+      'fk_rollup_column_id',
+      'rollup_function',
+    ],
+    payload
+  );
+
+  const relation = await (
+    await Column.get({
+      colId: (payload as RollupColumnReqType).fk_relation_column_id,
+    })
+  ).getColOptions<LinkToAnotherRecordType>();
+
+  if (!relation) {
+    throw new Error('Relation column not found');
+  }
+
+  let relatedColumn: Column;
+  switch (relation.type) {
+    case 'hm':
+      relatedColumn = await Column.get({
+        colId: relation.fk_child_column_id,
+      });
+      break;
+    case 'mm':
+    case 'bt':
+      relatedColumn = await Column.get({
+        colId: relation.fk_parent_column_id,
+      });
+      break;
+  }
+
+  const relatedTable = await relatedColumn.getModel();
+  if (
+    !(await relatedTable.getColumns()).find(
+      (c) => c.id === (payload as RollupColumnReqType).fk_rollup_column_id
+    )
+  )
+    throw new Error('Rollup column not found in related table');
+}
+
+async function validateLookupPayload(
+  payload: ColumnReqType & { uidt: UITypes }
+) {
+  validateParams(
+    ['title', 'fk_relation_column_id', 'fk_lookup_column_id'],
+    payload
+  );
+
+  const relation = await (
+    await Column.get({
+      colId: (payload as LookupColumnReqType).fk_relation_column_id,
+    })
+  ).getColOptions<LinkToAnotherRecordType>();
+
+  if (!relation) {
+    throw new Error('Relation column not found');
+  }
+
+  let relatedColumn: Column;
+  switch (relation.type) {
+    case 'hm':
+      relatedColumn = await Column.get({
+        colId: relation.fk_child_column_id,
+      });
+      break;
+    case 'mm':
+    case 'bt':
+      relatedColumn = await Column.get({
+        colId: relation.fk_parent_column_id,
+      });
+      break;
+  }
+
+  const relatedTable = await relatedColumn.getModel();
+  if (
+    !(await relatedTable.getColumns()).find(
+      (c) => c.id === (payload 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>
@@ -153,49 +242,7 @@ export async function columnAdd(
   switch (colBody.uidt) {
     case UITypes.Rollup:
       {
-        validateParams(
-          [
-            'title',
-            'fk_relation_column_id',
-            'fk_rollup_column_id',
-            'rollup_function',
-          ],
-          req.body
-        );
-
-        const relation = await (
-          await Column.get({
-            colId: (req.body as RollupColumnReqType).fk_relation_column_id,
-          })
-        ).getColOptions<LinkToAnotherRecordType>();
-
-        if (!relation) {
-          throw new Error('Relation column not found');
-        }
-
-        let relatedColumn: Column;
-        switch (relation.type) {
-          case 'hm':
-            relatedColumn = await Column.get({
-              colId: relation.fk_child_column_id,
-            });
-            break;
-          case 'mm':
-          case 'bt':
-            relatedColumn = await Column.get({
-              colId: relation.fk_parent_column_id,
-            });
-            break;
-        }
-
-        const relatedTable = await relatedColumn.getModel();
-        if (
-          !(await relatedTable.getColumns()).find(
-            (c) =>
-              c.id === (req.body as RollupColumnReqType).fk_rollup_column_id
-          )
-        )
-          throw new Error('Rollup column not found in related table');
+        await validateRollupPayload(req.body);
 
         await Column.insert({
           ...colBody,
@@ -205,44 +252,7 @@ export async function columnAdd(
       break;
     case UITypes.Lookup:
       {
-        validateParams(
-          ['title', 'fk_relation_column_id', 'fk_lookup_column_id'],
-          req.body
-        );
-
-        const relation = await (
-          await Column.get({
-            colId: (req.body as LookupColumnReqType).fk_relation_column_id,
-          })
-        ).getColOptions<LinkToAnotherRecordType>();
-
-        if (!relation) {
-          throw new Error('Relation column not found');
-        }
-
-        let relatedColumn: Column;
-        switch (relation.type) {
-          case 'hm':
-            relatedColumn = await Column.get({
-              colId: relation.fk_child_column_id,
-            });
-            break;
-          case 'mm':
-          case 'bt':
-            relatedColumn = await Column.get({
-              colId: relation.fk_parent_column_id,
-            });
-            break;
-        }
-
-        const relatedTable = await relatedColumn.getModel();
-        if (
-          !(await relatedTable.getColumns()).find(
-            (c) =>
-              c.id === (req.body as LookupColumnReqType).fk_lookup_column_id
-          )
-        )
-          throw new Error('Lookup column not found in related table');
+        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`