From 879267cd4d4b9d64cbddb7e2dcdbf892d4edd5d9 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 24 Aug 2022 23:21:18 +0530
Subject: [PATCH] fix(api): add view column if missing in view columns table

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../api/swagger/helpers/getSwaggerJSON.ts     |  4 +-
 packages/nocodb/src/lib/models/View.ts        | 82 +++++++++++++------
 2 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/packages/nocodb/src/lib/meta/api/swagger/helpers/getSwaggerJSON.ts b/packages/nocodb/src/lib/meta/api/swagger/helpers/getSwaggerJSON.ts
index 9b60ac7d96..19c09a5514 100644
--- a/packages/nocodb/src/lib/meta/api/swagger/helpers/getSwaggerJSON.ts
+++ b/packages/nocodb/src/lib/meta/api/swagger/helpers/getSwaggerJSON.ts
@@ -1,3 +1,5 @@
+import FormViewColumn from '../../../../models/FormViewColumn';
+import GalleryViewColumn from '../../../../models/GalleryViewColumn';
 import Noco from '../../../../Noco';
 import Model from '../../../../models/Model';
 import swaggerBase from './swagger-base.json';
@@ -62,5 +64,5 @@ export default async function getSwaggerJSON(
 
 export interface SwaggerView {
   view: View;
-  columns: Array<GridViewColumn>;
+  columns: Array<GridViewColumn | GalleryViewColumn | FormViewColumn>;
 }
diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts
index 9b2513786e..85e0cb7ed0 100644
--- a/packages/nocodb/src/lib/models/View.ts
+++ b/packages/nocodb/src/lib/models/View.ts
@@ -468,7 +468,7 @@ export default class View implements ViewType {
   static async getColumns(
     viewId: string,
     ncMeta = Noco.ncMeta
-  ): Promise<Array<GridViewColumn | any>> {
+  ): Promise<Array<GridViewColumn | FormViewColumn | GalleryViewColumn>> {
     let columns: Array<GridViewColumn | any> = [];
     const view = await this.get(viewId, ncMeta);
 
@@ -497,8 +497,8 @@ export default class View implements ViewType {
     viewId: string,
     colId: string,
     colData: {
-      order: number;
-      show: boolean;
+      order?: number;
+      show?: boolean;
     },
     ncMeta = Noco.ncMeta
   ): Promise<Array<GridViewColumn | any>> {
@@ -524,10 +524,7 @@ export default class View implements ViewType {
         cacheScope = CacheScope.FORM_VIEW_COLUMN;
         break;
     }
-    const updateObj = {
-      order: colData.order,
-      show: colData.show,
-    };
+    const updateObj = extractProps(colData, ['order', 'show']);
     // get existing cache
     const key = `${cacheScope}:${colId}`;
     let o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
@@ -886,6 +883,15 @@ export default class View implements ViewType {
     const view = await this.get(viewId);
     const table = this.extractViewColumnsTableName(view);
     const scope = this.extractViewColumnsTableNameScope(view);
+
+    const columns = await view
+      .getModel(ncMeta)
+      .then((meta) => meta.getColumns());
+    const viewColumns = await this.getColumns(viewId, ncMeta);
+    const availableColumnsInView = viewColumns.map(
+      (column) => column.fk_column_id
+    );
+
     // get existing cache
     const dataList = await NocoCache.getList(scope, [viewId]);
     if (dataList?.length) {
@@ -898,24 +904,50 @@ export default class View implements ViewType {
         }
       }
     }
-    return await ncMeta.metaUpdate(
-      null,
-      null,
-      table,
-      { show: true },
-      {
-        fk_view_id: viewId,
-      },
-      ignoreColdIds?.length
-        ? {
-            _not: {
-              fk_column_id: {
-                in: ignoreColdIds,
-              },
-            },
-          }
-        : null
-    );
+
+    // insert or update view column
+    for (const col of columns) {
+      const colIndex = availableColumnsInView.indexOf(col.id);
+      if (colIndex > -1) {
+        await this.updateColumn(
+          viewId,
+          viewColumns[colIndex].id,
+          { show: true },
+          ncMeta
+        );
+      } else {
+        await this.insertColumn(
+          {
+            view_id: viewId,
+            order: await ncMeta.metaGetNextOrder(table, {
+              fk_view_id: viewId,
+            }),
+            show: true,
+            fk_column_id: col.id,
+          },
+          ncMeta
+        );
+      }
+
+      // return await ncMeta.metaUpdate(
+      //   null,
+      //   null,
+      //   table,
+      //   { show: true },
+      //   {
+      //     fk_view_id: viewId,
+      //   },
+      //   ignoreColdIds?.length
+      //     ? {
+      //         _not: {
+      //           fk_column_id: {
+      //             in: ignoreColdIds,
+      //           },
+      //         },
+      //       }
+      //     : null
+      // );
+    }
   }
 
   static async hideAllColumns(