From 2390c06c835882f3020ce88fb7dfa96f6bd8a6cc Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 20 Feb 2024 07:16:15 +0000
Subject: [PATCH] fix(nc-gui): some more fixes

---
 .../nc-gui/components/smartsheet/toolbar/FieldsMenu.vue   | 4 ++--
 packages/nc-gui/composables/useCalendarViewStore.ts       | 3 +--
 packages/nocodb/src/models/View.ts                        | 8 +++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index 935c839d2b..24223a8686 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -370,7 +370,7 @@ useMenuCloseOnEsc(open)
                 <div
                   v-if="
                     filteredFieldList
-                      .filter((el) => el !== gridDisplayValueField && el.title.toLowerCase().includes(filterQuery.toLowerCase()))
+                      .filter((el) => (activeView.type !== ViewTypes.CALENDAR ? el !== gridDisplayValueField : true))
                       .includes(field)
                   "
                   :key="field.id"
@@ -403,7 +403,7 @@ useMenuCloseOnEsc(open)
                   <div class="flex-1" />
                 </div>
               </template>
-              <template v-if="activeView?.type === ViewTypes.GRID || activeView?.type === ViewTypes.CALENDAR" #header>
+              <template v-if="activeView?.type === ViewTypes.GRID" #header>
                 <div
                   v-if="gridDisplayValueField && filteredFieldList[0].title.toLowerCase().includes(filterQuery.toLowerCase())"
                   :key="`pv-${gridDisplayValueField.id}`"
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index 3ef3f335d2..40381ae251 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -37,7 +37,7 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
 
     const { isUIAllowed } = useRoles()
 
-    const displayField = ref<ColumnType>()
+    const displayField = computed(() => meta.value?.columns?.find((c) => c.pv))
 
     const activeCalendarView = ref<'month' | 'year' | 'day' | 'week'>()
 
@@ -530,7 +530,6 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
           fk_to_col: range.fk_to_column_id ? meta.value?.columns!.find((col) => col.id === range.fk_to_column_id) : null,
         }
       }) as any
-      displayField.value = meta.value.columns.find((col) => col.pv)
     }
 
     async function loadCalendarData() {
diff --git a/packages/nocodb/src/models/View.ts b/packages/nocodb/src/models/View.ts
index 7e40d94991..084d5df9fb 100644
--- a/packages/nocodb/src/models/View.ts
+++ b/packages/nocodb/src/models/View.ts
@@ -572,7 +572,13 @@ export default class View implements ViewType {
           await KanbanViewColumn.insert(modifiedInsertObj, ncMeta);
           break;
         case ViewTypes.CALENDAR:
-          await CalendarViewColumn.insert(modifiedInsertObj, ncMeta);
+          await CalendarViewColumn.insert(
+            {
+              ...insertObj,
+              fk_view_id: view.id,
+            },
+            ncMeta,
+          );
           break;
       }
     }