From ea42f838eeb985e27dee00c4b811340cd2c24881 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 6 Jan 2024 08:47:50 +0000
Subject: [PATCH] fix: hide CreatedBy & LastModifiedBy system fields from
 initial field selectors

---
 .../components/smartsheet/toolbar/CreateGroupBy.vue       | 8 +++++++-
 .../nc-gui/components/smartsheet/toolbar/CreateSort.vue   | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/CreateGroupBy.vue b/packages/nc-gui/components/smartsheet/toolbar/CreateGroupBy.vue
index b548925055..82785365f7 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/CreateGroupBy.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/CreateGroupBy.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isCreatedOrLastModifiedByCol, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
 
 const props = defineProps<{
   // As we need to focus search box when the parent is opened
@@ -39,6 +39,12 @@ const options = computed<ColumnType[]>(
             /** ignore virtual fields which are system fields ( mm relation ) and qr code fields */
             return false
           }
+
+          if (isCreatedOrLastModifiedByCol(c)) {
+            /** ignore created by and last modified by system field */
+            return false
+          }
+
           return showSystemFields.value
         } else if (c.uidt === UITypes.QrCode || c.uidt === UITypes.Barcode || c.uidt === UITypes.ID) {
           return false
diff --git a/packages/nc-gui/components/smartsheet/toolbar/CreateSort.vue b/packages/nc-gui/components/smartsheet/toolbar/CreateSort.vue
index aac8dbdd6a..38775b61d7 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/CreateSort.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/CreateSort.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isCreatedOrLastModifiedByCol, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
 
 const props = defineProps<{
   // As we need to focus search box when the parent is opened
@@ -33,6 +33,11 @@ const options = computed<ColumnType[]>(
           return true
         }
         if (isSystemColumn(metaColumnById?.value?.[c.id!])) {
+          if (isCreatedOrLastModifiedByCol(c)) {
+            /** ignore created by and last modified by system field */
+            return false
+          }
+
           return (
             /** hide system columns if not enabled */
             showSystemFields.value