From f3381252ff98903fb57f5c925eb5522c643d1c76 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 12 Jul 2024 18:22:01 +0000
Subject: [PATCH] fix: avoid deleting foreign key when it's a custom link

---
 .../smartsheet/column/LinkAdvancedOptions.vue | 19 +++++++++++--------
 packages/nocodb/src/helpers/columnHelpers.ts  | 14 +++++++-------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LinkAdvancedOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkAdvancedOptions.vue
index 6b57cc56c0..879a6dd3a5 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkAdvancedOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkAdvancedOptions.vue
@@ -1,6 +1,13 @@
 <script setup lang="ts">
 import { useColumnCreateStoreOrThrow, useVModel, computed, inject, MetaInj, ref, useI18n,useBase, storeToRefs, useMetas } from '#imports'
-import {isVirtualCol, ModelTypes, RelationTypes, UITypes} from "nocodb-sdk";
+import {
+  isCreatedOrLastModifiedByCol,
+  isCreatedOrLastModifiedTimeCol,
+  isVirtualCol,
+  ModelTypes,
+  RelationTypes,
+  UITypes
+} from "nocodb-sdk";
 import type {ColumnType} from "nocodb-sdk";
 
 const props = defineProps<{
@@ -46,7 +53,7 @@ const columns = computed(() => {
     return []
   }
 
-  return meta.value.columns;
+  return meta.value.columns?.filter(c => !isCreatedOrLastModifiedByCol(c) && !isCreatedOrLastModifiedTimeCol(c) && !isVirtualCol(c));
 })
 
 const refTableColumns = computed(() => {
@@ -55,9 +62,7 @@ const refTableColumns = computed(() => {
   }
 
 
-  return metas.value[vModel.value.custom?.ref_model_id]?.columns.filter(
-      (c: ColumnType) => !isVirtualCol(c.uidt as UITypes),
-  )
+  return metas.value[vModel.value.custom?.ref_model_id]?.columns?.filter(c => !isCreatedOrLastModifiedByCol(c) && !isCreatedOrLastModifiedTimeCol(c) && !isVirtualCol(c))
 })
 
 const juncTableColumns = computed(() => {
@@ -66,9 +71,7 @@ const juncTableColumns = computed(() => {
   }
 
 
-  return metas.value[vModel.value.custom?.junc_model_id]?.columns.filter(
-      (c: ColumnType) => !isVirtualCol(c.uidt as UITypes),
-  )
+  return metas.value[vModel.value.custom?.junc_model_id]?.columns?.filter(c => !isCreatedOrLastModifiedByCol(c) && !isCreatedOrLastModifiedTimeCol(c) && !isVirtualCol(c))
 })
 
 
diff --git a/packages/nocodb/src/helpers/columnHelpers.ts b/packages/nocodb/src/helpers/columnHelpers.ts
index b7e955e11e..2d83aa774d 100644
--- a/packages/nocodb/src/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/helpers/columnHelpers.ts
@@ -44,7 +44,7 @@ export async function createHmAndBtColumn(
   isLinks = false,
   colExtra?: any,
   parentColumn?: Column,
-  isCustom = false
+  isCustom = false,
 ) {
   // save bt column
   {
@@ -72,8 +72,8 @@ export async function createHmAndBtColumn(
       ...(type === 'bt' ? colExtra : {}),
       meta: {
         ...(colExtra?.meta || {}),
-        custom: isCustom
-      }
+        custom: isCustom,
+      },
     });
   }
   // save hm column
@@ -86,7 +86,7 @@ export async function createHmAndBtColumn(
       ...(columnMeta || {}),
       plural: columnMeta?.plural || pluralize(child.title),
       singular: columnMeta?.singular || singularize(child.title),
-      custom: isCustom
+      custom: isCustom,
     };
 
     await Column.insert(context, {
@@ -136,7 +136,7 @@ export async function createOOColumn(
   columnMeta = null,
   colExtra?: any,
   parentColumn?: Column,
-  isCustom = false
+  isCustom = false,
 ) {
   // save bt column
   {
@@ -166,7 +166,7 @@ export async function createOOColumn(
         // one-to-one relation is combination of both hm and bt to identify table which have
         // foreign key column(similar to bt) we are adding a boolean flag `bt` under meta
         bt: true,
-        custom: isCustom
+        custom: isCustom,
       },
     });
   }
@@ -186,7 +186,7 @@ export async function createOOColumn(
       ...(columnMeta || {}),
       plural: columnMeta?.plural || pluralize(child.title),
       singular: columnMeta?.singular || singularize(child.title),
-      custom: isCustom
+      custom: isCustom,
     };
 
     await Column.insert(context, {