From 93a274a365f00dedfd1dad5021439e0f51f91054 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Sat, 2 Mar 2024 12:01:11 +0000
Subject: [PATCH 001/253] feat(nc-gui): refresh year view

---
 .../nc-gui/components/nc/DateWeekSelector.vue | 46 +++++++++++++++----
 .../smartsheet/calendar/SideMenu.vue          | 21 +++++----
 .../smartsheet/calendar/YearView.vue          |  3 +-
 .../components/smartsheet/calendar/index.vue  |  9 +++-
 4 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index fbc3cd604e..a1ea8b0a92 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -2,6 +2,7 @@
 import dayjs from 'dayjs'
 
 interface Props {
+  size?: 'small' | 'medium'
   selectedDate?: dayjs.Dayjs | null
   isDisabled?: boolean
   pageDate?: dayjs.Dayjs
@@ -16,6 +17,7 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
+  size: 'medium',
   selectedDate: null,
   isDisabled: false,
   isMondayFirst: true,
@@ -135,7 +137,7 @@ const paginate = (action: 'next' | 'prev') => {
 </script>
 
 <template>
-  <div class="px-4 pt-3 pb-4 flex flex-col gap-4">
+  <div class="flex flex-col gap-4">
     <div
       :class="{
         'justify-center': disablePagination,
@@ -163,12 +165,31 @@ const paginate = (action: 'next' | 'prev') => {
       </NcTooltip>
     </div>
     <div class="border-1 border-gray-200 rounded-y-xl max-w-[320px]">
-      <div class="flex flex-row bg-gray-100 gap-2 rounded-t-xl justify-between px-2">
-        <span v-for="(day, index) in days" :key="index" class="h-9 flex items-center justify-center w-9 text-gray-500">{{
-          day
-        }}</span>
+      <div
+        :class="{
+          'gap-1 px-1': size === 'small',
+          'gap-2 px-2': size === 'medium',
+        }"
+        class="flex flex-row bg-gray-100 rounded-t-xl justify-between"
+      >
+        <span
+          v-for="(day, index) in days"
+          :key="index"
+          :class="{
+            'w-9 h-9': size === 'medium',
+            'w-8 h-8': size === 'small',
+          }"
+          class="flex items-center justify-center text-gray-500"
+          >{{ day }}</span
+        >
       </div>
-      <div class="grid grid-cols-7 gap-2 p-2">
+      <div
+        :class="{
+          'gap-2 p-2': size === 'medium',
+          'gap-1 p-1': size === 'small',
+        }"
+        class="grid grid-cols-7"
+      >
         <span
           v-for="(date, index) in dates"
           :key="index"
@@ -181,12 +202,21 @@ const paginate = (action: 'next' | 'prev') => {
             'nc-selected-week-start': isSameDate(date, selectedWeek?.start),
             'nc-selected-week-end': isSameDate(date, selectedWeek?.end),
             'rounded-md bg-brand-50 nc-calendar-today text-brand-500': isSameDate(date, dayjs()) && isDateInCurrentMonth(date),
+            'h-9 w-9': size === 'medium',
+            'h-8 w-8': size === 'small',
           }"
-          class="h-9 w-9 px-1 py-2 relative font-medium flex items-center cursor-pointer justify-center"
+          class="px-1 py-1 relative font-medium flex items-center cursor-pointer justify-center"
           data-testid="nc-calendar-date"
           @click="handleSelectDate(date)"
         >
-          <span v-if="isActiveDate(date)" class="absolute z-2 h-1.5 w-1.5 rounded-full bg-brand-500 top-1 right-1"></span>
+          <span
+            v-if="isActiveDate(date)"
+            :class="{
+              'h-1.5 w-1.5': size === 'medium',
+              'h-1 w-1': size === 'small',
+            }"
+            class="absolute z-2 rounded-full bg-brand-500 top-1 right-1"
+          ></span>
           <span class="z-2">
             {{ date.get('date') }}
           </span>
diff --git a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
index d8ac850f1f..250056a115 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
@@ -269,18 +269,18 @@ const newRecord = () => {
   emit('newRecord', { row, oldRow: {}, rowMeta: { new: true } })
 }
 
-const height = ref(0)
+const width = ref(0)
 
-const heightListener = () => {
-  height.value = window.innerHeight
+const widthListener = () => {
+  width.value = window.innerWidth
 }
 
 onMounted(() => {
-  window.addEventListener('resize', heightListener)
+  window.addEventListener('resize', widthListener)
 })
 
 onUnmounted(() => {
-  window.removeEventListener('resize', heightListener)
+  window.removeEventListener('resize', widthListener)
 })
 </script>
 
@@ -295,7 +295,8 @@ onUnmounted(() => {
   >
     <div
       :class="{
-        '!hidden': height < 918,
+        '!hidden': width < 1440,
+        'px-4 pt-3 pb-4 ': activeCalendarView === ('day' as const) || activeCalendarView === ('week' as const),
       }"
       class="flex flex-col"
     >
@@ -327,7 +328,7 @@ onUnmounted(() => {
 
     <div
       :class="{
-        '!border-t-0': height < 918,
+        '!border-t-0': width < 1440,
       }"
       class="px-4 border-t-1 border-gray-200 relative flex flex-col gap-y-4 pt-3"
     >
@@ -369,9 +370,9 @@ onUnmounted(() => {
         v-if="calendarRange"
         :ref="sideBarListRef"
         :class="{
-          '!h-[calc(100vh-10.5rem)]': height < 918,
-        'h-[calc(100vh-36.2rem)]': activeCalendarView === ('day' as const) || activeCalendarView === ('week' as const) && height > 918,
-        'h-[calc(100vh-25.1rem)]': activeCalendarView === ('month' as const) || activeCalendarView === ('year' as const)  && height > 918,
+          '!h-[calc(100vh-10.5rem)]': width < 1440,
+        'h-[calc(100vh-36.2rem)]': activeCalendarView === ('day' as const) || activeCalendarView === ('week' as const) && width > 1440,
+        'h-[calc(100vh-25.1rem)]': activeCalendarView === ('month' as const) || activeCalendarView === ('year' as const)  && width > 1440,
       }"
         class="gap-2 flex flex-col nc-scrollbar-md overflow-y-auto nc-calendar-top-height"
         data-testid="nc-calendar-side-menu-list"
diff --git a/packages/nc-gui/components/smartsheet/calendar/YearView.vue b/packages/nc-gui/components/smartsheet/calendar/YearView.vue
index 6684ab27af..7f7fdb34b5 100644
--- a/packages/nc-gui/components/smartsheet/calendar/YearView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/YearView.vue
@@ -12,7 +12,7 @@ const months = computed(() => {
 
 <template>
   <div
-    class="flex flex-wrap gap-6 pb-4 items-center justify-center overflow-auto nc-scrollbar-md"
+    class="flex flex-wrap gap-3 py-3 items-center justify-center overflow-auto nc-scrollbar-md"
     data-testid="nc-calendar-year-view"
   >
     <NcDateWeekSelector
@@ -21,6 +21,7 @@ const months = computed(() => {
       v-model:active-dates="activeDates"
       v-model:page-date="months[index]"
       v-model:selected-date="selectedDate"
+      size="small"
       class="max-w-[350px]"
       data-testid="nc-calendar-year-view-month-selector"
       disable-pagination
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index f36d3227fa..7a78f2e3f6 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -194,7 +194,14 @@ const headerText = computed(() => {
             </NcButton>
 
             <template #overlay>
-              <div v-if="calendarRangeDropdown" class="min-w-[22.1rem]" @click.stop>
+              <div
+                v-if="calendarRangeDropdown"
+                :class="{
+                  'px-4 pt-3 pb-4 ': activeCalendarView === 'week' || activeCalendarView === 'day',
+                }"
+                class="min-w-[22.1rem]"
+                @click.stop
+              >
                 <NcDateWeekSelector
                   v-if="activeCalendarView === ('day' as const)"
                   v-model:active-dates="activeDates"

From 871a41590f4886134ed6a0de4c0f6fd76b57053c Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Sat, 2 Mar 2024 12:01:11 +0000
Subject: [PATCH 002/253] feat(nc-gui): sidebar scroll issue

---
 .../smartsheet/calendar/SideMenu.vue          | 91 ++++++++++---------
 packages/nc-gui/utils/browserUtils.ts         |  2 +-
 2 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
index 250056a115..b7791a3031 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
@@ -287,15 +287,17 @@ onUnmounted(() => {
 <template>
   <div
     :class="{
-      'w-0': !props.visible,
-      'w-1/6 min-w-[22.1rem] nc-calendar-side-menu-open': props.visible,
+      '!w-0': !props.visible,
+      'min-w-[356px]': width > 1440 && props.visible,
+      'min-w-[264px]': width <= 1440 && props.visible,
+      'nc-calendar-side-menu-open': props.visible,
     }"
     class="h-full border-l-1 border-gray-200 transition-all"
     data-testid="nc-calendar-side-menu"
   >
     <div
       :class="{
-        '!hidden': width < 1440,
+        '!hidden': width <= 1440,
         'px-4 pt-3 pb-4 ': activeCalendarView === ('day' as const) || activeCalendarView === ('week' as const),
       }"
       class="flex flex-col"
@@ -328,11 +330,11 @@ onUnmounted(() => {
 
     <div
       :class="{
-        '!border-t-0': width < 1440,
+        '!border-t-0': width <= 1440,
       }"
-      class="px-4 border-t-1 border-gray-200 relative flex flex-col gap-y-4 pt-3"
+      class="border-t-1 border-gray-200 relative flex flex-col gap-y-4 pt-3"
     >
-      <div class="flex items-center gap-2">
+      <div class="flex px-4 items-center gap-2">
         <a-input
           v-model:value="searchQuery.value"
           :class="{
@@ -370,11 +372,12 @@ onUnmounted(() => {
         v-if="calendarRange"
         :ref="sideBarListRef"
         :class="{
-          '!h-[calc(100vh-10.5rem)]': width < 1440,
-        'h-[calc(100vh-36.2rem)]': activeCalendarView === ('day' as const) || activeCalendarView === ('week' as const) && width > 1440,
-        'h-[calc(100vh-25.1rem)]': activeCalendarView === ('month' as const) || activeCalendarView === ('year' as const)  && width > 1440,
+         '!h-[calc(100vh-10.5rem)]': width <= 1440,
+        'h-[calc(100vh-36.2rem)]': activeCalendarView === ('day' as const) || activeCalendarView === ('week' as const) && width >= 1440,
+        'h-[calc(100vh-25.1rem)]': activeCalendarView === ('month' as const) || activeCalendarView === ('year' as const)  && width >= 1440,
+   
       }"
-        class="gap-2 flex flex-col nc-scrollbar-md overflow-y-auto nc-calendar-top-height"
+        class="nc-scrollbar-md pl-4 pr-4 overflow-y-auto"
         data-testid="nc-calendar-side-menu-list"
         @scroll="sideBarListScrollHandle"
       >
@@ -398,56 +401,58 @@ onUnmounted(() => {
           </div>
         </div>
         <template v-else-if="renderData.length > 0">
-          <LazySmartsheetRow v-for="(record, rowIndex) in renderData" :key="rowIndex" :row="record">
-            <LazySmartsheetCalendarSideRecordCard
-              :draggable="sideBarFilterOption === 'withoutDates' && activeCalendarView !== 'year'"
-              :from-date="
+          <div class="gap-2 flex flex-col">
+            <LazySmartsheetRow v-for="(record, rowIndex) in renderData" :key="rowIndex" :row="record">
+              <LazySmartsheetCalendarSideRecordCard
+                :draggable="sideBarFilterOption === 'withoutDates' && activeCalendarView !== 'year'"
+                :from-date="
                 record.rowMeta.range?.fk_from_col
                   ? calDataType === UITypes.Date
                     ? dayjs(record.row[record.rowMeta.range.fk_from_col.title!]).format('DD MMM')
                     : dayjs(record.row[record.rowMeta.range.fk_from_col.title!]).format('DD MMM•HH:mm A')
                   : null
               "
-              :invalid="
+                :invalid="
                 record.rowMeta.range!.fk_to_col &&
                 dayjs(record.row[record.rowMeta.range!.fk_from_col.title!]).isAfter(
                   dayjs(record.row[record.rowMeta.range!.fk_to_col.title!]),
                 )
               "
-              :row="record"
-              :to-date="
+                :row="record"
+                :to-date="
                 record.rowMeta.range!.fk_to_col
                   ? calDataType === UITypes.Date
                     ? dayjs(record.row[record.rowMeta.range!.fk_to_col.title!]).format('DD MMM')
                     : dayjs(record.row[record.rowMeta.range!.fk_to_col.title!]).format('DD MMM•HH:mm A')
                   : null
               "
-              color="blue"
-              data-testid="nc-sidebar-record-card"
-              @click="emit('expand-record', record)"
-              @dragstart="dragStart($event, record)"
-              @dragover.prevent
-            >
-              <template v-if="!isRowEmpty(record, displayField)">
-                <div :class="{}">
-                  <LazySmartsheetVirtualCell
-                    v-if="isVirtualCol(displayField)"
-                    v-model="record.row[displayField.title]"
-                    :column="displayField"
-                    :row="record"
-                  />
-
-                  <LazySmartsheetCell
-                    v-else
-                    v-model="record.row[displayField.title]"
-                    :column="displayField"
-                    :edit-enabled="false"
-                    :read-only="true"
-                  />
-                </div>
-              </template>
-            </LazySmartsheetCalendarSideRecordCard>
-          </LazySmartsheetRow>
+                color="blue"
+                data-testid="nc-sidebar-record-card"
+                @click="emit('expand-record', record)"
+                @dragstart="dragStart($event, record)"
+                @dragover.prevent
+              >
+                <template v-if="!isRowEmpty(record, displayField)">
+                  <div :class="{}">
+                    <LazySmartsheetVirtualCell
+                      v-if="isVirtualCol(displayField)"
+                      v-model="record.row[displayField.title]"
+                      :column="displayField"
+                      :row="record"
+                    />
+
+                    <LazySmartsheetCell
+                      v-else
+                      v-model="record.row[displayField.title]"
+                      :column="displayField"
+                      :edit-enabled="false"
+                      :read-only="true"
+                    />
+                  </div>
+                </template>
+              </LazySmartsheetCalendarSideRecordCard>
+            </LazySmartsheetRow>
+          </div>
         </template>
       </div>
     </div>
diff --git a/packages/nc-gui/utils/browserUtils.ts b/packages/nc-gui/utils/browserUtils.ts
index 8f2f4b7ec2..22d928e104 100644
--- a/packages/nc-gui/utils/browserUtils.ts
+++ b/packages/nc-gui/utils/browserUtils.ts
@@ -19,6 +19,6 @@ export const getScrollbarWidth = () => {
   outer.appendChild(inner)
 
   const widthWithScroll = inner.offsetWidth
-  outer.parentNode.removeChild(outer)
+  outer?.parentNode?.removeChild(outer)
   return widthNoScroll - widthWithScroll
 }

From 5cd9dbe1f6d59e3e8193f770731e36051df8b872 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Sat, 2 Mar 2024 12:01:11 +0000
Subject: [PATCH 003/253] feat(nc-gui): misc issues fix

---
 .../nc-gui/components/smartsheet/calendar/SideRecordCard.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/SideRecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/SideRecordCard.vue
index 33a90399f9..78340d32cb 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideRecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideRecordCard.vue
@@ -17,7 +17,7 @@ const props = withDefaults(defineProps<Props>(), {
 
 <template>
   <div class="border-1 cursor-pointer border-gray-200 items-center px-2 py-3 rounded-lg">
-    <div class="flex items-center gap-2">
+    <div class="flex items-center pl-1 gap-2">
       <span
         :class="{
           'bg-maroon-500': props.color === 'maroon',

From cd8e5218d898951c08d7cb0359c2f440c8ad9f5b Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Sat, 2 Mar 2024 12:01:11 +0000
Subject: [PATCH 004/253] feat(nc-gui): xsmall calendar

---
 .../nc-gui/components/nc/DateWeekSelector.vue     | 15 +++++++++++----
 .../components/smartsheet/calendar/YearView.vue   |  3 +--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index a1ea8b0a92..618d39b132 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -2,7 +2,7 @@
 import dayjs from 'dayjs'
 
 interface Props {
-  size?: 'small' | 'medium'
+  size?: 'small' | 'medium' | 'xsmall'
   selectedDate?: dayjs.Dayjs | null
   isDisabled?: boolean
   pageDate?: dayjs.Dayjs
@@ -137,7 +137,13 @@ const paginate = (action: 'next' | 'prev') => {
 </script>
 
 <template>
-  <div class="flex flex-col gap-4">
+  <div
+    :class="{
+      'gap-1': size === 'xsmall',
+      'gap-4': size === 'small' || size === 'medium',
+    }"
+    class="flex flex-col"
+  >
     <div
       :class="{
         'justify-center': disablePagination,
@@ -169,6 +175,7 @@ const paginate = (action: 'next' | 'prev') => {
         :class="{
           'gap-1 px-1': size === 'small',
           'gap-2 px-2': size === 'medium',
+          'px-1': size === 'xsmall',
         }"
         class="flex flex-row bg-gray-100 rounded-t-xl justify-between"
       >
@@ -205,7 +212,7 @@ const paginate = (action: 'next' | 'prev') => {
             'h-9 w-9': size === 'medium',
             'h-8 w-8': size === 'small',
           }"
-          class="px-1 py-1 relative font-medium flex items-center cursor-pointer justify-center"
+          class="px-1 py-1 relative border-1 border-transparent font-medium flex items-center cursor-pointer justify-center"
           data-testid="nc-calendar-date"
           @click="handleSelectDate(date)"
         >
@@ -213,7 +220,7 @@ const paginate = (action: 'next' | 'prev') => {
             v-if="isActiveDate(date)"
             :class="{
               'h-1.5 w-1.5': size === 'medium',
-              'h-1 w-1': size === 'small',
+              'h-1 w-1': size === 'small' || size === 'xsmall',
             }"
             class="absolute z-2 rounded-full bg-brand-500 top-1 right-1"
           ></span>
diff --git a/packages/nc-gui/components/smartsheet/calendar/YearView.vue b/packages/nc-gui/components/smartsheet/calendar/YearView.vue
index 7f7fdb34b5..a6901d09bb 100644
--- a/packages/nc-gui/components/smartsheet/calendar/YearView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/YearView.vue
@@ -21,8 +21,7 @@ const months = computed(() => {
       v-model:active-dates="activeDates"
       v-model:page-date="months[index]"
       v-model:selected-date="selectedDate"
-      size="small"
-      class="max-w-[350px]"
+      size="xsmall"
       data-testid="nc-calendar-year-view-month-selector"
       disable-pagination
     />

From 5df15aff3425630220b38c39279dd2195626d125 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Sat, 2 Mar 2024 12:01:12 +0000
Subject: [PATCH 005/253] feat: configurable year size

---
 .../nc-gui/components/nc/DateWeekSelector.vue | 61 ++++++++++++-------
 .../smartsheet/calendar/YearView.vue          |  6 +-
 .../components/smartsheet/calendar/index.vue  | 34 ++++++++++-
 .../composables/useCalendarViewStore.ts       | 14 ++++-
 4 files changed, 89 insertions(+), 26 deletions(-)

diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index 618d39b132..a9005b0819 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -2,7 +2,7 @@
 import dayjs from 'dayjs'
 
 interface Props {
-  size?: 'small' | 'medium' | 'xsmall'
+  size?: 'medium' | 'large' | 'small'
   selectedDate?: dayjs.Dayjs | null
   isDisabled?: boolean
   pageDate?: dayjs.Dayjs
@@ -17,7 +17,7 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  size: 'medium',
+  size: 'large',
   selectedDate: null,
   isDisabled: false,
   isMondayFirst: true,
@@ -139,8 +139,8 @@ const paginate = (action: 'next' | 'prev') => {
 <template>
   <div
     :class="{
-      'gap-1': size === 'xsmall',
-      'gap-4': size === 'small' || size === 'medium',
+      'gap-1': size === 'small',
+      'gap-4': size === 'medium' || size === 'large',
     }"
     class="flex flex-col"
   >
@@ -152,7 +152,7 @@ const paginate = (action: 'next' | 'prev') => {
       class="flex items-center"
     >
       <NcTooltip>
-        <NcButton v-if="!disablePagination" size="small" type="secondary" @click="paginate('prev')">
+        <NcButton v-if="!disablePagination" size="medium" type="secondary" @click="paginate('prev')">
           <component :is="iconMap.doubleLeftArrow" class="h-4 w-4" />
         </NcButton>
         <template #title>
@@ -160,9 +160,16 @@ const paginate = (action: 'next' | 'prev') => {
         </template>
       </NcTooltip>
 
-      <span class="font-bold text-gray-700">{{ currentMonthYear }}</span>
+      <span
+        :class="{
+          'text-xs': size === 'small',
+          'text-sm': size === 'medium',
+        }"
+        class="font-bold text-gray-700"
+        >{{ currentMonthYear }}</span
+      >
       <NcTooltip>
-        <NcButton v-if="!disablePagination" size="small" type="secondary" @click="paginate('next')">
+        <NcButton v-if="!disablePagination" size="medium" type="secondary" @click="paginate('next')">
           <component :is="iconMap.doubleRightArrow" class="h-4 w-4" />
         </NcButton>
         <template #title>
@@ -170,30 +177,38 @@ const paginate = (action: 'next' | 'prev') => {
         </template>
       </NcTooltip>
     </div>
-    <div class="border-1 border-gray-200 rounded-y-xl max-w-[320px]">
+    <div
+      :class="{
+        'rounded-lg': size === 'small',
+        'rounded-y-xl': size !== 'small',
+      }"
+      class="border-1 border-gray-200 max-w-[320px]"
+    >
       <div
         :class="{
-          'gap-1 px-1': size === 'small',
-          'gap-2 px-2': size === 'medium',
-          'px-1': size === 'xsmall',
+          'gap-1 px-1': size === 'medium',
+          'gap-2 px-2': size === 'large',
+          'px-1 py-1 !rounded-t-lg': size === 'small',
+          'rounded-t-xl': size !== 'small',
         }"
-        class="flex flex-row bg-gray-100 rounded-t-xl justify-between"
+        class="flex flex-row bg-gray-100 justify-between"
       >
         <span
           v-for="(day, index) in days"
           :key="index"
           :class="{
-            'w-9 h-9': size === 'medium',
-            'w-8 h-8': size === 'small',
+            'w-9 h-9': size === 'large',
+            'w-8 h-8': size === 'medium',
+            'text-[10px]': size === 'small',
           }"
-          class="flex items-center justify-center text-gray-500"
+          class="flex items-center uppercase justify-center text-gray-500"
           >{{ day }}</span
         >
       </div>
       <div
         :class="{
-          'gap-2 p-2': size === 'medium',
-          'gap-1 p-1': size === 'small',
+          'gap-2 p-2': size === 'large',
+          'gap-1 p-1': size === 'medium',
         }"
         class="grid grid-cols-7"
       >
@@ -209,18 +224,20 @@ const paginate = (action: 'next' | 'prev') => {
             'nc-selected-week-start': isSameDate(date, selectedWeek?.start),
             'nc-selected-week-end': isSameDate(date, selectedWeek?.end),
             'rounded-md bg-brand-50 nc-calendar-today text-brand-500': isSameDate(date, dayjs()) && isDateInCurrentMonth(date),
-            'h-9 w-9': size === 'medium',
-            'h-8 w-8': size === 'small',
+            'h-9 w-9': size === 'large',
+            'h-8 w-8': size === 'medium',
+            'text-xs': size === 'small',
           }"
-          class="px-1 py-1 relative border-1 border-transparent font-medium flex items-center cursor-pointer justify-center"
+          class="px-1 py-1 relative border-1 border-transparent font-large flex items-center cursor-pointer justify-center"
           data-testid="nc-calendar-date"
           @click="handleSelectDate(date)"
         >
           <span
             v-if="isActiveDate(date)"
             :class="{
-              'h-1.5 w-1.5': size === 'medium',
-              'h-1 w-1': size === 'small' || size === 'xsmall',
+              'h-1.5 w-1.5': size === 'large',
+              'h-1 w-1': size === 'medium',
+              'h-0.75 w-0.75': size === 'small',
             }"
             class="absolute z-2 rounded-full bg-brand-500 top-1 right-1"
           ></span>
diff --git a/packages/nc-gui/components/smartsheet/calendar/YearView.vue b/packages/nc-gui/components/smartsheet/calendar/YearView.vue
index a6901d09bb..9f03eaf828 100644
--- a/packages/nc-gui/components/smartsheet/calendar/YearView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/YearView.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-const { selectedDate, activeDates } = useCalendarViewStoreOrThrow()
+const { selectedDate, activeDates, calendarMetaData } = useCalendarViewStoreOrThrow()
 
 const months = computed(() => {
   const months = []
@@ -8,6 +8,8 @@ const months = computed(() => {
   }
   return months
 })
+
+const size = computed(() => calendarMetaData.value?.meta?.yearViewSize ?? 'small')
 </script>
 
 <template>
@@ -21,7 +23,7 @@ const months = computed(() => {
       v-model:active-dates="activeDates"
       v-model:page-date="months[index]"
       v-model:selected-date="selectedDate"
-      size="xsmall"
+      :size="size"
       data-testid="nc-calendar-year-view-month-selector"
       disable-pagination
     />
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index 7a78f2e3f6..2631767503 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -54,6 +54,7 @@ const {
   pageDate,
   showSideMenu,
   selectedDateRange,
+  updateCalendarMeta,
   paginateCalendarView,
 } = useCalendarViewStoreOrThrow()
 
@@ -165,6 +166,14 @@ const headerText = computed(() => {
       return dayjs(selectedDate.value).format('YYYY')
   }
 })
+
+const updateCalendarSize = async (size: string) => {
+  await updateCalendarMeta({
+    meta: {
+      yearViewSize: size,
+    },
+  })
+}
 </script>
 
 <template>
@@ -242,7 +251,6 @@ const headerText = computed(() => {
             </NcButton>
           </NcTooltip>
           <NcButton
-            v-if="!isMobileMode"
             v-e="`['c:calendar:calendar-${activeCalendarView}-today-btn']`"
             data-testid="nc-calendar-today-btn"
             size="small"
@@ -253,6 +261,30 @@ const headerText = computed(() => {
               {{ $t('activity.goToToday') }}
             </span>
           </NcButton>
+          <NcDropdown v-if="activeCalendarView === 'year'" :auto-close="false" :trigger="['click']">
+            <NcButton
+              v-if="!isMobileMode"
+              v-e="`['c:calendar:calendar-${activeCalendarView}-toggle-sidebar']`"
+              data-testid="nc-calendar-side-bar-btn"
+              size="small"
+              type="secondary"
+            >
+              Calendar Size
+            </NcButton>
+            <template #overlay>
+              <NcMenu>
+                <NcMenuItem
+                  v-for="size in ['small', 'medium', 'large']"
+                  :key="size"
+                  class="capitalize"
+                  data-testid="nc-calendar-view-size"
+                  @click="updateCalendarSize(size)"
+                >
+                  {{ size }}
+                </NcMenuItem>
+              </NcMenu>
+            </template>
+          </NcDropdown>
           <span class="opacity-0" data-testid="nc-active-calendar-view">
             {{ activeCalendarView }}
           </span>
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index 432ba3554a..b780843743 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -620,11 +620,23 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
 
     async function updateCalendarMeta(updateObj: Partial<CalendarType>) {
       if (!viewMeta?.value?.id || !isUIAllowed('dataEdit') || isPublic.value) return
+
+      const updateValue = {
+        ...(typeof calendarMetaData.value.meta === 'string'
+          ? JSON.parse(calendarMetaData.value.meta)
+          : calendarMetaData.value.meta),
+        ...(typeof updateObj.meta === 'string' ? JSON.parse(updateObj.meta) : updateObj.meta),
+      }
+
       try {
-        await $api.dbView.calendarUpdate(viewMeta.value.id, updateObj)
+        await $api.dbView.calendarUpdate(viewMeta.value.id, {
+          ...updateObj,
+          meta: JSON.stringify(updateValue),
+        })
         calendarMetaData.value = {
           ...calendarMetaData.value,
           ...updateObj,
+          meta: updateValue,
         }
       } catch (e) {
         message.error('Error updating changes')

From 62ec989dc1b3d643e1020bb43cd282cb8361d733 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Sat, 2 Mar 2024 12:01:12 +0000
Subject: [PATCH 006/253] feat: update size

---
 packages/nc-gui/components/nc/DateWeekSelector.vue  | 4 +++-
 packages/nc-gui/components/nc/MonthYearSelector.vue | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index a9005b0819..b5ca5504b1 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -220,6 +220,8 @@ const paginate = (action: 'next' | 'prev') => {
             'bg-brand-50 border-1 !border-brand-500': isSelectedDate(date) && !isWeekPicker && isDayInPagedMonth(date),
             'hover:(border-1 border-gray-200 bg-gray-100)': !isSelectedDate(date) && !isWeekPicker,
             'nc-selected-week z-1': isDateInSelectedWeek(date) && isWeekPicker,
+            'border-none': isWeekPicker,
+            'border-transparent': !isWeekPicker,
             'text-gray-400': !isDateInCurrentMonth(date),
             'nc-selected-week-start': isSameDate(date, selectedWeek?.start),
             'nc-selected-week-end': isSameDate(date, selectedWeek?.end),
@@ -228,7 +230,7 @@ const paginate = (action: 'next' | 'prev') => {
             'h-8 w-8': size === 'medium',
             'text-xs': size === 'small',
           }"
-          class="px-1 py-1 relative border-1 border-transparent font-large flex items-center cursor-pointer justify-center"
+          class="px-1 py-1 relative border-1 font-large flex items-center cursor-pointer justify-center"
           data-testid="nc-calendar-date"
           @click="handleSelectDate(date)"
         >
diff --git a/packages/nc-gui/components/nc/MonthYearSelector.vue b/packages/nc-gui/components/nc/MonthYearSelector.vue
index c5c2b94346..a012817551 100644
--- a/packages/nc-gui/components/nc/MonthYearSelector.vue
+++ b/packages/nc-gui/components/nc/MonthYearSelector.vue
@@ -114,7 +114,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
             :class="{
               '!bg-brand-50 border-1 !border-brand-500': isMonthSelected(month),
             }"
-            class="h-9 rounded-lg flex font-medium items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-500 cursor-pointer"
+            class="h-9 rounded-lg flex font-medium items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
             @click="selectedDate = month"
           >
             {{ month.format('MMM') }}
@@ -127,7 +127,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
             :class="{
               '!bg-brand-50 !border-1 !border-brand-500': compareYear(year, selectedDate),
             }"
-            class="h-9 rounded-lg flex font-medium items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-500 cursor-pointer"
+            class="h-9 rounded-lg flex font-medium items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
             @click="selectedDate = year"
           >
             {{ year.format('YYYY') }}

From fb48f589685e51625805a17e21138cd039c3a4df Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Sat, 2 Mar 2024 12:01:12 +0000
Subject: [PATCH 007/253] fix(nc-gui): modified widths

---
 packages/nc-gui/components/nc/DateWeekSelector.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index b5ca5504b1..10817907e7 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -188,7 +188,7 @@ const paginate = (action: 'next' | 'prev') => {
         :class="{
           'gap-1 px-1': size === 'medium',
           'gap-2 px-2': size === 'large',
-          'px-1 py-1 !rounded-t-lg': size === 'small',
+          'px-2 py-1 !rounded-t-lg': size === 'small',
           'rounded-t-xl': size !== 'small',
         }"
         class="flex flex-row bg-gray-100 justify-between"
@@ -202,7 +202,7 @@ const paginate = (action: 'next' | 'prev') => {
             'text-[10px]': size === 'small',
           }"
           class="flex items-center uppercase justify-center text-gray-500"
-          >{{ day }}</span
+          >{{ size === 'small' ? day[0] : day }}</span
         >
       </div>
       <div
@@ -228,7 +228,7 @@ const paginate = (action: 'next' | 'prev') => {
             'rounded-md bg-brand-50 nc-calendar-today text-brand-500': isSameDate(date, dayjs()) && isDateInCurrentMonth(date),
             'h-9 w-9': size === 'large',
             'h-8 w-8': size === 'medium',
-            'text-xs': size === 'small',
+            'h-6 w-6 text-[10px]': size === 'small',
           }"
           class="px-1 py-1 relative border-1 font-large flex items-center cursor-pointer justify-center"
           data-testid="nc-calendar-date"
@@ -240,8 +240,10 @@ const paginate = (action: 'next' | 'prev') => {
               'h-1.5 w-1.5': size === 'large',
               'h-1 w-1': size === 'medium',
               'h-0.75 w-0.75': size === 'small',
+              'top-1 right-1': size != 'small',
+              'top-0.5 right-0.5': size === 'small',
             }"
-            class="absolute z-2 rounded-full bg-brand-500 top-1 right-1"
+            class="absolute z-2 rounded-full bg-brand-500"
           ></span>
           <span class="z-2">
             {{ date.get('date') }}

From abf25dd0d09d9bfb1f4612e628906c6356f4333a Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Sat, 2 Mar 2024 12:01:12 +0000
Subject: [PATCH 008/253] fix(nc-gui): change size automatically

---
 .../nc-gui/components/nc/DateWeekSelector.vue |  4 +-
 .../smartsheet/calendar/YearView.vue          | 51 +++++++++++++------
 .../components/smartsheet/calendar/index.vue  | 33 ------------
 3 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index 10817907e7..63e1a6fb09 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -202,7 +202,7 @@ const paginate = (action: 'next' | 'prev') => {
             'text-[10px]': size === 'small',
           }"
           class="flex items-center uppercase justify-center text-gray-500"
-          >{{ size === 'small' ? day[0] : day }}</span
+          >{{ day[0] }}</span
         >
       </div>
       <div
@@ -240,7 +240,7 @@ const paginate = (action: 'next' | 'prev') => {
               'h-1.5 w-1.5': size === 'large',
               'h-1 w-1': size === 'medium',
               'h-0.75 w-0.75': size === 'small',
-              'top-1 right-1': size != 'small',
+              'top-1 right-1': size !== 'small',
               'top-0.5 right-0.5': size === 'small',
             }"
             class="absolute z-2 rounded-full bg-brand-500"
diff --git a/packages/nc-gui/components/smartsheet/calendar/YearView.vue b/packages/nc-gui/components/smartsheet/calendar/YearView.vue
index 9f03eaf828..f5dfe08944 100644
--- a/packages/nc-gui/components/smartsheet/calendar/YearView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/YearView.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-const { selectedDate, activeDates, calendarMetaData } = useCalendarViewStoreOrThrow()
+const { selectedDate, activeDates } = useCalendarViewStoreOrThrow()
 
 const months = computed(() => {
   const months = []
@@ -9,24 +9,43 @@ const months = computed(() => {
   return months
 })
 
-const size = computed(() => calendarMetaData.value?.meta?.yearViewSize ?? 'small')
+const calendarContainer = ref<HTMLElement | null>(null)
+
+const { width } = useWindowSize()
+
+const size = ref('small')
+
+const handleResize = () => {
+  if (width.value < 1608) {
+    size.value = 'small'
+  } else if (width.value < 2000) {
+    size.value = 'medium'
+  } else {
+    size.value = 'large'
+  }
+}
+
+onMounted(() => {
+  handleResize()
+})
+
+watch(width, handleResize)
 </script>
 
 <template>
-  <div
-    class="flex flex-wrap gap-3 py-3 items-center justify-center overflow-auto nc-scrollbar-md"
-    data-testid="nc-calendar-year-view"
-  >
-    <NcDateWeekSelector
-      v-for="(_, index) in months"
-      :key="index"
-      v-model:active-dates="activeDates"
-      v-model:page-date="months[index]"
-      v-model:selected-date="selectedDate"
-      :size="size"
-      data-testid="nc-calendar-year-view-month-selector"
-      disable-pagination
-    />
+  <div ref="calendarContainer" class="overflow-auto flex my-3 justify-center nc-scrollbar-md">
+    <div class="grid grid-cols-4 justify-items-center gap-3" data-testid="nc-calendar-year-view">
+      <NcDateWeekSelector
+        v-for="(_, index) in months"
+        :key="index"
+        v-model:active-dates="activeDates"
+        v-model:page-date="months[index]"
+        v-model:selected-date="selectedDate"
+        :size="size"
+        data-testid="nc-calendar-year-view-month-selector"
+        disable-pagination
+      />
+    </div>
   </div>
 </template>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index 2631767503..89008f8669 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -54,7 +54,6 @@ const {
   pageDate,
   showSideMenu,
   selectedDateRange,
-  updateCalendarMeta,
   paginateCalendarView,
 } = useCalendarViewStoreOrThrow()
 
@@ -166,14 +165,6 @@ const headerText = computed(() => {
       return dayjs(selectedDate.value).format('YYYY')
   }
 })
-
-const updateCalendarSize = async (size: string) => {
-  await updateCalendarMeta({
-    meta: {
-      yearViewSize: size,
-    },
-  })
-}
 </script>
 
 <template>
@@ -261,30 +252,6 @@ const updateCalendarSize = async (size: string) => {
               {{ $t('activity.goToToday') }}
             </span>
           </NcButton>
-          <NcDropdown v-if="activeCalendarView === 'year'" :auto-close="false" :trigger="['click']">
-            <NcButton
-              v-if="!isMobileMode"
-              v-e="`['c:calendar:calendar-${activeCalendarView}-toggle-sidebar']`"
-              data-testid="nc-calendar-side-bar-btn"
-              size="small"
-              type="secondary"
-            >
-              Calendar Size
-            </NcButton>
-            <template #overlay>
-              <NcMenu>
-                <NcMenuItem
-                  v-for="size in ['small', 'medium', 'large']"
-                  :key="size"
-                  class="capitalize"
-                  data-testid="nc-calendar-view-size"
-                  @click="updateCalendarSize(size)"
-                >
-                  {{ size }}
-                </NcMenuItem>
-              </NcMenu>
-            </template>
-          </NcDropdown>
           <span class="opacity-0" data-testid="nc-active-calendar-view">
             {{ activeCalendarView }}
           </span>

From 9e74b682b5891c206c8de5e7907403e485244bb1 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 2 Mar 2024 12:31:13 +0000
Subject: [PATCH 009/253] fix: keep hidden fields on undo

---
 packages/nc-gui/composables/useData.ts        | 40 +++++++++++++++++++
 packages/nocodb/src/db/BaseModelSqlv2.ts      | 21 +++++++++-
 .../src/db/sql-data-mapper/lib/BaseModel.ts   |  1 +
 packages/nocodb/src/schema/swagger-v2.json    |  8 ++++
 packages/nocodb/src/schema/swagger.json       | 24 +++++++++++
 5 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/composables/useData.ts b/packages/nc-gui/composables/useData.ts
index 33f3cfb57b..a287042292 100644
--- a/packages/nc-gui/composables/useData.ts
+++ b/packages/nc-gui/composables/useData.ts
@@ -559,6 +559,19 @@ export function useData(args: {
           .map((c) => row.row[c.title!])
           .join('___')
 
+        const fullRecord = await $api.dbTableRow.read(
+          NOCO,
+          // todo: base_id missing on view type
+          base?.value.id as string,
+          meta.value?.id as string,
+          encodeURIComponent(id as string),
+          {
+            getHiddenColumn: true,
+          },
+        )
+
+        row.row = fullRecord
+
         const deleted = await deleteRowById(id as string)
         if (!deleted) {
           return
@@ -584,6 +597,7 @@ export function useData(args: {
                 pg: { page: number; pageSize: number },
               ) {
                 const pkData = rowPkData(row.row, meta.value?.columns as ColumnType[])
+
                 row.row = { ...pkData, ...row.row }
                 await insertRow(row, ltarState, {}, true)
                 recoverLTARRefs(row.row)
@@ -642,7 +656,20 @@ export function useData(args: {
 
     if (!removedRowsData.length) return
 
+    const { list } = await $api.dbTableRow.list(NOCO, base?.value.id as string, meta.value?.id as string, {
+      pks: removedRowsData.map((row) => row[compositePrimaryKey]).join(','),
+    })
+
     try {
+      for (const removedRow of removedRowsData) {
+        const rowObj = removedRow.row
+        const rowPk = rowPkData(rowObj.row, meta?.value?.columns as ColumnType[])
+        const fullRecord = list.find((r: Record<string, any>) => {
+          return Object.keys(rowPk).every((key) => rowPk[key] === r[key])
+        })
+        rowObj.row = clone(fullRecord)
+      }
+
       const removedRowIds: Record<string, any>[] = await bulkDeleteRows(
         removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
       )
@@ -767,7 +794,20 @@ export function useData(args: {
 
     if (!removedRowsData.length) return
 
+    const { list } = await $api.dbTableRow.list(NOCO, base?.value.id as string, meta.value?.id as string, {
+      pks: removedRowsData.map((row) => row[compositePrimaryKey]).join(','),
+    })
+
     try {
+      for (const removedRow of removedRowsData) {
+        const rowObj = removedRow.row
+        const rowPk = rowPkData(rowObj.row, meta?.value?.columns as ColumnType[])
+        const fullRecord = list.find((r: Record<string, any>) => {
+          return Object.keys(rowPk).every((key) => rowPk[key] === r[key])
+        })
+        rowObj.row = clone(fullRecord)
+      }
+
       const removedRowIds: Record<string, any>[] = await bulkDeleteRows(
         removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
       )
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index 586882ec0c..5fbc87b130 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -426,7 +426,24 @@ class BaseModelSqlv2 {
       if (createdCol) qb.orderBy(createdCol.column_name);
     }
 
-    if (!ignorePagination) applyPaginate(qb, rest);
+    if (rest.pks) {
+      const pks = rest.pks.split(',');
+      qb.where((qb) => {
+        pks.forEach((pk) => {
+          qb.orWhere(_wherePk(this.model.primaryKeys, pk));
+        });
+        return qb;
+      });
+    }
+
+    // For calendar View, if calendarLimitOverride is provided, use it as limit for the query
+    if (!ignorePagination) {
+      if (!calendarLimitOverride) {
+        applyPaginate(qb, rest);
+      } else {
+        applyPaginate(qb, { ...rest, limit: calendarLimitOverride });
+      }
+    }
     const proto = await this.getProto();
 
     let data;
@@ -2114,6 +2131,7 @@ class BaseModelSqlv2 {
     obj.offset = Math.max(+(args.offset || args.o) || 0, 0);
     obj.fields = args.fields || args.f;
     obj.sort = args.sort || args.s;
+    obj.pks = args.pks;
     return obj;
   }
 
@@ -6382,6 +6400,7 @@ export function getListArgs(
   obj.fields =
     args?.fields || args?.f || (ignoreAssigningWildcardSelect ? null : '*');
   obj.sort = args?.sort || args?.s || model.primaryKey?.[0]?.column_name;
+  obj.pks = args?.pks;
   return obj;
 }
 
diff --git a/packages/nocodb/src/db/sql-data-mapper/lib/BaseModel.ts b/packages/nocodb/src/db/sql-data-mapper/lib/BaseModel.ts
index f0a7ccb85b..7eb712b5bb 100644
--- a/packages/nocodb/src/db/sql-data-mapper/lib/BaseModel.ts
+++ b/packages/nocodb/src/db/sql-data-mapper/lib/BaseModel.ts
@@ -1514,6 +1514,7 @@ export interface XcFilter {
   fields?: string;
   filterArr?: Filter[];
   sortArr?: Sort[];
+  pks?: string;
 }
 
 export interface XcFilterWithAlias extends XcFilter {
diff --git a/packages/nocodb/src/schema/swagger-v2.json b/packages/nocodb/src/schema/swagger-v2.json
index 47740de402..d83879580b 100644
--- a/packages/nocodb/src/schema/swagger-v2.json
+++ b/packages/nocodb/src/schema/swagger-v2.json
@@ -7503,6 +7503,14 @@
             "in": "query",
             "name": "filterArrJson",
             "description": "Used for multiple filter queries"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "in": "query",
+            "name": "pks",
+            "description": "Comma separated list of pks"
           }
         ],
         "description": "List all shared view rows"
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index 71f2920c9b..35d6be38a9 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -9040,6 +9040,14 @@
             "name": "filterArrJson",
             "description": "Used for multiple filter queries"
           },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "in": "query",
+            "name": "pks",
+            "description": "Comma separated list of pks"
+          },
           {
             "$ref": "#/components/parameters/xc-auth"
           }
@@ -12348,6 +12356,14 @@
             "in": "query",
             "name": "filterArrJson",
             "description": "Used for multiple filter queries"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "in": "query",
+            "name": "pks",
+            "description": "Comma separated list of pks"
           }
         ],
         "description": "List all shared view rows"
@@ -15914,6 +15930,14 @@
             "name": "filterArrJson",
             "description": "Used for multiple filter queries"
           },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "in": "query",
+            "name": "pks",
+            "description": "Comma separated list of pks"
+          },
           {
             "$ref": "#/components/parameters/xc-auth"
           }

From 19714973905deed2cd2bbcf1f35baaf87b94a379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D5=A1=C9=A8=D5=BC=C9=A2=D3=84=D5=A1=D6=85=D5=BC=C9=A2?=
 <wingkwong.code@gmail.com>
Date: Mon, 4 Mar 2024 14:56:29 +0800
Subject: [PATCH 010/253] fix(docs): related topics links in table operations

---
 .../060.table-operations/020.field-operations.md   | 14 ++++++--------
 .../docs/060.table-operations/030.filter.md        | 12 ++++++------
 .../docs/060.table-operations/040.sort.md          | 12 ++++++------
 .../docs/060.table-operations/050.group-by.md      | 12 ++++++------
 .../docs/060.table-operations/060.row-height.md    | 12 ++++++------
 .../docs/060.table-operations/070.search.md        | 13 ++++++-------
 .../docs/060.table-operations/080.download.md      | 12 ++++++------
 7 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/packages/noco-docs/docs/060.table-operations/020.field-operations.md b/packages/noco-docs/docs/060.table-operations/020.field-operations.md
index aafbc86e94..3f6759d0c0 100644
--- a/packages/noco-docs/docs/060.table-operations/020.field-operations.md
+++ b/packages/noco-docs/docs/060.table-operations/020.field-operations.md
@@ -34,11 +34,9 @@ For Gallery View & Kanban View, you can change the cover field by clicking on th
 ![Change cover field](/img/v2/table-operations/change-cover-image.png)
 
 ### Related topics
-- [Filter](filter)
-- [Sort](sort)
-- [GroupBy](group-by)
-- [Row height](row-height)
-- [Quick Search](search)
-- [Download](download)
-
-
+- [Filter](/table-operations/filter)
+- [Sort](/table-operations/sort)
+- [GroupBy](/table-operations/group-by)
+- [Row Height](/table-operations/row-height)
+- [Quick Search](/table-operations/search)
+- [Download](/table-operations/download)
\ No newline at end of file
diff --git a/packages/noco-docs/docs/060.table-operations/030.filter.md b/packages/noco-docs/docs/060.table-operations/030.filter.md
index 9570c1acfe..8462954af8 100644
--- a/packages/noco-docs/docs/060.table-operations/030.filter.md
+++ b/packages/noco-docs/docs/060.table-operations/030.filter.md
@@ -50,9 +50,9 @@ NocoDB currently supports various types of filters for corresponding fields. Ple
 [Filter Matrix](https://docs.google.com/spreadsheets/d/e/2PACX-1vTpCNKtA-szaXUKJEO5uuSIRnzUOK793MKnyBz9m2rQcwn7HqK19jPHeER-IIRWH9X56J78wfxXZuuv/pubhtml?gid=427284630&amp;single=true&amp;widget=true&amp;headers=false)
 
 ### Related topics
-- [Field operations](field-operations)
-- [Sort](sort)
-- [GroupBy](group-by)
-- [Row height](row-height)
-- [Quick Search](search)
-- [Download](download)
\ No newline at end of file
+- [Field Operations](/table-operations/field-operations)
+- [Sort](/table-operations/sort)
+- [GroupBy](/table-operations/group-by)
+- [Row Height](/table-operations/row-height)
+- [Quick Search](/table-operations/search)
+- [Download](/table-operations/download)
\ No newline at end of file
diff --git a/packages/noco-docs/docs/060.table-operations/040.sort.md b/packages/noco-docs/docs/060.table-operations/040.sort.md
index 223956ad21..5fc5d9bb3a 100644
--- a/packages/noco-docs/docs/060.table-operations/040.sort.md
+++ b/packages/noco-docs/docs/060.table-operations/040.sort.md
@@ -34,9 +34,9 @@ Field configured at the top will be used for the first-level sorting, followed b
 ![Delete Sorting](/img/v2/table-operations/sort-4.png)
 
 ### Related topics
-- [Field operations](field-operations)
-- [Filter](filter)
-- [GroupBy](group-by)
-- [record height](row-height)
-- [Quick Search](search)
-- [Download](download)
+- [Field Operations](/table-operations/field-operations)
+- [Filter](/table-operations/filter)
+- [GroupBy](/table-operations/group-by)
+- [Row Height](/table-operations/row-height)
+- [Quick Search](/table-operations/search)
+- [Download](/table-operations/download)
\ No newline at end of file
diff --git a/packages/noco-docs/docs/060.table-operations/050.group-by.md b/packages/noco-docs/docs/060.table-operations/050.group-by.md
index 517deaf604..04cd56ccf9 100644
--- a/packages/noco-docs/docs/060.table-operations/050.group-by.md
+++ b/packages/noco-docs/docs/060.table-operations/050.group-by.md
@@ -39,9 +39,9 @@ To disable `Group By` and return to the standard spreadsheet grid view, you must
 ![Group By](/img/v2/table-operations/group-by-delete.png)
 
 ### Related topics
-- [Field operations](field-operations)
-- [Filter](filter)
-- [Sort](sort)
-- [Row height](row-height)
-- [Quick Search](search)
-- [Download](download)
\ No newline at end of file
+- [Field Operations](/table-operations/field-operations)
+- [Filter](/table-operations/filter)
+- [Sort](/table-operations/sort)
+- [Row Height](/table-operations/row-height)
+- [Quick Search](/table-operations/search)
+- [Download](/table-operations/download)
\ No newline at end of file
diff --git a/packages/noco-docs/docs/060.table-operations/060.row-height.md b/packages/noco-docs/docs/060.table-operations/060.row-height.md
index b120659135..60114320e4 100644
--- a/packages/noco-docs/docs/060.table-operations/060.row-height.md
+++ b/packages/noco-docs/docs/060.table-operations/060.row-height.md
@@ -24,9 +24,9 @@ NocoDB offers users the flexibility to adjust the display height of records with
 ![Extra](/img/v2/table-operations/row-height-5.png)
 
 ### Related topics
-- [Field operations](field-operations)
-- [Filter](filter)
-- [Sort](sort)
-- [GroupBy](group-by)
-- [Quick Search](search)
-- [Download](download)
+- [Field Operations](/table-operations/field-operations)
+- [Filter](/table-operations/filter)
+- [Sort](/table-operations/sort)
+- [GroupBy](/table-operations/group-by)
+- [Quick Search](/table-operations/search)
+- [Download](/table-operations/download)
\ No newline at end of file
diff --git a/packages/noco-docs/docs/060.table-operations/070.search.md b/packages/noco-docs/docs/060.table-operations/070.search.md
index d6dfbb228f..0dc637135c 100644
--- a/packages/noco-docs/docs/060.table-operations/070.search.md
+++ b/packages/noco-docs/docs/060.table-operations/070.search.md
@@ -14,10 +14,9 @@ NocoDB offers a quick search feature that allows you to search for records by fi
 ![image](/img/v2/table-operations/table-search.png)
 
 ### Related topics
-- [Field operations](field-operations)
-- [Filter](filter)
-- [Sort](sort)
-- [GroupBy](group-by)
-- [record height](row-height)
-- [Download](download)
-
+- [Field Operations](/table-operations/field-operations)
+- [Filter](/table-operations/filter)
+- [Sort](/table-operations/sort)
+- [GroupBy](/table-operations/group-by)
+- [Row Height](/table-operations/row-height)
+- [Download](/table-operations/download)
\ No newline at end of file
diff --git a/packages/noco-docs/docs/060.table-operations/080.download.md b/packages/noco-docs/docs/060.table-operations/080.download.md
index 086a46cffe..c3c6aa4dc5 100644
--- a/packages/noco-docs/docs/060.table-operations/080.download.md
+++ b/packages/noco-docs/docs/060.table-operations/080.download.md
@@ -17,9 +17,9 @@ To export data from NocoDB, follow these steps:
 ![Export](/img/v2/table-operations/download.png)
 
 ### Related topics
-- [Field operations](field-operations)
-- [Filter](filter)
-- [Sort](sort)
-- [GroupBy](group-by)
-- [record height](row-height)
-- [Quick Search](search)
+- [Field Operations](/table-operations/field-operations)
+- [Filter](/table-operations/filter)
+- [Sort](/table-operations/sort)
+- [GroupBy](/table-operations/group-by)
+- [Row Height](/table-operations/row-height)
+- [Quick Search](/table-operations/search)
\ No newline at end of file

From 220d267ede261591d572bec953cbb6f97f43d392 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 4 Mar 2024 22:22:39 +0530
Subject: [PATCH 011/253] chore: ref nocodb-sdk locally

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/package.json | 2 +-
 packages/nocodb/package.json | 4 ++--
 pnpm-lock.yaml               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 1dd38c3461..8f428c85d6 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -74,7 +74,7 @@
     "marked": "^4.3.0",
     "monaco-editor": "^0.45.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "0.204.4",
+    "nocodb-sdk": "workspace:^",
     "papaparse": "^5.4.1",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.7",
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 177a008a47..8b7e8e80b5 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -137,7 +137,7 @@
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.4.2",
-    "nocodb-sdk": "0.204.4",
+    "nocodb-sdk": "workspace:^",
     "nodemailer": "^6.9.11",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.4",
@@ -229,4 +229,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c4b3ab4f07..7cb8ee4678 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -142,7 +142,7 @@ importers:
         specifier: ^0.11.0
         version: 0.11.0
       nocodb-sdk:
-        specifier: 0.204.4
+        specifier: workspace:^
         version: link:../nocodb-sdk
       papaparse:
         specifier: ^5.4.1
@@ -692,7 +692,7 @@ importers:
         specifier: ^0.4.2
         version: 0.4.2(@nestjs/common@10.3.3)(@nestjs/core@10.3.3)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1)
       nocodb-sdk:
-        specifier: 0.204.4
+        specifier: workspace:^
         version: link:../nocodb-sdk
       nodemailer:
         specifier: ^6.9.11

From d2641a17a77a6a4c15b7b96e80243b4bd5c35854 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 4 Mar 2024 19:35:13 +0000
Subject: [PATCH 012/253] refactor: show body tab for customization

---
 packages/nc-gui/components/webhook/Editor.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 7095727353..c4460eb914 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -19,6 +19,7 @@ import {
   useI18n,
   useNuxtApp,
   watch,
+  isEeUI
 } from '#imports'
 import { extractNextDefaultName } from '~/helpers/parsers/parserHelpers'
 
@@ -75,7 +76,7 @@ let hookRef = reactive<
   version: 'v2',
 })
 
-const isBodyShown = ref(hookRef.version === 'v1')
+const isBodyShown = ref(hookRef.version === 'v1' || isEeUI)
 
 const urlTabKey = ref(isBodyShown.value ? 'body' : 'params')
 
@@ -318,7 +319,7 @@ function setHook(newHook: HookType) {
       payload: notification.payload,
     },
   })
-  if (hookRef.version === 'v1') {
+  if (hookRef.version === 'v1' || isEeUI) {
     urlTabKey.value = 'body'
     eventList.value = [
       { text: ['After', 'Insert'], value: ['after', 'insert'] },

From b3466c4c76f1ff65524501a2f69dde9a7faab76a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 4 Mar 2024 19:35:13 +0000
Subject: [PATCH 013/253] refactor: data to event as context variable

---
 packages/nc-gui/components/webhook/Editor.vue | 15 +++++++++------
 packages/nocodb/src/helpers/webhookHelpers.ts |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index c4460eb914..c79cf2e85f 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -9,6 +9,7 @@ import {
   fieldRequiredValidator,
   iconMap,
   inject,
+  isEeUI,
   message,
   onMounted,
   parseProp,
@@ -19,7 +20,6 @@ import {
   useI18n,
   useNuxtApp,
   watch,
-  isEeUI
 } from '#imports'
 import { extractNextDefaultName } from '~/helpers/parsers/parserHelpers'
 
@@ -65,7 +65,7 @@ let hookRef = reactive<
     type: 'URL',
     payload: {
       method: 'POST',
-      body: '{{ json data }}',
+      body: '{{ json event }}',
       headers: [{}],
       parameters: [{}],
       path: '',
@@ -76,9 +76,10 @@ let hookRef = reactive<
   version: 'v2',
 })
 
+const isBodyShownEasterEgg = ref(false)
 const isBodyShown = ref(hookRef.version === 'v1' || isEeUI)
 
-const urlTabKey = ref(isBodyShown.value ? 'body' : 'params')
+const urlTabKey = ref(isBodyShownEasterEgg.value && isBodyShown.value ? 'body' : 'params')
 
 const apps: Record<string, any> = ref()
 
@@ -302,7 +303,8 @@ function onNotificationTypeChange(reset = false) {
   }
 
   if (hookRef.notification.type === 'URL') {
-    hookRef.notification.payload.body = hookRef.notification.payload.body || '{{ json data }}'
+    const body = hookRef.notification.payload.body
+    hookRef.notification.payload.body = body ? (body === '{{ json data }}' ? '{{ json event }}' : body) : '{{ json event }}'
     hookRef.notification.payload.parameters = hookRef.notification.payload.parameters || [{}]
     hookRef.notification.payload.headers = hookRef.notification.payload.headers || [{}]
     hookRef.notification.payload.method = hookRef.notification.payload.method || 'POST'
@@ -655,6 +657,7 @@ onMounted(async () => {
                 size="large"
                 class="nc-select-hook-url-method"
                 dropdown-class-name="nc-dropdown-hook-notification-url-method"
+                @dblclick="isBodyShownEasterEgg = !isBodyShownEasterEgg"
               >
                 <a-select-option v-for="(method, i) in methodList" :key="i" :value="method.title">
                   <div class="flex items-center gap-2 justify-between">
@@ -684,7 +687,7 @@ onMounted(async () => {
 
             <a-col :span="24">
               <NcTabs v-model:activeKey="urlTabKey" type="card" closeable="false" class="border-1 !pb-2 !rounded-lg">
-                <a-tab-pane v-if="isBodyShown" key="body" tab="Body">
+                <a-tab-pane v-if="isBodyShown && isBodyShownEasterEgg" key="body" tab="Body">
                   <LazyMonacoEditor
                     v-model="hookRef.notification.payload.body"
                     disable-deep-compare
@@ -804,7 +807,7 @@ onMounted(async () => {
 
           <a-row>
             <a-col :span="24">
-              <div v-if="isBodyShown" class="text-gray-600">
+              <div v-if="isBodyShown && isBodyShownEasterEgg" class="text-gray-600">
                 <div class="flex items-center">
                   <em
                     >{{ $t('msg.webhookBodyMsg1') }} <strong>{{ $t('msg.webhookBodyMsg2') }}</strong>
diff --git a/packages/nocodb/src/helpers/webhookHelpers.ts b/packages/nocodb/src/helpers/webhookHelpers.ts
index 5b884486c1..3fb111cc62 100644
--- a/packages/nocodb/src/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/helpers/webhookHelpers.ts
@@ -30,6 +30,7 @@ export function parseBody(template: string, data: any): string {
 
   return Handlebars.compile(template, { noEscape: true })({
     data,
+    event: data,
   });
 }
 

From 951b667e03985aee163f5d202c7ffd7e9f5e81ff Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Tue, 5 Mar 2024 00:21:43 +0000
Subject: [PATCH 014/253] New translations en.json (French)

---
 packages/nc-gui/lang/fr.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index 7772d37772..3827c1b9c1 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -193,17 +193,17 @@
     "seconds": "Secondes",
     "paste": "Coller",
     "restore": "Restaurer",
-    "replace": "Replace",
+    "replace": "Remplacer",
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "Liste"
   },
   "objects": {
-    "day": "Day",
-    "week": "Week",
-    "month": "Month",
-    "year": "Year",
+    "day": "Jour",
+    "week": "Semaine",
+    "month": "Mois",
+    "year": "Année",
     "workspace": "Espace de travail",
     "workspaces": "Espaces de travail",
     "project": "Projet",
@@ -314,7 +314,7 @@
     "docs": "Docs",
     "forum": "Forum",
     "parameter": "Parameter",
-    "headers": "Headers",
+    "headers": "En-têtes",
     "parameterName": "Parameter Name",
     "currencyLocale": "Currency Locale",
     "currencyCode": "Currency Code",

From e46fc1bb387107bbd635cf9e8b50849cb590f206 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Tue, 5 Mar 2024 00:21:44 +0000
Subject: [PATCH 015/253] New translations en.json (German)

---
 packages/nc-gui/lang/de.json | 196 +++++++++++++++++------------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index c2895a6db5..640152cec0 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -1,34 +1,34 @@
 {
   "dashboards": {
-    "create_new_dashboard_project": "Create New Interface",
+    "create_new_dashboard_project": "Schnittstelle erstellen",
     "connect_data_sources": "Datenquellen hinzufügen",
-    "alert": "Alert",
-    "alert-message": "No databases have been connected. Connect database bases to build interfaces. Skip this step and add databases from the base home page later.",
-    "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Select Database Bases that you want to link to this Interface.",
-    "create_interface": "Create interface",
-    "project_name": "Base Name",
-    "connect": "Connect",
+    "alert": "Alarm",
+    "alert-message": "Es wurden noch keine Datenbanken verbunden. Verbinden Sie Datenbanken, um Schnittstellen zu erstellen. Überspringen Sie diesen Schritt und fügen Sie später Datenbanken über die Startseite der Datenbank hinzu.",
+    "select_database_projects_that_you_want_to_link_to_this_dashboard_projects": "Wählen Sie die Datenbanken aus, die Sie mit dieser Schnittstelle verknüpfen möchten.",
+    "create_interface": "Schnittstelle erstellen",
+    "project_name": "Basisname",
+    "connect": "Verbindung herstellen",
     "buttonActionTypes": {
-      "open_external_url": "Open external link",
-      "delete_record": "Delete record",
-      "update_record": "Update record",
-      "open_layout": "Open layout"
+      "open_external_url": "Externen Link öffnen",
+      "delete_record": "Eintrag löschen",
+      "update_record": "Eintrag aktualisieren",
+      "open_layout": "Layout öffnen"
     },
     "widgets": {
       "static_text": "Text",
-      "chart": "Chart",
-      "table": "Table",
-      "image": "Image",
-      "map": "Map",
-      "button": "Button",
-      "number": "Number",
-      "bar_chart": "Bar Chart",
-      "line_chart": "Line Chart",
-      "area_chart": "Area Chart",
-      "pie_chart": "Pie Chart",
-      "donut_chart": "Donut Chart",
-      "scatter_plot": "Scatter Plot",
-      "bubble_chart": "Bubble Chart",
+      "chart": "Diagramm",
+      "table": "Tabelle",
+      "image": "Bild",
+      "map": "Karte",
+      "button": "Schaltfläche",
+      "number": "Zahl",
+      "bar_chart": "Säulendiagramm",
+      "line_chart": "Liniendiagramm",
+      "area_chart": "Flächendiagramm",
+      "pie_chart": "Tortendiagramm",
+      "donut_chart": "Kreisringdiagramm",
+      "scatter_plot": "Streudiagramm",
+      "bubble_chart": "Blasendiagramm",
       "radar_chart": "Radar Chart",
       "polar_area_chart": "Polar Area Chart",
       "radial_bar_chart": "Radial Bar Chart",
@@ -39,7 +39,7 @@
     }
   },
   "general": {
-    "quit": "Quit",
+    "quit": "Beenden",
     "home": "Start",
     "load": "Laden",
     "open": "Öffnen",
@@ -47,27 +47,27 @@
     "yes": "Ja",
     "no": "Nein",
     "ok": "Ok",
-    "back": "Back",
+    "back": "Zurück",
     "and": "Und",
     "or": "Oder",
     "add": "Hinzufügen",
     "edit": "Bearbeiten",
-    "link": "Link",
+    "link": "Verknüpfung",
     "links": "Verknüpfung",
     "remove": "Entfernen",
-    "import": "Import",
+    "import": "Importieren",
     "logout": "Ausloggen",
     "empty": "Empty",
     "changeIcon": "Icon ändern",
     "save": "Speichern",
-    "available": "Available",
-    "abort": "Abort",
-    "saving": "Saving",
+    "available": "Verfügbar",
+    "abort": "Abbrechen",
+    "saving": "Speichere",
     "cancel": "Abbrechen",
     "null": "Null",
-    "escape": "Escape",
-    "hex": "Hex",
-    "clear": "Clear",
+    "escape": "Abbrechen",
+    "hex": "HEX",
+    "clear": "Leeren",
     "slack": "Slack",
     "comment": "Comment",
     "microsoftTeams": "Microsoft Teams",
@@ -75,14 +75,14 @@
     "matterMost": "Mattermost",
     "twilio": "Twilio",
     "whatsappTwilio": "WhatsApp Twilio",
-    "quote": "Quote",
+    "quote": "Zitat",
     "submit": "Bestätigen",
     "create": "Erstellen",
-    "createEntity": "Create {entity}",
-    "creating": "Creating",
-    "creatingEntity": "Creating {entity}",
+    "createEntity": "{entity} erstellen",
+    "creating": "Wird erstellt",
+    "creatingEntity": "{entity} wird erstellt",
     "details": "Details",
-    "skip": "Skip",
+    "skip": "Überspringen",
     "code": "Code",
     "duplicate": "Duplizieren",
     "duplicating": "Duplicating",
@@ -187,23 +187,23 @@
     "join": "Join",
     "options": "Options",
     "primaryValue": "Primary Value",
-    "useSurveyMode": "Use Survey Mode",
-    "shift": "Shift",
-    "enter": "Enter",
-    "seconds": "Seconds",
-    "paste": "Paste",
-    "restore": "Restore",
-    "replace": "Replace",
+    "useSurveyMode": "Umfragemodus verwenden",
+    "shift": "Shift / Umschalttaste",
+    "enter": "Enter / Eingabetaste",
+    "seconds": "Sekunden",
+    "paste": "Einfügen",
+    "restore": "Wiederherstellen",
+    "replace": "Ersetzen",
     "banner": "Banner",
     "logo": "Logo",
-    "dropdown": "Dropdown",
-    "list": "List"
+    "dropdown": "Dropdown-Liste",
+    "list": "Liste"
   },
   "objects": {
-    "day": "Day",
-    "week": "Week",
-    "month": "Month",
-    "year": "Year",
+    "day": "Tag",
+    "week": "Woche",
+    "month": "Monat",
+    "year": "Jahr",
     "workspace": "Arbeitsbereich",
     "workspaces": "Arbeitsbereiche",
     "project": "Projekt",
@@ -222,7 +222,7 @@
     "webhooks": "Webhooks",
     "view": "Ansicht",
     "views": "Ansichten",
-    "sidebar": "Sidebar",
+    "sidebar": "Seitenleiste",
     "viewType": {
       "grid": "Gitter",
       "gallery": "Galerie",
@@ -235,7 +235,7 @@
     "users": "Benutzer",
     "role": "Rolle",
     "roles": "Rollen",
-    "developer": "Developer",
+    "developer": "Entwickler",
     "roleType": {
       "owner": "Eigentümer",
       "creator": "Ersteller",
@@ -243,7 +243,7 @@
       "commenter": "Kommentator",
       "viewer": "Betrachter",
       "noaccess": "Kein Zugriff",
-      "superAdmin": "Super Admin",
+      "superAdmin": "Super-Admin",
       "orgLevelCreator": "Organisationsebenen-Ersteller",
       "orgLevelViewer": "Organisationsebenen-Betrachter"
     },
@@ -310,38 +310,38 @@
     "isNotNull": "ist nicht Null"
   },
   "title": {
-    "sso": "Authentication (SSO)",
+    "sso": "Authentifizierung (SSO)",
     "docs": "Dokumentation",
     "forum": "Forum",
     "parameter": "Parameter",
-    "headers": "Headers",
-    "parameterName": "Parameter Name",
-    "currencyLocale": "Currency Locale",
+    "headers": "Kopfzeilen",
+    "parameterName": "Parametername",
+    "currencyLocale": "Währung",
     "currencyCode": "Währungscode",
     "searchMembers": "Nach Nutzern suchen",
-    "noMembersFound": "No members found",
-    "dateJoined": "Date Joined",
+    "noMembersFound": "Keine Mitglieder gefunden",
+    "dateJoined": "Beitrittsdatum",
     "tokenName": "Name des Tokens",
-    "inDesktop": "in Desktop",
-    "rowData": "Record data",
-    "creator": "Creator",
+    "inDesktop": "Auf Desktopgerät",
+    "rowData": "Daten aufzeichnen",
+    "creator": "Ersteller",
     "qrCode": "QR-Code",
-    "termsOfService": "Terms of Service",
-    "updateSelectedRows": "Update Selected Records",
+    "termsOfService": "Nutzungsbedingungen",
+    "updateSelectedRows": "Ausgewählte Datensätze aktualisieren",
     "noFiltersAdded": "Keine Filter verwendet",
-    "editCards": "Edit Cards",
-    "noFieldsFound": "No fields found",
+    "editCards": "Karten bearbeiten",
+    "noFieldsFound": "Keine Felder gefunden",
     "displayValue": "Display Value",
-    "expand": "Expand",
-    "hideAll": "Hide all",
-    "hideSystemFields": "Hide system fields",
-    "removeFile": "Remove File",
+    "expand": "Aufklappen",
+    "hideAll": "Zuklappen",
+    "hideSystemFields": "Systemfelder ausblenden",
+    "removeFile": "Datei löschen",
     "hasMany": "Has Many",
     "manyToMany": "Many to Many",
-    "virtualRelation": "Virtual Relation",
-    "linkMore": "Link More",
-    "linkMoreRecords": "Link more records",
-    "linkRecords": "Link Records",
+    "virtualRelation": "Virtuelle Relation",
+    "linkMore": "Mehr verknüpfen",
+    "linkMoreRecords": "Weitere Datensätze verknüpfen",
+    "linkRecords": "Datensätze verknüpfen",
     "downloadFile": "Download File",
     "renameTable": "Rename Table",
     "renamingTable": "Renaming Table",
@@ -350,7 +350,7 @@
     "deleteWs": "Arbeitsbereich löschen",
     "deletingWs": "Deleting Workspace",
     "copyAuthToken": "Auth-Token kopieren",
-    "copiedAuthToken": "Copied Auth Token",
+    "copiedAuthToken": "Auth-Token kopiert",
     "copyInviteToken": "Copy Invite Token",
     "showSidebar": "Show Sidebar",
     "hideSidebar": "Hide Sidebar",
@@ -443,36 +443,36 @@
     "generalSettings": "General Settings",
     "ssoSettings": "SSO Settings",
     "organizeBy": "Organize by",
-    "previous": "Previous",
-    "nextMonth": "Next Month",
-    "previousMonth": "Previous Month",
-    "next": "Next",
+    "previous": "Vorherige",
+    "nextMonth": "Folgender Monat",
+    "previousMonth": "Vorhergehender Monat",
+    "next": "Weiter",
     "organiseBy": "Organise by",
     "heading1": "Heading 1",
     "heading2": "Heading 2",
     "heading3": "Heading 3",
-    "bold": "Bold",
-    "italic": "Italic",
-    "underline": "Underline",
+    "bold": "Fett",
+    "italic": "Kursiv",
+    "underline": "Unterstrichen",
     "strike": "Strike",
-    "taskList": "Task List",
-    "bulletList": "Bullet List",
-    "numberedList": "Numbered List",
-    "downloadData": "Download Data",
-    "blockQuote": "Block Quote",
-    "noToken": "No Token",
+    "taskList": "Aufgabenliste",
+    "bulletList": "Aufzählungsliste",
+    "numberedList": "Numerierte Liste",
+    "downloadData": "Daten herunterladen",
+    "blockQuote": "Zitatblock",
+    "noToken": "Kein Token",
     "tokenLimit": "Nur ein Token pro Benutzer ist erlaubt",
-    "duplicateAttachment": "File with name {filename} already attached",
-    "viewIdColon": "VIEW ID: {viewId}",
-    "toAddress": "To Address",
-    "subject": "Subject",
-    "body": "Body",
-    "commaSeparatedMobileNumber": "Comma separated Mobile #",
+    "duplicateAttachment": "Datei mit dem Namen {filename} ist bereits angehängt",
+    "viewIdColon": "Anzeige-ID: {viewId}",
+    "toAddress": "Empfängeradresse",
+    "subject": "Betreff",
+    "body": "Textkörper",
+    "commaSeparatedMobileNumber": "Durch Kommata separierte Telefonnummernliste",
     "headerName": "Header Name",
     "icon": "Icon",
     "max": "Max",
-    "enableRichText": "Enable Rich Text",
-    "idColon": "Id:",
+    "enableRichText": "Rich-Text-Format aktivieren",
+    "idColon": "ID:",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",

From e6e995993e99c188ac7c9c173a1faace86ed20c8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 5 Mar 2024 00:46:57 +0000
Subject: [PATCH 016/253] refactor: move query param check to a common function

---
 packages/nocodb/src/models/FormView.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/models/FormView.ts b/packages/nocodb/src/models/FormView.ts
index cddb2308a5..14939f29d1 100644
--- a/packages/nocodb/src/models/FormView.ts
+++ b/packages/nocodb/src/models/FormView.ts
@@ -1,8 +1,8 @@
 import type {
-  MetaType,
+  AttachmentResType,
   BoolType,
   FormType,
-  AttachmentResType,
+  MetaType,
 } from 'nocodb-sdk';
 import { PresignedUrl } from '~/models';
 import FormViewColumn from '~/models/FormViewColumn';

From 13043a2b4e52d4795737bd29f2be3352ed00a023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D5=A1=C9=A8=D5=BC=C9=A2=D3=84=D5=A1=D6=85=D5=BC=C9=A2?=
 <wingkwong.code@gmail.com>
Date: Tue, 5 Mar 2024 11:53:22 +0800
Subject: [PATCH 017/253] chore(deps): sync dependencies

---
 package.json                         |  13 +-
 packages/nc-gui/package.json         |   4 +-
 packages/noco-docs/package-lock.json | 819 ++++++++++++++++++---------
 packages/noco-docs/package.json      |  12 +-
 packages/nocodb/package.json         |   4 +-
 pnpm-lock.yaml                       | 508 ++++++-----------
 6 files changed, 749 insertions(+), 611 deletions(-)

diff --git a/package.json b/package.json
index e9f7a325cf..3a6c54469d 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "fs": "0.0.1-security",
     "lerna": "^7.4.2",
     "husky": "^8.0.3",
-    "xlsx": "^0.17.5"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
   "husky": {
     "hooks": {
@@ -47,7 +47,16 @@
   "pnpm": {
     "overrides": {
       "vue": "3.3.13",
-      "typescript": "latest"
+      "typescript": "latest",
+      "ajv@<6.12.3": ">=6.12.3",
+      "node.extend@<1.1.7": ">=1.1.7",
+      "tough-cookie@<4.1.3": ">=4.1.3",
+      "@babel/traverse@<7.23.2": ">=7.23.2",
+      "follow-redirects@<1.15.4": ">=1.15.4",
+      "axios@>=0.8.1 <0.28.0": ">=0.28.0",
+      "ip@<1.1.9": ">=1.1.9",
+      "ip@=2.0.0": ">=2.0.1",
+      "xml2js@<0.5.0": ">=0.5.0"
     }
   }
 }
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 8f428c85d6..bd16d5f64a 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -101,7 +101,7 @@
     "vue3-grid-layout-next": "^1.0.6",
     "vue3-text-clamp": "^0.1.2",
     "vuedraggable": "^4.1.0",
-    "xlsx": "^0.18.5"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.26.3",
@@ -158,7 +158,7 @@
     "nuxt": "^3.10.3",
     "nuxt-windicss": "^2.6.1",
     "prettier": "^2.8.8",
-    "sass": "^1.70.0",
+    "sass": "^1.71.1",
     "ts-loader": "^9.5.1",
     "unplugin-icons": "^0.18.5",
     "unplugin-vue-components": "^0.26.0",
diff --git a/packages/noco-docs/package-lock.json b/packages/noco-docs/package-lock.json
index edd09af26d..baa85cb049 100644
--- a/packages/noco-docs/package-lock.json
+++ b/packages/noco-docs/package-lock.json
@@ -9,15 +9,15 @@
       "version": "1.1.0",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/plugin-client-redirects": "3.0.1",
-        "@docusaurus/plugin-ideal-image": "3.0.1",
-        "@docusaurus/plugin-sitemap": "3.0.1",
-        "@docusaurus/preset-classic": "3.0.1",
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/plugin-client-redirects": "3.1.1",
+        "@docusaurus/plugin-ideal-image": "3.1.1",
+        "@docusaurus/plugin-sitemap": "3.1.1",
+        "@docusaurus/preset-classic": "3.1.1",
         "@mdx-js/react": "^3.0.1",
         "clsx": "^1.2.1",
         "docusaurus-plugin-sass": "^0.2.5",
-        "docusaurus-theme-search-typesense": "^0.14.1",
+        "docusaurus-theme-search-typesense": "^0.16.0",
         "nc-analytics": "^0.0.9",
         "plugin-image-zoom": "github:flexanalytics/plugin-image-zoom",
         "prism-react-renderer": "^1.3.5",
@@ -196,12 +196,12 @@
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
@@ -2172,9 +2172,9 @@
       }
     },
     "node_modules/@docusaurus/core": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-3.0.1.tgz",
-      "integrity": "sha512-CXrLpOnW+dJdSv8M5FAJ3JBwXtL6mhUWxFA8aS0ozK6jBG/wgxERk5uvH28fCeFxOGbAT9v1e9dOMo1X2IEVhQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-3.1.1.tgz",
+      "integrity": "sha512-2nQfKFcf+MLEM7JXsXwQxPOmQAR6ytKMZVSx7tVi9HEm9WtfwBH1fp6bn8Gj4zLUhjWKCLoysQ9/Wm+EZCQ4yQ==",
       "dependencies": {
         "@babel/core": "^7.23.3",
         "@babel/generator": "^7.23.3",
@@ -2186,13 +2186,13 @@
         "@babel/runtime": "^7.22.6",
         "@babel/runtime-corejs3": "^7.22.6",
         "@babel/traverse": "^7.22.8",
-        "@docusaurus/cssnano-preset": "3.0.1",
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/mdx-loader": "3.0.1",
+        "@docusaurus/cssnano-preset": "3.1.1",
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/mdx-loader": "3.1.1",
         "@docusaurus/react-loadable": "5.5.2",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-common": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-common": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "@slorber/static-site-generator-webpack-plugin": "^4.0.7",
         "@svgr/webpack": "^6.5.1",
         "autoprefixer": "^10.4.14",
@@ -2258,9 +2258,9 @@
       }
     },
     "node_modules/@docusaurus/cssnano-preset": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.0.1.tgz",
-      "integrity": "sha512-wjuXzkHMW+ig4BD6Ya1Yevx9UJadO4smNZCEljqBoQfIQrQskTswBs7lZ8InHP7mCt273a/y/rm36EZhqJhknQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.1.1.tgz",
+      "integrity": "sha512-LnoIDjJWbirdbVZDMq+4hwmrTl2yHDnBf9MLG9qyExeAE3ac35s4yUhJI8yyTCdixzNfKit4cbXblzzqMu4+8g==",
       "dependencies": {
         "cssnano-preset-advanced": "^5.3.10",
         "postcss": "^8.4.26",
@@ -2272,9 +2272,9 @@
       }
     },
     "node_modules/@docusaurus/logger": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.0.1.tgz",
-      "integrity": "sha512-I5L6Nk8OJzkVA91O2uftmo71LBSxe1vmOn9AMR6JRCzYeEBrqneWMH02AqMvjJ2NpMiviO+t0CyPjyYV7nxCWQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.1.1.tgz",
+      "integrity": "sha512-BjkNDpQzewcTnST8trx4idSoAla6zZ3w22NqM/UMcFtvYJgmoE4layuTzlfql3VFPNuivvj7BOExa/+21y4X2Q==",
       "dependencies": {
         "chalk": "^4.1.2",
         "tslib": "^2.6.0"
@@ -2284,11 +2284,11 @@
       }
     },
     "node_modules/@docusaurus/lqip-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/lqip-loader/-/lqip-loader-3.0.1.tgz",
-      "integrity": "sha512-hFSu8ltYo0ZnWBWmjMhSprOr6nNKG01YdMDxH/hahBfyaNDCkZU4o7mQNgUW845lvYdp6bhjyW31WJwBjOnLqw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/lqip-loader/-/lqip-loader-3.1.1.tgz",
+      "integrity": "sha512-s06lySAX5ghCiQe0+/GaMWcVvgkBQ6U8p182fW+JbdjxABS8ecx2in2AQJbvrwKNgiMjOhsXiaE6BmbQAmT6nw==",
       "dependencies": {
-        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/logger": "3.1.1",
         "file-loader": "^6.2.0",
         "lodash": "^4.17.21",
         "sharp": "^0.32.3",
@@ -2299,15 +2299,15 @@
       }
     },
     "node_modules/@docusaurus/mdx-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.0.1.tgz",
-      "integrity": "sha512-ldnTmvnvlrONUq45oKESrpy+lXtbnTcTsFkOTIDswe5xx5iWJjt6eSa0f99ZaWlnm24mlojcIGoUWNCS53qVlQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.1.1.tgz",
+      "integrity": "sha512-xN2IccH9+sv7TmxwsDJNS97BHdmlqWwho+kIVY4tcCXkp+k4QuzvWBeunIMzeayY4Fu13A6sAjHGv5qm72KyGA==",
       "dependencies": {
         "@babel/parser": "^7.22.7",
         "@babel/traverse": "^7.22.8",
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "@mdx-js/mdx": "^3.0.0",
         "@slorber/remark-comment": "^1.0.0",
         "escape-html": "^1.0.3",
@@ -2342,6 +2342,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.0.1.tgz",
       "integrity": "sha512-DEHpeqUDsLynl3AhQQiO7AbC7/z/lBra34jTcdYuvp9eGm01pfH1wTVq8YqWZq6Jyx0BgcVl/VJqtE9StRd9Ag==",
+      "dev": true,
       "dependencies": {
         "@docusaurus/react-loadable": "5.5.2",
         "@docusaurus/types": "3.0.1",
@@ -2358,15 +2359,15 @@
       }
     },
     "node_modules/@docusaurus/plugin-client-redirects": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-3.0.1.tgz",
-      "integrity": "sha512-CoZapnHbV3j5jsHCa/zmKaa8+H+oagHBgg91dN5I8/3kFit/xtZPfRaznvDX49cHg2nSoV74B3VMAT+bvCmzFQ==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-common": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-3.1.1.tgz",
+      "integrity": "sha512-J/1Z75XkO+BmUXHW17FrCIYZQ3b0IKaJECH6yCxW5RQ8NMMJ+SZCtPtx5oYoAd0VHersNiUu+ZAxfOqbsn1jKQ==",
+      "dependencies": {
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-common": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "eta": "^2.2.0",
         "fs-extra": "^11.1.1",
         "lodash": "^4.17.21",
@@ -2381,17 +2382,17 @@
       }
     },
     "node_modules/@docusaurus/plugin-content-blog": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.0.1.tgz",
-      "integrity": "sha512-cLOvtvAyaMQFLI8vm4j26svg3ktxMPSXpuUJ7EERKoGbfpJSsgtowNHcRsaBVmfuCsRSk1HZ/yHBsUkTmHFEsg==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/mdx-loader": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-common": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.1.1.tgz",
+      "integrity": "sha512-ew/3VtVoG3emoAKmoZl7oKe1zdFOsI0NbcHS26kIxt2Z8vcXKCUgK9jJJrz0TbOipyETPhqwq4nbitrY3baibg==",
+      "dependencies": {
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/mdx-loader": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-common": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "cheerio": "^1.0.0-rc.12",
         "feed": "^4.2.2",
         "fs-extra": "^11.1.1",
@@ -2411,18 +2412,38 @@
         "react-dom": "^18.0.0"
       }
     },
-    "node_modules/@docusaurus/plugin-content-docs": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.0.1.tgz",
-      "integrity": "sha512-dRfAOA5Ivo+sdzzJGXEu33yAtvGg8dlZkvt/NEJ7nwi1F2j4LEdsxtfX2GKeETB2fP6XoGNSQnFXqa2NYGrHFg==",
+    "node_modules/@docusaurus/plugin-content-blog/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/mdx-loader": "3.0.1",
-        "@docusaurus/module-type-aliases": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-content-docs": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.1.1.tgz",
+      "integrity": "sha512-lhFq4E874zw0UOH7ujzxnCayOyAt0f9YPVYSb9ohxrdCM8B4szxitUw9rIX4V9JLLHVoqIJb6k+lJJ1jrcGJ0A==",
+      "dependencies": {
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/mdx-loader": "3.1.1",
+        "@docusaurus/module-type-aliases": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "@types/react-router-config": "^5.0.7",
         "combine-promises": "^1.1.0",
         "fs-extra": "^11.1.1",
@@ -2440,16 +2461,55 @@
         "react-dom": "^18.0.0"
       }
     },
-    "node_modules/@docusaurus/plugin-content-pages": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.0.1.tgz",
-      "integrity": "sha512-oP7PoYizKAXyEttcvVzfX3OoBIXEmXTMzCdfmC4oSwjG4SPcJsRge3mmI6O8jcZBgUPjIzXD21bVGWEE1iu8gg==",
+    "node_modules/@docusaurus/plugin-content-docs/node_modules/@docusaurus/module-type-aliases": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.1.1.tgz",
+      "integrity": "sha512-xBJyx0TMfAfVZ9ZeIOb1awdXgR4YJMocIEzTps91rq+hJDFJgJaylDtmoRhUxkwuYmNK1GJpW95b7DLztSBJ3A==",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/mdx-loader": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@docusaurus/react-loadable": "5.5.2",
+        "@docusaurus/types": "3.1.1",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router-config": "*",
+        "@types/react-router-dom": "*",
+        "react-helmet-async": "*",
+        "react-loadable": "npm:@docusaurus/react-loadable@5.5.2"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-dom": "*"
+      }
+    },
+    "node_modules/@docusaurus/plugin-content-docs/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-content-pages": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.1.1.tgz",
+      "integrity": "sha512-NQHncNRAJbyLtgTim9GlEnNYsFhuCxaCNkMwikuxLTiGIPH7r/jpb7O3f3jUMYMebZZZrDq5S7om9a6rvB/YCA==",
+      "dependencies": {
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/mdx-loader": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "fs-extra": "^11.1.1",
         "tslib": "^2.6.0",
         "webpack": "^5.88.1"
@@ -2462,14 +2522,34 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/plugin-content-pages/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/plugin-debug": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.0.1.tgz",
-      "integrity": "sha512-09dxZMdATky4qdsZGzhzlUvvC+ilQ2hKbYF+wez+cM2mGo4qHbv8+qKXqxq0CQZyimwlAOWQLoSozIXU0g0i7g==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.1.1.tgz",
+      "integrity": "sha512-xWeMkueM9wE/8LVvl4+Qf1WqwXmreMjI5Kgr7GYCDoJ8zu4kD+KaMhrh7py7MNM38IFvU1RfrGKacCEe2DRRfQ==",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
         "fs-extra": "^11.1.1",
         "react-json-view-lite": "^1.2.0",
         "tslib": "^2.6.0"
@@ -2482,14 +2562,34 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/plugin-debug/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/plugin-google-analytics": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.0.1.tgz",
-      "integrity": "sha512-jwseSz1E+g9rXQwDdr0ZdYNjn8leZBnKPjjQhMBEiwDoenL3JYFcNW0+p0sWoVF/f2z5t7HkKA+cYObrUh18gg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.1.1.tgz",
+      "integrity": "sha512-+q2UpWTqVi8GdlLoSlD5bS/YpxW+QMoBwrPrUH/NpvpuOi0Of7MTotsQf9JWd3hymZxl2uu1o3PIrbpxfeDFDQ==",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -2500,14 +2600,34 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/plugin-google-analytics/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/plugin-google-gtag": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.0.1.tgz",
-      "integrity": "sha512-UFTDvXniAWrajsulKUJ1DB6qplui1BlKLQZjX4F7qS/qfJ+qkKqSkhJ/F4VuGQ2JYeZstYb+KaUzUzvaPK1aRQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.1.1.tgz",
+      "integrity": "sha512-0mMPiBBlQ5LFHTtjxuvt/6yzh8v7OxLi3CbeEsxXZpUzcKO/GC7UA1VOWUoBeQzQL508J12HTAlR3IBU9OofSw==",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "@types/gtag.js": "^0.0.12",
         "tslib": "^2.6.0"
       },
@@ -2519,14 +2639,34 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/plugin-google-gtag/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/plugin-google-tag-manager": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.0.1.tgz",
-      "integrity": "sha512-IPFvuz83aFuheZcWpTlAdiiX1RqWIHM+OH8wS66JgwAKOiQMR3+nLywGjkLV4bp52x7nCnwhNk1rE85Cpy/CIw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.1.1.tgz",
+      "integrity": "sha512-d07bsrMLdDIryDtY17DgqYUbjkswZQr8cLWl4tzXrt5OR/T/zxC1SYKajzB3fd87zTu5W5klV5GmUwcNSMXQXA==",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "tslib": "^2.6.0"
       },
       "engines": {
@@ -2537,17 +2677,37 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/plugin-google-tag-manager/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/plugin-ideal-image": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-ideal-image/-/plugin-ideal-image-3.0.1.tgz",
-      "integrity": "sha512-IvAUpEIz6v1/fVz6UTdQY12pYIE5geNFtsuKpsULpMaotwYf3Gs7acXjQog4qquKkc65yV5zuvMj8BZMHEwLyQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-ideal-image/-/plugin-ideal-image-3.1.1.tgz",
+      "integrity": "sha512-FYce5eV5/fWO4qIG8sKYdK3MTwusdxQML/M62IiltUNM/cqFkDrty1d+H+/I2PYX1s7AOoL3YomdJNP4vra/Tg==",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/lqip-loader": "3.0.1",
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/lqip-loader": "3.1.1",
         "@docusaurus/responsive-loader": "^1.7.0",
-        "@docusaurus/theme-translations": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@docusaurus/theme-translations": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "@slorber/react-ideal-image": "^0.0.12",
         "react-waypoint": "^10.3.0",
         "sharp": "^0.32.3",
@@ -2568,17 +2728,37 @@
         }
       }
     },
-    "node_modules/@docusaurus/plugin-sitemap": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.0.1.tgz",
-      "integrity": "sha512-xARiWnjtVvoEniZudlCq5T9ifnhCu/GAZ5nA7XgyLfPcNpHQa241HZdsTlLtVcecEVVdllevBKOp7qknBBaMGw==",
+    "node_modules/@docusaurus/plugin-ideal-image/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
       "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-common": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-sitemap": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.1.1.tgz",
+      "integrity": "sha512-iJ4hCaMmDaUqRv131XJdt/C/jJQx8UreDWTRqZKtNydvZVh/o4yXGRRFOplea1D9b/zpwL1Y+ZDwX7xMhIOTmg==",
+      "dependencies": {
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-common": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "fs-extra": "^11.1.1",
         "sitemap": "^7.1.1",
         "tslib": "^2.6.0"
@@ -2591,24 +2771,44 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/plugin-sitemap/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/preset-classic": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.0.1.tgz",
-      "integrity": "sha512-il9m9xZKKjoXn6h0cRcdnt6wce0Pv1y5t4xk2Wx7zBGhKG1idu4IFHtikHlD0QPuZ9fizpXspXcTzjL5FXc1Gw==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/plugin-content-blog": "3.0.1",
-        "@docusaurus/plugin-content-docs": "3.0.1",
-        "@docusaurus/plugin-content-pages": "3.0.1",
-        "@docusaurus/plugin-debug": "3.0.1",
-        "@docusaurus/plugin-google-analytics": "3.0.1",
-        "@docusaurus/plugin-google-gtag": "3.0.1",
-        "@docusaurus/plugin-google-tag-manager": "3.0.1",
-        "@docusaurus/plugin-sitemap": "3.0.1",
-        "@docusaurus/theme-classic": "3.0.1",
-        "@docusaurus/theme-common": "3.0.1",
-        "@docusaurus/theme-search-algolia": "3.0.1",
-        "@docusaurus/types": "3.0.1"
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.1.1.tgz",
+      "integrity": "sha512-jG4ys/hWYf69iaN/xOmF+3kjs4Nnz1Ay3CjFLDtYa8KdxbmUhArA9HmP26ru5N0wbVWhY+6kmpYhTJpez5wTyg==",
+      "dependencies": {
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/plugin-content-blog": "3.1.1",
+        "@docusaurus/plugin-content-docs": "3.1.1",
+        "@docusaurus/plugin-content-pages": "3.1.1",
+        "@docusaurus/plugin-debug": "3.1.1",
+        "@docusaurus/plugin-google-analytics": "3.1.1",
+        "@docusaurus/plugin-google-gtag": "3.1.1",
+        "@docusaurus/plugin-google-tag-manager": "3.1.1",
+        "@docusaurus/plugin-sitemap": "3.1.1",
+        "@docusaurus/theme-classic": "3.1.1",
+        "@docusaurus/theme-common": "3.1.1",
+        "@docusaurus/theme-search-algolia": "3.1.1",
+        "@docusaurus/types": "3.1.1"
       },
       "engines": {
         "node": ">=18.0"
@@ -2618,6 +2818,26 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/preset-classic/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/react-loadable": {
       "version": "5.5.2",
       "resolved": "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz",
@@ -2654,22 +2874,22 @@
       }
     },
     "node_modules/@docusaurus/theme-classic": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.0.1.tgz",
-      "integrity": "sha512-XD1FRXaJiDlmYaiHHdm27PNhhPboUah9rqIH0lMpBt5kYtsGjJzhqa27KuZvHLzOP2OEpqd2+GZ5b6YPq7Q05Q==",
-      "dependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/mdx-loader": "3.0.1",
-        "@docusaurus/module-type-aliases": "3.0.1",
-        "@docusaurus/plugin-content-blog": "3.0.1",
-        "@docusaurus/plugin-content-docs": "3.0.1",
-        "@docusaurus/plugin-content-pages": "3.0.1",
-        "@docusaurus/theme-common": "3.0.1",
-        "@docusaurus/theme-translations": "3.0.1",
-        "@docusaurus/types": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-common": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.1.1.tgz",
+      "integrity": "sha512-GiPE/jbWM8Qv1A14lk6s9fhc0LhPEQ00eIczRO4QL2nAQJZXkjPG6zaVx+1cZxPFWbAsqSjKe2lqkwF3fGkQ7Q==",
+      "dependencies": {
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/mdx-loader": "3.1.1",
+        "@docusaurus/module-type-aliases": "3.1.1",
+        "@docusaurus/plugin-content-blog": "3.1.1",
+        "@docusaurus/plugin-content-docs": "3.1.1",
+        "@docusaurus/plugin-content-pages": "3.1.1",
+        "@docusaurus/theme-common": "3.1.1",
+        "@docusaurus/theme-translations": "3.1.1",
+        "@docusaurus/types": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-common": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "@mdx-js/react": "^3.0.0",
         "clsx": "^2.0.0",
         "copy-text-to-clipboard": "^3.2.0",
@@ -2692,6 +2912,45 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/theme-classic/node_modules/@docusaurus/module-type-aliases": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.1.1.tgz",
+      "integrity": "sha512-xBJyx0TMfAfVZ9ZeIOb1awdXgR4YJMocIEzTps91rq+hJDFJgJaylDtmoRhUxkwuYmNK1GJpW95b7DLztSBJ3A==",
+      "dependencies": {
+        "@docusaurus/react-loadable": "5.5.2",
+        "@docusaurus/types": "3.1.1",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router-config": "*",
+        "@types/react-router-dom": "*",
+        "react-helmet-async": "*",
+        "react-loadable": "npm:@docusaurus/react-loadable@5.5.2"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-dom": "*"
+      }
+    },
+    "node_modules/@docusaurus/theme-classic/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/theme-classic/node_modules/clsx": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz",
@@ -2713,17 +2972,17 @@
       }
     },
     "node_modules/@docusaurus/theme-common": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.0.1.tgz",
-      "integrity": "sha512-cr9TOWXuIOL0PUfuXv6L5lPlTgaphKP+22NdVBOYah5jSq5XAAulJTjfe+IfLsEG4L7lJttLbhW7LXDFSAI7Ag==",
-      "dependencies": {
-        "@docusaurus/mdx-loader": "3.0.1",
-        "@docusaurus/module-type-aliases": "3.0.1",
-        "@docusaurus/plugin-content-blog": "3.0.1",
-        "@docusaurus/plugin-content-docs": "3.0.1",
-        "@docusaurus/plugin-content-pages": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-common": "3.0.1",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.1.1.tgz",
+      "integrity": "sha512-38urZfeMhN70YaXkwIGXmcUcv2CEYK/2l4b05GkJPrbEbgpsIZM3Xc+Js2ehBGGZmfZq8GjjQ5RNQYG+MYzCYg==",
+      "dependencies": {
+        "@docusaurus/mdx-loader": "3.1.1",
+        "@docusaurus/module-type-aliases": "3.1.1",
+        "@docusaurus/plugin-content-blog": "3.1.1",
+        "@docusaurus/plugin-content-docs": "3.1.1",
+        "@docusaurus/plugin-content-pages": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-common": "3.1.1",
         "@types/history": "^4.7.11",
         "@types/react": "*",
         "@types/react-router-config": "*",
@@ -2741,6 +3000,45 @@
         "react-dom": "^18.0.0"
       }
     },
+    "node_modules/@docusaurus/theme-common/node_modules/@docusaurus/module-type-aliases": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.1.1.tgz",
+      "integrity": "sha512-xBJyx0TMfAfVZ9ZeIOb1awdXgR4YJMocIEzTps91rq+hJDFJgJaylDtmoRhUxkwuYmNK1GJpW95b7DLztSBJ3A==",
+      "dependencies": {
+        "@docusaurus/react-loadable": "5.5.2",
+        "@docusaurus/types": "3.1.1",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router-config": "*",
+        "@types/react-router-dom": "*",
+        "react-helmet-async": "*",
+        "react-loadable": "npm:@docusaurus/react-loadable@5.5.2"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-dom": "*"
+      }
+    },
+    "node_modules/@docusaurus/theme-common/node_modules/@docusaurus/types": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.1.1.tgz",
+      "integrity": "sha512-grBqOLnubUecgKFXN9q3uit2HFbCxTWX4Fam3ZFbMN0sWX9wOcDoA7lwdX/8AmeL20Oc4kQvWVgNrsT8bKRvzg==",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "^1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
     "node_modules/@docusaurus/theme-common/node_modules/clsx": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz",
@@ -2762,18 +3060,18 @@
       }
     },
     "node_modules/@docusaurus/theme-search-algolia": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.0.1.tgz",
-      "integrity": "sha512-DDiPc0/xmKSEdwFkXNf1/vH1SzJPzuJBar8kMcBbDAZk/SAmo/4lf6GU2drou4Ae60lN2waix+jYWTWcJRahSA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.1.1.tgz",
+      "integrity": "sha512-tBH9VY5EpRctVdaAhT+b1BY8y5dyHVZGFXyCHgTrvcXQy5CV4q7serEX7U3SveNT9zksmchPyct6i1sFDC4Z5g==",
       "dependencies": {
         "@docsearch/react": "^3.5.2",
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/plugin-content-docs": "3.0.1",
-        "@docusaurus/theme-common": "3.0.1",
-        "@docusaurus/theme-translations": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/plugin-content-docs": "3.1.1",
+        "@docusaurus/theme-common": "3.1.1",
+        "@docusaurus/theme-translations": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "algoliasearch": "^4.18.0",
         "algoliasearch-helper": "^3.13.3",
         "clsx": "^2.0.0",
@@ -2800,9 +3098,9 @@
       }
     },
     "node_modules/@docusaurus/theme-translations": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.0.1.tgz",
-      "integrity": "sha512-6UrbpzCTN6NIJnAtZ6Ne9492vmPVX+7Fsz4kmp+yor3KQwA1+MCzQP7ItDNkP38UmVLnvB/cYk/IvehCUqS3dg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.1.1.tgz",
+      "integrity": "sha512-xvWQFwjxHphpJq5fgk37FXCDdAa2o+r7FX8IpMg+bGZBNXyWBu3MjZ+G4+eUVNpDhVinTc+j6ucL0Ain5KCGrg==",
       "dependencies": {
         "fs-extra": "^11.1.1",
         "tslib": "^2.6.0"
@@ -2815,6 +3113,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.0.1.tgz",
       "integrity": "sha512-plyX2iU1tcUsF46uQ01pAd4JhexR7n0iiQ5MSnBFX6M6NSJgDYdru/i1/YNPKOnQHBoXGLHv0dNT6OAlDWNjrg==",
+      "devOptional": true,
       "dependencies": {
         "@types/history": "^4.7.11",
         "@types/react": "*",
@@ -2831,11 +3130,11 @@
       }
     },
     "node_modules/@docusaurus/utils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.0.1.tgz",
-      "integrity": "sha512-TwZ33Am0q4IIbvjhUOs+zpjtD/mXNmLmEgeTGuRq01QzulLHuPhaBTTAC/DHu6kFx3wDgmgpAlaRuCHfTcXv8g==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.1.1.tgz",
+      "integrity": "sha512-ZJfJa5cJQtRYtqijsPEnAZoduW6sjAQ7ZCWSZavLcV10Fw0Z3gSaPKA/B4micvj2afRZ4gZxT7KfYqe5H8Cetg==",
       "dependencies": {
-        "@docusaurus/logger": "3.0.1",
+        "@docusaurus/logger": "3.1.1",
         "@svgr/webpack": "^6.5.1",
         "escape-string-regexp": "^4.0.0",
         "file-loader": "^6.2.0",
@@ -2866,9 +3165,9 @@
       }
     },
     "node_modules/@docusaurus/utils-common": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.0.1.tgz",
-      "integrity": "sha512-W0AxD6w6T8g6bNro8nBRWf7PeZ/nn7geEWM335qHU2DDDjHuV4UZjgUGP1AQsdcSikPrlIqTJJbKzer1lRSlIg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.1.1.tgz",
+      "integrity": "sha512-eGne3olsIoNfPug5ixjepZAIxeYFzHHnor55Wb2P57jNbtVaFvij/T+MS8U0dtZRFi50QU+UPmRrXdVUM8uyMg==",
       "dependencies": {
         "tslib": "^2.6.0"
       },
@@ -2885,12 +3184,12 @@
       }
     },
     "node_modules/@docusaurus/utils-validation": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.0.1.tgz",
-      "integrity": "sha512-ujTnqSfyGQ7/4iZdB4RRuHKY/Nwm58IIb+41s5tCXOv/MBU2wGAjOHq3U+AEyJ8aKQcHbxvTKJaRchNHYUVUQg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.1.1.tgz",
+      "integrity": "sha512-KlY4P9YVDnwL+nExvlIpu79abfEv6ZCHuOX4ZQ+gtip+Wxj0daccdReIWWtqxM/Fb5Cz1nQvUCc7VEtT8IBUAA==",
       "dependencies": {
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
         "joi": "^17.9.2",
         "js-yaml": "^4.1.0",
         "tslib": "^2.6.0"
@@ -2940,13 +3239,13 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz",
-      "integrity": "sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
@@ -2961,9 +3260,9 @@
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -2983,9 +3282,9 @@
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.23",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz",
-      "integrity": "sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -3510,9 +3809,9 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.56.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.4.tgz",
-      "integrity": "sha512-lG1GLUnL5vuRBGb3MgWUWLdGMH2Hps+pERuyQXCfWozuGKdnhf9Pbg4pkcrVUHjKrU7Rl+GCZ/299ObBXZFAxg==",
+      "version": "8.56.5",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.5.tgz",
+      "integrity": "sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==",
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -3653,9 +3952,9 @@
       "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="
     },
     "node_modules/@types/node": {
-      "version": "20.11.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.21.tgz",
-      "integrity": "sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==",
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -3694,9 +3993,9 @@
       "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
     },
     "node_modules/@types/react": {
-      "version": "18.2.60",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.60.tgz",
-      "integrity": "sha512-dfiPj9+k20jJrLGOu9Nf6eqxm2EyJRrq2NvwOFsfbb7sFExZ9WELPs67UImHj3Ayxg8ruTtKtNnbjaF8olPq0A==",
+      "version": "18.2.62",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.62.tgz",
+      "integrity": "sha512-l3f57BbaEKP0xcFzf+5qRG8/PXykZiuVM6eEoPtqBPCp6dxO3HhDkLIgIyXPhPKNAeXn3KO2pEaNgzaEo/asaw==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -4107,9 +4406,9 @@
       }
     },
     "node_modules/algoliasearch-helper": {
-      "version": "3.16.2",
-      "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.16.2.tgz",
-      "integrity": "sha512-Yl/Gu5Cq4Z5s/AJ0jR37OPI1H3+z7PHz657ibyaXgMOaWvPlZ3OACN13N+7HCLPUlB0BN+8BtmrG/CqTilowBA==",
+      "version": "3.16.3",
+      "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.16.3.tgz",
+      "integrity": "sha512-1OuJT6sONAa9PxcOmWo5WCAT3jQSpCR9/m5Azujja7nhUQwAUDvaaAYrcmUySsrvHh74usZHbE3jFfGnWtZj8w==",
       "dependencies": {
         "@algolia/events": "^4.0.1"
       },
@@ -4228,9 +4527,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.17",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.17.tgz",
-      "integrity": "sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==",
+      "version": "10.4.18",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
+      "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
       "funding": [
         {
           "type": "opencollective",
@@ -4246,8 +4545,8 @@
         }
       ],
       "dependencies": {
-        "browserslist": "^4.22.2",
-        "caniuse-lite": "^1.0.30001578",
+        "browserslist": "^4.23.0",
+        "caniuse-lite": "^1.0.30001591",
         "fraction.js": "^4.3.7",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -4359,15 +4658,15 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/bare-events": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.0.tgz",
-      "integrity": "sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.1.tgz",
+      "integrity": "sha512-9GYPpsPFvrWBkelIhOhTWtkeZxVxZOdb3VnFTCzlOo3OjvmTvzLoZFUT8kNFACx0vJej6QPney1Cf9BvzCNE/A==",
       "optional": true
     },
     "node_modules/bare-fs": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.2.0.tgz",
-      "integrity": "sha512-+VhW202E9eTVGkX7p+TNXtZC4RTzj9JfJW7PtfIbZ7mIQ/QT9uOafQTx7lx2n9ERmWsXvLHF4hStAFn4gl2mQw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.2.1.tgz",
+      "integrity": "sha512-+CjmZANQDFZWy4PGbVdmALIwmt33aJg8qTkVjClU6X4WmZkTPBDxRHiBn7fpqEWEfF3AC2io++erpViAIQbSjg==",
       "optional": true,
       "dependencies": {
         "bare-events": "^2.0.0",
@@ -4442,12 +4741,12 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -4455,7 +4754,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -4712,9 +5011,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001591",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz",
-      "integrity": "sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==",
+      "version": "1.0.30001593",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001593.tgz",
+      "integrity": "sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -5905,15 +6204,15 @@
       }
     },
     "node_modules/docusaurus-theme-search-typesense": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/docusaurus-theme-search-typesense/-/docusaurus-theme-search-typesense-0.14.1.tgz",
-      "integrity": "sha512-Zdbs1qnVv5cqxzh5/zGbLQfX4UNQGo6wnRRkYTtCg1eMvK14kFn7oejCxvkvfmRZpeeWLTMBgKyV220Kv7kKFw==",
-      "dependencies": {
-        "@docusaurus/logger": "3.0.1",
-        "@docusaurus/plugin-content-docs": "3.0.1",
-        "@docusaurus/theme-translations": "3.0.1",
-        "@docusaurus/utils": "3.0.1",
-        "@docusaurus/utils-validation": "3.0.1",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/docusaurus-theme-search-typesense/-/docusaurus-theme-search-typesense-0.16.0.tgz",
+      "integrity": "sha512-XbBoXnzx0hzc9uipF07w7CYyu/YPn2tjm4NprO+izA9B9jxMi6vtzNgTYzR0keOWeALGrcoswpDNvYgjHjMfCQ==",
+      "dependencies": {
+        "@docusaurus/logger": "3.1.1",
+        "@docusaurus/plugin-content-docs": "3.1.1",
+        "@docusaurus/theme-translations": "3.1.1",
+        "@docusaurus/utils": "3.1.1",
+        "@docusaurus/utils-validation": "3.1.1",
         "algoliasearch-helper": "^3.10.0",
         "clsx": "^1.2.1",
         "eta": "^2.0.0",
@@ -5928,8 +6227,8 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@docusaurus/core": "3.0.1",
-        "@docusaurus/theme-common": "3.0.1",
+        "@docusaurus/core": "3.1.1",
+        "@docusaurus/theme-common": "3.1.1",
         "react": "^18.0.0",
         "react-dom": "^18.0.0"
       }
@@ -6053,9 +6352,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.685",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.685.tgz",
-      "integrity": "sha512-yDYeobbTEe4TNooEzOQO6xFqg9XnAkVy2Lod1C1B2it8u47JNLYvl9nLDWBamqUakWB8Jc1hhS1uHUNYTNQdfw=="
+      "version": "1.4.692",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.692.tgz",
+      "integrity": "sha512-d5rZRka9n2Y3MkWRN74IoAsxR0HK3yaAt7T50e3iT9VZmCCQDT3geXUO5ZRMhDToa1pkCeQXuNo+0g+NfDOVPA=="
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
@@ -6410,13 +6709,13 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.18.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz",
+      "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.5.0",
@@ -7544,9 +7843,9 @@
       }
     },
     "node_modules/html-entities": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-      "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+      "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
       "funding": [
         {
           "type": "github",
@@ -12021,9 +12320,9 @@
       }
     },
     "node_modules/prebuild-install": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
-      "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
+      "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
       "dependencies": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
@@ -12267,9 +12566,9 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -13602,11 +13901,11 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
-      "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
         "get-intrinsic": "^1.2.4",
         "object-inspect": "^1.13.1"
diff --git a/packages/noco-docs/package.json b/packages/noco-docs/package.json
index 6b8ef33d63..b39facde5d 100644
--- a/packages/noco-docs/package.json
+++ b/packages/noco-docs/package.json
@@ -28,15 +28,15 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@docusaurus/core": "3.0.1",
-    "@docusaurus/plugin-client-redirects": "3.0.1",
-    "@docusaurus/plugin-ideal-image": "3.0.1",
-    "@docusaurus/plugin-sitemap": "3.0.1",
-    "@docusaurus/preset-classic": "3.0.1",
+    "@docusaurus/core": "3.1.1",
+    "@docusaurus/plugin-client-redirects": "3.1.1",
+    "@docusaurus/plugin-ideal-image": "3.1.1",
+    "@docusaurus/plugin-sitemap": "3.1.1",
+    "@docusaurus/preset-classic": "3.1.1",
     "@mdx-js/react": "^3.0.1",
     "clsx": "^1.2.1",
     "docusaurus-plugin-sass": "^0.2.5",
-    "docusaurus-theme-search-typesense": "^0.14.1",
+    "docusaurus-theme-search-typesense": "^0.16.0",
     "nc-analytics": "^0.0.9",
     "plugin-image-zoom": "github:flexanalytics/plugin-image-zoom",
     "prism-react-renderer": "^1.3.5",
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 8b7e8e80b5..b6134c843d 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -167,12 +167,12 @@
     "sqlite3": "^5.1.7",
     "tedious": "^16.6.1",
     "tinycolor2": "^1.6.0",
-    "twilio": "^3.84.1",
+    "twilio": "^4.23.0",
     "unique-names-generator": "^4.7.1",
     "uuid": "^9.0.1",
     "validator": "^13.11.0",
     "xc-core-ts": "^0.1.0",
-    "xlsx": "^0.18.5"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
   "devDependencies": {
     "@nestjs/cli": "^10.3.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7cb8ee4678..de35087b7c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,6 +7,15 @@ settings:
 overrides:
   vue: 3.3.13
   typescript: latest
+  ajv@<6.12.3: '>=6.12.3'
+  node.extend@<1.1.7: '>=1.1.7'
+  tough-cookie@<4.1.3: '>=4.1.3'
+  '@babel/traverse@<7.23.2': '>=7.23.2'
+  follow-redirects@<1.15.4: '>=1.15.4'
+  axios@>=0.8.1 <0.28.0: '>=0.28.0'
+  ip@<1.1.9: '>=1.1.9'
+  ip@=2.0.0: '>=2.0.1'
+  xml2js@<0.5.0: '>=0.5.0'
 
 importers:
 
@@ -22,8 +31,8 @@ importers:
         specifier: ^7.4.2
         version: 7.4.2
       xlsx:
-        specifier: ^0.17.5
-        version: 0.17.5
+        specifier: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz
+        version: '@cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz'
 
   packages/nc-gui:
     dependencies:
@@ -223,8 +232,8 @@ importers:
         specifier: ^4.1.0
         version: 4.1.0(vue@3.3.13)
       xlsx:
-        specifier: ^0.18.5
-        version: 0.18.5
+        specifier: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz
+        version: '@cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz'
     devDependencies:
       '@antfu/eslint-config':
         specifier: ^0.26.3
@@ -381,7 +390,7 @@ importers:
         version: 6.0.4
       nuxt:
         specifier: ^3.10.3
-        version: 3.10.3(eslint@8.56.0)(sass@1.70.0)(vite@4.5.2)
+        version: 3.10.3(eslint@8.56.0)(sass@1.71.1)(vite@4.5.2)
       nuxt-windicss:
         specifier: ^2.6.1
         version: 2.6.1(vite@4.5.2)
@@ -389,8 +398,8 @@ importers:
         specifier: ^2.8.8
         version: 2.8.8
       sass:
-        specifier: ^1.70.0
-        version: 1.70.0
+        specifier: ^1.71.1
+        version: 1.71.1
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(webpack@5.90.3)
@@ -408,7 +417,7 @@ importers:
         version: 0.10.0(vite@4.5.2)
       vitest:
         specifier: ^1.2.2
-        version: 1.2.2(@vitest/ui@0.34.7)(happy-dom@6.0.4)(sass@1.70.0)
+        version: 1.2.2(@vitest/ui@0.34.7)(happy-dom@6.0.4)(sass@1.71.1)
       windicss:
         specifier: ^3.5.6
         version: 3.5.6
@@ -782,8 +791,8 @@ importers:
         specifier: ^1.6.0
         version: 1.6.0
       twilio:
-        specifier: ^3.84.1
-        version: 3.84.1(debug@4.3.4)
+        specifier: ^4.23.0
+        version: 4.23.0(debug@4.3.4)
       unique-names-generator:
         specifier: ^4.7.1
         version: 4.7.1
@@ -797,8 +806,8 @@ importers:
         specifier: ^0.1.0
         version: 0.1.0
       xlsx:
-        specifier: ^0.18.5
-        version: 0.18.5
+        specifier: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz
+        version: '@cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz'
     devDependencies:
       '@nestjs/cli':
         specifier: ^10.3.2
@@ -913,7 +922,7 @@ importers:
     dependencies:
       axios:
         specifier: ^1.6.7
-        version: 1.6.7
+        version: 1.6.7(debug@3.2.7)
       dayjs:
         specifier: ^1.11.10
         version: 1.11.10
@@ -1085,7 +1094,7 @@ packages:
     resolution: {integrity: sha512-QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==}
     engines: {node: '>= 10.9.0', npm: '>= 6.2.0'}
     dependencies:
-      ajv: 6.10.2
+      ajv: 8.12.0
       fast-json-stable-stringify: 2.0.0
       magic-string: 0.25.3
       rxjs: 6.4.0
@@ -5568,7 +5577,7 @@ packages:
       class-validator:
         optional: true
     dependencies:
-      axios: 0.27.2(debug@4.3.4)
+      axios: 1.6.7(debug@4.3.4)
       iterare: 1.2.1
       reflect-metadata: 0.2.1
       rxjs: 7.8.1
@@ -6109,8 +6118,8 @@ packages:
       '@nuxt/kit': 3.10.3
       '@nuxt/schema': 3.10.3
       execa: 7.2.0
-      nuxt: 3.10.3(eslint@8.56.0)(sass@1.70.0)(vite@4.5.2)
-      vite: 4.5.2(sass@1.70.0)
+      nuxt: 3.10.3(eslint@8.56.0)(sass@1.71.1)(vite@4.5.2)
+      vite: 4.5.2(sass@1.71.1)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -6157,7 +6166,7 @@ packages:
       launch-editor: 2.6.1
       local-pkg: 0.5.0
       magicast: 0.3.2
-      nuxt: 3.10.3(eslint@8.56.0)(sass@1.70.0)(vite@4.5.2)
+      nuxt: 3.10.3(eslint@8.56.0)(sass@1.71.1)(vite@4.5.2)
       nypm: 0.3.6
       ohash: 1.1.3
       pacote: 17.0.6
@@ -6170,7 +6179,7 @@ packages:
       simple-git: 3.22.0
       sirv: 2.0.4
       unimport: 3.7.1(rollup@4.12.0)
-      vite: 4.5.2(sass@1.70.0)
+      vite: 4.5.2(sass@1.71.1)
       vite-plugin-inspect: 0.8.3(@nuxt/kit@3.10.3)(vite@4.5.2)
       vite-plugin-vue-inspector: 4.0.2(vite@4.5.2)
       which: 3.0.1
@@ -6480,7 +6489,7 @@ packages:
   /@nuxt/ui-templates@1.3.1:
     resolution: {integrity: sha512-5gc02Pu1HycOVUWJ8aYsWeeXcSTPe8iX8+KIrhyEtEoOSkY0eMBuo0ssljB8wALuEmepv31DlYe5gpiRwkjESA==}
 
-  /@nuxt/vite-builder@3.10.3(eslint@8.56.0)(sass@1.70.0)(vue@3.3.13):
+  /@nuxt/vite-builder@3.10.3(eslint@8.56.0)(sass@1.71.1)(vue@3.3.13):
     resolution: {integrity: sha512-BqkbrYkEk1AVUJleofbqTRV+ltf2p1CDjGDK78zENPCgrSABlj4F4oK8rze8vmRY5qoH7kMZxgMa2dXVXCp6OA==}
     engines: {node: ^14.18.0 || >=16.10.0}
     peerDependencies:
@@ -6516,8 +6525,8 @@ packages:
       ufo: 1.4.0
       unenv: 1.9.0
       unplugin: 1.7.1
-      vite: 5.1.4(sass@1.70.0)
-      vite-node: 1.3.1(sass@1.70.0)
+      vite: 5.1.4(sass@1.71.1)
+      vite-node: 1.3.1(sass@1.71.1)
       vite-plugin-checker: 0.6.4(eslint@8.56.0)(vite@5.1.4)
       vue: 3.3.13
       vue-bundle-renderer: 2.0.0
@@ -7136,7 +7145,7 @@ packages:
     resolution: {integrity: sha512-AtJbZv5Yy+vWX5v32DPTr+CW7AkSK8HJx52orDbrYt/9s4lGM2t4KKAmwaTQEH2HYr2HVh1mlqs54/S1s3WT1g==}
     dependencies:
       '@iconify/iconify': 2.1.2
-      axios: 0.26.1(debug@4.3.4)
+      axios: 1.6.7(debug@4.3.4)
       debug: 4.3.4(supports-color@5.5.0)
       fast-glob: 3.3.2
       fs-extra: 10.1.0
@@ -9923,7 +9932,7 @@ packages:
       '@unocss/core': 0.58.5
       '@unocss/reset': 0.58.5
       '@unocss/vite': 0.58.5(vite@4.5.2)
-      vite: 4.5.2(sass@1.70.0)
+      vite: 4.5.2(sass@1.71.1)
     transitivePeerDependencies:
       - rollup
     dev: true
@@ -10146,7 +10155,7 @@ packages:
       chokidar: 3.6.0
       fast-glob: 3.3.2
       magic-string: 0.30.7
-      vite: 4.5.2(sass@1.70.0)
+      vite: 4.5.2(sass@1.71.1)
     transitivePeerDependencies:
       - rollup
     dev: true
@@ -10201,7 +10210,7 @@ packages:
       '@babel/core': 7.23.9
       '@babel/plugin-transform-typescript': 7.23.4(@babel/core@7.23.9)
       '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.23.9)
-      vite: 5.1.4(sass@1.70.0)
+      vite: 5.1.4(sass@1.71.1)
       vue: 3.3.13
     transitivePeerDependencies:
       - supports-color
@@ -10214,7 +10223,7 @@ packages:
       vite: ^5.0.0
       vue: 3.3.13
     dependencies:
-      vite: 5.1.4(sass@1.70.0)
+      vite: 5.1.4(sass@1.71.1)
       vue: 3.3.13
     dev: true
 
@@ -10260,7 +10269,7 @@ packages:
       pathe: 1.1.2
       picocolors: 1.0.0
       sirv: 2.0.3
-      vitest: 1.2.2(@vitest/ui@0.34.7)(happy-dom@6.0.4)(sass@1.70.0)
+      vitest: 1.2.2(@vitest/ui@0.34.7)(happy-dom@6.0.4)(sass@1.71.1)
     dev: true
 
   /@vitest/utils@0.34.7:
@@ -10567,7 +10576,7 @@ packages:
     resolution: {integrity: sha512-+u3RLPFedjASs5EKPc69Ge49WNgqeMfSxFn+qrQTzblPXZg6+EFzhjarS5edj2qAf6xQ93f95TUxRwKStXj/sQ==}
     peerDependencies:
       async-validator: '*'
-      axios: '*'
+      axios: '>=0.28.0'
       change-case: '*'
       drauu: '*'
       focus-trap: '*'
@@ -10628,7 +10637,7 @@ packages:
       '@vueuse/core': 10.7.2(vue@3.3.13)
       '@vueuse/metadata': 10.7.2
       local-pkg: 0.5.0
-      nuxt: 3.10.3(eslint@8.56.0)(sass@1.70.0)(vite@4.5.2)
+      nuxt: 3.10.3(eslint@8.56.0)(sass@1.71.1)(vite@4.5.2)
       vue-demi: 0.14.7(vue@3.3.13)
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -10978,18 +10987,10 @@ packages:
     resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==}
     dev: true
 
-  /adler-32@1.2.0:
-    resolution: {integrity: sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==}
-    engines: {node: '>=0.8'}
-    hasBin: true
-    dependencies:
-      exit-on-epipe: 1.0.1
-      printj: 1.1.2
-    dev: true
-
   /adler-32@1.3.1:
     resolution: {integrity: sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==}
     engines: {node: '>=0.8'}
+    dev: false
 
   /agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
@@ -11046,7 +11047,7 @@ packages:
   /ajv-keywords@3.5.2(ajv@6.12.6):
     resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
     peerDependencies:
-      ajv: ^6.9.1
+      ajv: '>=6.12.3'
     dependencies:
       ajv: 6.12.6
     dev: true
@@ -11060,15 +11061,6 @@ packages:
       fast-deep-equal: 3.1.3
     dev: true
 
-  /ajv@6.10.2:
-    resolution: {integrity: sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==}
-    dependencies:
-      fast-deep-equal: 2.0.1
-      fast-json-stable-stringify: 2.1.0
-      json-schema-traverse: 0.4.1
-      uri-js: 4.4.1
-    dev: true
-
   /ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
@@ -11291,7 +11283,7 @@ packages:
   /array-buffer-byte-length@1.0.0:
     resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       is-array-buffer: 3.0.2
 
   /array-buffer-byte-length@1.0.1:
@@ -11318,10 +11310,10 @@ packages:
     resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4
       is-string: 1.0.7
     dev: true
 
@@ -11364,7 +11356,7 @@ packages:
     resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
       es-shim-unscopables: 1.0.0
@@ -11384,7 +11376,7 @@ packages:
     resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
       es-shim-unscopables: 1.0.0
@@ -11403,7 +11395,7 @@ packages:
   /array.prototype.tosorted@1.1.3:
     resolution: {integrity: sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==}
     dependencies:
-      call-bind: 1.0.6
+      call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.22.4
       es-errors: 1.3.0
@@ -11415,9 +11407,9 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       array-buffer-byte-length: 1.0.0
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4
       is-array-buffer: 3.0.2
       is-shared-array-buffer: 1.0.2
 
@@ -11445,6 +11437,7 @@ packages:
 
   /asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
+    dev: true
 
   /asn1.js-rfc2560@5.0.1(asn1.js@5.4.1):
     resolution: {integrity: sha512-1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA==}
@@ -11624,50 +11617,17 @@ packages:
       is-retry-allowed: 2.2.0
     dev: false
 
-  /axios@0.24.0(debug@4.3.4):
-    resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==}
-    dependencies:
-      follow-redirects: 1.15.4(debug@4.3.4)
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /axios@0.26.1(debug@4.3.4):
-    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
-    dependencies:
-      follow-redirects: 1.15.4(debug@4.3.4)
-    transitivePeerDependencies:
-      - debug
-
-  /axios@0.27.2(debug@3.2.7):
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.4(debug@3.2.7)
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /axios@0.27.2(debug@4.3.4):
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
-    dependencies:
-      follow-redirects: 1.15.4(debug@4.3.4)
-      form-data: 4.0.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
   /axios@1.6.2:
     resolution: {integrity: sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==}
     dependencies:
-      follow-redirects: 1.15.2
+      follow-redirects: 1.15.4(debug@3.2.7)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
     dev: false
 
-  /axios@1.6.7:
+  /axios@1.6.7(debug@3.2.7):
     resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==}
     dependencies:
       follow-redirects: 1.15.4(debug@3.2.7)
@@ -11684,7 +11644,6 @@ packages:
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
-    dev: false
 
   /b4a@1.6.4:
     resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==}
@@ -12252,17 +12211,8 @@ packages:
   /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
-      function-bind: 1.1.1
-      get-intrinsic: 1.2.1
-
-  /call-bind@1.0.6:
-    resolution: {integrity: sha512-Mj50FLHtlsoVfRfnHaZvyrooHcrlceNZdL/QBvJJVd9Ta55qCQK0gs4ss2oZDeV9zFCs6ewzYgVE5yfVmfFpVg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      es-errors: 1.3.0
       function-bind: 1.1.2
       get-intrinsic: 1.2.4
-      set-function-length: 1.2.1
     dev: true
 
   /call-bind@1.0.7:
@@ -12274,7 +12224,6 @@ packages:
       function-bind: 1.1.2
       get-intrinsic: 1.2.4
       set-function-length: 1.2.1
-    dev: true
 
   /callforth@0.3.1:
     resolution: {integrity: sha512-Q2zPfqnwoKsb1DTVCr4lmhe49wKNBsMmNlbudjleu3/co+Nw1pOqFHYJHrW3VZ253ou9AAr+xauQR0C55NPdzA==}
@@ -12327,6 +12276,7 @@ packages:
     dependencies:
       adler-32: 1.3.1
       crc-32: 1.2.2
+    dev: false
 
   /chai@4.4.1:
     resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==}
@@ -12680,6 +12630,7 @@ packages:
   /codepage@1.15.0:
     resolution: {integrity: sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==}
     engines: {node: '>=0.8'}
+    dev: false
 
   /collect-v8-coverage@1.0.2:
     resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==}
@@ -13777,16 +13728,6 @@ packages:
       clone: 1.0.4
     dev: true
 
-  /define-data-property@1.1.2:
-    resolution: {integrity: sha512-SRtsSqsDbgpJBbW3pABMCOt6rQyeM8s8RiyeSN8jYG8sYmt/kGJejbydttUsnDs1tadr19tvhT4ShwMyoqAm4g==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.1
-    dev: true
-
   /define-data-property@1.1.4:
     resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
     engines: {node: '>= 0.4'}
@@ -13794,7 +13735,6 @@ packages:
       es-define-property: 1.0.0
       es-errors: 1.3.0
       gopd: 1.0.1
-    dev: true
 
   /define-lazy-prop@2.0.0:
     resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
@@ -13809,15 +13749,15 @@ packages:
     resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      has-property-descriptors: 1.0.0
+      has-property-descriptors: 1.0.2
       object-keys: 1.1.1
 
   /define-properties@1.2.1:
     resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      define-data-property: 1.1.2
-      has-property-descriptors: 1.0.1
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.2
       object-keys: 1.1.1
     dev: true
 
@@ -14273,16 +14213,16 @@ packages:
       array-buffer-byte-length: 1.0.0
       arraybuffer.prototype.slice: 1.0.1
       available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       es-set-tostringtag: 2.0.1
       es-to-primitive: 1.2.1
       function.prototype.name: 1.1.5
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4
       get-symbol-description: 1.0.0
       globalthis: 1.0.3
       gopd: 1.0.1
       has: 1.0.3
-      has-property-descriptors: 1.0.0
+      has-property-descriptors: 1.0.2
       has-proto: 1.0.1
       has-symbols: 1.0.3
       internal-slot: 1.0.5
@@ -14294,7 +14234,7 @@ packages:
       is-string: 1.0.7
       is-typed-array: 1.1.12
       is-weakref: 1.0.2
-      object-inspect: 1.12.3
+      object-inspect: 1.13.1
       object-keys: 1.1.1
       object.assign: 4.1.4
       regexp.prototype.flags: 1.5.0
@@ -14363,9 +14303,9 @@ packages:
     dependencies:
       define-properties: 1.2.0
       es-abstract: 1.22.1
-      function-bind: 1.1.1
+      function-bind: 1.1.2
       functions-have-names: 1.2.3
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4
       globalthis: 1.0.3
       has-property-descriptors: 1.0.0
     dev: false
@@ -14375,12 +14315,10 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       get-intrinsic: 1.2.4
-    dev: true
 
   /es-errors@1.3.0:
     resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
     engines: {node: '>= 0.4'}
-    dev: true
 
   /es-iterator-helpers@1.0.17:
     resolution: {integrity: sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==}
@@ -14415,7 +14353,7 @@ packages:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4
       has: 1.0.3
       has-tostringtag: 1.0.0
 
@@ -14437,7 +14375,7 @@ packages:
   /es-shim-unscopables@1.0.2:
     resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
     dependencies:
-      hasown: 2.0.0
+      hasown: 2.0.1
     dev: true
 
   /es-to-primitive@1.2.1:
@@ -14847,7 +14785,7 @@ packages:
       eslint: 8.56.0
       eslint-import-resolver-node: 0.3.9
       eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0)
-      hasown: 2.0.0
+      hasown: 2.0.1
       is-core-module: 2.13.1
       is-glob: 4.0.3
       minimatch: 3.1.2
@@ -15406,11 +15344,6 @@ packages:
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
 
-  /exit-on-epipe@1.0.1:
-    resolution: {integrity: sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==}
-    engines: {node: '>=0.8'}
-    dev: true
-
   /exit@0.1.2:
     resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
     engines: {node: '>= 0.8.0'}
@@ -15619,10 +15552,6 @@ packages:
     engines: {'0': node >=0.6.0}
     dev: false
 
-  /fast-deep-equal@2.0.1:
-    resolution: {integrity: sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==}
-    dev: true
-
   /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
@@ -15868,16 +15797,6 @@ packages:
     resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==}
     dev: false
 
-  /follow-redirects@1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
-
   /follow-redirects@1.15.4(debug@3.2.7):
     resolution: {integrity: sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==}
     engines: {node: '>=4.0'}
@@ -16007,6 +15926,7 @@ packages:
   /frac@1.1.2:
     resolution: {integrity: sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==}
     engines: {node: '>=0.8'}
+    dev: false
 
   /fraction.js@4.3.7:
     resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
@@ -16124,9 +16044,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
-
   /function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
@@ -16134,7 +16051,7 @@ packages:
     resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
       functions-have-names: 1.2.3
@@ -16262,10 +16179,11 @@ packages:
   /get-intrinsic@1.2.1:
     resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
     dependencies:
-      function-bind: 1.1.1
+      function-bind: 1.1.2
       has: 1.0.3
       has-proto: 1.0.1
       has-symbols: 1.0.3
+    dev: true
 
   /get-intrinsic@1.2.4:
     resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
@@ -16275,8 +16193,7 @@ packages:
       function-bind: 1.1.2
       has-proto: 1.0.1
       has-symbols: 1.0.3
-      hasown: 2.0.0
-    dev: true
+      hasown: 2.0.1
 
   /get-own-enumerable-property-symbols@3.0.2:
     resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==}
@@ -16353,8 +16270,8 @@ packages:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
 
   /get-symbol-description@1.0.2:
     resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
@@ -16660,7 +16577,7 @@ packages:
   /gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4
 
   /graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
@@ -16890,20 +16807,14 @@ packages:
 
   /has-property-descriptors@1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
-    dependencies:
-      get-intrinsic: 1.2.1
-
-  /has-property-descriptors@1.0.1:
-    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
     dependencies:
       get-intrinsic: 1.2.4
-    dev: true
+    dev: false
 
   /has-property-descriptors@1.0.2:
     resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
     dependencies:
       es-define-property: 1.0.0
-    dev: true
 
   /has-proto@1.0.1:
     resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
@@ -16933,7 +16844,7 @@ packages:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
     dependencies:
-      function-bind: 1.1.1
+      function-bind: 1.1.2
 
   /hash-sum@2.0.0:
     resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==}
@@ -16949,7 +16860,6 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       function-bind: 1.1.2
-    dev: true
 
   /he@1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
@@ -17369,7 +17279,7 @@ packages:
     resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4
       has: 1.0.3
       side-channel: 1.0.4
 
@@ -17378,7 +17288,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       es-errors: 1.3.0
-      hasown: 2.0.0
+      hasown: 2.0.1
       side-channel: 1.0.4
     dev: true
 
@@ -17439,13 +17349,13 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /ip@1.1.8:
-    resolution: {integrity: sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==}
-    dev: false
-
   /ip@2.0.0:
     resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==}
     requiresBuild: true
+    dev: false
+
+  /ip@2.0.1:
+    resolution: {integrity: sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==}
 
   /ipaddr.js@1.9.1:
     resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
@@ -17525,15 +17435,15 @@ packages:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       has-tostringtag: 1.0.0
     dev: false
 
   /is-array-buffer@3.0.2:
     resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
       is-typed-array: 1.1.12
 
   /is-array-buffer@3.0.4:
@@ -17575,7 +17485,7 @@ packages:
     resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       has-tostringtag: 1.0.0
 
   /is-buffer@1.1.6:
@@ -17833,7 +17743,7 @@ packages:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       has-tostringtag: 1.0.0
 
   /is-regexp@1.0.0:
@@ -17860,7 +17770,7 @@ packages:
   /is-shared-array-buffer@1.0.2:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
 
   /is-ssh@1.4.0:
     resolution: {integrity: sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==}
@@ -17940,7 +17850,7 @@ packages:
   /is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
 
   /is-weakset@2.0.2:
     resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
@@ -17975,8 +17885,8 @@ packages:
       system-architecture: 0.1.0
     dev: true
 
-  /is@0.2.7:
-    resolution: {integrity: sha512-ajQCouIvkcSnl2iRdK70Jug9mohIHVX9uKpoWnl115ov0R5mzBvRrXxrnHbsA+8AdwCwc/sfw7HXmd4I5EJBdQ==}
+  /is@3.3.0:
+    resolution: {integrity: sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==}
     dev: false
 
   /isarray@1.0.0:
@@ -18801,22 +18711,6 @@ packages:
     resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
     engines: {'0': node >= 0.2.0}
 
-  /jsonwebtoken@8.5.1:
-    resolution: {integrity: sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==}
-    engines: {node: '>=4', npm: '>=1.4.28'}
-    dependencies:
-      jws: 3.2.2
-      lodash.includes: 4.3.0
-      lodash.isboolean: 3.0.3
-      lodash.isinteger: 4.0.4
-      lodash.isnumber: 3.0.3
-      lodash.isplainobject: 4.0.6
-      lodash.isstring: 4.0.1
-      lodash.once: 4.1.1
-      ms: 2.1.3
-      semver: 5.7.2
-    dev: false
-
   /jsonwebtoken@9.0.2:
     resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
     engines: {node: '>=12', npm: '>=6'}
@@ -20400,7 +20294,7 @@ packages:
     peerDependencies:
       knex: 2.4.2
     dependencies:
-      axios: 0.27.2(debug@4.3.4)
+      axios: 1.6.7(debug@4.3.4)
       emittery: 0.13.1
       is-docker: 2.2.1
       knex: 2.4.2(mysql2@3.9.2)(pg@8.11.3)(sqlite3@5.1.7)(tedious@16.6.1)
@@ -20713,19 +20607,19 @@ packages:
   /node-releases@2.0.14:
     resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
-  /node.extend@1.0.8:
-    resolution: {integrity: sha512-yvo/DZY0kijlDF192KqLX59/Yz0S5eUrV0GnRcjsoRXVqCGt7EVK+ONq3ZlijJvH/z/447qJaOeTgOGfyFQNPA==}
-    engines: {'0': node >= 0.4.0}
+  /node.extend@2.0.3:
+    resolution: {integrity: sha512-xwADg/okH48PvBmRZyoX8i8GJaKuJ1CqlqotlZOhUio8egD1P5trJupHKBzcPjSF9ifK2gPcEICRBnkfPqQXZw==}
+    engines: {node: '>=0.4.0'}
     dependencies:
-      is: 0.2.7
-      object-keys: 0.4.0
+      hasown: 2.0.1
+      is: 3.3.0
     dev: false
 
   /node.flow@1.2.3:
     resolution: {integrity: sha512-f6bmAiB6wte7YTVWn5rWpz7Fh9OFHMmj8FwNkI3XnwIHRbg7H3nVncr1Kz8DnGS3idUFpRQ8D6lsecUAvjlqKA==}
     engines: {'0': node >= 0.4.0}
     dependencies:
-      node.extend: 1.0.8
+      node.extend: 2.0.3
     dev: false
 
   /nodemailer@6.9.11:
@@ -21045,7 +20939,7 @@ packages:
       - vite
     dev: true
 
-  /nuxt@3.10.3(eslint@8.56.0)(sass@1.70.0)(vite@4.5.2):
+  /nuxt@3.10.3(eslint@8.56.0)(sass@1.71.1)(vite@4.5.2):
     resolution: {integrity: sha512-NchGNiiz9g/ErJAb462W/lpX2NqcXYb9hugySKWvLXNdrjeAPiJ2/7mhgwUSiZA9MpjuQg3saiEajr1zlRIOCg==}
     engines: {node: ^14.18.0 || >=16.10.0}
     hasBin: true
@@ -21064,7 +20958,7 @@ packages:
       '@nuxt/schema': 3.10.3
       '@nuxt/telemetry': 2.5.3
       '@nuxt/ui-templates': 1.3.1
-      '@nuxt/vite-builder': 3.10.3(eslint@8.56.0)(sass@1.70.0)(vue@3.3.13)
+      '@nuxt/vite-builder': 3.10.3(eslint@8.56.0)(sass@1.71.1)(vue@3.3.13)
       '@unhead/dom': 1.8.10
       '@unhead/ssr': 1.8.10
       '@unhead/vue': 1.8.10(vue@3.3.13)
@@ -21169,7 +21063,7 @@ packages:
       '@yarnpkg/lockfile': 1.1.0
       '@yarnpkg/parsers': 3.0.0-rc.46
       '@zkochan/js-yaml': 0.0.6
-      axios: 1.6.7
+      axios: 1.6.7(debug@3.2.7)
       chalk: 4.1.2
       cli-cursor: 3.1.0
       cli-spinners: 2.6.1
@@ -21253,14 +21147,10 @@ packages:
 
   /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
+    dev: true
 
   /object-inspect@1.13.1:
     resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
-    dev: true
-
-  /object-keys@0.4.0:
-    resolution: {integrity: sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==}
-    dev: false
 
   /object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
@@ -21276,7 +21166,7 @@ packages:
     resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       has-symbols: 1.0.3
       object-keys: 1.1.1
@@ -21295,7 +21185,7 @@ packages:
     resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.6
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
     dev: true
@@ -21343,7 +21233,7 @@ packages:
     resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
     dev: true
@@ -22142,10 +22032,6 @@ packages:
     engines: {node: '>=10.13.0'}
     dev: false
 
-  /pop-iterate@1.0.1:
-    resolution: {integrity: sha512-HRCx4+KJE30JhX84wBN4+vja9bNfysxg1y28l0DuJmkoaICiv2ZSilKddbS48pq50P8d2erAhqDLbp47yv3MbQ==}
-    dev: false
-
   /possible-typed-array-names@1.0.0:
     resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
     engines: {node: '>= 0.4'}
@@ -22482,7 +22368,7 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
     dependencies:
-      axios: 0.24.0(debug@4.3.4)
+      axios: 1.6.7(debug@4.3.4)
       axios-retry: 3.6.1
       component-type: 1.2.1
       join-component: 1.1.0
@@ -22546,12 +22432,6 @@ packages:
       react-is: 18.2.0
     dev: true
 
-  /printj@1.1.2:
-    resolution: {integrity: sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==}
-    engines: {node: '>=0.8'}
-    hasBin: true
-    dev: true
-
   /proc-log@3.0.0:
     resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -22806,10 +22686,6 @@ packages:
     resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
     dev: false
 
-  /punycode@1.4.1:
-    resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
-    dev: false
-
   /punycode@2.3.0:
     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
@@ -22829,14 +22705,6 @@ packages:
       long: 4.0.0
     dev: false
 
-  /q@2.0.3:
-    resolution: {integrity: sha512-gv6vLGcmAOg96/fgo3d9tvA4dJNZL3fMyBqVRrGxQ+Q/o4k9QzbJ3NQF9cOO/71wRodoXhaPgphvMFU68qVAJQ==}
-    dependencies:
-      asap: 2.0.6
-      pop-iterate: 1.0.1
-      weak-map: 1.0.8
-    dev: false
-
   /qrcode@1.5.3:
     resolution: {integrity: sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==}
     engines: {node: '>=10.13.0'}
@@ -23163,7 +23031,7 @@ packages:
     resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       functions-have-names: 1.2.3
 
@@ -23223,7 +23091,7 @@ packages:
       performance-now: 2.1.0
       qs: 6.5.3
       safe-buffer: 5.2.1
-      tough-cookie: 2.4.3
+      tough-cookie: 4.1.3
       tunnel-agent: 0.6.0
       uuid: 3.4.0
     dev: false
@@ -23250,7 +23118,7 @@ packages:
       performance-now: 2.1.0
       qs: 6.5.3
       safe-buffer: 5.2.1
-      tough-cookie: 2.5.0
+      tough-cookie: 4.1.3
       tunnel-agent: 0.6.0
       uuid: 3.4.0
     dev: false
@@ -23478,10 +23346,6 @@ packages:
       '@rollup/rollup-win32-x64-msvc': 4.12.0
       fsevents: 2.3.3
 
-  /rootpath@0.1.2:
-    resolution: {integrity: sha512-R3wLbuAYejpxQjL/SjXo1Cjv4wcJECnMRT/FlcCfTwCBhaji9rWaRCoVEQ1SPiTJ4kKK+yh+bZLAV7SCafoDDw==}
-    dev: false
-
   /rope-sequence@1.3.4:
     resolution: {integrity: sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==}
     dev: false
@@ -23533,8 +23397,8 @@ packages:
     resolution: {integrity: sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==}
     engines: {node: '>=0.4'}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
       has-symbols: 1.0.3
       isarray: 2.0.5
 
@@ -23557,8 +23421,8 @@ packages:
   /safe-regex-test@1.0.0:
     resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
       is-regex: 1.1.4
 
   /safe-regex-test@1.0.3:
@@ -23584,8 +23448,8 @@ packages:
   /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  /sass@1.70.0:
-    resolution: {integrity: sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==}
+  /sass@1.71.1:
+    resolution: {integrity: sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
@@ -23737,13 +23601,12 @@ packages:
     resolution: {integrity: sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==}
     engines: {node: '>= 0.4'}
     dependencies:
-      define-data-property: 1.1.2
+      define-data-property: 1.1.4
       es-errors: 1.3.0
       function-bind: 1.1.2
       get-intrinsic: 1.2.4
       gopd: 1.0.1
-      has-property-descriptors: 1.0.1
-    dev: true
+      has-property-descriptors: 1.0.2
 
   /set-function-name@2.0.2:
     resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
@@ -23846,9 +23709,9 @@ packages:
   /side-channel@1.0.4:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      object-inspect: 1.12.3
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      object-inspect: 1.13.1
 
   /siginfo@2.0.0:
     resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
@@ -24024,7 +23887,7 @@ packages:
       asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
       asn1.js-rfc5280: 3.0.0
       aws-sdk: 2.1555.0
-      axios: 0.27.2(debug@3.2.7)
+      axios: 1.6.7(debug@3.2.7)
       big-integer: 1.6.51
       bignumber.js: 2.4.0
       binascii: 0.0.2
@@ -24142,7 +24005,7 @@ packages:
     resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
     engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
     dependencies:
-      ip: 2.0.0
+      ip: 2.0.1
       smart-buffer: 4.2.0
 
   /sort-keys@2.0.0:
@@ -24301,6 +24164,7 @@ packages:
     engines: {node: '>=0.8'}
     dependencies:
       frac: 1.1.2
+    dev: false
 
   /sshpk@1.17.0:
     resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==}
@@ -24460,7 +24324,7 @@ packages:
   /string.prototype.matchall@4.0.10:
     resolution: {integrity: sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==}
     dependencies:
-      call-bind: 1.0.6
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
       get-intrinsic: 1.2.4
@@ -24475,7 +24339,7 @@ packages:
     resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
     dev: true
@@ -24484,7 +24348,7 @@ packages:
     resolution: {integrity: sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
 
@@ -24500,7 +24364,7 @@ packages:
   /string.prototype.trimend@1.0.6:
     resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
 
@@ -24515,7 +24379,7 @@ packages:
   /string.prototype.trimstart@1.0.6:
     resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.0
       es-abstract: 1.22.1
 
@@ -25153,28 +25017,12 @@ packages:
       nopt: 1.0.10
     dev: true
 
-  /tough-cookie@2.4.3:
-    resolution: {integrity: sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      psl: 1.9.0
-      punycode: 1.4.1
-    dev: false
-
-  /tough-cookie@2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      psl: 1.9.0
-      punycode: 2.3.0
-    dev: false
-
   /tough-cookie@4.1.3:
     resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
     engines: {node: '>=6'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.3.0
+      punycode: 2.3.1
       universalify: 0.2.0
       url-parse: 1.5.10
     dev: false
@@ -25451,18 +25299,15 @@ packages:
     resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
     dev: false
 
-  /twilio@3.84.1(debug@4.3.4):
-    resolution: {integrity: sha512-Q/xaPoayTj+bgJdnUgpE+EiB/VoNOG+byDFdlDej0FgxiHLgXKliZfVv6boqHPWvC1k7Dt0AK96OBFZ0P55QQg==}
-    engines: {node: '>=6.0'}
+  /twilio@4.23.0(debug@4.3.4):
+    resolution: {integrity: sha512-LdNBQfOe0dY2oJH2sAsrxazpgfFQo5yXGxe96QA8UWB5uu+433PrUbkv8gQ5RmrRCqUTPQ0aOrIyAdBr1aB03Q==}
+    engines: {node: '>=14.0'}
     dependencies:
-      axios: 0.26.1(debug@4.3.4)
+      axios: 1.6.7(debug@4.3.4)
       dayjs: 1.11.10
       https-proxy-agent: 5.0.1
-      jsonwebtoken: 8.5.1
-      lodash: 4.17.21
-      q: 2.0.3
+      jsonwebtoken: 9.0.2
       qs: 6.11.2
-      rootpath: 0.1.2
       scmp: 2.1.0
       url-parse: 1.5.10
       xmlbuilder: 13.0.2
@@ -25533,8 +25378,8 @@ packages:
     resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
       is-typed-array: 1.1.12
 
   /typed-array-buffer@1.0.2:
@@ -25550,7 +25395,7 @@ packages:
     resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       for-each: 0.3.3
       has-proto: 1.0.1
       is-typed-array: 1.1.12
@@ -25560,7 +25405,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       for-each: 0.3.3
       has-proto: 1.0.1
       is-typed-array: 1.1.12
@@ -25568,7 +25413,7 @@ packages:
   /typed-array-length@1.0.4:
     resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       for-each: 0.3.3
       is-typed-array: 1.1.12
 
@@ -25627,7 +25472,7 @@ packages:
   /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       has-bigints: 1.0.2
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
@@ -25822,7 +25667,7 @@ packages:
       '@unocss/transformer-variant-group': 0.58.5
       '@unocss/vite': 0.58.5(vite@4.5.2)
       '@unocss/webpack': 0.58.5(webpack@5.90.3)
-      vite: 4.5.2(sass@1.70.0)
+      vite: 4.5.2(sass@1.71.1)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -26100,7 +25945,7 @@ packages:
       formstream: 1.3.1
       humanize-ms: 1.2.1
       iconv-lite: 0.4.24
-      ip: 1.1.8
+      ip: 2.0.0
       pump: 3.0.0
       qs: 6.11.2
       statuses: 1.5.0
@@ -26237,7 +26082,7 @@ packages:
       extsprintf: 1.3.0
     dev: false
 
-  /vite-node@1.2.2(sass@1.70.0):
+  /vite-node@1.2.2(sass@1.71.1):
     resolution: {integrity: sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -26246,7 +26091,7 @@ packages:
       debug: 4.3.4(supports-color@5.5.0)
       pathe: 1.1.2
       picocolors: 1.0.0
-      vite: 5.1.4(sass@1.70.0)
+      vite: 5.1.4(sass@1.71.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -26258,7 +26103,7 @@ packages:
       - terser
     dev: true
 
-  /vite-node@1.3.1(sass@1.70.0):
+  /vite-node@1.3.1(sass@1.71.1):
     resolution: {integrity: sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -26267,7 +26112,7 @@ packages:
       debug: 4.3.4(supports-color@5.5.0)
       pathe: 1.1.2
       picocolors: 1.0.0
-      vite: 5.1.4(sass@1.70.0)
+      vite: 5.1.4(sass@1.71.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -26322,7 +26167,7 @@ packages:
       semver: 7.6.0
       strip-ansi: 6.0.1
       tiny-invariant: 1.3.1
-      vite: 5.1.4(sass@1.70.0)
+      vite: 5.1.4(sass@1.71.1)
       vscode-languageclient: 7.0.0
       vscode-languageserver: 7.0.0
       vscode-languageserver-textdocument: 1.0.8
@@ -26349,7 +26194,7 @@ packages:
       perfect-debounce: 1.0.0
       picocolors: 1.0.0
       sirv: 2.0.4
-      vite: 4.5.2(sass@1.70.0)
+      vite: 4.5.2(sass@1.71.1)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -26372,7 +26217,7 @@ packages:
       '@purge-icons/core': 0.10.0
       '@purge-icons/generated': 0.10.0
       rollup-plugin-purge-icons: 0.10.0
-      vite: 4.5.2(sass@1.70.0)
+      vite: 4.5.2(sass@1.71.1)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -26392,7 +26237,7 @@ packages:
       '@vue/compiler-dom': 3.4.20
       kolorist: 1.8.0
       magic-string: 0.30.7
-      vite: 4.5.2(sass@1.70.0)
+      vite: 4.5.2(sass@1.71.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -26405,13 +26250,13 @@ packages:
       '@windicss/plugin-utils': 1.9.1
       debug: 4.3.4(supports-color@5.5.0)
       kolorist: 1.8.0
-      vite: 4.5.2(sass@1.70.0)
+      vite: 4.5.2(sass@1.71.1)
       windicss: 3.5.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite@4.5.2(sass@1.70.0):
+  /vite@4.5.2(sass@1.71.1):
     resolution: {integrity: sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -26442,12 +26287,12 @@ packages:
       esbuild: 0.18.20
       postcss: 8.4.35
       rollup: 3.29.4
-      sass: 1.70.0
+      sass: 1.71.1
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
 
-  /vite@5.1.4(sass@1.70.0):
+  /vite@5.1.4(sass@1.71.1):
     resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -26478,12 +26323,12 @@ packages:
       esbuild: 0.19.11
       postcss: 8.4.35
       rollup: 4.12.0
-      sass: 1.70.0
+      sass: 1.71.1
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
 
-  /vitest@1.2.2(@vitest/ui@0.34.7)(happy-dom@6.0.4)(sass@1.70.0):
+  /vitest@1.2.2(@vitest/ui@0.34.7)(happy-dom@6.0.4)(sass@1.71.1):
     resolution: {integrity: sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -26528,8 +26373,8 @@ packages:
       strip-literal: 1.3.0
       tinybench: 2.6.0
       tinypool: 0.8.2
-      vite: 5.1.4(sass@1.70.0)
-      vite-node: 1.2.2(sass@1.70.0)
+      vite: 5.1.4(sass@1.71.1)
+      vite-node: 1.2.2(sass@1.71.1)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -26870,10 +26715,6 @@ packages:
       defaults: 1.0.4
     dev: true
 
-  /weak-map@1.0.8:
-    resolution: {integrity: sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw==}
-    dev: false
-
   /web-encoding@1.1.5:
     resolution: {integrity: sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==}
     dependencies:
@@ -26887,7 +26728,7 @@ packages:
     engines: {node: '>=0.8.x'}
     dependencies:
       step: 0.0.6
-      xml2js: 0.1.14
+      xml2js: 0.6.2
     dev: false
 
   /webidl-conversions@3.0.1:
@@ -27171,7 +27012,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       for-each: 0.3.3
       gopd: 1.0.1
       has-tostringtag: 1.0.0
@@ -27319,10 +27160,12 @@ packages:
   /wmf@1.0.2:
     resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==}
     engines: {node: '>=0.8'}
+    dev: false
 
   /word@0.3.0:
     resolution: {integrity: sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==}
     engines: {node: '>=0.8'}
+    dev: false
 
   /wordwrap@1.0.0:
     resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
@@ -27480,20 +27323,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /xlsx@0.17.5:
-    resolution: {integrity: sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==}
-    engines: {node: '>=0.8'}
-    hasBin: true
-    dependencies:
-      adler-32: 1.2.0
-      cfb: 1.2.2
-      codepage: 1.15.0
-      crc-32: 1.2.2
-      ssf: 0.11.2
-      wmf: 1.0.2
-      word: 0.3.0
-    dev: true
-
   /xlsx@0.18.5:
     resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==}
     engines: {node: '>=0.8'}
@@ -27525,12 +27354,6 @@ packages:
     engines: {node: '>=18'}
     dev: false
 
-  /xml2js@0.1.14:
-    resolution: {integrity: sha512-pbdws4PPPNc1HPluSUKamY4GWMk592K7qwcj6BExbVOhhubub8+pMda/ql68b6L3luZs/OGjGSB5goV7SnmgnA==}
-    dependencies:
-      sax: 1.2.4
-    dev: false
-
   /xml2js@0.5.0:
     resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
     engines: {node: '>=4.0.0'}
@@ -27739,3 +27562,10 @@ packages:
       compress-commons: 5.0.1
       readable-stream: 3.6.2
     dev: true
+
+  '@cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz':
+    resolution: {tarball: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz}
+    name: xlsx
+    version: 0.19.3
+    engines: {node: '>=0.8'}
+    hasBin: true

From a6aef50b738b59ed39525391369a2e692f1938f0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 12:00:16 +0800
Subject: [PATCH 018/253] chore(renovate): Update dependency nocodb to v0.204.4
 (#7791)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 scripts/pkg-executable/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pkg-executable/package.json b/scripts/pkg-executable/package.json
index 3102b1934f..08d223738f 100644
--- a/scripts/pkg-executable/package.json
+++ b/scripts/pkg-executable/package.json
@@ -30,7 +30,7 @@
     "@nestjs/common": "^10.3.3",
     "@nestjs/core": "^10.3.3",
     "express": "^4.18.3",
-    "nocodb": "0.204.3"
+    "nocodb": "0.204.4"
   },
   "overrides": {
     "sqlite3": "5.1.7"

From cd0753c6c64deb89234a7d662996f4a64bb252c0 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 5 Mar 2024 13:00:24 +0530
Subject: [PATCH 019/253] chore: action to validate swagger json

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .github/workflows/ci-cd.yml | 39 +++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 0d021b6272..c3ff829eb4 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -28,6 +28,33 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+    validate-swagger-json:
+      runs-on: ubuntu-20.04
+      timeout-minutes: 10
+      if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+          with:
+            fetch-depth: 1
+
+# enable after fixing all validation errors
+#        - name: Validate OpenAPI definition
+#          uses: char0n/swagger-editor-validate@v1
+#          with:
+#            swagger-editor-url: http://localhost/
+#            definition-file: packages/nocodb/src/schema/swagger.json
+
+        - name: Validate Swagger JSON
+          run: |
+            if ! jq empty packages/nocodb/src/schema/swagger.json; then
+              echo "swagger.json file is not valid JSON"
+              exit 1
+            fi
+            if ! jq empty packages/nocodb/src/schema/swagger-v2.json; then
+              echo "swaggerv2.json file is not valid JSON"
+              exit 1
+            fi
     unit-tests:
       runs-on: ubuntu-20.04
       timeout-minutes: 40
@@ -45,7 +72,7 @@ jobs:
           uses: actions/checkout@v3
           with:
             fetch-depth: 0
-        - name: remove use-node-version from .npmrc 
+        - name: remove use-node-version from .npmrc
           run:  sed -i '/^use-node-version/d' .npmrc
         - name: Get pnpm store directory
           shell: bash
@@ -80,8 +107,8 @@ jobs:
           uses: actions/checkout@v3
           with:
             fetch-depth: 0
-        - name: remove use-node-version from .npmrc 
-          run:  sed -i '/^use-node-version/d' .npmrc           
+        - name: remove use-node-version from .npmrc
+          run:  sed -i '/^use-node-version/d' .npmrc
         - name: Get pnpm store directory
           shell: bash
           run: |
@@ -134,7 +161,7 @@ jobs:
       uses: ./.github/workflows/playwright-test-workflow.yml
       with:
         db: mysql
-        shard: 4       
+        shard: 4
     playwright-sqlite-1:
       needs: pre-build-for-playwright
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
@@ -162,7 +189,7 @@ jobs:
       uses: ./.github/workflows/playwright-test-workflow.yml
       with:
         db: sqlite
-        shard: 4           
+        shard: 4
     playwright-pg-shard-1:
       needs: pre-build-for-playwright
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
@@ -190,4 +217,4 @@ jobs:
       uses: ./.github/workflows/playwright-test-workflow.yml
       with:
         db: pg
-        shard: 4       
\ No newline at end of file
+        shard: 4

From 766effdb5624b96efa1afcfe8acd3b2a8d9e3894 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 5 Mar 2024 09:47:01 +0000
Subject: [PATCH 020/253] fix: handle if error is undefined/null

---
 packages/nc-gui/components/nc/ErrorBoundary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/nc/ErrorBoundary.vue b/packages/nc-gui/components/nc/ErrorBoundary.vue
index 25b7df4585..83da1797ed 100644
--- a/packages/nc-gui/components/nc/ErrorBoundary.vue
+++ b/packages/nc-gui/components/nc/ErrorBoundary.vue
@@ -66,7 +66,7 @@ export default {
 <template>
   <slot :key="key"></slot>
   <slot name="error">
-    <NcModal v-model:visible="errModal" :class="{ active: errModal }" :centered="true" :closable="false" :footer="null">
+    <NcModal v-if="error" v-model:visible="errModal" :class="{ active: errModal }" :centered="true" :closable="false" :footer="null">
       <div class="w-full flex flex-col gap-1">
         <h2 class="text-xl font-semibold">Oops! Something unexpected happened :/</h2>
 

From 3d8c267b79bed4f72fe7744f6524dfb71ecc6df0 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 5 Mar 2024 12:05:46 +0000
Subject: [PATCH 021/253] feat(nc-gui): new field icons

---
 .../assets/nc-icons/cell-attachment.svg       |  3 +
 .../nc-gui/assets/nc-icons/cell-barcode.svg   |  3 +
 .../nc-gui/assets/nc-icons/cell-checkbox.svg  |  4 +
 .../nc-gui/assets/nc-icons/cell-currency.svg  |  4 +
 packages/nc-gui/assets/nc-icons/cell-date.svg |  6 ++
 .../nc-gui/assets/nc-icons/cell-datetime.svg  |  8 ++
 packages/nc-gui/assets/nc-icons/cell-db.svg   |  5 ++
 .../nc-gui/assets/nc-icons/cell-decimal.svg   |  7 ++
 .../nc-gui/assets/nc-icons/cell-duration.svg  |  7 ++
 .../nc-gui/assets/nc-icons/cell-email.svg     |  4 +
 .../nc-gui/assets/nc-icons/cell-formula.svg   |  8 ++
 .../nc-gui/assets/nc-icons/cell-geometry.svg  |  7 ++
 packages/nc-gui/assets/nc-icons/cell-json.svg |  8 ++
 packages/nc-gui/assets/nc-icons/cell-link.svg |  7 ++
 .../nc-gui/assets/nc-icons/cell-longtext.svg  |  8 ++
 .../nc-gui/assets/nc-icons/cell-lookup.svg    |  9 +++
 .../assets/nc-icons/cell-multiselect.svg      |  8 ++
 .../nc-gui/assets/nc-icons/cell-number.svg    |  6 ++
 .../assets/nc-icons/cell-percentage.svg       |  5 ++
 .../nc-gui/assets/nc-icons/cell-phone.svg     |  3 +
 .../nc-gui/assets/nc-icons/cell-qrcode.svg    | 10 +++
 .../nc-gui/assets/nc-icons/cell-rating.svg    |  3 +
 .../nc-gui/assets/nc-icons/cell-rollup.svg    |  3 +
 .../nc-gui/assets/nc-icons/cell-select.svg    |  4 +
 packages/nc-gui/assets/nc-icons/cell-text.svg |  5 ++
 packages/nc-gui/assets/nc-icons/cell-time.svg |  4 +
 packages/nc-gui/assets/nc-icons/cell-url.svg  |  4 +
 packages/nc-gui/assets/nc-icons/cell-user.svg |  4 +
 .../nc-gui/assets/nc-icons/system-date.svg    |  7 ++
 .../nc-gui/assets/nc-icons/system-key.svg     |  4 +
 .../nc-gui/assets/nc-icons/system-text.svg    |  6 ++
 .../nc-gui/assets/nc-icons/system-user.svg    |  5 ++
 .../smartsheet/column/EditOrAdd.vue           |  2 +-
 .../components/smartsheet/header/CellIcon.ts  | 52 ++++++-------
 .../smartsheet/header/VirtualCellIcon.ts      | 32 ++++----
 packages/nc-gui/utils/columnUtils.ts          | 76 +++++++++----------
 packages/nc-gui/utils/iconUtils.ts            | 66 ++++++++++++++++
 37 files changed, 325 insertions(+), 82 deletions(-)
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-attachment.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-barcode.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-checkbox.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-currency.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-date.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-datetime.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-db.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-decimal.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-duration.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-email.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-formula.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-geometry.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-json.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-link.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-longtext.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-lookup.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-multiselect.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-number.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-percentage.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-phone.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-qrcode.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-rating.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-rollup.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-select.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-text.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-time.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-url.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/cell-user.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/system-date.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/system-key.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/system-text.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/system-user.svg

diff --git a/packages/nc-gui/assets/nc-icons/cell-attachment.svg b/packages/nc-gui/assets/nc-icons/cell-attachment.svg
new file mode 100644
index 0000000000..0d14c80304
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-attachment.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22 11.376L12.5445 20.2938C11.3861 21.3862 9.81499 22 8.1768 22C6.53861 22 4.96752 21.3862 3.80914 20.2938C2.65077 19.2013 2 17.7195 2 16.1745C2 14.6295 2.65077 13.1477 3.80914 12.0553L13.2647 3.1375C14.0369 2.40917 15.0843 2 16.1765 2C17.2686 2 18.316 2.40917 19.0882 3.1375C19.8605 3.86583 20.2943 4.85365 20.2943 5.88366C20.2943 6.91367 19.8605 7.9015 19.0882 8.62983L9.6224 17.5476C9.23627 17.9118 8.71257 18.1163 8.16651 18.1163C7.62045 18.1163 7.09675 17.9118 6.71063 17.5476C6.3245 17.1834 6.10758 16.6895 6.10758 16.1745C6.10758 15.6595 6.3245 15.1656 6.71063 14.8014L15.4459 6.57263" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-barcode.svg b/packages/nc-gui/assets/nc-icons/cell-barcode.svg
new file mode 100644
index 0000000000..e1736db956
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-barcode.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 19V5H3.65377V19H2ZM4.78206 19V5H6.43585V19H4.78206ZM7.56415 19V5H8.69244V19H7.56415ZM10.3462 19V5H12V19H10.3462ZM13.1283 19V5H15.3076V19H13.1283ZM16.4359 19V5H17.5641V19H16.4359ZM19.8207 19V5H22V19H19.8207Z" fill="currentColor"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-checkbox.svg b/packages/nc-gui/assets/nc-icons/cell-checkbox.svg
new file mode 100644
index 0000000000..c7dfdfb14f
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-checkbox.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2" y="2" width="20" height="20" rx="4" stroke="currentColor" stroke-width="2"/>
+<path d="M18 7L9.75 16L6 11.9091" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-currency.svg b/packages/nc-gui/assets/nc-icons/cell-currency.svg
new file mode 100644
index 0000000000..f4886aee03
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-currency.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 1V23" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 5H9.5C8.57174 5 7.6815 5.36875 7.02513 6.02513C6.36875 6.6815 6 7.57174 6 8.5C6 9.42826 6.36875 10.3185 7.02513 10.9749C7.6815 11.6313 8.57174 12 9.5 12H14.5C15.4283 12 16.3185 12.3687 16.9749 13.0251C17.6313 13.6815 18 14.5717 18 15.5C18 16.4283 17.6313 17.3185 16.9749 17.9749C16.3185 18.6313 15.4283 19 14.5 19H6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-date.svg b/packages/nc-gui/assets/nc-icons/cell-date.svg
new file mode 100644
index 0000000000..c5df544962
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-date.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 4H5C3.89543 4 3 4.89543 3 6V20C3 21.1046 3.89543 22 5 22H19C20.1046 22 21 21.1046 21 20V6C21 4.89543 20.1046 4 19 4Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 2V6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 2V6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 10H21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-datetime.svg b/packages/nc-gui/assets/nc-icons/cell-datetime.svg
new file mode 100644
index 0000000000..859720d9e8
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-datetime.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 10.1389V6.66667C19 5.74619 18.2041 5 17.2222 5H4.77778C3.79594 5 3 5.74619 3 6.66667V18.3333C3 19.2538 3.79594 20 4.77778 20H11" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 9.85706H18.4286" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.1428 3V6.42857" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.28577 3V6.42857" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 21C19.2091 21 21 19.2091 21 17C21 14.7909 19.2091 13 17 13C14.7909 13 13 14.7909 13 17C13 19.2091 14.7909 21 17 21Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 16V16.8889L18 18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-db.svg b/packages/nc-gui/assets/nc-icons/cell-db.svg
new file mode 100644
index 0000000000..53d8ccc922
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-db.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 8C16.9706 8 21 6.65685 21 5C21 3.34315 16.9706 2 12 2C7.02944 2 3 3.34315 3 5C3 6.65685 7.02944 8 12 8Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 12C21 13.66 17 15 12 15C7 15 3 13.66 3 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 5V19C3 20.66 7 22 12 22C17 22 21 20.66 21 19V5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-decimal.svg b/packages/nc-gui/assets/nc-icons/cell-decimal.svg
new file mode 100644
index 0000000000..4d5db110a1
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-decimal.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="8.36365" y="3" width="4.3636" height="8.52631" rx="2.1818" stroke="currentColor" stroke-width="2"/>
+<ellipse cx="4.96727" cy="11.2635" rx="0.967266" ry="0.945" fill="currentColor"/>
+<rect x="15.6362" y="3" width="4.3636" height="8.52631" rx="2.1818" stroke="currentColor" stroke-width="2"/>
+<path d="M16.6061 21L20 17.6842L16.6061 14.3684" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.36365 17.6843H19.9999" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-duration.svg b/packages/nc-gui/assets/nc-icons/cell-duration.svg
new file mode 100644
index 0000000000..d8e5fe8372
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-duration.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.9503 20C15.8163 20 18.9503 16.866 18.9503 13C18.9503 9.13401 15.8163 6 11.9503 6C8.08432 6 4.95032 9.13401 4.95032 13C4.95032 16.866 8.08432 20 11.9503 20Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.9503 10V13L13.4503 14.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 3L12 6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.2929 7.12129C19.6834 6.73077 19.6834 6.0976 19.2929 5.70708C18.9024 5.31655 18.2692 5.31655 17.8787 5.70708L19.2929 7.12129ZM17.8787 5.70708L15.8787 7.70708L17.2929 9.12129L19.2929 7.12129L17.8787 5.70708Z" fill="currentColor"/>
+<path d="M13.5 3H10.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-email.svg b/packages/nc-gui/assets/nc-icons/cell-email.svg
new file mode 100644
index 0000000000..1bf0267b34
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-email.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 4H20C21.1 4 22 4.9 22 6V18C22 19.1 21.1 20 20 20H4C2.9 20 2 19.1 2 18V6C2 4.9 2.9 4 4 4Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22 6L12 13L2 6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-formula.svg b/packages/nc-gui/assets/nc-icons/cell-formula.svg
new file mode 100644
index 0000000000..169d829606
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-formula.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.19995 9.04529H12.6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 9.04529H17.4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 19.1035C3 21.7403 5.796 21.5217 6 19.1035L7.8 4.5949C8.004 2.17677 10.8 2.78134 10.8 4.5949" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+<path d="M21 18.7177H17.4" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6 18.7177H8.99998" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.2001 9.04529L19.8001 18.7177M19.8001 9.04529L10.2001 18.7177" stroke="currentColor" stroke-width="2"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-geometry.svg b/packages/nc-gui/assets/nc-icons/cell-geometry.svg
new file mode 100644
index 0000000000..4126148ebf
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-geometry.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.73167 3.53666C5.84223 3.31554 6.15777 3.31554 6.26833 3.53666L8.78292 8.56584C8.88265 8.76531 8.7376 9 8.51459 9H3.48541C3.2624 9 3.11735 8.76531 3.21708 8.56584L5.73167 3.53666Z" stroke="currentColor" stroke-width="2"/>
+<path d="M14.5714 3L21 9.42857" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.9999 3L14.5713 9.42857" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.33333 15H3.66667C3.29848 15 3 15.2985 3 15.6667V20.3333C3 20.7015 3.29848 21 3.66667 21H8.33333C8.70152 21 9 20.7015 9 20.3333V15.6667C9 15.2985 8.70152 15 8.33333 15Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="18" cy="18" r="3" stroke="currentColor" stroke-width="2"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-json.svg b/packages/nc-gui/assets/nc-icons/cell-json.svg
new file mode 100644
index 0000000000..c613327dfc
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-json.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 20H7.5C6.39543 20 5.5 19.1046 5.5 18V14C5.5 12.8954 4.60457 12 3.5 12H3" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+<path d="M3 12H3.5C4.60457 12 5.5 11.1046 5.5 10V6C5.5 4.89543 6.39543 4 7.5 4H8" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+<path d="M16 20H16.5C17.6046 20 18.5 19.1046 18.5 18V14C18.5 12.8954 19.3954 12 20.5 12H21" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+<path d="M21 12H20.5C19.3954 12 18.5 11.1046 18.5 10V6C18.5 4.89543 17.6046 4 16.5 4H16" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+<ellipse cx="11.995" cy="9.63743" rx="1" ry="1.025" fill="currentColor"/>
+<path d="M11.9999 14.7623L11.5499 16.2998" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-link.svg b/packages/nc-gui/assets/nc-icons/cell-link.svg
new file mode 100644
index 0000000000..c2427ff00e
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-link.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 6L21 6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 18L21 18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13 12L21 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 14.3333L10.3333 12L8 9.66663" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 12L10 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-longtext.svg b/packages/nc-gui/assets/nc-icons/cell-longtext.svg
new file mode 100644
index 0000000000..bfdb92ae92
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-longtext.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 10H11" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 6H11" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 14H3" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17 18H3" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 10L5.41056 5.17889C5.44741 5.10518 5.55259 5.10518 5.58944 5.17889L8 10" stroke="#1F293A" stroke-width="2" stroke-linecap="round"/>
+<path d="M4 9H7" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-lookup.svg b/packages/nc-gui/assets/nc-icons/cell-lookup.svg
new file mode 100644
index 0000000000..d77c7e1a69
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-lookup.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.3333 19.6667C18.1743 19.6667 19.6667 18.1743 19.6667 16.3333C19.6667 14.4924 18.1743 13 16.3333 13C14.4924 13 13 14.4924 13 16.3333C13 18.1743 14.4924 19.6667 16.3333 19.6667Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 21L19 19" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.3409 10H3.34094" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 14H3" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 10H3" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 6H3" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 18H3" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-multiselect.svg b/packages/nc-gui/assets/nc-icons/cell-multiselect.svg
new file mode 100644
index 0000000000..c1eaf56f58
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-multiselect.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.66667 4.5H3.33333C3.14924 4.5 3 4.64924 3 4.83333V7.16667C3 7.35076 3.14924 7.5 3.33333 7.5H5.66667C5.85076 7.5 6 7.35076 6 7.16667V4.83333C6 4.64924 5.85076 4.5 5.66667 4.5Z" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.5 6L21 6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.66667 10.5H3.33333C3.14924 10.5 3 10.6492 3 10.8333V13.1667C3 13.3508 3.14924 13.5 3.33333 13.5H5.66667C5.85076 13.5 6 13.3508 6 13.1667V10.8333C6 10.6492 5.85076 10.5 5.66667 10.5Z" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.5 12L21 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.66667 16.5H3.33333C3.14924 16.5 3 16.6492 3 16.8333V19.1667C3 19.3508 3.14924 19.5 3.33333 19.5H5.66667C5.85076 19.5 6 19.3508 6 19.1667V16.8333C6 16.6492 5.85076 16.5 5.66667 16.5Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.5 18L21 18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-number.svg b/packages/nc-gui/assets/nc-icons/cell-number.svg
new file mode 100644
index 0000000000..04a8149bbd
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-number.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 9H20" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 15H20" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 3L8 21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 3L14 21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-percentage.svg b/packages/nc-gui/assets/nc-icons/cell-percentage.svg
new file mode 100644
index 0000000000..bd53dc96c5
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-percentage.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 5L5 19" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.5 9C7.88071 9 9 7.88071 9 6.5C9 5.11929 7.88071 4 6.5 4C5.11929 4 4 5.11929 4 6.5C4 7.88071 5.11929 9 6.5 9Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.5 20C18.8807 20 20 18.8807 20 17.5C20 16.1193 18.8807 15 17.5 15C16.1193 15 15 16.1193 15 17.5C15 18.8807 16.1193 20 17.5 20Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-phone.svg b/packages/nc-gui/assets/nc-icons/cell-phone.svg
new file mode 100644
index 0000000000..cebfd82713
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-phone.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.8881 16.9201V19.9201C21.8892 20.1986 21.8322 20.4743 21.7206 20.7294C21.6091 20.9846 21.4454 21.2137 21.2402 21.402C21.035 21.5902 20.7927 21.7336 20.5289 21.8228C20.265 21.912 19.9855 21.9452 19.7081 21.9201C16.631 21.5857 13.6751 20.5342 11.0781 18.8501C8.66194 17.3148 6.61345 15.2663 5.07812 12.8501C3.38809 10.2413 2.33636 7.27109 2.00812 4.1801C1.98313 3.90356 2.01599 3.62486 2.10462 3.36172C2.19324 3.09859 2.33569 2.85679 2.52288 2.65172C2.71008 2.44665 2.93792 2.28281 3.19191 2.17062C3.44589 2.05843 3.72046 2.00036 3.99812 2.0001H6.99812C7.48342 1.99532 7.95391 2.16718 8.32188 2.48363C8.68985 2.80008 8.93019 3.23954 8.99812 3.7201C9.12474 4.68016 9.35957 5.62282 9.69812 6.5301C9.83266 6.88802 9.86178 7.27701 9.78202 7.65098C9.70227 8.02494 9.51698 8.36821 9.24812 8.6401L7.97812 9.9101C9.40167 12.4136 11.4746 14.4865 13.9781 15.9101L15.2481 14.6401C15.52 14.3712 15.8633 14.1859 16.2372 14.1062C16.6112 14.0264 17.0002 14.0556 17.3581 14.1901C18.2654 14.5286 19.2081 14.7635 20.1681 14.8901C20.6539 14.9586 21.0975 15.2033 21.4146 15.5776C21.7318 15.9519 21.9003 16.4297 21.8881 16.9201Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-qrcode.svg b/packages/nc-gui/assets/nc-icons/cell-qrcode.svg
new file mode 100644
index 0000000000..4e10fc7aac
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-qrcode.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.33333 4H4.66667C4.29848 4 4 4.29848 4 4.66667V9.33333C4 9.70152 4.29848 10 4.66667 10H9.33333C9.70152 10 10 9.70152 10 9.33333V4.66667C10 4.29848 9.70152 4 9.33333 4Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.3333 4H14.6667C14.2985 4 14 4.29848 14 4.66667V9.33333C14 9.70152 14.2985 10 14.6667 10H19.3333C19.7015 10 20 9.70152 20 9.33333V4.66667C20 4.29848 19.7015 4 19.3333 4Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.33333 14H4.66667C4.29848 14 4 14.2985 4 14.6667V19.3333C4 19.7015 4.29848 20 4.66667 20H9.33333C9.70152 20 10 19.7015 10 19.3333V14.6667C10 14.2985 9.70152 14 9.33333 14Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.8889 14H14.1111C14.0497 14 14 14.0497 14 14.1111V14.8889C14 14.9503 14.0497 15 14.1111 15H14.8889C14.9503 15 15 14.9503 15 14.8889V14.1111C15 14.0497 14.9503 14 14.8889 14Z" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.3889 16.5H16.6111C16.5497 16.5 16.5 16.5497 16.5 16.6111V17.3889C16.5 17.4503 16.5497 17.5 16.6111 17.5H17.3889C17.4503 17.5 17.5 17.4503 17.5 17.3889V16.6111C17.5 16.5497 17.4503 16.5 17.3889 16.5Z" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.8889 19H19.1111C19.0497 19 19 19.0497 19 19.1111V19.8889C19 19.9503 19.0497 20 19.1111 20H19.8889C19.9503 20 20 19.9503 20 19.8889V19.1111C20 19.0497 19.9503 19 19.8889 19Z" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.8889 19H14.1111C14.0497 19 14 19.0497 14 19.1111V19.8889C14 19.9503 14.0497 20 14.1111 20H14.8889C14.9503 20 15 19.9503 15 19.8889V19.1111C15 19.0497 14.9503 19 14.8889 19Z" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.8889 14H19.1111C19.0497 14 19 14.0497 19 14.1111V14.8889C19 14.9503 19.0497 15 19.1111 15H19.8889C19.9503 15 20 14.9503 20 14.8889V14.1111C20 14.0497 19.9503 14 19.8889 14Z" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-rating.svg b/packages/nc-gui/assets/nc-icons/cell-rating.svg
new file mode 100644
index 0000000000..e52116a748
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-rating.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 2L15.09 8.26L22 9.27L17 14.14L18.18 21.02L12 17.77L5.82 21.02L7 14.14L2 9.27L8.91 8.26L12 2Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-rollup.svg b/packages/nc-gui/assets/nc-icons/cell-rollup.svg
new file mode 100644
index 0000000000..6730c17e5d
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-rollup.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.7544 21.9998C9.62162 21.9998 7.48916 21.3746 5.67844 20.186C3.32397 18.6409 1.72994 16.3191 1.18949 13.6492C0.672309 11.0938 1.22537 8.37108 2.70682 6.17848C4.13963 4.05777 6.27968 2.63038 8.73333 2.15888C11.0751 1.70886 13.562 2.22527 15.5555 3.57522C17.4745 4.87405 18.7562 6.80196 19.1654 9.00329C19.5547 11.0974 19.0666 13.3111 17.8272 15.0761C16.642 16.7643 14.8983 17.8812 12.916 18.2209C11.0375 18.5424 9.06376 18.0899 7.50163 16.9786C6.01976 15.9243 5.05219 14.3891 4.7772 12.6557C4.51783 11.0199 4.94356 9.31537 5.94562 7.97896C6.88567 6.72533 8.23574 5.92267 9.74727 5.71849C11.1653 5.52742 12.627 5.92201 13.7568 6.80243C14.7998 7.61605 15.4482 8.76228 15.5816 10.0299C15.706 11.2146 15.3313 12.4116 14.5537 13.3152C13.8512 14.1313 12.8894 14.6106 11.8452 14.6656C10.8814 14.7154 9.90466 14.3479 9.22818 13.6808C8.63158 13.0918 8.32337 12.3229 8.36118 11.5162C8.39641 10.7637 8.81018 10.0062 9.41538 9.58673C9.92598 9.23274 10.5279 9.13798 11.1093 9.31967C11.5926 9.471 11.861 9.98245 11.7087 10.462C11.5565 10.9419 11.0406 11.2083 10.5581 11.0572C10.5327 11.0491 10.5175 11.0441 10.466 11.0799C10.3269 11.1762 10.2027 11.4144 10.1939 11.6001C10.1802 11.8953 10.2902 12.1604 10.5212 12.3878C10.8316 12.6941 11.3028 12.8671 11.7483 12.8463C12.4365 12.8101 12.8947 12.4377 13.158 12.132C13.604 11.6138 13.8279 10.8988 13.7558 10.2187C13.6751 9.4457 13.2725 8.74105 12.6232 8.23467C11.882 7.65684 10.9244 7.39681 9.99469 7.52299C8.97594 7.66033 8.06095 8.20845 7.41821 9.066C6.70853 10.0122 6.4069 11.2171 6.58994 12.3723C6.78773 13.6198 7.49103 14.7301 8.57024 15.498C9.73623 16.3271 11.2059 16.6656 12.6036 16.4257C14.0989 16.1693 15.4193 15.3203 16.3217 14.0345C17.2826 12.666 17.6612 10.9525 17.3605 9.33326C17.0413 7.6134 16.0328 6.10269 14.5218 5.07964C12.9293 4.0016 10.9468 3.5891 9.08216 3.94671C7.11213 4.32538 5.3894 5.47793 4.23114 7.19257C3.02032 8.98493 2.5673 11.2074 2.98903 13.2903C3.43209 15.4809 4.74697 17.3902 6.69095 18.6665C8.70975 19.9918 11.2052 20.4774 13.5371 19.9985C17.7225 19.1391 20.9312 15.3679 21.1663 11.0311C21.1936 10.5288 21.6239 10.1445 22.132 10.1707C22.6381 10.1978 23.0261 10.6268 22.9986 11.1293C22.7194 16.2781 18.8967 20.7588 13.9087 21.7828C13.1985 21.9279 12.4764 21.9998 11.7544 21.9998Z" fill="currentColor"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-select.svg b/packages/nc-gui/assets/nc-icons/cell-select.svg
new file mode 100644
index 0000000000..a19b1801e6
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-select.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="3" y="3" width="18" height="18" rx="9" stroke="currentColor" stroke-width="2"/>
+<rect x="7" y="7" width="10" height="10" rx="5" fill="currentColor" stroke="currentColor" stroke-width="2"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-text.svg b/packages/nc-gui/assets/nc-icons/cell-text.svg
new file mode 100644
index 0000000000..9af97b17a4
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-text.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M4 7V4H20V7" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M9 20H15" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M12 4V20" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-time.svg b/packages/nc-gui/assets/nc-icons/cell-time.svg
new file mode 100644
index 0000000000..8df7a2cda8
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-time.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 6V12L16 14" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-url.svg b/packages/nc-gui/assets/nc-icons/cell-url.svg
new file mode 100644
index 0000000000..781af1c05c
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-url.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 7H18C18.6566 7 19.3068 7.12933 19.9134 7.3806C20.52 7.63188 21.0712 8.00017 21.5355 8.46447C21.9998 8.92876 22.3681 9.47996 22.6194 10.0866C22.8707 10.6932 23 11.3434 23 12C23 12.6566 22.8707 13.3068 22.6194 13.9134C22.3681 14.52 21.9998 15.0712 21.5355 15.5355C21.0712 15.9998 20.52 16.3681 19.9134 16.6194C19.3068 16.8707 18.6566 17 18 17H15M9 17H6C5.34339 17 4.69321 16.8707 4.08658 16.6194C3.47995 16.3681 2.92876 15.9998 2.46447 15.5355C1.52678 14.5979 1 13.3261 1 12C1 10.6739 1.52678 9.40215 2.46447 8.46447C3.40215 7.52678 4.67392 7 6 7H9" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 12H16" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/cell-user.svg b/packages/nc-gui/assets/nc-icons/cell-user.svg
new file mode 100644
index 0000000000..60f73b5442
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/cell-user.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 21V19C20 17.9391 19.5786 16.9217 18.8284 16.1716C18.0783 15.4214 17.0609 15 16 15H8C6.93913 15 5.92172 15.4214 5.17157 16.1716C4.42143 16.9217 4 17.9391 4 19V21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 11C14.2091 11 16 9.20914 16 7C16 4.79086 14.2091 3 12 3C9.79086 3 8 4.79086 8 7C8 9.20914 9.79086 11 12 11Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/system-date.svg b/packages/nc-gui/assets/nc-icons/system-date.svg
new file mode 100644
index 0000000000..0b894b1d7c
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/system-date.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 12V6.66667C20 5.74619 19.2041 5 18.2222 5H5.77778C4.79594 5 4 5.74619 4 6.66667V18.3333C4 19.2538 4.79594 20 5.77778 20H13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 9.85706H19.4286" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.1428 3V6.42857" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.28564 3V6.42857" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 17.631L16.6666 19.3186V21.9903H15V17.631ZM22 14.0432V21.7151C22 21.8727 21.8731 22 21.7174 22C21.6428 22 21.5714 21.9709 21.5181 21.9169L15 15.9682V14.2849C15 14.1273 15.1258 14 15.2815 14H15.2964C15.3711 14 15.4436 14.0302 15.4958 14.0831L20.3324 18.3302V14.0432H22Z" stroke="#3366FF" fill="#3366FF"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/system-key.svg b/packages/nc-gui/assets/nc-icons/system-key.svg
new file mode 100644
index 0000000000..cca2ff1d07
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/system-key.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 2L19 4M19 4L22 7L18.5 10.5L15.5 7.5M19 4L15.5 7.5M11.39 11.61C11.9064 12.1195 12.3168 12.726 12.5978 13.3948C12.8787 14.0635 13.0246 14.7813 13.0271 15.5066C13.0295 16.232 12.8884 16.9507 12.6119 17.6213C12.3355 18.2919 11.9291 18.9012 11.4162 19.4141C10.9033 19.9271 10.294 20.3334 9.62333 20.6099C8.95271 20.8864 8.23403 21.0275 7.50866 21.025C6.7833 21.0226 6.06557 20.8767 5.39682 20.5958C4.72807 20.3148 4.1215 19.9043 3.61203 19.388C2.61016 18.3507 2.05579 16.9614 2.06832 15.5193C2.08085 14.0772 2.65928 12.6977 3.67903 11.678C4.69877 10.6583 6.07824 10.0798 7.52032 10.0673C8.96241 10.0548 10.3517 10.6091 11.389 11.611L11.39 11.61ZM11.39 11.61L15.5 7.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 17.631L16.6666 19.3186V21.9903H15V17.631ZM22 14.0432V21.7151C22 21.8727 21.8731 22 21.7174 22C21.6428 22 21.5714 21.9709 21.5181 21.9169L15 15.9682V14.2849C15 14.1273 15.1258 14 15.2815 14H15.2964C15.3711 14 15.4436 14.0302 15.4958 14.0831L20.3324 18.3302V14.0432H22Z" fill="#3366FF" stroke="#3366FF"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/system-text.svg b/packages/nc-gui/assets/nc-icons/system-text.svg
new file mode 100644
index 0000000000..81f3e3e566
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/system-text.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 6V3H18V6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 18H13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 3V18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 17.631L16.6666 19.3186V21.9903H15V17.631ZM22 14.0432V21.7151C22 21.8727 21.8731 22 21.7174 22C21.6428 22 21.5714 21.9709 21.5181 21.9169L15 15.9682V14.2849C15 14.1273 15.1258 14 15.2815 14H15.2964C15.3711 14 15.4436 14.0302 15.4958 14.0831L20.3324 18.3302V14.0432H22Z" stroke="#3366FF" fill="#3366FF"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/system-user.svg b/packages/nc-gui/assets/nc-icons/system-user.svg
new file mode 100644
index 0000000000..83703faa3c
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/system-user.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 17.631L16.6666 19.3186V21.9903H15V17.631ZM22 14.0432V21.7151C22 21.8727 21.8731 22 21.7174 22C21.6428 22 21.5714 21.9709 21.5181 21.9169L15 15.9682V14.2849C15 14.1273 15.1258 14 15.2815 14H15.2964C15.3711 14 15.4436 14.0302 15.4958 14.0831L20.3324 18.3302V14.0432H22Z" stroke="#3366FF" fill="#3366FF"/>
+<path d="M13 15H8C6.93913 15 5.92172 15.4214 5.17157 16.1716C4.42143 16.9217 4 17.9391 4 19V21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 11C14.2091 11 16 9.20914 16 7C16 4.79086 14.2091 3 12 3C9.79086 3 8 4.79086 8 7C8 9.20914 9.79086 11 12 11Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 1475665a7a..dfba038b27 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -309,7 +309,7 @@ if (props.fromTableExplorer) {
               </template>
               <a-select-option v-for="opt of uiTypesOptions" :key="opt.name" :value="opt.name" v-bind="validateInfos.uidt">
                 <div class="flex gap-2 items-center">
-                  <component :is="opt.icon" class="text-gray-700" />
+                  <component :is="opt.icon" class="text-gray-700 w-4 h-4" />
                   <div class="flex-1">{{ opt.name }}</div>
                   <span v-if="opt.deprecated" class="!text-xs !text-gray-300">({{ $t('general.deprecated') }})</span>
                   <component
diff --git a/packages/nc-gui/components/smartsheet/header/CellIcon.ts b/packages/nc-gui/components/smartsheet/header/CellIcon.ts
index d7152e368b..2bbe6268f6 100644
--- a/packages/nc-gui/components/smartsheet/header/CellIcon.ts
+++ b/packages/nc-gui/components/smartsheet/header/CellIcon.ts
@@ -40,60 +40,60 @@ import {
 
 const renderIcon = (column: ColumnType, abstractType: any) => {
   if (isPrimaryKey(column)) {
-    return iconMap.key
+    return iconMap.cellSystemKey
   } else if (isSpecificDBType(column)) {
-    return iconMap.specificDbType
+    return iconMap.cellDb
   } else if (isJSON(column)) {
-    return iconMap.json
+    return iconMap.cellJson
   } else if (isDate(column, abstractType)) {
-    return iconMap.calendar
+    return iconMap.cellDate
   } else if (isDateTime(column, abstractType)) {
-    return iconMap.datetime
+    return iconMap.cellDatetime
   } else if (isGeoData(column)) {
     return iconMap.geoData
   } else if (isSet(column)) {
-    return iconMap.multiSelect
+    return iconMap.cellMultiSelect
   } else if (isSingleSelect(column)) {
-    return iconMap.singleSelect
+    return iconMap.cellSingleSelect
   } else if (isBoolean(column, abstractType)) {
-    return iconMap.boolean
+    return iconMap.cellCheckbox
   } else if (isTextArea(column)) {
-    return iconMap.longText
+    return iconMap.cellLongText
   } else if (isEmail(column)) {
-    return iconMap.email
+    return iconMap.cellEmail
   } else if (isYear(column, abstractType)) {
-    return iconMap.calendar
+    return iconMap.cellDate
   } else if (isTime(column, abstractType)) {
-    return iconMap.clock
+    return iconMap.cellTime
   } else if (isRating(column)) {
-    return iconMap.rating
+    return iconMap.cellRating
   } else if (isAttachment(column)) {
-    return iconMap.image
+    return iconMap.cellAttachment
   } else if (isDecimal(column)) {
-    return iconMap.decimal
+    return iconMap.cellDecimal
   } else if (isPhoneNumber(column)) {
-    return iconMap.phone
+    return iconMap.cellPhone
   } else if (isURL(column)) {
-    return iconMap.web
+    return iconMap.cellUrl
   } else if (isCurrency(column)) {
-    return iconMap.currency
+    return iconMap.cellCurrency
   } else if (isDuration(column)) {
-    return iconMap.duration
+    return iconMap.cellDuration
   } else if (isPercent(column)) {
-    return iconMap.percent
+    return iconMap.cellPercent
   } else if (isGeometry(column)) {
-    return iconMap.calculator
+    return iconMap.cellGeometry
   } else if (isUser(column)) {
     if ((column.meta as { is_multi?: boolean; notify?: boolean })?.is_multi) {
-      return iconMap.phUsers
+      return iconMap.cellUser
     }
-    return iconMap.phUser
+    return iconMap.cellUser
   } else if (isInt(column, abstractType) || isFloat(column, abstractType)) {
-    return iconMap.number
+    return iconMap.cellNumber
   } else if (isString(column, abstractType)) {
-    return iconMap.text
+    return iconMap.cellText
   } else {
-    return iconMap.generic
+    return iconMap.cellSystemText
   }
 }
 
diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
index 6b547e1801..66e509dd59 100644
--- a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
+++ b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts
@@ -1,7 +1,7 @@
 import type { PropType } from '@vue/runtime-core'
 import type { ColumnType, LinkToAnotherRecordType, LookupType, RollupType } from 'nocodb-sdk'
-import type { Ref } from 'vue'
 import { RelationTypes, UITypes } from 'nocodb-sdk'
+import type { Ref } from 'vue'
 import {
   ColumnInj,
   MetaInj,
@@ -33,44 +33,44 @@ const renderIcon = (column: ColumnType, relationColumn?: ColumnType) => {
       }
       break
     case UITypes.SpecificDBType:
-      return { icon: iconMap.specificDbType, color: 'text-grey' }
+      return { icon: iconMap.cellDb, color: 'text-grey' }
     case UITypes.Formula:
-      return { icon: iconMap.formula, color: 'text-grey' }
+      return { icon: iconMap.cellFormula, color: 'text-grey' }
     case UITypes.QrCode:
-      return { icon: iconMap.qrCode, color: 'text-grey' }
+      return { icon: iconMap.cellQrCode, color: 'text-grey' }
     case UITypes.Barcode:
-      return { icon: iconMap.barCode, color: 'text-grey' }
+      return { icon: iconMap.cellBarcode, color: 'text-grey' }
     case UITypes.Lookup:
       switch ((relationColumn?.colOptions as LinkToAnotherRecordType)?.type) {
         case RelationTypes.MANY_TO_MANY:
-          return { icon: iconMap.lookup, color: 'text-pink-500' }
+          return { icon: iconMap.cellLookup, color: 'text-pink-500' }
         case RelationTypes.HAS_MANY:
-          return { icon: iconMap.lookup, color: 'text-orange-500' }
+          return { icon: iconMap.cellLookup, color: 'text-orange-500' }
         case RelationTypes.BELONGS_TO:
-          return { icon: iconMap.lookup, color: 'text-blue-500' }
+          return { icon: iconMap.cellLookup, color: 'text-blue-500' }
       }
-      return { icon: iconMap.lookup, color: 'text-grey' }
+      return { icon: iconMap.cellLookup, color: 'text-grey' }
     case UITypes.Rollup:
       switch ((relationColumn?.colOptions as LinkToAnotherRecordType)?.type) {
         case RelationTypes.MANY_TO_MANY:
-          return { icon: iconMap.rollup, color: 'text-pink-500' }
+          return { icon: iconMap.cellRollup, color: 'text-pink-500' }
         case RelationTypes.HAS_MANY:
-          return { icon: iconMap.rollup, color: 'text-orange-500' }
+          return { icon: iconMap.cellRollup, color: 'text-orange-500' }
         case RelationTypes.BELONGS_TO:
-          return { icon: iconMap.rollup, color: 'text-blue-500' }
+          return { icon: iconMap.cellRollup, color: 'text-blue-500' }
       }
-      return { icon: iconMap.rollup, color: 'text-grey' }
+      return { icon: iconMap.cellRollup, color: 'text-grey' }
     case UITypes.Count:
       return { icon: CountIcon, color: 'text-grey' }
     case UITypes.CreatedTime:
     case UITypes.LastModifiedTime:
-      return { icon: iconMap.datetime, color: 'text-grey' }
+      return { icon: iconMap.cellSystemDate, color: 'text-grey' }
     case UITypes.CreatedBy:
     case UITypes.LastModifiedBy:
-      return { icon: iconMap.phUser, color: 'text-grey' }
+      return { icon: iconMap.cellSystemUser, color: 'text-grey' }
   }
 
-  return { icon: iconMap.generic, color: 'text-grey' }
+  return { icon: iconMap.cellSystemText, color: 'text-grey' }
 }
 
 export default defineComponent({
diff --git a/packages/nc-gui/utils/columnUtils.ts b/packages/nc-gui/utils/columnUtils.ts
index 316056a332..2be05db81d 100644
--- a/packages/nc-gui/utils/columnUtils.ts
+++ b/packages/nc-gui/utils/columnUtils.ts
@@ -1,125 +1,123 @@
 import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
 import { RelationTypes, UITypes } from 'nocodb-sdk'
 import { iconMap } from '#imports'
-import LinkVariant from '~icons/mdi/link-variant'
-import ID from '~icons/mdi/identifier'
 
 const uiTypes = [
   {
     name: UITypes.Links,
-    icon: iconMap.link,
+    icon: iconMap.cellLinks,
     virtual: 1,
   },
   {
     name: UITypes.LinkToAnotherRecord,
-    icon: iconMap.link,
+    icon: iconMap.cellLinks,
     virtual: 1,
     deprecated: 1,
   },
   {
     name: UITypes.Lookup,
-    icon: iconMap.lookup,
+    icon: iconMap.cellLookup,
     virtual: 1,
   },
   {
     name: UITypes.SingleLineText,
-    icon: iconMap.text,
+    icon: iconMap.cellText,
   },
   {
     name: UITypes.LongText,
-    icon: iconMap.longText,
+    icon: iconMap.cellLongText,
   },
   {
     name: UITypes.Number,
-    icon: iconMap.number,
+    icon: iconMap.cellNumber,
   },
   {
     name: UITypes.Decimal,
-    icon: iconMap.decimal,
+    icon: iconMap.cellDecimal,
   },
   {
     name: UITypes.Attachment,
-    icon: iconMap.image,
+    icon: iconMap.cellAttachment,
   },
   {
     name: UITypes.Checkbox,
-    icon: iconMap.boolean,
+    icon: iconMap.cellCheckbox,
   },
   {
     name: UITypes.MultiSelect,
-    icon: iconMap.multiSelect,
+    icon: iconMap.cellMultiSelect,
   },
   {
     name: UITypes.SingleSelect,
-    icon: iconMap.singleSelect,
+    icon: iconMap.cellSingleSelect,
   },
   {
     name: UITypes.Date,
-    icon: iconMap.calendar,
+    icon: iconMap.cellDate,
   },
   {
     name: UITypes.Year,
-    icon: iconMap.calendar,
+    icon: iconMap.cellDate,
   },
   {
     name: UITypes.Time,
-    icon: iconMap.clock,
+    icon: iconMap.cellTime,
   },
   {
     name: UITypes.PhoneNumber,
-    icon: iconMap.phone,
+    icon: iconMap.cellPhone,
   },
   {
     name: UITypes.Email,
-    icon: iconMap.email,
+    icon: iconMap.cellEmail,
   },
   {
     name: UITypes.URL,
-    icon: iconMap.web,
+    icon: iconMap.cellUrl,
   },
   {
     name: UITypes.Currency,
-    icon: iconMap.currency,
+    icon: iconMap.cellCurrency,
   },
   {
     name: UITypes.Percent,
-    icon: iconMap.percent,
+    icon: iconMap.cellPercent,
   },
   {
     name: UITypes.Duration,
-    icon: iconMap.duration,
+    icon: iconMap.cellDuration,
   },
   {
     name: UITypes.Rating,
-    icon: iconMap.rating,
+    icon: iconMap.cellRating,
   },
   {
     name: UITypes.Formula,
-    icon: iconMap.formula,
+    icon: iconMap.cellFormula,
     virtual: 1,
   },
   {
     name: UITypes.Rollup,
-    icon: iconMap.rollup,
+    icon: iconMap.cellRollup,
     virtual: 1,
   },
   {
     name: UITypes.DateTime,
-    icon: iconMap.datetime,
+    icon: iconMap.cellDatetime,
   },
   {
     name: UITypes.QrCode,
-    icon: iconMap.qrCode,
+    icon: iconMap.cellQrCode,
     virtual: 1,
   },
   {
     name: UITypes.Barcode,
-    icon: iconMap.barCode,
+    icon: iconMap.cellBarcode,
     virtual: 1,
   },
   {
     name: UITypes.Geometry,
-    icon: iconMap.calculator,
+    icon: iconMap.cellGeometry,
   },
 
   {
@@ -128,31 +126,31 @@ const uiTypes = [
   },
   {
     name: UITypes.JSON,
-    icon: iconMap.json,
+    icon: iconMap.cellJson,
   },
   {
     name: UITypes.SpecificDBType,
-    icon: iconMap.specificDbType,
+    icon: iconMap.cellDb,
   },
   {
     name: UITypes.User,
-    icon: iconMap.phUser,
+    icon: iconMap.cellUser,
   },
   {
     name: UITypes.CreatedTime,
-    icon: iconMap.datetime,
+    icon: iconMap.cellSystemDate,
   },
   {
     name: UITypes.LastModifiedTime,
-    icon: iconMap.datetime,
+    icon: iconMap.cellSystemDate,
   },
   {
     name: UITypes.CreatedBy,
-    icon: iconMap.phUser,
+    icon: iconMap.cellSystemUser,
   },
   {
     name: UITypes.LastModifiedBy,
-    icon: iconMap.phUser,
+    icon: iconMap.cellSystemUser,
   },
 ]
 
@@ -162,15 +160,15 @@ const getUIDTIcon = (uidt: UITypes | string) => {
       ...uiTypes,
       {
         name: UITypes.CreatedTime,
-        icon: iconMap.calendar,
+        icon: iconMap.cellSystemDate,
       },
       {
         name: UITypes.ID,
-        icon: ID,
+        icon: iconMap.cellSystemKey,
       },
       {
         name: UITypes.ForeignKey,
-        icon: LinkVariant,
+        icon: iconMap.cellLinks,
       },
     ].find((t) => t.name === uidt) || {}
   ).icon
diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index 41a6cafcdb..484e6a937c 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -130,6 +130,39 @@ import NcUnderline from '~icons/nc-icons/underline'
 import NcCrop from '~icons/nc-icons/crop'
 import NcLink from '~icons/nc-icons/link'
 
+import NcCellBarcode from '~icons/nc-icons/cell-barcode'
+import NcCellCheckbox from '~icons/nc-icons/cell-checkbox'
+import NcCellDate from '~icons/nc-icons/cell-date'
+import NcCellEmail from '~icons/nc-icons/cell-email'
+import NcCellFormula from '~icons/nc-icons/cell-formula'
+import NcCellCurrency from '~icons/nc-icons/cell-currency'
+import NcCellDatetime from '~icons/nc-icons/cell-datetime'
+import NcCellDb from '~icons/nc-icons/cell-db'
+import NcCellDecimal from '~icons/nc-icons/cell-decimal'
+import NcCellDuration from '~icons/nc-icons/cell-duration'
+import NcCellGeometry from '~icons/nc-icons/cell-geometry'
+import NcCellJson from '~icons/nc-icons/cell-json'
+import NcCellLinks from '~icons/nc-icons/cell-link'
+import NcCellLongText from '~icons/nc-icons/cell-longtext'
+import NcCellLookup from '~icons/nc-icons/cell-lookup'
+import NcCellMultiSelect from '~icons/nc-icons/cell-multiselect'
+import NcCellNumber from '~icons/nc-icons/cell-number'
+import NcCellPercent from '~icons/nc-icons/cell-percentage'
+import NcCellPhone from '~icons/nc-icons/cell-phone'
+import NcCellQrCode from '~icons/nc-icons/cell-qrcode'
+import NcCellRating from '~icons/nc-icons/cell-rating'
+import NcCellRollup from '~icons/nc-icons/cell-rollup'
+import NcCellSingleSelect from '~icons/nc-icons/cell-select'
+import NcCellText from '~icons/nc-icons/cell-text'
+import NcCellTime from '~icons/nc-icons/cell-time'
+import NcCellUrl from '~icons/nc-icons/cell-url'
+import NcCellUser from '~icons/nc-icons/cell-user'
+import NcCellSystemDate from '~icons/nc-icons/system-date'
+import NcCellSystemKey from '~icons/nc-icons/system-key'
+import NcCellSystemUser from '~icons/nc-icons/system-user'
+import NcCellSystemText from '~icons/nc-icons/system-text'
+import NcCellAttachment from '~icons/nc-icons/cell-attachment'
+
 // keep it for reference
 // todo: remove it after all icons are migrated
 /* export const iconMapOld = {
@@ -278,6 +311,39 @@ import NcLink from '~icons/nc-icons/link'
 } as const */
 
 export const iconMap = {
+  cellBarcode: NcCellBarcode,
+  cellCheckbox: NcCellCheckbox,
+  cellDate: NcCellDate,
+  cellEmail: NcCellEmail,
+  cellFormula: NcCellFormula,
+  cellCurrency: NcCellCurrency,
+  cellDatetime: NcCellDatetime,
+  cellDb: NcCellDb,
+  cellDecimal: NcCellDecimal,
+  cellDuration: NcCellDuration,
+  cellGeometry: NcCellGeometry,
+  cellJson: NcCellJson,
+  cellLinks: NcCellLinks,
+  cellLongText: NcCellLongText,
+  cellLookup: NcCellLookup,
+  cellMultiSelect: NcCellMultiSelect,
+  cellNumber: NcCellNumber,
+  cellPercent: NcCellPercent,
+  cellPhone: NcCellPhone,
+  cellQrCode: NcCellQrCode,
+  cellRating: NcCellRating,
+  cellRollup: NcCellRollup,
+  cellSingleSelect: NcCellSingleSelect,
+  cellText: NcCellText,
+  cellTime: NcCellTime,
+  cellUrl: NcCellUrl,
+  cellUser: NcCellUser,
+  cellSystemDate: NcCellSystemDate,
+  cellSystemKey: NcCellSystemKey,
+  cellSystemUser: NcCellSystemUser,
+  cellSystemText: NcCellSystemText,
+  cellAttachment: NcCellAttachment,
+
   sort: Sort,
   group: Group,
   filter: Filter,

From 3d8e829fd1882eadcff9da97b7b5fec4f8653bd8 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 05:42:19 +0000
Subject: [PATCH 022/253] fix(nc-gui): update system icons

---
 packages/nc-gui/assets/nc-icons/system-date.svg | 7 +++++++
 packages/nc-gui/assets/nc-icons/system-key.svg  | 4 ++++
 packages/nc-gui/assets/nc-icons/system-text.svg | 6 ++++++
 packages/nc-gui/assets/nc-icons/system-user.svg | 5 +++++
 4 files changed, 22 insertions(+)
 create mode 100644 packages/nc-gui/assets/nc-icons/system-date.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/system-key.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/system-text.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/system-user.svg

diff --git a/packages/nc-gui/assets/nc-icons/system-date.svg b/packages/nc-gui/assets/nc-icons/system-date.svg
new file mode 100644
index 0000000000..c9e3333ff8
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/system-date.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 12V6.66667C20 5.74619 19.2041 5 18.2222 5H5.77778C4.79594 5 4 5.74619 4 6.66667V18.3333C4 19.2538 4.79594 20 5.77778 20H12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 9.85704H19.4286" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.1428 3V6.42857" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.28577 3V6.42857" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 21V15.2414C15 15.1523 15.1077 15.1077 15.1707 15.1707L20.8293 20.8293C20.8923 20.8923 21 20.8477 21 20.7586V15" stroke="#3366FF" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/system-key.svg b/packages/nc-gui/assets/nc-icons/system-key.svg
new file mode 100644
index 0000000000..f2c3ed467b
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/system-key.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 2L19 4M19 4L22 7L18.5 10.5L15.5 7.5M19 4L15.5 7.5M11.39 11.61C11.9064 12.1195 12.3168 12.726 12.5978 13.3948C12.8787 14.0635 13.0246 14.7813 13.0271 15.5066C13.0295 16.232 12.8884 16.9507 12.6119 17.6213C12.3355 18.2919 11.9291 18.9012 11.4162 19.4141C10.9033 19.9271 10.294 20.3334 9.62333 20.6099C8.95271 20.8864 8.23403 21.0275 7.50866 21.025C6.7833 21.0226 6.06557 20.8767 5.39682 20.5958C4.72807 20.3148 4.1215 19.9043 3.61203 19.388C2.61016 18.3507 2.05579 16.9614 2.06832 15.5193C2.08085 14.0772 2.65928 12.6977 3.67903 11.678C4.69877 10.6583 6.07824 10.0798 7.52032 10.0673C8.96241 10.0548 10.3517 10.6091 11.389 11.611L11.39 11.61ZM11.39 11.61L15.5 7.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 22V16.2414C16 16.1523 16.1077 16.1077 16.1707 16.1707L21.8293 21.8293C21.8923 21.8923 22 21.8477 22 21.7586V16" stroke="#3366FF" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/system-text.svg b/packages/nc-gui/assets/nc-icons/system-text.svg
new file mode 100644
index 0000000000..23616c84eb
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/system-text.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 6V3H18V6" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 18H13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 3V18" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 22V16.2414C16 16.1523 16.1077 16.1077 16.1707 16.1707L21.8293 21.8293C21.8923 21.8923 22 21.8477 22 21.7586V16" stroke="#3366FF" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/system-user.svg b/packages/nc-gui/assets/nc-icons/system-user.svg
new file mode 100644
index 0000000000..a4316e1f09
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/system-user.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 21V15.2414C15 15.1523 15.1077 15.1077 15.1707 15.1707L20.8293 20.8293C20.8923 20.8923 21 20.8477 21 20.7586V15" stroke="#3366FF" stroke-width="2" stroke-linecap="round"/>
+<path d="M12.5 15H8C6.93913 15 5.92172 15.4214 5.17157 16.1716C4.42143 16.9217 4 17.9391 4 19V21" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 11C14.2091 11 16 9.20914 16 7C16 4.79086 14.2091 3 12 3C9.79086 3 8 4.79086 8 7C8 9.20914 9.79086 11 12 11Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

From 718a9b94c3b77c37d8d6c9b0164b6d75a36f8d43 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 15:53:10 +0800
Subject: [PATCH 023/253] chore(renovate): Update minor (minor) (#6999)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(renovate): Update minor

* chore: update node version

* chore(deps): pnpm-lock.yaml

* chore(deps): pnpm-lock.yaml

* chore(deps): pnpm-lock.yaml

* fix(nc-gui): remove process.nextTick define

* fix(playwright): mysql version

* chore(playwright): bump NC_REQ_NODE_V

* fix(deps): bump @nestjs/throttler

* chore(nc-gui): components.d.ts

* fix(deps): use @nuxt/image

* fix(nc-gui): broken image

* fix(nc-gui): @antfu/eslint-config

* fix(deps): bump knex versions

* fix(deps): use 2.4.2 for knex

* chore(deps): rollback

* chore(deps): @antfu/eslint-config

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: աɨռɢӄաօռɢ <wingkwong.code@gmail.com>
---
 .github/workflows/unit-test.yml           |   2 +-
 docker-compose/traefik/docker-compose.yml |   4 +-
 packages/nc-gui/nuxt.config.ts            |   2 +-
 packages/nc-gui/package.json              |   5 +-
 packages/noco-docs/package.json           |   4 +-
 pnpm-lock.yaml                            | 133 ++++++----------------
 6 files changed, 44 insertions(+), 106 deletions(-)

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 00498b7928..38c2ed6b3b 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: 18.19.0
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
diff --git a/docker-compose/traefik/docker-compose.yml b/docker-compose/traefik/docker-compose.yml
index b02b03bad7..5d4115d615 100644
--- a/docker-compose/traefik/docker-compose.yml
+++ b/docker-compose/traefik/docker-compose.yml
@@ -34,7 +34,7 @@ services:
       retries: 10
       test: "pg_isready -U ${DATABASE_USER} -d ${DATABASE_NAME}"
       timeout: 2s
-    image: "postgres:12.1-alpine"
+    image: "postgres:12.17-alpine"
     networks: 
       - traefik_proxy
     restart: always
@@ -71,7 +71,7 @@ services:
         - "-c"
         - "http://localhost:8081/ping"
       timeout: 3s
-    image: "traefik:v2.2"
+    image: "traefik:v2.11"
     networks: 
       - default
       - traefik_proxy
diff --git a/packages/nc-gui/nuxt.config.ts b/packages/nc-gui/nuxt.config.ts
index 09bcb62fb0..877fedeaa9 100644
--- a/packages/nc-gui/nuxt.config.ts
+++ b/packages/nc-gui/nuxt.config.ts
@@ -234,4 +234,4 @@ export default defineNuxtConfig({
       { name: 'storeToRefs', from: 'pinia' },
     ],
   },
-})
+})
\ No newline at end of file
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index bd16d5f64a..7959a7c9d9 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -15,7 +15,7 @@
     "url": "https://github.com/nocodb/nocodb/issues"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=18.19.0"
   },
   "license": "AGPL-3.0-or-later",
   "web-types": "web-types.json",
@@ -39,6 +39,7 @@
     "@braks/revue-draggable": "^0.4.3",
     "@ckpack/vue-color": "^1.5.0",
     "@iconify/vue": "^4.1.1",
+    "@nuxt/image": "^1.3.0",
     "@pinia/nuxt": "^0.5.1",
     "@tiptap/extension-link": "2.2.4",
     "@tiptap/extension-placeholder": "^2.2.4",
@@ -167,4 +168,4 @@
     "vitest": "^1.2.2",
     "windicss": "^3.5.6"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/noco-docs/package.json b/packages/noco-docs/package.json
index b39facde5d..1c33a99ef9 100644
--- a/packages/noco-docs/package.json
+++ b/packages/noco-docs/package.json
@@ -45,7 +45,7 @@
     "sass": "^1.71.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.0.1",
+    "@docusaurus/module-type-aliases": "3.1.1",
     "@tsconfig/docusaurus": "^1.0.7",
     "typescript": "^4.9.5"
   },
@@ -62,6 +62,6 @@
     ]
   },
   "engines": {
-    "node": ">=16.14.2"
+    "node": ">=16.20.2"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index de35087b7c..0c0e53555d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,6 +45,9 @@ importers:
       '@iconify/vue':
         specifier: ^4.1.1
         version: 4.1.1(vue@3.3.13)
+      '@nuxt/image':
+        specifier: ^1.3.0
+        version: 1.3.0
       '@pinia/nuxt':
         specifier: ^0.5.1
         version: 0.5.1(vue@3.3.13)
@@ -304,9 +307,6 @@ importers:
       '@intlify/unplugin-vue-i18n':
         specifier: ^0.13.0
         version: 0.13.0(vue-i18n@9.9.1)
-      '@nuxt/image':
-        specifier: ^1.3.0
-        version: 1.3.0
       '@types/d3-scale':
         specifier: ^4.0.8
         version: 4.0.8
@@ -2669,7 +2669,6 @@ packages:
   /@babel/compat-data@7.23.5:
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
-    dev: true
 
   /@babel/core@7.23.3:
     resolution: {integrity: sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==}
@@ -2737,7 +2736,6 @@ packages:
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/generator@7.23.4:
     resolution: {integrity: sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==}
@@ -2783,7 +2781,6 @@ packages:
       browserslist: 4.23.0
       lru-cache: 5.1.1
       semver: 6.3.1
-    dev: true
 
   /@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==}
@@ -2872,7 +2869,6 @@ packages:
       '@babel/helper-simple-access': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/helper-validator-identifier': 7.22.20
-    dev: true
 
   /@babel/helper-optimise-call-expression@7.22.5:
     resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
@@ -2932,7 +2928,6 @@ packages:
   /@babel/helper-validator-option@7.23.5:
     resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
     engines: {node: '>=6.9.0'}
-    dev: true
 
   /@babel/helpers@7.23.2:
     resolution: {integrity: sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==}
@@ -2964,7 +2959,6 @@ packages:
       '@babel/types': 7.23.9
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@babel/highlight@7.23.4:
     resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}
@@ -3226,7 +3220,6 @@ packages:
   /@babel/standalone@7.23.10:
     resolution: {integrity: sha512-xqWviI/pt1Zb/d+6ilWa5IDL2mkDzsBnlHbreqnfyP3/QB/ofQ1bNVcHj8YQX154Rf/xZKR6y0s1ydVF3nAS8g==}
     engines: {node: '>=6.9.0'}
-    dev: true
 
   /@babel/template@7.22.15:
     resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==}
@@ -3529,7 +3522,7 @@ packages:
     requiresBuild: true
     dependencies:
       tslib: 2.6.2
-    dev: true
+    dev: false
     optional: true
 
   /@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.20.1):
@@ -4222,7 +4215,7 @@ packages:
     resolution: {integrity: sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==}
     engines: {node: '>=14'}
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@fastify/busboy@2.1.0:
@@ -4639,7 +4632,7 @@ packages:
     requiresBuild: true
     optionalDependencies:
       '@img/sharp-libvips-darwin-arm64': 1.0.1
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-darwin-x64@0.33.2:
@@ -4650,7 +4643,7 @@ packages:
     requiresBuild: true
     optionalDependencies:
       '@img/sharp-libvips-darwin-x64': 1.0.1
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-libvips-darwin-arm64@1.0.1:
@@ -4659,7 +4652,7 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-libvips-darwin-x64@1.0.1:
@@ -4668,7 +4661,7 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-libvips-linux-arm64@1.0.1:
@@ -4677,7 +4670,7 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-libvips-linux-arm@1.0.1:
@@ -4686,7 +4679,7 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-libvips-linux-s390x@1.0.1:
@@ -4695,7 +4688,7 @@ packages:
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-libvips-linux-x64@1.0.1:
@@ -4704,7 +4697,7 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-libvips-linuxmusl-arm64@1.0.1:
@@ -4713,7 +4706,7 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-libvips-linuxmusl-x64@1.0.1:
@@ -4722,7 +4715,7 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-linux-arm64@0.33.2:
@@ -4733,7 +4726,7 @@ packages:
     requiresBuild: true
     optionalDependencies:
       '@img/sharp-libvips-linux-arm64': 1.0.1
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-linux-arm@0.33.2:
@@ -4744,7 +4737,7 @@ packages:
     requiresBuild: true
     optionalDependencies:
       '@img/sharp-libvips-linux-arm': 1.0.1
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-linux-s390x@0.33.2:
@@ -4755,7 +4748,7 @@ packages:
     requiresBuild: true
     optionalDependencies:
       '@img/sharp-libvips-linux-s390x': 1.0.1
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-linux-x64@0.33.2:
@@ -4766,7 +4759,7 @@ packages:
     requiresBuild: true
     optionalDependencies:
       '@img/sharp-libvips-linux-x64': 1.0.1
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-linuxmusl-arm64@0.33.2:
@@ -4777,7 +4770,7 @@ packages:
     requiresBuild: true
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-arm64': 1.0.1
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-linuxmusl-x64@0.33.2:
@@ -4788,7 +4781,7 @@ packages:
     requiresBuild: true
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-x64': 1.0.1
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-wasm32@0.33.2:
@@ -4798,7 +4791,7 @@ packages:
     requiresBuild: true
     dependencies:
       '@emnapi/runtime': 0.45.0
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-win32-ia32@0.33.2:
@@ -4807,7 +4800,7 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@img/sharp-win32-x64@0.33.2:
@@ -4816,7 +4809,7 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /@interactjs/actions@1.10.18(@interactjs/core@1.10.18)(@interactjs/utils@1.10.18):
@@ -6223,7 +6216,7 @@ packages:
       - idb-keyval
       - rollup
       - supports-color
-    dev: true
+    dev: false
 
   /@nuxt/kit@3.10.1:
     resolution: {integrity: sha512-M9VRY0QGbG6lWOVqt69ZF96RLBUZVXyFpbBUwHnoHgjF9BXSX/MT/hrZcJicN4aPM2QRephGgsBd4U5wFmmn6g==}
@@ -6250,7 +6243,7 @@ packages:
     transitivePeerDependencies:
       - rollup
       - supports-color
-    dev: true
+    dev: false
 
   /@nuxt/kit@3.10.2:
     resolution: {integrity: sha512-Bua7taY9CIm7HCTpHXqFyM1xlZkrUl6HOqWrkGjLLQg9eeWAdKT7ppT0iEMiGnb9f+5T0uL5Ec3TvuR5J8P9WA==}
@@ -6377,7 +6370,7 @@ packages:
     transitivePeerDependencies:
       - rollup
       - supports-color
-    dev: true
+    dev: false
 
   /@nuxt/schema@3.10.2:
     resolution: {integrity: sha512-hHVnMlPKYR6AVK889gvcYVgewB1885/KPZW6uYhVWkeKGc63JzNCILq8ykTqG/t8LpG1ZJpwxo5KtDk9nIZrfA==}
@@ -6819,7 +6812,6 @@ packages:
     cpu: [arm64]
     os: [android]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-darwin-arm64@2.3.0:
@@ -6837,7 +6829,6 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-darwin-x64@2.3.0:
@@ -6855,7 +6846,6 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-freebsd-x64@2.3.0:
@@ -6873,7 +6863,6 @@ packages:
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-linux-arm-glibc@2.3.0:
@@ -6891,7 +6880,6 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-linux-arm64-glibc@2.3.0:
@@ -6909,7 +6897,6 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-linux-arm64-musl@2.3.0:
@@ -6927,7 +6914,6 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-linux-x64-glibc@2.3.0:
@@ -6945,7 +6931,6 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-linux-x64-musl@2.3.0:
@@ -6963,7 +6948,6 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-wasm@2.3.0:
@@ -6986,7 +6970,6 @@ packages:
       is-glob: 4.0.3
       micromatch: 4.0.5
       napi-wasm: 1.1.0
-    dev: true
     bundledDependencies:
       - napi-wasm
 
@@ -7005,7 +6988,6 @@ packages:
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-win32-ia32@2.3.0:
@@ -7023,7 +7005,6 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher-win32-x64@2.3.0:
@@ -7041,7 +7022,6 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@parcel/watcher@2.0.4:
@@ -7099,7 +7079,6 @@ packages:
       '@parcel/watcher-win32-arm64': 2.4.0
       '@parcel/watcher-win32-ia32': 2.4.0
       '@parcel/watcher-win32-x64': 2.4.0
-    dev: true
 
   /@pinia/nuxt@0.5.1(vue@3.3.13):
     resolution: {integrity: sha512-6wT6TqY81n+7/x3Yhf0yfaJVKkZU42AGqOR0T3+UvChcaOJhSma7OWPN64v+ptYlznat+fS1VTwNAcbi2lzHnw==}
@@ -7606,7 +7585,6 @@ packages:
   /@sindresorhus/merge-streams@2.2.1:
     resolution: {integrity: sha512-255V7MMIKw6aQ43Wbqp9HZ+VHn6acddERTLiiLnlcPLU9PdTq9Aijl12oklAgUEblLWye+vHLzmqBx6f2TGcZw==}
     engines: {node: '>=18'}
-    dev: true
 
   /@sinonjs/commons@3.0.0:
     resolution: {integrity: sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==}
@@ -8884,7 +8862,6 @@ packages:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
     requiresBuild: true
-    dev: true
 
   /@tsconfig/node10@1.0.9:
     resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
@@ -11906,7 +11883,6 @@ packages:
 
   /boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
-    dev: true
 
   /bowser@2.11.0:
     resolution: {integrity: sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==}
@@ -12121,7 +12097,6 @@ packages:
       perfect-debounce: 1.0.0
       pkg-types: 1.0.3
       rc9: 2.1.1
-    dev: true
 
   /c12@1.9.0:
     resolution: {integrity: sha512-7KTCZXdIbOA2hLRQ+1KzJ15Qp9Wn58one74dkihMVp2H6EzKTa3OYBy0BSfS1CCcmxYyqeX8L02m40zjQ+dstg==}
@@ -12568,7 +12543,6 @@ packages:
       execa: 8.0.1
       is-wsl: 3.1.0
       is64bit: 2.0.0
-    dev: true
 
   /cliui@6.0.0:
     resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
@@ -12659,6 +12633,7 @@ packages:
     dependencies:
       color-name: 1.1.4
       simple-swizzle: 0.2.2
+    dev: false
 
   /color-support@1.1.3:
     resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
@@ -12678,7 +12653,7 @@ packages:
     dependencies:
       color-convert: 2.0.1
       color-string: 1.9.1
-    dev: true
+    dev: false
     optional: true
 
   /colord@2.9.3:
@@ -12745,7 +12720,6 @@ packages:
   /commander@7.2.0:
     resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
     engines: {node: '>= 10'}
-    dev: true
 
   /commander@8.3.0:
     resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
@@ -12982,7 +12956,6 @@ packages:
 
   /cookie-es@1.0.0:
     resolution: {integrity: sha512-mWYvfOLrfEc996hlKcdABeIiPHUPC6DM2QYZdGGOvhOTbA3tjm2eBwqlJpoFdjC89NI4Qt6h0Pu06Mp+1Pj5OQ==}
-    dev: true
 
   /cookie-parser@1.4.6:
     resolution: {integrity: sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==}
@@ -13172,7 +13145,6 @@ packages:
   /crossws@0.1.1:
     resolution: {integrity: sha512-c9c/o7bS3OjsdpSkvexpka0JNlesBF2JU9B2V1yNsYGwRbAafxhJQ7VI9b48D5bpONz/oxbPGMzBojy9sXoQIQ==}
     requiresBuild: true
-    dev: true
 
   /crossws@0.2.4:
     resolution: {integrity: sha512-DAxroI2uSOgUKLz00NX6A8U/8EE3SZHmIND+10jkVSaypvyt57J5JEOxAQOL6lQxyzi/wZbTIwssU1uy69h5Vg==}
@@ -13307,7 +13279,6 @@ packages:
       domhandler: 5.0.3
       domutils: 3.1.0
       nth-check: 2.1.1
-    dev: true
 
   /css-tree@2.2.1:
     resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==}
@@ -13316,7 +13287,6 @@ packages:
     dependencies:
       mdn-data: 2.0.28
       source-map-js: 1.0.2
-    dev: true
 
   /css-tree@2.3.1:
     resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
@@ -13342,7 +13312,7 @@ packages:
   /cssfilter@0.0.10:
     resolution: {integrity: sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==}
     requiresBuild: true
-    dev: true
+    dev: false
     optional: true
 
   /cssnano-preset-default@6.0.3(postcss@8.4.35):
@@ -13409,7 +13379,6 @@ packages:
     requiresBuild: true
     dependencies:
       css-tree: 2.2.1
-    dev: true
 
   /cssstyle@4.0.1:
     resolution: {integrity: sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==}
@@ -13792,7 +13761,6 @@ packages:
 
   /destr@2.0.3:
     resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==}
-    dev: true
 
   /destroy@1.2.0:
     resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
@@ -13808,7 +13776,6 @@ packages:
     engines: {node: '>=0.10'}
     hasBin: true
     requiresBuild: true
-    dev: true
 
   /detect-libc@2.0.2:
     resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==}
@@ -13894,18 +13861,15 @@ packages:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       entities: 4.5.0
-    dev: true
 
   /domelementtype@2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
-    dev: true
 
   /domhandler@5.0.3:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
     dependencies:
       domelementtype: 2.3.0
-    dev: true
 
   /domino@2.1.6:
     resolution: {integrity: sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==}
@@ -13925,7 +13889,6 @@ packages:
       dom-serializer: 2.0.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
-    dev: true
 
   /dot-prop@5.3.0:
     resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
@@ -13958,7 +13921,6 @@ packages:
   /dotenv@16.4.4:
     resolution: {integrity: sha512-XvPXc8XAQThSjAbY6cQ/9PcBXmFoWuw1sQ3b8HqUCR6ziGXjkTi//kB9SWa2UwqlgdAIuRqAa/9hVljzPehbYg==}
     engines: {node: '>=12'}
-    dev: true
 
   /dotenv@8.6.0:
     resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
@@ -16220,7 +16182,6 @@ packages:
 
   /get-port-please@3.1.2:
     resolution: {integrity: sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==}
-    dev: true
 
   /get-port@3.2.0:
     resolution: {integrity: sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==}
@@ -16530,7 +16491,6 @@ packages:
       path-type: 5.0.0
       slash: 5.1.0
       unicorn-magic: 0.1.0
-    dev: true
 
   /google-auth-library@8.9.0:
     resolution: {integrity: sha512-f7aQCJODJFmYWN6PeNKzgvy9LI2tYmXnzpNDHEjG5sDNPgGb2FXQyTBnXeSH+PAtpKESFD+LmHw3Ox3mN7e1Fg==}
@@ -16690,7 +16650,6 @@ packages:
       ufo: 1.4.0
       uncrypto: 0.1.3
       unenv: 1.9.0
-    dev: true
 
   /h3@1.10.1:
     resolution: {integrity: sha512-UBAUp47hmm4BB5/njB4LrEa9gpuvZj4/Qf/ynSMzO6Ku2RXaouxEfiG2E2IFnv6fxbhAkzjasDxmo6DFdEeXRg==}
@@ -16705,7 +16664,6 @@ packages:
       ufo: 1.4.0
       uncrypto: 0.1.3
       unenv: 1.9.0
-    dev: true
 
   /h3@1.11.1:
     resolution: {integrity: sha512-AbaH6IDnZN6nmbnJOH72y3c5Wwh9P97soSVdGSBbcDACRdkC0FEWf25pzx4f/NuOCK6quHmW18yF2Wx+G4Zi1A==}
@@ -17008,7 +16966,6 @@ packages:
     resolution: {integrity: sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
     requiresBuild: true
-    dev: true
 
   /http-signature@1.2.0:
     resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
@@ -17145,11 +17102,9 @@ packages:
   /ignore@5.3.1:
     resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
     engines: {node: '>= 4'}
-    dev: true
 
   /image-meta@0.2.0:
     resolution: {integrity: sha512-ZBGjl0ZMEMeOC3Ns0wUF/5UdUmr3qQhBSCniT0LxOgGGIRHiNFOkMtIHB7EOznRU47V2AxPgiVP+s+0/UCU0Hg==}
-    dev: true
 
   /immutable@4.3.4:
     resolution: {integrity: sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==}
@@ -17401,7 +17356,7 @@ packages:
       - '@vercel/kv'
       - idb-keyval
       - supports-color
-    dev: true
+    dev: false
     optional: true
 
   /iron-webcrypto@0.8.0:
@@ -17410,7 +17365,6 @@ packages:
 
   /iron-webcrypto@1.0.0:
     resolution: {integrity: sha512-anOK1Mktt8U1Xi7fCM3RELTuYbnFikQY5VtrDj7kPgpejV7d43tWKhzgioO0zpkazLEL/j/iayRqnJhrGfqUsg==}
-    dev: true
 
   /is-absolute@1.0.0:
     resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
@@ -17461,6 +17415,7 @@ packages:
   /is-arrayish@0.3.2:
     resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
     requiresBuild: true
+    dev: false
 
   /is-async-function@2.0.0:
     resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
@@ -17540,7 +17495,6 @@ packages:
     resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     hasBin: true
-    dev: true
 
   /is-extendable@0.1.1:
     resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
@@ -17626,7 +17580,6 @@ packages:
     hasBin: true
     dependencies:
       is-docker: 3.0.0
-    dev: true
 
   /is-installed-globally@1.0.0:
     resolution: {integrity: sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==}
@@ -17875,7 +17828,6 @@ packages:
     engines: {node: '>=16'}
     dependencies:
       is-inside-container: 1.0.0
-    dev: true
 
   /is64bit@2.0.0:
     resolution: {integrity: sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw==}
@@ -17883,7 +17835,6 @@ packages:
     requiresBuild: true
     dependencies:
       system-architecture: 0.1.0
-    dev: true
 
   /is@3.3.0:
     resolution: {integrity: sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==}
@@ -19190,7 +19141,6 @@ packages:
       ufo: 1.4.0
       untun: 0.1.3
       uqr: 0.1.2
-    dev: true
 
   /listr2@4.0.5:
     resolution: {integrity: sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==}
@@ -19424,7 +19374,6 @@ packages:
   /lru-cache@10.0.3:
     resolution: {integrity: sha512-B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg==}
     engines: {node: 14 || >=16.14}
-    dev: true
 
   /lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
@@ -19664,7 +19613,6 @@ packages:
   /mdn-data@2.0.28:
     resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
     requiresBuild: true
-    dev: true
 
   /mdn-data@2.0.30:
     resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
@@ -20269,7 +20217,6 @@ packages:
   /napi-wasm@1.1.0:
     resolution: {integrity: sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==}
     requiresBuild: true
-    dev: true
 
   /native-duplexpair@1.0.0:
     resolution: {integrity: sha512-E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA==}
@@ -20905,7 +20852,6 @@ packages:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
     dependencies:
       boolbase: 1.0.0
-    dev: true
 
   /nuxi@3.10.1:
     resolution: {integrity: sha512-ZNt858+FOZDIiKKFJkXO7uJAnALytDdn1XbLgtZAqbtWNMayHbOnWcnxh+WSOE4H9uOi2+loWXEqKElmNWLgcQ==}
@@ -21253,7 +21199,6 @@ packages:
       destr: 2.0.3
       node-fetch-native: 1.6.1
       ufo: 1.4.0
-    dev: true
 
   /ohash@1.1.3:
     resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==}
@@ -22779,7 +22724,6 @@ packages:
 
   /radix3@1.1.0:
     resolution: {integrity: sha512-pNsHDxbGORSvuSScqNJ+3Km6QAVqk8CfsCBIEoDgpqLrkD2f3QM4I7d1ozJJ172OmIcoUcerZaNWqtLkRXTV3A==}
-    dev: true
 
   /randombytes@2.1.0:
     resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
@@ -23660,7 +23604,7 @@ packages:
       '@img/sharp-wasm32': 0.33.2
       '@img/sharp-win32-ia32': 0.33.2
       '@img/sharp-win32-x64': 0.33.2
-    dev: true
+    dev: false
     optional: true
 
   /shebang-command@1.2.0:
@@ -23785,6 +23729,7 @@ packages:
     requiresBuild: true
     dependencies:
       is-arrayish: 0.3.2
+    dev: false
 
   /simple-update-notifier@2.0.0:
     resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
@@ -24603,7 +24548,6 @@ packages:
       css-what: 6.1.0
       csso: 5.0.5
       picocolors: 1.0.0
-    dev: true
 
   /symbol-observable@1.2.0:
     resolution: {integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==}
@@ -24647,7 +24591,6 @@ packages:
     resolution: {integrity: sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==}
     engines: {node: '>=18'}
     requiresBuild: true
-    dev: true
 
   /tapable@1.1.3:
     resolution: {integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==}
@@ -25493,7 +25436,6 @@ packages:
 
   /uncrypto@0.1.3:
     resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}
-    dev: true
 
   /unctx@2.3.1:
     resolution: {integrity: sha512-PhKke8ZYauiqh3FEMVNm7ljvzQiph0Mt3GBRve03IJm7ukfaON2OBK795tLwhbyfzknuRRkW0+Ze+CQUmzOZ+A==}
@@ -25525,7 +25467,6 @@ packages:
       mime: 3.0.0
       node-fetch-native: 1.6.1
       pathe: 1.1.2
-    dev: true
 
   /unescape@1.0.1:
     resolution: {integrity: sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==}
@@ -25837,7 +25778,6 @@ packages:
       ufo: 1.4.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /untun@0.1.2:
     resolution: {integrity: sha512-wLAMWvxfqyTiBODA1lg3IXHQtjggYLeTK7RnSfqtOXixWJ3bAa2kK/HHmOOg19upteqO3muLvN6O/icbyQY33Q==}
@@ -25857,7 +25797,6 @@ packages:
       citty: 0.1.5
       consola: 3.2.3
       pathe: 1.1.2
-    dev: true
 
   /untyped@1.4.0:
     resolution: {integrity: sha512-Egkr/s4zcMTEuulcIb7dgURS6QpN7DyqQYdf+jBtiaJvQ+eRsrtWUoX84SbvQWuLkXsOjM+8sJC9u6KoMK/U7Q==}
@@ -25886,7 +25825,6 @@ packages:
       scule: 1.3.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /upath@2.0.1:
     resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==}
@@ -25906,7 +25844,6 @@ packages:
   /uqr@0.1.2:
     resolution: {integrity: sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==}
     requiresBuild: true
-    dev: true
 
   /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
@@ -27401,7 +27338,7 @@ packages:
     dependencies:
       commander: 2.20.3
       cssfilter: 0.0.10
-    dev: true
+    dev: false
     optional: true
 
   /xtend@4.0.2:

From e1dd478ac2a20d5dfbe25bc5145ff052b81ca986 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:32 +0000
Subject: [PATCH 024/253] fix: sidebar corrections

---
 packages/nc-gui/components/nc/DateWeekSelector.vue  | 4 ++--
 packages/nc-gui/components/nc/MonthYearSelector.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index 63e1a6fb09..6bfa8de2b6 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -152,7 +152,7 @@ const paginate = (action: 'next' | 'prev') => {
       class="flex items-center"
     >
       <NcTooltip>
-        <NcButton v-if="!disablePagination" size="medium" type="secondary" @click="paginate('prev')">
+        <NcButton v-if="!disablePagination" size="small" type="secondary" @click="paginate('prev')">
           <component :is="iconMap.doubleLeftArrow" class="h-4 w-4" />
         </NcButton>
         <template #title>
@@ -169,7 +169,7 @@ const paginate = (action: 'next' | 'prev') => {
         >{{ currentMonthYear }}</span
       >
       <NcTooltip>
-        <NcButton v-if="!disablePagination" size="medium" type="secondary" @click="paginate('next')">
+        <NcButton v-if="!disablePagination" size="small" type="secondary" @click="paginate('next')">
           <component :is="iconMap.doubleRightArrow" class="h-4 w-4" />
         </NcButton>
         <template #title>
diff --git a/packages/nc-gui/components/nc/MonthYearSelector.vue b/packages/nc-gui/components/nc/MonthYearSelector.vue
index a012817551..543ed5082f 100644
--- a/packages/nc-gui/components/nc/MonthYearSelector.vue
+++ b/packages/nc-gui/components/nc/MonthYearSelector.vue
@@ -114,7 +114,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
             :class="{
               '!bg-brand-50 border-1 !border-brand-500': isMonthSelected(month),
             }"
-            class="h-9 rounded-lg flex font-medium items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
+            class="h-9 rounded-lg flex items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
             @click="selectedDate = month"
           >
             {{ month.format('MMM') }}
@@ -127,7 +127,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
             :class="{
               '!bg-brand-50 !border-1 !border-brand-500': compareYear(year, selectedDate),
             }"
-            class="h-9 rounded-lg flex font-medium items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
+            class="h-9 rounded-lg flex items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
             @click="selectedDate = year"
           >
             {{ year.format('YYYY') }}

From ddbebf9eb8f85507210d6680719cbaebfbc62d0c Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:32 +0000
Subject: [PATCH 025/253] fix: minor interaction correction

---
 .../calendar/DayView/DateTimeField.vue        |  9 ++----
 .../smartsheet/calendar/MonthView.vue         | 29 ++++++-----------
 .../smartsheet/calendar/RecordCard.vue        |  9 +++---
 .../smartsheet/calendar/VRecordCard.vue       | 11 ++++---
 .../calendar/WeekView/DateField.vue           | 32 +++++++------------
 .../calendar/WeekView/DateTimeField.vue       | 19 +++--------
 .../components/smartsheet/calendar/index.vue  |  2 +-
 7 files changed, 41 insertions(+), 70 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index d086a45c43..8f1e6c55e3 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -391,10 +391,7 @@ const calculateNewRow = (event: MouseEvent) => {
   if (dragElement.value) {
     formattedData.value = formattedData.value.map((r) => {
       const pk = extractPkFromRow(r.row, meta.value!.columns!)
-      if (pk === newPk) {
-        return newRow
-      }
-      return r
+      return pk === newPk ? newRow : r
     })
   } else {
     // If the old row is not found, we add the new row to the formattedData array and remove the old row from the formattedSideBarData array
@@ -564,7 +561,6 @@ const dragStart = (event: MouseEvent, record: Row) => {
     dragRecord.value = record
 
     dragElement.value = target
-    dragRecord.value = record
 
     document.addEventListener('mousemove', onDrag)
     document.addEventListener('mouseup', stopDrag)
@@ -749,7 +745,8 @@ const viewMore = (hour: dayjs.Dayjs) => {
         >
           <LazySmartsheetRow :row="record">
             <LazySmartsheetCalendarVRecordCard
-              :hover="hoverRecord === record.rowMeta.id"
+              :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
+              :selected="record.rowMeta.id === dragRecord?.rowMeta?.id"
               :position="record.rowMeta!.position"
               :record="record"
               :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 398244a090..6c40b29385 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -112,7 +112,7 @@ const recordsToDisplay = computed<{
   const perHeight = gridContainerHeight.value / dates.value.length
   const perRecordHeight = 40
 
-  const spaceBetweenRecords = 35
+  const spaceBetweenRecords = 30
 
   // This object is used to keep track of the number of records in a day
   // The key is the date in the format YYYY-MM-DD
@@ -528,6 +528,7 @@ const stopDrag = (event: MouseEvent) => {
     dragElement.value = null
   }
 
+  dragRecord.value = undefined
   updateRowProperty(newRow, updateProperty, false)
   focusedDate.value = null
 
@@ -550,12 +551,10 @@ const dragStart = (event: MouseEvent, record: Row) => {
     const allRecords = document.querySelectorAll('.draggable-record')
     allRecords.forEach((el) => {
       if (!el.getAttribute('data-unique-id').includes(record.rowMeta.id!)) {
-        // el.style.visibility = 'hidden'
         el.style.opacity = '30%'
       }
     })
 
-    dragRecord.value = record
     // selectedDate.value = null
 
     isDragging.value = true
@@ -672,7 +671,7 @@ const isDateSelected = (date: dayjs.Dayjs) => {
                   '!block': isDateSelected(day),
                   '!hidden': !isDateSelected(day),
                 }"
-                class="!group-hover:block"
+                class="!group-hover:block rounded"
                 size="small"
                 type="secondary"
               >
@@ -709,8 +708,8 @@ const isDateSelected = (date: dayjs.Dayjs) => {
                 '!block': isDateSelected(day),
                 '!hidden': !isDateSelected(day),
               }"
-              class="!group-hover:block"
-              size="small"
+              class="!group-hover:block !w-6 !h-6 !rounded"
+              size="xsmall"
               type="secondary"
               @click="
                 () => {
@@ -723,13 +722,13 @@ const isDateSelected = (date: dayjs.Dayjs) => {
                 }
               "
             >
-              <component :is="iconMap.plus" class="h-4 w-4" />
+              <component :is="iconMap.plus" />
             </NcButton>
             <span
               :class="{
                 'bg-brand-50 text-brand-500': day.isSame(dayjs(), 'date'),
               }"
-              class="px-1.5 rounded-lg py-1 my-1"
+              class="px-1.3 py-1 text-xs rounded-lg"
             >
               {{ day.format('DD') }}
             </span>
@@ -761,10 +760,6 @@ const isDateSelected = (date: dayjs.Dayjs) => {
         :style="{
           ...record.rowMeta.style,
           zIndex: record.rowMeta.id === draggingId ? 100 : 0,
-          boxShadow:
-            record.rowMeta.id === draggingId
-              ? '0px 8px 8px -4px rgba(0, 0, 0, 0.04), 0px 20px 24px -4px rgba(0, 0, 0, 0.10)'
-              : 'none',
         }"
         class="absolute group draggable-record cursor-pointer pointer-events-auto"
         @mouseleave="hoverRecord = null"
@@ -773,17 +768,11 @@ const isDateSelected = (date: dayjs.Dayjs) => {
       >
         <LazySmartsheetRow :row="record">
           <LazySmartsheetCalendarRecordCard
-            :hover="hoverRecord === record.rowMeta.id"
+            :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === draggingId"
             :position="record.rowMeta.position"
             :record="record"
             :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
-            :selected="
-              dragRecord
-                ? dragRecord.rowMeta.id === record.rowMeta.id
-                : resizeRecord
-                ? resizeRecord.rowMeta.id === record.rowMeta.id
-                : false
-            "
+            :selected="dragRecord?.rowMeta?.id === record.rowMeta.id || resizeRecord?.rowMeta?.id === record.rowMeta.id"
             @resize-start="onResizeStart"
             @dblclick.stop="emit('expandRecord', record)"
           >
diff --git a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
index fbeb7efcb2..6b0d0ab5f4 100644
--- a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
@@ -28,9 +28,9 @@ const emit = defineEmits(['resize-start'])
     :class="{
       'min-h-9': size === 'small',
       'h-full': size === 'auto',
-      'rounded-l-lg': position === 'leftRounded',
-      'rounded-r-lg': position === 'rightRounded',
-      'rounded-lg mx-1': position === 'rounded',
+      'rounded-l-md': position === 'leftRounded',
+      'rounded-r-md': position === 'rightRounded',
+      'rounded-md mx-1': position === 'rounded',
       'rounded-none': position === 'none',
       'bg-maroon-50': color === 'maroon',
       'bg-blue-50': color === 'blue',
@@ -39,7 +39,8 @@ const emit = defineEmits(['resize-start'])
       'bg-pink-50': color === 'pink',
       'bg-purple-50': color === 'purple',
       'group-hover:(border-brand-500 border-1)': resize,
-      '!border-brand-500 border-1': selected || hover,
+      '!border-brand-500 border-1': selected,
+      'shadow-md': hover,
     }"
     class="relative transition-all flex items-center px-1 group border-1 border-transparent"
   >
diff --git a/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
index c4ac0b4345..b66afc0c65 100644
--- a/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
@@ -26,7 +26,7 @@ const emit = defineEmits(['resize-start'])
   >
     <NcButton
       :class="{
-        '!flex rounded-lg border-brand-500': selected || hover,
+        '!flex rounded-md border-brand-500': selected || hover,
       }"
       class="!group-hover:(border-brand-500) !border-1 text-gray-400 cursor-ns-resize"
       size="xsmall"
@@ -38,9 +38,9 @@ const emit = defineEmits(['resize-start'])
   </div>
   <div
     :class="{
-      'rounded-t-lg': position === 'topRounded',
-      'rounded-b-lg': position === 'bottomRounded',
-      'rounded-lg': position === 'rounded',
+      'rounded-t-md': position === 'topRounded',
+      'rounded-b-md': position === 'bottomRounded',
+      'rounded-md': position === 'rounded',
       'rounded-none': position === 'none',
       'bg-maroon-50': color === 'maroon',
       'bg-blue-50': color === 'blue',
@@ -49,7 +49,8 @@ const emit = defineEmits(['resize-start'])
       'bg-pink-50': color === 'pink',
       'bg-purple-50': color === 'purple',
       'group-hover:(border-brand-500)': resize,
-      '!border-brand-500 border-1': selected || hover,
+      '!border-brand-500 border-1': selected,
+      'shadow-md': hover,
     }"
     class="relative flex items-center h-full ml-0.25 border-1 border-transparent"
   >
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index fecd8400db..f8f0242b64 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -418,7 +418,7 @@ const calculateNewRow = (event: MouseEvent, updateSideBarData?: boolean) => {
 const onDrag = (event: MouseEvent) => {
   if (!isUIAllowed('dataEdit')) return
   if (!container.value || !dragRecord.value) return
-  calculateNewRow(event)
+  calculateNewRow(event, false)
 }
 
 const stopDrag = (event: MouseEvent) => {
@@ -443,6 +443,7 @@ const stopDrag = (event: MouseEvent) => {
     dragElement.value.style.boxShadow = 'none'
     dragElement.value = null
   }
+  dragRecord.value = undefined
 
   updateRowProperty(newRow, updateProperty, false)
 
@@ -470,8 +471,6 @@ const dragStart = (event: MouseEvent, record: Row) => {
       }
     })
 
-    dragRecord.value = record
-
     isDragging.value = true
     dragElement.value = target
     dragRecord.value = record
@@ -512,10 +511,13 @@ const dropEvent = (event: DragEvent) => {
       dragElement.value = null
     }
     updateRowProperty(newRow, updateProperty, false)
-
-    dragRecord.value = null
   }
 }
+
+const selectDate = (day: dayjs.Dayjs) => {
+  selectedDate.value = day
+  dragRecord.value = undefined
+}
 </script>
 
 <template>
@@ -541,7 +543,7 @@ const dropEvent = (event: DragEvent) => {
         }"
         class="flex flex-col border-r-1 min-h-[100vh] last:border-r-0 items-center w-1/7"
         data-testid="nc-calendar-week-day"
-        @click="selectedDate = dayjs(date)"
+        @click="selectDate(date)"
       ></div>
     </div>
     <div
@@ -555,31 +557,21 @@ const dropEvent = (event: DragEvent) => {
         :data-unique-id="record.rowMeta.id"
         :style="{
           ...record.rowMeta.style,
-          boxShadow:
-            record.rowMeta.id === dragElement?.getAttribute('data-unique-id')
-              ? '0px 8px 8px -4px rgba(0, 0, 0, 0.04), 0px 20px 24px -4px rgba(0, 0, 0, 0.10)'
-              : 'none',
         }"
         class="absolute group draggable-record pointer-events-auto nc-calendar-week-record-card"
-        @mousedown="dragStart($event, record)"
+        @mousedown.stop="dragStart($event, record)"
         @mouseleave="hoverRecord = null"
         @mouseover="hoverRecord = record.rowMeta.id"
       >
         <LazySmartsheetRow :row="record">
           <LazySmartsheetCalendarRecordCard
-            :hover="hoverRecord === record.rowMeta.id"
+            :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
             :position="record.rowMeta.position"
             :record="record"
-            :selected="
-              dragRecord
-                ? dragRecord.rowMeta.id === record.rowMeta.id
-                : resizeRecord
-                ? resizeRecord.rowMeta.id === record.rowMeta.id
-                : false
-            "
+            :selected="dragRecord?.rowMeta?.id === record.rowMeta.id || resizeRecord?.rowMeta.id === record.rowMeta.id"
             :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
             color="blue"
-            @dblclick="emits('expand-record', record)"
+            @dblclick.stop="emits('expand-record', record)"
             @resize-start="onResizeStart"
           >
             <template v-if="!isRowEmpty(record, displayField)">
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index dab58fd133..d959339734 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -394,8 +394,6 @@ const recordsAcrossAllRange = computed<{
   }
 })
 
-const dragElement = ref<HTMLElement | null>(null)
-
 const resizeInProgress = ref(false)
 
 const dragTimeout = ref<ReturnType<typeof setTimeout>>()
@@ -520,7 +518,6 @@ const calculateNewRow = (
   newRow: Row | null
   updatedProperty: string[]
 } => {
-  if (!isUIAllowed('dataEdit') || !container.value || !dragRecord.value) return { newRow: null, updatedProperty: [] }
   const { width, left, top } = container.value.getBoundingClientRect()
 
   const { scrollHeight } = container.value
@@ -620,11 +617,6 @@ const stopDrag = (event: MouseEvent) => {
     el.style.opacity = '100%'
   })
 
-  if (dragElement.value) {
-    dragElement.value.style.boxShadow = 'none'
-    dragElement.value = null
-  }
-
   if (newRow) {
     updateRowProperty(newRow, updatedProperty, false)
   }
@@ -654,10 +646,7 @@ const dragStart = (event: MouseEvent, record: Row) => {
       }
     })
 
-    dragRecord.value = record
-
     isDragging.value = true
-    dragElement.value = target
     dragRecord.value = record
 
     document.addEventListener('mousemove', onDrag)
@@ -776,6 +765,7 @@ const isOverflowAcrossHourRange = (hour: dayjs.Dayjs) => {
             () => {
               selectedTime = hour
               selectedDate = hour
+              dragRecord = undefined
             }
           "
         >
@@ -806,18 +796,19 @@ const isOverflowAcrossHourRange = (hour: dayjs.Dayjs) => {
           :data-unique-id="record.rowMeta!.id"
           :style="record.rowMeta!.style "
           class="absolute draggable-record w-1/7 group cursor-pointer pointer-events-auto"
-          @mousedown="dragStart($event, record)"
+          @mousedown.stop="dragStart($event, record)"
           @mouseleave="hoverRecord = null"
           @mouseover="hoverRecord = record.rowMeta.id"
           @dragover.prevent
         >
           <LazySmartsheetRow :row="record">
             <LazySmartsheetCalendarVRecordCard
-              :hover="hoverRecord === record.rowMeta.id"
+              :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
               :position="record.rowMeta!.position"
-              :record="record"
               :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
+              :record="record"
               color="blue"
+              :selected="record.rowMeta!.id === dragRecord?.rowMeta?.id"
               @resize-start="onResizeStart"
             >
               <template v-if="!isRowEmpty(record, displayField)">
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index 087843c83b..d8c9deeac6 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -247,7 +247,7 @@ const headerText = computed(() => {
             type="secondary"
             @click="goToToday"
           >
-            <span class="text-gray-700">
+            <span class="text-gray-600 !text-sm">
               {{ $t('activity.goToToday') }}
             </span>
           </NcButton>

From 9461e2f7d2dc7167f8404a7a0bb9d481df654c2a Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:33 +0000
Subject: [PATCH 026/253] fix(nc-gui): dblclick interaction

---
 .../nc-gui/components/nc/ErrorBoundary.vue    |  8 +++---
 .../smartsheet/calendar/DayView/DateField.vue | 13 ++++++++++
 .../calendar/DayView/DateTimeField.vue        | 26 ++++++++++++++-----
 .../smartsheet/calendar/MonthView.vue         | 14 ++++++++++
 .../calendar/WeekView/DateField.vue           | 22 +++++++++++++---
 .../calendar/WeekView/DateTimeField.vue       | 14 ++++++++++
 6 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/nc/ErrorBoundary.vue b/packages/nc-gui/components/nc/ErrorBoundary.vue
index 83da1797ed..98474d193e 100644
--- a/packages/nc-gui/components/nc/ErrorBoundary.vue
+++ b/packages/nc-gui/components/nc/ErrorBoundary.vue
@@ -29,7 +29,7 @@ export default {
 
     const copyError = async () => {
       try {
-        if (error.value) await copy(`message: ${error.value.message}\n\n${error.value.stack}`)
+        if (error.value) await copy(`message: ${error.value?.message}\n\n${error.value?.stack}`)
         message.info('Error message copied to clipboard.')
       } catch (e) {
         message.error('Something went wrong while copying to clipboard, please copy from browser console.')
@@ -95,9 +95,9 @@ export default {
         >
           <div class="nc-left-vertical-bar"></div>
           <div class="nc-error-content">
-            <span class="font-weight-bold">Message: {{ error.message }}</span>
+            <span class="font-weight-bold">Message: {{ error?.message }}</span>
             <br />
-            <div class="text-gray-500 mt-2">{{ error.stack }}</div>
+            <div class="text-gray-500 mt-2">{{ error?.stack }}</div>
           </div>
         </div>
         <div class="flex justify-end gap-2">
@@ -107,7 +107,7 @@ export default {
               Copy Error
             </div>
           </NcButton>
-          <NcButton v-if="!prevError || error.message !== prevError.message" size="small" @click="reload">
+          <NcButton v-if="!prevError || error?.message !== prevError?.message" size="small" @click="reload">
             <div class="flex items-center gap-1">
               <GeneralIcon icon="reload" />
               Reload
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 7d6e5c8864..82fe9a7977 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -183,6 +183,17 @@ const dropEvent = (event: DragEvent) => {
     updateRowProperty(newRow, updateProperty, false)
   }
 }
+
+// TODO: Add Support for multiple ranges when multiple ranges are supported
+const newRecord = () => {
+  if (!isUIAllowed('dataEdit') || !calendarRange.value?.length) return
+  const record = {
+    row: {
+      [calendarRange.value[0].fk_from_col!.title!]: selectedDate.value.format('YYYY-MM-DD HH:mm:ssZ'),
+    },
+  }
+  emit('newRecord', record)
+}
 </script>
 
 <template>
@@ -191,6 +202,7 @@ const dropEvent = (event: DragEvent) => {
     ref="container"
     class="w-full relative h-[calc(100vh-10.8rem)] overflow-y-auto nc-scrollbar-md"
     data-testid="nc-calendar-day-view"
+    @dblclick="newRecord"
     @drop="dropEvent"
   >
     <div
@@ -240,6 +252,7 @@ const dropEvent = (event: DragEvent) => {
     ref="container"
     class="w-full h-full flex text-md font-bold text-gray-500 items-center justify-center"
     @drop="dropEvent"
+    @dblclick="newRecord"
   >
     No records in this day
   </div>
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 8f1e6c55e3..3af93de23e 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -108,7 +108,7 @@ const recordsAcrossAllRange = computed<{
     if (fromCol && endCol) {
       for (const record of sortedFormattedData) {
         // We use this id during the drag and drop operation and to keep track of the number of records that overlap at a given time
-        const id = generateRandomNumber()
+        const id = record.rowMeta?.id ?? generateRandomNumber()
         let startDate = dayjs(record.row[fromCol.title!])
         let endDate = dayjs(record.row[endCol.title!])
 
@@ -202,7 +202,7 @@ const recordsAcrossAllRange = computed<{
       }
     } else if (fromCol) {
       for (const record of sortedFormattedData) {
-        const id = generateRandomNumber()
+        const id = record.rowMeta?.id ?? generateRandomNumber()
 
         const startDate = dayjs(record.row[fromCol.title!])
 
@@ -611,11 +611,26 @@ const viewMore = (hour: dayjs.Dayjs) => {
   selectedTime.value = hour
   showSideMenu.value = true
 }
+
+const selectHour = (hour: dayjs.Dayjs) => {
+  selectedTime.value = hour
+  dragRecord.value = null
+}
+
+// TODO: Add Support for multiple ranges when multiple ranges are supported
+const newRecord = (hour: dayjs.Dayjs) => {
+  if (!isUIAllowed('dataEdit') || !calendarRange.value?.length) return
+  const record = {
+    row: {
+      [calendarRange.value[0].fk_from_col!.title!]: hour.format('YYYY-MM-DD HH:mm:ssZ'),
+    },
+  }
+  emit('newRecord', record)
+}
 </script>
 
 <template>
   <div
-    v-if="recordsAcrossAllRange.record.length"
     ref="container"
     class="w-full relative no-selection h-[calc(100vh-10rem)] overflow-y-auto nc-scrollbar-md"
     data-testid="nc-calendar-day-view"
@@ -628,7 +643,8 @@ const viewMore = (hour: dayjs.Dayjs) => {
       }"
       class="flex w-full min-h-20 relative border-1 group hover:bg-gray-50 border-white border-b-gray-100"
       data-testid="nc-calendar-day-hour"
-      @click="selectedTime = hour"
+      @click="selectHour(hour)"
+      @dblclick="newRecord(hour)"
     >
       <div class="pt-2 px-4 text-xs text-gray-500 font-semibold h-20">
         {{ dayjs(hour).format('H A') }}
@@ -778,8 +794,6 @@ const viewMore = (hour: dayjs.Dayjs) => {
       </div>
     </div>
   </div>
-
-  <div v-else class="w-full h-full flex text-md font-bold text-gray-500 items-center justify-center">No records in this day</div>
 </template>
 
 <style lang="scss" scoped>
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 6c40b29385..f0bd84bb94 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -620,6 +620,19 @@ const isDateSelected = (date: dayjs.Dayjs) => {
   if (!selectedDate.value) return false
   return dayjs(date).isSame(selectedDate.value, 'day')
 }
+
+// TODO: Add Support for multiple ranges when multiple ranges are supported
+const addRecord = (date: dayjs.Dayjs) => {
+  if (!isUIAllowed('dataEdit') || !calendarRange.value) return
+  const fromCol = calendarRange.value[0].fk_from_col
+  if (!fromCol) return
+  const newRecord = {
+    row: {
+      [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
+    },
+  }
+  emit('newRecord', newRecord)
+}
 </script>
 
 <template>
@@ -655,6 +668,7 @@ const isDateSelected = (date: dayjs.Dayjs) => {
           class="text-right relative group last:border-r-0 text-sm h-full border-r-1 border-b-1 border-gray-100 font-medium hover:bg-gray-50 text-gray-800 bg-white"
           data-testid="nc-calendar-month-day"
           @click="selectDate(day)"
+          @dblclick="addRecord(day)"
         >
           <div v-if="isUIAllowed('dataEdit')" class="flex justify-between p-1">
             <span
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index f8f0242b64..d8d26a6639 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -111,7 +111,7 @@ const calendarData = computed(() => {
         return !endDate.isBefore(startDate)
       })) {
         // Generate a unique id for the record if it doesn't have one
-        const id = record.row.id ?? generateRandomNumber()
+        const id = record.rowMeta.id ?? generateRandomNumber()
         let startDate = dayjs(record.row[fromCol.title!])
         const ogStartDate = startDate.clone()
         const endDate = dayjs(record.row[toCol.title!])
@@ -203,7 +203,7 @@ const calendarData = computed(() => {
       }
     } else if (fromCol) {
       for (const record of formattedData.value) {
-        const id = record.row.id ?? generateRandomNumber()
+        const id = record.rowMeta.id ?? generateRandomNumber()
 
         const startDate = dayjs(record.row[fromCol.title!])
         const startDaysDiff = Math.max(startDate.diff(selectedDateRange.value.start, 'day'), 0)
@@ -518,6 +518,19 @@ const selectDate = (day: dayjs.Dayjs) => {
   selectedDate.value = day
   dragRecord.value = undefined
 }
+
+// TODO: Add Support for multiple ranges when multiple ranges are supported
+const addRecord = (date: dayjs.Dayjs) => {
+  if (!isUIAllowed('dataEdit') || !calendarRange.value) return
+  const fromCol = calendarRange.value[0].fk_from_col
+  if (!fromCol) return
+  const newRecord = {
+    row: {
+      [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
+    },
+  }
+  emits('newRecord', newRecord)
+}
 </script>
 
 <template>
@@ -544,6 +557,7 @@ const selectDate = (day: dayjs.Dayjs) => {
         class="flex flex-col border-r-1 min-h-[100vh] last:border-r-0 items-center w-1/7"
         data-testid="nc-calendar-week-day"
         @click="selectDate(date)"
+        @dblclick="addRecord(date)"
       ></div>
     </div>
     <div
@@ -568,12 +582,14 @@ const selectDate = (day: dayjs.Dayjs) => {
             :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
             :position="record.rowMeta.position"
             :record="record"
-            :selected="dragRecord?.rowMeta?.id === record.rowMeta.id || resizeRecord?.rowMeta.id === record.rowMeta.id"
+            :selected="dragRecord?.rowMeta?.id === record.rowMeta.id"
             :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
             color="blue"
             @dblclick.stop="emits('expand-record', record)"
             @resize-start="onResizeStart"
           >
+            {{ dragRecord?.rowMeta?.id }}
+            {{ record?.rowMeta?.id }}
             <template v-if="!isRowEmpty(record, displayField)">
               <LazySmartsheetCalendarCell
                 v-model="record.row[displayField!.title!]"
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index d959339734..2b3b44828a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -721,6 +721,19 @@ const isOverflowAcrossHourRange = (hour: dayjs.Dayjs) => {
 
   return { isOverflow, overflowCount }
 }
+
+// TODO: Add Support for multiple ranges when multiple ranges are supported
+const addRecord = (date: dayjs.Dayjs) => {
+  if (!isUIAllowed('dataEdit') || !calendarRange.value) return
+  const fromCol = calendarRange.value[0].fk_from_col
+  if (!fromCol) return
+  const newRecord = {
+    row: {
+      [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
+    },
+  }
+  emits('newRecord', newRecord)
+}
 </script>
 
 <template>
@@ -761,6 +774,7 @@ const isOverflowAcrossHourRange = (hour: dayjs.Dayjs) => {
           }"
           class="text-center relative h-20 text-sm text-gray-500 w-full hover:bg-gray-50 py-1 border-transparent border-1 border-x-gray-100 border-t-gray-100"
           data-testid="nc-calendar-week-hour"
+          @dblclick="addRecord(hour)"
           @click="
             () => {
               selectedTime = hour

From b77984adb69168db5e545a87c7dff918a0f88180 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:33 +0000
Subject: [PATCH 027/253] fix(nc-gui): minor ui corrections

---
 packages/nc-gui/components/smartsheet/calendar/RecordCard.vue  | 2 +-
 packages/nc-gui/components/smartsheet/calendar/SideMenu.vue    | 2 +-
 packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
index 6b0d0ab5f4..77d587708a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
@@ -39,7 +39,7 @@ const emit = defineEmits(['resize-start'])
       'bg-pink-50': color === 'pink',
       'bg-purple-50': color === 'purple',
       'group-hover:(border-brand-500 border-1)': resize,
-      '!border-brand-500 border-1': selected,
+      '!border-blue-200 border-1': selected,
       'shadow-md': hover,
     }"
     class="relative transition-all flex items-center px-1 group border-1 border-transparent"
diff --git a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
index b7791a3031..b5e5264e15 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
@@ -349,7 +349,7 @@ onUnmounted(() => {
           </template>
         </a-input>
         <NcSelect v-model:value="sideBarFilterOption" class="min-w-38 !text-gray-800" data-testid="nc-calendar-sidebar-filter">
-          <a-select-option v-for="option in options" :key="option.value" :value="option.value" class="!text-gray-800">
+          <a-select-option v-for="option in options" :key="option.value" :value="option.value" class="!text-gray-600">
             <div class="flex items-center justify-between gap-2">
               <div class="truncate flex-1">
                 <NcTooltip :title="option.label" placement="top" show-on-truncate-only>
diff --git a/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
index b66afc0c65..083906ecef 100644
--- a/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
@@ -49,7 +49,7 @@ const emit = defineEmits(['resize-start'])
       'bg-pink-50': color === 'pink',
       'bg-purple-50': color === 'purple',
       'group-hover:(border-brand-500)': resize,
-      '!border-brand-500 border-1': selected,
+      '!border-blue-200 border-1': selected,
       'shadow-md': hover,
     }"
     class="relative flex items-center h-full ml-0.25 border-1 border-transparent"

From ca896d36a9b4bbd8431d83fc9cd7f5b647830247 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:33 +0000
Subject: [PATCH 028/253] fix: unwanted interaction

---
 .../components/smartsheet/calendar/DayView/DateTimeField.vue  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 3af93de23e..8290066e95 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -529,6 +529,10 @@ const stopDrag = (event: MouseEvent) => {
     dragElement.value = null
   }
 
+  if (dragRecord.value) {
+    dragRecord.value = undefined
+  }
+
   if (!newRow) return
   updateRowProperty(newRow, updateProperty, false)
 

From c4be7305d6bf29005067eeaa88ce843d11f37771 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:33 +0000
Subject: [PATCH 029/253] feat(nc-gui): enable ranges

---
 packages/nc-gui/components/dlg/ViewCreate.vue |  67 +++++-----
 .../smartsheet/toolbar/CalendarRange.vue      | 119 ++++++++----------
 2 files changed, 84 insertions(+), 102 deletions(-)

diff --git a/packages/nc-gui/components/dlg/ViewCreate.vue b/packages/nc-gui/components/dlg/ViewCreate.vue
index f88b0d3855..6b5a546601 100644
--- a/packages/nc-gui/components/dlg/ViewCreate.vue
+++ b/packages/nc-gui/components/dlg/ViewCreate.vue
@@ -217,15 +217,12 @@ async function onSubmit() {
   }
 }
 
-/*
-TODO: Add support for end date and multiple range in future
 const addCalendarRange = async () => {
   form.calendar_range.push({
     fk_from_column_id: viewSelectFieldOptions.value[0].value as string,
     fk_to_column_id: null,
   })
 }
-*/
 
 const isMetaLoading = ref(false)
 
@@ -453,23 +450,20 @@ onMounted(async () => {
                 </div>
               </a-select-option>
             </NcSelect>
-            <!--
-<div
-  v-if="range.fk_to_column_id === null && isEeUI"
-class="cursor-pointer flex items-center text-gray-800 gap-1"
-@click="range.fk_to_column_id = undefined"
->
-<component :is="iconMap.plus" class="h-4 w-4" />
-{{ $t('activity.addEndDate') }}
-</div>
-<template v-else-if="isEeUI">
-<span>
-  {{ $t('activity.withEndDate') }}
-</span>
-
-             TODO: Add support for end date and multiple range in future
-
- <div class="flex">
+            <div
+              v-if="range.fk_to_column_id === null && isEeUI"
+              class="cursor-pointer flex items-center text-gray-800 gap-1"
+              @click="range.fk_to_column_id = undefined"
+            >
+              <component :is="iconMap.plus" class="h-4 w-4" />
+              {{ $t('activity.addEndDate') }}
+            </div>
+            <template v-else-if="isEeUI">
+              <span>
+                {{ $t('activity.withEndDate') }}
+              </span>
+
+              <div class="flex">
                 <NcSelect
                   v-model:value="range.fk_to_column_id"
                   :disabled="isMetaLoading"
@@ -499,27 +493,28 @@ class="cursor-pointer flex items-center text-gray-800 gap-1"
                 </NcSelect>
                 <NcButton class="!rounded-l-none !border-l-0" size="small" type="secondary" @click="range.fk_to_column_id = null">
                   <component :is="iconMap.delete" class="h-4 w-4" />
-                </NcButton> -->
-          </div>
-        </template>
-        <!--            <NcButton
-                          v-if="index !== 0"
-                          size="small"
-                          type="secondary"
-                          @click="
-                            () => {
-                              form.calendar_range = form.calendar_range.filter((_, i) => i !== index)
-                            }
-                          "
-                        >
-                          <component :is="iconMap.close" />
-                        </NcButton>
+                </NcButton>
+              </div>
+              <NcButton
+                v-if="index !== 0"
+                size="small"
+                type="secondary"
+                @click="
+                  () => {
+                    form.calendar_range = form.calendar_range.filter((_, i) => i !== index)
+                  }
+                "
+              >
+                <component :is="iconMap.close" />
+              </NcButton>
+            </template>
           </div>
+
           <NcButton class="mt-2" size="small" type="secondary" @click="addCalendarRange">
             <component :is="iconMap.plus" />
             Add another date field
           </NcButton>
-                 -->
+        </template>
       </a-form>
       <div v-else-if="!isNecessaryColumnsPresent" class="flex flex-row p-4 border-gray-200 border-1 gap-x-4 rounded-lg w-full">
         <GeneralIcon class="!text-5xl text-orange-500" icon="warning" />
diff --git a/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue b/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
index 552e630311..90a6ac5a0f 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
@@ -93,9 +93,7 @@ const dateFieldOptions = computed<SelectProps['options']>(() => {
   )
 })
 
-// TODO: Add support for end date in future
-// To add new calendar range
-/* const addCalendarRange = async () => {
+const addCalendarRange = async () => {
   _calendar_ranges.value.push({
     fk_from_column_id: dateFieldOptions.value![0].value as string,
     fk_to_column_id: null,
@@ -111,7 +109,7 @@ const removeRange = async (id: number) => {
 const saveCalendarRange = async (range: CalendarRangeType, value?) => {
   range.fk_to_column_id = value
   await saveCalendarRanges()
-} */
+}
 </script>
 
 <template>
@@ -132,7 +130,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
       </a-button>
     </div>
     <template #overlay>
-      <div v-if="calendarRangeDropdown" class="w-full p-6 w-[22rem]" data-testid="nc-calendar-range-menu" @click.stop>
+      <div v-if="calendarRangeDropdown" class="w-full p-6 w-[36rem]" data-testid="nc-calendar-range-menu" @click.stop>
         <div
           v-for="(range, id) in _calendar_ranges"
           :key="id"
@@ -167,69 +165,58 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
             </a-select-option>
           </NcSelect>
 
-          <!--
-            TODO: Add support for end date and multiple range in future
-            <div
-                      v-if="range.fk_to_column_id === null && isEeUI"
-                      class="flex cursor-pointer flex text-gray-800 items-center gap-1"
-                      data-testid="nc-calendar-range-add-end-date"
-                      @click="saveCalendarRange(range, undefined)"
-                    >
-                      <component :is="iconMap.plus" class="h-4 w-4" />
-                      {{ $t('activity.addEndDate') }}
-                    </div>
-                    <template v-else-if="isEeUI && false">
-                      <span>
-                        {{ $t('activity.withEndDate') }}
-                      </span>
-                      <div class="flex">
-                        <NcSelect
-                          v-model:value="range.fk_to_column_id"
-                          :disabled="!range.fk_from_column_id"
-                          :placeholder="$t('placeholder.notSelected')"
-                          class="!rounded-r-none nc-to-select"
-                          data-testid="nc-calendar-range-to-field-select"
-                          @change="saveCalendarRanges"
-                        >
-                          <a-select-option
-                            v-for="(option, opId) in [...dateFieldOptions].filter((f) => {
-                              const firstRange = dateFieldOptions.find((f) => f.value === calendarRange[0].fk_from_column_id)
-                              return firstRange?.uidt === f.uidt
-                            })"
-                            :key="opId"
-                            :value="option.value"
-                          >
-                            <div class="flex items-center">
-                              <SmartsheetHeaderIcon :column="option" />
-                              <NcTooltip class="truncate flex-1 max-w-18" placement="top" show-on-truncate-only>
-                                <template #title>{{ option.label }}</template>
-                                {{ option.label }}
-                              </NcTooltip>
-                            </div>
-                          </a-select-option>
-                        </NcSelect>
-                        <NcButton class="!rounded-l-none !border-l-0" size="small" type="secondary" @click="saveCalendarRange(range, null)">
-                          <component :is="iconMap.delete" class="h-4 w-4" />
-                        </NcButton>
-                      </div>
-                    </template>
-                    <NcButton v-if="id !== 0" size="small" type="secondary" @click="removeRange(id)">
-                      <component :is="iconMap.close" />
-                    </NcButton>
+          <div
+            v-if="range.fk_to_column_id === null && isEeUI"
+            class="flex cursor-pointer flex text-gray-800 items-center gap-1"
+            data-testid="nc-calendar-range-add-end-date"
+            @click="saveCalendarRange(range, undefined)"
+          >
+            <component :is="iconMap.plus" class="h-4 w-4" />
+            {{ $t('activity.addEndDate') }}
+          </div>
+          <template v-else-if="isEeUI">
+            <span>
+              {{ $t('activity.withEndDate') }}
+            </span>
+            <div class="flex">
+              <NcSelect
+                v-model:value="range.fk_to_column_id"
+                :disabled="!range.fk_from_column_id"
+                :placeholder="$t('placeholder.notSelected')"
+                class="!rounded-r-none nc-to-select"
+                data-testid="nc-calendar-range-to-field-select"
+                @change="saveCalendarRanges"
+              >
+                <a-select-option
+                  v-for="(option, opId) in [...dateFieldOptions].filter((f) => {
+                    const firstRange = dateFieldOptions.find((f) => f.value === calendarRange[0].fk_from_column_id)
+                    return firstRange?.uidt === f.uidt
+                  })"
+                  :key="opId"
+                  :value="option.value"
+                >
+                  <div class="flex items-center">
+                    <SmartsheetHeaderIcon :column="option" />
+                    <NcTooltip class="truncate flex-1 max-w-18" placement="top" show-on-truncate-only>
+                      <template #title>{{ option.label }}</template>
+                      {{ option.label }}
+                    </NcTooltip>
                   </div>
-                  <NcButton
-                    v-if="false"
-                    class="mt-2"
-                    data-testid="nc-calendar-range-add-btn"
-                    size="small"
-                    type="secondary"
-                    @click="addCalendarRange"
-                  >
-                    <component :is="iconMap.plus" />
-                    Add another date field
-                  </NcButton>
-                  -->
+                </a-select-option>
+              </NcSelect>
+              <NcButton class="!rounded-l-none !border-l-0" size="small" type="secondary" @click="saveCalendarRange(range, null)">
+                <component :is="iconMap.delete" class="h-4 w-4" />
+              </NcButton>
+            </div>
+          </template>
+          <NcButton v-if="id !== 0" size="small" type="secondary" @click="removeRange(id)">
+            <component :is="iconMap.close" />
+          </NcButton>
         </div>
+        <NcButton class="mt-2" data-testid="nc-calendar-range-add-btn" size="small" type="secondary" @click="addCalendarRange">
+          <component :is="iconMap.plus" />
+          Add another date field
+        </NcButton>
       </div>
     </template>
   </NcDropdown>

From c91c9a6c60b10fa30d7c17edbbbf1edef8ebeaba Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:33 +0000
Subject: [PATCH 030/253] fix(nc-gui): some filters update

---
 .../components/smartsheet/calendar/MonthView.vue     |  6 ++++++
 .../components/smartsheet/calendar/RecordCard.vue    | 10 +++++-----
 packages/nocodb/src/db/conditionV2.ts                | 12 ++++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index f0bd84bb94..6296b7caf0 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -202,6 +202,7 @@ const recordsToDisplay = computed<{
         // If the range specifies fromCol and endCol
         const startDate = dayjs(record.row[startCol!.title!])
         const endDate = dayjs(record.row[endCol!.title!])
+
         let currentWeekStart = startDate.startOf('week')
 
         const id = record.rowMeta.id ?? generateRandomNumber()
@@ -219,6 +220,11 @@ const recordsToDisplay = computed<{
           const recordStart = currentWeekStart.isBefore(startDate) ? startDate : currentWeekStart
           const recordEnd = currentWeekEnd.isAfter(endDate) ? endDate : currentWeekEnd
 
+          if (recordEnd.isBefore(dates.value[0][0])) {
+            currentWeekStart = currentWeekStart.add(1, 'week')
+            continue
+          }
+
           // Update the recordsInDay object to keep track of the number of records in a day
           let day = recordStart.clone()
           while (day.isSameOrBefore(recordEnd)) {
diff --git a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
index 77d587708a..8ea7a2891a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
@@ -28,8 +28,8 @@ const emit = defineEmits(['resize-start'])
     :class="{
       'min-h-9': size === 'small',
       'h-full': size === 'auto',
-      'rounded-l-md': position === 'leftRounded',
-      'rounded-r-md': position === 'rightRounded',
+      'rounded-l-md ml-1': position === 'leftRounded',
+      'rounded-r-md mr-1': position === 'rightRounded',
       'rounded-md mx-1': position === 'rounded',
       'rounded-none': position === 'none',
       'bg-maroon-50': color === 'maroon',
@@ -60,7 +60,7 @@ const emit = defineEmits(['resize-start'])
     <div v-if="(position === 'leftRounded' || position === 'rounded') && resize" class="mt-0.7 h-7.1 absolute -left-4 resize">
       <NcButton
         :class="{
-          '!block z-1 !border-brand-500': selected || hover,
+          '!block z-2 !border-brand-500': selected || hover,
           '!hidden': !selected && !hover,
         }"
         size="xsmall"
@@ -84,10 +84,10 @@ const emit = defineEmits(['resize-start'])
       <span v-if="position === 'leftRounded' || position === 'none'" class="absolute my-0 right-5"> .... </span>
     </div>
 
-    <div v-if="(position === 'rightRounded' || position === 'rounded') && resize" class="absolute mt-0.3 z-1 -right-4 resize">
+    <div v-if="(position === 'rightRounded' || position === 'rounded') && resize" class="absolute mt-0.3 -right-4 resize">
       <NcButton
         :class="{
-          '!block !border-brand-500': selected || hover,
+          '!block !border-brand-500 z-2': selected || hover,
           '!hidden': !selected && !hover,
         }"
         size="xsmall"
diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index 9613310c07..da0383a889 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -902,7 +902,8 @@ const parseConditionV2 = async (
               // If the column is a datetime and the client is pg and the value has a timezone offset at the end
               // then we need to convert the value to timestamptz before comparing
               if (
-                column.uidt === UITypes.DateTime &&
+                (column.uidt === UITypes.DateTime ||
+                  column.uidt === UITypes.Date) &&
                 val.match(/[+-]\d{2}:\d{2}$/)
               ) {
                 if (qb.client.config.client === 'pg') {
@@ -944,7 +945,8 @@ const parseConditionV2 = async (
               // If the column is a datetime and the client is pg and the value has a timezone offset at the end
               // then we need to convert the value to timestamptz before comparing
               if (
-                column.uidt === UITypes.DateTime &&
+                (column.uidt === UITypes.DateTime ||
+                  column.uidt === UITypes.Date) &&
                 val.match(/[+-]\d{2}:\d{2}$/)
               ) {
                 if (qb.client.config.client === 'pg') {
@@ -985,7 +987,8 @@ const parseConditionV2 = async (
               // If the column is a datetime and the client is pg and the value has a timezone offset at the end
               // then we need to convert the value to timestamptz before comparing
               if (
-                column.uidt === UITypes.DateTime &&
+                (column.uidt === UITypes.DateTime ||
+                  column.uidt === UITypes.Date) &&
                 val.match(/[+-]\d{2}:\d{2}$/)
               ) {
                 if (qb.client.config.client === 'pg') {
@@ -1028,7 +1031,8 @@ const parseConditionV2 = async (
               // If the column is a datetime and the client is pg and the value has a timezone offset at the end
               // then we need to convert the value to timestamptz before comparing
               if (
-                column.uidt === UITypes.DateTime &&
+                (column.uidt === UITypes.DateTime ||
+                  column.uidt === UITypes.Date) &&
                 val.match(/[+-]\d{2}:\d{2}$/)
               ) {
                 if (qb.client.config.client === 'pg') {

From f362ed43458b45f3ff99d4e4cd75d6b19a7fc1d6 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:33 +0000
Subject: [PATCH 031/253] fix(nc-gui): overlap issue

---
 .../smartsheet/calendar/MonthView.vue         | 19 +++++++++----------
 .../composables/useCalendarViewStore.ts       |  9 ++++++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 6296b7caf0..17b23ce398 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -133,13 +133,12 @@ const recordsToDisplay = computed<{
 
     // Filter out records that don't satisfy the range and sort them by start date
     const sortedFormattedData = [...formattedData.value].filter((record) => {
-      const fromDate = record.row[startCol!.title!] ? dayjs(record.row[startCol!.title!]) : null
-
       if (startCol && endCol) {
-        const fromDate = record.row[startCol!.title!] ? dayjs(record.row[startCol!.title!]) : null
-        const toDate = record.row[endCol!.title!] ? dayjs(record.row[endCol!.title!]) : null
+        const fromDate = record.row[startCol.title!] ? dayjs(record.row[startCol.title!]) : null
+        const toDate = record.row[endCol.title!] ? dayjs(record.row[endCol.title!]) : null
         return fromDate && toDate && !toDate.isBefore(fromDate)
       } else if (startCol && !endCol) {
+        const fromDate = record.row[startCol!.title!] ? dayjs(record.row[startCol!.title!]) : null
         return !!fromDate
       }
       return false
@@ -148,7 +147,7 @@ const recordsToDisplay = computed<{
     sortedFormattedData.forEach((record: Row) => {
       if (!endCol && startCol) {
         // If there is no end date, we just display the record on the start date
-        const startDate = dayjs(record.row[startCol!.title!])
+        const startDate = dayjs(record.row[startCol.title!])
         const dateKey = startDate.format('YYYY-MM-DD')
 
         if (!recordsInDay[dateKey]) {
@@ -200,13 +199,13 @@ const recordsToDisplay = computed<{
         })
       } else if (startCol && endCol) {
         // If the range specifies fromCol and endCol
-        const startDate = dayjs(record.row[startCol!.title!])
-        const endDate = dayjs(record.row[endCol!.title!])
+        const startDate = dayjs(record.row[startCol.title!])
+        const endDate = dayjs(record.row[endCol.title!])
 
         let currentWeekStart = startDate.startOf('week')
 
         const id = record.rowMeta.id ?? generateRandomNumber()
-        // Since the records can span multiple weeks, to display, we render multiple records
+        // Since the records can span multiple weeks, to display, we render multiple elements
         // for each week the record spans. The id is used to identify the elements that belong to the same record
 
         while (
@@ -263,8 +262,7 @@ const recordsToDisplay = computed<{
                 overflowCount: 0,
               }
             }
-            const recordIndex = recordsInDay[dateKey].count
-            maxRecordCount = Math.max(maxRecordCount, recordIndex)
+            maxRecordCount = Math.max(maxRecordCount, recordsInDay[dateKey].count)
           }
 
           const startDayIndex = Math.max(
@@ -724,6 +722,7 @@ const addRecord = (date: dayjs.Dayjs) => {
               </template>
             </NcDropdown>
             <NcButton
+              v-else
               :class="{
                 '!block': isDateSelected(day),
                 '!hidden': !isDateSelected(day),
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index 893c910b57..fa6e172741 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -1,11 +1,12 @@
 import type { ComputedRef, Ref } from 'vue'
-import {
+import { UITypes } from 'nocodb-sdk'
+import type {
   type Api,
+  CalendarRangeType,
   type CalendarType,
   type ColumnType,
   type PaginatedType,
   type TableType,
-  UITypes,
   type ViewType,
 } from 'nocodb-sdk'
 import dayjs from 'dayjs'
@@ -112,6 +113,7 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
       Array<{
         fk_from_col: ColumnType | null
         fk_to_col: ColumnType | null
+        id: string
       }>
     >([])
 
@@ -418,8 +420,9 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
         const calMeta = typeof res.meta === 'string' ? JSON.parse(res.meta) : res.meta
         activeCalendarView.value = calMeta?.active_view
         if (!activeCalendarView.value) activeCalendarView.value = 'month'
-        calendarRange.value = res?.calendar_range?.map((range: any) => {
+        calendarRange.value = res?.calendar_range?.map((range: CalendarRangeType) => {
           return {
+            id: range.id,
             fk_from_col: meta.value?.columns?.find((col) => col.id === range.fk_from_column_id),
             fk_to_col: range.fk_to_column_id ? meta.value?.columns?.find((col) => col.id === range.fk_to_column_id) : null,
           }

From c8a7a06e3a2816edfe843098a27ac105cbc425bd Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:33 +0000
Subject: [PATCH 032/253] fix(nocodb): refactor resizing logic in datetime day
 view

---
 .../calendar/DayView/DateTimeField.vue        | 31 +++++++++----------
 .../calendar/WeekView/DateTimeField.vue       |  5 +--
 .../smartsheet/toolbar/CalendarRange.vue      |  4 +--
 .../composables/useCalendarViewStore.ts       |  3 +-
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 8290066e95..4cd575d123 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -112,9 +112,6 @@ const recordsAcrossAllRange = computed<{
         let startDate = dayjs(record.row[fromCol.title!])
         let endDate = dayjs(record.row[endCol.title!])
 
-        // If no start date is provided or startDate is after the endDate, we skip the record
-        if (!startDate.isValid() || startDate.isAfter(endDate)) continue
-
         // If there is no end date, we add 30 minutes to the start date and use that as the end date
         if (!endDate.isValid()) {
           endDate = startDate.clone().add(30, 'minutes')
@@ -122,13 +119,13 @@ const recordsAcrossAllRange = computed<{
 
         // If the start date is before the opened date, we use the schedule start as the start date
         // This is to ensure the generated style of the record is not outside the bounds of the calendar
-        if (startDate.isBefore(scheduleStart, 'minutes')) {
+        if (startDate.isBefore(scheduleStart)) {
           startDate = scheduleStart
         }
 
         // If the end date is after the schedule end, we use the schedule end as the end date
         // This is to ensure the generated style of the record is not outside the bounds of the calendar
-        if (endDate.isAfter(scheduleEnd, 'minutes')) {
+        if (endDate.isAfter(scheduleEnd)) {
           endDate = scheduleEnd
         }
 
@@ -208,7 +205,7 @@ const recordsAcrossAllRange = computed<{
 
         let endDate = dayjs(record.row[fromCol.title!]).add(1, 'hour')
 
-        if (endDate.isAfter(scheduleEnd, 'minutes')) {
+        if (endDate.isAfter(scheduleEnd)) {
           endDate = scheduleEnd
         }
 
@@ -328,6 +325,7 @@ const useDebouncedRowUpdate = useDebounceFn((row: Row, updateProperty: string[],
 // When the user is dragging a record, we calculate the new start and end date based on the mouse position
 const calculateNewRow = (event: MouseEvent) => {
   if (!container.value || !dragRecord.value) return { newRow: null, updateProperty: [] }
+
   const { top } = container.value.getBoundingClientRect()
 
   const { scrollHeight } = container.value
@@ -405,10 +403,9 @@ const calculateNewRow = (event: MouseEvent) => {
 }
 
 const onResize = (event: MouseEvent) => {
-  if (!isUIAllowed('dataEdit')) return
-  if (!container.value || !resizeRecord.value) return
-  const { top, bottom } = container.value.getBoundingClientRect()
+  if (!isUIAllowed('dataEdit') || !container.value || !resizeRecord.value) return
 
+  const { top, bottom } = container.value.getBoundingClientRect()
   const { scrollHeight } = container.value
 
   // If the mouse position is near the top or bottom of the scroll container, we scroll the container
@@ -422,26 +419,28 @@ const onResize = (event: MouseEvent) => {
 
   const fromCol = resizeRecord.value.rowMeta.range?.fk_from_col
   const toCol = resizeRecord.value.rowMeta.range?.fk_to_col
+
   if (!fromCol || !toCol) return
 
   const ogEndDate = dayjs(resizeRecord.value.row[toCol.title!])
   const ogStartDate = dayjs(resizeRecord.value.row[fromCol.title!])
 
-  const hour = Math.max(Math.floor(percentY * 23), 0)
+  const hour = Math.floor(percentY * 24) // Round down to the nearest hour
+  const minutes = Math.round((percentY * 24 * 60) % 60)
 
   let newRow: Row | null = null
   let updateProperty: string[] = []
 
   if (resizeDirection.value === 'right') {
     // If the user is resizing the record to the right, we calculate the new end date based on the mouse position
-    let newEndDate = dayjs(selectedDate.value).add(hour, 'hour')
+    let newEndDate = dayjs(selectedDate.value).add(hour, 'hour').add(minutes, 'minute')
 
     updateProperty = [toCol.title!]
 
     // If the new end date is before the start date, we set the new end date to the start date
     // This is to ensure the end date is always same or after the start date
-    if (dayjs(newEndDate).isBefore(ogStartDate, 'day')) {
-      newEndDate = ogStartDate.clone()
+    if (dayjs(newEndDate).isBefore(ogStartDate.add(1, 'hour'))) {
+      newEndDate = ogStartDate.clone().add(1, 'hour')
     }
 
     if (!newEndDate.isValid()) return
@@ -454,14 +453,14 @@ const onResize = (event: MouseEvent) => {
       },
     }
   } else if (resizeDirection.value === 'left') {
-    let newStartDate = dayjs(selectedDate.value).add(hour, 'hour')
+    let newStartDate = dayjs(selectedDate.value).add(hour, 'hour').add(minutes, 'minute')
 
     updateProperty = [fromCol.title!]
 
     // If the new start date is after the end date, we set the new start date to the end date
     // This is to ensure the start date is always before or same the end date
-    if (dayjs(newStartDate).isAfter(ogEndDate)) {
-      newStartDate = dayjs(dayjs(ogEndDate)).clone()
+    if (dayjs(newStartDate).isAfter(ogEndDate.subtract(1, 'hour'))) {
+      newStartDate = dayjs(dayjs(ogEndDate)).clone().add(-1, 'hour')
     }
     if (!newStartDate) return
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index 2b3b44828a..72ee023499 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -442,12 +442,13 @@ const onResize = (event: MouseEvent) => {
 
   const day = Math.floor(percentX * 7)
   const hour = Math.floor(percentY * 23)
+  const minutes = Math.round((percentY * 24 * 60) % 60)
 
   let updateProperty: string[] = []
   let newRow: Row = resizeRecord.value
 
   if (resizeDirection.value === 'right') {
-    let newEndDate = dayjs(selectedDateRange.value.start).add(day, 'day').add(hour, 'hour')
+    let newEndDate = dayjs(selectedDateRange.value.start).add(day, 'day').add(hour, 'hour').add(minutes, 'minute')
     updateProperty = [toCol.title!]
 
     // If the new end date is before the start date, we set the new end date to the start date
@@ -465,7 +466,7 @@ const onResize = (event: MouseEvent) => {
       },
     }
   } else if (resizeDirection.value === 'left') {
-    let newStartDate = dayjs(selectedDateRange.value.start).add(day, 'day').add(hour, 'hour')
+    let newStartDate = dayjs(selectedDateRange.value.start).add(day, 'day').add(hour, 'hour').add(minutes, 'minute')
     updateProperty = [fromCol.title!]
 
     // If the new start date is after the end date, we set the new start date to the end date
diff --git a/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue b/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
index 90a6ac5a0f..2d1f7ac2da 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
@@ -28,7 +28,7 @@ const IsPublic = inject(IsPublicInj, ref(false))
 
 const { loadViewColumns } = useViewColumnsOrThrow()
 
-const { loadCalendarMeta, loadCalendarData, loadSidebarData } = useCalendarViewStoreOrThrow()
+const { loadCalendarMeta, loadCalendarData, loadSidebarData, fetchActiveDates } = useCalendarViewStoreOrThrow()
 
 const calendarRangeDropdown = ref(false)
 
@@ -71,7 +71,7 @@ const saveCalendarRanges = async () => {
         calendar_range: calRanges as CalendarRangeType[],
       })
       await loadCalendarMeta()
-      await Promise.all([loadCalendarData(), loadSidebarData()])
+      await Promise.all([loadCalendarData(), loadSidebarData(), fetchActiveDates()])
     } catch (e) {
       console.log(e)
       message.error('There was an error while updating view!')
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index fa6e172741..2a0556b7e5 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -1,5 +1,4 @@
 import type { ComputedRef, Ref } from 'vue'
-import { UITypes } from 'nocodb-sdk'
 import type {
   type Api,
   CalendarRangeType,
@@ -9,6 +8,7 @@ import type {
   type TableType,
   type ViewType,
 } from 'nocodb-sdk'
+import { UITypes } from 'nocodb-sdk'
 import dayjs from 'dayjs'
 import { extractPkFromRow, extractSdkResponseErrorMsg, rowPkData } from '~/utils'
 import { IsPublicInj, type Row, ref, storeToRefs, useBase, useInjectionState, useUndoRedo } from '#imports'
@@ -787,6 +787,7 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
     })
 
     return {
+      fetchActiveDates,
       formattedSideBarData,
       loadMoreSidebarData,
       loadSidebarData,

From 4562adf4c95834610cb4302b20c44d87c8d1fa81 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:34 +0000
Subject: [PATCH 033/253] fix(nc-gui): date time overlap fix

---
 .../calendar/DayView/DateTimeField.vue        | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 4cd575d123..f24d50b4c9 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -90,19 +90,25 @@ const recordsAcrossAllRange = computed<{
 
     // We fetch all the records that match the calendar ranges in a single time.
     // But not all fetched records are valid for the certain range, so we filter them out & sort them
-    const sortedFormattedData = [...formattedData.value].filter((record) => {
-      const fromDate = record.row[fromCol!.title!] ? dayjs(record.row[fromCol!.title!]) : null
+    const sortedFormattedData = [...formattedData.value]
+      .filter((record) => {
+        const fromDate = record.row[fromCol!.title!] ? dayjs(record.row[fromCol!.title!]) : null
 
-      if (fromCol && endCol) {
-        const fromDate = record.row[fromCol.title!] ? dayjs(record.row[fromCol.title!]) : null
-        const toDate = record.row[endCol.title!] ? dayjs(record.row[endCol.title!]) : null
+        if (fromCol && endCol) {
+          const fromDate = record.row[fromCol.title!] ? dayjs(record.row[fromCol.title!]) : null
+          const toDate = record.row[endCol.title!] ? dayjs(record.row[endCol.title!]) : null
 
-        return fromDate && toDate?.isValid() ? fromDate.isBefore(toDate) : true
-      } else if (fromCol && !endCol) {
-        return !!fromDate
-      }
-      return false
-    })
+          return fromDate && toDate?.isValid() ? fromDate.isBefore(toDate) : true
+        } else if (fromCol && !endCol) {
+          return !!fromDate
+        }
+        return false
+      })
+      .sort((a, b) => {
+        const aDate = dayjs(a.row[fromCol!.title!])
+        const bDate = dayjs(b.row[fromCol!.title!])
+        return aDate.isBefore(bDate) ? -1 : 1
+      })
 
     // If there is a start and end column, we calculate the top and height of the record based on the start and end date
     if (fromCol && endCol) {
@@ -145,7 +151,7 @@ const recordsAcrossAllRange = computed<{
           top: `${topInPixels + 5 + startHour * 2}px`,
         }
 
-        // We loop through every 15 minutes between the start and end date and keep track of the number of records that overlap at a given time
+        // We loop through every 1 minutes between the start and end date and keep track of the number of records that overlap at a given time
         // If the number of records exceeds 4, we hide the record and show a button to view more records
         while (_startDate.isBefore(endDate)) {
           const timeKey = _startDate.format('HH:mm')
@@ -203,7 +209,7 @@ const recordsAcrossAllRange = computed<{
 
         const startDate = dayjs(record.row[fromCol.title!])
 
-        let endDate = dayjs(record.row[fromCol.title!]).add(1, 'hour')
+        let endDate = dayjs(record.row[fromCol.title!]).add(1, 'hour').add(1, 'minute')
 
         if (endDate.isAfter(scheduleEnd)) {
           endDate = scheduleEnd
@@ -215,7 +221,7 @@ const recordsAcrossAllRange = computed<{
         let _startDate = startDate.clone()
 
         // We loop through every minute between the start and end date and keep track of the number of records that overlap at a given time
-        while (_startDate.isBefore(endDate)) {
+        while (_startDate.isBefore(endDate, 'minute')) {
           const timeKey = _startDate.format('HH:mm')
 
           if (!overlaps[timeKey]) {

From 6c65a1a4521f8da59b4dd40da451c1b07f573c16 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:34 +0000
Subject: [PATCH 034/253] fix(nc-gui): date time major rewrite

---
 .../calendar/DayView/DateTimeField.vue        | 302 ++++++++++++++----
 .../composables/useCalendarViewStore.ts       |   4 +-
 packages/nc-gui/lib/types.ts                  |   4 +
 3 files changed, 250 insertions(+), 60 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index f24d50b4c9..e612089719 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -52,6 +52,143 @@ const hours = computed(() => {
   return hours
 })
 
+const calculateNewDates = ({
+  endDate,
+  startDate,
+  scheduleStart,
+  scheduleEnd,
+}: {
+  endDate: dayjs.Dayjs
+  startDate: dayjs.Dayjs
+  scheduleStart: dayjs.Dayjs
+  scheduleEnd: dayjs.Dayjs
+}) => {
+  // If there is no end date, we add 15 minutes to the start date and use that as the end date
+  if (!endDate.isValid()) {
+    endDate = startDate.clone().add(15, 'minutes')
+  }
+
+  // If the start date is before the opened date, we use the schedule start as the start date
+  // This is to ensure the generated style of the record is not outside the bounds of the calendar
+  if (startDate.isBefore(scheduleStart)) {
+    startDate = scheduleStart
+  }
+
+  // If the end date is after the schedule end, we use the schedule end as the end date
+  // This is to ensure the generated style of the record is not outside the bounds of the calendar
+  if (endDate.isAfter(scheduleEnd)) {
+    endDate = scheduleEnd
+  }
+
+  return { endDate, startDate }
+}
+
+const getGridTime = (date: dayjs.Dayjs, round = false) => {
+  const gridCalc = date.hour() * 60 + date.minute()
+  if (round) {
+    return Math.ceil(gridCalc)
+  } else {
+    return Math.floor(gridCalc)
+  }
+}
+
+const getGridTimeSlots = (from: dayjs.Dayjs, to: dayjs.Dayjs) => {
+  return {
+    from: getGridTime(from, false),
+    to: getGridTime(to, true) - 1,
+  }
+}
+
+const hasSlotForRecord = (
+  record: Row,
+  columnArray: Row[],
+  dates: {
+    fromDate: dayjs.Dayjs
+    toDate: dayjs.Dayjs
+  },
+) => {
+  const { fromDate, toDate } = dates
+
+  if (!fromDate || !toDate) return false
+
+  for (const column of columnArray) {
+    const columnFromCol = column.rowMeta.range.fk_from_col
+    const columnToCol = column.rowMeta.range.fk_to_col
+
+    const { startDate: columnFromDate, endDate: columnToDate } = calculateNewDates({
+      startDate: dayjs(column.row[columnFromCol.title!]),
+      endDate: columnToCol ? dayjs(column.row[columnToCol.title!]) : dayjs(column.row[columnFromCol.title!]).add(1, 'hour'),
+      scheduleStart: dayjs(selectedDate.value).startOf('day'),
+      scheduleEnd: dayjs(selectedDate.value).endOf('day'),
+    })
+
+    if (
+      fromDate.isBetween(columnFromDate, columnToDate, null, '[]') ||
+      toDate.isBetween(columnFromDate, columnToDate, null, '[]')
+    ) {
+      return false
+    }
+  }
+  return true
+}
+
+const getMaxOfGrid = (
+  {
+    fromDate,
+    toDate,
+  }: {
+    fromDate: dayjs.Dayjs
+    toDate: dayjs.Dayjs
+  },
+  gridTimeMap: Map<number, number>,
+) => {
+  let max = 0
+  const gridTimes = getGridTimeSlots(fromDate, toDate)
+
+  for (let gridCounter = gridTimes.from; gridCounter <= gridTimes.to; gridCounter++) {
+    if (gridTimeMap.has(gridCounter) && gridTimeMap.get(gridCounter) > max) {
+      max = gridTimeMap.get(gridCounter)
+    }
+  }
+  return max
+}
+const isOverlaps = (row1: Row, row2: Row) => {
+  const fromCol1 = row1.rowMeta.range?.fk_from_col
+  const toCol1 = row1.rowMeta.range?.fk_to_col
+  const fromCol2 = row2.rowMeta.range?.fk_from_col
+  const toCol2 = row2.rowMeta.range?.fk_to_col
+
+  if (!fromCol1 || !fromCol2) return false
+
+  const { startDate: startDate1, endDate: endDate1 } = calculateNewDates({
+    endDate: toCol1 ? dayjs(row1.row[toCol1.title!]) : dayjs(row1.row[fromCol1.title!]).add(1, 'hour'),
+    startDate: dayjs(row1.row[fromCol1.title!]),
+    scheduleStart: dayjs(selectedDate.value).startOf('day'),
+    scheduleEnd: dayjs(selectedDate.value).endOf('day'),
+  })
+
+  const { startDate: startDate2, endDate: endDate2 } = calculateNewDates({
+    endDate: toCol2 ? dayjs(row2.row[toCol2.title!]) : dayjs(row2.row[fromCol2.title!]).add(1, 'hour'),
+    startDate: dayjs(row2.row[fromCol2.title!]),
+    scheduleStart: dayjs(selectedDate.value).startOf('day'),
+    scheduleEnd: dayjs(selectedDate.value).endOf('day'),
+  })
+
+  return startDate1.isBetween(startDate2, endDate2, null, '[]') || endDate1.isBetween(startDate2, endDate2, null, '[]')
+}
+
+const getMaxOverlaps = ({ row, rowArray }: { row: Row; rowArray: Row[] }) => {
+  let maxOverlaps = row.rowMeta.numberOfOverlaps
+  for (const record of rowArray) {
+    if (isOverlaps(row, record)) {
+      if (record.rowMeta.numberOfOverlaps > row.rowMeta.numberOfOverlaps) {
+        maxOverlaps = record.rowMeta.numberOfOverlaps
+      }
+    }
+  }
+  return maxOverlaps
+}
+
 const recordsAcrossAllRange = computed<{
   record: Row[]
   count: {
@@ -82,7 +219,10 @@ const recordsAcrossAllRange = computed<{
 
   const perRecordHeight = 80
 
-  let recordsByRange: Array<Row> = []
+  const columnArray: Array<Array<Row>> = [[]]
+  const gridTimeMap = new Map()
+
+  const recordsByRange: Array<Row> = []
 
   calendarRange.value.forEach((range) => {
     const fromCol = range.fk_from_col
@@ -107,34 +247,19 @@ const recordsAcrossAllRange = computed<{
       .sort((a, b) => {
         const aDate = dayjs(a.row[fromCol!.title!])
         const bDate = dayjs(b.row[fromCol!.title!])
-        return aDate.isBefore(bDate) ? -1 : 1
+        return aDate.isBefore(bDate) ? 1 : -1
       })
 
-    // If there is a start and end column, we calculate the top and height of the record based on the start and end date
-    if (fromCol && endCol) {
-      for (const record of sortedFormattedData) {
-        // We use this id during the drag and drop operation and to keep track of the number of records that overlap at a given time
-        const id = record.rowMeta?.id ?? generateRandomNumber()
-        let startDate = dayjs(record.row[fromCol.title!])
-        let endDate = dayjs(record.row[endCol.title!])
-
-        // If there is no end date, we add 30 minutes to the start date and use that as the end date
-        if (!endDate.isValid()) {
-          endDate = startDate.clone().add(30, 'minutes')
-        }
-
-        // If the start date is before the opened date, we use the schedule start as the start date
-        // This is to ensure the generated style of the record is not outside the bounds of the calendar
-        if (startDate.isBefore(scheduleStart)) {
-          startDate = scheduleStart
-        }
-
-        // If the end date is after the schedule end, we use the schedule end as the end date
-        // This is to ensure the generated style of the record is not outside the bounds of the calendar
-        if (endDate.isAfter(scheduleEnd)) {
-          endDate = scheduleEnd
-        }
+    for (const record of sortedFormattedData) {
+      const id = generateRandomNumber()
 
+      if (fromCol && endCol) {
+        const { endDate, startDate } = calculateNewDates({
+          endDate: dayjs(record.row[endCol.title!]),
+          startDate: dayjs(record.row[fromCol.title!]),
+          scheduleStart,
+          scheduleEnd,
+        })
         // The top of the record is calculated based on the start hour and minute
         const topInPixels = (startDate.hour() + startDate.minute() / 60) * 80
 
@@ -143,7 +268,6 @@ const recordsAcrossAllRange = computed<{
         const heightInPixels = Math.max((endDate.diff(startDate, 'minute') / 60) * 80, perRecordHeight)
 
         const startHour = startDate.hour()
-
         let _startDate = startDate.clone()
 
         const style: Partial<CSSStyleDeclaration> = {
@@ -202,18 +326,13 @@ const recordsAcrossAllRange = computed<{
             range: range as any,
           },
         })
-      }
-    } else if (fromCol) {
-      for (const record of sortedFormattedData) {
-        const id = record.rowMeta?.id ?? generateRandomNumber()
-
-        const startDate = dayjs(record.row[fromCol.title!])
-
-        let endDate = dayjs(record.row[fromCol.title!]).add(1, 'hour').add(1, 'minute')
-
-        if (endDate.isAfter(scheduleEnd)) {
-          endDate = scheduleEnd
-        }
+      } else if (fromCol) {
+        const { startDate, endDate } = calculateNewDates({
+          startDate: dayjs(record.row[fromCol.title!]),
+          endDate: dayjs(record.row[fromCol.title!]).add(1, 'hour'),
+          scheduleStart,
+          scheduleEnd,
+        })
 
         const startHour = startDate.hour()
 
@@ -242,6 +361,7 @@ const recordsAcrossAllRange = computed<{
               display: 'none',
             }
           }
+
           _startDate = _startDate.add(1, 'minute')
         }
 
@@ -277,32 +397,98 @@ const recordsAcrossAllRange = computed<{
     }
   })
 
-  // We can't calculate the width & left of the records without knowing the number of records that overlap at a given time
-  // So we loop through the records again and calculate the width & left of the records based on the number of records that overlap at a given time
-  recordsByRange = recordsByRange.map((record) => {
-    // MaxOverlaps is the number of records that overlap at a given time
-    // overlapIndex is the index of the record in the list of records that overlap at a given time
-    let maxOverlaps = 1
-    let overlapIndex = 0
-    for (const minutes in overlaps) {
-      if (overlaps[minutes].id.includes(record.rowMeta.id!)) {
-        maxOverlaps = Math.max(maxOverlaps, overlaps[minutes].id.length - overlaps[minutes].overflowCount)
-        overlapIndex = Math.max(overlaps[minutes].id.indexOf(record.rowMeta.id!), overlapIndex)
+  recordsByRange.sort((a, b) => {
+    const fromColA = a.rowMeta.range?.fk_from_col
+    const fromColB = b.rowMeta.range?.fk_from_col
+    if (!fromColA || !fromColB) return 0
+    return dayjs(a.row[fromColA.title!]).isBefore(dayjs(b.row[fromColB.title!])) ? -1 : 1
+  })
+
+  for (const record of recordsByRange) {
+    const fromCol = record.rowMeta.range?.fk_from_col
+    const toCol = record.rowMeta.range?.fk_to_col
+
+    if (!fromCol) continue
+
+    const { startDate, endDate } = calculateNewDates({
+      startDate: dayjs(record.row[fromCol.title!]),
+      endDate: toCol ? dayjs(record.row[toCol.title!]) : dayjs(record.row[fromCol.title!]).add(1, 'hour'),
+      scheduleStart,
+      scheduleEnd,
+    })
+
+    const gridTimes = getGridTimeSlots(startDate, endDate)
+
+    for (let gridCounter = gridTimes.from; gridCounter <= gridTimes.to; gridCounter++) {
+      if (gridTimeMap.has(gridCounter)) {
+        gridTimeMap.set(gridCounter, gridTimeMap.get(gridCounter) + 1)
+      } else {
+        gridTimeMap.set(gridCounter, 1)
+      }
+    }
+
+    let foundAColumn = false
+
+    for (const column in columnArray) {
+      if (
+        hasSlotForRecord(record, columnArray[column], {
+          fromDate: startDate,
+          toDate: endDate,
+        })
+      ) {
+        columnArray[column].push(record)
+        foundAColumn = true
+        break
       }
     }
 
-    const spacing = 0.25
-    const widthPerRecord = (100 - spacing * (maxOverlaps - 1)) / maxOverlaps
+    if (!foundAColumn) {
+      columnArray.push([record])
+    }
+  }
 
-    const leftPerRecord = (widthPerRecord + spacing) * overlapIndex
+  for (const columnIndex in columnArray) {
+    for (const record of columnArray[columnIndex]) {
+      const recordRange = record.rowMeta.range
+      const fromCol = recordRange.fk_from_col
+      const toCol = recordRange.fk_to_col
+
+      const { startDate, endDate } = calculateNewDates({
+        startDate: dayjs(record.row[fromCol.title!]),
+        endDate: toCol ? dayjs(record.row[toCol.title!]) : dayjs(record.row[fromCol.title!]).add(1, 'hour'),
+        scheduleStart: dayjs(selectedDate.value).startOf('day'),
+        scheduleEnd: dayjs(selectedDate.value).endOf('day'),
+      })
+
+      record.rowMeta.numberOfOverlaps =
+        getMaxOfGrid(
+          {
+            fromDate: startDate,
+            toDate: endDate,
+          },
+          gridTimeMap,
+        ) - 1
+      record.rowMeta.overLapIteration = parseInt(columnIndex) + 1
+    }
+  }
+
+  for (const record of recordsByRange) {
+    record.rowMeta.numberOfOverlaps = getMaxOverlaps({
+      row: record,
+      rowArray: recordsByRange,
+    })
+
+    const width = 100 / columnArray.length
+    const left = width * (record.rowMeta.overLapIteration - 1)
 
     record.rowMeta.style = {
       ...record.rowMeta.style,
-      left: `${leftPerRecord - 0.08}%`,
-      width: `calc(${widthPerRecord}%)`,
+      width: `${width.toFixed(2)}%`,
+      left: `${left}%`,
     }
-    return record
-  })
+  }
+
+  console.log(columnArray)
 
   return {
     count: overlaps,
@@ -783,7 +969,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
                   v-if="!isRowEmpty(record, displayField!)"
                   v-model="record.row[displayField!.title!]"
                   :bold="getFieldStyle(displayField!).bold"
-                  :column="displayField"
+                  :column="displayField!"
                   :italic="getFieldStyle(displayField!).italic"
                   :underline="getFieldStyle(displayField!).underline"
                 />
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index 2a0556b7e5..630f49341d 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -111,8 +111,8 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
 
     const calendarRange = ref<
       Array<{
-        fk_from_col: ColumnType | null
-        fk_to_col: ColumnType | null
+        fk_from_col: ColumnType
+        fk_to_col?: ColumnType | null
         id: string
       }>
     >([])
diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts
index 3300c6cc32..7109e5e316 100644
--- a/packages/nc-gui/lib/types.ts
+++ b/packages/nc-gui/lib/types.ts
@@ -75,6 +75,10 @@ interface Row {
     id?: string
     position?: string
     dayIndex?: number
+
+    overLapIteration?: number
+    numberOfOverlaps?: number
+    minutes?: number
   }
 }
 

From 9f3f66abd05dc86d8d9b12bf5128ca4467472f28 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:34 +0000
Subject: [PATCH 035/253] fix(nc-gui): some records missing

---
 .../calendar/DayView/DateTimeField.vue          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index e612089719..e3e2ad8cc3 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -70,7 +70,7 @@ const calculateNewDates = ({
 
   // If the start date is before the opened date, we use the schedule start as the start date
   // This is to ensure the generated style of the record is not outside the bounds of the calendar
-  if (startDate.isBefore(scheduleStart)) {
+  if (startDate.isSameOrBefore(scheduleStart)) {
     startDate = scheduleStart
   }
 
@@ -112,8 +112,10 @@ const hasSlotForRecord = (
   if (!fromDate || !toDate) return false
 
   for (const column of columnArray) {
-    const columnFromCol = column.rowMeta.range.fk_from_col
-    const columnToCol = column.rowMeta.range.fk_to_col
+    const columnFromCol = column.rowMeta.range?.fk_from_col
+    const columnToCol = column.rowMeta.range?.fk_to_col
+
+    if (!columnFromCol) return false
 
     const { startDate: columnFromDate, endDate: columnToDate } = calculateNewDates({
       startDate: dayjs(column.row[columnFromCol.title!]),
@@ -181,6 +183,7 @@ const getMaxOverlaps = ({ row, rowArray }: { row: Row; rowArray: Row[] }) => {
   let maxOverlaps = row.rowMeta.numberOfOverlaps
   for (const record of rowArray) {
     if (isOverlaps(row, record)) {
+      if (!record.rowMeta.numberOfOverlaps || !row.rowMeta.numberOfOverlaps) continue
       if (record.rowMeta.numberOfOverlaps > row.rowMeta.numberOfOverlaps) {
         maxOverlaps = record.rowMeta.numberOfOverlaps
       }
@@ -238,7 +241,7 @@ const recordsAcrossAllRange = computed<{
           const fromDate = record.row[fromCol.title!] ? dayjs(record.row[fromCol.title!]) : null
           const toDate = record.row[endCol.title!] ? dayjs(record.row[endCol.title!]) : null
 
-          return fromDate && toDate?.isValid() ? fromDate.isBefore(toDate) : true
+          return fromDate && toDate?.isValid() ? fromDate.isSameOrBefore(toDate) : true
         } else if (fromCol && !endCol) {
           return !!fromDate
         }
@@ -450,8 +453,10 @@ const recordsAcrossAllRange = computed<{
   for (const columnIndex in columnArray) {
     for (const record of columnArray[columnIndex]) {
       const recordRange = record.rowMeta.range
-      const fromCol = recordRange.fk_from_col
-      const toCol = recordRange.fk_to_col
+      const fromCol = recordRange?.fk_from_col
+      const toCol = recordRange?.fk_to_col
+
+      if (!fromCol) continue
 
       const { startDate, endDate } = calculateNewDates({
         startDate: dayjs(record.row[fromCol.title!]),

From 891e3578778e672382c8a36bb29ed82983d05743 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:34 +0000
Subject: [PATCH 036/253] fix(nc-gui): disable ranges

---
 packages/nc-gui/components/dlg/ViewCreate.vue | 11 ++--
 .../calendar/DayView/DateTimeField.vue        | 66 ++++++++++++-------
 .../smartsheet/toolbar/CalendarRange.vue      | 14 ++--
 3 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/packages/nc-gui/components/dlg/ViewCreate.vue b/packages/nc-gui/components/dlg/ViewCreate.vue
index 6b5a546601..a38a576fd8 100644
--- a/packages/nc-gui/components/dlg/ViewCreate.vue
+++ b/packages/nc-gui/components/dlg/ViewCreate.vue
@@ -217,12 +217,14 @@ async function onSubmit() {
   }
 }
 
+/*
 const addCalendarRange = async () => {
   form.calendar_range.push({
     fk_from_column_id: viewSelectFieldOptions.value[0].value as string,
     fk_to_column_id: null,
   })
 }
+*/
 
 const isMetaLoading = ref(false)
 
@@ -450,7 +452,7 @@ onMounted(async () => {
                 </div>
               </a-select-option>
             </NcSelect>
-            <div
+            <!--            <div
               v-if="range.fk_to_column_id === null && isEeUI"
               class="cursor-pointer flex items-center text-gray-800 gap-1"
               @click="range.fk_to_column_id = undefined"
@@ -508,12 +510,13 @@ onMounted(async () => {
                 <component :is="iconMap.close" />
               </NcButton>
             </template>
-          </div>
+          </div> -->
 
-          <NcButton class="mt-2" size="small" type="secondary" @click="addCalendarRange">
+            <!--          <NcButton class="mt-2" size="small" type="secondary" @click="addCalendarRange">
             <component :is="iconMap.plus" />
             Add another date field
-          </NcButton>
+          </NcButton> -->
+          </div>
         </template>
       </a-form>
       <div v-else-if="!isNecessaryColumnsPresent" class="flex flex-row p-4 border-gray-200 border-1 gap-x-4 rounded-lg w-full">
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index e3e2ad8cc3..88bbf38e81 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -83,7 +83,7 @@ const calculateNewDates = ({
   return { endDate, startDate }
 }
 
-const getGridTime = (date: dayjs.Dayjs, round = false) => {
+/* const getGridTime = (date: dayjs.Dayjs, round = false) => {
   const gridCalc = date.hour() * 60 + date.minute()
   if (round) {
     return Math.ceil(gridCalc)
@@ -97,9 +97,9 @@ const getGridTimeSlots = (from: dayjs.Dayjs, to: dayjs.Dayjs) => {
     from: getGridTime(from, false),
     to: getGridTime(to, true) - 1,
   }
-}
+} */
 
-const hasSlotForRecord = (
+/* const hasSlotForRecord = (
   record: Row,
   columnArray: Row[],
   dates: {
@@ -132,9 +132,9 @@ const hasSlotForRecord = (
     }
   }
   return true
-}
+} */
 
-const getMaxOfGrid = (
+/* const getMaxOfGrid = (
   {
     fromDate,
     toDate,
@@ -153,8 +153,8 @@ const getMaxOfGrid = (
     }
   }
   return max
-}
-const isOverlaps = (row1: Row, row2: Row) => {
+} */
+/* const isOverlaps = (row1: Row, row2: Row) => {
   const fromCol1 = row1.rowMeta.range?.fk_from_col
   const toCol1 = row1.rowMeta.range?.fk_to_col
   const fromCol2 = row2.rowMeta.range?.fk_from_col
@@ -177,9 +177,9 @@ const isOverlaps = (row1: Row, row2: Row) => {
   })
 
   return startDate1.isBetween(startDate2, endDate2, null, '[]') || endDate1.isBetween(startDate2, endDate2, null, '[]')
-}
+} */
 
-const getMaxOverlaps = ({ row, rowArray }: { row: Row; rowArray: Row[] }) => {
+/* const getMaxOverlaps = ({ row, rowArray }: { row: Row; rowArray: Row[] }) => {
   let maxOverlaps = row.rowMeta.numberOfOverlaps
   for (const record of rowArray) {
     if (isOverlaps(row, record)) {
@@ -190,7 +190,7 @@ const getMaxOverlaps = ({ row, rowArray }: { row: Row; rowArray: Row[] }) => {
     }
   }
   return maxOverlaps
-}
+} */
 
 const recordsAcrossAllRange = computed<{
   record: Row[]
@@ -222,10 +222,10 @@ const recordsAcrossAllRange = computed<{
 
   const perRecordHeight = 80
 
-  const columnArray: Array<Array<Row>> = [[]]
-  const gridTimeMap = new Map()
+  /*  const columnArray: Array<Array<Row>> = [[]]
+  const gridTimeMap = new Map() */
 
-  const recordsByRange: Array<Row> = []
+  let recordsByRange: Array<Row> = []
 
   calendarRange.value.forEach((range) => {
     const fromCol = range.fk_from_col
@@ -254,7 +254,7 @@ const recordsAcrossAllRange = computed<{
       })
 
     for (const record of sortedFormattedData) {
-      const id = generateRandomNumber()
+      const id = record.rowMeta.id ?? generateRandomNumber()
 
       if (fromCol && endCol) {
         const { endDate, startDate } = calculateNewDates({
@@ -399,15 +399,41 @@ const recordsAcrossAllRange = computed<{
       }
     }
   })
-
+  /*
   recordsByRange.sort((a, b) => {
     const fromColA = a.rowMeta.range?.fk_from_col
     const fromColB = b.rowMeta.range?.fk_from_col
     if (!fromColA || !fromColB) return 0
     return dayjs(a.row[fromColA.title!]).isBefore(dayjs(b.row[fromColB.title!])) ? -1 : 1
+  }) */
+
+  // We can't calculate the width & left of the records without knowing the number of records that overlap at a given time
+  // So we loop through the records again and calculate the width & left of the records based on the number of records that overlap at a given time
+  recordsByRange = recordsByRange.map((record) => {
+    // MaxOverlaps is the number of records that overlap at a given time
+    // overlapIndex is the index of the record in the list of records that overlap at a given time
+    let maxOverlaps = 1
+    let overlapIndex = 0
+    for (const minutes in overlaps) {
+      if (overlaps[minutes].id.includes(record.rowMeta.id!)) {
+        maxOverlaps = Math.max(maxOverlaps, overlaps[minutes].id.length - overlaps[minutes].overflowCount)
+        overlapIndex = Math.max(overlaps[minutes].id.indexOf(record.rowMeta.id!), overlapIndex)
+      }
+    }
+    const spacing = 0.25
+    const widthPerRecord = (100 - spacing * (maxOverlaps - 1)) / maxOverlaps
+    const leftPerRecord = (widthPerRecord + spacing) * overlapIndex
+    record.rowMeta.style = {
+      ...record.rowMeta.style,
+      left: `${leftPerRecord - 0.08}%`,
+      width: `calc(${widthPerRecord}%)`,
+    }
+    return record
   })
 
-  for (const record of recordsByRange) {
+  // TODO: Rewrite the calculations for the style of the records
+
+  /* for (const record of recordsByRange) {
     const fromCol = record.rowMeta.range?.fk_from_col
     const toCol = record.rowMeta.range?.fk_to_col
 
@@ -449,8 +475,7 @@ const recordsAcrossAllRange = computed<{
       columnArray.push([record])
     }
   }
-
-  for (const columnIndex in columnArray) {
+ for (const columnIndex in columnArray) {
     for (const record of columnArray[columnIndex]) {
       const recordRange = record.rowMeta.range
       const fromCol = recordRange?.fk_from_col
@@ -476,7 +501,6 @@ const recordsAcrossAllRange = computed<{
       record.rowMeta.overLapIteration = parseInt(columnIndex) + 1
     }
   }
-
   for (const record of recordsByRange) {
     record.rowMeta.numberOfOverlaps = getMaxOverlaps({
       row: record,
@@ -491,9 +515,7 @@ const recordsAcrossAllRange = computed<{
       width: `${width.toFixed(2)}%`,
       left: `${left}%`,
     }
-  }
-
-  console.log(columnArray)
+  } */
 
   return {
     count: overlaps,
diff --git a/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue b/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
index 2d1f7ac2da..47e4ad562b 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
@@ -93,7 +93,7 @@ const dateFieldOptions = computed<SelectProps['options']>(() => {
   )
 })
 
-const addCalendarRange = async () => {
+/* const addCalendarRange = async () => {
   _calendar_ranges.value.push({
     fk_from_column_id: dateFieldOptions.value![0].value as string,
     fk_to_column_id: null,
@@ -109,7 +109,7 @@ const removeRange = async (id: number) => {
 const saveCalendarRange = async (range: CalendarRangeType, value?) => {
   range.fk_to_column_id = value
   await saveCalendarRanges()
-}
+} */
 </script>
 
 <template>
@@ -130,7 +130,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
       </a-button>
     </div>
     <template #overlay>
-      <div v-if="calendarRangeDropdown" class="w-full p-6 w-[36rem]" data-testid="nc-calendar-range-menu" @click.stop>
+      <div v-if="calendarRangeDropdown" class="w-full p-6 w-[25rem]" data-testid="nc-calendar-range-menu" @click.stop>
         <div
           v-for="(range, id) in _calendar_ranges"
           :key="id"
@@ -165,7 +165,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
             </a-select-option>
           </NcSelect>
 
-          <div
+          <!--          <div
             v-if="range.fk_to_column_id === null && isEeUI"
             class="flex cursor-pointer flex text-gray-800 items-center gap-1"
             data-testid="nc-calendar-range-add-end-date"
@@ -209,14 +209,16 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
               </NcButton>
             </div>
           </template>
+
           <NcButton v-if="id !== 0" size="small" type="secondary" @click="removeRange(id)">
             <component :is="iconMap.close" />
           </NcButton>
+            -->
         </div>
-        <NcButton class="mt-2" data-testid="nc-calendar-range-add-btn" size="small" type="secondary" @click="addCalendarRange">
+        <!--        <NcButton class="mt-2" data-testid="nc-calendar-range-add-btn" size="small" type="secondary" @click="addCalendarRange">
           <component :is="iconMap.plus" />
           Add another date field
-        </NcButton>
+        </NcButton> -->
       </div>
     </template>
   </NcDropdown>

From d9ca498e3373af962cf15ce3ac403859d7d8f014 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:34 +0000
Subject: [PATCH 037/253] fix(nc-gui): remove change related to error boundary

---
 packages/nc-gui/components/nc/ErrorBoundary.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/nc/ErrorBoundary.vue b/packages/nc-gui/components/nc/ErrorBoundary.vue
index 98474d193e..83da1797ed 100644
--- a/packages/nc-gui/components/nc/ErrorBoundary.vue
+++ b/packages/nc-gui/components/nc/ErrorBoundary.vue
@@ -29,7 +29,7 @@ export default {
 
     const copyError = async () => {
       try {
-        if (error.value) await copy(`message: ${error.value?.message}\n\n${error.value?.stack}`)
+        if (error.value) await copy(`message: ${error.value.message}\n\n${error.value.stack}`)
         message.info('Error message copied to clipboard.')
       } catch (e) {
         message.error('Something went wrong while copying to clipboard, please copy from browser console.')
@@ -95,9 +95,9 @@ export default {
         >
           <div class="nc-left-vertical-bar"></div>
           <div class="nc-error-content">
-            <span class="font-weight-bold">Message: {{ error?.message }}</span>
+            <span class="font-weight-bold">Message: {{ error.message }}</span>
             <br />
-            <div class="text-gray-500 mt-2">{{ error?.stack }}</div>
+            <div class="text-gray-500 mt-2">{{ error.stack }}</div>
           </div>
         </div>
         <div class="flex justify-end gap-2">
@@ -107,7 +107,7 @@ export default {
               Copy Error
             </div>
           </NcButton>
-          <NcButton v-if="!prevError || error?.message !== prevError?.message" size="small" @click="reload">
+          <NcButton v-if="!prevError || error.message !== prevError.message" size="small" @click="reload">
             <div class="flex items-center gap-1">
               <GeneralIcon icon="reload" />
               Reload

From 9d0d42cea5c1a440cfd9b8c596faa7c8464642ef Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:34 +0000
Subject: [PATCH 038/253] feat(nc-gui): some more issue fix

---
 .../nc-gui/components/nc/DateWeekSelector.vue |  2 +-
 .../components/nc/MonthYearSelector.vue       |  2 +-
 .../components/smartsheet/calendar/Cell.vue   |  1 +
 .../smartsheet/calendar/DayView/DateField.vue |  1 +
 .../calendar/DayView/DateTimeField.vue        |  1 +
 .../smartsheet/calendar/MonthView.vue         |  1 +
 .../smartsheet/calendar/RecordCard.vue        |  2 +-
 .../smartsheet/calendar/SideMenu.vue          | 21 +++----------------
 .../smartsheet/calendar/SideRecordCard.vue    |  4 ++--
 .../smartsheet/calendar/VRecordCard.vue       |  4 +---
 .../calendar/WeekView/DateField.vue           |  1 +
 .../calendar/WeekView/DateTimeField.vue       |  1 +
 .../components/smartsheet/calendar/index.vue  |  2 ++
 13 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
index 6bfa8de2b6..5109561690 100644
--- a/packages/nc-gui/components/nc/DateWeekSelector.vue
+++ b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -165,7 +165,7 @@ const paginate = (action: 'next' | 'prev') => {
           'text-xs': size === 'small',
           'text-sm': size === 'medium',
         }"
-        class="font-bold text-gray-700"
+        class="text-gray-700"
         >{{ currentMonthYear }}</span
       >
       <NcTooltip>
diff --git a/packages/nc-gui/components/nc/MonthYearSelector.vue b/packages/nc-gui/components/nc/MonthYearSelector.vue
index 543ed5082f..567541c78a 100644
--- a/packages/nc-gui/components/nc/MonthYearSelector.vue
+++ b/packages/nc-gui/components/nc/MonthYearSelector.vue
@@ -95,7 +95,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
           <span>{{ $t('labels.previous') }}</span>
         </template>
       </NcTooltip>
-      <span class="font-bold text-gray-700">{{ isYearPicker ? $t('labels.selectYear') : pageDate.year() }}</span>
+      <span class="text-gray-700">{{ isYearPicker ? $t('labels.selectYear') : pageDate.year() }}</span>
       <NcTooltip>
         <NcButton size="small" type="secondary" @click="paginate('next')">
           <component :is="iconMap.doubleRightArrow" class="h-4 w-4" />
diff --git a/packages/nc-gui/components/smartsheet/calendar/Cell.vue b/packages/nc-gui/components/smartsheet/calendar/Cell.vue
index 8a9c6a1db3..003828b2bb 100644
--- a/packages/nc-gui/components/smartsheet/calendar/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/Cell.vue
@@ -356,6 +356,7 @@ const parseValue = (value: any, col: ColumnType): string => {
 
 <template>
   <span
+    class="before:content-['•'] !first:before:content-[''] !first:before:px-0 before:px-1"
     :class="{
       'font-bold': bold,
       'italic': italic,
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 82fe9a7977..ce1af9619b 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -235,6 +235,7 @@ const newRecord = () => {
           </template>
           <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
             <LazySmartsheetCalendarCell
+              v-if="!isRowEmpty(record, field!)"
               v-model="record.row[field!.title!]"
               :bold="getFieldStyle(field).bold"
               :column="field"
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 88bbf38e81..7813421720 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -1003,6 +1003,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
               </template>
               <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
                 <LazySmartsheetCalendarCell
+                  v-if="!isRowEmpty(record, field!)"
                   v-model="record.row[field!.title!]"
                   :bold="getFieldStyle(field).bold"
                   :column="field"
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 17b23ce398..170bcf1efd 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -806,6 +806,7 @@ const addRecord = (date: dayjs.Dayjs) => {
             </template>
             <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
               <LazySmartsheetCalendarCell
+                v-if="!isRowEmpty(record, field!)"
                 v-model="record.row[field!.title!]"
                 :bold="getFieldStyle(field).bold"
                 :column="field"
diff --git a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
index 8ea7a2891a..317ea33e85 100644
--- a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
@@ -77,7 +77,7 @@ const emit = defineEmits(['resize-start'])
         :class="{
           'pr-7': position === 'leftRounded',
         }"
-        class="text-sm pr-3 mr-3 break-word space-x-2 whitespace-nowrap gap-2 overflow-hidden text-ellipsis w-full truncate text-gray-800"
+        class="text-sm pr-3 mr-3 break-word whitespace-nowrap overflow-hidden text-ellipsis w-full truncate text-gray-800"
       >
         <slot />
       </span>
diff --git a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
index b5e5264e15..f636a27097 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { VNodeRef } from '@vue/runtime-core'
-import { UITypes, isVirtualCol } from 'nocodb-sdk'
+import { UITypes } from 'nocodb-sdk'
 import dayjs from 'dayjs'
 import { type Row, computed, iconMap, isRowEmpty, ref } from '#imports'
 
@@ -348,7 +348,7 @@ onUnmounted(() => {
             <component :is="iconMap.search" class="h-4 w-4 mr-1 text-gray-500" />
           </template>
         </a-input>
-        <NcSelect v-model:value="sideBarFilterOption" class="min-w-38 !text-gray-800" data-testid="nc-calendar-sidebar-filter">
+        <NcSelect v-model:value="sideBarFilterOption" class="min-w-38 !text-gray-600" data-testid="nc-calendar-sidebar-filter">
           <a-select-option v-for="option in options" :key="option.value" :value="option.value" class="!text-gray-600">
             <div class="flex items-center justify-between gap-2">
               <div class="truncate flex-1">
@@ -433,22 +433,7 @@ onUnmounted(() => {
                 @dragover.prevent
               >
                 <template v-if="!isRowEmpty(record, displayField)">
-                  <div :class="{}">
-                    <LazySmartsheetVirtualCell
-                      v-if="isVirtualCol(displayField)"
-                      v-model="record.row[displayField.title]"
-                      :column="displayField"
-                      :row="record"
-                    />
-
-                    <LazySmartsheetCell
-                      v-else
-                      v-model="record.row[displayField.title]"
-                      :column="displayField"
-                      :edit-enabled="false"
-                      :read-only="true"
-                    />
-                  </div>
+                  <LazySmartsheetCalendarCell v-model="record.row[displayField!.title!]" :column="displayField" />
                 </template>
               </LazySmartsheetCalendarSideRecordCard>
             </LazySmartsheetRow>
diff --git a/packages/nc-gui/components/smartsheet/calendar/SideRecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/SideRecordCard.vue
index 78340d32cb..d105958707 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideRecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideRecordCard.vue
@@ -29,8 +29,8 @@ const props = withDefaults(defineProps<Props>(), {
         }"
         class="block h-10 w-1 rounded"
       ></span>
-      <div class="flex text-ellipsis gap-1 flex-col">
-        <span class="text-sm max-w-40 truncate text-gray-800">
+      <div class="flex gap-1 flex-col">
+        <span class="text-sm max-w-56 truncate text-gray-800">
           <slot />
         </span>
         <span v-if="showDate" class="text-xs text-gray-500">{{ fromDate }} {{ toDate ? ` - ${toDate}` : '' }}</span>
diff --git a/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
index 083906ecef..00a5d74e85 100644
--- a/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/VRecordCard.vue
@@ -70,9 +70,7 @@ const emit = defineEmits(['resize-start'])
 
     <div v-if="position === 'bottomRounded' || position === 'none'" class="ml-3">....</div>
 
-    <span
-      class="pl-1 pr-1 text-sm h-[80%] text-gray-800 leading-7 space-x-2 break-all whitespace-normal truncate w-full overflow-y-hidden"
-    >
+    <span class="pl-1 pr-1 text-sm h-[80%] text-gray-800 leading-7 break-all whitespace-normal truncate w-full overflow-y-hidden">
       <slot />
     </span>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index d8d26a6639..013bb3df95 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -601,6 +601,7 @@ const addRecord = (date: dayjs.Dayjs) => {
             </template>
             <template v-for="(field, index) in fieldsWithoutDisplay" :key="index">
               <LazySmartsheetCalendarCell
+                v-if="!isRowEmpty(record, field!)"
                 v-model="record.row[field!.title!]"
                 :bold="getFieldStyle(field).bold"
                 :column="field"
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index 72ee023499..8ba36581e7 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -838,6 +838,7 @@ const addRecord = (date: dayjs.Dayjs) => {
               </template>
               <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
                 <LazySmartsheetCalendarCell
+                  v-if="!isRowEmpty(record, field!)"
                   v-model="record.row[field!.title!]"
                   :bold="getFieldStyle(field).bold"
                   :column="field"
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index d8c9deeac6..202d1c2f46 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -321,6 +321,7 @@ const headerText = computed(() => {
     <LazySmartsheetExpandedForm
       v-if="expandedFormRow && expandedFormDlg"
       v-model="expandedFormDlg"
+      close-after-save
       :meta="meta"
       :row="expandedFormRow"
       :state="expandedFormRowState"
@@ -332,6 +333,7 @@ const headerText = computed(() => {
     <LazySmartsheetExpandedForm
       v-if="expandedFormOnRowIdDlg"
       v-model="expandedFormOnRowIdDlg"
+      close-after-save
       :meta="meta"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :row-id="route.query.rowId"

From 77948fe835315ecf2a7294e9eedd9bcac04309dd Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:34 +0000
Subject: [PATCH 039/253] feat(nc-gui): weekend background

---
 packages/nc-gui/assets/style.scss                            | 5 +++++
 packages/nc-gui/components/smartsheet/calendar/MonthView.vue | 1 +
 .../components/smartsheet/calendar/WeekView/DateField.vue    | 1 +
 .../smartsheet/calendar/WeekView/DateTimeField.vue           | 1 +
 4 files changed, 8 insertions(+)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index 8ea1d047ca..e9ebcd8fd0 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -784,4 +784,9 @@ svg.nc-cell-icon, svg.nc-virtual-cell-icon {
       @apply !flex !pl-4 max-w-[calc(100%_-_16px)];
     }
   }
+}
+
+.bg-crossed-lines {
+  background-image: repeating-linear-gradient(-45deg, #e7e7e9 0, #e7e7e9 1px, #ffffff 0, #ffffff 8%),
+  repeating-linear-gradient(45deg, #e7e7e9 0, #e7e7e9 1px, #ffffff 0, #ffffff 8%);
 }
\ No newline at end of file
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 170bcf1efd..1325c4b1d6 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -668,6 +668,7 @@ const addRecord = (date: dayjs.Dayjs) => {
             'border-brand-500 border-1 !border-r-1 border-b-1':
               isDateSelected(day) || (focusedDate && dayjs(day).isSame(focusedDate, 'day')),
             '!text-gray-400': !isDayInPagedMonth(day),
+            'bg-crossed-lines': day.get('day') === 0 || day.get('day') === 6,
           }"
           class="text-right relative group last:border-r-0 text-sm h-full border-r-1 border-b-1 border-gray-100 font-medium hover:bg-gray-50 text-gray-800 bg-white"
           data-testid="nc-calendar-month-day"
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index 013bb3df95..1cde761d66 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -553,6 +553,7 @@ const addRecord = (date: dayjs.Dayjs) => {
         :key="dateIndex"
         :class="{
           '!border-1 !border-t-0 border-brand-500': dayjs(date).isSame(selectedDate, 'day'),
+          'bg-crossed-lines': date.get('day') === 0 || date.get('day') === 6,
         }"
         class="flex flex-col border-r-1 min-h-[100vh] last:border-r-0 items-center w-1/7"
         data-testid="nc-calendar-week-day"
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index 8ba36581e7..ce93d5cc7f 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -772,6 +772,7 @@ const addRecord = (date: dayjs.Dayjs) => {
           :key="hourIndex"
           :class="{
             'border-1 !border-brand-500 bg-gray-50': hour.isSame(selectedTime, 'hour'),
+            'bg-crossed-lines': hour.get('day') === 0 || hour.get('day') === 6,
           }"
           class="text-center relative h-20 text-sm text-gray-500 w-full hover:bg-gray-50 py-1 border-transparent border-1 border-x-gray-100 border-t-gray-100"
           data-testid="nc-calendar-week-hour"

From c2206e6b5a770fcdb4ba39e6b124d551792481c7 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:35 +0000
Subject: [PATCH 040/253] feat(nc-gui): weekend background

---
 packages/nc-gui/assets/style.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index e9ebcd8fd0..e8481e0957 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -787,6 +787,6 @@ svg.nc-cell-icon, svg.nc-virtual-cell-icon {
 }
 
 .bg-crossed-lines {
-  background-image: repeating-linear-gradient(-45deg, #e7e7e9 0, #e7e7e9 1px, #ffffff 0, #ffffff 8%),
-  repeating-linear-gradient(45deg, #e7e7e9 0, #e7e7e9 1px, #ffffff 0, #ffffff 8%);
+  background-image: repeating-linear-gradient(-45deg, #e7e7e9 0, #e7e7e9 1px, transparent 0, transparent 12%),
+  repeating-linear-gradient(45deg, #e7e7e9 0, #e7e7e9 1px, transparent 0, transparent 12%);
 }
\ No newline at end of file

From 1254b67813a3f8cd8b60c8eb0ea6afea0a5fa789 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:35 +0000
Subject: [PATCH 041/253] feat(nc-gui): separator not working

---
 .../components/smartsheet/calendar/Cell.vue       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/Cell.vue b/packages/nc-gui/components/smartsheet/calendar/Cell.vue
index 003828b2bb..07eb093553 100644
--- a/packages/nc-gui/components/smartsheet/calendar/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/Cell.vue
@@ -356,7 +356,7 @@ const parseValue = (value: any, col: ColumnType): string => {
 
 <template>
   <span
-    class="before:content-['•'] !first:before:content-[''] !first:before:px-0 before:px-1"
+    class="calendar-cell before:px-1"
     :class="{
       'font-bold': bold,
       'italic': italic,
@@ -368,4 +368,15 @@ const parseValue = (value: any, col: ColumnType): string => {
   </span>
 </template>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.calendar-cell {
+  &::before {
+    content: '•';
+    padding: 0 4px;
+  }
+  &:first-child::before {
+    content: '';
+    padding: 0;
+  }
+}
+</style>

From 21d0bf3b823b88cd2bf86198a77262a0291addf5 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:35 +0000
Subject: [PATCH 042/253] fix(nc-gui): minor fixes

---
 packages/nc-gui/components/smartsheet/calendar/MonthView.vue | 2 +-
 packages/nc-gui/composables/useCalendarViewStore.ts          | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 1325c4b1d6..0b035819e1 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -390,7 +390,7 @@ const calculateNewRow = (event: MouseEvent, updateSideBar?: boolean) => {
     updateProperty.push(toCol!.title!)
   }
 
-  if (!newRow) return
+  if (!newRow) return { newRow: null, updateProperty: [] }
 
   const newPk = extractPkFromRow(newRow.row, meta.value!.columns!)
 
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index 630f49341d..f7369dc8ea 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -733,9 +733,8 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
     watch(activeCalendarView, async (value, oldValue) => {
       if (oldValue === 'week') {
         pageDate.value = selectedDate.value
-        selectedDate.value = selectedDateRange.value.start
-        selectedMonth.value = selectedDateRange.value.start
-        selectedTime.value = selectedDateRange.value.start
+        selectedMonth.value = selectedDate.value ?? selectedDateRange.value.start
+        selectedTime.value = selectedDate.value ?? selectedDateRange.value.start
       } else if (oldValue === 'month') {
         selectedDate.value = selectedMonth.value
         pageDate.value = selectedDate.value

From 7426a3992a3f863fdeb64a64383bd1ff7c9a0565 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:35 +0000
Subject: [PATCH 043/253] fix(nc-gui): reduce color of sidebar toggle

---
 packages/nc-gui/components/smartsheet/calendar/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index 202d1c2f46..e3b9ab91ee 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -265,7 +265,7 @@ const headerText = computed(() => {
             type="secondary"
             @click="showSideMenu = !showSideMenu"
           >
-            <component :is="iconMap.sidebar" class="h-4 w-4 text-gray-700 transition-all" />
+            <component :is="iconMap.sidebar" class="h-4 w-4 text-gray-600 transition-all" />
           </NcButton>
         </NcTooltip>
       </div>

From b3f12d02d730007f19c31a415684d10b121fe35f Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:35 +0000
Subject: [PATCH 044/253] fix(nc-gui): change bg of weekend

---
 packages/nc-gui/assets/style.scss                             | 4 ----
 packages/nc-gui/components/smartsheet/calendar/MonthView.vue  | 2 +-
 .../components/smartsheet/calendar/WeekView/DateField.vue     | 4 +---
 .../components/smartsheet/calendar/WeekView/DateTimeField.vue | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index e8481e0957..4b195ee081 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -786,7 +786,3 @@ svg.nc-cell-icon, svg.nc-virtual-cell-icon {
   }
 }
 
-.bg-crossed-lines {
-  background-image: repeating-linear-gradient(-45deg, #e7e7e9 0, #e7e7e9 1px, transparent 0, transparent 12%),
-  repeating-linear-gradient(45deg, #e7e7e9 0, #e7e7e9 1px, transparent 0, transparent 12%);
-}
\ No newline at end of file
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 0b035819e1..893389f13c 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -668,7 +668,7 @@ const addRecord = (date: dayjs.Dayjs) => {
             'border-brand-500 border-1 !border-r-1 border-b-1':
               isDateSelected(day) || (focusedDate && dayjs(day).isSame(focusedDate, 'day')),
             '!text-gray-400': !isDayInPagedMonth(day),
-            'bg-crossed-lines': day.get('day') === 0 || day.get('day') === 6,
+            '!bg-gray-50': day.get('day') === 0 || day.get('day') === 6,
           }"
           class="text-right relative group last:border-r-0 text-sm h-full border-r-1 border-b-1 border-gray-100 font-medium hover:bg-gray-50 text-gray-800 bg-white"
           data-testid="nc-calendar-month-day"
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index 1cde761d66..e4e03cc28a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -553,7 +553,7 @@ const addRecord = (date: dayjs.Dayjs) => {
         :key="dateIndex"
         :class="{
           '!border-1 !border-t-0 border-brand-500': dayjs(date).isSame(selectedDate, 'day'),
-          'bg-crossed-lines': date.get('day') === 0 || date.get('day') === 6,
+          '!bg-gray-50': date.get('day') === 0 || date.get('day') === 6,
         }"
         class="flex flex-col border-r-1 min-h-[100vh] last:border-r-0 items-center w-1/7"
         data-testid="nc-calendar-week-day"
@@ -589,8 +589,6 @@ const addRecord = (date: dayjs.Dayjs) => {
             @dblclick.stop="emits('expand-record', record)"
             @resize-start="onResizeStart"
           >
-            {{ dragRecord?.rowMeta?.id }}
-            {{ record?.rowMeta?.id }}
             <template v-if="!isRowEmpty(record, displayField)">
               <LazySmartsheetCalendarCell
                 v-model="record.row[displayField!.title!]"
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index ce93d5cc7f..e5ad4e23de 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -772,7 +772,7 @@ const addRecord = (date: dayjs.Dayjs) => {
           :key="hourIndex"
           :class="{
             'border-1 !border-brand-500 bg-gray-50': hour.isSame(selectedTime, 'hour'),
-            'bg-crossed-lines': hour.get('day') === 0 || hour.get('day') === 6,
+            '!bg-gray-50': hour.get('day') === 0 || hour.get('day') === 6,
           }"
           class="text-center relative h-20 text-sm text-gray-500 w-full hover:bg-gray-50 py-1 border-transparent border-1 border-x-gray-100 border-t-gray-100"
           data-testid="nc-calendar-week-hour"

From e808dd2b9f4ebb756cfe907698e18f5a19a06887 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:35 +0000
Subject: [PATCH 045/253] fix(nc-gui): view filters not applying

---
 packages/nc-gui/components/dlg/ViewCreate.vue                   | 2 +-
 packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue | 2 +-
 packages/nc-gui/composables/useCalendarViewStore.ts             | 2 +-
 packages/nocodb/src/services/calendar-datas.service.ts          | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/dlg/ViewCreate.vue b/packages/nc-gui/components/dlg/ViewCreate.vue
index a38a576fd8..3459f7c0ef 100644
--- a/packages/nc-gui/components/dlg/ViewCreate.vue
+++ b/packages/nc-gui/components/dlg/ViewCreate.vue
@@ -317,7 +317,7 @@ onMounted(async () => {
 <template>
   <NcModal
     v-model:visible="vModel"
-    :size="[ViewTypes.KANBAN, ViewTypes.MAP, ViewTypes.CALENDAR].includes(form.type) ? 'medium' : 'small'"
+    :size="[ViewTypes.KANBAN, ViewTypes.MAP, ViewTypes.CALENDAR].includes(form.type) ? 'small' : 'small'"
   >
     <template #header>
       <div class="flex w-full flex-row justify-between items-center">
diff --git a/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue b/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
index 47e4ad562b..50826010a3 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/CalendarRange.vue
@@ -130,7 +130,7 @@ const saveCalendarRange = async (range: CalendarRangeType, value?) => {
       </a-button>
     </div>
     <template #overlay>
-      <div v-if="calendarRangeDropdown" class="w-full p-6 w-[25rem]" data-testid="nc-calendar-range-menu" @click.stop>
+      <div v-if="calendarRangeDropdown" class="w-full p-6 w-[23rem]" data-testid="nc-calendar-range-menu" @click.stop>
         <div
           v-for="(range, id) in _calendar_ranges"
           :key="id"
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index f7369dc8ea..bb0d07f817 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -119,7 +119,7 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
 
     const calDataType = computed(() => {
       if (!calendarRange.value || !calendarRange.value[0]) return null
-      return calendarRange.value[0]!.fk_from_col!.uidt
+      return calendarRange.value[0]?.fk_from_col?.uidt
     })
 
     const sideBarFilter = computed(() => {
diff --git a/packages/nocodb/src/services/calendar-datas.service.ts b/packages/nocodb/src/services/calendar-datas.service.ts
index d34a7c637e..634dbca1ed 100644
--- a/packages/nocodb/src/services/calendar-datas.service.ts
+++ b/packages/nocodb/src/services/calendar-datas.service.ts
@@ -53,6 +53,7 @@ export class CalendarDatasService {
     return await this.datasService.dataList({
       ...param,
       ...query,
+      viewName: view.id,
       baseName: model.base_id,
       tableName: model.id,
       calendarLimitOverride: 3000, // TODO: make this configurable in env

From a1b61b64112e4763a1ef0f7ac856141daefbf5c2 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:35 +0000
Subject: [PATCH 046/253] fix(nc-gui): reduce record size

---
 .../nc-gui/components/smartsheet/calendar/Cell.vue |  2 +-
 .../smartsheet/calendar/DayView/DateField.vue      | 12 ++++++------
 .../components/smartsheet/calendar/MonthView.vue   | 14 +++++++-------
 .../components/smartsheet/calendar/RecordCard.vue  |  8 ++++----
 .../smartsheet/calendar/WeekView/DateField.vue     |  6 +++---
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/Cell.vue b/packages/nc-gui/components/smartsheet/calendar/Cell.vue
index 07eb093553..797124951b 100644
--- a/packages/nc-gui/components/smartsheet/calendar/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/Cell.vue
@@ -356,7 +356,7 @@ const parseValue = (value: any, col: ColumnType): string => {
 
 <template>
   <span
-    class="calendar-cell before:px-1"
+    class="calendar-cell text-xs before:px-1"
     :class="{
       'font-bold': bold,
       'italic': italic,
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index ce1af9619b..5ad88785b2 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -20,22 +20,22 @@ const fields = inject(FieldsInj, ref())
 const { fields: _fields } = useViewColumnsOrThrow()
 
 const getFieldStyle = (field: ColumnType) => {
-  const fi = _fields.value.find((f) => f.title === field.title)
+  const fi = _fields.value?.find((f) => f.title === field.title)
 
   return {
-    underline: fi.underline,
-    bold: fi.bold,
-    italic: fi.italic,
+    underline: fi?.underline,
+    bold: fi?.bold,
+    italic: fi?.italic,
   }
 }
 
-const fieldsWithoutDisplay = computed(() => fields.value.filter((f) => !isPrimary(f)))
+const fieldsWithoutDisplay = computed(() => fields.value?.filter((f) => !isPrimary(f)))
 
 // We loop through all the records and calculate the position of each record based on the range
 // We only need to calculate the top, of the record since there is no overlap in the day view of date Field
 const recordsAcrossAllRange = computed<Row[]>(() => {
   let dayRecordCount = 0
-  const perRecordHeight = 40
+  const perRecordHeight = 26
 
   if (!calendarRange.value) return []
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 893389f13c..10174c8000 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -110,9 +110,9 @@ const recordsToDisplay = computed<{
 
   const perWidth = gridContainerWidth.value / 7
   const perHeight = gridContainerHeight.value / dates.value.length
-  const perRecordHeight = 40
+  const perRecordHeight = 24
 
-  const spaceBetweenRecords = 30
+  const spaceBetweenRecords = 26
 
   // This object is used to keep track of the number of records in a day
   // The key is the date in the format YYYY-MM-DD
@@ -174,10 +174,10 @@ const recordsToDisplay = computed<{
 
         // The top is calculated from the week index and the record index
         // If the record in 1st week and no record in that date them the top will be 0
-        const top = weekIndex * perHeight + spaceBetweenRecords + (recordIndex - 1) * perRecordHeight
+        const top = weekIndex * perHeight + spaceBetweenRecords + (recordIndex - 1) * (perRecordHeight + 4)
 
         // The 25 is obtained from the trial and error
-        const heightRequired = perRecordHeight * recordIndex + spaceBetweenRecords + 25
+        const heightRequired = perRecordHeight * recordIndex + spaceBetweenRecords
 
         if (heightRequired > perHeight) {
           style.display = 'none'
@@ -283,7 +283,7 @@ const recordsToDisplay = computed<{
           // The top is calculated from the week index and the record index
           // If the record in 1st week and no record in that date them the top will be 0
           // If the record in 1st week and 1 record in that date then the top will be perRecordHeight + spaceBetweenRecords
-          const top = weekIndex * perHeight + spaceBetweenRecords + Math.max(maxRecordCount - 1, 0) * perRecordHeight
+          const top = weekIndex * perHeight + spaceBetweenRecords + Math.max(maxRecordCount - 1, 0) * (perRecordHeight + 4)
           const heightRequired = perRecordHeight * maxRecordCount + spaceBetweenRecords
 
           let position = 'rounded'
@@ -308,7 +308,7 @@ const recordsToDisplay = computed<{
 
           // If the height required is more than the height of the week, we hide the record
           // and update the recordsInDay object for all the spanned days
-          if (heightRequired + 15 > perHeight) {
+          if (heightRequired > perHeight) {
             style.display = 'none'
             for (let i = startDayIndex; i <= endDayIndex; i++) {
               const week = dates.value[weekIndex]
@@ -761,7 +761,7 @@ const addRecord = (date: dayjs.Dayjs) => {
               recordsToDisplay.count[dayjs(day).format('YYYY-MM-DD')]?.overflow &&
               !draggingId
             "
-            class="!absolute bottom-1 text-center w-15 mx-auto inset-x-0 z-3 text-gray-500"
+            class="!absolute bottom-1 right-1 text-center w-15 mx-auto z-3 text-gray-500"
             size="xxsmall"
             type="secondary"
             @click="viewMore(day)"
diff --git a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
index 317ea33e85..8379b4591c 100644
--- a/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
@@ -26,7 +26,7 @@ const emit = defineEmits(['resize-start'])
 <template>
   <div
     :class="{
-      'min-h-9': size === 'small',
+      'h-6': size === 'small',
       'h-full': size === 'auto',
       'rounded-l-md ml-1': position === 'leftRounded',
       'rounded-r-md mr-1': position === 'rightRounded',
@@ -54,7 +54,7 @@ const emit = defineEmits(['resize-start'])
         'bg-pink-500': color === 'pink',
         'bg-purple-500': color === 'purple',
       }"
-      class="w-1 min-h-5 bg-blue-500 rounded-x rounded-y-sm"
+      class="w-1 min-h-4 bg-blue-500 rounded-x rounded-y-sm"
     ></div>
 
     <div v-if="(position === 'leftRounded' || position === 'rounded') && resize" class="mt-0.7 h-7.1 absolute -left-4 resize">
@@ -71,13 +71,13 @@ const emit = defineEmits(['resize-start'])
       </NcButton>
     </div>
 
-    <div class="overflow-hidden items-center flex w-full ml-2 h-8">
+    <div class="overflow-hidden items-center justify-center flex w-full ml-2">
       <span v-if="position === 'rightRounded' || position === 'none'" class="mr-1"> .... </span>
       <span
         :class="{
           'pr-7': position === 'leftRounded',
         }"
-        class="text-sm pr-3 mr-3 break-word whitespace-nowrap overflow-hidden text-ellipsis w-full truncate text-gray-800"
+        class="text-sm pr-3 mb-0.5 mr-3 break-word whitespace-nowrap overflow-hidden text-ellipsis w-full truncate text-gray-800"
       >
         <slot />
       </span>
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index e4e03cc28a..6580052356 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -23,7 +23,7 @@ const fields = inject(FieldsInj, ref())
 const { fields: _fields } = useViewColumnsOrThrow()
 
 const getFieldStyle = (field: ColumnType | undefined) => {
-  const fi = _fields.value?.find((f) => f.title === field.title)
+  const fi = _fields.value?.find((f) => f.title === field?.title)
 
   return {
     underline: fi?.underline,
@@ -196,7 +196,7 @@ const calendarData = computed(() => {
             style: {
               width: widthStyle,
               left: `${startDaysDiff * perDayWidth}px`,
-              top: `${suitableRow * 40}px`,
+              top: `${suitableRow * 26}px`,
             },
           },
         })
@@ -222,7 +222,7 @@ const calendarData = computed(() => {
             style: {
               width: `calc(${perDayWidth}px)`,
               left: `${startDaysDiff * perDayWidth}px`,
-              top: `${suitableRow * 40}px`,
+              top: `${suitableRow * 26}px`,
             },
           },
         })

From b550e8dac5d8995771b4ee9eabab4a1562e34b6b Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:36 +0000
Subject: [PATCH 047/253] fix(nc-gui): record overlap

---
 .../nc-gui/components/smartsheet/calendar/MonthView.vue   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 10174c8000..5d12bd7adb 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -177,7 +177,7 @@ const recordsToDisplay = computed<{
         const top = weekIndex * perHeight + spaceBetweenRecords + (recordIndex - 1) * (perRecordHeight + 4)
 
         // The 25 is obtained from the trial and error
-        const heightRequired = perRecordHeight * recordIndex + spaceBetweenRecords
+        const heightRequired = perRecordHeight * recordIndex + spaceBetweenRecords + 13
 
         if (heightRequired > perHeight) {
           style.display = 'none'
@@ -284,7 +284,7 @@ const recordsToDisplay = computed<{
           // If the record in 1st week and no record in that date them the top will be 0
           // If the record in 1st week and 1 record in that date then the top will be perRecordHeight + spaceBetweenRecords
           const top = weekIndex * perHeight + spaceBetweenRecords + Math.max(maxRecordCount - 1, 0) * (perRecordHeight + 4)
-          const heightRequired = perRecordHeight * maxRecordCount + spaceBetweenRecords
+          const heightRequired = perRecordHeight * maxRecordCount + spaceBetweenRecords + 13
 
           let position = 'rounded'
           // Here we are checking if the startDay is before all the dates shown in UI rather that the current month
@@ -761,12 +761,12 @@ const addRecord = (date: dayjs.Dayjs) => {
               recordsToDisplay.count[dayjs(day).format('YYYY-MM-DD')]?.overflow &&
               !draggingId
             "
-            class="!absolute bottom-1 right-1 text-center w-15 mx-auto z-3 text-gray-500"
+            class="!absolute bottom-1 right-1 text-center min-w-4.5 mx-auto z-3 text-gray-500"
             size="xxsmall"
             type="secondary"
             @click="viewMore(day)"
           >
-            <span class="text-xs"> + {{ recordsToDisplay.count[dayjs(day).format('YYYY-MM-DD')]?.overflowCount }} more </span>
+            <span class="text-xs px-0.5"> + {{ recordsToDisplay.count[dayjs(day).format('YYYY-MM-DD')]?.overflowCount }} </span>
           </NcButton>
         </div>
       </div>

From 86833917fdc599634678b7b8571387bed4c428a4 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 6 Mar 2024 10:54:36 +0000
Subject: [PATCH 048/253] fix(nc-gui): correct spacing

---
 .../components/smartsheet/calendar/DayView/DateField.vue    | 2 +-
 .../nc-gui/components/smartsheet/calendar/MonthView.vue     | 6 +++---
 .../components/smartsheet/calendar/WeekView/DateField.vue   | 4 ++--
 packages/nc-gui/components/smartsheet/calendar/index.vue    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 5ad88785b2..0c3f6b3c70 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -35,7 +35,7 @@ const fieldsWithoutDisplay = computed(() => fields.value?.filter((f) => !isPrima
 // We only need to calculate the top, of the record since there is no overlap in the day view of date Field
 const recordsAcrossAllRange = computed<Row[]>(() => {
   let dayRecordCount = 0
-  const perRecordHeight = 26
+  const perRecordHeight = 28
 
   if (!calendarRange.value) return []
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 5d12bd7adb..e27cb73a8a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -177,7 +177,7 @@ const recordsToDisplay = computed<{
         const top = weekIndex * perHeight + spaceBetweenRecords + (recordIndex - 1) * (perRecordHeight + 4)
 
         // The 25 is obtained from the trial and error
-        const heightRequired = perRecordHeight * recordIndex + spaceBetweenRecords + 13
+        const heightRequired = perRecordHeight * recordIndex + spaceBetweenRecords + 12
 
         if (heightRequired > perHeight) {
           style.display = 'none'
@@ -284,7 +284,7 @@ const recordsToDisplay = computed<{
           // If the record in 1st week and no record in that date them the top will be 0
           // If the record in 1st week and 1 record in that date then the top will be perRecordHeight + spaceBetweenRecords
           const top = weekIndex * perHeight + spaceBetweenRecords + Math.max(maxRecordCount - 1, 0) * (perRecordHeight + 4)
-          const heightRequired = perRecordHeight * maxRecordCount + spaceBetweenRecords + 13
+          const heightRequired = perRecordHeight * Math.max(maxRecordCount, 0) + spaceBetweenRecords + 12
 
           let position = 'rounded'
           // Here we are checking if the startDay is before all the dates shown in UI rather that the current month
@@ -766,7 +766,7 @@ const addRecord = (date: dayjs.Dayjs) => {
             type="secondary"
             @click="viewMore(day)"
           >
-            <span class="text-xs px-0.5"> + {{ recordsToDisplay.count[dayjs(day).format('YYYY-MM-DD')]?.overflowCount }} </span>
+            <span class="text-xs px-1"> + {{ recordsToDisplay.count[dayjs(day).format('YYYY-MM-DD')]?.overflowCount }} </span>
           </NcButton>
         </div>
       </div>
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index 6580052356..12c96c7d16 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -196,7 +196,7 @@ const calendarData = computed(() => {
             style: {
               width: widthStyle,
               left: `${startDaysDiff * perDayWidth}px`,
-              top: `${suitableRow * 26}px`,
+              top: `${suitableRow * 28}px`,
             },
           },
         })
@@ -222,7 +222,7 @@ const calendarData = computed(() => {
             style: {
               width: `calc(${perDayWidth}px)`,
               left: `${startDaysDiff * perDayWidth}px`,
-              top: `${suitableRow * 26}px`,
+              top: `${suitableRow * 28}px`,
             },
           },
         })
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index e3b9ab91ee..e54d7d5caa 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -169,7 +169,7 @@ const headerText = computed(() => {
 <template>
   <div class="flex h-full flex-row" data-testid="nc-calendar-wrapper">
     <div class="flex flex-col w-full">
-      <div class="flex justify-between p-3 items-center border-b-1 border-gray-200" data-testid="nc-calendar-topbar">
+      <div class="flex justify-between p-2 items-center border-b-1 border-gray-200" data-testid="nc-calendar-topbar">
         <div class="flex justify-start gap-3 items-center">
           <NcTooltip>
             <template #title> {{ $t('labels.previous') }}</template>

From 0f1e66b3a83017b0a017d369dcd4bdbbabdf2720 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 10:37:52 +0800
Subject: [PATCH 049/253] chore(renovate): Update patch (#7805)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/nc-gui/package.json |   2 +-
 packages/nocodb/package.json |   2 +-
 pnpm-lock.yaml               | 118 +++++++++++++++++------------------
 3 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 7959a7c9d9..2d287e8f49 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -15,7 +15,7 @@
     "url": "https://github.com/nocodb/nocodb/issues"
   },
   "engines": {
-    "node": ">=18.19.0"
+    "node": ">=18.19.1"
   },
   "license": "AGPL-3.0-or-later",
   "web-types": "web-types.json",
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index b6134c843d..66449275f9 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -184,7 +184,7 @@
     "@types/jest": "^29.5.12",
     "@types/mocha": "^10.0.6",
     "@types/multer": "^1.4.11",
-    "@types/node": "20.11.24",
+    "@types/node": "20.11.25",
     "@types/passport-google-oauth20": "^2.0.14",
     "@types/passport-jwt": "^3.0.13",
     "@types/supertest": "^2.0.16",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0c0e53555d..976841558a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -837,8 +837,8 @@ importers:
         specifier: ^1.4.11
         version: 1.4.11
       '@types/node':
-        specifier: 20.11.24
-        version: 20.11.24
+        specifier: 20.11.25
+        version: 20.11.25
       '@types/passport-google-oauth20':
         specifier: ^2.0.14
         version: 2.0.14
@@ -883,7 +883,7 @@ importers:
         version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8)
       jest:
         specifier: 29.7.0
-        version: 29.7.0(@types/node@20.11.24)(ts-node@10.9.2)
+        version: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)
       mocha:
         specifier: ^10.3.0
         version: 10.3.0
@@ -907,7 +907,7 @@ importers:
         version: 9.5.1(typescript@5.3.2)(webpack@5.90.3)
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@20.11.24)(typescript@5.3.2)
+        version: 10.9.2(@types/node@20.11.25)(typescript@5.3.2)
       tsconfig-paths:
         specifier: ^4.2.0
         version: 4.2.0
@@ -5020,7 +5020,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       chalk: 4.1.2
       jest-message-util: 29.7.0
       jest-util: 29.7.0
@@ -5041,14 +5041,14 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.8.0
       exit: 0.1.2
       graceful-fs: 4.2.11
       jest-changed-files: 29.7.0
-      jest-config: 29.7.0(@types/node@20.11.24)(ts-node@10.9.2)
+      jest-config: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
@@ -5076,7 +5076,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       jest-mock: 29.7.0
     dev: true
 
@@ -5110,7 +5110,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -5143,7 +5143,7 @@ packages:
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.20
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       chalk: 4.1.2
       collect-v8-coverage: 1.0.2
       exit: 0.1.2
@@ -5231,7 +5231,7 @@ packages:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       '@types/yargs': 17.0.24
       chalk: 4.1.2
     dev: true
@@ -8938,7 +8938,7 @@ packages:
     resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
     dependencies:
       '@types/connect': 3.4.35
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/caseless@0.12.5:
@@ -8952,13 +8952,13 @@ packages:
   /@types/concat-stream@1.6.1:
     resolution: {integrity: sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/connect@3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/cookie@0.4.1:
@@ -8971,7 +8971,7 @@ packages:
   /@types/cors@2.8.13:
     resolution: {integrity: sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
 
   /@types/d3-scale@4.0.8:
     resolution: {integrity: sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==}
@@ -9031,7 +9031,7 @@ packages:
   /@types/express-serve-static-core@4.17.36:
     resolution: {integrity: sha512-zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
       '@types/send': 0.17.1
@@ -9053,7 +9053,7 @@ packages:
   /@types/form-data@0.0.33:
     resolution: {integrity: sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/geojson@7946.0.10:
@@ -9064,13 +9064,13 @@ packages:
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/http-errors@2.0.1:
@@ -9080,13 +9080,13 @@ packages:
   /@types/http-proxy@1.17.14:
     resolution: {integrity: sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/ioredis-mock@8.2.5:
     resolution: {integrity: sha512-cZyuwC9LGtg7s5G9/w6rpy3IOZ6F/hFR0pQlWYZESMo1xQUYbDpa6haqB4grTePjsGzcB/YLBFCjqRunK5wieg==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       ioredis: 5.3.2
     transitivePeerDependencies:
       - supports-color
@@ -9130,13 +9130,13 @@ packages:
   /@types/jsonwebtoken@9.0.2:
     resolution: {integrity: sha512-drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/jsonwebtoken@9.0.5:
     resolution: {integrity: sha512-VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: false
 
   /@types/leaflet.markercluster@1.5.4:
@@ -9190,7 +9190,7 @@ packages:
   /@types/node-fetch@2.6.4:
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       form-data: 3.0.1
     dev: false
 
@@ -9202,8 +9202,8 @@ packages:
     resolution: {integrity: sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w==}
     dev: false
 
-  /@types/node@20.11.24:
-    resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==}
+  /@types/node@20.11.25:
+    resolution: {integrity: sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==}
     dependencies:
       undici-types: 5.26.5
 
@@ -9222,7 +9222,7 @@ packages:
   /@types/oauth@0.9.1:
     resolution: {integrity: sha512-a1iY62/a3yhZ7qH7cNUsxoI3U/0Fe9+RnuFrpTKr+0WVOzbKlSLojShCKe20aOD1Sppv+i8Zlq0pLDuTJnwS4A==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/object.omit@3.0.3:
@@ -9300,7 +9300,7 @@ packages:
     resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==}
     dependencies:
       '@types/caseless': 0.12.5
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       '@types/tough-cookie': 4.0.5
       form-data: 2.5.1
     dev: false
@@ -9317,7 +9317,7 @@ packages:
     resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
     dependencies:
       '@types/mime': 1.3.2
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/serve-static@1.15.2:
@@ -9325,7 +9325,7 @@ packages:
     dependencies:
       '@types/http-errors': 2.0.1
       '@types/mime': 3.0.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/showdown@2.0.6:
@@ -9352,7 +9352,7 @@ packages:
     resolution: {integrity: sha512-LOWgpacIV8GHhrsQU+QMZuomfqXiqzz3ILLkCtKx3Us6AmomFViuzKT9D693QTKgyut2oCytMG8/efOop+DB+w==}
     dependencies:
       '@types/cookiejar': 2.1.2
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: true
 
   /@types/supertest@2.0.16:
@@ -9384,7 +9384,7 @@ packages:
   /@types/tunnel@0.0.3:
     resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: false
 
   /@types/turndown@5.0.4:
@@ -9424,7 +9424,7 @@ packages:
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
     dev: false
     optional: true
 
@@ -13054,7 +13054,7 @@ packages:
       readable-stream: 3.6.2
     dev: true
 
-  /create-jest@29.7.0(@types/node@20.11.24)(ts-node@10.9.2):
+  /create-jest@29.7.0(@types/node@20.11.25)(ts-node@10.9.2):
     resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -13063,7 +13063,7 @@ packages:
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@20.11.24)(ts-node@10.9.2)
+      jest-config: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -14078,7 +14078,7 @@ packages:
     dependencies:
       '@types/cookie': 0.4.1
       '@types/cors': 2.8.13
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       accepts: 1.3.8
       base64id: 2.0.0
       cookie: 0.4.2
@@ -14747,7 +14747,7 @@ packages:
       eslint: 8.56.0
       eslint-import-resolver-node: 0.3.9
       eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0)
-      hasown: 2.0.1
+      hasown: 2.0.0
       is-core-module: 2.13.1
       is-glob: 4.0.3
       minimatch: 3.1.2
@@ -18010,7 +18010,7 @@ packages:
       '@jest/expect': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       chalk: 4.1.2
       co: 4.6.0
       dedent: 1.5.1
@@ -18031,7 +18031,7 @@ packages:
       - supports-color
     dev: true
 
-  /jest-cli@29.7.0(@types/node@20.11.24)(ts-node@10.9.2):
+  /jest-cli@29.7.0(@types/node@20.11.25)(ts-node@10.9.2):
     resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -18045,10 +18045,10 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@20.11.24)(ts-node@10.9.2)
+      create-jest: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)
       exit: 0.1.2
       import-local: 3.1.0
-      jest-config: 29.7.0(@types/node@20.11.24)(ts-node@10.9.2)
+      jest-config: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -18059,7 +18059,7 @@ packages:
       - ts-node
     dev: true
 
-  /jest-config@29.7.0(@types/node@20.11.24)(ts-node@10.9.2):
+  /jest-config@29.7.0(@types/node@20.11.25)(ts-node@10.9.2):
     resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -18074,7 +18074,7 @@ packages:
       '@babel/core': 7.23.7
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       babel-jest: 29.7.0(@babel/core@7.23.7)
       chalk: 4.1.2
       ci-info: 3.8.0
@@ -18094,7 +18094,7 @@ packages:
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.9.2(@types/node@20.11.24)(typescript@5.3.2)
+      ts-node: 10.9.2(@types/node@20.11.25)(typescript@5.3.2)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -18135,7 +18135,7 @@ packages:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       jest-mock: 29.7.0
       jest-util: 29.7.0
     dev: true
@@ -18151,7 +18151,7 @@ packages:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -18227,7 +18227,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       jest-util: 29.7.0
     dev: true
 
@@ -18282,7 +18282,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.11
@@ -18313,7 +18313,7 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       chalk: 4.1.2
       cjs-module-lexer: 1.2.3
       collect-v8-coverage: 1.0.2
@@ -18365,7 +18365,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -18377,7 +18377,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -18402,7 +18402,7 @@ packages:
     dependencies:
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -18414,7 +18414,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -18423,13 +18423,13 @@ packages:
     resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest@29.7.0(@types/node@20.11.24)(ts-node@10.9.2):
+  /jest@29.7.0(@types/node@20.11.25)(ts-node@10.9.2):
     resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -18442,7 +18442,7 @@ packages:
       '@jest/core': 29.7.0(ts-node@10.9.2)
       '@jest/types': 29.6.3
       import-local: 3.1.0
-      jest-cli: 29.7.0(@types/node@20.11.24)(ts-node@10.9.2)
+      jest-cli: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -25033,7 +25033,7 @@ packages:
       '@babel/core': 7.23.7
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
-      jest: 29.7.0(@types/node@20.11.24)(ts-node@10.9.2)
+      jest: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)
       jest-util: 29.6.3
       json5: 2.2.3
       lodash.memoize: 4.1.2
@@ -25088,7 +25088,7 @@ packages:
       typescript: 5.3.2
     dev: true
 
-  /ts-node@10.9.2(@types/node@20.11.24)(typescript@5.3.2):
+  /ts-node@10.9.2(@types/node@20.11.25)(typescript@5.3.2):
     resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
     hasBin: true
     peerDependencies:
@@ -25107,7 +25107,7 @@ packages:
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 20.11.24
+      '@types/node': 20.11.25
       acorn: 8.11.2
       acorn-walk: 8.2.0
       arg: 4.1.3

From bcb2721bcd0901903d79ef65be0d88028fb81c4b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 20:35:04 +0800
Subject: [PATCH 050/253] chore(renovate): Update dependency
 @iconify-json/lucide to ^1.1.172 (#7812)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/nc-gui/package.json |  2 +-
 pnpm-lock.yaml               | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 2d287e8f49..79847c2899 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -117,7 +117,7 @@
     "@iconify-json/ion": "^1.1.15",
     "@iconify-json/la": "^1.1.8",
     "@iconify-json/logos": "^1.1.42",
-    "@iconify-json/lucide": "^1.1.171",
+    "@iconify-json/lucide": "^1.1.172",
     "@iconify-json/material-symbols": "^1.1.74",
     "@iconify-json/mdi": "^1.1.64",
     "@iconify-json/mi": "^1.1.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 976841558a..3f68db50b8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -275,8 +275,8 @@ importers:
         specifier: ^1.1.42
         version: 1.1.42
       '@iconify-json/lucide':
-        specifier: ^1.1.171
-        version: 1.1.171
+        specifier: ^1.1.172
+        version: 1.1.172
       '@iconify-json/material-symbols':
         specifier: ^1.1.74
         version: 1.1.74
@@ -901,7 +901,7 @@ importers:
         version: 6.3.4
       ts-jest:
         specifier: 29.1.2
-        version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2)
+        version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2)
       ts-loader:
         specifier: ^9.5.1
         version: 9.5.1(typescript@5.3.2)(webpack@5.90.3)
@@ -971,7 +971,7 @@ importers:
         version: 5.0.5
       ts-jest:
         specifier: ^29.1.2
-        version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2)
+        version: 29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2)
       tsc-alias:
         specifier: ^1.8.8
         version: 1.8.8
@@ -4522,8 +4522,8 @@ packages:
       '@iconify/types': 2.0.0
     dev: true
 
-  /@iconify-json/lucide@1.1.171:
-    resolution: {integrity: sha512-qYOXqnmYBHwH6yGVHOyNgLQ2WFz3UrZpBou37jFe1OWtTKbu/8fDixZuv/rBEhyQcX1mw+dFY+dguYNlGjYAmQ==}
+  /@iconify-json/lucide@1.1.172:
+    resolution: {integrity: sha512-D7O4Z/Sx9xYVtkx5EcNpe6B5btZwEH9Fxf2KQh9nwFgOGGXdTuOB2Sh0AHfR6K3eCQ63Uhvz/4MzaIyUoixPQw==}
     dependencies:
       '@iconify/types': 2.0.0
     dev: true
@@ -25009,7 +25009,7 @@ packages:
     engines: {node: '>=14.0.0'}
     dev: false
 
-  /ts-jest@29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.3.2):
+  /ts-jest@29.1.2(@babel/core@7.23.9)(jest@29.7.0)(typescript@5.3.2):
     resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==}
     engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -25030,7 +25030,7 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.23.7
+      '@babel/core': 7.23.9
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
       jest: 29.7.0(@types/node@20.11.25)(ts-node@10.9.2)

From 563fdf42f9e665db2af25d207c1a35e6109775cc Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Thu, 7 Mar 2024 17:00:26 +0000
Subject: [PATCH 051/253] fix(docs): update `edit this page` link

---
 packages/noco-docs/docusaurus.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/noco-docs/docusaurus.config.js b/packages/noco-docs/docusaurus.config.js
index 8689f75761..2003e5ead2 100644
--- a/packages/noco-docs/docusaurus.config.js
+++ b/packages/noco-docs/docusaurus.config.js
@@ -68,7 +68,7 @@ const config = {
           sidebarPath: require.resolve("./sidebars.js"),
           routeBasePath: "/",
           editUrl:
-            "https://github.com/nocodb/nocodb/tree/develop/packages/noco-docs/docs/",
+            "https://github.com/nocodb/nocodb/tree/develop/packages/noco-docs/",
           lastVersion: "current",
           versions: {
             current: {

From 7e666b15688fda9671225a1aaadc6159c9bbbbf3 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 05:59:29 +0000
Subject: [PATCH 052/253] fix(nc-gui): incorrect route query params issue

---
 packages/nc-gui/composables/useTableNew.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/composables/useTableNew.ts b/packages/nc-gui/composables/useTableNew.ts
index ef35db3aed..b20494e43b 100644
--- a/packages/nc-gui/composables/useTableNew.ts
+++ b/packages/nc-gui/composables/useTableNew.ts
@@ -86,10 +86,7 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
 
     const navigateToTable = async () => {
       if (openedViewsTab.value === 'view') {
-        await navigateTo({
-          path: `/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}`,
-          query: route.value.query,
-        })
+        await navigateTo(`/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}`)
       }
 
       table.isViewsLoading = true
@@ -102,10 +99,7 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
           // find the default view and navigate to it, if not found navigate to the first one
           const defaultView = views.find((v) => v.is_default) || views[0]
 
-          await navigateTo({
-            path: `/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}/${defaultView.id}/${openedViewsTab.value}`,
-            query: route.value.query,
-          })
+          await navigateTo(`/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}/${defaultView.id}/${openedViewsTab.value}`)
         }
       } catch (e) {
         console.error(e)

From 589c1acd68a46a13deb126fee1a5f00b49f57458 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:10:45 +0800
Subject: [PATCH 053/253] chore(renovate): Update dependency nodemailer to
 ^6.9.12 (#7821)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/nocodb/package.json | 2 +-
 pnpm-lock.yaml               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 66449275f9..f9fcf189a7 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -138,7 +138,7 @@
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.4.2",
     "nocodb-sdk": "workspace:^",
-    "nodemailer": "^6.9.11",
+    "nodemailer": "^6.9.12",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.4",
     "os-locale": "^6.0.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3f68db50b8..abf9f6299c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -704,8 +704,8 @@ importers:
         specifier: workspace:^
         version: link:../nocodb-sdk
       nodemailer:
-        specifier: ^6.9.11
-        version: 6.9.11
+        specifier: ^6.9.12
+        version: 6.9.12
       object-hash:
         specifier: ^3.0.0
         version: 3.0.0
@@ -20569,8 +20569,8 @@ packages:
       node.extend: 2.0.3
     dev: false
 
-  /nodemailer@6.9.11:
-    resolution: {integrity: sha512-UiAkgiERuG94kl/3bKfE8o10epvDnl0vokNEtZDPTq9BWzIl6EFT9336SbIT4oaTBD8NmmUTLsQyXHV82eXSWg==}
+  /nodemailer@6.9.12:
+    resolution: {integrity: sha512-pnLo7g37Br3jXbF0bl5DekBJihm2q+3bB3l2o/B060sWmb5l+VqeScAQCBqaQ+5ezRZFzW5SciZNGdRDEbq89w==}
     engines: {node: '>=6.0.0'}
     dev: false
 

From d92ac512ac094160c9e375e78d1774f01c7b0161 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 9 Mar 2024 07:10:47 +0000
Subject: [PATCH 054/253] fix: use parseMetaProp on export service

---
 .../src/modules/jobs/jobs/export-import/export.service.ts   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index 15b383663c..78e450600b 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -13,6 +13,7 @@ import NcPluginMgrv2 from '~/helpers/NcPluginMgrv2';
 import { NcError } from '~/helpers/catchError';
 import { DatasService } from '~/services/datas.service';
 import { Base, Hook, Model, Source } from '~/models';
+import { parseMetaProp } from '~/utils/modelUtils';
 
 @Injectable()
 export class ExportService {
@@ -220,10 +221,7 @@ export class ExportService {
                 break;
               case 'meta':
                 if (view.type === ViewTypes.KANBAN) {
-                  const meta = JSON.parse(view.view.meta as string) as Record<
-                    string,
-                    any
-                  >;
+                  const meta = parseMetaProp(view.view) as Record<string, any>;
                   for (const [k, v] of Object.entries(meta)) {
                     const colId = idMap.get(k as string);
                     for (const op of v) {

From b0512625ec4c2ee0975bc3f082c7a808b5d4688f Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 9 Mar 2024 07:10:47 +0000
Subject: [PATCH 055/253] fix: use limitOverride for export getDataList

---
 packages/nocodb/src/db/BaseModelSqlv2.ts             | 12 ++++++------
 .../jobs/jobs/export-import/export.service.ts        |  6 +++++-
 .../nocodb/src/services/calendar-datas.service.ts    |  2 +-
 packages/nocodb/src/services/datas.service.ts        |  8 ++++----
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index c34a7ea961..1822934d17 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -318,14 +318,14 @@ class BaseModelSqlv2 {
       sortArr?: Sort[];
       sort?: string | string[];
       fieldsSet?: Set<string>;
-      calendarLimitOverride?: number;
+      limitOverride?: number;
     } = {},
     options: {
       ignoreViewFilterAndSort?: boolean;
       ignorePagination?: boolean;
       validateFormula?: boolean;
       throwErrorIfInvalidParams?: boolean;
-      calendarLimitOverride?: number;
+      limitOverride?: number;
     } = {},
   ): Promise<any> {
     const {
@@ -333,7 +333,7 @@ class BaseModelSqlv2 {
       ignorePagination = false,
       validateFormula = false,
       throwErrorIfInvalidParams = false,
-      calendarLimitOverride,
+      limitOverride,
     } = options;
 
     const { where, fields, ...rest } = this._getListArgs(args as any);
@@ -439,12 +439,12 @@ class BaseModelSqlv2 {
       });
     }
 
-    // For calendar View, if calendarLimitOverride is provided, use it as limit for the query
+    // if limitOverride is provided, use it as limit for the query (for internal usage eg. calendar, export)
     if (!ignorePagination) {
-      if (!calendarLimitOverride) {
+      if (!limitOverride) {
         applyPaginate(qb, rest);
       } else {
-        applyPaginate(qb, { ...rest, limit: calendarLimitOverride });
+        applyPaginate(qb, { ...rest, limit: limitOverride });
       }
     }
     const proto = await this.getProto();
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index 78e450600b..7c810c4a2b 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -611,6 +611,7 @@ export class ExportService {
           query: { limit, offset, fields },
           baseModel,
           ignoreViewFilterAndSort: true,
+          limitOverride: limit,
         })
         .then((result) => {
           try {
@@ -661,6 +662,7 @@ export class ExportService {
           query: { limit, offset, fields },
           baseModel,
           ignoreViewFilterAndSort: true,
+          limitOverride: limit,
         })
         .then((result) => {
           try {
@@ -681,7 +683,9 @@ export class ExportService {
                 offset + limit,
                 limit,
                 fields,
-              ).then(resolve);
+              )
+                .then(resolve)
+                .catch(reject);
             }
           } catch (e) {
             reject(e);
diff --git a/packages/nocodb/src/services/calendar-datas.service.ts b/packages/nocodb/src/services/calendar-datas.service.ts
index 634dbca1ed..48480f7efa 100644
--- a/packages/nocodb/src/services/calendar-datas.service.ts
+++ b/packages/nocodb/src/services/calendar-datas.service.ts
@@ -56,7 +56,7 @@ export class CalendarDatasService {
       viewName: view.id,
       baseName: model.base_id,
       tableName: model.id,
-      calendarLimitOverride: 3000, // TODO: make this configurable in env
+      limitOverride: 3000, // TODO: make this configurable in env
     });
   }
 
diff --git a/packages/nocodb/src/services/datas.service.ts b/packages/nocodb/src/services/datas.service.ts
index 676ed3428a..53cd4eb3b8 100644
--- a/packages/nocodb/src/services/datas.service.ts
+++ b/packages/nocodb/src/services/datas.service.ts
@@ -23,7 +23,7 @@ export class DatasService {
       query: any;
       disableOptimization?: boolean;
       ignorePagination?: boolean;
-      calendarLimitOverride?: number;
+      limitOverride?: number;
       throwErrorIfInvalidParams?: boolean;
     },
   ) {
@@ -43,7 +43,7 @@ export class DatasService {
       query: param.query,
       throwErrorIfInvalidParams: true,
       ignorePagination: param.ignorePagination,
-      calendarLimitOverride: param.calendarLimitOverride,
+      limitOverride: param.limitOverride,
     });
   }
 
@@ -153,7 +153,7 @@ export class DatasService {
     throwErrorIfInvalidParams?: boolean;
     ignoreViewFilterAndSort?: boolean;
     ignorePagination?: boolean;
-    calendarLimitOverride?: number;
+    limitOverride?: number;
   }) {
     const { model, view, query = {}, ignoreViewFilterAndSort = false } = param;
 
@@ -193,7 +193,7 @@ export class DatasService {
               ignoreViewFilterAndSort,
               throwErrorIfInvalidParams: param.throwErrorIfInvalidParams,
               ignorePagination: param.ignorePagination,
-              calendarLimitOverride: param.calendarLimitOverride,
+              limitOverride: param.limitOverride,
             }),
             {},
             listArgs,

From 9de208ff6dfb8e62dac215ca2fc04000bb539ea3 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 9 Mar 2024 07:10:47 +0000
Subject: [PATCH 056/253] fix: missing catch for asynchronous op

---
 .../src/modules/jobs/jobs/export-import/export.service.ts     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index 7c810c4a2b..d69c9275f2 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -633,7 +633,9 @@ export class ExportService {
                 offset + limit,
                 limit,
                 fields,
-              ).then(resolve);
+              )
+                .then(resolve)
+                .catch(reject);
             }
           } catch (e) {
             reject(e);

From 4de1087d90bcad23edbefd0f29b7106e4e51b7c5 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sat, 9 Mar 2024 07:10:47 +0000
Subject: [PATCH 057/253] fix: apply limit override to PagedResponseImpl

---
 packages/nocodb/src/helpers/PagedResponse.ts         | 1 +
 packages/nocodb/src/helpers/extractLimitAndOffset.ts | 6 ++++++
 packages/nocodb/src/services/datas.service.ts        | 1 +
 3 files changed, 8 insertions(+)

diff --git a/packages/nocodb/src/helpers/PagedResponse.ts b/packages/nocodb/src/helpers/PagedResponse.ts
index 09d4e35f82..09696b11a6 100644
--- a/packages/nocodb/src/helpers/PagedResponse.ts
+++ b/packages/nocodb/src/helpers/PagedResponse.ts
@@ -11,6 +11,7 @@ export class PagedResponseImpl<T> {
       count?: number | string;
       l?: number;
       o?: number;
+      limitOverride?: number;
     } = {},
     additionalProps?: Record<string, any>,
   ) {
diff --git a/packages/nocodb/src/helpers/extractLimitAndOffset.ts b/packages/nocodb/src/helpers/extractLimitAndOffset.ts
index d995d14bc0..42df63224a 100644
--- a/packages/nocodb/src/helpers/extractLimitAndOffset.ts
+++ b/packages/nocodb/src/helpers/extractLimitAndOffset.ts
@@ -15,6 +15,7 @@ export function extractLimitAndOffset(
     offset?: number | string;
     l?: number | string;
     o?: number | string;
+    limitOverride?: number;
   } = {},
 ) {
   const obj: {
@@ -40,5 +41,10 @@ export function extractLimitAndOffset(
   const offset = +(args.offset || args.o) || 0;
   obj.offset = Math.max(Number.isInteger(offset) ? offset : 0, 0);
 
+  // override limit if provided
+  if (args.limitOverride) {
+    obj.limit = +args.limitOverride;
+  }
+
   return obj;
 }
diff --git a/packages/nocodb/src/services/datas.service.ts b/packages/nocodb/src/services/datas.service.ts
index 53cd4eb3b8..dac753df80 100644
--- a/packages/nocodb/src/services/datas.service.ts
+++ b/packages/nocodb/src/services/datas.service.ts
@@ -210,6 +210,7 @@ export class DatasService {
     ]);
     return new PagedResponseImpl(data, {
       ...query,
+      ...(param.limitOverride ? { limitOverride: param.limitOverride } : {}),
       count,
     });
   }

From 20b2aaf49a107df66fe084d45a3f1392d48124b1 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 07:54:44 +0000
Subject: [PATCH 058/253] fix(nc-gui): long text field alignment in grid cell

---
 packages/nc-gui/components/cell/RichText.vue  | 10 +++++++---
 packages/nc-gui/components/cell/TextArea.vue  | 20 ++++++++++++++++---
 .../nc-gui/components/nc/ErrorBoundary.vue    |  9 ++++++++-
 packages/nc-gui/nuxt.config.ts                |  2 +-
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index bb21d91cc8..422bea455f 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -9,7 +9,7 @@ import Underline from '@tiptap/extension-underline'
 import Placeholder from '@tiptap/extension-placeholder'
 import { TaskItem } from '@/helpers/dbTiptapExtensions/task-item'
 import { Link } from '@/helpers/dbTiptapExtensions/links'
-import { IsExpandedFormOpenInj, IsFormInj, ReadonlyInj, RowHeightInj } from '#imports'
+import { IsExpandedFormOpenInj, IsFormInj, IsGridInj, ReadonlyInj, RowHeightInj } from '#imports'
 
 const props = defineProps<{
   value?: string | null
@@ -33,6 +33,8 @@ const readOnlyCell = inject(ReadonlyInj, ref(false))
 
 const isForm = inject(IsFormInj, ref(false))
 
+const isGrid = inject(IsGridInj, ref(false))
+
 const isFocused = ref(false)
 
 const turndownService = new TurndownService({})
@@ -222,6 +224,7 @@ useEventListener(
       'nc-rich-text-embed flex flex-col pl-1 w-full': !fullMode,
       'readonly': readOnly,
       'nc-form-rich-text-field !p-0': isFormField,
+      'nc-rich-text-grid': isGrid,
     }"
     :tabindex="readOnlyCell || isFormField ? -1 : 0"
   >
@@ -285,11 +288,12 @@ useEventListener(
   .ProseMirror {
     @apply !border-transparent max-h-full;
   }
-  &:not(.nc-form-rich-text-field) {
+  &:not(.nc-form-rich-text-field):not(.nc-rich-text-grid) {
     .ProseMirror {
       min-height: 8rem;
     }
   }
+
   &.nc-form-rich-text-field {
     .ProseMirror {
       padding: 0;
@@ -346,7 +350,7 @@ useEventListener(
     pointer-events: none;
   }
   .ProseMirror {
-    @apply flex-grow pt-1 border-1 border-gray-200 rounded-lg;
+    @apply flex-grow pt-1.5 border-1 border-gray-200 rounded-lg;
 
     > * {
       @apply ml-1;
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 2c5e0139a7..9284767798 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -203,7 +203,7 @@ watch(inputWrapperRef, () => {
 <template>
   <div>
     <div
-      class="flex flex-row pt-0.5 w-full long-text-wrapper"
+      class="flex flex-row w-full long-text-wrapper"
       :class="{
         'min-h-10': rowHeight !== 1 || isExpandedFormOpen,
         'min-h-9': rowHeight === 1 && !isExpandedFormOpen,
@@ -213,6 +213,10 @@ watch(inputWrapperRef, () => {
       <div
         v-if="isRichMode"
         class="w-full cursor-pointer nc-readonly-rich-text-wrapper"
+        :class="{
+          'nc-readonly-rich-text-grid ': !isExpandedFormOpen && !isForm,
+          'nc-readonly-rich-text-sort-height': rowHeight === 1 && !isExpandedFormOpen && !isForm,
+        }"
         :style="{
           maxHeight: isForm ? undefined : isExpandedFormOpen ? `${height}px` : `${25 * (rowHeight || 1)}px`,
           minHeight: isForm ? undefined : isExpandedFormOpen ? `${height}px` : `${25 * (rowHeight || 1)}px`,
@@ -256,10 +260,9 @@ watch(inputWrapperRef, () => {
         v-else-if="rowHeight"
         :value="vModel"
         :lines="rowHeight"
-        class="mr-7 nc-text-area-clamped-text"
+        class="nc-text-area-clamped-text my-auto"
         :style="{
           'word-break': 'break-word',
-          'white-space': 'pre-line',
           'max-height': `${25 * (rowHeight || 1)}px`,
         }"
         @click="onTextClick"
@@ -350,6 +353,17 @@ textarea:focus {
 .nc-longtext-scrollbar {
   @apply scrollbar-thin scrollbar-thumb-gray-200 hover:scrollbar-thumb-gray-300 scrollbar-track-transparent;
 }
+
+.nc-readonly-rich-text-wrapper {
+  &.nc-readonly-rich-text-grid {
+    :deep(.ProseMirror) {
+      @apply !pt-0;
+    }
+    &.nc-readonly-rich-text-sort-height {
+      @apply mt-2;
+    }
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/packages/nc-gui/components/nc/ErrorBoundary.vue b/packages/nc-gui/components/nc/ErrorBoundary.vue
index 83da1797ed..cefbd1d786 100644
--- a/packages/nc-gui/components/nc/ErrorBoundary.vue
+++ b/packages/nc-gui/components/nc/ErrorBoundary.vue
@@ -66,7 +66,14 @@ export default {
 <template>
   <slot :key="key"></slot>
   <slot name="error">
-    <NcModal v-if="error" v-model:visible="errModal" :class="{ active: errModal }" :centered="true" :closable="false" :footer="null">
+    <NcModal
+      v-if="error"
+      v-model:visible="errModal"
+      :class="{ active: errModal }"
+      :centered="true"
+      :closable="false"
+      :footer="null"
+    >
       <div class="w-full flex flex-col gap-1">
         <h2 class="text-xl font-semibold">Oops! Something unexpected happened :/</h2>
 
diff --git a/packages/nc-gui/nuxt.config.ts b/packages/nc-gui/nuxt.config.ts
index 877fedeaa9..09bcb62fb0 100644
--- a/packages/nc-gui/nuxt.config.ts
+++ b/packages/nc-gui/nuxt.config.ts
@@ -234,4 +234,4 @@ export default defineNuxtConfig({
       { name: 'storeToRefs', from: 'pinia' },
     ],
   },
-})
\ No newline at end of file
+})

From 178668348f4eb97e82f453a580ef7d0881481cf0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:40:00 +0000
Subject: [PATCH 059/253] fix(nc-gui): hide table or base it is blank

---
 .../components/dashboard/TreeView/TableNode.vue  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 309446907d..8242f98395 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -138,6 +138,22 @@ watch(
 const isTableOpened = computed(() => {
   return openedTableId.value === table.value?.id && (activeView.value?.is_default || !activeViewTitleOrId.value)
 })
+
+const baseTimeout = ref()
+
+watch(openedTableId, () => {
+  if (table.value.id !== openedTableId.value && isExpanded.value) {
+    if (baseTimeout.value) {
+      clearTimeout(baseTimeout.value)
+    }
+    baseTimeout.value = setTimeout(() => {
+      if (isExpanded.value) {
+        isExpanded.value = false
+      }
+      clearTimeout(baseTimeout.value)
+    }, 5000)
+  }
+})
 </script>
 
 <template>

From a2afaa8dc2b80d4c4d9fe856f83b0532bef78d7f Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:40:00 +0000
Subject: [PATCH 060/253] fix(nc-gui): small changes

---
 .../nc-gui/components/dashboard/TreeView/TableNode.vue     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 8242f98395..f34c0bdcbb 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -142,10 +142,11 @@ const isTableOpened = computed(() => {
 const baseTimeout = ref()
 
 watch(openedTableId, () => {
+  console.log('view ', openedTableId.value)
+  if (baseTimeout.value) {
+    clearTimeout(baseTimeout.value)
+  }
   if (table.value.id !== openedTableId.value && isExpanded.value) {
-    if (baseTimeout.value) {
-      clearTimeout(baseTimeout.value)
-    }
     baseTimeout.value = setTimeout(() => {
       if (isExpanded.value) {
         isExpanded.value = false

From a96e191016db8ae7b8de08f2d774f9974ba35e8d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:40:00 +0000
Subject: [PATCH 061/253] fix(nc-gui): auto collapse empty tables after 10s
 except active table

---
 .../dashboard/TreeView/TableNode.vue          | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index f34c0bdcbb..81a36c3594 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -45,7 +45,7 @@ provide(SidebarTableInj, table)
 const { setMenuContext, openRenameTableDialog, duplicateTable } = inject(TreeViewInj)!
 
 const { loadViews: _loadViews } = useViewsStore()
-const { activeView, activeViewTitleOrId } = storeToRefs(useViewsStore())
+const { activeView, activeViewTitleOrId, viewsByTable } = storeToRefs(useViewsStore())
 const { isLeftSidebarOpen } = storeToRefs(useSidebarStore())
 
 // todo: temp
@@ -139,20 +139,24 @@ const isTableOpened = computed(() => {
   return openedTableId.value === table.value?.id && (activeView.value?.is_default || !activeViewTitleOrId.value)
 })
 
-const baseTimeout = ref()
+const tableTimeout = ref()
 
 watch(openedTableId, () => {
-  console.log('view ', openedTableId.value)
-  if (baseTimeout.value) {
-    clearTimeout(baseTimeout.value)
+  if (tableTimeout.value) {
+    clearTimeout(tableTimeout.value)
   }
-  if (table.value.id !== openedTableId.value && isExpanded.value) {
-    baseTimeout.value = setTimeout(() => {
+
+  if (base.value.id === activeView.value?.base_id && table.value.id !== openedTableId.value && isExpanded.value) {
+    const views = viewsByTable.value.get(table.value.id!)?.filter((v) => !v.is_default) ?? []
+
+    if (views.length) return
+
+    tableTimeout.value = setTimeout(() => {
       if (isExpanded.value) {
         isExpanded.value = false
       }
-      clearTimeout(baseTimeout.value)
-    }, 5000)
+      clearTimeout(tableTimeout.value)
+    }, 10000)
   }
 })
 </script>

From edf6ee904093dae699baac8973ed478c6cc131e9 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:40:00 +0000
Subject: [PATCH 062/253] fix(nc-gui): auto collapse all base empty table

---
 packages/nc-gui/components/dashboard/TreeView/TableNode.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 81a36c3594..64904ededd 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -146,7 +146,7 @@ watch(openedTableId, () => {
     clearTimeout(tableTimeout.value)
   }
 
-  if (base.value.id === activeView.value?.base_id && table.value.id !== openedTableId.value && isExpanded.value) {
+  if (table.value.id !== openedTableId.value && isExpanded.value) {
     const views = viewsByTable.value.get(table.value.id!)?.filter((v) => !v.is_default) ?? []
 
     if (views.length) return

From ed8d5a9769398d5cf65191194b630e1388f0b96f Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:40:01 +0000
Subject: [PATCH 063/253] fix(nc-gui): PR review changes #2487

---
 .../nc-gui/components/dashboard/TreeView/TableNode.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 64904ededd..e4071a7d3c 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -139,11 +139,11 @@ const isTableOpened = computed(() => {
   return openedTableId.value === table.value?.id && (activeView.value?.is_default || !activeViewTitleOrId.value)
 })
 
-const tableTimeout = ref()
+let tableTimeout: number
 
 watch(openedTableId, () => {
-  if (tableTimeout.value) {
-    clearTimeout(tableTimeout.value)
+  if (tableTimeout) {
+    clearTimeout(tableTimeout)
   }
 
   if (table.value.id !== openedTableId.value && isExpanded.value) {
@@ -151,11 +151,11 @@ watch(openedTableId, () => {
 
     if (views.length) return
 
-    tableTimeout.value = setTimeout(() => {
+    tableTimeout = setTimeout(() => {
       if (isExpanded.value) {
         isExpanded.value = false
       }
-      clearTimeout(tableTimeout.value)
+      clearTimeout(tableTimeout)
     }, 10000)
   }
 })

From 038013d47e75550de11414831a0d546d30c72c5d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:09 +0000
Subject: [PATCH 064/253] feat(nc-gui): prefill shared form setup

---
 .../dlg/share-and-collaborate/SharePage.vue   | 98 ++++++++++++++-----
 packages/nc-gui/lang/en.json                  |  9 +-
 packages/nc-gui/lib/enums.ts                  |  7 ++
 3 files changed, 88 insertions(+), 26 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index ebc85cc9ca..dd559457b8 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ColumnType, KanbanType, ViewType } from 'nocodb-sdk'
 import { ViewTypes } from 'nocodb-sdk'
-import { useMetas } from '#imports'
+import { useMetas, PreFilledMode } from '#imports'
 
 const { view: _view, $api } = useSmartsheetStoreOrThrow()
 const { $e } = useNuxtApp()
@@ -44,6 +44,10 @@ const activeView = computed<(ViewType & { meta: object & Record<string, any> })
   },
 })
 
+const isPublicShared = computed(() => {
+  return !!activeView.value?.uuid
+})
+
 const url = computed(() => {
   return sharedViewUrl() ?? ''
 })
@@ -145,6 +149,16 @@ const surveyMode = computed({
   },
 })
 
+const preFilledMode = computed({
+  get: () => parseProp(activeView.value?.meta)?.preFilledMode || PreFilledMode.Default,
+  set: (preFilled) => {
+    if (!activeView.value?.meta) return
+
+    activeView.value.meta = { ...activeView.value.meta, preFilledMode: preFilled }
+    savePreFilledMode()
+  },
+})
+
 function sharedViewUrl() {
   if (!activeView.value) return
 
@@ -254,9 +268,10 @@ async function updateSharedView() {
   return true
 }
 
-const isPublicShared = computed(() => {
-  return !!activeView.value?.uuid
-})
+async function savePreFilledMode() {
+  await updateSharedView()
+  $e(`a:view:share:${preFilledMode.value}-prefilled-mode`)
+}
 </script>
 
 <template>
@@ -307,11 +322,7 @@ const isPublicShared = computed(() => {
           <div
             v-if="
               activeView &&
-              (activeView.type === ViewTypes.GRID ||
-                activeView.type === ViewTypes.KANBAN ||
-                activeView.type === ViewTypes.GALLERY ||
-                activeView.type === ViewTypes.MAP ||
-                activeView.type === ViewTypes.CALENDAR)
+              [ViewTypes.GRID, ViewTypes.KANBAN, ViewTypes.GALLERY, ViewTypes.MAP, ViewTypes.CALENDAR].includes(activeView.type)
             "
             class="flex flex-row justify-between"
           >
@@ -325,23 +336,54 @@ const isPublicShared = computed(() => {
             />
           </div>
 
-          <div v-if="activeView?.type === ViewTypes.FORM" class="flex flex-row justify-between">
-            <div class="text-black">{{ $t('activity.surveyMode') }}</div>
-            <a-switch
-              v-model:checked="surveyMode"
-              v-e="['c:share:view:surver-mode:toggle']"
-              data-testid="nc-modal-share-view__surveyMode"
-            >
-            </a-switch>
-          </div>
-          <div v-if="activeView?.type === ViewTypes.FORM && !isEeUI" class="flex flex-row justify-between">
-            <div class="text-black">{{ $t('activity.rtlOrientation') }}</div>
-            <a-switch
-              v-model:checked="withRTL"
-              v-e="['c:share:view:rtl-orientation:toggle']"
-              data-testid="nc-modal-share-view__RTL"
+          <template v-if="activeView?.type === ViewTypes.FORM">
+            <div class="flex flex-row justify-between">
+              <div class="text-black">{{ $t('activity.surveyMode') }}</div>
+              <a-switch
+                v-model:checked="surveyMode"
+                v-e="['c:share:view:surver-mode:toggle']"
+                data-testid="nc-modal-share-view__surveyMode"
+              >
+              </a-switch>
+            </div>
+            <div v-if="!isEeUI" class="flex flex-row justify-between">
+              <div class="text-black">{{ $t('activity.rtlOrientation') }}</div>
+              <a-switch
+                v-model:checked="withRTL"
+                v-e="['c:share:view:rtl-orientation:toggle']"
+                data-testid="nc-modal-share-view__RTL"
+              >
+              </a-switch>
+            </div>
+          </template>
+        </div>
+        <div
+          v-if="activeView?.type === ViewTypes.FORM"
+          class="nc-pre-filled-mode-wrapper flex flex-col justify-between gap-y-3 mt-1 py-2 px-3 bg-gray-50 rounded-md"
+        >
+          <div>
+            <div class="text-black">{{ $t('activity.preFilledFields.title') }}</div>
+
+            <a-select
+              v-model:value="preFilledMode"
+              class="nc-pre-filled-mode !rounded-md w-full"
+              dropdown-class-name="nc-dropdown-pre-filled-mode border-1 !rounded-md border-gray-200"
             >
-            </a-switch>
+              <template #suffixIcon>
+                <GeneralIcon icon="arrowDown" class="text-gray-700" />
+              </template>
+              <a-select-option v-for="mode of Object.values(PreFilledMode)" :key="mode" :value="mode">
+                <div class="flex gap-2 items-center">
+                  <div class="flex-1">{{ $t(`activity.preFilledFields.${mode}`) }}</div>
+                  <component
+                    :is="iconMap.check"
+                    v-if="preFilledMode === mode"
+                    id="nc-selected-item-icon"
+                    class="text-primary w-4 h-4"
+                  />
+                </div>
+              </a-select-option>
+            </a-select>
           </div>
         </div>
       </template>
@@ -367,4 +409,10 @@ const isPublicShared = computed(() => {
     line-height: 1rem !important;
   }
 }
+
+.nc-pre-filled-mode-wrapper {
+  .nc-pre-filled-mode.ant-select {
+    @apply !p-0 mt-2;
+  }
+}
 </style>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index f7c5751ed5..710665b281 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -926,7 +926,14 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Pre-filled Fields",
+      "default": "Allow pre-filling fields",
+      "disabled": "Disable pre-filling fields",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields"
+    }
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
diff --git a/packages/nc-gui/lib/enums.ts b/packages/nc-gui/lib/enums.ts
index d490484794..5001d068c9 100644
--- a/packages/nc-gui/lib/enums.ts
+++ b/packages/nc-gui/lib/enums.ts
@@ -136,3 +136,10 @@ export enum ImportSource {
   URL = 'url',
   STRING = 'string',
 }
+
+export enum PreFilledMode {
+  Default = 'default',
+  Disabled = 'disabled',
+  Locked = 'locked',
+  Hidden = 'hidden',
+}

From d7729b5de52c9615487e736912c3c5564b900fa0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:09 +0000
Subject: [PATCH 065/253] fix(nc-gui): small changes in share form store

---
 .../nc-gui/composables/useSharedFormViewStore.ts   | 14 +++++++++++---
 packages/nc-gui/lib/types.ts                       |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 4be41faebc..f303af99f2 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -30,6 +30,7 @@ import {
   useProvideSmartsheetRowStore,
   useViewsStore,
   watch,
+  PreFilledMode,
 } from '#imports'
 import type { SharedViewMeta } from '#imports'
 
@@ -65,6 +66,8 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
 
   const { t } = useI18n()
 
+  const route = useRoute()
+
   const formState = ref<Record<string, any>>({})
 
   const { state: additionalState } = useProvideSmartsheetRowStore(
@@ -79,9 +82,14 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const fieldRequired = (fieldName = 'This field') =>
     helpers.withMessage(t('msg.error.fieldRequired', { value: fieldName }), required)
 
-  const formColumns = computed(() =>
-    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || isLinksOrLTAR(col.uidt)),
-  )
+  const formColumns = computed(() => {
+    const filterdFormColumns = columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || isLinksOrLTAR(col.uidt))
+    // if (Object.keys(route.query).length && sharedViewMeta.value.preFilledMode !== PreFilledMode.Disabled) {
+
+    // }
+
+    return filterdFormColumns
+  })
 
   const loadSharedView = async () => {
     passwordError.value = null
diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts
index 7109e5e316..cd61b37e47 100644
--- a/packages/nc-gui/lib/types.ts
+++ b/packages/nc-gui/lib/types.ts
@@ -2,7 +2,7 @@ import type { BaseType, ColumnType, FilterType, MetaType, PaginatedType, Roles,
 import type { I18n } from 'vue-i18n'
 import type { Theme as AntTheme } from 'ant-design-vue/es/config-provider'
 import type { UploadFile } from 'ant-design-vue'
-import type { ImportSource, ImportType, TabType } from './enums'
+import type { ImportSource, ImportType, PreFilledMode, TabType } from './enums'
 import type { rolePermissions } from './acl'
 
 interface User {
@@ -115,6 +115,7 @@ interface SharedViewMeta extends Record<string, any> {
   theme?: Partial<ThemeConfig>
   allowCSVDownload?: boolean
   rtl?: boolean
+  preFilledMode?: PreFilledMode
 }
 
 interface SharedView {

From 2973185708d0d5f53cbf1de60a1ac2e3f4f7aa5f Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:09 +0000
Subject: [PATCH 066/253] feat(nc-gui): allow prefill shared form setup

---
 .../composables/useSharedFormViewStore.ts     | 70 ++++++++++++++++---
 .../[typeOrId]/form/[viewId]/index/index.vue  |  3 +-
 .../[typeOrId]/form/[viewId]/index/survey.vue |  3 +-
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index f303af99f2..6e7b971125 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -49,8 +49,15 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
 
   const sharedFormView = ref<FormType>()
   const meta = ref<TableType>()
-  const columns =
-    ref<(ColumnType & { required?: BoolType; show?: BoolType; label?: StringOrNullType; enable_scanner?: BoolType })[]>()
+  const columns = ref<
+    (ColumnType & {
+      required?: BoolType
+      show?: BoolType
+      label?: StringOrNullType
+      enable_scanner?: BoolType
+      read_only?: boolean
+    })[]
+  >()
   const sharedViewMeta = ref<SharedViewMeta>({})
   const formResetHook = createEventHook<void>()
 
@@ -82,14 +89,9 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const fieldRequired = (fieldName = 'This field') =>
     helpers.withMessage(t('msg.error.fieldRequired', { value: fieldName }), required)
 
-  const formColumns = computed(() => {
-    const filterdFormColumns = columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || isLinksOrLTAR(col.uidt))
-    // if (Object.keys(route.query).length && sharedViewMeta.value.preFilledMode !== PreFilledMode.Disabled) {
-
-    // }
-
-    return filterdFormColumns
-  })
+  const formColumns = computed(() =>
+    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || isLinksOrLTAR(col.uidt)),
+  )
 
   const loadSharedView = async () => {
     passwordError.value = null
@@ -126,6 +128,8 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
 
       await setMeta(viewMeta.model)
 
+      handlePreFillForm()
+
       // if base is not defined then set it with an object containing source
       if (!base.value?.sources)
         baseStore.setProject({
@@ -245,6 +249,52 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     v$.value?.$reset()
   }
 
+  function handlePreFillForm() {
+    // http://localhost:3000/#/nc/form/070dbc84-f3ca-43a3-808a-3547a873933f?Multiselect=a,b
+    if (Object.keys(route.query).length && sharedViewMeta.value.preFilledMode !== PreFilledMode.Disabled) {
+      console.log('router', route.query)
+      columns.value = columns.value?.map((c) => {
+        if ((c.label || c.title) && route.query?.[c.label!] === undefined && route.query?.[c.title!] === undefined) {
+          return c
+        }
+
+        switch (sharedViewMeta.value.preFilledMode) {
+          case PreFilledMode.Hidden: {
+            c.show = false
+          }
+          case PreFilledMode.Locked: {
+            c.read_only = true
+          }
+        }
+        switch (c.uidt) {
+          case UITypes.SingleSelect:
+          case UITypes.MultiSelect: {
+            const allValues = (c.dtxp as string)?.split(',').map((o) => o?.replace(/^['"]|['"]$/g, ''))
+            let options = ((route.query?.[c.label!] || route.query?.[c.title!]) as string)?.split(',').filter((op) => {
+              console.log('options', op, allValues, allValues.includes(op))
+              if (allValues.includes(op)) return true
+            })
+            console.log('c', options, c)
+            if (options.length) {
+              formState.value[c.title!] = c.uidt === UITypes.SingleSelect ? options[0] : options.join(',')
+            }
+            break
+          }
+          case UITypes.User: {
+            break
+          }
+          default: {
+            formState.value[c.title!] = route.query?.[c.label!] || route.query?.[c.title!]
+          }
+        }
+
+        return c
+      })
+
+      console.log('column', columns.value)
+    }
+  }
+
   /** reset form if show_blank_form is true */
   watch(submitted, (nextVal) => {
     if (nextVal && sharedFormView.value?.show_blank_form) {
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index ac9aa25d17..6c929fec4a 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -200,7 +200,8 @@ const onDecode = async (scannedCodeValue: string) => {
                           { 'layout-list': parseProp(field?.meta)?.isList },
                         ]"
                         :column="field"
-                        edit-enabled
+                        :edit-enabled="!field?.read_only"
+                        :read-only="field?.read_only"
                       />
                       <a-button
                         v-if="field.enable_scanner"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
index 0f104e3e9b..1939f39844 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
@@ -297,7 +297,8 @@ onMounted(() => {
                 :class="parseProp(field?.meta)?.isList ? 'layout-list' : ''"
                 :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
                 :column="field"
-                edit-enabled
+                :edit-enabled="!field?.read_only"
+                :read-only="field?.read_only"
               />
 
               <div class="flex flex-col gap-2 text-slate-500 dark:text-slate-300 text-[0.75rem] my-2 px-1">

From 35dd69fa81eda7e09cef7e63819c85b10e48f3c4 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:09 +0000
Subject: [PATCH 067/253] fix(nc-gui): use only title for query params in
 prefill form

---
 .../composables/useSharedFormViewStore.ts     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 6e7b971125..c977d19579 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -7,6 +7,7 @@ import type {
   FormColumnType,
   FormType,
   LinkToAnotherRecordType,
+  SelectOptionsType,
   StringOrNullType,
   TableType,
 } from 'nocodb-sdk'
@@ -254,9 +255,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     if (Object.keys(route.query).length && sharedViewMeta.value.preFilledMode !== PreFilledMode.Disabled) {
       console.log('router', route.query)
       columns.value = columns.value?.map((c) => {
-        if ((c.label || c.title) && route.query?.[c.label!] === undefined && route.query?.[c.title!] === undefined) {
-          return c
-        }
+        if (!c.title || !route.query?.[c.title]) return c
 
         switch (sharedViewMeta.value.preFilledMode) {
           case PreFilledMode.Hidden: {
@@ -269,22 +268,32 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         switch (c.uidt) {
           case UITypes.SingleSelect:
           case UITypes.MultiSelect: {
-            const allValues = (c.dtxp as string)?.split(',').map((o) => o?.replace(/^['"]|['"]$/g, ''))
-            let options = ((route.query?.[c.label!] || route.query?.[c.title!]) as string)?.split(',').filter((op) => {
-              console.log('options', op, allValues, allValues.includes(op))
-              if (allValues.includes(op)) return true
-            })
+            const limitOptions = Array.isArray(parseProp(c.meta).limitOptions)
+              ? parseProp(c.meta).limitOptions.reduce((ac, op) => {
+                  if (op?.id) {
+                    ac[op.id] = op
+                  }
+                  return ac
+                }, {})
+              : {}
+            const queryOptions = (route.query?.[c.title] as string)?.split(',')
+            let options = ((c.colOptions || []) as SelectOptionsType).options
+              .filter((op) => {
+                if (queryOptions.includes(op?.title!) && (limitOptions[op?.id!] ? limitOptions[op?.id!]?.show : true)) return true
+              })
+              .map((op) => op.title)
             console.log('c', options, c)
             if (options.length) {
-              formState.value[c.title!] = c.uidt === UITypes.SingleSelect ? options[0] : options.join(',')
+              formState.value[c.title] = c.uidt === UITypes.SingleSelect ? options[0] : options.join(',')
             }
+            console.log('form state', formState.value[c.title])
             break
           }
           case UITypes.User: {
             break
           }
           default: {
-            formState.value[c.title!] = route.query?.[c.label!] || route.query?.[c.title!]
+            formState.value[c.title] = route.query?.[c.title]
           }
         }
 

From 9a57f4fca0aca7db1e2c2797ec72ceeb13bac8c2 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:10 +0000
Subject: [PATCH 068/253] feat(nc-gui): prefill user, text & numeric fields

---
 .../dlg/share-and-collaborate/SharePage.vue   |   2 +-
 .../nc-gui/components/smartsheet/Cell.vue     |  10 +-
 .../composables/useSharedFormViewStore.ts     | 103 +++++++++++++-----
 packages/nc-gui/utils/cell.ts                 |  11 ++
 4 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index dd559457b8..8368d6766b 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { ColumnType, KanbanType, ViewType } from 'nocodb-sdk'
 import { ViewTypes } from 'nocodb-sdk'
-import { useMetas, PreFilledMode } from '#imports'
+import { PreFilledMode, useMetas } from '#imports'
 
 const { view: _view, $api } = useSmartsheetStoreOrThrow()
 const { $e } = useNuxtApp()
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index 56165395fc..22b8d300af 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -29,6 +29,7 @@ import {
   isJSON,
   isManualSaved,
   isMultiSelect,
+  isNumericFieldType,
   isPercent,
   isPhoneNumber,
   isPrimary,
@@ -142,14 +143,7 @@ const navigate = (dir: NavigateDir, e: KeyboardEvent) => {
 }
 
 const isNumericField = computed(() => {
-  return (
-    isInt(column.value, abstractType.value) ||
-    isFloat(column.value, abstractType.value) ||
-    isDecimal(column.value) ||
-    isCurrency(column.value) ||
-    isPercent(column.value) ||
-    isDuration(column.value)
-  )
+  return isNumericFieldType(column.value, abstractType.value)
 })
 
 // disable contexxtmenu event propagation when cell is in
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index c977d19579..87fea962cf 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -11,15 +11,18 @@ import type {
   StringOrNullType,
   TableType,
 } from 'nocodb-sdk'
-import { ErrorMessages, RelationTypes, UITypes, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
+import { ErrorMessages, RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { isString } from '@vue/shared'
 import { filterNullOrUndefinedObjectProperties } from '~/helpers/parsers/parserHelpers'
 import {
+  PreFilledMode,
   SharedViewPasswordInj,
   computed,
   createEventHook,
   extractSdkResponseErrorMsg,
+  isNumericFieldType,
   message,
+  parseProp,
   provide,
   ref,
   storeToRefs,
@@ -31,7 +34,6 @@ import {
   useProvideSmartsheetRowStore,
   useViewsStore,
   watch,
-  PreFilledMode,
 } from '#imports'
 import type { SharedViewMeta } from '#imports'
 
@@ -67,9 +69,10 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const { metas, setMeta } = useMetas()
 
   const baseStore = useBase()
-  const { base } = storeToRefs(baseStore)
+  const { base, sqlUis } = storeToRefs(baseStore)
 
   const basesStore = useBases()
+
   const { basesUser } = storeToRefs(basesStore)
 
   const { t } = useI18n()
@@ -129,8 +132,6 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
 
       await setMeta(viewMeta.model)
 
-      handlePreFillForm()
-
       // if base is not defined then set it with an object containing source
       if (!base.value?.sources)
         baseStore.setProject({
@@ -149,6 +150,8 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       if (viewMeta.users) {
         basesUser.value.set(viewMeta.base_id, viewMeta.users)
       }
+
+      handlePreFillForm()
     } catch (e: any) {
       if (e.response && e.response.status === 404) {
         notFound.value = true
@@ -255,47 +258,87 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     if (Object.keys(route.query).length && sharedViewMeta.value.preFilledMode !== PreFilledMode.Disabled) {
       console.log('router', route.query)
       columns.value = columns.value?.map((c) => {
-        if (!c.title || !route.query?.[c.title]) return c
+        if (!c.title || !route.query?.[c.title] || isSystemColumn(c) || (isVirtualCol(c) && !isLinksOrLTAR(c)) || isAttachment(c))
+          return c
 
         switch (sharedViewMeta.value.preFilledMode) {
           case PreFilledMode.Hidden: {
             c.show = false
+            break
           }
           case PreFilledMode.Locked: {
             c.read_only = true
+            break
           }
         }
+
         switch (c.uidt) {
           case UITypes.SingleSelect:
-          case UITypes.MultiSelect: {
-            const limitOptions = Array.isArray(parseProp(c.meta).limitOptions)
-              ? parseProp(c.meta).limitOptions.reduce((ac, op) => {
-                  if (op?.id) {
-                    ac[op.id] = op
-                  }
-                  return ac
-                }, {})
-              : {}
+          case UITypes.MultiSelect:
+          case UITypes.User: {
+            const limitOptions = (parseProp(c.meta).limitOptions || []).reduce((ac, op) => {
+              if (op?.id) {
+                ac[op.id] = op
+              }
+              return ac
+            }, {})
+
             const queryOptions = (route.query?.[c.title] as string)?.split(',')
-            let options = ((c.colOptions || []) as SelectOptionsType).options
-              .filter((op) => {
-                if (queryOptions.includes(op?.title!) && (limitOptions[op?.id!] ? limitOptions[op?.id!]?.show : true)) return true
-              })
-              .map((op) => op.title)
-            console.log('c', options, c)
-            if (options.length) {
-              formState.value[c.title] = c.uidt === UITypes.SingleSelect ? options[0] : options.join(',')
+
+            let options: string[] = []
+
+            if ([UITypes.SingleSelect, UITypes.MultiSelect].includes(c.uidt as UITypes)) {
+              options = ((c.colOptions as SelectOptionsType)?.options || [])
+                .filter((op) => {
+                  if (
+                    op?.id &&
+                    op?.title &&
+                    queryOptions.includes(op.title) &&
+                    (limitOptions[op.id] ? limitOptions[op.id]?.show : !(parseProp(c.meta).limitOptions || []).length)
+                  ) {
+                    return true
+                  }
+                  return false
+                })
+                .map((op) => op.title as string)
+
+              if (options.length) {
+                formState.value[c.title] = c.uidt === UITypes.SingleSelect ? options[0] : options.join(',')
+              }
+            } else {
+              options = (meta.value?.base_id ? basesUser.value.get(meta.value.base_id) || [] : [])
+                .filter((user) => {
+                  if (
+                    user?.id &&
+                    user?.email &&
+                    queryOptions.includes(user.email) &&
+                    (limitOptions[user.id] ? limitOptions[user.id]?.show : !(parseProp(c.meta).limitOptions || []).length)
+                  ) {
+                    return true
+                  }
+                  return false
+                })
+                .map((user) => user.email)
+
+              if (options.length) {
+                formState.value[c.title] = !parseProp(c.meta)?.is_multi ? options[0] : options.join(',')
+              }
             }
-            console.log('form state', formState.value[c.title])
-            break
-          }
-          case UITypes.User: {
             break
           }
           default: {
-            formState.value[c.title] = route.query?.[c.title]
+            if (isNumericFieldType(c, getColAbstractType(c))) {
+              if (!isNaN(parseInt(route.query?.[c.title] as string))) {
+                formState.value[c.title] = parseInt(route.query?.[c.title] as string)
+              }
+            } else {
+              formState.value[c.title] = route.query?.[c.title]
+            }
           }
         }
+        console.log('c', c)
+
+        console.log('form state', formState.value)
 
         return c
       })
@@ -304,6 +347,10 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     }
   }
 
+  function getColAbstractType(c: ColumnType) {
+    return (c?.source_id ? sqlUis.value[c?.source_id] : Object.values(sqlUis.value)[0]).getAbstractType(c)
+  }
+
   /** reset form if show_blank_form is true */
   watch(submitted, (nextVal) => {
     if (nextVal && sharedFormView.value?.show_blank_form) {
diff --git a/packages/nc-gui/utils/cell.ts b/packages/nc-gui/utils/cell.ts
index 4df66dab79..66e73c81a5 100644
--- a/packages/nc-gui/utils/cell.ts
+++ b/packages/nc-gui/utils/cell.ts
@@ -82,3 +82,14 @@ export const renderValue = (result?: any) => {
     return dayjs(d).isValid() ? dayjs(d).format('YYYY-MM-DD HH:mm') : d
   })
 }
+
+export const isNumericFieldType = (column: ColumnType, abstractType: any) => {
+  return (
+    isInt(column, abstractType) ||
+    isFloat(column, abstractType) ||
+    isDecimal(column) ||
+    isCurrency(column) ||
+    isPercent(column) ||
+    isDuration(column)
+  )
+}

From eaeb3b57b70affee99dfeea0b886042ebdd95cfd Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:10 +0000
Subject: [PATCH 069/253] feat(nc-gui): add prefill support for rating, url,
 checkbox, year, data & dateTime fields

---
 .../composables/useSharedFormViewStore.ts     | 225 ++++++++++++------
 1 file changed, 156 insertions(+), 69 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 87fea962cf..cd23ad7e06 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -1,5 +1,6 @@
 import useVuelidate from '@vuelidate/core'
 import { helpers, minLength, required } from '@vuelidate/validators'
+import dayjs from 'dayjs'
 import type { Ref } from 'vue'
 import type {
   BoolType,
@@ -11,7 +12,16 @@ import type {
   StringOrNullType,
   TableType,
 } from 'nocodb-sdk'
-import { ErrorMessages, RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import {
+  ErrorMessages,
+  RelationTypes,
+  UITypes,
+  getDateFormat,
+  getDateTimeFormat,
+  isLinksOrLTAR,
+  isSystemColumn,
+  isVirtualCol,
+} from 'nocodb-sdk'
 import { isString } from '@vue/shared'
 import { filterNullOrUndefinedObjectProperties } from '~/helpers/parsers/parserHelpers'
 import {
@@ -258,9 +268,17 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     if (Object.keys(route.query).length && sharedViewMeta.value.preFilledMode !== PreFilledMode.Disabled) {
       console.log('router', route.query)
       columns.value = columns.value?.map((c) => {
-        if (!c.title || !route.query?.[c.title] || isSystemColumn(c) || (isVirtualCol(c) && !isLinksOrLTAR(c)) || isAttachment(c))
+        if (
+          !c.title ||
+          !route.query?.[c.title] ||
+          isSystemColumn(c) ||
+          (isVirtualCol(c) && !isLinksOrLTAR(c)) ||
+          isAttachment(c)
+        ) {
           return c
+        }
 
+        // Update column
         switch (sharedViewMeta.value.preFilledMode) {
           case PreFilledMode.Hidden: {
             c.show = false
@@ -272,77 +290,15 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
           }
         }
 
-        switch (c.uidt) {
-          case UITypes.SingleSelect:
-          case UITypes.MultiSelect:
-          case UITypes.User: {
-            const limitOptions = (parseProp(c.meta).limitOptions || []).reduce((ac, op) => {
-              if (op?.id) {
-                ac[op.id] = op
-              }
-              return ac
-            }, {})
-
-            const queryOptions = (route.query?.[c.title] as string)?.split(',')
-
-            let options: string[] = []
-
-            if ([UITypes.SingleSelect, UITypes.MultiSelect].includes(c.uidt as UITypes)) {
-              options = ((c.colOptions as SelectOptionsType)?.options || [])
-                .filter((op) => {
-                  if (
-                    op?.id &&
-                    op?.title &&
-                    queryOptions.includes(op.title) &&
-                    (limitOptions[op.id] ? limitOptions[op.id]?.show : !(parseProp(c.meta).limitOptions || []).length)
-                  ) {
-                    return true
-                  }
-                  return false
-                })
-                .map((op) => op.title as string)
-
-              if (options.length) {
-                formState.value[c.title] = c.uidt === UITypes.SingleSelect ? options[0] : options.join(',')
-              }
-            } else {
-              options = (meta.value?.base_id ? basesUser.value.get(meta.value.base_id) || [] : [])
-                .filter((user) => {
-                  if (
-                    user?.id &&
-                    user?.email &&
-                    queryOptions.includes(user.email) &&
-                    (limitOptions[user.id] ? limitOptions[user.id]?.show : !(parseProp(c.meta).limitOptions || []).length)
-                  ) {
-                    return true
-                  }
-                  return false
-                })
-                .map((user) => user.email)
-
-              if (options.length) {
-                formState.value[c.title] = !parseProp(c.meta)?.is_multi ? options[0] : options.join(',')
-              }
-            }
-            break
-          }
-          default: {
-            if (isNumericFieldType(c, getColAbstractType(c))) {
-              if (!isNaN(parseInt(route.query?.[c.title] as string))) {
-                formState.value[c.title] = parseInt(route.query?.[c.title] as string)
-              }
-            } else {
-              formState.value[c.title] = route.query?.[c.title]
-            }
-          }
+        // Prefill form state
+        const preFillValue = getPreFillValue(c, (route.query?.[c.title] as string).trim())
+        if (preFillValue !== undefined) {
+          formState.value[c.title] = preFillValue
         }
-        console.log('c', c)
-
-        console.log('form state', formState.value)
 
         return c
       })
-
+      console.log('form state', formState.value)
       console.log('column', columns.value)
     }
   }
@@ -351,6 +307,137 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     return (c?.source_id ? sqlUis.value[c?.source_id] : Object.values(sqlUis.value)[0]).getAbstractType(c)
   }
 
+  function getPreFillValue(c: ColumnType, value: string) {
+    let preFillValue: any = ''
+    switch (c.uidt) {
+      case UITypes.SingleSelect:
+      case UITypes.MultiSelect:
+      case UITypes.User: {
+        const limitOptions = (parseProp(c.meta).limitOptions || []).reduce((ac, op) => {
+          if (op?.id) {
+            ac[op.id] = op
+          }
+          return ac
+        }, {})
+
+        const queryOptions = value.split(',')
+
+        let options: string[] = []
+
+        if ([UITypes.SingleSelect, UITypes.MultiSelect].includes(c.uidt as UITypes)) {
+          options = ((c.colOptions as SelectOptionsType)?.options || [])
+            .filter((op) => {
+              if (
+                op?.id &&
+                op?.title &&
+                queryOptions.includes(op.title) &&
+                (limitOptions[op.id] ? limitOptions[op.id]?.show : !(parseProp(c.meta).limitOptions || []).length)
+              ) {
+                return true
+              }
+              return false
+            })
+            .map((op) => op.title as string)
+
+          if (options.length) {
+            preFillValue = c.uidt === UITypes.SingleSelect ? options[0] : options.join(',')
+          }
+        } else {
+          options = (meta.value?.base_id ? basesUser.value.get(meta.value.base_id) || [] : [])
+            .filter((user) => {
+              if (
+                user?.id &&
+                user?.email &&
+                queryOptions.includes(user.email) &&
+                (limitOptions[user.id] ? limitOptions[user.id]?.show : !(parseProp(c.meta).limitOptions || []).length)
+              ) {
+                return true
+              }
+              return false
+            })
+            .map((user) => user.email)
+
+          if (options.length) {
+            preFillValue = !parseProp(c.meta)?.is_multi ? options[0] : options.join(',')
+          }
+        }
+        break
+      }
+      case UITypes.Checkbox: {
+        if (['true', '1'].includes(value.toLowerCase())) {
+          preFillValue = true
+        } else if (['false', '0'].includes(value.toLowerCase())) {
+          preFillValue = false
+        }
+        break
+      }
+      case UITypes.Rating: {
+        if (!isNaN(Number(value))) {
+          preFillValue = Number(value) > parseProp(c.meta).max ? parseProp(c.meta).max : Number(preFillValue)
+        }
+        break
+      }
+      case UITypes.URL: {
+        if (parseProp(c.meta).validate) {
+          if (isValidURL(value)) {
+            preFillValue = value
+          }
+        } else {
+          preFillValue = value
+        }
+        break
+      }
+      case UITypes.Year: {
+        if (/^\d+$/.test(preFillValue)) {
+          preFillValue = Number(value)
+        }
+        break
+      }
+      case UITypes.Date:
+      case UITypes.DateTime: {
+        let parsedDateOrDateTime = dayjs(value, getDateTimeFormat(value))
+
+        if (!parsedDateOrDateTime.isValid()) {
+          parsedDateOrDateTime = dayjs(value, getDateFormat(value))
+        }
+
+        if (parsedDateOrDateTime.isValid()) {
+          preFillValue =
+            c.uidt === UITypes.Date
+              ? parsedDateOrDateTime.format('YYYY-MM-DD')
+              : parsedDateOrDateTime.utc().format('YYYY-MM-DD HH:mm:ssZ')
+        }
+        break
+      }
+      case UITypes.Time: {
+        let parsedTime = dayjs(value)
+
+        if (!parsedTime.isValid()) {
+          parsedTime = dayjs(value, 'HH:mm:ss')
+        }
+        if (!parsedTime.isValid()) {
+          parsedTime = dayjs(`1999-01-01 ${value}`)
+        }
+        if (parsedTime.isValid()) {
+          preFillValue = parsedTime.format(baseStore.isMysql(c.source_id) ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ')
+        }
+      }
+      case UITypes.LinkToAnotherRecord: {
+        break
+      }
+      default: {
+        if (isNumericFieldType(c, getColAbstractType(c))) {
+          if (!isNaN(Number(value))) {
+            preFillValue = Number(value)
+          }
+        } else {
+          preFillValue = value
+        }
+      }
+    }
+    return preFillValue
+  }
+
   /** reset form if show_blank_form is true */
   watch(submitted, (nextVal) => {
     if (nextVal && sharedFormView.value?.show_blank_form) {

From b9bfbeab571285f69bf84bf1d877e40ddef3bf29 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:10 +0000
Subject: [PATCH 070/253] fix(nc-gui): hide system columns in shared form

---
 .../composables/useSharedFormViewStore.ts     | 30 ++++++++++++++++---
 packages/nc-gui/composables/useViewData.ts    |  2 +-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index cd23ad7e06..3acda5c249 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -104,7 +104,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     helpers.withMessage(t('msg.error.fieldRequired', { value: fieldName }), required)
 
   const formColumns = computed(() =>
-    columns.value?.filter((c) => c.show).filter((col) => !isVirtualCol(col) || isLinksOrLTAR(col.uidt)),
+    columns.value?.filter((c) => c.show).filter((col) => !isSystemColumn(col) && (!isVirtualCol(col) || isLinksOrLTAR(col.uidt))),
   )
 
   const loadSharedView = async () => {
@@ -313,7 +313,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       case UITypes.SingleSelect:
       case UITypes.MultiSelect:
       case UITypes.User: {
-        const limitOptions = (parseProp(c.meta).limitOptions || []).reduce((ac, op) => {
+        const limitOptions = (parseProp(c.meta).isLimitOption ? parseProp(c.meta).limitOptions || [] : []).reduce((ac, op) => {
           if (op?.id) {
             ac[op.id] = op
           }
@@ -331,7 +331,11 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
                 op?.id &&
                 op?.title &&
                 queryOptions.includes(op.title) &&
-                (limitOptions[op.id] ? limitOptions[op.id]?.show : !(parseProp(c.meta).limitOptions || []).length)
+                (limitOptions[op.id]
+                  ? limitOptions[op.id]?.show
+                  : parseProp(c.meta).isLimitOption
+                  ? !(parseProp(c.meta).limitOptions || []).length
+                  : true)
               ) {
                 return true
               }
@@ -349,7 +353,11 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
                 user?.id &&
                 user?.email &&
                 queryOptions.includes(user.email) &&
-                (limitOptions[user.id] ? limitOptions[user.id]?.show : !(parseProp(c.meta).limitOptions || []).length)
+                (limitOptions[user.id]
+                  ? limitOptions[user.id]?.show
+                  : parseProp(c.meta).isLimitOption
+                  ? !(parseProp(c.meta).limitOptions || []).length
+                  : true)
               ) {
                 return true
               }
@@ -421,8 +429,22 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         if (parsedTime.isValid()) {
           preFillValue = parsedTime.format(baseStore.isMysql(c.source_id) ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ')
         }
+        break
       }
       case UITypes.LinkToAnotherRecord: {
+        if (isBt(c)) {
+          const queryOptions = value.split(',')
+
+          // console.log('column bt', queryOptions, c)
+        }
+        break
+      }
+      case UITypes.Links: {
+        if (isMm(c)) {
+          const queryOptions = value.split(',')
+
+          // console.log('column mm', queryOptions, c)
+        }
         break
       }
       default: {
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 853f28a53e..8ce1235199 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -297,7 +297,7 @@ export function useViewData(
           fk_column_id: c.id,
           fk_view_id: viewMeta.value?.id,
           ...(fieldById[c.id!] ? fieldById[c.id!] : {}),
-          meta: { ...parseProp(fieldById[c.id!]?.meta), ...parseProp(c.meta) }, // TODO: discuss with @pranav
+          meta: { ...parseProp(fieldById[c.id!]?.meta), ...parseProp(c.meta) },
           order: (fieldById[c.id!] && fieldById[c.id!].order) || order++,
           id: fieldById[c.id!] && fieldById[c.id!].id,
         }))

From f3b46bd72a6f214b72486777d4c49b5acdea3613 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:10 +0000
Subject: [PATCH 071/253] fix(nc-gui): grayed out shared form field if
 prefilled fields are locked

---
 .../nc-gui/components/cell/MultiSelect.vue    |  2 +-
 .../nc-gui/components/cell/SingleSelect.vue   |  2 +-
 packages/nc-gui/components/cell/User.vue      |  1 +
 .../dlg/share-and-collaborate/SharePage.vue   |  2 +-
 .../composables/useSharedFormViewStore.ts     | 29 +++-----
 packages/nc-gui/lang/en.json                  |  3 +-
 .../index/[typeOrId]/form/[viewId]/index.vue  | 10 +--
 .../[typeOrId]/form/[viewId]/index/index.vue  | 71 ++++++++++---------
 .../[typeOrId]/form/[viewId]/index/survey.vue | 67 +++++++++--------
 9 files changed, 94 insertions(+), 93 deletions(-)

diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index 5c5a205f2a..333a35c01f 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -394,7 +394,7 @@ const onFocus = () => {
     @click="toggleMenu"
   >
     <div v-if="!isEditColumn && isForm && parseProp(column.meta)?.isList" class="w-full max-w-full">
-      <a-checkbox-group v-model:value="vModel" class="nc-field-layout-list">
+      <a-checkbox-group v-model:value="vModel" :disabled="readOnly || !editAllowed" class="nc-field-layout-list">
         <a-checkbox
           v-for="op of options"
           :key="op.title"
diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 57ccd9ee38..3d7d6ee3e4 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -315,7 +315,7 @@ const onFocus = () => {
     @keydown.enter.stop.prevent="toggleMenu"
   >
     <div v-if="!isEditColumn && isForm && parseProp(column.meta)?.isList" class="w-full max-w-full">
-      <a-radio-group v-model:value="vModel" class="nc-field-layout-list">
+      <a-radio-group v-model:value="vModel" :disabled="readOnly || !editAllowed" class="nc-field-layout-list">
         <a-radio
           v-for="op of options"
           :key="op.title"
diff --git a/packages/nc-gui/components/cell/User.vue b/packages/nc-gui/components/cell/User.vue
index 3331110136..ec04f34400 100644
--- a/packages/nc-gui/components/cell/User.vue
+++ b/packages/nc-gui/components/cell/User.vue
@@ -323,6 +323,7 @@ const filterOption = (input: string, option: any) => {
       <component
         :is="isMultiple ? CheckboxGroup : RadioGroup"
         v-model:value="vModelListLayout"
+        :disabled="readOnly || !editAllowed"
         class="nc-field-layout-list"
         @update:value="
           (value) => {
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index 8368d6766b..c28ef0ae84 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -191,7 +191,7 @@ function sharedViewUrl() {
     dashboardUrl1 = `${baseUrl}${appInfo.value?.dashboardPath}`
   }
 
-  return encodeURI(`${dashboardUrl1}#/nc/${viewType}/${activeView.value.uuid}`)
+  return encodeURI(`${dashboardUrl1}#/nc/${viewType}/${activeView.value.uuid}${surveyMode.value ? '/survey' : ''}`)
 }
 
 const toggleViewShare = async () => {
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 3acda5c249..b37d6ac59a 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -264,15 +264,14 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   }
 
   function handlePreFillForm() {
-    // http://localhost:3000/#/nc/form/070dbc84-f3ca-43a3-808a-3547a873933f?Multiselect=a,b
     if (Object.keys(route.query).length && sharedViewMeta.value.preFilledMode !== PreFilledMode.Disabled) {
-      console.log('router', route.query)
       columns.value = columns.value?.map((c) => {
         if (
           !c.title ||
           !route.query?.[c.title] ||
           isSystemColumn(c) ||
-          (isVirtualCol(c) && !isLinksOrLTAR(c)) ||
+          isVirtualCol(c) ||
+          // (isVirtualCol(c) && !isLinksOrLTAR(c)) || // Todo: Enable this after linksOrLTAR prefill supported
           isAttachment(c)
         ) {
           return c
@@ -298,8 +297,6 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
 
         return c
       })
-      console.log('form state', formState.value)
-      console.log('column', columns.value)
     }
   }
 
@@ -308,7 +305,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   }
 
   function getPreFillValue(c: ColumnType, value: string) {
-    let preFillValue: any = ''
+    let preFillValue: any
     switch (c.uidt) {
       case UITypes.SingleSelect:
       case UITypes.MultiSelect:
@@ -381,7 +378,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       }
       case UITypes.Rating: {
         if (!isNaN(Number(value))) {
-          preFillValue = Number(value) > parseProp(c.meta).max ? parseProp(c.meta).max : Number(preFillValue)
+          preFillValue = Number(value) > parseProp(c.meta).max ? parseProp(c.meta).max : Number(value)
         }
         break
       }
@@ -396,7 +393,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         break
       }
       case UITypes.Year: {
-        if (/^\d+$/.test(preFillValue)) {
+        if (/^\d+$/.test(value)) {
           preFillValue = Number(value)
         }
         break
@@ -431,22 +428,12 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         }
         break
       }
-      case UITypes.LinkToAnotherRecord: {
-        if (isBt(c)) {
-          const queryOptions = value.split(',')
-
-          // console.log('column bt', queryOptions, c)
-        }
-        break
-      }
+      case UITypes.LinkToAnotherRecord:
       case UITypes.Links: {
-        if (isMm(c)) {
-          const queryOptions = value.split(',')
-
-          // console.log('column mm', queryOptions, c)
-        }
+        // Todo: create an api which will fetch query params records and then autofill records
         break
       }
+
       default: {
         if (isNumericFieldType(c, getColAbstractType(c))) {
           if (!isNaN(Number(value))) {
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 710665b281..92d2dbe81d 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -932,7 +932,8 @@
       "default": "Allow pre-filling fields",
       "disabled": "Disable pre-filling fields",
       "locked": "Lock pre-filled fields as read-only",
-      "hidden": "Hide pre-filled fields"
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
     }
   },
   "tooltip": {
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
index fb2e45ff2c..79b671de02 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
@@ -87,6 +87,10 @@ p {
         &:not(.layout-list) {
           @apply rounded-lg border-solid border-1 border-gray-200 focus-within:border-brand-500 overflow-hidden;
 
+          &.readonly {
+            @apply bg-gray-50 cursor-not-allowed;
+          }
+
           & > div {
             @apply !bg-transparent;
           }
@@ -110,7 +114,7 @@ p {
         input,
         textarea,
         &.nc-virtual-cell {
-          @apply bg-white dark:(bg-slate-500 text-white);
+          @apply bg-white dark:(bg-slate-500 text-white) disabled:bg-transparent;
 
           .ant-btn {
             @apply dark:(bg-slate-300);
@@ -120,9 +124,7 @@ p {
             @apply dark:(bg-slate-700 text-white);
           }
         }
-        &:not(.layout-list) > div {
-          @apply bg-white dark:(bg-slate-500 text-white);
-        }
+
         &.layout-list > div {
           .ant-btn {
             @apply dark:(bg-slate-300);
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index 6c929fec4a..6658252457 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -180,40 +180,45 @@ const onDecode = async (scannedCodeValue: string) => {
                   </div>
 
                   <div>
-                    <LazySmartsheetDivDataCell class="flex relative">
-                      <LazySmartsheetVirtualCell
-                        v-if="isVirtualCol(field)"
-                        :model-value="null"
-                        class="mt-0 nc-input nc-cell"
-                        :data-testid="`nc-form-input-cell-${field.label || field.title}`"
-                        :class="`nc-form-input-${field.title?.replaceAll(' ', '')}`"
-                        :column="field"
-                      />
+                    <NcTooltip :disabled="!field?.read_only">
+                      <template #title> {{ $t('activity.preFilledFields.lockedFieldTooltip') }} </template>
 
-                      <LazySmartsheetCell
-                        v-else
-                        v-model="formState[field.title]"
-                        class="nc-input truncate"
-                        :data-testid="`nc-form-input-cell-${field.label || field.title}`"
-                        :class="[
-                          `nc-form-input-${field.title?.replaceAll(' ', '')}`,
-                          { 'layout-list': parseProp(field?.meta)?.isList },
-                        ]"
-                        :column="field"
-                        :edit-enabled="!field?.read_only"
-                        :read-only="field?.read_only"
-                      />
-                      <a-button
-                        v-if="field.enable_scanner"
-                        class="nc-btn-fill-form-column-by-scan nc-toolbar-btn"
-                        :alt="$t('activity.fillByCodeScan')"
-                        @click="showCodeScannerForFieldTitle(field.title)"
-                      >
-                        <div class="flex items-center gap-1">
-                          <component :is="iconMap.qrCodeScan" class="h-5 w-5" />
-                        </div>
-                      </a-button>
-                    </LazySmartsheetDivDataCell>
+                      <LazySmartsheetDivDataCell class="flex relative">
+                        <LazySmartsheetVirtualCell
+                          v-if="isVirtualCol(field)"
+                          :model-value="null"
+                          class="mt-0 nc-input nc-cell"
+                          :data-testid="`nc-form-input-cell-${field.label || field.title}`"
+                          :class="`nc-form-input-${field.title?.replaceAll(' ', '')}`"
+                          :column="field"
+                          :read-only="field?.read_only"
+                        />
+
+                        <LazySmartsheetCell
+                          v-else
+                          v-model="formState[field.title]"
+                          class="nc-input truncate"
+                          :data-testid="`nc-form-input-cell-${field.label || field.title}`"
+                          :class="[
+                            `nc-form-input-${field.title?.replaceAll(' ', '')}`,
+                            { 'layout-list': parseProp(field?.meta)?.isList },
+                          ]"
+                          :column="field"
+                          :edit-enabled="!field?.read_only"
+                          :read-only="field?.read_only"
+                        />
+                        <a-button
+                          v-if="field.enable_scanner"
+                          class="nc-btn-fill-form-column-by-scan nc-toolbar-btn"
+                          :alt="$t('activity.fillByCodeScan')"
+                          @click="showCodeScannerForFieldTitle(field.title)"
+                        >
+                          <div class="flex items-center gap-1">
+                            <component :is="iconMap.qrCodeScan" class="h-5 w-5" />
+                          </div>
+                        </a-button>
+                      </LazySmartsheetDivDataCell>
+                    </NcTooltip>
 
                     <div class="flex flex-col gap-2 text-slate-500 dark:text-slate-300 text-sm mt-2">
                       <template v-if="isVirtualCol(field)">
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
index 1939f39844..bac5a0c11b 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
@@ -280,38 +280,43 @@ onMounted(() => {
               <LazyCellRichText :value="field?.description" class="!h-auto -ml-1" is-form-field read-only sync-value-change />
             </div>
 
-            <LazySmartsheetDivDataCell v-if="field.title" class="relative nc-form-data-cell">
-              <LazySmartsheetVirtualCell
-                v-if="isVirtualCol(field)"
-                v-model="formState[field.title]"
-                class="mt-0 nc-input h-auto"
-                :row="{ row: {}, oldRow: {}, rowMeta: {} }"
-                :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
-                :column="field"
-              />
-
-              <LazySmartsheetCell
-                v-else
-                v-model="formState[field.title]"
-                class="nc-input h-auto"
-                :class="parseProp(field?.meta)?.isList ? 'layout-list' : ''"
-                :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
-                :column="field"
-                :edit-enabled="!field?.read_only"
-                :read-only="field?.read_only"
-              />
-
-              <div class="flex flex-col gap-2 text-slate-500 dark:text-slate-300 text-[0.75rem] my-2 px-1">
-                <div v-for="error of v$.localState[field.title]?.$errors" :key="error" class="text-red-500">
-                  {{ error.$message }}
+            <NcTooltip :disabled="!field?.read_only">
+              <template #title> {{ $t('activity.preFilledFields.lockedFieldTooltip') }} </template>
+
+              <LazySmartsheetDivDataCell v-if="field.title" class="relative nc-form-data-cell">
+                <LazySmartsheetVirtualCell
+                  v-if="isVirtualCol(field)"
+                  v-model="formState[field.title]"
+                  class="mt-0 nc-input h-auto"
+                  :row="{ row: {}, oldRow: {}, rowMeta: {} }"
+                  :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
+                  :column="field"
+                  :read-only="field?.read_only"
+                />
+
+                <LazySmartsheetCell
+                  v-else
+                  v-model="formState[field.title]"
+                  class="nc-input h-auto"
+                  :class="parseProp(field?.meta)?.isList ? 'layout-list' : ''"
+                  :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
+                  :column="field"
+                  :edit-enabled="!field?.read_only"
+                  :read-only="field?.read_only"
+                />
+
+                <div class="flex flex-col gap-2 text-slate-500 dark:text-slate-300 text-[0.75rem] my-2 px-1">
+                  <div v-for="error of v$.localState[field.title]?.$errors" :key="error" class="text-red-500">
+                    {{ error.$message }}
+                  </div>
+
+                  <div v-if="field.uidt === UITypes.LongText" class="text-sm text-gray-500 flex flex-wrap items-center">
+                    {{ $t('general.shift') }} <MdiAppleKeyboardShift class="mx-1 text-primary" /> + {{ $t('general.enter') }}
+                    <MaterialSymbolsKeyboardReturn class="mx-1 text-primary" /> {{ $t('msg.makeLineBreak') }}
+                  </div>
                 </div>
-
-                <div v-if="field.uidt === UITypes.LongText" class="text-sm text-gray-500 flex flex-wrap items-center">
-                  {{ $t('general.shift') }} <MdiAppleKeyboardShift class="mx-1 text-primary" /> + {{ $t('general.enter') }}
-                  <MaterialSymbolsKeyboardReturn class="mx-1 text-primary" /> {{ $t('msg.makeLineBreak') }}
-                </div>
-              </div>
-            </LazySmartsheetDivDataCell>
+              </LazySmartsheetDivDataCell>
+            </NcTooltip>
           </div>
 
           <div class="ml-1 mt-4 flex w-full text-lg">

From 88cbb34cb1cac2e09abe385076d2f489ff46773e Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:11 +0000
Subject: [PATCH 072/253] fix(nc-gui): allow user email or id in prefilled form

---
 .../nc-gui/components/smartsheet/Form.vue     | 65 +++++++++++++++----
 .../composables/useSharedFormViewStore.ts     |  2 +-
 packages/nc-gui/lang/en.json                  |  3 +-
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 9dbb379ce3..e7aa20daf9 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -214,12 +214,26 @@ async function submitForm() {
   submitted.value = true
 }
 
+async function getPreFilledLink() {
+  if (isLocked.value || !isUIAllowed('dataInsert')) return
+
+  const preFilledData = { ...formState, ...state.value }
+
+  console.log('preFilled Data', preFilledData)
+
+  for (const c of visibleColumns.value) {
+    if (c.title && preFilledData[c.title] && preFilledData[c.title].trim()) {
+      
+    }
+  }
+}
+
 async function clearForm() {
   if (isLocked.value || !isUIAllowed('dataInsert')) return
 
   formState = reactive<Record<string, any>>({})
   state.value = {}
-  await formRef.value.clearValidate()
+  await formRef.value?.clearValidate()
   reloadEventHook.trigger()
 }
 
@@ -566,6 +580,7 @@ watch(submitted, (v) => {
     const intvl = setInterval(() => {
       if (--secondsRemain.value < 0) {
         submitted.value = false
+        clearForm()
         clearInterval(intvl)
       }
     }, 1000)
@@ -736,7 +751,16 @@ useEventListener(
                   </div>
 
                   <div v-if="formViewData.submit_another_form || !isPublic" class="text-right mt-4">
-                    <NcButton type="primary" size="medium" @click="submitted = false">
+                    <NcButton
+                      type="primary"
+                      size="medium"
+                      @click="
+                        () => {
+                          submitted = false
+                          clearForm()
+                        }
+                      "
+                    >
                       {{ $t('activity.submitAnotherForm') }}
                     </NcButton>
                   </div>
@@ -1289,18 +1313,31 @@ useEventListener(
                     >
                       {{ $t('activity.clearForm') }}
                     </NcButton>
-                    <NcButton
-                      html-type="submit"
-                      type="primary"
-                      size="small"
-                      :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length"
-                      class="nc-form-submit nc-form-focus-element"
-                      data-testid="nc-form-submit"
-                      data-title="nc-form-submit"
-                      @click="submitForm"
-                    >
-                      {{ $t('general.submit') }}
-                    </NcButton>
+                    <div class="flex items-center gap-3">
+                      <NcButton
+                        type="primary"
+                        size="small"
+                        :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length || isLocked"
+                        class="nc-form-get-pre-filled-link nc-form-focus-element"
+                        data-testid="nc-form-get-pre-filled-link"
+                        data-title="nc-form-get-pre-filled-link"
+                        @click="getPreFilledLink"
+                      >
+                        {{ $t('activity.getPreFilledLink') }}
+                      </NcButton>
+                      <NcButton
+                        html-type="submit"
+                        type="primary"
+                        size="small"
+                        :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length"
+                        class="nc-form-submit nc-form-focus-element"
+                        data-testid="nc-form-submit"
+                        data-title="nc-form-submit"
+                        @click="submitForm"
+                      >
+                        {{ $t('general.submit') }}
+                      </NcButton>
+                    </div>
                   </div>
                 </a-form>
 
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index b37d6ac59a..072df3b768 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -349,7 +349,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
               if (
                 user?.id &&
                 user?.email &&
-                queryOptions.includes(user.email) &&
+                (queryOptions.includes(user.email) || queryOptions.includes(user.id)) &&
                 (limitOptions[user.id]
                   ? limitOptions[user.id]?.show
                   : parseProp(c.meta).isLimitOption
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 92d2dbe81d..0d6151e040 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -934,7 +934,8 @@
       "locked": "Lock pre-filled fields as read-only",
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
-    }
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",

From a798b55eabb12dfbc490edf64a8bb85672a9fb50 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:11 +0000
Subject: [PATCH 073/253] fix(nc-gui): allow prefill date, datetime, time only
 in iso format

---
 .../composables/useSharedFormViewStore.ts     | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 072df3b768..c9e6e8ac08 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -277,22 +277,22 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
           return c
         }
 
-        // Update column
-        switch (sharedViewMeta.value.preFilledMode) {
-          case PreFilledMode.Hidden: {
-            c.show = false
-            break
-          }
-          case PreFilledMode.Locked: {
-            c.read_only = true
-            break
-          }
-        }
-
-        // Prefill form state
         const preFillValue = getPreFillValue(c, (route.query?.[c.title] as string).trim())
         if (preFillValue !== undefined) {
+          // Prefill form state
           formState.value[c.title] = preFillValue
+
+          // Update column
+          switch (sharedViewMeta.value.preFilledMode) {
+            case PreFilledMode.Hidden: {
+              c.show = false
+              break
+            }
+            case PreFilledMode.Locked: {
+              c.read_only = true
+              break
+            }
+          }
         }
 
         return c
@@ -398,19 +398,22 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         }
         break
       }
-      case UITypes.Date:
-      case UITypes.DateTime: {
-        let parsedDateOrDateTime = dayjs(value, getDateTimeFormat(value))
-
-        if (!parsedDateOrDateTime.isValid()) {
-          parsedDateOrDateTime = dayjs(value, getDateFormat(value))
+      case UITypes.Date: {
+        const parsedDate = dayjs(value, 'YYYY-MM-DD')
+        if (parsedDate.isValid()) {
+          preFillValue = parsedDate.format('YYYY-MM-DD')
         }
+        break
+      }
+      case UITypes.DateTime: {
+        let parsedDateTime = dayjs(value, 'YYYY-MM-DD HH:mm:ss')
 
-        if (parsedDateOrDateTime.isValid()) {
-          preFillValue =
-            c.uidt === UITypes.Date
-              ? parsedDateOrDateTime.format('YYYY-MM-DD')
-              : parsedDateOrDateTime.utc().format('YYYY-MM-DD HH:mm:ssZ')
+        if (parsedDateTime.isValid()) {
+          preFillValue = parsedDateTime.utc().format('YYYY-MM-DD HH:mm:ssZ')
+        } else if (dayjs(value).toISOString() === value) {
+          if (parsedDateTime.isValid() && parsedDateTime.toISOString() === value) {
+            preFillValue = dayjs(value).format('YYYY-MM-DD HH:mm:ssZ')
+          }
         }
         break
       }

From 497d049374e973face6fdc11d38e9cf1937f11c9 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:11 +0000
Subject: [PATCH 074/253] feat(nc-gui): get prefill link option

---
 .../nc-gui/components/smartsheet/Form.vue     | 39 +++++++++++++++----
 .../index/[typeOrId]/form/[viewId]/index.vue  | 15 ++++++-
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index e7aa20daf9..7f0949135a 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -70,9 +70,13 @@ const enum NcForm {
   subheading = 'nc-form-sub-heading',
 }
 
-const { isMobileMode, user } = useGlobal()
+const { isMobileMode, user, getBaseUrl, appInfo } = useGlobal()
 
-const formRef = ref()
+const { dashboardUrl } = useDashboard()
+
+const workspaceStore = useWorkspace()
+
+const { copy } = useCopy()
 
 const { $api, $e } = useNuxtApp()
 
@@ -82,6 +86,8 @@ const { base } = storeToRefs(useBase())
 
 const { getPossibleAttachmentSrc } = useAttachment()
 
+const formRef = ref()
+
 let formState = reactive<Record<string, any>>({})
 
 const secondsRemain = ref(0)
@@ -215,17 +221,36 @@ async function submitForm() {
 }
 
 async function getPreFilledLink() {
-  if (isLocked.value || !isUIAllowed('dataInsert')) return
+  if (isLocked.value || !isUIAllowed('dataInsert') || !view.value?.uuid) return
 
   const preFilledData = { ...formState, ...state.value }
 
-  console.log('preFilled Data', preFilledData)
+  const searchParams = new URLSearchParams()
 
   for (const c of visibleColumns.value) {
-    if (c.title && preFilledData[c.title] && preFilledData[c.title].trim()) {
-      
+    if (c.title && preFilledData[c.title] && !isVirtualCol(c)) {
+      searchParams.append(c.title, preFilledData[c.title])
     }
   }
+
+  // get base url for workspace
+  const baseUrl = getBaseUrl(workspaceStore.activeWorkspaceId)
+
+  let dashboardUrl1 = dashboardUrl.value
+
+  if (baseUrl) {
+    dashboardUrl1 = `${baseUrl}${appInfo.value?.dashboardPath}`
+  }
+
+  copy(
+    encodeURI(
+      `${dashboardUrl1}#/nc/form/${view.value?.uuid}${parseProp(view.value?.meta).surveyMode ? '/survey' : ''}${
+        searchParams.toString() ? `?${searchParams.toString()}` : ''
+      }`,
+    ),
+  )
+
+  message.info(t('msg.info.copiedToClipboard'))
 }
 
 async function clearForm() {
@@ -1317,7 +1342,7 @@ useEventListener(
                       <NcButton
                         type="primary"
                         size="small"
-                        :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length || isLocked"
+                        :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length || isLocked || !view?.uuid"
                         class="nc-form-get-pre-filled-link nc-form-focus-element"
                         data-testid="nc-form-get-pre-filled-link"
                         data-title="nc-form-get-pre-filled-link"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
index 79b671de02..6e889598d0 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
@@ -89,6 +89,11 @@ p {
 
           &.readonly {
             @apply bg-gray-50 cursor-not-allowed;
+
+            input,
+            textarea {
+              @apply !bg-transparent;
+            }
           }
 
           & > div {
@@ -111,11 +116,17 @@ p {
           }
         }
 
+        &:not(.readonly) {
+          input,
+          textarea,
+          &.nc-virtual-cell {
+            @apply bg-white !disabled:bg-transparent;
+          }
+        }
+
         input,
         textarea,
         &.nc-virtual-cell {
-          @apply bg-white dark:(bg-slate-500 text-white) disabled:bg-transparent;
-
           .ant-btn {
             @apply dark:(bg-slate-300);
           }

From dc31d4db28f396ef09d9dab0f49c54bfb946883e Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:11 +0000
Subject: [PATCH 075/253] fix(nc-gui): prefill iso date format issue

---
 .../nc-gui/components/general/ColorPicker.vue |  6 +----
 .../nc-gui/components/smartsheet/Form.vue     |  7 ------
 .../composables/useSharedFormViewStore.ts     | 22 +++++++++----------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/packages/nc-gui/components/general/ColorPicker.vue b/packages/nc-gui/components/general/ColorPicker.vue
index dffd7c9bc5..c3e748a653 100644
--- a/packages/nc-gui/components/general/ColorPicker.vue
+++ b/packages/nc-gui/components/general/ColorPicker.vue
@@ -104,15 +104,11 @@ watch(picked, (n, _o) => {
   -webkit-text-stroke-width: 1px;
   -webkit-text-stroke-color: white;
 }
-.color-selector:not(.new-design):hover {
+.color-selector:hover {
   filter: brightness(90%);
   -webkit-filter: brightness(90%);
 }
 
-.color-selector.new-design:hover {
-  box-shadow: 0px 0px 0px 2px #fff, 0px 0px 0px 4px #3069fe;
-}
-
 .color-selector.selected:not(.new-design) {
   filter: brightness(90%);
   -webkit-filter: brightness(90%);
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 7f0949135a..107e3ba98e 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -360,13 +360,6 @@ async function showOrHideColumn(column: Record<string, any>, show: boolean, isSi
     await $api.dbView.formColumnUpdate(column.id, column)
 
     fields.value[fieldIndex] = column as any
-    // await saveOrUpdate(
-    //   {
-    //     ...column,
-    //     show,
-    //   },
-    //   fieldIndex,
-    // )
 
     reloadEventHook.trigger()
 
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index c9e6e8ac08..95b83c5ceb 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -276,8 +276,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         ) {
           return c
         }
-
-        const preFillValue = getPreFillValue(c, (route.query?.[c.title] as string).trim())
+        const preFillValue = getPreFillValue(c, decodeURIComponent(route.query?.[c.title] as string).trim())
         if (preFillValue !== undefined) {
           // Prefill form state
           formState.value[c.title] = preFillValue
@@ -399,21 +398,20 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         break
       }
       case UITypes.Date: {
-        const parsedDate = dayjs(value, 'YYYY-MM-DD')
-        if (parsedDate.isValid()) {
-          preFillValue = parsedDate.format('YYYY-MM-DD')
+        const parsedDate = dayjs(value)
+        if ((parsedDate.isValid() && parsedDate.toISOString() === value) || dayjs(value, 'YYYY-MM-DD').isValid()) {
+          preFillValue = dayjs(value).format('YYYY-MM-DD')
         }
         break
       }
       case UITypes.DateTime: {
-        let parsedDateTime = dayjs(value, 'YYYY-MM-DD HH:mm:ss')
+        const parsedDateTime = dayjs(value)
 
-        if (parsedDateTime.isValid()) {
-          preFillValue = parsedDateTime.utc().format('YYYY-MM-DD HH:mm:ssZ')
-        } else if (dayjs(value).toISOString() === value) {
-          if (parsedDateTime.isValid() && parsedDateTime.toISOString() === value) {
-            preFillValue = dayjs(value).format('YYYY-MM-DD HH:mm:ssZ')
-          }
+        if (
+          (parsedDateTime.isValid() && parsedDateTime.toISOString() === value) ||
+          dayjs(value, 'YYYY-MM-DD HH:mm:ss').isValid()
+        ) {
+          preFillValue = dayjs(value).utc().format('YYYY-MM-DD HH:mm:ssZ')
         }
         break
       }

From 865b7cebea613b4c2b128138a2a1eea5913a1e1c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:11 +0000
Subject: [PATCH 076/253] fic(nc-gui): add tooltip on disabled get prefilled
 link btn

---
 .../nc-gui/components/smartsheet/Form.vue     | 26 +++++++++++--------
 packages/nc-gui/lang/en.json                  |  3 ++-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 107e3ba98e..c22db474cb 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1332,17 +1332,21 @@ useEventListener(
                       {{ $t('activity.clearForm') }}
                     </NcButton>
                     <div class="flex items-center gap-3">
-                      <NcButton
-                        type="primary"
-                        size="small"
-                        :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length || isLocked || !view?.uuid"
-                        class="nc-form-get-pre-filled-link nc-form-focus-element"
-                        data-testid="nc-form-get-pre-filled-link"
-                        data-title="nc-form-get-pre-filled-link"
-                        @click="getPreFilledLink"
-                      >
-                        {{ $t('activity.getPreFilledLink') }}
-                      </NcButton>
+                      <NcTooltip :disabled="!!view?.uuid">
+                        <template #title>{{$t('tooltip.formIsNotShared')}}</template>
+                        <NcButton
+                          v-if="isUIAllowed('dataInsert') && visibleColumns.length"
+                          type="primary"
+                          size="small"
+                          :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length || isLocked || !view?.uuid"
+                          class="nc-form-get-pre-filled-link nc-form-focus-element"
+                          data-testid="nc-form-get-pre-filled-link"
+                          data-title="nc-form-get-pre-filled-link"
+                          @click="getPreFilledLink"
+                        >
+                          {{ $t('activity.getPreFilledLink') }}
+                        </NcButton>
+                      </NcTooltip>
                       <NcButton
                         html-type="submit"
                         type="primary"
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 0d6151e040..47736cda95 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -965,7 +965,8 @@
     "clearMetadata": "Clear all metadata from meta tables.",
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
-    "clientCA": "Select CA file"
+    "clientCA": "Select CA file",
+    "formIsNotShared": "Form is not shared"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From cd56db5f5327a922cc5005ceee4d965d9e308746 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:11 +0000
Subject: [PATCH 077/253] fix(nc-gui): prefilled select input css

---
 .../nc-gui/components/dlg/share-and-collaborate/SharePage.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index c28ef0ae84..775cd3ed7c 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -413,6 +413,10 @@ async function savePreFilledMode() {
 .nc-pre-filled-mode-wrapper {
   .nc-pre-filled-mode.ant-select {
     @apply !p-0 mt-2;
+
+    &.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector{
+      @apply !border-brand-500 !shadow-none
+    }
   }
 }
 </style>

From d449bbd1bb62feaa2d22232ad348f3f4ed3de3b2 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:12 +0000
Subject: [PATCH 078/253] fix(nc-gui): small changes

---
 .../nc-gui/components/dlg/share-and-collaborate/SharePage.vue | 4 ++--
 packages/nc-gui/components/smartsheet/Form.vue                | 2 +-
 .../nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue     | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index 775cd3ed7c..b6b282ef3e 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -414,8 +414,8 @@ async function savePreFilledMode() {
   .nc-pre-filled-mode.ant-select {
     @apply !p-0 mt-2;
 
-    &.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector{
-      @apply !border-brand-500 !shadow-none
+    &.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
+      @apply !border-brand-500 !shadow-none;
     }
   }
 }
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index c22db474cb..019306f309 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1333,7 +1333,7 @@ useEventListener(
                     </NcButton>
                     <div class="flex items-center gap-3">
                       <NcTooltip :disabled="!!view?.uuid">
-                        <template #title>{{$t('tooltip.formIsNotShared')}}</template>
+                        <template #title>{{ $t('tooltip.formIsNotShared') }}</template>
                         <NcButton
                           v-if="isUIAllowed('dataInsert') && visibleColumns.length"
                           type="primary"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
index 6e889598d0..6657d3b99f 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
@@ -151,6 +151,9 @@ p {
           & > div {
             @apply w-full;
           }
+          &.readonly > div {
+            @apply px-3 py-1;
+          }
 
           textarea {
             @apply px-3;

From 18c352c4b331e9229d475cbce3592f707e1a8d6c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:12 +0000
Subject: [PATCH 079/253] fix(nc-gui): disable autofocus json field in form
 view

---
 packages/nc-gui/components/cell/Json.vue     |  1 +
 packages/nc-gui/components/monaco/Editor.vue | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/cell/Json.vue b/packages/nc-gui/components/cell/Json.vue
index e39ff2e06c..7b2270d6b5 100644
--- a/packages/nc-gui/components/cell/Json.vue
+++ b/packages/nc-gui/components/cell/Json.vue
@@ -184,6 +184,7 @@ watch(isExpanded, () => {
         :class="{ 'expanded-editor': isExpanded, 'editor': !isExpanded }"
         :hide-minimap="true"
         :disable-deep-compare="true"
+        :auto-focus="!isForm"
         @update:model-value="localValue = $event"
         @keydown.enter.stop
       />
diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index a353cbca43..06ad6884b7 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -12,9 +12,18 @@ interface Props {
   validate?: boolean
   disableDeepCompare?: boolean
   readOnly?: boolean
+  autoFocus: boolean
 }
 
-const { hideMinimap, lang = 'json', validate = true, disableDeepCompare = false, modelValue, readOnly } = defineProps<Props>()
+const {
+  hideMinimap,
+  lang = 'json',
+  validate = true,
+  disableDeepCompare = false,
+  modelValue,
+  readOnly,
+  autoFocus = true,
+} = defineProps<Props>()
 
 const emits = defineEmits(['update:modelValue'])
 
@@ -120,7 +129,7 @@ onMounted(async () => {
       }
     })
 
-    if (!isDrawerOrModalExist()) {
+    if (!isDrawerOrModalExist() && autoFocus) {
       // auto focus on json cells only
       editor.focus()
     }

From 67f8eb2fe4d1d1e0ba56082176ffa5c06a42e264 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:12 +0000
Subject: [PATCH 080/253] chore(nc-gui): lint

---
 packages/nc-gui/composables/useSharedFormViewStore.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 95b83c5ceb..3a788a23ba 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -12,16 +12,7 @@ import type {
   StringOrNullType,
   TableType,
 } from 'nocodb-sdk'
-import {
-  ErrorMessages,
-  RelationTypes,
-  UITypes,
-  getDateFormat,
-  getDateTimeFormat,
-  isLinksOrLTAR,
-  isSystemColumn,
-  isVirtualCol,
-} from 'nocodb-sdk'
+import { ErrorMessages, RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import { isString } from '@vue/shared'
 import { filterNullOrUndefinedObjectProperties } from '~/helpers/parsers/parserHelpers'
 import {

From 8bd4215c00e0a7223862d59f6ea5a795b37cd412 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:12 +0000
Subject: [PATCH 081/253] fix(nc-gui): move get prefill link in share form
 modal

---
 .../dlg/share-and-collaborate/SharePage.vue   | 110 ++++++++++++++----
 .../nc-gui/components/smartsheet/Form.vue     |  70 ++++-------
 .../composables/useSharedFormViewStore.ts     |   2 +-
 packages/nc-gui/lang/en.json                  |   6 +-
 packages/nc-gui/lib/enums.ts                  |   3 +-
 packages/nc-gui/lib/types.ts                  |   1 +
 packages/nc-gui/store/views.ts                |   5 +
 7 files changed, 123 insertions(+), 74 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index b6b282ef3e..f197402783 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -7,6 +7,8 @@ const { view: _view, $api } = useSmartsheetStoreOrThrow()
 const { $e } = useNuxtApp()
 const { getBaseUrl, appInfo } = useGlobal()
 
+const { t } = useI18n()
+
 const { dashboardUrl } = useDashboard()
 
 const viewStore = useViewsStore()
@@ -52,6 +54,10 @@ const url = computed(() => {
   return sharedViewUrl() ?? ''
 })
 
+const forPreFillUrl = computed(() => {
+  return sharedViewUrl(true) ?? ''
+})
+
 const passwordProtectedLocal = ref(false)
 
 const passwordProtected = computed(() => {
@@ -149,17 +155,31 @@ const surveyMode = computed({
   },
 })
 
-const preFilledMode = computed({
-  get: () => parseProp(activeView.value?.meta)?.preFilledMode || PreFilledMode.Default,
-  set: (preFilled) => {
+const formPreFill = computed({
+  get: () => ({
+    preFillEnabled: parseProp(activeView.value?.meta)?.preFillEnabled ?? false,
+    preFilledMode: parseProp(activeView.value?.meta)?.preFilledMode || t('general.default'),
+  }),
+  set: (value) => {
     if (!activeView.value?.meta) return
 
-    activeView.value.meta = { ...activeView.value.meta, preFilledMode: preFilled }
+    if (formPreFill.value.preFillEnabled !== value.preFillEnabled) {
+      $e(`a:view:share:prefilled-mode-${value.preFillEnabled ? 'enabled' : 'disabled'}`)
+    }
+
+    if (formPreFill.value.preFilledMode !== value.preFilledMode) {
+      $e(`a:view:share:${value.preFillEnabled || 'default'}-prefilled-mode`)
+    }
+
+    activeView.value.meta = {
+      ...activeView.value.meta,
+      ...value,
+    }
     savePreFilledMode()
   },
 })
 
-function sharedViewUrl() {
+function sharedViewUrl(isPreFillUrl: boolean = false) {
   if (!activeView.value) return
 
   let viewType
@@ -191,7 +211,13 @@ function sharedViewUrl() {
     dashboardUrl1 = `${baseUrl}${appInfo.value?.dashboardPath}`
   }
 
-  return encodeURI(`${dashboardUrl1}#/nc/${viewType}/${activeView.value.uuid}${surveyMode.value ? '/survey' : ''}`)
+  return encodeURI(
+    `${dashboardUrl1}#/nc/${viewType}/${activeView.value.uuid}${surveyMode.value ? '/survey' : ''}${
+      isPreFillUrl && formPreFill.value.preFillEnabled && viewStore.preFillFormSearchParams
+        ? `?${viewStore.preFillFormSearchParams}`
+        : ''
+    }`,
+  )
 }
 
 const toggleViewShare = async () => {
@@ -270,7 +296,6 @@ async function updateSharedView() {
 
 async function savePreFilledMode() {
   await updateSharedView()
-  $e(`a:view:share:${preFilledMode.value}-prefilled-mode`)
 }
 </script>
 
@@ -361,29 +386,74 @@ async function savePreFilledMode() {
           v-if="activeView?.type === ViewTypes.FORM"
           class="nc-pre-filled-mode-wrapper flex flex-col justify-between gap-y-3 mt-1 py-2 px-3 bg-gray-50 rounded-md"
         >
-          <div>
+          <div class="flex flex-row justify-between">
             <div class="text-black">{{ $t('activity.preFilledFields.title') }}</div>
+            <a-switch
+              :checked="formPreFill.preFillEnabled"
+              v-e="['c:share:view:surver-mode:toggle']"
+              data-testid="nc-modal-share-view__surveyMode"
+              @update:checked="
+                (value) => {
+                  formPreFill = {
+                    ...formPreFill,
+                    preFillEnabled: value,
+                  }
+                }
+              "
+            >
+            </a-switch>
+          </div>
+          <div v-if="formPreFill.preFillEnabled">
+            <!-- <div class="text-black">{{ $t('activity.preFilledFields.title') }}</div> -->
 
             <a-select
-              v-model:value="preFilledMode"
+              :value="formPreFill.preFilledMode"
+              :allow-clear="formPreFill.preFilledMode !== t('general.default')"
               class="nc-pre-filled-mode !rounded-md w-full"
               dropdown-class-name="nc-dropdown-pre-filled-mode border-1 !rounded-md border-gray-200"
+              @update:value="
+                (value) => {
+                  formPreFill = {
+                    ...formPreFill,
+                    preFilledMode: value || '',
+                  }
+                }
+              "
             >
               <template #suffixIcon>
                 <GeneralIcon icon="arrowDown" class="text-gray-700" />
               </template>
-              <a-select-option v-for="mode of Object.values(PreFilledMode)" :key="mode" :value="mode">
-                <div class="flex gap-2 items-center">
-                  <div class="flex-1">{{ $t(`activity.preFilledFields.${mode}`) }}</div>
-                  <component
-                    :is="iconMap.check"
-                    v-if="preFilledMode === mode"
-                    id="nc-selected-item-icon"
-                    class="text-primary w-4 h-4"
-                  />
-                </div>
-              </a-select-option>
+              <template v-for="mode of Object.values(PreFilledMode)" :key="mode">
+                <a-select-option v-if="mode !== PreFilledMode.Default" :value="mode">
+                  <div class="flex gap-2 items-center">
+                    <div class="flex-1">{{ $t(`activity.preFilledFields.${mode}`) }}</div>
+                    <component
+                      :is="iconMap.check"
+                      v-if="formPreFill.preFilledMode === mode"
+                      id="nc-selected-item-icon"
+                      class="text-primary w-4 h-4"
+                    />
+                  </div>
+                </a-select-option>
+              </template>
             </a-select>
+
+            <NcTooltip
+              :disabled="!!viewStore.preFillFormSearchParams"
+              :class="{
+                '!cursor-not-allowed': !viewStore.preFillFormSearchParams,
+              }"
+            >
+              <template #title> {{ $t('tooltip.fillTheFormFieldFirst') }} </template>
+              <div
+                class="mt-0.5 border-t-1 border-gray-100 pt-3"
+                :class="{
+                  'pointer-events-none': !viewStore.preFillFormSearchParams,
+                }"
+              >
+                <GeneralCopyUrl v-model:url="forPreFillUrl" />
+              </div>
+            </NcTooltip>
           </div>
         </div>
       </template>
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 019306f309..705a787d24 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -43,6 +43,7 @@ import {
   useViewColumnsOrThrow,
   useViewData,
   watch,
+  useViewsStore,
 } from '#imports'
 import type { ImageCropperConfig } from '~/lib'
 
@@ -104,6 +105,8 @@ const isPublic = inject(IsPublicInj, ref(false))
 
 const { loadFormView, insertRow, formColumnData, formViewData, updateFormView } = useViewData(meta, view)
 
+const { preFillFormSearchParams } = storeToRefs(useViewsStore())
+
 const reloadEventHook = inject(ReloadViewDataHookInj, createEventHook())
 
 reloadEventHook.on(async () => {
@@ -199,6 +202,22 @@ const updateView = useDebounceFn(
   { maxWait: 2000 },
 )
 
+const updatePreFillFormSearchParams = useDebounceFn(() => {
+  if (isLocked.value || !isUIAllowed('dataInsert')) return
+
+  const preFilledData = { ...formState, ...state.value }
+
+  const searchParams = new URLSearchParams()
+
+  for (const c of visibleColumns.value) {
+    if (c.title && preFilledData[c.title] && !isVirtualCol(c) && !(UITypes.Attachment === c.uidt)) {
+      searchParams.append(c.title, preFilledData[c.title])
+    }
+  }
+
+  preFillFormSearchParams.value = searchParams.toString()
+}, 250)
+
 async function submitForm() {
   if (isLocked.value || !isUIAllowed('dataInsert')) return
 
@@ -220,38 +239,6 @@ async function submitForm() {
   submitted.value = true
 }
 
-async function getPreFilledLink() {
-  if (isLocked.value || !isUIAllowed('dataInsert') || !view.value?.uuid) return
-
-  const preFilledData = { ...formState, ...state.value }
-
-  const searchParams = new URLSearchParams()
-
-  for (const c of visibleColumns.value) {
-    if (c.title && preFilledData[c.title] && !isVirtualCol(c)) {
-      searchParams.append(c.title, preFilledData[c.title])
-    }
-  }
-
-  // get base url for workspace
-  const baseUrl = getBaseUrl(workspaceStore.activeWorkspaceId)
-
-  let dashboardUrl1 = dashboardUrl.value
-
-  if (baseUrl) {
-    dashboardUrl1 = `${baseUrl}${appInfo.value?.dashboardPath}`
-  }
-
-  copy(
-    encodeURI(
-      `${dashboardUrl1}#/nc/form/${view.value?.uuid}${parseProp(view.value?.meta).surveyMode ? '/survey' : ''}${
-        searchParams.toString() ? `?${searchParams.toString()}` : ''
-      }`,
-    ),
-  )
-
-  message.info(t('msg.info.copiedToClipboard'))
-}
 
 async function clearForm() {
   if (isLocked.value || !isUIAllowed('dataInsert')) return
@@ -639,6 +626,10 @@ watch([focusLabel, activeRow], () => {
   }
 })
 
+watch([formState, state], () => {
+  updatePreFillFormSearchParams()
+})
+
 useEventListener(
   formRef,
   'focusout',
@@ -1332,21 +1323,6 @@ useEventListener(
                       {{ $t('activity.clearForm') }}
                     </NcButton>
                     <div class="flex items-center gap-3">
-                      <NcTooltip :disabled="!!view?.uuid">
-                        <template #title>{{ $t('tooltip.formIsNotShared') }}</template>
-                        <NcButton
-                          v-if="isUIAllowed('dataInsert') && visibleColumns.length"
-                          type="primary"
-                          size="small"
-                          :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length || isLocked || !view?.uuid"
-                          class="nc-form-get-pre-filled-link nc-form-focus-element"
-                          data-testid="nc-form-get-pre-filled-link"
-                          data-title="nc-form-get-pre-filled-link"
-                          @click="getPreFilledLink"
-                        >
-                          {{ $t('activity.getPreFilledLink') }}
-                        </NcButton>
-                      </NcTooltip>
                       <NcButton
                         html-type="submit"
                         type="primary"
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 3a788a23ba..2518baeeb7 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -255,7 +255,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   }
 
   function handlePreFillForm() {
-    if (Object.keys(route.query).length && sharedViewMeta.value.preFilledMode !== PreFilledMode.Disabled) {
+    if (Object.keys(route.query).length && sharedViewMeta.value.preFillEnabled) {
       columns.value = columns.value?.map((c) => {
         if (
           !c.title ||
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 47736cda95..062905a936 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -928,9 +928,7 @@
     "addFieldFromFormView": "Add Field",
     "selectAllFields": "Select all fields",
     "preFilledFields": {
-      "title": "Pre-filled Fields",
-      "default": "Allow pre-filling fields",
-      "disabled": "Disable pre-filling fields",
+      "title": "Enable Pre-fill",
       "locked": "Lock pre-filled fields as read-only",
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
@@ -966,7 +964,7 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "formIsNotShared": "Form is not shared"
+    "fillTheFormFieldFirst": "Fill the form fields first"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",
diff --git a/packages/nc-gui/lib/enums.ts b/packages/nc-gui/lib/enums.ts
index 5001d068c9..abcd362f0f 100644
--- a/packages/nc-gui/lib/enums.ts
+++ b/packages/nc-gui/lib/enums.ts
@@ -138,8 +138,7 @@ export enum ImportSource {
 }
 
 export enum PreFilledMode {
-  Default = 'default',
-  Disabled = 'disabled',
+  Default = '',
   Locked = 'locked',
   Hidden = 'hidden',
 }
diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts
index cd61b37e47..24c1d997f5 100644
--- a/packages/nc-gui/lib/types.ts
+++ b/packages/nc-gui/lib/types.ts
@@ -115,6 +115,7 @@ interface SharedViewMeta extends Record<string, any> {
   theme?: Partial<ThemeConfig>
   allowCSVDownload?: boolean
   rtl?: boolean
+  preFillEnabled?: boolean
   preFilledMode?: PreFilledMode
 }
 
diff --git a/packages/nc-gui/store/views.ts b/packages/nc-gui/store/views.ts
index f32ca96271..48f24a6555 100644
--- a/packages/nc-gui/store/views.ts
+++ b/packages/nc-gui/store/views.ts
@@ -116,6 +116,8 @@ export const useViewsStore = defineStore('viewsStore', () => {
   // Used for Grid View Pagination
   const isPaginationLoading = ref(true)
 
+  const preFillFormSearchParams = ref('')
+
   const loadViews = async ({
     tableId,
     ignoreLoading,
@@ -282,6 +284,8 @@ export const useViewsStore = defineStore('viewsStore', () => {
     if (!view) return
     if (!view.base_id) return
 
+    preFillFormSearchParams.value = ''
+
     const tableName = tablesStore.baseTables.get(view.base_id)?.find((t) => t.id === view.fk_model_id)?.title
 
     const baseName = bases.basesList.find((p) => p.id === view.base_id)?.title
@@ -322,6 +326,7 @@ export const useViewsStore = defineStore('viewsStore', () => {
     activeSorts,
     activeNestedFilters,
     isActiveViewLocked,
+    preFillFormSearchParams,
   }
 })
 

From ed0987b3d3a85c59a32d8a3581a2aa51b0fbebcf Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:12 +0000
Subject: [PATCH 082/253] chore(nc-gui): lint

---
 .../dlg/share-and-collaborate/SharePage.vue   |  2 +-
 .../nc-gui/components/smartsheet/Form.vue     | 37 +++++++------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index f197402783..e2a866f4ef 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -389,8 +389,8 @@ async function savePreFilledMode() {
           <div class="flex flex-row justify-between">
             <div class="text-black">{{ $t('activity.preFilledFields.title') }}</div>
             <a-switch
-              :checked="formPreFill.preFillEnabled"
               v-e="['c:share:view:surver-mode:toggle']"
+              :checked="formPreFill.preFillEnabled"
               data-testid="nc-modal-share-view__surveyMode"
               @update:checked="
                 (value) => {
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 705a787d24..b9cc44a185 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -42,7 +42,6 @@ import {
   useRoles,
   useViewColumnsOrThrow,
   useViewData,
-  watch,
   useViewsStore,
 } from '#imports'
 import type { ImageCropperConfig } from '~/lib'
@@ -71,13 +70,7 @@ const enum NcForm {
   subheading = 'nc-form-sub-heading',
 }
 
-const { isMobileMode, user, getBaseUrl, appInfo } = useGlobal()
-
-const { dashboardUrl } = useDashboard()
-
-const workspaceStore = useWorkspace()
-
-const { copy } = useCopy()
+const { isMobileMode, user } = useGlobal()
 
 const { $api, $e } = useNuxtApp()
 
@@ -239,7 +232,6 @@ async function submitForm() {
   submitted.value = true
 }
 
-
 async function clearForm() {
   if (isLocked.value || !isUIAllowed('dataInsert')) return
 
@@ -1322,20 +1314,19 @@ useEventListener(
                     >
                       {{ $t('activity.clearForm') }}
                     </NcButton>
-                    <div class="flex items-center gap-3">
-                      <NcButton
-                        html-type="submit"
-                        type="primary"
-                        size="small"
-                        :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length"
-                        class="nc-form-submit nc-form-focus-element"
-                        data-testid="nc-form-submit"
-                        data-title="nc-form-submit"
-                        @click="submitForm"
-                      >
-                        {{ $t('general.submit') }}
-                      </NcButton>
-                    </div>
+
+                    <NcButton
+                      html-type="submit"
+                      type="primary"
+                      size="small"
+                      :disabled="!isUIAllowed('dataInsert') || !visibleColumns.length"
+                      class="nc-form-submit nc-form-focus-element"
+                      data-testid="nc-form-submit"
+                      data-title="nc-form-submit"
+                      @click="submitForm"
+                    >
+                      {{ $t('general.submit') }}
+                    </NcButton>
                   </div>
                 </a-form>
 

From 48432c40afea233b2bb9ebfdd1b42d52a935d759 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:12 +0000
Subject: [PATCH 083/253] fix(nc-gui): invalid queryselector char issue

---
 packages/nc-gui/components/smartsheet/Form.vue | 10 +++++++---
 tests/playwright/pages/Dashboard/Form/index.ts | 10 ++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index b9cc44a185..123ac8b385 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -606,9 +606,13 @@ watch([formState, state.value], async () => {
 
 watch(activeRow, (newValue) => {
   if (newValue) {
-    document
-      .querySelector(`.nc-form-field-item-${newValue?.replaceAll(' ', '')}`)
-      ?.scrollIntoView({ behavior: 'smooth', block: 'center' })
+    const field = document.querySelector(`.nc-form-field-item-${CSS.escape(newValue?.replaceAll(' ', ''))}`)
+
+    if (field) {
+      setTimeout(() => {
+        field?.scrollIntoView({ behavior: 'smooth', block: 'center' })
+      }, 50)
+    }
   }
 })
 
diff --git a/tests/playwright/pages/Dashboard/Form/index.ts b/tests/playwright/pages/Dashboard/Form/index.ts
index 0f18392039..bba939f9e7 100644
--- a/tests/playwright/pages/Dashboard/Form/index.ts
+++ b/tests/playwright/pages/Dashboard/Form/index.ts
@@ -116,7 +116,10 @@ export class FormPage extends BasePage {
       await src.dragTo(dst);
     } else if (mode === 'hideField') {
       // in form-v2, hide field will be using right sidebar
-      await this.formFields.locator(`[data-testid="nc-form-field-item-${field}"]`).locator('.nc-switch').click();
+      await this.formFields
+        .locator(`[data-testid="nc-form-field-item-${CSS.escape(field)}"]`)
+        .locator('.nc-switch')
+        .click();
     }
   }
 
@@ -132,7 +135,10 @@ export class FormPage extends BasePage {
       await src.dragTo(dst, { trial: true });
       await src.dragTo(dst);
     } else if (mode === 'clickField') {
-      await this.formFields.locator(`[data-testid="nc-form-field-item-${field}"]`).locator('.nc-switch').click();
+      await this.formFields
+        .locator(`[data-testid="nc-form-field-item-${CSS.escape(field)}"]`)
+        .locator('.nc-switch')
+        .click();
     }
   }
 

From 0d9db02f683e121cd509e4ebdbcb639e5ad06f33 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:13 +0000
Subject: [PATCH 084/253] fix(nc-gui): prefill issue if query param key is
 encoded

---
 packages/nc-gui/composables/useSharedFormViewStore.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 2518baeeb7..dce85a3107 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -257,9 +257,10 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   function handlePreFillForm() {
     if (Object.keys(route.query).length && sharedViewMeta.value.preFillEnabled) {
       columns.value = columns.value?.map((c) => {
+        const queryParam = route.query?.[c.title as string] || route.query?.[encodeURIComponent(c.title as string)]
         if (
           !c.title ||
-          !route.query?.[c.title] ||
+          !queryParam ||
           isSystemColumn(c) ||
           isVirtualCol(c) ||
           // (isVirtualCol(c) && !isLinksOrLTAR(c)) || // Todo: Enable this after linksOrLTAR prefill supported
@@ -267,7 +268,8 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         ) {
           return c
         }
-        const preFillValue = getPreFillValue(c, decodeURIComponent(route.query?.[c.title] as string).trim())
+
+        const preFillValue = getPreFillValue(c, decodeURIComponent(queryParam as string).trim())
         if (preFillValue !== undefined) {
           // Prefill form state
           formState.value[c.title] = preFillValue

From 979430b0e7d289b3974fd90a340be0a4a95fc849 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:13 +0000
Subject: [PATCH 085/253] test: pw test fails issue

---
 tests/playwright/pages/Dashboard/Form/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/Form/index.ts b/tests/playwright/pages/Dashboard/Form/index.ts
index bba939f9e7..ba46e39625 100644
--- a/tests/playwright/pages/Dashboard/Form/index.ts
+++ b/tests/playwright/pages/Dashboard/Form/index.ts
@@ -117,7 +117,7 @@ export class FormPage extends BasePage {
     } else if (mode === 'hideField') {
       // in form-v2, hide field will be using right sidebar
       await this.formFields
-        .locator(`[data-testid="nc-form-field-item-${CSS.escape(field)}"]`)
+        .locator(`[data-testid="nc-form-field-item-${window.CSS.escape(field)}"]`)
         .locator('.nc-switch')
         .click();
     }
@@ -136,7 +136,7 @@ export class FormPage extends BasePage {
       await src.dragTo(dst);
     } else if (mode === 'clickField') {
       await this.formFields
-        .locator(`[data-testid="nc-form-field-item-${CSS.escape(field)}"]`)
+        .locator(`[data-testid="nc-form-field-item-${window.CSS.escape(field)}"]`)
         .locator('.nc-switch')
         .click();
     }

From d07ed1638e75511cc4048a0f894415166d15a559 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:13 +0000
Subject: [PATCH 086/253] test(nc-gui): pw test fail issue

---
 tests/playwright/pages/Dashboard/Form/index.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/playwright/pages/Dashboard/Form/index.ts b/tests/playwright/pages/Dashboard/Form/index.ts
index ba46e39625..0f18392039 100644
--- a/tests/playwright/pages/Dashboard/Form/index.ts
+++ b/tests/playwright/pages/Dashboard/Form/index.ts
@@ -116,10 +116,7 @@ export class FormPage extends BasePage {
       await src.dragTo(dst);
     } else if (mode === 'hideField') {
       // in form-v2, hide field will be using right sidebar
-      await this.formFields
-        .locator(`[data-testid="nc-form-field-item-${window.CSS.escape(field)}"]`)
-        .locator('.nc-switch')
-        .click();
+      await this.formFields.locator(`[data-testid="nc-form-field-item-${field}"]`).locator('.nc-switch').click();
     }
   }
 
@@ -135,10 +132,7 @@ export class FormPage extends BasePage {
       await src.dragTo(dst, { trial: true });
       await src.dragTo(dst);
     } else if (mode === 'clickField') {
-      await this.formFields
-        .locator(`[data-testid="nc-form-field-item-${window.CSS.escape(field)}"]`)
-        .locator('.nc-switch')
-        .click();
+      await this.formFields.locator(`[data-testid="nc-form-field-item-${field}"]`).locator('.nc-switch').click();
     }
   }
 

From 3662a5ce609d6411e7741d646c1ebc12786aa103 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:13 +0000
Subject: [PATCH 087/253] fix(nc-gui): update prefill enable switch testid

---
 .../components/dlg/share-and-collaborate/SharePage.vue       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index e2a866f4ef..e053d9830f 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -391,7 +391,7 @@ async function savePreFilledMode() {
             <a-switch
               v-e="['c:share:view:surver-mode:toggle']"
               :checked="formPreFill.preFillEnabled"
-              data-testid="nc-modal-share-view__surveyMode"
+              data-testid="nc-modal-share-view__preFill"
               @update:checked="
                 (value) => {
                   formPreFill = {
@@ -404,13 +404,12 @@ async function savePreFilledMode() {
             </a-switch>
           </div>
           <div v-if="formPreFill.preFillEnabled">
-            <!-- <div class="text-black">{{ $t('activity.preFilledFields.title') }}</div> -->
-
             <a-select
               :value="formPreFill.preFilledMode"
               :allow-clear="formPreFill.preFilledMode !== t('general.default')"
               class="nc-pre-filled-mode !rounded-md w-full"
               dropdown-class-name="nc-dropdown-pre-filled-mode border-1 !rounded-md border-gray-200"
+              data-testid="nc-modal-share-view__preFillMode"
               @update:value="
                 (value) => {
                   formPreFill = {

From c71bcab080936a611edbcf4af2325e280356a332 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:13 +0000
Subject: [PATCH 088/253] fix(nc-gui): use existing copy link component for
 prefill link

---
 .../dlg/share-and-collaborate/SharePage.vue   | 93 +++++++------------
 1 file changed, 35 insertions(+), 58 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index e053d9830f..f986170996 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -54,10 +54,6 @@ const url = computed(() => {
   return sharedViewUrl() ?? ''
 })
 
-const forPreFillUrl = computed(() => {
-  return sharedViewUrl(true) ?? ''
-})
-
 const passwordProtectedLocal = ref(false)
 
 const passwordProtected = computed(() => {
@@ -179,7 +175,7 @@ const formPreFill = computed({
   },
 })
 
-function sharedViewUrl(isPreFillUrl: boolean = false) {
+function sharedViewUrl() {
   if (!activeView.value) return
 
   let viewType
@@ -213,9 +209,7 @@ function sharedViewUrl(isPreFillUrl: boolean = false) {
 
   return encodeURI(
     `${dashboardUrl1}#/nc/${viewType}/${activeView.value.uuid}${surveyMode.value ? '/survey' : ''}${
-      isPreFillUrl && formPreFill.value.preFillEnabled && viewStore.preFillFormSearchParams
-        ? `?${viewStore.preFillFormSearchParams}`
-        : ''
+      formPreFill.value.preFillEnabled && viewStore.preFillFormSearchParams ? `?${viewStore.preFillFormSearchParams}` : ''
     }`,
   )
 }
@@ -403,57 +397,40 @@ async function savePreFilledMode() {
             >
             </a-switch>
           </div>
-          <div v-if="formPreFill.preFillEnabled">
-            <a-select
-              :value="formPreFill.preFilledMode"
-              :allow-clear="formPreFill.preFilledMode !== t('general.default')"
-              class="nc-pre-filled-mode !rounded-md w-full"
-              dropdown-class-name="nc-dropdown-pre-filled-mode border-1 !rounded-md border-gray-200"
-              data-testid="nc-modal-share-view__preFillMode"
-              @update:value="
-                (value) => {
-                  formPreFill = {
-                    ...formPreFill,
-                    preFilledMode: value || '',
-                  }
+
+          <a-select
+            v-if="formPreFill.preFillEnabled"
+            :value="formPreFill.preFilledMode"
+            :allow-clear="formPreFill.preFilledMode !== t('general.default')"
+            class="nc-pre-filled-mode !rounded-md w-full !mt-0"
+            dropdown-class-name="nc-dropdown-pre-filled-mode border-1 !rounded-md border-gray-200"
+            data-testid="nc-modal-share-view__preFillMode"
+            @update:value="
+              (value) => {
+                formPreFill = {
+                  ...formPreFill,
+                  preFilledMode: value || '',
                 }
-              "
-            >
-              <template #suffixIcon>
-                <GeneralIcon icon="arrowDown" class="text-gray-700" />
-              </template>
-              <template v-for="mode of Object.values(PreFilledMode)" :key="mode">
-                <a-select-option v-if="mode !== PreFilledMode.Default" :value="mode">
-                  <div class="flex gap-2 items-center">
-                    <div class="flex-1">{{ $t(`activity.preFilledFields.${mode}`) }}</div>
-                    <component
-                      :is="iconMap.check"
-                      v-if="formPreFill.preFilledMode === mode"
-                      id="nc-selected-item-icon"
-                      class="text-primary w-4 h-4"
-                    />
-                  </div>
-                </a-select-option>
-              </template>
-            </a-select>
-
-            <NcTooltip
-              :disabled="!!viewStore.preFillFormSearchParams"
-              :class="{
-                '!cursor-not-allowed': !viewStore.preFillFormSearchParams,
-              }"
-            >
-              <template #title> {{ $t('tooltip.fillTheFormFieldFirst') }} </template>
-              <div
-                class="mt-0.5 border-t-1 border-gray-100 pt-3"
-                :class="{
-                  'pointer-events-none': !viewStore.preFillFormSearchParams,
-                }"
-              >
-                <GeneralCopyUrl v-model:url="forPreFillUrl" />
-              </div>
-            </NcTooltip>
-          </div>
+              }
+            "
+          >
+            <template #suffixIcon>
+              <GeneralIcon icon="arrowDown" class="text-gray-700" />
+            </template>
+            <template v-for="mode of Object.values(PreFilledMode)" :key="mode">
+              <a-select-option v-if="mode !== PreFilledMode.Default" :value="mode">
+                <div class="flex gap-2 items-center">
+                  <div class="flex-1">{{ $t(`activity.preFilledFields.${mode}`) }}</div>
+                  <component
+                    :is="iconMap.check"
+                    v-if="formPreFill.preFilledMode === mode"
+                    id="nc-selected-item-icon"
+                    class="text-primary w-4 h-4"
+                  />
+                </div>
+              </a-select-option>
+            </template>
+          </a-select>
         </div>
       </template>
     </div>

From eec83135fa1801a86e772fede8bf22da3aa93f0d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:13 +0000
Subject: [PATCH 089/253] fix(nc-gui): shared form field readonly bg color
 issue

---
 .../pages/index/[typeOrId]/form/[viewId]/index/index.vue    | 5 ++---
 .../pages/index/[typeOrId]/form/[viewId]/index/survey.vue   | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index 6658252457..4e8d4083ad 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -182,14 +182,13 @@ const onDecode = async (scannedCodeValue: string) => {
                   <div>
                     <NcTooltip :disabled="!field?.read_only">
                       <template #title> {{ $t('activity.preFilledFields.lockedFieldTooltip') }} </template>
-
                       <LazySmartsheetDivDataCell class="flex relative">
                         <LazySmartsheetVirtualCell
                           v-if="isVirtualCol(field)"
                           :model-value="null"
                           class="mt-0 nc-input nc-cell"
                           :data-testid="`nc-form-input-cell-${field.label || field.title}`"
-                          :class="`nc-form-input-${field.title?.replaceAll(' ', '')}`"
+                          :class="[`nc-form-input-${field.title?.replaceAll(' ', '')}`, { readonly: field?.read_only }]"
                           :column="field"
                           :read-only="field?.read_only"
                         />
@@ -201,7 +200,7 @@ const onDecode = async (scannedCodeValue: string) => {
                           :data-testid="`nc-form-input-cell-${field.label || field.title}`"
                           :class="[
                             `nc-form-input-${field.title?.replaceAll(' ', '')}`,
-                            { 'layout-list': parseProp(field?.meta)?.isList },
+                            { 'layout-list': parseProp(field?.meta)?.isList, 'readonly': field?.read_only },
                           ]"
                           :column="field"
                           :edit-enabled="!field?.read_only"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
index bac5a0c11b..0724623a40 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
@@ -282,12 +282,14 @@ onMounted(() => {
 
             <NcTooltip :disabled="!field?.read_only">
               <template #title> {{ $t('activity.preFilledFields.lockedFieldTooltip') }} </template>
-
               <LazySmartsheetDivDataCell v-if="field.title" class="relative nc-form-data-cell">
                 <LazySmartsheetVirtualCell
                   v-if="isVirtualCol(field)"
                   v-model="formState[field.title]"
                   class="mt-0 nc-input h-auto"
+                  :class="{
+                    readonly: field?.read_only,
+                  }"
                   :row="{ row: {}, oldRow: {}, rowMeta: {} }"
                   :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
                   :column="field"
@@ -298,7 +300,7 @@ onMounted(() => {
                   v-else
                   v-model="formState[field.title]"
                   class="nc-input h-auto"
-                  :class="parseProp(field?.meta)?.isList ? 'layout-list' : ''"
+                  :class="{ 'layout-list': parseProp(field?.meta)?.isList, 'readonly': field?.read_only }"
                   :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
                   :column="field"
                   :edit-enabled="!field?.read_only"

From d4459884b101f0a59890826824271b603e7819a4 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:14 +0000
Subject: [PATCH 090/253] fix(nc-gui): prefill link search params copy issue

---
 .../nc-gui/components/dlg/share-and-collaborate/SharePage.vue | 4 +++-
 packages/nc-gui/components/smartsheet/Form.vue                | 2 ++
 packages/nc-gui/store/views.ts                                | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index f986170996..ce357da8c0 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -209,7 +209,7 @@ function sharedViewUrl() {
 
   return encodeURI(
     `${dashboardUrl1}#/nc/${viewType}/${activeView.value.uuid}${surveyMode.value ? '/survey' : ''}${
-      formPreFill.value.preFillEnabled && viewStore.preFillFormSearchParams ? `?${viewStore.preFillFormSearchParams}` : ''
+      viewStore.preFillFormSearchParams && formPreFill.value.preFillEnabled ? `?${viewStore.preFillFormSearchParams}` : ''
     }`,
   )
 }
@@ -291,6 +291,8 @@ async function updateSharedView() {
 async function savePreFilledMode() {
   await updateSharedView()
 }
+
+watchEffect(() => {})
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 123ac8b385..3841000e58 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -564,6 +564,8 @@ onMounted(async () => {
   if (imageCropperData.value.src) {
     URL.revokeObjectURL(imageCropperData.value.imageConfig.src)
   }
+  
+  preFillFormSearchParams.value = ''
 
   isLoadingFormView.value = true
   await loadFormView()
diff --git a/packages/nc-gui/store/views.ts b/packages/nc-gui/store/views.ts
index 48f24a6555..64e426f48f 100644
--- a/packages/nc-gui/store/views.ts
+++ b/packages/nc-gui/store/views.ts
@@ -284,8 +284,6 @@ export const useViewsStore = defineStore('viewsStore', () => {
     if (!view) return
     if (!view.base_id) return
 
-    preFillFormSearchParams.value = ''
-
     const tableName = tablesStore.baseTables.get(view.base_id)?.find((t) => t.id === view.fk_model_id)?.title
 
     const baseName = bases.basesList.find((p) => p.id === view.base_id)?.title

From 7b17a3bb754187c8f0f51d82a513ce5500fafb02 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:14 +0000
Subject: [PATCH 091/253] fix(nc-gui): add tooltip info after enable prefill &
 survey mode option in sharePage modal

---
 .../dlg/share-and-collaborate/SharePage.vue   | 36 +++++++++++++++----
 packages/nc-gui/lang/en.json                  |  3 +-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index ce357da8c0..23da10696d 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -315,7 +315,7 @@ watchEffect(() => {})
           <GeneralCopyUrl v-model:url="url" />
         </div>
         <div class="flex flex-col justify-between mt-1 py-2 px-3 bg-gray-50 rounded-md">
-          <div class="flex flex-row justify-between">
+          <div class="flex flex-row items-center justify-between">
             <div class="flex text-black">{{ $t('activity.restrictAccessWithPassword') }}</div>
             <a-switch
               v-e="['c:share:view:password:toggle']"
@@ -323,6 +323,7 @@ watchEffect(() => {})
               :loading="isUpdating.password"
               class="share-password-toggle !mt-0.25"
               data-testid="share-password-toggle"
+              size="small"
               @click="togglePasswordProtected"
             />
           </div>
@@ -345,7 +346,7 @@ watchEffect(() => {})
               activeView &&
               [ViewTypes.GRID, ViewTypes.KANBAN, ViewTypes.GALLERY, ViewTypes.MAP, ViewTypes.CALENDAR].includes(activeView.type)
             "
-            class="flex flex-row justify-between"
+            class="flex flex-row items-center justify-between"
           >
             <div class="flex text-black">{{ $t('activity.allowDownload') }}</div>
             <a-switch
@@ -354,25 +355,34 @@ watchEffect(() => {})
               :loading="isUpdating.download"
               class="public-password-toggle !mt-0.25"
               data-testid="share-download-toggle"
+              size="small"
             />
           </div>
 
           <template v-if="activeView?.type === ViewTypes.FORM">
-            <div class="flex flex-row justify-between">
-              <div class="text-black">{{ $t('activity.surveyMode') }}</div>
+            <div class="flex flex-row items-center justify-between">
+              <div class="text-black">
+                {{ $t('activity.surveyMode') }}
+                <NcTooltip class="inline">
+                  <template #title> {{ $t('tooltip.surveyFormInfo') }}</template>
+                  <GeneralIcon icon="info" class="text-gray-600 cursor-pointer"></GeneralIcon>
+                </NcTooltip>
+              </div>
               <a-switch
                 v-model:checked="surveyMode"
                 v-e="['c:share:view:surver-mode:toggle']"
                 data-testid="nc-modal-share-view__surveyMode"
+                size="small"
               >
               </a-switch>
             </div>
-            <div v-if="!isEeUI" class="flex flex-row justify-between">
+            <div v-if="!isEeUI" class="flex flex-row items-center justify-between">
               <div class="text-black">{{ $t('activity.rtlOrientation') }}</div>
               <a-switch
                 v-model:checked="withRTL"
                 v-e="['c:share:view:rtl-orientation:toggle']"
                 data-testid="nc-modal-share-view__RTL"
+                size="small"
               >
               </a-switch>
             </div>
@@ -382,12 +392,24 @@ watchEffect(() => {})
           v-if="activeView?.type === ViewTypes.FORM"
           class="nc-pre-filled-mode-wrapper flex flex-col justify-between gap-y-3 mt-1 py-2 px-3 bg-gray-50 rounded-md"
         >
-          <div class="flex flex-row justify-between">
-            <div class="text-black">{{ $t('activity.preFilledFields.title') }}</div>
+          <div class="flex flex-row items-center justify-between">
+            <div class="text-black flex-1">
+              {{ $t('activity.preFilledFields.title') }}
+
+              <NcTooltip class="inline">
+                <template #title
+                  ><div class="text-center">
+                    {{ $t('tooltip.preFillFormInfo') }}
+                  </div></template
+                >
+                <GeneralIcon icon="info" class="text-gray-600 cursor-pointer"></GeneralIcon>
+              </NcTooltip>
+            </div>
             <a-switch
               v-e="['c:share:view:surver-mode:toggle']"
               :checked="formPreFill.preFillEnabled"
               data-testid="nc-modal-share-view__preFill"
+              size="small"
               @update:checked="
                 (value) => {
                   formPreFill = {
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 062905a936..3668e4f5e9 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -964,7 +964,8 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "fillTheFormFieldFirst": "Fill the form fields first"
+    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 835f55b9a5225401594f3bcb2a107d98a4dd092c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:14 +0000
Subject: [PATCH 092/253] fix(nc-gui): prevent clear prefilled readonly or
 hidden fields on clicking clear form

---
 packages/nc-gui/composables/useSharedFormViewStore.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index dce85a3107..64675920da 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -81,6 +81,8 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const route = useRoute()
 
   const formState = ref<Record<string, any>>({})
+  
+  const preFilledformState = ref<Record<string, any>>({})
 
   const { state: additionalState } = useProvideSmartsheetRowStore(
     meta as Ref<TableType>,
@@ -250,7 +252,11 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     formResetHook.trigger()
 
     additionalState.value = {}
-    formState.value = {}
+    formState.value = {
+      ...([PreFilledMode.Locked, PreFilledMode.Hidden].includes(sharedViewMeta.value.preFilledMode)
+        ? preFilledformState.value
+        : {}),
+    }
     v$.value?.$reset()
   }
 
@@ -273,6 +279,8 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         if (preFillValue !== undefined) {
           // Prefill form state
           formState.value[c.title] = preFillValue
+          // preFilledformState will be used in clear for to fill the filled data
+          preFilledformState.value[c.title] = preFillValue
 
           // Update column
           switch (sharedViewMeta.value.preFilledMode) {

From a454349a478852ed7861124d03248e47c642e720 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:14 +0000
Subject: [PATCH 093/253] fix(nc-gui): use radio inputs instead of select for
 prefilled mode select

---
 .../dlg/share-and-collaborate/SharePage.vue   | 67 +++++++------------
 .../nc-gui/components/smartsheet/Form.vue     |  2 +-
 packages/nc-gui/lang/en.json                  |  3 +-
 packages/nc-gui/lib/enums.ts                  |  2 +-
 4 files changed, 27 insertions(+), 47 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index 23da10696d..d8ffa4b11a 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -154,7 +154,7 @@ const surveyMode = computed({
 const formPreFill = computed({
   get: () => ({
     preFillEnabled: parseProp(activeView.value?.meta)?.preFillEnabled ?? false,
-    preFilledMode: parseProp(activeView.value?.meta)?.preFilledMode || t('general.default'),
+    preFilledMode: parseProp(activeView.value?.meta)?.preFilledMode || PreFilledMode.Default,
   }),
   set: (value) => {
     if (!activeView.value?.meta) return
@@ -164,7 +164,7 @@ const formPreFill = computed({
     }
 
     if (formPreFill.value.preFilledMode !== value.preFilledMode) {
-      $e(`a:view:share:${value.preFillEnabled || 'default'}-prefilled-mode`)
+      $e(`a:view:share:${value.preFilledMode}-prefilled-mode`)
     }
 
     activeView.value.meta = {
@@ -361,9 +361,11 @@ watchEffect(() => {})
 
           <template v-if="activeView?.type === ViewTypes.FORM">
             <div class="flex flex-row items-center justify-between">
-              <div class="text-black">
-                {{ $t('activity.surveyMode') }}
-                <NcTooltip class="inline">
+              <div class="text-black flex items-center space-x-1">
+                <div>
+                  {{ $t('activity.surveyMode') }}
+                </div>
+                <NcTooltip>
                   <template #title> {{ $t('tooltip.surveyFormInfo') }}</template>
                   <GeneralIcon icon="info" class="text-gray-600 cursor-pointer"></GeneralIcon>
                 </NcTooltip>
@@ -393,15 +395,17 @@ watchEffect(() => {})
           class="nc-pre-filled-mode-wrapper flex flex-col justify-between gap-y-3 mt-1 py-2 px-3 bg-gray-50 rounded-md"
         >
           <div class="flex flex-row items-center justify-between">
-            <div class="text-black flex-1">
-              {{ $t('activity.preFilledFields.title') }}
+            <div class="text-black flex items-center space-x-1">
+              <div>
+                {{ $t('activity.preFilledFields.title') }}
+              </div>
 
-              <NcTooltip class="inline">
-                <template #title
-                  ><div class="text-center">
+              <NcTooltip>
+                <template #title>
+                  <div class="text-center">
                     {{ $t('tooltip.preFillFormInfo') }}
-                  </div></template
-                >
+                  </div>
+                </template>
                 <GeneralIcon icon="info" class="text-gray-600 cursor-pointer"></GeneralIcon>
               </NcTooltip>
             </div>
@@ -422,12 +426,10 @@ watchEffect(() => {})
             </a-switch>
           </div>
 
-          <a-select
+          <a-radio-group
             v-if="formPreFill.preFillEnabled"
-            :value="formPreFill.preFilledMode"
-            :allow-clear="formPreFill.preFilledMode !== t('general.default')"
-            class="nc-pre-filled-mode !rounded-md w-full !mt-0"
-            dropdown-class-name="nc-dropdown-pre-filled-mode border-1 !rounded-md border-gray-200"
+            :value="formPreFill.preFilledMode || ''"
+            class="nc-field-layout-list"
             data-testid="nc-modal-share-view__preFillMode"
             @update:value="
               (value) => {
@@ -438,23 +440,10 @@ watchEffect(() => {})
               }
             "
           >
-            <template #suffixIcon>
-              <GeneralIcon icon="arrowDown" class="text-gray-700" />
-            </template>
-            <template v-for="mode of Object.values(PreFilledMode)" :key="mode">
-              <a-select-option v-if="mode !== PreFilledMode.Default" :value="mode">
-                <div class="flex gap-2 items-center">
-                  <div class="flex-1">{{ $t(`activity.preFilledFields.${mode}`) }}</div>
-                  <component
-                    :is="iconMap.check"
-                    v-if="formPreFill.preFilledMode === mode"
-                    id="nc-selected-item-icon"
-                    class="text-primary w-4 h-4"
-                  />
-                </div>
-              </a-select-option>
-            </template>
-          </a-select>
+            <a-radio v-for="mode of Object.values(PreFilledMode)" :key="mode" :value="mode">
+              <div class="flex-1">{{ $t(`activity.preFilledFields.${mode || Default}`) }}</div>
+            </a-radio>
+          </a-radio-group>
         </div>
       </template>
     </div>
@@ -479,14 +468,4 @@ watchEffect(() => {})
     line-height: 1rem !important;
   }
 }
-
-.nc-pre-filled-mode-wrapper {
-  .nc-pre-filled-mode.ant-select {
-    @apply !p-0 mt-2;
-
-    &.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
-      @apply !border-brand-500 !shadow-none;
-    }
-  }
-}
 </style>
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 3841000e58..77ec353a1d 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -669,7 +669,7 @@ useEventListener(
   (e: KeyboardEvent) => {
     const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
 
-    switch (e.key.toLowerCase()) {
+    switch (e.key?.toLowerCase()) {
       case 's':
         if (
           cmdOrCtrl &&
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 3668e4f5e9..f66b113cf4 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -929,6 +929,7 @@
     "selectAllFields": "Select all fields",
     "preFilledFields": {
       "title": "Enable Pre-fill",
+      "default": "Default",
       "locked": "Lock pre-filled fields as read-only",
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
@@ -964,7 +965,7 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
diff --git a/packages/nc-gui/lib/enums.ts b/packages/nc-gui/lib/enums.ts
index abcd362f0f..400a126cdf 100644
--- a/packages/nc-gui/lib/enums.ts
+++ b/packages/nc-gui/lib/enums.ts
@@ -138,7 +138,7 @@ export enum ImportSource {
 }
 
 export enum PreFilledMode {
-  Default = '',
+  Default = 'default',
   Locked = 'locked',
   Hidden = 'hidden',
 }

From b9057d20b75a999e48e5c6d853a6127879e4e69c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:14 +0000
Subject: [PATCH 094/253] fix(nc-gui): prefill link issue after clicking clear
 form btn in form builder

---
 .../dlg/share-and-collaborate/SharePage.vue   |  6 +--
 .../nc-gui/components/smartsheet/Form.vue     | 45 ++++++++++---------
 .../composables/useSharedFormViewStore.ts     |  2 +-
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index d8ffa4b11a..580f02484b 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -7,8 +7,6 @@ const { view: _view, $api } = useSmartsheetStoreOrThrow()
 const { $e } = useNuxtApp()
 const { getBaseUrl, appInfo } = useGlobal()
 
-const { t } = useI18n()
-
 const { dashboardUrl } = useDashboard()
 
 const viewStore = useViewsStore()
@@ -428,14 +426,14 @@ watchEffect(() => {})
 
           <a-radio-group
             v-if="formPreFill.preFillEnabled"
-            :value="formPreFill.preFilledMode || ''"
+            :value="formPreFill.preFilledMode"
             class="nc-field-layout-list"
             data-testid="nc-modal-share-view__preFillMode"
             @update:value="
               (value) => {
                 formPreFill = {
                   ...formPreFill,
-                  preFilledMode: value || '',
+                  preFilledMode: value,
                 }
               }
             "
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 77ec353a1d..58f42723db 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -31,7 +31,6 @@ import {
   onClickOutside,
   parseProp,
   provide,
-  reactive,
   ref,
   useDebounceFn,
   useEventListener,
@@ -82,7 +81,7 @@ const { getPossibleAttachmentSrc } = useAttachment()
 
 const formRef = ref()
 
-let formState = reactive<Record<string, any>>({})
+const formState = ref<Record<string, any>>({})
 
 const secondsRemain = ref(0)
 
@@ -112,7 +111,7 @@ const { fields, showAll, hideAll } = useViewColumnsOrThrow()
 const { state, row } = useProvideSmartsheetRowStore(
   meta,
   ref({
-    row: formState,
+    row: formState.value,
     oldRow: {},
     rowMeta: { new: true },
   }),
@@ -198,7 +197,7 @@ const updateView = useDebounceFn(
 const updatePreFillFormSearchParams = useDebounceFn(() => {
   if (isLocked.value || !isUIAllowed('dataInsert')) return
 
-  const preFilledData = { ...formState, ...state.value }
+  const preFilledData = { ...formState.value, ...state.value }
 
   const searchParams = new URLSearchParams()
 
@@ -224,7 +223,7 @@ async function submitForm() {
   }
 
   await insertRow({
-    row: { ...formState, ...state.value },
+    row: { ...formState.value, ...state.value },
     oldRow: {},
     rowMeta: { new: true },
   })
@@ -235,7 +234,7 @@ async function submitForm() {
 async function clearForm() {
   if (isLocked.value || !isUIAllowed('dataInsert')) return
 
-  formState = reactive<Record<string, any>>({})
+  formState.value = {}
   state.value = {}
   await formRef.value?.clearValidate()
   reloadEventHook.trigger()
@@ -564,7 +563,7 @@ onMounted(async () => {
   if (imageCropperData.value.src) {
     URL.revokeObjectURL(imageCropperData.value.imageConfig.src)
   }
-  
+
   preFillFormSearchParams.value = ''
 
   isLoadingFormView.value = true
@@ -592,19 +591,25 @@ watch(view, (nextView) => {
   }
 })
 
-watch([formState, state.value], async () => {
-  for (const virtualField in state.value) {
-    if (!formState[virtualField]) {
-      formState[virtualField] = state.value[virtualField]
+watch(
+  [formState, state],
+  async () => {
+    for (const virtualField in state.value) {
+      formState.value[virtualField] = state.value[virtualField]
     }
-  }
 
-  try {
-    await formRef.value?.validateFields([...Object.keys(formState)])
-  } catch (e: any) {
-    e.errorFields.map((f: Record<string, any>) => console.error(f.errors.join(',')))
-  }
-})
+    updatePreFillFormSearchParams()
+
+    try {
+      await formRef.value?.validateFields([...Object.keys(formState.value)])
+    } catch (e: any) {
+      e.errorFields.map((f: Record<string, any>) => console.error(f.errors.join(',')))
+    }
+  },
+  {
+    deep: true,
+  },
+)
 
 watch(activeRow, (newValue) => {
   if (newValue) {
@@ -624,10 +629,6 @@ watch([focusLabel, activeRow], () => {
   }
 })
 
-watch([formState, state], () => {
-  updatePreFillFormSearchParams()
-})
-
 useEventListener(
   formRef,
   'focusout',
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 64675920da..f6441731e0 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -81,7 +81,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   const route = useRoute()
 
   const formState = ref<Record<string, any>>({})
-  
+
   const preFilledformState = ref<Record<string, any>>({})
 
   const { state: additionalState } = useProvideSmartsheetRowStore(

From cbe0ced13694be43ac99775cda9db6db72a832e3 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:14 +0000
Subject: [PATCH 095/253] fix(nc-gui): reduce gap between prefill mode radio
 inputs

---
 .../dlg/share-and-collaborate/SharePage.vue      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index 580f02484b..33d864eaf1 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -427,7 +427,7 @@ watchEffect(() => {})
           <a-radio-group
             v-if="formPreFill.preFillEnabled"
             :value="formPreFill.preFilledMode"
-            class="nc-field-layout-list"
+            class="nc-modal-share-view-preFillMode"
             data-testid="nc-modal-share-view__preFillMode"
             @update:value="
               (value) => {
@@ -466,4 +466,18 @@ watchEffect(() => {})
     line-height: 1rem !important;
   }
 }
+
+.nc-modal-share-view-preFillMode {
+  @apply flex flex-col;
+
+  .ant-radio-wrapper {
+    @apply !m-0 !flex !items-center w-full px-2 py-1 rounded-lg hover:bg-gray-100;
+    .ant-radio {
+      @apply !top-0;
+    }
+    .ant-radio + span {
+      @apply !flex !pl-4;
+    }
+  }
+}
 </style>

From 758c898ffbbdd5c61e5bdd477e325632e472e315 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:15 +0000
Subject: [PATCH 096/253] fix(nc-gui): swap prefilled mode radio options

---
 packages/nc-gui/lib/enums.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/lib/enums.ts b/packages/nc-gui/lib/enums.ts
index 400a126cdf..f386e6a9df 100644
--- a/packages/nc-gui/lib/enums.ts
+++ b/packages/nc-gui/lib/enums.ts
@@ -139,6 +139,6 @@ export enum ImportSource {
 
 export enum PreFilledMode {
   Default = 'default',
-  Locked = 'locked',
   Hidden = 'hidden',
+  Locked = 'locked',
 }

From aef292b2f71b04ebbe5d189ceb74fd09d66c438b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:15 +0000
Subject: [PATCH 097/253] feat(nc-gui): prefill form with default values

---
 .../composables/useSharedFormViewStore.ts      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index f6441731e0..8d723d12c0 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -124,11 +124,17 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         {} as Record<string, FormColumnType>,
       )
 
-      columns.value = viewMeta.model?.columns?.map((c) => ({
-        ...c,
-        meta: { ...parseProp(fieldById[c.id].meta), ...parseProp(c.meta) },
-        description: fieldById[c.id].description,
-      }))
+      columns.value = viewMeta.model?.columns?.map((c) => {
+        if (!isSystemColumn(c) && !isVirtualCol(c) && c?.title && c?.cdf) {
+          formState.value[c.title] = c.cdf
+        }
+
+        return {
+          ...c,
+          meta: { ...parseProp(fieldById[c.id].meta), ...parseProp(c.meta) },
+          description: fieldById[c.id].description,
+        }
+      })
 
       const _sharedViewMeta = (viewMeta as any).meta
       sharedViewMeta.value = isString(_sharedViewMeta) ? JSON.parse(_sharedViewMeta) : _sharedViewMeta
@@ -262,7 +268,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
 
   function handlePreFillForm() {
     if (Object.keys(route.query).length && sharedViewMeta.value.preFillEnabled) {
-      columns.value = columns.value?.map((c) => {
+      columns.value = columns.value.map((c) => {
         const queryParam = route.query?.[c.title as string] || route.query?.[encodeURIComponent(c.title as string)]
         if (
           !c.title ||

From 2d2ec98088fadfe088e23171149ed93861e4ecd0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:15 +0000
Subject: [PATCH 098/253] fix(nc-gui): some review comments

---
 .../dlg/share-and-collaborate/SharePage.vue   | 27 +++++++------------
 packages/nc-gui/components/monaco/Editor.vue  | 19 +++++++------
 .../composables/useSharedFormViewStore.ts     |  6 ++---
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index 33d864eaf1..fafadd37ba 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -173,6 +173,13 @@ const formPreFill = computed({
   },
 })
 
+const handleChangeFormPreFill = (value: { preFillEnabled?: boolean; preFilledMode?: PreFilledMode }) => {
+  formPreFill.value = {
+    ...formPreFill.value,
+    ...value,
+  }
+}
+
 function sharedViewUrl() {
   if (!activeView.value) return
 
@@ -412,14 +419,7 @@ watchEffect(() => {})
               :checked="formPreFill.preFillEnabled"
               data-testid="nc-modal-share-view__preFill"
               size="small"
-              @update:checked="
-                (value) => {
-                  formPreFill = {
-                    ...formPreFill,
-                    preFillEnabled: value,
-                  }
-                }
-              "
+              @update:checked="handleChangeFormPreFill({ preFillEnabled: $event as boolean })"
             >
             </a-switch>
           </div>
@@ -429,17 +429,10 @@ watchEffect(() => {})
             :value="formPreFill.preFilledMode"
             class="nc-modal-share-view-preFillMode"
             data-testid="nc-modal-share-view__preFillMode"
-            @update:value="
-              (value) => {
-                formPreFill = {
-                  ...formPreFill,
-                  preFilledMode: value,
-                }
-              }
-            "
+            @update:value="handleChangeFormPreFill({ preFilledMode: $event })"
           >
             <a-radio v-for="mode of Object.values(PreFilledMode)" :key="mode" :value="mode">
-              <div class="flex-1">{{ $t(`activity.preFilledFields.${mode || Default}`) }}</div>
+              <div class="flex-1">{{ $t(`activity.preFilledFields.${mode}`) }}</div>
             </a-radio>
           </a-radio-group>
         </div>
diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 06ad6884b7..e0675d21c7 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -12,18 +12,17 @@ interface Props {
   validate?: boolean
   disableDeepCompare?: boolean
   readOnly?: boolean
-  autoFocus: boolean
+  autoFocus?: boolean
 }
 
-const {
-  hideMinimap,
-  lang = 'json',
-  validate = true,
-  disableDeepCompare = false,
-  modelValue,
-  readOnly,
-  autoFocus = true,
-} = defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  lang: 'json',
+  validate: true,
+  disableDeepCompare: false,
+  autoFocus: true,
+})
+
+const { hideMinimap, lang, validate, disableDeepCompare, modelValue, readOnly, autoFocus } = props
 
 const emits = defineEmits(['update:modelValue'])
 
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 8d723d12c0..b393f6b07f 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -267,9 +267,9 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
   }
 
   function handlePreFillForm() {
-    if (Object.keys(route.query).length && sharedViewMeta.value.preFillEnabled) {
-      columns.value = columns.value.map((c) => {
-        const queryParam = route.query?.[c.title as string] || route.query?.[encodeURIComponent(c.title as string)]
+    if (Object.keys(route.query || {}).length && sharedViewMeta.value.preFillEnabled) {
+      columns.value = (columns.value || []).map((c) => {
+        const queryParam = route.query[c.title as string] || route.query[encodeURIComponent(c.title as string)]
         if (
           !c.title ||
           !queryParam ||

From 3ee5e52f60eaa9834cb470ffe6e654ffba929827 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:15 +0000
Subject: [PATCH 099/253] fix(nc-gui): use math.max instead of ternary operator

---
 packages/nc-gui/composables/useSharedFormViewStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index b393f6b07f..5b73724a06 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -384,7 +384,7 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       }
       case UITypes.Rating: {
         if (!isNaN(Number(value))) {
-          preFillValue = Number(value) > parseProp(c.meta).max ? parseProp(c.meta).max : Number(value)
+          preFillValue = Math.min(Math.max(Number(value), 0), parseProp(c.meta).max ?? 5)
         }
         break
       }

From 62220705de32d51d550f5f7e0ff7df6954efc36b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:15 +0000
Subject: [PATCH 100/253] fix(nc-gui): add condition to check default value

---
 packages/nc-gui/components/monaco/Editor.vue  |  4 ++--
 .../nc-gui/components/smartsheet/Form.vue     |  2 +-
 .../composables/useSharedFormViewStore.ts     | 20 +++++++++++++++----
 packages/nc-gui/utils/dataUtils.ts            |  4 ++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index e0675d21c7..706f700e9a 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -22,10 +22,10 @@ const props = withDefaults(defineProps<Props>(), {
   autoFocus: true,
 })
 
-const { hideMinimap, lang, validate, disableDeepCompare, modelValue, readOnly, autoFocus } = props
-
 const emits = defineEmits(['update:modelValue'])
 
+const { hideMinimap, lang, validate, disableDeepCompare, modelValue, readOnly, autoFocus } = props
+
 const vModel = computed<string>({
   get: () => {
     if (typeof modelValue === 'object') {
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 58f42723db..30bb06f06b 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1466,7 +1466,7 @@ useEventListener(
                             <SmartsheetHeaderCellIcon v-else :column-meta="field" />
                             <div class="flex-1 flex items-center justify-start max-w-[calc(100%_-_68px)] mr-4">
                               <div class="w-full flex items-center">
-                                <div class="ml-1 inline-block max-w-1/2">
+                                <div class="ml-1 inline-flex" :class="field.label?.trim() ? 'max-w-1/2' : 'max-w-[95%]'">
                                   <NcTooltip class="truncate text-sm" :disabled="drag" show-on-truncate-only>
                                     <template #title>
                                       <div class="text-center">
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index 5b73724a06..ee76defc11 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -97,7 +97,11 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     helpers.withMessage(t('msg.error.fieldRequired', { value: fieldName }), required)
 
   const formColumns = computed(() =>
-    columns.value?.filter((c) => c.show).filter((col) => !isSystemColumn(col) && (!isVirtualCol(col) || isLinksOrLTAR(col.uidt))),
+    columns.value
+      ?.filter((c) => c.show)
+      .filter(
+        (col) => !isSystemColumn(col) && col.uidt !== UITypes.SpecificDBType && (!isVirtualCol(col) || isLinksOrLTAR(col.uidt)),
+      ),
   )
 
   const loadSharedView = async () => {
@@ -125,7 +129,15 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
       )
 
       columns.value = viewMeta.model?.columns?.map((c) => {
-        if (!isSystemColumn(c) && !isVirtualCol(c) && c?.title && c?.cdf) {
+        if (
+          !isSystemColumn(c) &&
+          !isVirtualCol(c) &&
+          !isAttachment(c) &&
+          c.uidt !== UITypes.SpecificDBType &&
+          c?.title &&
+          c?.cdf &&
+          !/^\w+\(\)|CURRENT_TIMESTAMP$/.test(c.cdf)
+        ) {
           formState.value[c.title] = c.cdf
         }
 
@@ -275,8 +287,8 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
           !queryParam ||
           isSystemColumn(c) ||
           isVirtualCol(c) ||
-          // (isVirtualCol(c) && !isLinksOrLTAR(c)) || // Todo: Enable this after linksOrLTAR prefill supported
-          isAttachment(c)
+          isAttachment(c) ||
+          c.uidt === UITypes.SpecificDBType
         ) {
           return c
         }
diff --git a/packages/nc-gui/utils/dataUtils.ts b/packages/nc-gui/utils/dataUtils.ts
index d5eb9a029e..afde59faab 100644
--- a/packages/nc-gui/utils/dataUtils.ts
+++ b/packages/nc-gui/utils/dataUtils.ts
@@ -102,9 +102,9 @@ export const rowDefaultData = (columns: ColumnType[] = []) => {
     if (
       !isSystemColumn(col) &&
       !isVirtualCol(col) &&
-      !isLinksOrLTAR({ uidt: col.uidt! }) &&
       ![UITypes.Rollup, UITypes.Lookup, UITypes.Formula, UITypes.Barcode, UITypes.QrCode].includes(col.uidt) &&
-      col?.cdf
+      col?.cdf &&
+      !/^\w+\(\)|CURRENT_TIMESTAMP$/.test(col.cdf)
     ) {
       const defaultValue = col.cdf
       acc[col.title!] = typeof defaultValue === 'string' ? defaultValue.replace(/^'/, '').replace(/'$/, '') : defaultValue

From 61400e7a5c6f13ac94497376cceddfda7d9f1cff Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:15 +0000
Subject: [PATCH 101/253] chore(nc-gui): lint

---
 packages/nc-gui/utils/dataUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/utils/dataUtils.ts b/packages/nc-gui/utils/dataUtils.ts
index afde59faab..939ce369f7 100644
--- a/packages/nc-gui/utils/dataUtils.ts
+++ b/packages/nc-gui/utils/dataUtils.ts
@@ -1,4 +1,4 @@
-import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import { RelationTypes, UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
 import { isColumnRequiredAndNull } from './columnUtils'
 import type { Row } from '~/lib'

From 9ce9d4d5ecaf9170ef6eeec64f126c4891162aa9 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:16 +0000
Subject: [PATCH 102/253] fix(nc-gui): focus form element only in tab press

---
 packages/nc-gui/components/smartsheet/Form.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 30bb06f06b..f3ec311e57 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1825,10 +1825,10 @@ useEventListener(
 .nc-form-field-ghost {
   @apply bg-gray-50;
 }
-:deep(.nc-form-input-required + button):focus {
+:deep(.nc-form-input-required + button):focus-visible {
   box-shadow: 0 0 0 2px #fff, 0 0 0 4px #3366ff;
 }
-:deep(.nc-form-switch-focus):focus {
+:deep(.nc-form-switch-focus):focus-visible {
   box-shadow: 0 0 0 2px #fff, 0 0 0 4px #3366ff;
 }
 .nc-form-field-layout {
@@ -1839,7 +1839,7 @@ useEventListener(
     .ant-radio {
       @apply !top-0;
 
-      &:focus-within .ant-radio-inner {
+      .ant-radio-input:focus-visible + .ant-radio-inner {
         box-shadow: 0 0 0 2px #fff, 0 0 0 4px #3366ff;
       }
     }
@@ -1847,12 +1847,9 @@ useEventListener(
 }
 
 .nc-form-wrapper {
-  .ant-switch:focus,
-  .ant-switch-checked:focus {
+  .ant-switch:focus-visible,
+  .ant-switch-checked:focus-visible {
     box-shadow: 0 0 0 2px #fff, 0 0 0 4px #3366ff;
-    &:hover {
-      box-shadow: none;
-    }
   }
 }
 </style>

From e906874a41d1ae639be59ceb8355e8b4ec805ad1 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:51:16 +0000
Subject: [PATCH 103/253] fix(nc-gui): add bg gray color for form field
 settings part

---
 packages/nc-gui/components/smartsheet/Form.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index f3ec311e57..d44cf5d982 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1088,7 +1088,7 @@ useEventListener(
                         </div>
 
                         <!-- Field Header  -->
-                        <div v-if="activeRow === element.title" class="w-full flex gap-3 items-center px-3 py-2 bg-gray-50">
+                        <div v-if="activeRow === element.title" class="w-full flex gap-3 items-center px-3 py-2 bg-gray-50 border-b-1 border-gray-200">
                           <component
                             :is="iconMap.drag"
                             class="nc-form-field-drag-handler flex-none cursor-move !h-4 !w-4 text-gray-600"
@@ -1241,7 +1241,7 @@ useEventListener(
                         <!-- Field Settings  -->
                         <div
                           v-if="activeRow === element.title && isSelectTypeCol(element.uidt)"
-                          class="nc-form-field-settings border-t border-gray-200 p-4 lg:p-6 flex flex-col gap-3"
+                          class="nc-form-field-settings border-t border-gray-200 p-4 lg:p-6 flex flex-col gap-3 bg-gray-50"
                         >
                           <!-- Layout  -->
                           <div v-if="isSelectTypeCol(element.uidt)">
@@ -1263,7 +1263,7 @@ useEventListener(
                           </div>
                           <!-- Todo: Show on conditions,... -->
                           <!-- eslint-disable vue/no-constant-condition -->
-                          <div v-if="false" class="flex items-start gap-3 px-3 py-2 border-1 border-gray-200 rounded-lg">
+                          <div v-if="false" class="flex items-start gap-3 px-3 py-2 border-1 border-gray-200 rounded-lg bg-white">
                             <a-switch v-e="['a:form-view:field:show-on-condition']" size="small" class="nc-form-switch-focus" />
                             <div>
                               <div class="font-medium text-gray-800">{{ $t('labels.showOnConditions') }}</div>
@@ -1272,7 +1272,7 @@ useEventListener(
                           </div>
 
                           <!-- Limit options -->
-                          <div v-if="isSelectTypeCol(element.uidt)" class="px-3 py-2 border-1 border-gray-200 rounded-lg">
+                          <div v-if="isSelectTypeCol(element.uidt)" class="px-3 py-2 border-1 border-gray-200 rounded-lg bg-white">
                             <div class="flex items-center gap-3">
                               <a-switch
                                 v-model:checked="element.meta.isLimitOption"
@@ -1835,7 +1835,7 @@ useEventListener(
   @apply !flex !items-center w-full space-x-3;
 
   :deep(.ant-radio-wrapper) {
-    @apply border-1 border-gray-200 rounded-lg !py-2 !px-3 basis-full !mr-0 !items-center;
+    @apply border-1 border-gray-200 rounded-lg !py-2 !px-3 basis-full !mr-0 !items-center bg-white;
     .ant-radio {
       @apply !top-0;
 

From ff26356173df2bcc95340ac99d563d369e227d4c Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:13 +0000
Subject: [PATCH 104/253] Update source file en.json

---
 packages/nc-gui/lang/en.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index f7c5751ed5..f66b113cf4 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Clear all metadata from meta tables.",
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
-    "clientCA": "Select CA file"
+    "clientCA": "Select CA file",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From f82eceb5dda716605a93a05c54b8d03f51c98944 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:16 +0000
Subject: [PATCH 105/253] New translations en.json (French)

---
 packages/nc-gui/lang/fr.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index 3827c1b9c1..ed32d80c90 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -926,7 +926,15 @@
     "startCommenting": "Commencez à commenter !",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limité à une seule source de données pour le moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Effacer toutes les métadonnées des méta-tables.",
     "clientKey": "Selectionner un fichier .key",
     "clientCert": "Selectionner un fichier .cert",
-    "clientCA": "Selectionner un fichier d'authentification"
+    "clientCA": "Selectionner un fichier d'authentification",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Sélectionnez les canaux Slack",

From 02833dfd21323819eed2db31282a24f01649bdd3 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:17 +0000
Subject: [PATCH 106/253] New translations en.json (Spanish)

---
 packages/nc-gui/lang/es.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
index ca2d1888a3..afe8b139e2 100644
--- a/packages/nc-gui/lang/es.json
+++ b/packages/nc-gui/lang/es.json
@@ -926,7 +926,15 @@
     "startCommenting": "¡Empieza a comentar!",
     "clearForm": "Limpiar formulario",
     "addFieldFromFormView": "Añadir Campo",
-    "selectAllFields": "Seleccionar todos los campos"
+    "selectAllFields": "Seleccionar todos los campos",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limitado a una única fuente de datos por el momento",
@@ -956,7 +964,9 @@
     "clearMetadata": "Limpiar todos los metadata de las tablas meta.",
     "clientKey": "Seleccionar archivo .key",
     "clientCert": "Seleccionar archivo .cert",
-    "clientCA": "Seleccionar archivo CA"
+    "clientCA": "Seleccionar archivo CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Seleccionar canales de Slack",

From e0f91acb2e4ab7c285bf9ea63048e8aec0da4634 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:18 +0000
Subject: [PATCH 107/253] New translations en.json (Arabic)

---
 packages/nc-gui/lang/ar.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json
index 6eb4379ed8..121bc83379 100644
--- a/packages/nc-gui/lang/ar.json
+++ b/packages/nc-gui/lang/ar.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "امسح جميع البيانات الوصفية من جداول التعريف.",
     "clientKey": "اختر .الملف الرئيسي",
     "clientCert": "اختر .ملف الشهادة",
-    "clientCA": "حدد ملف CA"
+    "clientCA": "حدد ملف CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 02d1886b09ea0ae1a375c6e0190eef323c07ca61 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:19 +0000
Subject: [PATCH 108/253] New translations en.json (Czech)

---
 packages/nc-gui/lang/cs.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json
index 7e91298687..8db7f01f7b 100644
--- a/packages/nc-gui/lang/cs.json
+++ b/packages/nc-gui/lang/cs.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Vymazání všech metadat z meta tabulek.",
     "clientKey": "Vyberte soubor .key",
     "clientCert": "Vyberte soubor .cert",
-    "clientCA": "Vyberte soubor CA"
+    "clientCA": "Vyberte soubor CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From df706d712bc2ab30aa60a7be9f450b56bd1995d2 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:20 +0000
Subject: [PATCH 109/253] New translations en.json (Danish)

---
 packages/nc-gui/lang/da.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
index 3b4eddd8cd..f558a46c5d 100644
--- a/packages/nc-gui/lang/da.json
+++ b/packages/nc-gui/lang/da.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Ryd alle metadata fra metaborde.",
     "clientKey": "Vælg .Key File.",
     "clientCert": "Vælg .cert File.",
-    "clientCA": "Vælg CA File."
+    "clientCA": "Vælg CA File.",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 0c4392bbb9f8e0a7dce27a755c4743ea7897e092 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:21 +0000
Subject: [PATCH 110/253] New translations en.json (German)

---
 packages/nc-gui/lang/de.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index 640152cec0..38150acb9b 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Alle Metadaten aus Meta-Tabellen löschen.",
     "clientKey": "Auswahl .key-Datei",
     "clientCert": "Auswahl .cert-Datei",
-    "clientCA": "Auswahl CA-Datei"
+    "clientCA": "Auswahl CA-Datei",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 8e3af5837dd7342f9dfa3ce90035d96a4bc9046d Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:22 +0000
Subject: [PATCH 111/253] New translations en.json (Basque)

---
 packages/nc-gui/lang/eu.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
index 8accb8d1ea..b03f08d7a7 100644
--- a/packages/nc-gui/lang/eu.json
+++ b/packages/nc-gui/lang/eu.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Clear all metadata from meta tables.",
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
-    "clientCA": "Select CA file"
+    "clientCA": "Select CA file",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 5fbc9745c6d3bad504bb046d503d4d47100531bb Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:23 +0000
Subject: [PATCH 112/253] New translations en.json (Finnish)

---
 packages/nc-gui/lang/fi.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
index 40bf851551..ce3e5f6e4f 100644
--- a/packages/nc-gui/lang/fi.json
+++ b/packages/nc-gui/lang/fi.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Tyhjennä kaikki metatiedot metapöydistä.",
     "clientKey": "Valitse .key-tiedosto",
     "clientCert": "Valitse .cert-tiedosto",
-    "clientCA": "Valitse CA-tiedosto"
+    "clientCA": "Valitse CA-tiedosto",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From f58a93d33ebe9a67d63d294f012915a0a9276f46 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:24 +0000
Subject: [PATCH 113/253] New translations en.json (Hebrew)

---
 packages/nc-gui/lang/he.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json
index ec0ce1cd1f..f62fad94e5 100644
--- a/packages/nc-gui/lang/he.json
+++ b/packages/nc-gui/lang/he.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "נקה את כל המטא נתונים מ מטא שולחנות.",
     "clientKey": "בחר קובץ .key.",
     "clientCert": "בחר קובץ .cert.",
-    "clientCA": "בחר קובץ CA."
+    "clientCA": "בחר קובץ CA.",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 7f5418fb263fb7ea8f0f903af3d373fc67b27b45 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:25 +0000
Subject: [PATCH 114/253] New translations en.json (Italian)

---
 packages/nc-gui/lang/it.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json
index d6f4190325..d6f8d33e71 100644
--- a/packages/nc-gui/lang/it.json
+++ b/packages/nc-gui/lang/it.json
@@ -926,7 +926,15 @@
     "startCommenting": "Inizi a commentare!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limitato a una sola sorgente dati per il momento",
@@ -956,7 +964,9 @@
     "clearMetadata": "Cancella tutti i metadati dalle sopratabelle",
     "clientKey": "Seleziona file .key",
     "clientCert": "Seleziona file .cert",
-    "clientCA": "Seleziona file CA"
+    "clientCA": "Seleziona file CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Seleziona un canale Slack",

From 3500371fe0718aed874310c87606981fa165e78e Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:26 +0000
Subject: [PATCH 115/253] New translations en.json (Japanese)

---
 packages/nc-gui/lang/ja.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json
index 6a7dbef23a..de3ffa1651 100644
--- a/packages/nc-gui/lang/ja.json
+++ b/packages/nc-gui/lang/ja.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "メタテーブルからすべてのメタデータをクリア",
     "clientKey": ".key ファイルを選択してください",
     "clientCert": ".cert ファイルを選択してください",
-    "clientCA": "CA ファイルを選択してください"
+    "clientCA": "CA ファイルを選択してください",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From a47cfcce62767010bbf1b060722b952a9443e4ab Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:27 +0000
Subject: [PATCH 116/253] New translations en.json (Korean)

---
 packages/nc-gui/lang/ko.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
index 7358d24c5e..3e47547d76 100644
--- a/packages/nc-gui/lang/ko.json
+++ b/packages/nc-gui/lang/ko.json
@@ -926,7 +926,15 @@
     "startCommenting": "댓글 달기",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "데이터 소스 제한에 도달했습니다.",
@@ -956,7 +964,9 @@
     "clearMetadata": "메타 테이블에서 모든 메타 데이터를 지우십시오.",
     "clientKey": "키 파일을 선택하십시오",
     "clientCert": ".cert 파일을 선택하십시오",
-    "clientCA": "CA 파일을 선택하십시오"
+    "clientCA": "CA 파일을 선택하십시오",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "슬랙 채널 선택",

From 71716b5504d13279752c0e9dac78e941c30dac85 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:28 +0000
Subject: [PATCH 117/253] New translations en.json (Dutch)

---
 packages/nc-gui/lang/nl.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
index d219001f08..a138f81c07 100644
--- a/packages/nc-gui/lang/nl.json
+++ b/packages/nc-gui/lang/nl.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Wis alle metadata uit metatabellen.",
     "clientKey": "Selecteer .key-bestand",
     "clientCert": "Selecteer .cert-bestand",
-    "clientCA": "Selecteer CA-bestand"
+    "clientCA": "Selecteer CA-bestand",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 3590b6091682a0ca6c2bf056464615238263192f Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:28 +0000
Subject: [PATCH 118/253] New translations en.json (Norwegian)

---
 packages/nc-gui/lang/no.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
index f867229c14..ea56767107 100644
--- a/packages/nc-gui/lang/no.json
+++ b/packages/nc-gui/lang/no.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Fjern alle metadata fra metatabeller.",
     "clientKey": "Velg .KEY-fil",
     "clientCert": "Velg .CERT-fil",
-    "clientCA": "Velg CA-fil"
+    "clientCA": "Velg CA-fil",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From f624c922f1d9a3c38ed5492a8b69e068bb5f94bd Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:29 +0000
Subject: [PATCH 119/253] New translations en.json (Polish)

---
 packages/nc-gui/lang/pl.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
index d560608300..e235785f29 100644
--- a/packages/nc-gui/lang/pl.json
+++ b/packages/nc-gui/lang/pl.json
@@ -926,7 +926,15 @@
     "startCommenting": "Rozpocznij komentowanie",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Ograniczenie do jednego źródła danych w tej chwili",
@@ -956,7 +964,9 @@
     "clearMetadata": "Wyczyść wszystkie metadane z tabeli meta.",
     "clientKey": "Wybierz plik .key.",
     "clientCert": "Wybierz plik .Cert.",
-    "clientCA": "Wybierz plik CA."
+    "clientCA": "Wybierz plik CA.",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Wybierz kanały Slack",

From 0649a15e02916bd7b4c70dee8771020bfc0d7e4b Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:30 +0000
Subject: [PATCH 120/253] New translations en.json (Portuguese)

---
 packages/nc-gui/lang/pt.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
index 10684fd4d7..f67484dcd8 100644
--- a/packages/nc-gui/lang/pt.json
+++ b/packages/nc-gui/lang/pt.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Limpar todos os metadados das meta-tabelas.",
     "clientKey": "Seleccione ficheiro .key",
     "clientCert": "Seleccione ficheiro .cert",
-    "clientCA": "Seleccione ficheiro CA"
+    "clientCA": "Seleccione ficheiro CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 5148aedeffd6e500c8ad2c553b3088d23f8f6148 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:31 +0000
Subject: [PATCH 121/253] New translations en.json (Russian)

---
 packages/nc-gui/lang/ru.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
index 8928b79b34..4825a25e5e 100644
--- a/packages/nc-gui/lang/ru.json
+++ b/packages/nc-gui/lang/ru.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Очистите все метаданные в таблице",
     "clientKey": "Выберите файл .key.",
     "clientCert": "Выберите файл .cert",
-    "clientCA": "Выберите файл CA"
+    "clientCA": "Выберите файл CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Выберите каналы Slack",

From 7b1b03d499ecf1c5813bd4c2bcfdc6243af1e393 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:32 +0000
Subject: [PATCH 122/253] New translations en.json (Slovak)

---
 packages/nc-gui/lang/sk.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json
index 46fb4a2e1a..bab47e9e56 100644
--- a/packages/nc-gui/lang/sk.json
+++ b/packages/nc-gui/lang/sk.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Vymazanie všetkých metadát z meta tabuliek.",
     "clientKey": "Vyberte súbor .key",
     "clientCert": "Vyberte súbor .cert",
-    "clientCA": "Vyberte súbor CA"
+    "clientCA": "Vyberte súbor CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 1af8f6a1ad25b1c3d5808f7bf061cbdda25ae493 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:33 +0000
Subject: [PATCH 123/253] New translations en.json (Slovenian)

---
 packages/nc-gui/lang/sl.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json
index f1c6404333..bbdc43518b 100644
--- a/packages/nc-gui/lang/sl.json
+++ b/packages/nc-gui/lang/sl.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Počisti vse metapodatke iz meta tabel.",
     "clientKey": "Izberi .key datoteko",
     "clientCert": "Izberi .cert datoteko",
-    "clientCA": "Izberit CA datoteko"
+    "clientCA": "Izberit CA datoteko",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 8a36b0e39422995a374f89d78953e35258d26643 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:34 +0000
Subject: [PATCH 124/253] New translations en.json (Swedish)

---
 packages/nc-gui/lang/sv.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
index e4c44cedb5..313add4d53 100644
--- a/packages/nc-gui/lang/sv.json
+++ b/packages/nc-gui/lang/sv.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Rensa alla metadata från meta-tabeller.",
     "clientKey": "Välj. Key-filen",
     "clientCert": "Välj .cert-fil",
-    "clientCA": "Välj CA-fil"
+    "clientCA": "Välj CA-fil",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From fb20c3e422bd76e08e652e12081f987563cda210 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:35 +0000
Subject: [PATCH 125/253] New translations en.json (Turkish)

---
 packages/nc-gui/lang/tr.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json
index 8dabc91af7..637488d008 100644
--- a/packages/nc-gui/lang/tr.json
+++ b/packages/nc-gui/lang/tr.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Tüm metaverileri meta tablolarından temizle",
     "clientKey": ".key dosyasını seçin",
     "clientCert": ".cert dosyasını seçin",
-    "clientCA": "CA dosyasını seçin"
+    "clientCA": "CA dosyasını seçin",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 00db650b97631a58ebc22e9876812e94632cc72c Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:36 +0000
Subject: [PATCH 126/253] New translations en.json (Ukrainian)

---
 packages/nc-gui/lang/uk.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json
index b84c440d5b..7f447cff21 100644
--- a/packages/nc-gui/lang/uk.json
+++ b/packages/nc-gui/lang/uk.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Очистити всі метадані з мета-таблиць.",
     "clientKey": "Виберіть .key файл",
     "clientCert": "Виберіть .cert файл",
-    "clientCA": "Виберіть файл CA"
+    "clientCA": "Виберіть файл CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 7c0cc55abc368c63bb4a55389e84971cefae11f0 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:37 +0000
Subject: [PATCH 127/253] New translations en.json (Chinese Simplified)

---
 packages/nc-gui/lang/zh-Hans.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json
index 7baf2d2ac5..5ef9f5edc9 100644
--- a/packages/nc-gui/lang/zh-Hans.json
+++ b/packages/nc-gui/lang/zh-Hans.json
@@ -926,7 +926,15 @@
     "startCommenting": "开始评论",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "暂时只限于一个数据源",
@@ -956,7 +964,9 @@
     "clearMetadata": "在元数据表格中清楚所有元数据",
     "clientKey": "选择 .key 文件",
     "clientCert": "选择 .cert 文件",
-    "clientCA": "选择 CA 文件"
+    "clientCA": "选择 CA 文件",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "选择 Slack 频道",

From f91b0159fcafe7ed13d53115cb27791882bb10a8 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:38 +0000
Subject: [PATCH 128/253] New translations en.json (Chinese Traditional)

---
 packages/nc-gui/lang/zh-Hant.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json
index 02de339387..b2638f2739 100644
--- a/packages/nc-gui/lang/zh-Hant.json
+++ b/packages/nc-gui/lang/zh-Hant.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "清除中繼資料表中的所有中繼資料。",
     "clientKey": "選擇 .key 檔案",
     "clientCert": "選擇 .cert 檔案",
-    "clientCA": "選擇 CA 檔案"
+    "clientCA": "選擇 CA 檔案",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 458d5d726af6650fe9e4c279e64620c2bbb61d58 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:39 +0000
Subject: [PATCH 129/253] New translations en.json (English)

---
 packages/nc-gui/lang/en.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index f66b113cf4..6c4c788626 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -694,9 +694,9 @@
     "appearanceSettings": "Appearance Settings",
     "backgroundColor": "Background Color",
     "hideNocodbBranding": "Hide NocoDB Branding",
-    "showOnConditions": "Show on conditions",
+    "showOnConditions": "Show on condtions",
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
-    "limitOptions": "Limit options",
+    "limitOptions": "Limit ptions",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
     "clearSelection": "Clear selection"
   },
@@ -928,8 +928,8 @@
     "addFieldFromFormView": "Add Field",
     "selectAllFields": "Select all fields",
     "preFilledFields": {
-      "title": "Enable Pre-fill",
-      "default": "Default",
+      "title": "Pre-filled Fields",
+      "default": "Allow pre-filling fields",
       "locked": "Lock pre-filled fields as read-only",
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
@@ -965,7 +965,7 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {

From 32586dedf779b4e25c8c1a7c90992d6fc11a64f7 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:40 +0000
Subject: [PATCH 130/253] New translations en.json (Vietnamese)

---
 packages/nc-gui/lang/vi.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json
index 0550a90cb0..e32fa3ae30 100644
--- a/packages/nc-gui/lang/vi.json
+++ b/packages/nc-gui/lang/vi.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Xóa tất cả siêu dữ liệu khỏi bảng meta.",
     "clientKey": "Chọn tệp .key.",
     "clientCert": "Chọn tệp .cert",
-    "clientCA": "Chọn CA Tệp"
+    "clientCA": "Chọn CA Tệp",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From da553caaed98716bfe2dd65b6649b69afb582585 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:41 +0000
Subject: [PATCH 131/253] New translations en.json (Portuguese, Brazilian)

---
 packages/nc-gui/lang/pt_BR.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
index 3dee65af2b..05d78d02e5 100644
--- a/packages/nc-gui/lang/pt_BR.json
+++ b/packages/nc-gui/lang/pt_BR.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Limpar todos os metadados das meta-tabelas.",
     "clientKey": "Selecione arquivo .key",
     "clientCert": "Selecione arquivo .cert",
-    "clientCA": "Selecione arquivo CA"
+    "clientCA": "Selecione arquivo CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 8f6433507e3a282d624bd5d104b5aeedc583f032 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:42 +0000
Subject: [PATCH 132/253] New translations en.json (Indonesian)

---
 packages/nc-gui/lang/id.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
index cf05b6b7c1..096da83df0 100644
--- a/packages/nc-gui/lang/id.json
+++ b/packages/nc-gui/lang/id.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Bersihkan semua metadata dari Meta Tables.",
     "clientKey": "Pilih .Key File.",
     "clientCert": "Pilih file .cert.",
-    "clientCA": "Pilih CA File."
+    "clientCA": "Pilih CA File.",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 26ca9a7318bba21d848585d0bd9454d0b2072b0f Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:43 +0000
Subject: [PATCH 133/253] New translations en.json (Persian)

---
 packages/nc-gui/lang/fa.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json
index 1c5cdfe3fa..91e4c03847 100644
--- a/packages/nc-gui/lang/fa.json
+++ b/packages/nc-gui/lang/fa.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "پاک‌سازی همه فراداده‌ها از فراجدول‌ها",
     "clientKey": "انتخاب فایل key.",
     "clientCert": "انتخاب فایل cert.",
-    "clientCA": "انتخاب فایل CA"
+    "clientCA": "انتخاب فایل CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From c49cdae5ccedc70e562f8e0cda04db1175c016a3 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:44 +0000
Subject: [PATCH 134/253] New translations en.json (Thai)

---
 packages/nc-gui/lang/th.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
index 8d2fbefc26..6d492fa46f 100644
--- a/packages/nc-gui/lang/th.json
+++ b/packages/nc-gui/lang/th.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "ล้างข้อมูลเมตาทั้งหมดจากตาราง Meta",
     "clientKey": "เลือก. ไฟล์. คีย์",
     "clientCert": "เลือกไฟล์ .cert",
-    "clientCA": "เลือกไฟล์ CA"
+    "clientCA": "เลือกไฟล์ CA",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 987f7a18d367f60ad700e6bc3ad8179cad09182a Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:45 +0000
Subject: [PATCH 135/253] New translations en.json (Croatian)

---
 packages/nc-gui/lang/hr.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json
index b8baad2c20..bc750b0488 100644
--- a/packages/nc-gui/lang/hr.json
+++ b/packages/nc-gui/lang/hr.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Obrišite sve metapodatke iz meta stolova.",
     "clientKey": "Odaberite .Kekey datoteku",
     "clientCert": "Odaberite .cert datoteku",
-    "clientCA": "Odaberite CA datoteku"
+    "clientCA": "Odaberite CA datoteku",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 33fba9e228d88659249200254b76cb00f9eb2678 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:46 +0000
Subject: [PATCH 136/253] New translations en.json (Latvian)

---
 packages/nc-gui/lang/lv.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json
index 3a1f37041c..72d69d5e07 100644
--- a/packages/nc-gui/lang/lv.json
+++ b/packages/nc-gui/lang/lv.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "Notīrīt visus metadatus no tabulām.",
     "clientKey": "Izvēlēties .key datni",
     "clientCert": "Izvēlēties .cert datni",
-    "clientCA": "Izvēlēties CA datni"
+    "clientCA": "Izvēlēties CA datni",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 46d7d9ced6aacdf9861bfb83e2f42d088577e443 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:47 +0000
Subject: [PATCH 137/253] New translations en.json (Hindi)

---
 packages/nc-gui/lang/hi.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json
index 8e31a3ec93..b17a62e92e 100644
--- a/packages/nc-gui/lang/hi.json
+++ b/packages/nc-gui/lang/hi.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "मेटा टेबल से सभी मेटाडेटा को साफ करें।",
     "clientKey": ".Key फ़ाइल का चयन करें",
     "clientCert": ".Cert फ़ाइल का चयन करें",
-    "clientCA": "सीए फ़ाइल का चयन करें"
+    "clientCA": "सीए फ़ाइल का चयन करें",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 8752d704a84e5df8bb02af63ade56d2a574e9fe8 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 9 Mar 2024 20:10:48 +0000
Subject: [PATCH 138/253] New translations en.json (Bengali, India)

---
 packages/nc-gui/lang/bn_IN.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json
index cf698a7c11..43d1e24ab5 100644
--- a/packages/nc-gui/lang/bn_IN.json
+++ b/packages/nc-gui/lang/bn_IN.json
@@ -926,7 +926,15 @@
     "startCommenting": "Start commenting!",
     "clearForm": "Clear Form",
     "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields"
+    "selectAllFields": "Select all fields",
+    "preFilledFields": {
+      "title": "Enable Pre-fill",
+      "default": "Default",
+      "locked": "Lock pre-filled fields as read-only",
+      "hidden": "Hide pre-filled fields",
+      "lockedFieldTooltip": "Pre-filled value"
+    },
+    "getPreFilledLink": "Get Pre-filled Link"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
@@ -956,7 +964,9 @@
     "clearMetadata": "মেটা টেবিলগুলি থেকে সমস্ত মেটাডেটা সাফ করুন।",
     "clientKey": ".key ফাইল নির্বাচন করুন",
     "clientCert": ".cert ফাইল নির্বাচন করুন",
-    "clientCA": "সিএ ফাইল নির্বাচন করুন"
+    "clientCA": "সিএ ফাইল নির্বাচন করুন",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
     "selectSlackChannels": "Select Slack channels",

From 578b1bcdacc399092955dbfc2e6a9eed30c41927 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sun, 10 Mar 2024 07:11:41 +0000
Subject: [PATCH 139/253] Update source file en.json

---
 packages/nc-gui/lang/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 36d7238165..f66b113cf4 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -694,9 +694,9 @@
     "appearanceSettings": "Appearance Settings",
     "backgroundColor": "Background Color",
     "hideNocodbBranding": "Hide NocoDB Branding",
-    "showOnConditions": "Show on condtions",
+    "showOnConditions": "Show on conditions",
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
-    "limitOptions": "Limit ptions",
+    "limitOptions": "Limit options",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
     "clearSelection": "Clear selection"
   },

From e1dab87bf22f7457b532e851243c69d3eaf4532e Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sun, 10 Mar 2024 07:15:18 +0000
Subject: [PATCH 140/253] New translations en.json (English)

---
 packages/nc-gui/lang/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index f66b113cf4..70fab4d023 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -928,8 +928,8 @@
     "addFieldFromFormView": "Add Field",
     "selectAllFields": "Select all fields",
     "preFilledFields": {
-      "title": "Enable Pre-fill",
-      "default": "Default",
+      "title": "Pre-filled Fields",
+      "default": "Allow pre-filling fields",
       "locked": "Lock pre-filled fields as read-only",
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
@@ -965,7 +965,7 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {

From 535a1e4a717471ab20ac3445f5af5a8bbe449292 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sun, 10 Mar 2024 09:39:49 +0000
Subject: [PATCH 141/253] fix: add timeout to webhook

---
 packages/nocodb/src/helpers/webhookHelpers.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nocodb/src/helpers/webhookHelpers.ts b/packages/nocodb/src/helpers/webhookHelpers.ts
index 3fb111cc62..6faba5155b 100644
--- a/packages/nocodb/src/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/helpers/webhookHelpers.ts
@@ -436,6 +436,7 @@ export function axiosRequestMake(_apiMeta, _user, data) {
           }),
         }
       : {}),
+    timeout: 30 * 1000,
   };
   return req;
 }

From 37c26e45944dc7534d80c189f441e518f6b175c1 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sun, 10 Mar 2024 19:38:36 +0000
Subject: [PATCH 142/253] Update source file en.json

---
 packages/nc-gui/lang/en.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 70fab4d023..36d7238165 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -694,9 +694,9 @@
     "appearanceSettings": "Appearance Settings",
     "backgroundColor": "Background Color",
     "hideNocodbBranding": "Hide NocoDB Branding",
-    "showOnConditions": "Show on conditions",
+    "showOnConditions": "Show on condtions",
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
-    "limitOptions": "Limit options",
+    "limitOptions": "Limit ptions",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
     "clearSelection": "Clear selection"
   },
@@ -928,8 +928,8 @@
     "addFieldFromFormView": "Add Field",
     "selectAllFields": "Select all fields",
     "preFilledFields": {
-      "title": "Pre-filled Fields",
-      "default": "Allow pre-filling fields",
+      "title": "Enable Pre-fill",
+      "default": "Default",
       "locked": "Lock pre-filled fields as read-only",
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
@@ -965,7 +965,7 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {

From 290f5fecccfe65c3f0bb8efad0c39a66804811e6 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Mon, 11 Mar 2024 07:38:59 +0000
Subject: [PATCH 143/253] New translations en.json (Polish)

---
 packages/nc-gui/lang/pl.json | 210 +++++++++++++++++------------------
 1 file changed, 105 insertions(+), 105 deletions(-)

diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
index e235785f29..a7b819cc6b 100644
--- a/packages/nc-gui/lang/pl.json
+++ b/packages/nc-gui/lang/pl.json
@@ -193,17 +193,17 @@
     "seconds": "Sekundy",
     "paste": "Wklej",
     "restore": "Przywróć",
-    "replace": "Replace",
-    "banner": "Banner",
+    "replace": "Zamień",
+    "banner": "Baner",
     "logo": "Logo",
-    "dropdown": "Dropdown",
-    "list": "List"
+    "dropdown": "Rozwijane menu",
+    "list": "Lista"
   },
   "objects": {
-    "day": "Day",
-    "week": "Week",
-    "month": "Month",
-    "year": "Year",
+    "day": "Dzień",
+    "week": "Tydzień",
+    "month": "Miesiąc",
+    "year": "Rok",
     "workspace": "Obszar roboczy",
     "workspaces": "Obszary robocze",
     "project": "Projekt",
@@ -310,7 +310,7 @@
     "isNotNull": "Nie jest null"
   },
   "title": {
-    "sso": "Authentication (SSO)",
+    "sso": "Autoryzacja (SSO)",
     "docs": "Dokumentacja",
     "forum": "Forum",
     "parameter": "Parametr",
@@ -341,7 +341,7 @@
     "virtualRelation": "Relacja wirtualna",
     "linkMore": "Połącz więcej",
     "linkMoreRecords": "Połącz więcej rekordów",
-    "linkRecords": "Link Records",
+    "linkRecords": "Połączone rekordy",
     "downloadFile": "Pobierz plik",
     "renameTable": "Zmień nazwę tabeli",
     "renamingTable": "Zmiana nazwy tabeli",
@@ -408,7 +408,7 @@
     "findRowByScanningCode": "Znajdź wiersz poprzez skanowanie kodu",
     "tokenManagement": "Zarządzanie tokenami",
     "addNewToken": "Dodaj nowy token",
-    "createNewToken": "Create new token",
+    "createNewToken": "Utwórz nowy token",
     "accountSettings": "Ustawienia konta",
     "resetPasswordMenu": "Menu resetowania hasła",
     "tokens": "Tokeny",
@@ -427,27 +427,27 @@
       "setNull": "Ustaw NULL",
       "setDefault": "Ustaw domyślne"
     },
-    "selectFieldsFromRightPannelToAddHere": "Select fields from right panel to add here",
-    "noOptionsFound": "No options found"
+    "selectFieldsFromRightPannelToAddHere": "Wybierz pole z panelu po prawej stronie aby tutaj dodać",
+    "noOptionsFound": "Nie znaleziono opcji"
   },
   "labels": {
-    "selectYear": "Select Year",
-    "save": "Save",
-    "cancel": "Cancel",
-    "metadataUrl": "Metadata URL",
-    "audience-entityId": "Audience/ Entity ID",
-    "redirectUrl": "Redirect URL",
+    "selectYear": "Wybierz rok",
+    "save": "Zapisz",
+    "cancel": "Anuluj",
+    "metadataUrl": "URL metadanych",
+    "audience-entityId": "Publiczność/ ID jednostki",
+    "redirectUrl": "URL przekierowania",
     "oidc": "OpenID Connect (OIDC)",
     "saml": "Security Assertion Markup Language (SAML)",
-    "newProvider": "New Provider",
-    "generalSettings": "General Settings",
-    "ssoSettings": "SSO Settings",
-    "organizeBy": "Organize by",
-    "previous": "Previous",
-    "nextMonth": "Next Month",
-    "previousMonth": "Previous Month",
-    "next": "Next",
-    "organiseBy": "Organise by",
+    "newProvider": "Nowy dostawca",
+    "generalSettings": "Ustawienia ogólne",
+    "ssoSettings": "Ustawienia SSO",
+    "organizeBy": "Organizuj według",
+    "previous": "Poprzedni",
+    "nextMonth": "Następny miesiąc",
+    "previousMonth": "Poprzedni miesiąc",
+    "next": "Następny",
+    "organiseBy": "Organizuj według",
     "heading1": "Nagłówek 1",
     "heading2": "Nagłówek 2",
     "heading3": "Nagłówek 3",
@@ -491,8 +491,8 @@
     "timeFormat": "Format czasu",
     "singularLabel": "Etykieta pojedyncza",
     "pluralLabel": "Etykieta mnoga",
-    "selectDateField": "Select a date field",
-    "endDateField": "End date field",
+    "selectDateField": "Wybierz datę",
+    "endDateField": "Pole daty końcowej",
     "optional": "(Opcjonalnie)",
     "clickToMake": "Kliknij, aby utworzyć",
     "visibleForRole": "widoczne dla roli:",
@@ -535,9 +535,9 @@
     "duplicateFormView": "Zduplikuj widok formularza",
     "createFormView": "Utwórz widok formularza",
     "duplicateKanbanView": "Zduplikuj widok Kanban",
-    "duplicateCalendarView": "Duplicate Calendar View",
+    "duplicateCalendarView": "Duplikuj widok kalendarza",
     "createKanbanView": "Utwórz widok Kanban",
-    "createCalendarView": "Create Calendar View",
+    "createCalendarView": "Utwórz widok kalendarza",
     "viewName": "Nazwa widoku",
     "viewLink": "Link do widoku",
     "columnName": "Nazwa kolumny",
@@ -613,7 +613,7 @@
       "joinCommunity": "Dołącz do społeczności NocoDB",
       "joinReddit": "Dołącz /r/NocoDB",
       "followNocodb": "Śledź NocoDB",
-      "communityTranslated": "(Community Translated)"
+      "communityTranslated": "(Przetłumaczone przez społeczność)"
     },
     "twitter": "Twitter",
     "docReference": "Odnośnik do dokumentu",
@@ -689,28 +689,28 @@
       "deletedField": "Usunięte pole",
       "incompleteConfiguration": "Niekompletna konfiguracja",
       "selectField": "Wybierz pole",
-      "selectFieldLabel": "Begin by selecting a field to customise its properties and structure."
+      "selectFieldLabel": "Rozpocznij od wybrania pola, aby dostosować jego właściwości i strukturę."
     },
-    "appearanceSettings": "Appearance Settings",
-    "backgroundColor": "Background Color",
-    "hideNocodbBranding": "Hide NocoDB Branding",
-    "showOnConditions": "Show on conditions",
-    "showFieldOnConditionsMet": "Shows field only when conditions are met",
-    "limitOptions": "Limit options",
-    "limitOptionsSubtext": "Limit options visible to users by selecting available options",
-    "clearSelection": "Clear selection"
+    "appearanceSettings": "Ustawienia wyglądu",
+    "backgroundColor": "Kolor tła",
+    "hideNocodbBranding": "Ukryj branding NocoDB",
+    "showOnConditions": "Pokaż na warunkach",
+    "showFieldOnConditionsMet": "Pokazuje pole tylko, gdy spełnione są warunki",
+    "limitOptions": "Ogranicz opcje",
+    "limitOptionsSubtext": "Ogranicz opcje widoczne dla użytkowników, wybierając dostępne opcje",
+    "clearSelection": "Wyczyść wybór"
   },
   "activity": {
-    "noRange": "Calendar view requires a date range",
-    "goToToday": "Go to Today",
-    "toggleSidebar": "Toggle Sidebar",
-    "addEndDate": "Add end date",
-    "withEndDate": "with end date",
-    "calendar": "Calendar",
-    "viewSettings": "View settings",
+    "noRange": "Widok kalendarza wymaga zakresu dat",
+    "goToToday": "Przejdź do dzisiaj",
+    "toggleSidebar": "Przełącz pasek boczny",
+    "addEndDate": "Dodaj datę zakończenia",
+    "withEndDate": "z datą zakończenia",
+    "calendar": "Kalendarz",
+    "viewSettings": "Ustawienia widoku",
     "googleOAuth": "Google OAuth",
-    "registerOIDC": "Register OIDC Identity Provider",
-    "registerSAML": "Register SAML Identity Provider",
+    "registerOIDC": "Zarejestruj dostawcę tożsamości OIDC",
+    "registerSAML": "Zarejestruj dostawcę tożsamości SAML",
     "openInANewTab": "Otwórz w nowej karcie",
     "copyIFrameCode": "Kopiuj kod IFrame",
     "onCondition": "Pod warunkiem",
@@ -924,17 +924,17 @@
     },
     "toggleMobileMode": "Przełącz tryb mobilny",
     "startCommenting": "Rozpocznij komentowanie",
-    "clearForm": "Clear Form",
-    "addFieldFromFormView": "Add Field",
-    "selectAllFields": "Select all fields",
+    "clearForm": "Wyczyść formularz",
+    "addFieldFromFormView": "Dodaj pole",
+    "selectAllFields": "Zaznacz wszystkie pola",
     "preFilledFields": {
-      "title": "Enable Pre-fill",
-      "default": "Default",
-      "locked": "Lock pre-filled fields as read-only",
-      "hidden": "Hide pre-filled fields",
-      "lockedFieldTooltip": "Pre-filled value"
+      "title": "Włącz wstępne wypełnienie",
+      "default": "Domyślne",
+      "locked": "Zablokuj wstępnie wypełnione pola jako tylko do odczytu",
+      "hidden": "Ukryj wstępnie wypełnione pola",
+      "lockedFieldTooltip": "Wstępnie wypełniona wartość"
     },
-    "getPreFilledLink": "Get Pre-filled Link"
+    "getPreFilledLink": "Uzyskaj link z wstępnie wypełnionymi danymi"
   },
   "tooltip": {
     "reachedSourceLimit": "Ograniczenie do jednego źródła danych w tej chwili",
@@ -965,8 +965,8 @@
     "clientKey": "Wybierz plik .key.",
     "clientCert": "Wybierz plik .Cert.",
     "clientCA": "Wybierz plik CA.",
-    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
-    "surveyFormInfo": "Form mode with one field per page"
+    "preFillFormInfo": "Generuj URL formularza udostępniania z wstępnie wypełnionymi danymi pola. Aby uzyskać link z wstępnie wypełnionymi danymi, upewnij się, że wypełniłeś wymagane pola w kreatorze widoku formularza.",
+    "surveyFormInfo": "Tryb formularza z jednym polem na stronę"
   },
   "placeholder": {
     "selectSlackChannels": "Wybierz kanały Slack",
@@ -981,7 +981,7 @@
     "selectGroupField": "Wybierz pole grupowania",
     "selectGroupFieldNotFound": "Nie można znaleźć pola jednokrotnego wyboru. Najpierw je utwórz.",
     "selectGeoField": "Wybierz pole danych geograficznych",
-    "notSelected": "-not selected-",
+    "notSelected": "-nie wybrano-",
     "selectGeoFieldNotFound": "Nie można znaleźć pola danych geograficznych. Najpierw je utwórz.",
     "password": {
       "enter": "Podaj hasło",
@@ -1013,13 +1013,13 @@
     "decimal8": "1.00000000",
     "value": "Wartość",
     "key": "Klucz",
-    "createTable": "Create your First Table!",
-    "createTableLabel": "Create your first table effortlessly, from scratch, or by importing/connecting to an external database.",
-    "noTokenCreated": "No API Tokens created",
-    "noTokenCreatedLabel": "Begin by creating API tokens to unlock advanced functionalities.",
-    "inviteYourTeam": "Invite your team",
-    "inviteYourTeamLabel": "Streamline collaboration and productivity with your team – start by inviting them to join your workspace.",
-    "searchOptions": "Search options"
+    "createTable": "Utwórz swoją Pierwszą Tabelę!",
+    "createTableLabel": "Utwórz swoją pierwszą tabelę bez wysiłku, od zera lub poprzez importowanie/połączenie z zewnętrzną bazą danych.",
+    "noTokenCreated": "Nie utworzono Żadnych Tokenów API",
+    "noTokenCreatedLabel": "Rozpocznij od utworzenia tokenów API, aby odblokować zaawansowane funkcjonalności.",
+    "inviteYourTeam": "Zaproś swój zespół",
+    "inviteYourTeamLabel": "Usprawnij współpracę i produktywność ze swoim zespołem – zacznij od zaproszenia ich do przyłączenia się do twojej przestrzeni roboczej.",
+    "searchOptions": "Opcje wyszukiwania"
   },
   "msg": {
     "clickToCopyFieldId": "Kliknij, aby skopiować Identyfikator Pola",
@@ -1047,7 +1047,7 @@
       "hintStart": "Wskazówka: Użyj {placeholder1} do odwołania się do pól, np.: {placeholder2}. Po więcej informacji zapoznaj się z",
       "hintEnd": "Formułami.",
       "noSuggestedFormulaFound": "Nie znaleziono sugerowanej formuły",
-      "typeIsExpected": "{calleeName} requires a {type} at position {position}",
+      "typeIsExpected": "{calleeName} wymaga {type} na pozycji {position}",
       "numericTypeIsExpected": "Oczekiwany jest typ numeryczny",
       "stringTypeIsExpected": "Oczekiwany jest typ tekstowy",
       "operationNotAvailable": "Operacja {operation} nie jest dostępna",
@@ -1104,9 +1104,9 @@
       "tooltip_desc": "Pojedynczy rekord z tabeli ",
       "tooltip_desc2": " może być powiązany z pojedynczym rekordem z tabeli "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Kliknij 'Połącz Rekordy', aby rozpocząć kojarzenie danych z '{tableName}'.",
     "noRecordsLinked": "Żadne rekordy nie są powiązane",
-    "noLinkedRecords": "No linked records",
+    "noLinkedRecords": "Brak powiązanych rekordów",
     "recordsLinked": "rekordy powiązane",
     "acceptOnlyValid": "Akceptuje tylko",
     "apiTokenCreate": "Utwórz osobiste tokeny API do użytku w automatyzacji lub zewnętrznych aplikacjach.",
@@ -1121,15 +1121,15 @@
     "length59Required": "Długość przekracza maksymalną liczbę 59 znaków",
     "noNewNotifications": "Nie masz nowych powiadomień",
     "noRecordFound": "Nie znaleziono rekordu",
-    "noRecordsFound": "No records found",
+    "noRecordsFound": "Nie znaleziono rekordów",
     "rowDeleted": "Rekord usunięty",
     "saveChanges": "Czy chcesz zapisać zmiany?",
     "tooLargeFieldEntity": "Pole jest zbyt duże, aby przekonwertować je na {entity}",
     "roleRequired": "Wymagana rola",
     "warning": {
-      "calendarNoFields": "Calendar view requires a date or date time field to be setup. Try setting up a calendar view after adding a date / date time field!",
-      "kanbanNoFields": "Kanban view requires a single select field to be setup. Try setting up a kanban view after adding a single select field!",
-      "mapNoFields": "Map view requires a geo data field to be setup. Try setting up a map view after adding a geo data field!",
+      "calendarNoFields": "Widok kalendarza wymaga ustawienia pola daty lub daty i czasu. Spróbuj ustawić widok kalendarza po dodaniu pola daty/daty i czasu!",
+      "kanbanNoFields": "Widok Kanban wymaga ustawienia pola z pojedynczym wyborem. Spróbuj ustawić widok Kanban po dodaniu pola z pojedynczym wyborem!",
+      "mapNoFields": "Widok mapy wymaga ustawienia pola z danymi geograficznymi. Spróbuj ustawić widok mapy po dodaniu pola z danymi geograficznymi!",
       "dbValid": "Upewnij się, że próbujesz połączyć się z prawidłową bazą danych! Ta operacja może spowodować utratę schematu!",
       "barcode": {
         "renderError": "Błąd kodu kreskowego - proszę sprawdzić kompatybilność między typem kodu wejściowego i kreskowego"
@@ -1148,8 +1148,8 @@
       }
     },
     "info": {
-      "idpPaste": "Paste these URL in your Identity Providers console",
-      "noSaml": "There are no configured SAML authentications.",
+      "idpPaste": "Proszę wkleić ten adres URL w konsoli dostawcy tożsamości",
+      "noSaml": "Nie ma skonfigurowanych uwierzytelnień SAML.",
       "disabledAsViewLocked": "Wyłączone, ponieważ widok jest zablokowany",
       "basesMigrated": "Bazy zostały przeniesione. Proszę spróbować ponownie.",
       "pasteNotSupported": "Operacja wklejania nie jest obsługiwana w aktywnej komórce",
@@ -1191,20 +1191,20 @@
       "formInput": "Wprowadź etykietę wejściową formularza",
       "formHelpText": "Dodaj trochę pomocy",
       "onlyCreator": "Tylko widoczne dla twórcy",
-      "formTitle": "Add form Title",
+      "formTitle": "Dodaj tytuł formularza",
       "formDesc": "Dodaj opis formularza",
       "beforeEnablePwd": "Ogranicz dostęp do hasła",
       "afterEnablePwd": "Dostęp jest ograniczony hasłem",
       "privateLink": "Ten widok jest współdzielony przez prywatny link",
       "privateLinkAdditionalInfo": "Ludzie z prywatnym ogniwem mogą widzieć tylko komórki widoczne w tym widoku",
-      "postFormSubmissionSettings": "Post Form Submission Settings",
+      "postFormSubmissionSettings": "Ustawienia po przesłaniu formularza",
       "apiOptions": "Dostęp do projektu przez",
       "submitAnotherForm": "Pokaż przycisk \"Prześlij inny formularz\"",
       "showBlankForm": "Pokaż pustą formę po 5 sekundach",
       "emailForm": "E-mail mnie",
       "showSysFields": "Pokaż pola systemowe.",
       "filterAutoApply": "Automatyczne zastosowanie",
-      "formDisplayMessage": "Display Message",
+      "formDisplayMessage": "Wyświetl wiadomość",
       "viewNotShared": "Aktualny widok nie jest udostępniany!",
       "showAllViews": "Pokaż wszystkie wspólne widoki na tę tabelę",
       "collabView": "Współpracownicy z uprawnieniami edycji lub wyższe mogą zmienić konfigurację widoku.",
@@ -1313,27 +1313,27 @@
       "submittedFormData": "Pomyślnie przesłałeś dane formularza.",
       "editingSystemKeyNotSupported": "Edycja klucza systemowego nie jest obsługiwana",
       "notAvailableAtTheMoment": "Obecnie niedostępne",
-      "groupPasteIsNotSupportedOnLinksColumn": "Group paste operation is not supported on Links/LinkToAnotherRecord column",
-      "groupClearIsNotSupportedOnLinksColumn": "Group clear operation is not supported on Links/LinkToAnotherRecord column",
-      "upgradeToEnterpriseEdition": "Upgrade to Enterprise Edition {extraInfo}",
-      "thisFeatureIsOnlyAvailableInEnterpriseEdition": "This feature is only available in enterprise edition",
-      "yourCurrentRoleIs": "Your current role is",
-      "pleaseRequestAccessForView": "Please request for higher permission from the Admin / Base owner / Workspace owner to get access to this {viewName}",
-      "preventHideAllOptions": "You cannot hide all options if field is required"
+      "groupPasteIsNotSupportedOnLinksColumn": "Operacja wklejania grupowego nie jest obsługiwana w kolumnie Linki/Połącz z innym rekordem",
+      "groupClearIsNotSupportedOnLinksColumn": "Operacja czyszczenia grupowego nie jest obsługiwana w kolumnie Linki/Połącz z innym rekordem",
+      "upgradeToEnterpriseEdition": "Zaktualizuj do wersji Enterprise {extraInfo}",
+      "thisFeatureIsOnlyAvailableInEnterpriseEdition": "Ta funkcja jest dostępna tylko w wersji Enterprise",
+      "yourCurrentRoleIs": "Twoja obecna rola to",
+      "pleaseRequestAccessForView": "Proszę o żądanie wyższych uprawnień od Admina / Właściciela bazy / Właściciela przestrzeni roboczej, aby uzyskać dostęp do tego {viewName}",
+      "preventHideAllOptions": "Nie możesz ukryć wszystkich opcji, jeśli pole jest wymagane"
     },
     "error": {
-      "fetchingCalendarData": "Error fetching calendar data",
-      "fetchingActiveDates": "Error fetching active dates",
-      "scopesRequired": "Scopes required",
-      "authUrlRequired": "Auth URL is required",
-      "userNameAttributeRequired": "Username attribute is required",
-      "clientIdRequired": "Client ID is required",
-      "issuerRequired": "Issuer is required",
-      "clientSecretRequired": "Client Secret is required",
-      "jwkUrlRequired": "JWK URL is required",
-      "tokenUrlRequired": "Token URL is required",
-      "userInfoUrlRequired": "UserInfo URL is required",
-      "eitherXML": "Either xml or metadata url is required",
+      "fetchingCalendarData": "Błąd podczas pobierania danych kalendarza",
+      "fetchingActiveDates": "Błąd podczas pobierania aktywnych dat",
+      "scopesRequired": "Wymagane zakresy",
+      "authUrlRequired": "Wymagany jest URL autoryzacji",
+      "userNameAttributeRequired": "Wymagany jest atrybut nazwy użytkownika",
+      "clientIdRequired": "Wymagane jest ID klienta",
+      "issuerRequired": "Wymagany jest wystawca",
+      "clientSecretRequired": "Wymagany jest sekret klienta",
+      "jwkUrlRequired": "Wymagany jest URL JWK",
+      "tokenUrlRequired": "Wymagany jest URL tokenu",
+      "userInfoUrlRequired": "Wymagany jest URL UserInfo",
+      "eitherXML": "Wymagany jest albo xml, albo URL metadanych",
       "nameRequired": "Wymagana nazwa",
       "nameMinLength": "Nazwa musi mieć co najmniej 2 znaki",
       "nameMaxLength": "Nazwa musi mieć maksymalnie 60 znaków",
@@ -1364,7 +1364,7 @@
         "invalidEmails": "Nieprawidłowe adresy email",
         "invalidEmail": "Nieprawidłowy adres email"
       },
-      "invalidXml": "Invalid XML",
+      "invalidXml": "Nieprawidłowy XML",
       "invalidURL": "Nieprawidłowy adres URL",
       "invalidEmail": "Nieprawidłowy e-mail",
       "internalError": "Wystąpił błąd wewnętrzny",
@@ -1413,9 +1413,9 @@
       "pasteFromClipboardError": "Nie udało się wkleić ze schowka",
       "multiFieldSaveValidation": "Proszę zakończyć konfigurację wszystkich pól przed zapisaniem",
       "somethingWentWrong": "Coś poszło nie tak",
-      "draggedContentIsNotTypeOfImage": "Dragged content is not type of image",
-      "fieldToParseImageData": "Field to parse image data",
-      "someOfTheRequiredFieldsAreEmpty": "Some of the required fields are empty"
+      "draggedContentIsNotTypeOfImage": "Przeciągnięta zawartość nie jest typem obrazu",
+      "fieldToParseImageData": "Pole do analizy danych obrazu",
+      "someOfTheRequiredFieldsAreEmpty": "Niektóre z wymaganych pól są puste"
     },
     "toast": {
       "exportMetadata": "Pomyślnie wyeksportowano metadane projektu",

From 6823ab50060d7bee2fcd2a521a748c161bacd034 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 11 Mar 2024 09:23:31 +0000
Subject: [PATCH 144/253] fix: support Date filter operations in where query
 params for Created/LastModified time fields

---
 packages/nc-gui/components/smartsheet/Form.vue        | 10 ++++++++--
 .../smartsheet/calendar/DayView/DateField.vue         |  2 +-
 .../smartsheet/calendar/DayView/DateTimeField.vue     |  2 +-
 .../components/smartsheet/calendar/MonthView.vue      |  2 +-
 .../smartsheet/calendar/WeekView/DateField.vue        |  2 +-
 .../smartsheet/calendar/WeekView/DateTimeField.vue    |  2 +-
 packages/nc-gui/composables/useViewGroupBy.ts         |  4 +++-
 packages/nocodb-sdk/src/lib/helperFunctions.ts        |  9 ++++++++-
 packages/nocodb/src/db/BaseModelSqlv2.ts              | 11 +++++++++--
 9 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index d44cf5d982..b92c41185f 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1088,7 +1088,10 @@ useEventListener(
                         </div>
 
                         <!-- Field Header  -->
-                        <div v-if="activeRow === element.title" class="w-full flex gap-3 items-center px-3 py-2 bg-gray-50 border-b-1 border-gray-200">
+                        <div
+                          v-if="activeRow === element.title"
+                          class="w-full flex gap-3 items-center px-3 py-2 bg-gray-50 border-b-1 border-gray-200"
+                        >
                           <component
                             :is="iconMap.drag"
                             class="nc-form-field-drag-handler flex-none cursor-move !h-4 !w-4 text-gray-600"
@@ -1272,7 +1275,10 @@ useEventListener(
                           </div>
 
                           <!-- Limit options -->
-                          <div v-if="isSelectTypeCol(element.uidt)" class="px-3 py-2 border-1 border-gray-200 rounded-lg bg-white">
+                          <div
+                            v-if="isSelectTypeCol(element.uidt)"
+                            class="px-3 py-2 border-1 border-gray-200 rounded-lg bg-white"
+                          >
                             <div class="flex items-center gap-3">
                               <a-switch
                                 v-model:checked="element.meta.isLimitOption"
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 0c3f6b3c70..7d890ed86a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -192,7 +192,7 @@ const newRecord = () => {
       [calendarRange.value[0].fk_from_col!.title!]: selectedDate.value.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('newRecord', record)
+  emit('new-record', record)
 }
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 7813421720..423f60798c 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -847,7 +847,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
       [calendarRange.value[0].fk_from_col!.title!]: hour.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('newRecord', record)
+  emit('new-record', record)
 }
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index e27cb73a8a..69d24059f7 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -635,7 +635,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('newRecord', newRecord)
+  emit('new-record', newRecord)
 }
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index 12c96c7d16..003b644b97 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -529,7 +529,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('newRecord', newRecord)
+  emits('new-record', newRecord)
 }
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index e5ad4e23de..16c9060fd2 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -733,7 +733,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('newRecord', newRecord)
+  emits('new-record', newRecord)
 }
 </script>
 
diff --git a/packages/nc-gui/composables/useViewGroupBy.ts b/packages/nc-gui/composables/useViewGroupBy.ts
index 8f3480e92d..37c38e6763 100644
--- a/packages/nc-gui/composables/useViewGroupBy.ts
+++ b/packages/nc-gui/composables/useViewGroupBy.ts
@@ -161,7 +161,9 @@ export const useViewGroupBy = (view: Ref<ViewType | undefined>, where?: Computed
         acc += `${acc.length ? '~and' : ''}(${curr.title},gb_null)`
       } else if (curr.column_uidt === UITypes.Checkbox) {
         acc += `${acc.length ? '~and' : ''}(${curr.title},${curr.key === GROUP_BY_VARS.TRUE ? 'checked' : 'notchecked'})`
-      } else if ([UITypes.Date, UITypes.DateTime].includes(curr.column_uidt as UITypes)) {
+      } else if (
+        [UITypes.Date, UITypes.DateTime, UITypes.CreatedTime, UITypes.LastModifiedTime].includes(curr.column_uidt as UITypes)
+      ) {
         acc += `${acc.length ? '~and' : ''}(${curr.title},eq,exactDate,${curr.key})`
       } else if ([UITypes.User, UITypes.CreatedBy, UITypes.LastModifiedBy].includes(curr.column_uidt as UITypes)) {
         try {
diff --git a/packages/nocodb-sdk/src/lib/helperFunctions.ts b/packages/nocodb-sdk/src/lib/helperFunctions.ts
index 43a8d878ec..9831c4f9a6 100644
--- a/packages/nocodb-sdk/src/lib/helperFunctions.ts
+++ b/packages/nocodb-sdk/src/lib/helperFunctions.ts
@@ -70,7 +70,14 @@ const getAvailableRollupForUiType = (type: string) => {
       'sumDistinct',
       'avgDistinct',
     ];
-  } else if ([UITypes.Date, UITypes.DateTime].includes(type as UITypes)) {
+  } else if (
+    [
+      UITypes.Date,
+      UITypes.DateTime,
+      UITypes.CreatedTime,
+      UITypes.LastModifiedTime,
+    ].includes(type as UITypes)
+  ) {
     return ['count', 'min', 'max', 'countDistinct'];
   } else if (
     [
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index c34a7ea961..720b57620a 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -6181,7 +6181,14 @@ function validateFilterComparison(uidt: UITypes, op: any, sub_op?: any) {
   }
 
   if (sub_op) {
-    if (![UITypes.Date, UITypes.DateTime].includes(uidt)) {
+    if (
+      ![
+        UITypes.Date,
+        UITypes.DateTime,
+        UITypes.CreatedTime,
+        UITypes.LastModifiedTime,
+      ].includes(uidt)
+    ) {
       NcError.badRequest(`'${sub_op}' is not supported for UI Type'${uidt}'.`);
     }
     if (!COMPARISON_SUB_OPS.includes(sub_op)) {
@@ -6237,7 +6244,7 @@ export function extractCondition(
 
     if (aliasColObjMap[alias]) {
       if (
-        [UITypes.Date, UITypes.DateTime].includes(aliasColObjMap[alias].uidt)
+        [UITypes.Date, UITypes.DateTime, UITypes.LastModifiedTime, UITypes.CreatedTime].includes(aliasColObjMap[alias].uidt)
       ) {
         value = value?.split(',');
         // the first element would be sub_op

From e68b31312643c13f89e792f08c5cb6c009cee05b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 11 Mar 2024 15:11:25 +0000
Subject: [PATCH 145/253] feat(nc-gui): open base/table/view in new tab on
 pressing cltr & cliking on then

---
 .../dashboard/TreeView/ProjectNode.vue        | 23 +++++-
 .../dashboard/TreeView/TableNode.vue          |  9 ++-
 packages/nc-gui/composables/useTableNew.ts    | 31 ++++++--
 packages/nc-gui/store/views.ts                | 79 ++++++++++++++-----
 packages/nc-gui/utils/urlUtils.ts             |  8 ++
 5 files changed, 123 insertions(+), 27 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 2acb07fa85..6d2331e002 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -32,6 +32,8 @@ import {
   useTablesStore,
   useTabs,
   useToggle,
+  useMagicKeys,
+  navigateToBlankTargetOpenOption,
 } from '#imports'
 import type { NcProject } from '#imports'
 
@@ -71,6 +73,8 @@ const { orgRoles, isUIAllowed } = useRoles()
 
 useTabs()
 
+const { meta: metaKey, ctrlKey } = useMagicKeys()
+
 const editMode = ref(false)
 
 const tempTitle = ref('')
@@ -253,12 +257,29 @@ const onProjectClick = async (base: NcProject, ignoreNavigation?: boolean, toggl
   if (!base) {
     return
   }
+  const cmdOrCtrl = isMac() ? metaKey.value : ctrlKey.value
 
-  if (!toggleIsExpanded) $e('c:base:open')
+  if (!toggleIsExpanded && !cmdOrCtrl) $e('c:base:open')
 
   ignoreNavigation = isMobileMode.value || ignoreNavigation
   toggleIsExpanded = isMobileMode.value || toggleIsExpanded
 
+  if (cmdOrCtrl && !ignoreNavigation) {
+    await navigateTo(
+      `${cmdOrCtrl ? '#' : ''}${baseUrl({
+        id: base.id!,
+        type: 'database',
+        isSharedBase: isSharedBase.value,
+      })}`,
+      cmdOrCtrl
+        ? {
+            open: navigateToBlankTargetOpenOption,
+          }
+        : undefined,
+    )
+    return
+  }
+
   if (toggleIsExpanded) {
     base.isExpanded = !base.isExpanded
   } else {
diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 309446907d..e108628e1e 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -4,7 +4,7 @@ import { toRef } from '@vue/reactivity'
 import { message } from 'ant-design-vue'
 import { storeToRefs } from 'pinia'
 
-import { ProjectRoleInj, TreeViewInj, useNuxtApp, useRoles, useTabs } from '#imports'
+import { ProjectRoleInj, TreeViewInj, useNuxtApp, useRoles, useTabs, useMagicKeys } from '#imports'
 import type { SidebarTableNode } from '~/lib'
 
 const props = withDefaults(
@@ -39,6 +39,8 @@ useTableNew({
   baseId: base.value.id!,
 })
 
+const { meta: metaKey, ctrlKey } = useMagicKeys()
+
 const baseRole = inject(ProjectRoleInj)
 provide(SidebarTableInj, table)
 
@@ -106,6 +108,11 @@ const onExpand = async () => {
 }
 
 const onOpenTable = async () => {
+  if (isMac() ? metaKey.value : ctrlKey.value) {
+    await _openTable(table.value, true)
+    return
+  }
+
   isLoading.value = true
   try {
     await _openTable(table.value)
diff --git a/packages/nc-gui/composables/useTableNew.ts b/packages/nc-gui/composables/useTableNew.ts
index b20494e43b..61ec1ff01b 100644
--- a/packages/nc-gui/composables/useTableNew.ts
+++ b/packages/nc-gui/composables/useTableNew.ts
@@ -19,6 +19,8 @@ import {
   useNuxtApp,
   useTabs,
   watch,
+  useMagicKeys,
+  navigateToBlankTargetOpenOption,
 } from '#imports'
 
 export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => void; baseId: string; sourceId?: string }) {
@@ -60,7 +62,7 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
   const tables = computed(() => baseTables.value.get(param.baseId) || [])
   const base = computed(() => bases.value.get(param.baseId))
 
-  const openTable = async (table: SidebarTableNode) => {
+  const openTable = async (table: SidebarTableNode, cmdOrCtrl: boolean = false) => {
     if (!table.base_id) return
 
     let base = bases.value.get(table.base_id)
@@ -86,7 +88,14 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
 
     const navigateToTable = async () => {
       if (openedViewsTab.value === 'view') {
-        await navigateTo(`/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}`)
+        await navigateTo(
+          `${cmdOrCtrl ? '#' : ''}/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}`,
+          cmdOrCtrl
+            ? {
+                open: navigateToBlankTargetOpenOption,
+              }
+            : undefined,
+        )
       }
 
       table.isViewsLoading = true
@@ -99,7 +108,16 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
           // find the default view and navigate to it, if not found navigate to the first one
           const defaultView = views.find((v) => v.is_default) || views[0]
 
-          await navigateTo(`/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}/${defaultView.id}/${openedViewsTab.value}`)
+          await navigateTo(
+            `${cmdOrCtrl ? '#' : ''}/${workspaceIdOrType}/${baseIdOrBaseId}/${table?.id}/${defaultView.id}/${
+              openedViewsTab.value
+            }`,
+            cmdOrCtrl
+              ? {
+                  open: navigateToBlankTargetOpenOption,
+                }
+              : undefined,
+          )
         }
       } catch (e) {
         console.error(e)
@@ -119,8 +137,11 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
         table.isMetaLoading = false
       }
     }
-
-    await Promise.all([navigateToTable(), loadTableMeta()])
+    if (cmdOrCtrl) {
+      await navigateToTable()
+    } else {
+      await Promise.all([navigateToTable(), loadTableMeta()])
+    }
   }
 
   const createTable = async () => {
diff --git a/packages/nc-gui/store/views.ts b/packages/nc-gui/store/views.ts
index 64e426f48f..5c2a1c9e10 100644
--- a/packages/nc-gui/store/views.ts
+++ b/packages/nc-gui/store/views.ts
@@ -1,6 +1,7 @@
 import type { FilterType, SortType, ViewType, ViewTypes } from 'nocodb-sdk'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import type { ViewPageType } from '~/lib'
+import { useMagicKeys, navigateToBlankTargetOpenOption } from '#imports'
 
 export const useViewsStore = defineStore('viewsStore', () => {
   const { $api } = useNuxtApp()
@@ -27,6 +28,8 @@ export const useViewsStore = defineStore('viewsStore', () => {
 
   const { activeWorkspaceId } = storeToRefs(useWorkspace())
 
+  const { meta: metaKey, ctrlKey } = useMagicKeys()
+
   const recentViews = computed<RecentView[]>(() =>
     allRecentViews.value.filter((f) => f.workspaceId === activeWorkspaceId.value).splice(0, 10),
   )
@@ -216,6 +219,8 @@ export const useViewsStore = defineStore('viewsStore', () => {
     hardReload?: boolean
     doNotSwitchTab?: boolean
   }) => {
+    const cmdOrCtrl = isMac() ? metaKey.value : ctrlKey.value
+
     const routeName = 'index-typeOrId-baseId-index-index-viewId-viewTitle-slugs'
 
     let baseIdOrBaseId = baseId
@@ -231,29 +236,63 @@ export const useViewsStore = defineStore('viewsStore', () => {
       router.currentRoute.value.query.page &&
       router.currentRoute.value.query.page === 'fields'
     ) {
-      await router.push({
-        name: routeName,
-        params: {
-          viewTitle: view.id || '',
-          viewId: tableId,
-          baseId: baseIdOrBaseId,
-          slugs,
-        },
-        query: router.currentRoute.value.query,
-      })
+      if (cmdOrCtrl) {
+        await navigateTo(
+          router.resolve({
+            name: routeName,
+            params: {
+              viewTitle: view.id || '',
+              viewId: tableId,
+              baseId: baseIdOrBaseId,
+              slugs,
+            },
+            query: router.currentRoute.value.query,
+          }).href,
+          {
+            open: navigateToBlankTargetOpenOption,
+          },
+        )
+      } else {
+        await router.push({
+          name: routeName,
+          params: {
+            viewTitle: view.id || '',
+            viewId: tableId,
+            baseId: baseIdOrBaseId,
+            slugs,
+          },
+          query: router.currentRoute.value.query,
+        })
+      }
     } else {
-      await router.push({
-        name: routeName,
-        params: {
-          viewTitle: view.id || '',
-          viewId: tableId,
-          baseId: baseIdOrBaseId,
-          slugs,
-        },
-      })
+      if (cmdOrCtrl) {
+        const href = router.resolve({
+          name: routeName,
+          params: {
+            viewTitle: view.id || '',
+            viewId: tableId,
+            baseId: baseIdOrBaseId,
+            slugs,
+          },
+        }).href
+
+        await navigateTo(href, {
+          open: navigateToBlankTargetOpenOption,
+        })
+      } else {
+        await router.push({
+          name: routeName,
+          params: {
+            viewTitle: view.id || '',
+            viewId: tableId,
+            baseId: baseIdOrBaseId,
+            slugs,
+          },
+        })
+      }
     }
 
-    if (hardReload) {
+    if (!cmdOrCtrl && hardReload) {
       await router
         .replace({
           name: routeName,
diff --git a/packages/nc-gui/utils/urlUtils.ts b/packages/nc-gui/utils/urlUtils.ts
index d0c098b460..b1ab1b826f 100644
--- a/packages/nc-gui/utils/urlUtils.ts
+++ b/packages/nc-gui/utils/urlUtils.ts
@@ -35,3 +35,11 @@ export const openLink = (path: string, baseURL?: string, target = '_blank') => {
   const url = new URL(path, baseURL)
   window.open(url.href, target, 'noopener,noreferrer')
 }
+
+export const navigateToBlankTargetOpenOption = {
+  target: '_blank',
+  windowFeatures: {
+    noopener: true,
+    noreferrer: true,
+  },
+}

From d796cef57199eb1f96298fbebb0db3f7589ccd82 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 11 Mar 2024 15:11:25 +0000
Subject: [PATCH 146/253] fix(nc-gui): small changes

---
 packages/nc-gui/store/views.ts | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/store/views.ts b/packages/nc-gui/store/views.ts
index 5c2a1c9e10..d767a94af6 100644
--- a/packages/nc-gui/store/views.ts
+++ b/packages/nc-gui/store/views.ts
@@ -266,19 +266,20 @@ export const useViewsStore = defineStore('viewsStore', () => {
       }
     } else {
       if (cmdOrCtrl) {
-        const href = router.resolve({
-          name: routeName,
-          params: {
-            viewTitle: view.id || '',
-            viewId: tableId,
-            baseId: baseIdOrBaseId,
-            slugs,
+        await navigateTo(
+          router.resolve({
+            name: routeName,
+            params: {
+              viewTitle: view.id || '',
+              viewId: tableId,
+              baseId: baseIdOrBaseId,
+              slugs,
+            },
+          }).href,
+          {
+            open: navigateToBlankTargetOpenOption,
           },
-        }).href
-
-        await navigateTo(href, {
-          open: navigateToBlankTargetOpenOption,
-        })
+        )
       } else {
         await router.push({
           name: routeName,

From 839e93ce33f366b0b368ee4cbf7db55ddfcf74fa Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 11 Mar 2024 15:11:25 +0000
Subject: [PATCH 147/253] fix(nc-gui): open view new tab in background on
 cmd+click

---
 .../dashboard/Sidebar/TopSection.vue          |  6 +++++-
 .../dashboard/TreeView/ProjectNode.vue        |  4 ++--
 .../dashboard/TreeView/TableNode.vue          |  2 +-
 .../dashboard/TreeView/ViewsNode.vue          | 19 ++++++++++++++++---
 packages/nc-gui/composables/useTableNew.ts    |  4 ++--
 packages/nc-gui/store/views.ts                |  2 +-
 packages/nc-gui/store/workspace.ts            | 11 +++++++++--
 7 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/Sidebar/TopSection.vue b/packages/nc-gui/components/dashboard/Sidebar/TopSection.vue
index 2b409eef86..84ecb8430f 100644
--- a/packages/nc-gui/components/dashboard/Sidebar/TopSection.vue
+++ b/packages/nc-gui/components/dashboard/Sidebar/TopSection.vue
@@ -6,6 +6,8 @@ const { isUIAllowed } = useRoles()
 
 const { appInfo } = useGlobal()
 
+const { meta: metaKey, ctrlKey } = useMagicKeys()
+
 const { isWorkspaceLoading, isWorkspaceSettingsPageOpened } = storeToRefs(workspaceStore)
 
 const { navigateToWorkspaceSettings } = workspaceStore
@@ -15,8 +17,10 @@ const { isSharedBase } = storeToRefs(baseStore)
 const isCreateProjectOpen = ref(false)
 
 const navigateToSettings = () => {
+  const cmdOrCtrl = isMac() ? metaKey.value : ctrlKey.value
+
   // TODO: Handle cloud case properly
-  navigateToWorkspaceSettings()
+  navigateToWorkspaceSettings('', cmdOrCtrl)
 
   // if (appInfo.value.baseHostName) {
   //   window.location.href = `https://app.${appInfo.value.baseHostName}/dashboard`
diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 6d2331e002..0230f38925 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -16,6 +16,7 @@ import {
   h,
   inject,
   navigateTo,
+  navigateToBlankTargetOpenOption,
   openLink,
   ref,
   resolveComponent,
@@ -26,14 +27,13 @@ import {
   useDialog,
   useGlobal,
   useI18n,
+  useMagicKeys,
   useNuxtApp,
   useRoles,
   useRouter,
   useTablesStore,
   useTabs,
   useToggle,
-  useMagicKeys,
-  navigateToBlankTargetOpenOption,
 } from '#imports'
 import type { NcProject } from '#imports'
 
diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index e108628e1e..31c23323dd 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -4,7 +4,7 @@ import { toRef } from '@vue/reactivity'
 import { message } from 'ant-design-vue'
 import { storeToRefs } from 'pinia'
 
-import { ProjectRoleInj, TreeViewInj, useNuxtApp, useRoles, useTabs, useMagicKeys } from '#imports'
+import { ProjectRoleInj, TreeViewInj, useMagicKeys, useNuxtApp, useRoles, useTabs } from '#imports'
 import type { SidebarTableNode } from '~/lib'
 
 const props = withDefaults(
diff --git a/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue b/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue
index b5a89d0b7a..910352b24e 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue
@@ -9,6 +9,7 @@ import {
   message,
   onKeyStroke,
   useDebounceFn,
+  useMagicKeys,
   useNuxtApp,
   useRoles,
   useVModel,
@@ -52,6 +53,8 @@ const { activeView } = storeToRefs(useViewsStore())
 
 const { getMeta } = useMetas()
 
+const { meta: metaKey, ctrlKey } = useMagicKeys()
+
 const table = computed(() => props.table)
 const injectedTable = ref(table.value)
 
@@ -80,11 +83,21 @@ const _title = ref<string | undefined>()
 
 /** Debounce click handler, so we can potentially enable editing view name {@see onDblClick} */
 const onClick = useDebounceFn(() => {
-  if (isEditing.value || isStopped.value) return
-
   emits('changeView', vModel.value)
 }, 250)
 
+const handleOnClick = () => {
+  if (isEditing.value || isStopped.value) return
+
+  const cmdOrCtrl = isMac() ? metaKey.value : ctrlKey.value
+
+  if (cmdOrCtrl) {
+    emits('changeView', vModel.value)
+  } else {
+    onClick()
+  }
+}
+
 /** Enable editing view name on dbl click */
 function onDblClick() {
   if (isMobileMode.value) return
@@ -209,7 +222,7 @@ watch(isDropdownOpen, async () => {
     }"
     :data-testid="`view-sidebar-view-${vModel.alias || vModel.title}`"
     @dblclick.stop="onDblClick"
-    @click="onClick"
+    @click.prevent="handleOnClick"
   >
     <div v-e="['a:view:open', { view: vModel.type }]" class="text-sm flex items-center w-full gap-1" data-testid="view-item">
       <div
diff --git a/packages/nc-gui/composables/useTableNew.ts b/packages/nc-gui/composables/useTableNew.ts
index 61ec1ff01b..8d77f790cb 100644
--- a/packages/nc-gui/composables/useTableNew.ts
+++ b/packages/nc-gui/composables/useTableNew.ts
@@ -10,17 +10,17 @@ import {
   extractSdkResponseErrorMsg,
   generateUniqueTitle as generateTitle,
   message,
+  navigateToBlankTargetOpenOption,
   reactive,
   storeToRefs,
   useBase,
   useCommandPalette,
   useI18n,
+  useMagicKeys,
   useMetas,
   useNuxtApp,
   useTabs,
   watch,
-  useMagicKeys,
-  navigateToBlankTargetOpenOption,
 } from '#imports'
 
 export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => void; baseId: string; sourceId?: string }) {
diff --git a/packages/nc-gui/store/views.ts b/packages/nc-gui/store/views.ts
index d767a94af6..f5e60d480c 100644
--- a/packages/nc-gui/store/views.ts
+++ b/packages/nc-gui/store/views.ts
@@ -1,7 +1,7 @@
 import type { FilterType, SortType, ViewType, ViewTypes } from 'nocodb-sdk'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import type { ViewPageType } from '~/lib'
-import { useMagicKeys, navigateToBlankTargetOpenOption } from '#imports'
+import { navigateToBlankTargetOpenOption, useMagicKeys } from '#imports'
 
 export const useViewsStore = defineStore('viewsStore', () => {
   const { $api } = useNuxtApp()
diff --git a/packages/nc-gui/store/workspace.ts b/packages/nc-gui/store/workspace.ts
index db79670ce3..36f6d1df16 100644
--- a/packages/nc-gui/store/workspace.ts
+++ b/packages/nc-gui/store/workspace.ts
@@ -199,8 +199,15 @@ export const useWorkspace = defineStore('workspaceStore', () => {
     })
   }
 
-  const navigateToWorkspaceSettings = async () => {
-    navigateTo('/account/users')
+  const navigateToWorkspaceSettings = async (_, cmdOrCtrl) => {
+    await navigateTo(
+      `${cmdOrCtrl ? '#' : ''}/account/users`,
+      cmdOrCtrl
+        ? {
+            open: navigateToBlankTargetOpenOption,
+          }
+        : undefined,
+    )
   }
 
   function setLoadingState(isLoading = false) {

From 61df4953005c084a2575f0a3cd5d30429cb9e29d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 11 Mar 2024 15:11:25 +0000
Subject: [PATCH 148/253] chore(nc-gui): lint

---
 packages/nc-gui/composables/useTableNew.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui/composables/useTableNew.ts b/packages/nc-gui/composables/useTableNew.ts
index 8d77f790cb..d51e3dd67a 100644
--- a/packages/nc-gui/composables/useTableNew.ts
+++ b/packages/nc-gui/composables/useTableNew.ts
@@ -16,7 +16,6 @@ import {
   useBase,
   useCommandPalette,
   useI18n,
-  useMagicKeys,
   useMetas,
   useNuxtApp,
   useTabs,

From 08e86dee5cab452f72fb6008f8d67092dd376d8c Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 12 Mar 2024 05:38:25 +0000
Subject: [PATCH 149/253] fix(nc-gui): lint

---
 .../components/smartsheet/calendar/DayView/DateField.vue  | 4 ++--
 .../smartsheet/calendar/DayView/DateTimeField.vue         | 8 ++++----
 .../nc-gui/components/smartsheet/calendar/MonthView.vue   | 6 +++---
 .../components/smartsheet/calendar/WeekView/DateField.vue | 4 ++--
 .../smartsheet/calendar/WeekView/DateTimeField.vue        | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 7d890ed86a..994a7ba5f4 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expand-record', 'new-record'])
+const emit = defineEmits(['expand-record', 'newRecord'])
 
 const meta = inject(MetaInj, ref())
 
@@ -192,7 +192,7 @@ const newRecord = () => {
       [calendarRange.value[0].fk_from_col!.title!]: selectedDate.value.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', record)
+  emit('newRecord', record)
 }
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 423f60798c..db85b39042 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expandRecord', 'new-record'])
+const emit = defineEmits(['expandRecord', 'newRecord'])
 
 const {
   // activeCalendarView,
@@ -847,7 +847,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
       [calendarRange.value[0].fk_from_col!.title!]: hour.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', record)
+  emit('newRecord', record)
 }
 </script>
 
@@ -909,7 +909,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
                       },
                     }
                   }
-                  emit('new-record', record)
+                  emit('newRecord', record)
                 }
               "
             >
@@ -946,7 +946,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
                 },
               }
             }
-            emit('new-record', record)
+            emit('newRecord', record)
           }
         "
       >
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 69d24059f7..ba4dcf8f54 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['new-record', 'expandRecord'])
+const emit = defineEmits(['newRecord', 'expandRecord'])
 
 const {
   selectedDate,
@@ -635,7 +635,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', newRecord)
+  emit('newRecord', newRecord)
 }
 </script>
 
@@ -738,7 +738,7 @@ const addRecord = (date: dayjs.Dayjs) => {
                       [calendarRange[0].fk_from_col!.title!]: (day).format('YYYY-MM-DD HH:mm:ssZ'),
                     },
                   }
-                  emit('new-record', record)
+                  emit('newRecord', record)
                 }
               "
             >
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index 003b644b97..8a37b955bc 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -5,7 +5,7 @@ import type { Row } from '~/lib'
 import { computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emits = defineEmits(['expandRecord'])
+const emits = defineEmits(['expandRecord', 'newRecord'])
 
 const { selectedDateRange, formattedData, formattedSideBarData, calendarRange, selectedDate, displayField, updateRowProperty } =
   useCalendarViewStoreOrThrow()
@@ -529,7 +529,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('new-record', newRecord)
+  emits('newRecord', newRecord)
 }
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index 16c9060fd2..ec1bb35475 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -5,7 +5,7 @@ import type { Row } from '~/lib'
 import { computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emits = defineEmits(['expandRecord'])
+const emits = defineEmits(['expandRecord', 'newRecord'])
 
 const {
   selectedDateRange,
@@ -733,7 +733,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('new-record', newRecord)
+  emits('newRecord', newRecord)
 }
 </script>
 

From 54b66d9c405da40d67b55b5f78744aa7c7d88a2b Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 12 Mar 2024 05:38:26 +0000
Subject: [PATCH 150/253] fix: lint

---
 .../smartsheet/calendar/DayView/DateField.vue |  4 +-
 .../smartsheet/calendar/MonthView.vue         |  2 +-
 .../smartsheet/calendar/SideMenu.vue          |  4 +-
 .../calendar/WeekView/DateField.vue           | 93 ++++++++++---------
 4 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 994a7ba5f4..1f7ba889e3 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expand-record', 'newRecord'])
+const emit = defineEmits(['expandRecord', 'newRecord'])
 
 const meta = inject(MetaInj, ref())
 
@@ -221,7 +221,7 @@ const newRecord = () => {
           :resize="false"
           color="blue"
           size="small"
-          @click="emit('expand-record', record)"
+          @click="emit('expandRecord', record)"
         >
           <template v-if="!isRowEmpty(record, displayField)">
             <LazySmartsheetCalendarCell
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index ba4dcf8f54..020f665540 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -710,7 +710,7 @@ const addRecord = (date: dayjs.Dayjs) => {
                             [range.fk_from_col!.title!]: dayjs(day).format('YYYY-MM-DD HH:mm:ssZ'),
                           },
                         }
-                        emit('new-record', record)
+                        emit('newRecord', record)
                       }
                     "
                   >
diff --git a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
index f636a27097..8cfa4b8980 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
@@ -8,7 +8,7 @@ const props = defineProps<{
   visible: boolean
 }>()
 
-const emit = defineEmits(['expand-record', 'newRecord'])
+const emit = defineEmits(['expandRecord', 'newRecord'])
 
 const INFINITY_SCROLL_THRESHOLD = 100
 
@@ -428,7 +428,7 @@ onUnmounted(() => {
               "
                 color="blue"
                 data-testid="nc-sidebar-record-card"
-                @click="emit('expand-record', record)"
+                @click="emit('expandRecord', record)"
                 @dragstart="dragStart($event, record)"
                 @dragover.prevent
               >
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index 8a37b955bc..f58bf648b8 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -565,52 +565,53 @@ const addRecord = (date: dayjs.Dayjs) => {
       class="absolute nc-scrollbar-md overflow-y-auto mt-9 pointer-events-none inset-0"
       data-testid="nc-calendar-week-record-container"
     >
-      <div
-        v-for="(record, id) in calendarData"
-        :key="id"
-        :data-testid="`nc-calendar-week-record-${record.row[displayField!.title!]}`"
-        :data-unique-id="record.rowMeta.id"
-        :style="{
-          ...record.rowMeta.style,
-        }"
-        class="absolute group draggable-record pointer-events-auto nc-calendar-week-record-card"
-        @mousedown.stop="dragStart($event, record)"
-        @mouseleave="hoverRecord = null"
-        @mouseover="hoverRecord = record.rowMeta.id"
-      >
-        <LazySmartsheetRow :row="record">
-          <LazySmartsheetCalendarRecordCard
-            :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
-            :position="record.rowMeta.position"
-            :record="record"
-            :selected="dragRecord?.rowMeta?.id === record.rowMeta.id"
-            :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
-            color="blue"
-            @dblclick.stop="emits('expand-record', record)"
-            @resize-start="onResizeStart"
-          >
-            <template v-if="!isRowEmpty(record, displayField)">
-              <LazySmartsheetCalendarCell
-                v-model="record.row[displayField!.title!]"
-                :bold="getFieldStyle(displayField).bold"
-                :column="displayField"
-                :italic="getFieldStyle(displayField).italic"
-                :underline="getFieldStyle(displayField).underline"
-              />
-            </template>
-            <template v-for="(field, index) in fieldsWithoutDisplay" :key="index">
-              <LazySmartsheetCalendarCell
-                v-if="!isRowEmpty(record, field!)"
-                v-model="record.row[field!.title!]"
-                :bold="getFieldStyle(field).bold"
-                :column="field"
-                :italic="getFieldStyle(field).italic"
-                :underline="getFieldStyle(field).underline"
-              />
-            </template>
-          </LazySmartsheetCalendarRecordCard>
-        </LazySmartsheetRow>
-      </div>
+      <template v-for="(record, id) in calendarData" :key="id">
+        <div
+          v-if="record.rowMeta.style?.display !== 'none'"
+          :data-testid="`nc-calendar-week-record-${record.row[displayField!.title!]}`"
+          :data-unique-id="record.rowMeta.id"
+          :style="{
+            ...record.rowMeta.style,
+          }"
+          class="absolute group draggable-record pointer-events-auto nc-calendar-week-record-card"
+          @mouseleave="hoverRecord = null"
+          @mouseover="hoverRecord = record.rowMeta.id"
+          @mousedown.stop="dragStart($event, record)"
+        >
+          <LazySmartsheetRow :row="record">
+            <LazySmartsheetCalendarRecordCard
+              :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
+              :position="record.rowMeta.position"
+              :record="record"
+              :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
+              :selected="dragRecord?.rowMeta?.id === record.rowMeta.id"
+              color="blue"
+              @dblclick.stop="emits('expandRecord', record)"
+              @resize-start="onResizeStart"
+            >
+              <template v-if="!isRowEmpty(record, displayField)">
+                <LazySmartsheetCalendarCell
+                  v-model="record.row[displayField!.title!]"
+                  :bold="getFieldStyle(displayField).bold"
+                  :column="displayField"
+                  :italic="getFieldStyle(displayField).italic"
+                  :underline="getFieldStyle(displayField).underline"
+                />
+              </template>
+              <template v-for="(field, index) in fieldsWithoutDisplay" :key="index">
+                <LazySmartsheetCalendarCell
+                  v-if="!isRowEmpty(record, field!)"
+                  v-model="record.row[field!.title!]"
+                  :bold="getFieldStyle(field).bold"
+                  :column="field"
+                  :italic="getFieldStyle(field).italic"
+                  :underline="getFieldStyle(field).underline"
+                />
+              </template>
+            </LazySmartsheetCalendarRecordCard>
+          </LazySmartsheetRow>
+        </div>
+      </template>
     </div>
   </div>
 </template>

From 2a470ef7fb0b35d872a1fa8af5d3821d0d901c06 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 12 Mar 2024 05:56:05 +0000
Subject: [PATCH 151/253] fix: add error handling

---
 .../smartsheet/toolbar/FieldsMenu.vue         | 92 ++++++++++---------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index 25e9166144..4c5a444300 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -83,58 +83,62 @@ const gridDisplayValueField = computed(() => {
 })
 
 const onMove = async (_event: { moved: { newIndex: number; oldIndex: number } }, undo = false) => {
-  // todo : sync with server
-  if (!fields.value) return
+  try {
+    // todo : sync with server
+    if (!fields.value) return
 
-  if (!undo) {
-    addUndo({
-      undo: {
-        fn: () => {
-          if (!fields.value) return
-          const temp = fields.value[_event.moved.newIndex]
-          fields.value[_event.moved.newIndex] = fields.value[_event.moved.oldIndex]
-          fields.value[_event.moved.oldIndex] = temp
-          onMove(
-            {
-              moved: {
-                newIndex: _event.moved.oldIndex,
-                oldIndex: _event.moved.newIndex,
+    if (!undo) {
+      addUndo({
+        undo: {
+          fn: () => {
+            if (!fields.value) return
+            const temp = fields.value[_event.moved.newIndex]
+            fields.value[_event.moved.newIndex] = fields.value[_event.moved.oldIndex]
+            fields.value[_event.moved.oldIndex] = temp
+            onMove(
+              {
+                moved: {
+                  newIndex: _event.moved.oldIndex,
+                  oldIndex: _event.moved.newIndex,
+                },
               },
-            },
-            true,
-          )
+              true,
+            )
+          },
+          args: [],
         },
-        args: [],
-      },
-      redo: {
-        fn: () => {
-          if (!fields.value) return
-          const temp = fields.value[_event.moved.oldIndex]
-          fields.value[_event.moved.oldIndex] = fields.value[_event.moved.newIndex]
-          fields.value[_event.moved.newIndex] = temp
-          onMove(_event, true)
+        redo: {
+          fn: () => {
+            if (!fields.value) return
+            const temp = fields.value[_event.moved.oldIndex]
+            fields.value[_event.moved.oldIndex] = fields.value[_event.moved.newIndex]
+            fields.value[_event.moved.newIndex] = temp
+            onMove(_event, true)
+          },
+          args: [],
         },
-        args: [],
-      },
-      scope: defineViewScope({ view: activeView.value }),
-    })
-  }
+        scope: defineViewScope({ view: activeView.value }),
+      })
+    }
 
-  if (fields.value.length < 2) return
+    if (fields.value.length < 2) return
 
-  await Promise.all(
-    fields.value.map(async (field, index) => {
-      if (field.order !== index + 1) {
-        field.order = index + 1
-        await saveOrUpdate(field, index, true)
-      }
-    }),
-  )
+    await Promise.all(
+      fields.value.map(async (field, index) => {
+        if (field.order !== index + 1) {
+          field.order = index + 1
+          await saveOrUpdate(field, index, true)
+        }
+      }),
+    )
 
-  await loadViewColumns()
-  reloadViewDataHook?.trigger()
+    await loadViewColumns()
+    reloadViewDataHook?.trigger()
 
-  $e('a:fields:reorder')
+    $e('a:fields:reorder')
+  } catch (e) {
+    message.error(await extractSdkResponseErrorMsg(e))
+  }
 }
 
 const coverOptions = computed<SelectProps['options']>(() => {

From a7ae59c4d55aa558c258a7f78d8954a7568405d4 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 12 Mar 2024 05:56:05 +0000
Subject: [PATCH 152/253] fix: permission name correction

---
 packages/nocodb/src/controllers/view-columns.controller.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/controllers/view-columns.controller.ts b/packages/nocodb/src/controllers/view-columns.controller.ts
index 6e5f0e9851..9647b342de 100644
--- a/packages/nocodb/src/controllers/view-columns.controller.ts
+++ b/packages/nocodb/src/controllers/view-columns.controller.ts
@@ -58,8 +58,8 @@ export class ViewColumnsController {
     '/api/v1/db/meta/views/:viewId/columns/:columnId',
     '/api/v2/meta/views/:viewId/columns/:columnId',
   ])
-  @Acl('columnUpdate')
-  async columnUpdate(
+  @Acl('viewColumnUpdate')
+  async viewColumnUpdate(
     @Param('viewId') viewId: string,
     @Param('columnId') columnId: string,
     @Body() body: ViewColumnReqType,

From 1a9ee6fa33ee822ddcf9bb188c7a0e0b77e7b1dc Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 12 Mar 2024 06:21:31 +0000
Subject: [PATCH 153/253] fix: allow shared form in iframe

---
 packages/nc-gui/middleware/01.security.global.ts         | 7 ++++++-
 packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/middleware/01.security.global.ts b/packages/nc-gui/middleware/01.security.global.ts
index 8b40f26861..20ce34a8d0 100644
--- a/packages/nc-gui/middleware/01.security.global.ts
+++ b/packages/nc-gui/middleware/01.security.global.ts
@@ -6,11 +6,16 @@ export default defineNuxtRouteMiddleware(async (to) => {
       return
     }
 
-    // allow for shared views
+    // allow for shared views based on page layout
     if (to.meta?.layout === 'shared-view') {
       return
     }
 
+    // allow for shared views based on pageType meta prop
+    if (to.meta?.pageType === 'shared-view') {
+      return
+    }
+
     // throw for all other pages
     throw createError({ statusCode: 403, message: 'Not allowed' })
   }
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
index 11d3a72576..5152cf8bc7 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
@@ -22,6 +22,7 @@ import {
 
 definePageMeta({
   public: true,
+  pageType: 'shared-view',
 })
 
 useSidebar('nc-left-sidebar', { hasSidebar: false })

From 092cd9df5031e84104956826654f5fcb1dda4d6b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:55 +0000
Subject: [PATCH 154/253] feat(nc-gui): base icon color

---
 packages/nc-gui/assets/img/hue-colors.png     | Bin 0 -> 59616 bytes
 .../components/general/BaseColorPicker.vue    | 205 ++++++++++++++++++
 2 files changed, 205 insertions(+)
 create mode 100644 packages/nc-gui/assets/img/hue-colors.png
 create mode 100644 packages/nc-gui/components/general/BaseColorPicker.vue

diff --git a/packages/nc-gui/assets/img/hue-colors.png b/packages/nc-gui/assets/img/hue-colors.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ea164a8f05e16472f41214ba9f5f5332b6d9d9d
GIT binary patch
literal 59616
zcmeI5T})eL7=XXiR(2%RbvR>XD3we@kPN(-`^m=Ir3=FaoQRQ`;0jY0b<xG$G=Ysm
z3<PK5{0W*R3vjV5Z~-V6ZqX$jixSNOiJ94O%T`4pIt&oPugW~%*B?6Q;mV7JJQt*;
z=d`2WIp=$y?|I+zu5oX1fjv1bSqNb--0dw9LN}i3Lbn(X+rRZ5G#<1gB?UW0M_>9M
z#xLI2$_igEDiYahH?83fVUxQUKWWB~5Y`q=SdB+bzSd%iZq-GLb>X?(@!Zf0hlFs8
zLa(RPuZ;}+^5*rIo!;lSjNa+{{)@?8-STD5mLL1FFN8k5@>2KECHv*Ss!pD{J~KN0
z)_CRk?=wxa&-G0WpFP^u?YS_w&G&HS@!U;+ADTa2wcR~=G`QhpdG+~$gA@C2+}7Gh
zC$4r4t_sXf`%etMk})?l-CQx{pDDljYG=c~iTuy}zSZZ?{IK!XkrTfS_RfuuZ>{O+
z%l&33lr(?Q{z3n#*=bM4h7AA2#*9;)$NF2-I`c2TbE~GYq59a&o^4}KJofI6pZcr6
zvtQ}|=fj(`1-DaI&!&&1t{!>3`KhYm$u%GEA1wMe(;X0+#il!4i=I?kk^*I|zb<(_
zyl3s#0WJ8b*~XTD<|=F7o#0dDyMrQ>wDjLouekRHg(K(1^@;u<V+Wr&Y&H2%SC&uc
zP1&glzl-k36X#5}xEyQqgl*45jfsarcZwS(TO4|_Q`DV)-)l00DdKIDExPT#6mhX+
zm)YPaiA{@+Mr^$5jKkt<%UrYga7A{o2G*Huv3NAAyQ}o0*eBin#5kOG4kw3`tJB8S
zsit2hTN{(DJQIkW#7>1kpinJjE6)VTmW7I1ps-M3-Ko}_tUJ*NQXilZutLhvA^Fe<
zXoRrEMI)dQ)R};Smq{2j0vbUj#?T081T=!eWi$dBLE$nQ0ga$4RVXfz1uAF+Gy)m{
zjj&LfMl}M}2vj4e>j8~`Mo?9}XaqC@8eyTppK1g&0vZ905WD>bjetf#BcKt`2n&#e
zMnEH=5!A8?jetf_c#uFN47KIVMtcFM2_qUqsOpnLhK?tW5=V)n#L<{+2%zH=#8F~r
zc=;XIc7@nU>?C#)JBgkDZ|vMLGVrwBXyewCcc)|cK$|T&V_}5jrr*Qj+Fd~@Zj&>4
zv#2-k?3FH_Su&YN+HTcb9tc#J_vcy_FzvF{8nF77X_}__%vzuMvO>aX-ujHM$<dVO
zIVUaGrku5yf|zLy<_Z!}h?@o%fd}9LcpygrJOB@j5vT<Zzyo6hSXRsYE_eVQfCu0~
z)SzMyzyt6AJcwj$zyt6AJOB^CgUASA4`dph<O22pdmu*uJOB^C1MmPmh!n_y2XX|!
z1MmPmFfIh;ktj{1_JG<0Y7ZjKDX<6N!99rwgPYeq80`hX%^FxfFka2rBmuE}SUxNt
zmJiE^<%=5uF#evzc+eem2i-w;H3FbJ=nlGr?x1@dxMJWzchH>#Jqh~g2&|9<y=!Wu
zMHiyp^LfqHnNViMz8d)j17exxVlI)={O5XkEyM+gXu~$way`^^ap~;VMhRC5-m5Ry
zL(LK#Yb(wS7l$l)uVuL&Y9g<?{gWkc3I73nO<xvA)8XQzbtZFd+H|I%dJ8kHW+9-o
z28f$bkm1C^1MooJv<4o42eKm`cmN*Aj(Fe!cmN(Kk%c_~52Vt>9)Jf@gJTcC19B)v
zatM1M(@fw2cmN)RE9$TZ-~skPRU=S)03Lt`QlP95Jn%pJ)ioiqo-FiwO7TLGTPa8z
z;e|*Wh3h2oLU<v(5MC%!|BM$}A>aq>0ei7qAxHv}1SAP)+^9p1kem~+d{{m#-wLvP
zz#gy%?8WY<1@?eFU{3`FV2_F~6&tDeS}7@AU=P>>_JF-;a~p$nsNcivQNJgZ7Ulim
z!OF&i+Ml}*qzNJ3tC%nE?=881ZGJ2ihR^?ya5iP9hM`}@26bITqQ$cR35u=9?MTmk
SWFpV_cu}~k*xRwwSN9)c{wVGM

literal 0
HcmV?d00001

diff --git a/packages/nc-gui/components/general/BaseColorPicker.vue b/packages/nc-gui/components/general/BaseColorPicker.vue
new file mode 100644
index 0000000000..1634cdbaf5
--- /dev/null
+++ b/packages/nc-gui/components/general/BaseColorPicker.vue
@@ -0,0 +1,205 @@
+<script lang="ts" setup>
+import data from 'emoji-mart-vue-fast/data/apple.json'
+import 'emoji-mart-vue-fast/css/emoji-mart.css'
+import { Slider } from '@ckpack/vue-color'
+import { Icon } from '@iconify/vue'
+import tinycolor from 'tinycolor2'
+
+import { EmojiIndex, Picker } from 'emoji-mart-vue-fast/src'
+
+const props = defineProps<{
+  hue?: number | undefined
+  size?: 'small' | 'medium' | 'large' | 'xlarge'
+  readonly?: boolean
+  disableClearing?: boolean
+}>()
+
+const emit = defineEmits(['colorSelected'])
+
+const { hue: initialHue, size = 'medium', readonly } = props
+
+const hueData = [199, 24, 41, 141, 224, 3, 317, 271, 332]
+
+const clearable = computed(() => {
+  return !props.disableClearing && !readonly
+})
+
+const isOpen = ref(false)
+
+const isOpenHuePicker = ref(false)
+
+const colorRef = ref(
+  initialHue !== undefined
+    ? {
+        hsv: {
+          a: 1,
+          h: initialHue,
+          s: 0,
+          v: 0,
+        },
+      }
+    : '',
+)
+
+function selectColor(hue: number) {
+  emit('colorSelected', hue)
+
+  isOpenHuePicker.value = false
+  isOpen.value = false
+}
+
+const onClick = (e: Event) => {
+  if (readonly) return
+
+  e.stopPropagation()
+
+  isOpen.value = !isOpen.value
+}
+
+// Due to calculation of dropdown position by ant dropdown, we need to delay the isOpen change
+// otherwise dropdown opening will be slow
+const debounceIsOpen = ref(false)
+watch(isOpen, () => {
+  if (!isOpen.value) {
+    debounceIsOpen.value = isOpen.value
+    return
+  }
+
+  setTimeout(() => {
+    debounceIsOpen.value = isOpen.value
+  }, 10)
+})
+
+const showClearButton = computed(() => {
+  return !!colorRef.value && clearable.value
+})
+
+watchEffect(() => {
+  console.log('hue', tinycolor(`hsv(${colorRef.value?.hsv?.h || 'none'}, 100%, 30%)`).toHexString(), colorRef.value)
+})
+</script>
+
+<template>
+  <a-dropdown v-model:visible="isOpen" :trigger="['click']" :disabled="readonly">
+    <div
+      class="flex flex-row justify-center items-center select-none rounded-md nc-emoji"
+      :class="{
+        'hover:bg-gray-500 hover:bg-opacity-15 cursor-pointer': !readonly,
+        'bg-gray-500 bg-opacity-15': isOpen,
+        'h-6 w-6 text-lg': size === 'small',
+        'h-8 w-8 text-xl': size === 'medium',
+        'h-10 w-10 text-2xl': size === 'large',
+        'h-14 w-16 text-5xl': size === 'xlarge',
+      }"
+      @click="onClick"
+    >
+      <template v-if="!colorRef">
+        <slot name="default" />
+      </template>
+      <template v-else>
+        <svg width="16" height="16" viewBox="0 0 1073 1073" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <mask
+            id="mask0_1749_80944"
+            style="mask-type: luminance"
+            maskUnits="userSpaceOnUse"
+            x="94"
+            y="40"
+            width="885"
+            height="993"
+          >
+            <path d="M978.723 40H94V1033H978.723V40Z" fill="white" />
+          </mask>
+          <g mask="url(#mask0_1749_80944)">
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
+              :fill="tinycolor(`hsv(${colorRef?.hsv?.h || 'none'}, 100%, 30%)`).toHexString()"
+            />
+            <path
+              fill-rule="evenodd"
+              clip-rule="evenodd"
+              d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
+              :fill="tinycolor(`hsv(${colorRef?.hsv?.h || 'none'}, 30%, 100%)`).toHexString()"
+            />
+          </g>
+        </svg>
+      </template>
+    </div>
+    <template #overlay>
+      <div
+        class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg"
+        :class="{
+          clearable: showClearButton,
+        }"
+      >
+        <div class="w-[164px] flex flex-wrap">
+          <div
+            v-for="(hue, i) of hueData"
+            :key="i"
+            class="p-1 rounded cursor-pointer hover:bg-gray-200"
+            :class="i > 4 ? 'mt-3' : ''"
+          >
+            <div
+              class="rounded h-6 w-6"
+              :style="{
+                backgroundColor: tinycolor(`hsv(${hue}, 30%, 100%) `).toHexString(),
+              }"
+            ></div>
+          </div>
+
+          <a-dropdown
+            v-model:visible="isOpenHuePicker"
+            :trigger="['click']"
+            :disabled="readonly"
+            placement="bottom"
+            overlayClassName="!left-8.5"
+          >
+            <div class="p-1 rounded cursor-pointer hover:bg-gray-200 mt-3">
+              <div
+                class="rounded overflow-hidden h-6 w-6"
+                :style="{
+                  backgroundColor: tinycolor(`hsv(${hue}, 30%, 100%) `).toHexString(),
+                }"
+              >
+                <img src="~/assets/img/hue-colors.png" class="" alt="Hue picker" />
+              </div>
+            </div>
+            <template #overlay>
+              <div
+                class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg flex flex-col space-y-3"
+                :class="{
+                  clearable: showClearButton,
+                }"
+              >
+                <div class="text-sm font-semibold">Custom Hue</div>
+                <Slider v-model="colorRef" class="nc-hue-color-picker" :disable-fields="true" />
+
+                <div class="flex items-center justify-end">
+                  <NcButton type="secondary" size="small" @click="selectColor(colorRef?.hsv?.h)"> Apply </NcButton>
+                </div>
+              </div>
+            </template>
+          </a-dropdown>
+        </div>
+      </div>
+    </template>
+  </a-dropdown>
+</template>
+
+<style lang="scss">
+.clearable {
+  .emoji-mart-search {
+    @apply pr-22;
+  }
+}
+
+.nc-hue-color-picker {
+  .vc-slider-swatches {
+    @apply hidden;
+  }
+  .vc-hue {
+    @apply rounded-lg;
+  }
+}
+</style>

From c5cda2b2af256761b1a8fd90d5a3299708c36155 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:55 +0000
Subject: [PATCH 155/253] fix(nc-gui): base color setup

---
 .../components/general/BaseColorPicker.vue    | 90 +++++++++++--------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseColorPicker.vue b/packages/nc-gui/components/general/BaseColorPicker.vue
index 1634cdbaf5..7892a39ffc 100644
--- a/packages/nc-gui/components/general/BaseColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseColorPicker.vue
@@ -1,11 +1,7 @@
 <script lang="ts" setup>
-import data from 'emoji-mart-vue-fast/data/apple.json'
-import 'emoji-mart-vue-fast/css/emoji-mart.css'
 import { Slider } from '@ckpack/vue-color'
-import { Icon } from '@iconify/vue'
 import tinycolor from 'tinycolor2'
-
-import { EmojiIndex, Picker } from 'emoji-mart-vue-fast/src'
+import { ProjectInj } from '#imports'
 
 const props = defineProps<{
   hue?: number | undefined
@@ -16,10 +12,14 @@ const props = defineProps<{
 
 const emit = defineEmits(['colorSelected'])
 
-const { hue: initialHue, size = 'medium', readonly } = props
+const { hue, size = 'medium', readonly } = props
 
 const hueData = [199, 24, 41, 141, 224, 3, 317, 271, 332]
 
+const base = inject(ProjectInj)!
+
+const localHue = ref(hue)
+
 const clearable = computed(() => {
   return !props.disableClearing && !readonly
 })
@@ -28,21 +28,35 @@ const isOpen = ref(false)
 
 const isOpenHuePicker = ref(false)
 
-const colorRef = ref(
-  initialHue !== undefined
+const colorRefs = ref(
+  localHue.value !== undefined
     ? {
-        hsv: {
-          a: 1,
-          h: initialHue,
-          s: 0,
-          v: 0,
-        },
+        h: localHue.value,
+        s: 0,
+        v: 0,
       }
-    : '',
+    : undefined,
 )
 
-function selectColor(hue: number) {
-  emit('colorSelected', hue)
+const colorRef = computed({
+  get: () => {
+    return localHue.value !== undefined
+      ? {
+          h: localHue.value,
+          s: 0,
+          v: 0,
+        }
+      : undefined
+  },
+  set: (val) => {
+    localHue.value = val?.hsv?.h
+  },
+})
+
+function selectColor(value: number) {
+  localHue.value = value
+
+  emit('colorSelected', value)
 
   isOpenHuePicker.value = false
   isOpen.value = false
@@ -56,26 +70,14 @@ const onClick = (e: Event) => {
   isOpen.value = !isOpen.value
 }
 
-// Due to calculation of dropdown position by ant dropdown, we need to delay the isOpen change
-// otherwise dropdown opening will be slow
-const debounceIsOpen = ref(false)
-watch(isOpen, () => {
-  if (!isOpen.value) {
-    debounceIsOpen.value = isOpen.value
-    return
-  }
-
-  setTimeout(() => {
-    debounceIsOpen.value = isOpen.value
-  }, 10)
-})
-
 const showClearButton = computed(() => {
-  return !!colorRef.value && clearable.value
+  return colorRef.value?.h !== undefined && clearable.value
 })
 
-watchEffect(() => {
-  console.log('hue', tinycolor(`hsv(${colorRef.value?.hsv?.h || 'none'}, 100%, 30%)`).toHexString(), colorRef.value)
+watch(isOpenHuePicker, () => {
+  if (!isOpenHuePicker.value && localHue.value !== parseProp(base.value.meta).iconHue) {
+    localHue.value = parseProp(base.value.meta).iconHue
+  }
 })
 </script>
 
@@ -93,7 +95,7 @@ watchEffect(() => {
       }"
       @click="onClick"
     >
-      <template v-if="!colorRef">
+      <template v-if="hue === undefined">
         <slot name="default" />
       </template>
       <template v-else>
@@ -114,13 +116,13 @@ watchEffect(() => {
               fill-rule="evenodd"
               clip-rule="evenodd"
               d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
-              :fill="tinycolor(`hsv(${colorRef?.hsv?.h || 'none'}, 100%, 30%)`).toHexString()"
+              :fill="tinycolor(`hsv(${colorRef?.h || 'none'}, 100%, 30%)`).toHexString()"
             />
             <path
               fill-rule="evenodd"
               clip-rule="evenodd"
               d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
-              :fill="tinycolor(`hsv(${colorRef?.hsv?.h || 'none'}, 30%, 100%)`).toHexString()"
+              :fill="tinycolor(`hsv(${colorRef?.h || 'none'}, 30%, 100%)`).toHexString()"
             />
           </g>
         </svg>
@@ -145,6 +147,7 @@ watchEffect(() => {
               :style="{
                 backgroundColor: tinycolor(`hsv(${hue}, 30%, 100%) `).toHexString(),
               }"
+              @click="selectColor(hue)"
             ></div>
           </div>
 
@@ -173,10 +176,19 @@ watchEffect(() => {
                 }"
               >
                 <div class="text-sm font-semibold">Custom Hue</div>
-                <Slider v-model="colorRef" class="nc-hue-color-picker" :disable-fields="true" />
+                <Slider
+                  :model-value="colorRef"
+                  class="nc-hue-color-picker"
+                  :disable-fields="true"
+                  @update:model-value="
+                    (value) => {
+                      console.log('update', value)
+                    }
+                  "
+                />
 
                 <div class="flex items-center justify-end">
-                  <NcButton type="secondary" size="small" @click="selectColor(colorRef?.hsv?.h)"> Apply </NcButton>
+                  <NcButton type="secondary" size="small" @click="selectColor(localHue)"> Apply </NcButton>
                 </div>
               </div>
             </template>

From 5a7ed8904f39a0f9a3fb944870867f6e527b687c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:55 +0000
Subject: [PATCH 156/253] feat(nc-gui): custom base icon color ee

---
 .../components/general/BaseColorPicker.vue    | 162 ++++++++++--------
 packages/nc-gui/lang/en.json                  |   6 +-
 2 files changed, 99 insertions(+), 69 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseColorPicker.vue b/packages/nc-gui/components/general/BaseColorPicker.vue
index 7892a39ffc..368f17954f 100644
--- a/packages/nc-gui/components/general/BaseColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseColorPicker.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { Slider } from '@ckpack/vue-color'
 import tinycolor from 'tinycolor2'
-import { ProjectInj } from '#imports'
 
 const props = defineProps<{
   hue?: number | undefined
@@ -16,45 +15,34 @@ const { hue, size = 'medium', readonly } = props
 
 const hueData = [199, 24, 41, 141, 224, 3, 317, 271, 332]
 
-const base = inject(ProjectInj)!
-
-const localHue = ref(hue)
-
-const clearable = computed(() => {
-  return !props.disableClearing && !readonly
-})
+const defaultHueValue = {
+  h: 0,
+  s: 0,
+  v: 0,
+}
 
 const isOpen = ref(false)
 
 const isOpenHuePicker = ref(false)
 
-const colorRefs = ref(
-  localHue.value !== undefined
+const colorRef = ref(
+  hue !== undefined && hue !== null
     ? {
-        h: localHue.value,
-        s: 0,
-        v: 0,
+        ...defaultHueValue,
+        h: hue,
       }
     : undefined,
 )
 
-const colorRef = computed({
-  get: () => {
-    return localHue.value !== undefined
-      ? {
-          h: localHue.value,
-          s: 0,
-          v: 0,
-        }
-      : undefined
-  },
-  set: (val) => {
-    localHue.value = val?.hsv?.h
-  },
-})
-
-function selectColor(value: number) {
-  localHue.value = value
+function selectColor(value: number | null) {
+  if (value === null) {
+    colorRef.value = undefined
+  } else {
+    colorRef.value = {
+      ...defaultHueValue,
+      h: value,
+    }
+  }
 
   emit('colorSelected', value)
 
@@ -70,15 +58,24 @@ const onClick = (e: Event) => {
   isOpen.value = !isOpen.value
 }
 
-const showClearButton = computed(() => {
-  return colorRef.value?.h !== undefined && clearable.value
-})
-
-watch(isOpenHuePicker, () => {
-  if (!isOpenHuePicker.value && localHue.value !== parseProp(base.value.meta).iconHue) {
-    localHue.value = parseProp(base.value.meta).iconHue
-  }
-})
+watch(
+  isOpenHuePicker,
+  () => {
+    if (!isOpenHuePicker.value && colorRef.value?.h !== hue) {
+      if (isNaN(parseFloat(`${hue}`))) {
+        colorRef.value = undefined
+      } else {
+        colorRef.value = {
+          ...defaultHueValue,
+          h: hue as number,
+        }
+      }
+    }
+  },
+  {
+    immediate: true,
+  },
+)
 </script>
 
 <template>
@@ -95,7 +92,7 @@ watch(isOpenHuePicker, () => {
       }"
       @click="onClick"
     >
-      <template v-if="hue === undefined">
+      <template v-if="colorRef?.h === undefined">
         <slot name="default" />
       </template>
       <template v-else>
@@ -129,25 +126,25 @@ watch(isOpenHuePicker, () => {
       </template>
     </div>
     <template #overlay>
-      <div
-        class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg"
-        :class="{
-          clearable: showClearButton,
-        }"
-      >
+      <div class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg">
         <div class="w-[164px] flex flex-wrap">
           <div
-            v-for="(hue, i) of hueData"
+            v-for="(h, i) of hueData"
             :key="i"
-            class="p-1 rounded cursor-pointer hover:bg-gray-200"
-            :class="i > 4 ? 'mt-3' : ''"
+            class="nc-pre-defined-hue-item p-1 rounded cursor-pointer hover:bg-gray-200"
+            :class="{
+              'mt-3': i > 4,
+            }"
           >
             <div
               class="rounded h-6 w-6"
+              :class="{
+                selected: h === hue,
+              }"
               :style="{
-                backgroundColor: tinycolor(`hsv(${hue}, 30%, 100%) `).toHexString(),
+                backgroundColor: tinycolor(`hsv(${h}, 30%, 100%) `).toHexString(),
               }"
-              @click="selectColor(hue)"
+              @click="selectColor(h)"
             ></div>
           </div>
 
@@ -156,11 +153,19 @@ watch(isOpenHuePicker, () => {
             :trigger="['click']"
             :disabled="readonly"
             placement="bottom"
-            overlayClassName="!left-8.5"
+            overlayClassName="!left-9"
           >
-            <div class="p-1 rounded cursor-pointer hover:bg-gray-200 mt-3">
+            <div
+              class="nc-custom-hue-picker-item p-1 rounded cursor-pointer hover:bg-gray-200 mt-3"
+              :class="{
+                'bg-gray-200': isOpenHuePicker,
+              }"
+            >
               <div
                 class="rounded overflow-hidden h-6 w-6"
+                :class="{
+                  selected: hue !== undefined && hue !== null && !hueData.includes(hue),
+                }"
                 :style="{
                   backgroundColor: tinycolor(`hsv(${hue}, 30%, 100%) `).toHexString(),
                 }"
@@ -169,49 +174,72 @@ watch(isOpenHuePicker, () => {
               </div>
             </div>
             <template #overlay>
-              <div
-                class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg flex flex-col space-y-3"
-                :class="{
-                  clearable: showClearButton,
-                }"
-              >
-                <div class="text-sm font-semibold">Custom Hue</div>
+              <div class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg flex flex-col space-y-4">
+                <div class="text-sm font-semibold">{{ $t('labels.customHue') }}</div>
+
                 <Slider
                   :model-value="colorRef"
                   class="nc-hue-color-picker"
+                  :style="{
+                    ['--nc-hue-slider-pointer-color']: tinycolor(`hsv(${colorRef?.h}, 100%, 100%)`).toHexString(),
+                  }"
                   :disable-fields="true"
                   @update:model-value="
                     (value) => {
-                      console.log('update', value)
+                      if (value?.hsv?.h === undefined) return
+                      colorRef = {
+                        ...defaultHueValue,
+                        h: +value.hsv.h,
+                      }
                     }
                   "
                 />
 
                 <div class="flex items-center justify-end">
-                  <NcButton type="secondary" size="small" @click="selectColor(localHue)"> Apply </NcButton>
+                  <NcButton type="secondary" size="small" @click="selectColor(colorRef?.h || 0)">
+                    {{ $t('general.apply') }}
+                  </NcButton>
                 </div>
               </div>
             </template>
           </a-dropdown>
         </div>
+
+        <div class="mt-3 flex items-center justify-end">
+          <NcButton type="secondary" size="small" @click.stop="selectColor(null)"> {{ $t('general.remove') }} </NcButton>
+        </div>
       </div>
     </template>
   </a-dropdown>
 </template>
 
-<style lang="scss">
-.clearable {
-  .emoji-mart-search {
-    @apply pr-22;
+<style lang="scss" scoped>
+.nc-pre-defined-hue-item,
+.nc-custom-hue-picker-item {
+  .selected {
+    box-shadow: 0 0 0 2px #fff, 0 0 0 4px #3069fe;
   }
 }
 
-.nc-hue-color-picker {
+:deep(.nc-hue-color-picker) {
+  &.vc-slider {
+    width: 297px;
+  }
   .vc-slider-swatches {
     @apply hidden;
   }
   .vc-hue {
     @apply rounded-lg;
   }
+  .vc-slider-hue-warp {
+    height: 6px;
+    .vc-hue-pointer {
+      top: -3px !important;
+    }
+    .vc-hue-picker {
+      background-color: white;
+      box-shadow: 0 0 0 3px var(--nc-hue-slider-pointer-color) !important;
+    }
+  }
 }
 </style>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 36d7238165..93783fee1b 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -698,7 +699,8 @@
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
     "limitOptions": "Limit ptions",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
-    "clearSelection": "Clear selection"
+    "clearSelection": "Clear selection",
+    "customHue": "Custom Hue"
   },
   "activity": {
     "noRange": "Calendar view requires a date range",

From 25dfa8973490639bcf4be523eeb39b281da54954 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:55 +0000
Subject: [PATCH 157/253] feat(nc-gui): add base icon color support

---
 .../dashboard/TreeView/ProjectNode.vue        | 28 +++++----
 .../components/general/BaseColorPicker.vue    | 44 +++++++++-----
 packages/nc-gui/lib/constants.ts              | 60 +++++++++++++++++++
 3 files changed, 105 insertions(+), 27 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 0230f38925..c4662746c2 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -172,16 +172,16 @@ defineExpose({
   enableEditMode,
 })
 
-const setIcon = async (icon: string, base: BaseType) => {
+const setColor = async (hue: number, base: BaseType) => {
   try {
     const meta = {
-      ...((base.meta as object) || {}),
-      icon,
+      ...parseProp(base.meta),
+      iconHue: hue,
     }
 
     basesStore.updateProject(base.id!, { meta: JSON.stringify(meta) })
 
-    $e('a:base:icon:navdraw', { icon })
+    $e('a:base:icon:color:navdraw', { iconHue: hue })
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
   }
@@ -385,6 +385,10 @@ const projectDelete = () => {
   isProjectDeleteDialogVisible.value = true
   $e('c:project:delete')
 }
+
+watchEffect(() => {
+  console.log('base', base.value)
+})
 </script>
 
 <template>
@@ -423,16 +427,18 @@ const projectDelete = () => {
             <div v-e="['c:base:emojiSelect']" class="flex items-center select-none w-6 h-full">
               <a-spin v-if="base.isLoading" class="!ml-1.25 !flex !flex-row !items-center !my-0.5 w-8" :indicator="indicator" />
 
-              <LazyGeneralEmojiPicker
+              <LazyGeneralBaseColorPicker
                 v-else
-                :key="base.meta?.icon"
-                :emoji="base.meta?.icon"
-                :readonly="true"
+                :key="parseProp(base.meta).iconHue"
+                :hue="parseProp(base.meta).iconHue"
                 size="small"
-                @emoji-selected="setIcon($event, base)"
+                :readonly="base.type && base.type !== 'database'"
+                @color-selected="setColor($event, base)"
               >
-                <GeneralProjectIcon :type="base.type" />
-              </LazyGeneralEmojiPicker>
+                <template #default>
+                  <GeneralProjectIcon :type="base.type" />
+                </template>
+              </LazyGeneralBaseColorPicker>
             </div>
           </div>
 
diff --git a/packages/nc-gui/components/general/BaseColorPicker.vue b/packages/nc-gui/components/general/BaseColorPicker.vue
index 368f17954f..f6b2e3bfff 100644
--- a/packages/nc-gui/components/general/BaseColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseColorPicker.vue
@@ -2,8 +2,10 @@
 import { Slider } from '@ckpack/vue-color'
 import tinycolor from 'tinycolor2'
 
+import { BASE_ICON_COLOR_HUE_DATA as preDefinedHueData } from '#imports'
+
 const props = defineProps<{
-  hue?: number | undefined
+  hue?: number | null
   size?: 'small' | 'medium' | 'large' | 'xlarge'
   readonly?: boolean
   disableClearing?: boolean
@@ -13,8 +15,6 @@ const emit = defineEmits(['colorSelected'])
 
 const { hue, size = 'medium', readonly } = props
 
-const hueData = [199, 24, 41, 141, 224, 3, 317, 271, 332]
-
 const defaultHueValue = {
   h: 0,
   s: 0,
@@ -92,7 +92,7 @@ watch(
       }"
       @click="onClick"
     >
-      <template v-if="colorRef?.h === undefined">
+      <template v-if="hue === undefined || hue === null">
         <slot name="default" />
       </template>
       <template v-else>
@@ -113,13 +113,29 @@ watch(
               fill-rule="evenodd"
               clip-rule="evenodd"
               d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
-              :fill="tinycolor(`hsv(${colorRef?.h || 'none'}, 100%, 30%)`).toHexString()"
+              :fill="
+                tinycolor(
+                  preDefinedHueData[`_${colorRef?.h}`]
+                    ? `hsv(${preDefinedHueData[`_${colorRef?.h}`].shade.h},${preDefinedHueData[`_${colorRef?.h}`].shade.s}%, ${
+                        preDefinedHueData[`_${colorRef?.h}`].shade.v
+                      }%)`
+                    : `hsv(${colorRef?.h || 'none'}, 100%, 30%)`,
+                ).toHexString()
+              "
             />
             <path
               fill-rule="evenodd"
               clip-rule="evenodd"
               d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
-              :fill="tinycolor(`hsv(${colorRef?.h || 'none'}, 30%, 100%)`).toHexString()"
+              :fill="
+                tinycolor(
+                  preDefinedHueData[`_${colorRef?.h}`]
+                    ? `hsv(${preDefinedHueData[`_${colorRef?.h}`].tint.h},${preDefinedHueData[`_${colorRef?.h}`].tint.s}%, ${
+                        preDefinedHueData[`_${colorRef?.h}`].tint.v
+                      }%)`
+                    : `hsv(${colorRef?.h || 'none'}, 30%, 100%)`,
+                ).toHexString()
+              "
             />
           </g>
         </svg>
@@ -129,7 +145,7 @@ watch(
       <div class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg">
         <div class="w-[164px] flex flex-wrap">
           <div
-            v-for="(h, i) of hueData"
+            v-for="(h, i) of Object.keys(preDefinedHueData)"
             :key="i"
             class="nc-pre-defined-hue-item p-1 rounded cursor-pointer hover:bg-gray-200"
             :class="{
@@ -139,12 +155,12 @@ watch(
             <div
               class="rounded h-6 w-6"
               :class="{
-                selected: h === hue,
+                selected: preDefinedHueData[h].tint.h === hue || (h === '_199' && (hue === undefined || hue === null)),
               }"
               :style="{
-                backgroundColor: tinycolor(`hsv(${h}, 30%, 100%) `).toHexString(),
+                backgroundColor: preDefinedHueData[h].pickerColor,
               }"
-              @click="selectColor(h)"
+              @click="selectColor(preDefinedHueData[h].tint.h)"
             ></div>
           </div>
 
@@ -153,7 +169,7 @@ watch(
             :trigger="['click']"
             :disabled="readonly"
             placement="bottom"
-            overlayClassName="!left-9"
+            overlay-class-name="!left-9"
           >
             <div
               class="nc-custom-hue-picker-item p-1 rounded cursor-pointer hover:bg-gray-200 mt-3"
@@ -164,7 +180,7 @@ watch(
               <div
                 class="rounded overflow-hidden h-6 w-6"
                 :class="{
-                  selected: hue !== undefined && hue !== null && !hueData.includes(hue),
+                  selected: hue !== undefined && hue !== null && !preDefinedHueData[`_${hue}`],
                 }"
                 :style="{
                   backgroundColor: tinycolor(`hsv(${hue}, 30%, 100%) `).toHexString(),
@@ -204,10 +220,6 @@ watch(
             </template>
           </a-dropdown>
         </div>
-
-        <div class="mt-3 flex items-center justify-end">
-          <NcButton type="secondary" size="small" @click.stop="selectColor(null)"> {{ $t('general.remove') }} </NcButton>
-        </div>
       </div>
     </template>
   </a-dropdown>
diff --git a/packages/nc-gui/lib/constants.ts b/packages/nc-gui/lib/constants.ts
index f8257bebfa..653db51438 100644
--- a/packages/nc-gui/lib/constants.ts
+++ b/packages/nc-gui/lib/constants.ts
@@ -18,3 +18,63 @@ export const GROUP_BY_VARS = {
     __nc_false__: 'Unchecked',
   } as Record<string, string>,
 }
+
+export const BASE_ICON_COLOR_HUE_DATA: Record<
+  string,
+  { tint: { h: number; s: number; v: number }; shade: { h: number; s: number; v: number }; pickerColor: string }
+> = {
+  // blue
+  _199: {
+    tint: { h: 199, s: 79, v: 100 },
+    shade: { h: 255, s: 80, v: 40 },
+    pickerColor: '#36BFFF',
+  },
+  // orange
+  _24: {
+    tint: { h: 24, s: 64, v: 98 },
+    shade: { h: 24, s: 81, v: 59 },
+    pickerColor: '#FA8231',
+  },
+  // yellow
+  _41: {
+    tint: { h: 41, s: 62, v: 99 },
+    shade: { h: 41, s: 77, v: 40 },
+    pickerColor: '#FCBE3A',
+  },
+  // green
+  _141: {
+    tint: { h: 141, s: 63, v: 87 },
+    shade: { h: 141, s: 81, v: 34 },
+    pickerColor: '#27D665',
+  },
+  // gray
+  _217: {
+    tint: { h: 217, s: 12, v: 69 },
+    shade: { h: 217, s: 32, v: 32 },
+    pickerColor: '#6A7184',
+  },
+  // red
+  _4: {
+    tint: { h: 4, s: 60, v: 100 },
+    shade: { h: 4, s: 74, v: 49 },
+    pickerColor: '#FF4A3F',
+  },
+  // pink
+  _317: {
+    tint: { h: 317, s: 62, v: 99 },
+    shade: { h: 317, s: 77, v: 40 },
+    pickerColor: '#FC3AC6',
+  },
+  // purple
+  _271: {
+    tint: { h: 271, s: 62, v: 84 },
+    shade: { h: 271, s: 82, v: 32 },
+    pickerColor: '#7D26CD',
+  },
+  // maroon
+  _332: {
+    tint: { h: 332, s: 58, v: 83 },
+    shade: { h: 332, s: 93, v: 41 },
+    pickerColor: '#B33771',
+  },
+}

From 79bc28c76521fd8fa08de21c468664c0f8aec269 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:56 +0000
Subject: [PATCH 158/253] fix(nc-gui): replace base icon from all places except
 sidebar

---
 .../nc-gui/components/dlg/ProjectDelete.vue   | 13 ++++++++++-
 .../dlg/share-and-collaborate/View.vue        | 13 ++++++++++-
 .../components/general/BaseColorPicker.vue    |  3 ++-
 packages/nc-gui/components/project/View.vue   | 12 +++++++++-
 .../components/workspace/ProjectList.vue      | 23 +++++++++++--------
 5 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui/components/dlg/ProjectDelete.vue b/packages/nc-gui/components/dlg/ProjectDelete.vue
index 2060e11685..453b936316 100644
--- a/packages/nc-gui/components/dlg/ProjectDelete.vue
+++ b/packages/nc-gui/components/dlg/ProjectDelete.vue
@@ -52,7 +52,18 @@ const onDelete = async () => {
   <GeneralDeleteModal v-model:visible="visible" :entity-name="$t('objects.project')" :on-delete="onDelete">
     <template #entity-preview>
       <div v-if="base" class="flex flex-row items-center py-2 px-2.25 bg-gray-50 rounded-lg text-gray-700 mb-4">
-        <GeneralProjectIcon :type="base.type" class="nc-view-icon px-1.5 w-10" />
+        <LazyGeneralBaseColorPicker
+          :key="parseProp(base.meta).iconHue"
+          :hue="parseProp(base.meta).iconHue"
+          size="small"
+          class="!w-auto !h-auto"
+          iconClass="nc-view-icon w-6 h-6"
+          readonly
+        >
+          <template #default>
+            <GeneralProjectIcon :type="base.type" class="nc-view-icon w-6 h-6" />
+          </template>
+        </LazyGeneralBaseColorPicker>
         <div
           class="capitalize text-ellipsis overflow-hidden select-none w-full pl-1.75"
           :style="{ wordBreak: 'keep-all', whiteSpace: 'nowrap', display: 'inline' }"
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
index 6a643517fc..c8fb3b437a 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
@@ -154,7 +154,18 @@ watch(showShareModal, (val) => {
       </div>
       <div class="share-base">
         <div class="flex flex-row items-center gap-x-2 px-4 pt-3 pb-3 select-none">
-          <GeneralProjectIcon :type="base.type" class="nc-view-icon group-hover" />
+          <LazyGeneralBaseColorPicker
+            :key="parseProp(base.meta).iconHue"
+            :hue="parseProp(base.meta).iconHue"
+            size="small"
+            class="!w-auto !h-auto"
+            iconClass="nc-view-icon group-hover"
+            readonly
+          >
+            <template #default>
+              <GeneralProjectIcon :type="base.type" class="nc-view-icon group-hover" />
+            </template>
+          </LazyGeneralBaseColorPicker>
 
           <div>{{ $t('activity.shareBase.label') }}</div>
           <div
diff --git a/packages/nc-gui/components/general/BaseColorPicker.vue b/packages/nc-gui/components/general/BaseColorPicker.vue
index f6b2e3bfff..629ae36771 100644
--- a/packages/nc-gui/components/general/BaseColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseColorPicker.vue
@@ -9,6 +9,7 @@ const props = defineProps<{
   size?: 'small' | 'medium' | 'large' | 'xlarge'
   readonly?: boolean
   disableClearing?: boolean
+  iconClass?: string
 }>()
 
 const emit = defineEmits(['colorSelected'])
@@ -96,7 +97,7 @@ watch(
         <slot name="default" />
       </template>
       <template v-else>
-        <svg width="16" height="16" viewBox="0 0 1073 1073" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <svg width="16" height="16" viewBox="0 0 1073 1073" fill="none" xmlns="http://www.w3.org/2000/svg" :class="iconClass">
           <mask
             id="mask0_1749_80944"
             style="mask-type: luminance"
diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index 5ecfe7182a..10af414156 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -82,7 +82,17 @@ watch(
       <div class="flex flex-row items-center gap-x-3">
         <GeneralOpenLeftSidebarBtn />
         <div class="flex flex-row items-center h-full gap-x-2.5">
-          <GeneralProjectIcon :type="openedProject?.type" />
+          <LazyGeneralBaseColorPicker
+            :key="parseProp(openedProject?.meta).iconHue"
+            :hue="parseProp(openedProject?.meta).iconHue"
+            size="small"
+            class="!w-auto !h-auto"
+            readonly
+          >
+            <template #default>
+              <GeneralProjectIcon :type="openedProject?.type" />
+            </template>
+          </LazyGeneralBaseColorPicker>
           <NcTooltip class="flex font-medium text-sm capitalize truncate max-w-150" show-on-truncate-only>
             <template #title> {{ openedProject?.title }}</template>
             <span class="truncate">
diff --git a/packages/nc-gui/components/workspace/ProjectList.vue b/packages/nc-gui/components/workspace/ProjectList.vue
index 51fc654993..9563d2bbe0 100644
--- a/packages/nc-gui/components/workspace/ProjectList.vue
+++ b/packages/nc-gui/components/workspace/ProjectList.vue
@@ -17,6 +17,7 @@ import {
   useNuxtApp,
   useRoles,
   useWorkspace,
+  parseProp,
 } from '#imports'
 
 const workspaceStore = useWorkspace()
@@ -181,16 +182,16 @@ function onProjectTitleClick(index: number) {
   }
 }
 
-const setIcon = async (icon: string, base: BaseType) => {
+const setColor = async (hue: number, base: BaseType) => {
   try {
     const meta = {
-      ...((base.meta as object) || {}),
-      icon,
+      ...parseProp(base.meta),
+      iconHue: hue,
     }
 
     basesStore.updateProject(base.id!, { meta: JSON.stringify(meta) })
 
-    $e('a:base:icon:navdraw', { icon })
+    $e('a:base:icon:color:navdraw', { iconHue: hue })
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
   }
@@ -250,15 +251,17 @@ const setIcon = async (icon: string, base: BaseType) => {
         <template v-if="column.dataIndex === 'title'">
           <div class="flex items-center nc-base-title gap-2.5 max-w-full -ml-1.5">
             <div class="flex items-center gap-2 text-center">
-              <LazyGeneralEmojiPicker
-                :key="record.id"
-                :emoji="record.meta?.icon"
+              <LazyGeneralBaseColorPicker
+                :key="parseProp(record.meta).iconHue"
+                :hue="parseProp(record.meta).iconHue"
                 size="small"
                 readonly
-                @emoji-selected="setIcon($event, record)"
+                @color-selected="setColor($event, record)"
               >
-                <GeneralProjectIcon :type="record.type" />
-              </LazyGeneralEmojiPicker>
+                <template #default>
+                  <GeneralProjectIcon :type="record.type" />
+                </template>
+              </LazyGeneralBaseColorPicker>
               <!-- todo: replace with switch -->
             </div>
 

From d68c20cf2ee97c60e2e77e17cbe09846e5c6ac0a Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:56 +0000
Subject: [PATCH 159/253] fix(nc-gui): error on clicking custom hue option

---
 .../dashboard/TreeView/ProjectNode.vue        | 10 +--
 .../components/general/BaseColorPicker.vue    | 67 ++++++++-----------
 packages/nc-gui/store/bases.ts                |  2 +-
 3 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index c4662746c2..5b5af004b4 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -235,7 +235,7 @@ async function addNewProjectChildEntity() {
   isAddNewProjectChildEntityLoading.value = true
 
   const isProjectPopulated = basesStore.isProjectPopulated(base.value.id!)
-  if (!isProjectPopulated && base.value.type === NcProjectType.DB) {
+  if (!isProjectPopulated && base.value?.type === NcProjectType.DB) {
     // We do not wait for tables api, so that add new table is seamless.
     // Only con would be while saving table duplicate table name FE validation might not work
     // If the table list api takes time to load before the table name validation
@@ -245,7 +245,7 @@ async function addNewProjectChildEntity() {
   try {
     openTableCreateDialog()
 
-    if (!base.value.isExpanded && base.value.type !== NcProjectType.DB) {
+    if (!base.value.isExpanded && base.value?.type !== NcProjectType.DB) {
       base.value.isExpanded = true
     }
   } finally {
@@ -432,11 +432,11 @@ watchEffect(() => {
                 :key="parseProp(base.meta).iconHue"
                 :hue="parseProp(base.meta).iconHue"
                 size="small"
-                :readonly="base.type && base.type !== 'database'"
+                :readonly="base?.type && base?.type !== 'database'"
                 @color-selected="setColor($event, base)"
               >
                 <template #default>
-                  <GeneralProjectIcon :type="base.type" />
+                  <GeneralProjectIcon :type="base?.type" />
                 </template>
               </LazyGeneralBaseColorPicker>
             </div>
@@ -739,7 +739,7 @@ watchEffect(() => {
     </div>
     <template v-if="!isSharedBase" #overlay>
       <NcMenu class="!py-0 rounded text-sm">
-        <template v-if="contextMenuTarget.type === 'base' && base.type === 'database'"></template>
+        <template v-if="contextMenuTarget.type === 'base' && base?.type === 'database'"></template>
 
         <template v-else-if="contextMenuTarget.type === 'source'"></template>
 
diff --git a/packages/nc-gui/components/general/BaseColorPicker.vue b/packages/nc-gui/components/general/BaseColorPicker.vue
index 629ae36771..2cb36efcea 100644
--- a/packages/nc-gui/components/general/BaseColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseColorPicker.vue
@@ -16,34 +16,25 @@ const emit = defineEmits(['colorSelected'])
 
 const { hue, size = 'medium', readonly } = props
 
-const defaultHueValue = {
+const defaultHueColor = {
   h: 0,
   s: 0,
   v: 0,
 }
 
+const defaultHueValue = 199
+
 const isOpen = ref(false)
 
 const isOpenHuePicker = ref(false)
 
-const colorRef = ref(
-  hue !== undefined && hue !== null
-    ? {
-        ...defaultHueValue,
-        h: hue,
-      }
-    : undefined,
-)
+const colorRef = ref({
+  ...defaultHueColor,
+  h: !(hue !== 0 && !hue) ? hue : defaultHueValue,
+})
 
-function selectColor(value: number | null) {
-  if (value === null) {
-    colorRef.value = undefined
-  } else {
-    colorRef.value = {
-      ...defaultHueValue,
-      h: value,
-    }
-  }
+function selectColor(value: number) {
+  colorRef.value.h = value
 
   emit('colorSelected', value)
 
@@ -63,13 +54,10 @@ watch(
   isOpenHuePicker,
   () => {
     if (!isOpenHuePicker.value && colorRef.value?.h !== hue) {
-      if (isNaN(parseFloat(`${hue}`))) {
-        colorRef.value = undefined
+      if (hue !== 0 && !hue) {
+        colorRef.value.h = defaultHueValue
       } else {
-        colorRef.value = {
-          ...defaultHueValue,
-          h: hue as number,
-        }
+        colorRef.value.h = hue
       }
     }
   },
@@ -91,9 +79,9 @@ watch(
         'h-10 w-10 text-2xl': size === 'large',
         'h-14 w-16 text-5xl': size === 'xlarge',
       }"
-      @click="onClick"
+      @click.stop="onClick"
     >
-      <template v-if="hue === undefined || hue === null">
+      <template v-if="hue !== 0 && !hue">
         <slot name="default" />
       </template>
       <template v-else>
@@ -116,11 +104,11 @@ watch(
               d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
               :fill="
                 tinycolor(
-                  preDefinedHueData[`_${colorRef?.h}`]
+                  preDefinedHueData && preDefinedHueData[`_${colorRef?.h}`]
                     ? `hsv(${preDefinedHueData[`_${colorRef?.h}`].shade.h},${preDefinedHueData[`_${colorRef?.h}`].shade.s}%, ${
                         preDefinedHueData[`_${colorRef?.h}`].shade.v
                       }%)`
-                    : `hsv(${colorRef?.h || 'none'}, 100%, 30%)`,
+                    : `hsv(${colorRef?.h ?? defaultHueValue}, 100%, 30%)`,
                 ).toHexString()
               "
             />
@@ -130,11 +118,11 @@ watch(
               d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
               :fill="
                 tinycolor(
-                  preDefinedHueData[`_${colorRef?.h}`]
+                  preDefinedHueData && preDefinedHueData[`_${colorRef?.h}`]
                     ? `hsv(${preDefinedHueData[`_${colorRef?.h}`].tint.h},${preDefinedHueData[`_${colorRef?.h}`].tint.s}%, ${
                         preDefinedHueData[`_${colorRef?.h}`].tint.v
                       }%)`
-                    : `hsv(${colorRef?.h || 'none'}, 30%, 100%)`,
+                    : `hsv(${colorRef?.h ?? defaultHueValue}, 30%, 100%)`,
                 ).toHexString()
               "
             />
@@ -156,7 +144,7 @@ watch(
             <div
               class="rounded h-6 w-6"
               :class="{
-                selected: preDefinedHueData[h].tint.h === hue || (h === '_199' && (hue === undefined || hue === null)),
+                selected: preDefinedHueData[h].tint.h === hue || (h === '_199' && hue !== 0 && !hue),
               }"
               :style="{
                 backgroundColor: preDefinedHueData[h].pickerColor,
@@ -192,28 +180,27 @@ watch(
             </div>
             <template #overlay>
               <div class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg flex flex-col space-y-4">
-                <div class="text-sm font-semibold">{{ $t('labels.customHue') }}</div>
+                <div>{{ $t('labels.customHue') }}</div>
 
                 <Slider
                   :model-value="colorRef"
                   class="nc-hue-color-picker"
                   :style="{
-                    ['--nc-hue-slider-pointer-color']: tinycolor(`hsv(${colorRef?.h}, 100%, 100%)`).toHexString(),
+                    ['--nc-hue-slider-pointer-color']: tinycolor(
+                      `hsv(${colorRef?.h ?? defaultHueValue}, 100%, 100%)`,
+                    ).toHexString(),
                   }"
-                  :disable-fields="true"
                   @update:model-value="
                     (value) => {
-                      if (value?.hsv?.h === undefined) return
-                      colorRef = {
-                        ...defaultHueValue,
-                        h: +value.hsv.h,
-                      }
+                      if (!value?.hsv?.h) return
+
+                      colorRef.h = value.hsv.h
                     }
                   "
                 />
 
                 <div class="flex items-center justify-end">
-                  <NcButton type="secondary" size="small" @click="selectColor(colorRef?.h || 0)">
+                  <NcButton type="secondary" size="small" @click="selectColor(colorRef?.h ?? defaultHueValue)">
                     {{ $t('general.apply') }}
                   </NcButton>
                 </div>
diff --git a/packages/nc-gui/store/bases.ts b/packages/nc-gui/store/bases.ts
index d83b05c261..69c720115b 100644
--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@@ -229,7 +229,7 @@ export const useBases = defineStore('basesStore', () => {
       ...baseUpdatePayload,
     }
 
-    bases.value.set(baseId, base)
+    bases.value.set(baseId, { ...base, meta: parseProp(base.meta) })
 
     await api.base.update(baseId, baseUpdatePayload)
 

From e196756381cbd71e8c0cf63fcb0dcc02eff2287b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:56 +0000
Subject: [PATCH 160/253] fix(nc-gui): remove optional chaining from base color
 picker

---
 .../components/general/BaseColorPicker.vue    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseColorPicker.vue b/packages/nc-gui/components/general/BaseColorPicker.vue
index 2cb36efcea..0f9381d702 100644
--- a/packages/nc-gui/components/general/BaseColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseColorPicker.vue
@@ -53,7 +53,7 @@ const onClick = (e: Event) => {
 watch(
   isOpenHuePicker,
   () => {
-    if (!isOpenHuePicker.value && colorRef.value?.h !== hue) {
+    if (!isOpenHuePicker.value && colorRef.value.h !== hue) {
       if (hue !== 0 && !hue) {
         colorRef.value.h = defaultHueValue
       } else {
@@ -81,7 +81,7 @@ watch(
       }"
       @click.stop="onClick"
     >
-      <template v-if="hue !== 0 && !hue">
+      <template v-if="hue !== 0 && !hue && colorRef.h === defaultHueValue">
         <slot name="default" />
       </template>
       <template v-else>
@@ -104,11 +104,11 @@ watch(
               d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
               :fill="
                 tinycolor(
-                  preDefinedHueData && preDefinedHueData[`_${colorRef?.h}`]
-                    ? `hsv(${preDefinedHueData[`_${colorRef?.h}`].shade.h},${preDefinedHueData[`_${colorRef?.h}`].shade.s}%, ${
-                        preDefinedHueData[`_${colorRef?.h}`].shade.v
+                  preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
+                    ? `hsv(${preDefinedHueData[`_${colorRef.h}`].shade.h},${preDefinedHueData[`_${colorRef.h}`].shade.s}%, ${
+                        preDefinedHueData[`_${colorRef.h}`].shade.v
                       }%)`
-                    : `hsv(${colorRef?.h ?? defaultHueValue}, 100%, 30%)`,
+                    : `hsv(${colorRef.h ?? defaultHueValue}, 100%, 30%)`,
                 ).toHexString()
               "
             />
@@ -118,11 +118,11 @@ watch(
               d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
               :fill="
                 tinycolor(
-                  preDefinedHueData && preDefinedHueData[`_${colorRef?.h}`]
-                    ? `hsv(${preDefinedHueData[`_${colorRef?.h}`].tint.h},${preDefinedHueData[`_${colorRef?.h}`].tint.s}%, ${
-                        preDefinedHueData[`_${colorRef?.h}`].tint.v
+                  preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
+                    ? `hsv(${preDefinedHueData[`_${colorRef.h}`].tint.h},${preDefinedHueData[`_${colorRef.h}`].tint.s}%, ${
+                        preDefinedHueData[`_${colorRef.h}`].tint.v
                       }%)`
-                    : `hsv(${colorRef?.h ?? defaultHueValue}, 30%, 100%)`,
+                    : `hsv(${colorRef.h ?? defaultHueValue}, 30%, 100%)`,
                 ).toHexString()
               "
             />
@@ -187,7 +187,7 @@ watch(
                   class="nc-hue-color-picker"
                   :style="{
                     ['--nc-hue-slider-pointer-color']: tinycolor(
-                      `hsv(${colorRef?.h ?? defaultHueValue}, 100%, 100%)`,
+                      `hsv(${colorRef.h ?? defaultHueValue}, 100%, 100%)`,
                     ).toHexString(),
                   }"
                   @update:model-value="
@@ -200,7 +200,7 @@ watch(
                 />
 
                 <div class="flex items-center justify-end">
-                  <NcButton type="secondary" size="small" @click="selectColor(colorRef?.h ?? defaultHueValue)">
+                  <NcButton type="secondary" size="small" @click="selectColor(colorRef.h ?? defaultHueValue)">
                     {{ $t('general.apply') }}
                   </NcButton>
                 </div>

From e3308123f7a49df87ae9f617595f38390aa58737 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:56 +0000
Subject: [PATCH 161/253] fix(nc-gui): rename baseColorPicker component name to
 baseIconColorPicker

---
 .../nc-gui/components/dashboard/TreeView/ProjectNode.vue  | 8 ++------
 packages/nc-gui/components/dlg/ProjectDelete.vue          | 6 +++---
 .../nc-gui/components/dlg/share-and-collaborate/View.vue  | 6 +++---
 .../{BaseColorPicker.vue => BaseIconColorPicker.vue}      | 0
 packages/nc-gui/components/project/View.vue               | 4 ++--
 packages/nc-gui/components/workspace/ProjectList.vue      | 6 +++---
 6 files changed, 13 insertions(+), 17 deletions(-)
 rename packages/nc-gui/components/general/{BaseColorPicker.vue => BaseIconColorPicker.vue} (100%)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 5b5af004b4..0a542e680c 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -385,10 +385,6 @@ const projectDelete = () => {
   isProjectDeleteDialogVisible.value = true
   $e('c:project:delete')
 }
-
-watchEffect(() => {
-  console.log('base', base.value)
-})
 </script>
 
 <template>
@@ -427,7 +423,7 @@ watchEffect(() => {
             <div v-e="['c:base:emojiSelect']" class="flex items-center select-none w-6 h-full">
               <a-spin v-if="base.isLoading" class="!ml-1.25 !flex !flex-row !items-center !my-0.5 w-8" :indicator="indicator" />
 
-              <LazyGeneralBaseColorPicker
+              <LazyGeneralBaseIconColorPicker
                 v-else
                 :key="parseProp(base.meta).iconHue"
                 :hue="parseProp(base.meta).iconHue"
@@ -438,7 +434,7 @@ watchEffect(() => {
                 <template #default>
                   <GeneralProjectIcon :type="base?.type" />
                 </template>
-              </LazyGeneralBaseColorPicker>
+              </LazyGeneralBaseIconColorPicker>
             </div>
           </div>
 
diff --git a/packages/nc-gui/components/dlg/ProjectDelete.vue b/packages/nc-gui/components/dlg/ProjectDelete.vue
index 453b936316..305277439e 100644
--- a/packages/nc-gui/components/dlg/ProjectDelete.vue
+++ b/packages/nc-gui/components/dlg/ProjectDelete.vue
@@ -52,18 +52,18 @@ const onDelete = async () => {
   <GeneralDeleteModal v-model:visible="visible" :entity-name="$t('objects.project')" :on-delete="onDelete">
     <template #entity-preview>
       <div v-if="base" class="flex flex-row items-center py-2 px-2.25 bg-gray-50 rounded-lg text-gray-700 mb-4">
-        <LazyGeneralBaseColorPicker
+        <LazyGeneralBaseIconColorPicker
           :key="parseProp(base.meta).iconHue"
           :hue="parseProp(base.meta).iconHue"
           size="small"
           class="!w-auto !h-auto"
-          iconClass="nc-view-icon w-6 h-6"
+          icon-class="nc-view-icon w-6 h-6"
           readonly
         >
           <template #default>
             <GeneralProjectIcon :type="base.type" class="nc-view-icon w-6 h-6" />
           </template>
-        </LazyGeneralBaseColorPicker>
+        </LazyGeneralBaseIconColorPicker>
         <div
           class="capitalize text-ellipsis overflow-hidden select-none w-full pl-1.75"
           :style="{ wordBreak: 'keep-all', whiteSpace: 'nowrap', display: 'inline' }"
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
index c8fb3b437a..06933990b7 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
@@ -154,18 +154,18 @@ watch(showShareModal, (val) => {
       </div>
       <div class="share-base">
         <div class="flex flex-row items-center gap-x-2 px-4 pt-3 pb-3 select-none">
-          <LazyGeneralBaseColorPicker
+          <LazyGeneralBaseIconColorPicker
             :key="parseProp(base.meta).iconHue"
             :hue="parseProp(base.meta).iconHue"
             size="small"
             class="!w-auto !h-auto"
-            iconClass="nc-view-icon group-hover"
+            icon-class="nc-view-icon group-hover"
             readonly
           >
             <template #default>
               <GeneralProjectIcon :type="base.type" class="nc-view-icon group-hover" />
             </template>
-          </LazyGeneralBaseColorPicker>
+          </LazyGeneralBaseIconColorPicker>
 
           <div>{{ $t('activity.shareBase.label') }}</div>
           <div
diff --git a/packages/nc-gui/components/general/BaseColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
similarity index 100%
rename from packages/nc-gui/components/general/BaseColorPicker.vue
rename to packages/nc-gui/components/general/BaseIconColorPicker.vue
diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index 10af414156..0dabfe1a66 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -82,7 +82,7 @@ watch(
       <div class="flex flex-row items-center gap-x-3">
         <GeneralOpenLeftSidebarBtn />
         <div class="flex flex-row items-center h-full gap-x-2.5">
-          <LazyGeneralBaseColorPicker
+          <LazyGeneralBaseIconColorPicker
             :key="parseProp(openedProject?.meta).iconHue"
             :hue="parseProp(openedProject?.meta).iconHue"
             size="small"
@@ -92,7 +92,7 @@ watch(
             <template #default>
               <GeneralProjectIcon :type="openedProject?.type" />
             </template>
-          </LazyGeneralBaseColorPicker>
+          </LazyGeneralBaseIconColorPicker>
           <NcTooltip class="flex font-medium text-sm capitalize truncate max-w-150" show-on-truncate-only>
             <template #title> {{ openedProject?.title }}</template>
             <span class="truncate">
diff --git a/packages/nc-gui/components/workspace/ProjectList.vue b/packages/nc-gui/components/workspace/ProjectList.vue
index 9563d2bbe0..543d7910b4 100644
--- a/packages/nc-gui/components/workspace/ProjectList.vue
+++ b/packages/nc-gui/components/workspace/ProjectList.vue
@@ -10,6 +10,7 @@ import {
   isEeUI,
   message,
   navigateTo,
+  parseProp,
   ref,
   storeToRefs,
   useBases,
@@ -17,7 +18,6 @@ import {
   useNuxtApp,
   useRoles,
   useWorkspace,
-  parseProp,
 } from '#imports'
 
 const workspaceStore = useWorkspace()
@@ -251,7 +251,7 @@ const setColor = async (hue: number, base: BaseType) => {
         <template v-if="column.dataIndex === 'title'">
           <div class="flex items-center nc-base-title gap-2.5 max-w-full -ml-1.5">
             <div class="flex items-center gap-2 text-center">
-              <LazyGeneralBaseColorPicker
+              <LazyGeneralBaseIconColorPicker
                 :key="parseProp(record.meta).iconHue"
                 :hue="parseProp(record.meta).iconHue"
                 size="small"
@@ -261,7 +261,7 @@ const setColor = async (hue: number, base: BaseType) => {
                 <template #default>
                   <GeneralProjectIcon :type="record.type" />
                 </template>
-              </LazyGeneralBaseColorPicker>
+              </LazyGeneralBaseIconColorPicker>
               <!-- todo: replace with switch -->
             </div>
 

From c0630b4000e9a116781253053974436a50a8f7e3 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:57 +0000
Subject: [PATCH 162/253] fix(nc-gui): update base icon in cmd k

---
 packages/nc-gui/components/cmd-k/index.vue    | 38 ++++++++++++-------
 .../dashboard/TreeView/ProjectNode.vue        |  8 ++--
 .../src/services/command-palette.service.ts   |  3 ++
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/packages/nc-gui/components/cmd-k/index.vue b/packages/nc-gui/components/cmd-k/index.vue
index a78001545f..fe5bfcb37d 100644
--- a/packages/nc-gui/components/cmd-k/index.vue
+++ b/packages/nc-gui/components/cmd-k/index.vue
@@ -17,6 +17,7 @@ interface CmdAction {
   keywords?: string[]
   section?: string
   is_default?: number | null
+  iconHue?: number
 }
 
 const props = defineProps<{
@@ -385,20 +386,29 @@ defineExpose({
                   @click="fireAction(act)"
                 >
                   <div class="cmdk-action-content w-full">
-                    <component
-                      :is="(iconMap as any)[act.icon]"
-                      v-if="act.icon && typeof act.icon === 'string' && (iconMap as any)[act.icon]"
-                      class="cmdk-action-icon"
-                      :class="{
-                        '!text-blue-500': act.icon === 'grid',
-                        '!text-purple-500': act.icon === 'form',
-                        '!text-[#FF9052]': act.icon === 'kanban',
-                        '!text-pink-500': act.icon === 'gallery',
-                      }"
-                    />
-                    <div v-else-if="act.icon" class="cmdk-action-icon max-w-4 flex items-center justify-center">
-                      <LazyGeneralEmojiPicker class="!text-sm !h-4 !w-4" size="small" :emoji="act.icon" readonly />
-                    </div>
+                    <template v-if="title === 'Bases' || act.icon === 'project'">
+                      <LazyGeneralBaseIconColorPicker :key="act.iconHue" :hue="act.iconHue" size="small" readonly>
+                        <template #default>
+                          <GeneralProjectIcon type="database" />
+                        </template>
+                      </LazyGeneralBaseIconColorPicker>
+                    </template>
+                    <template v-else>
+                      <component
+                        :is="(iconMap as any)[act.icon]"
+                        v-if="act.icon && typeof act.icon === 'string' && (iconMap as any)[act.icon]"
+                        class="cmdk-action-icon"
+                        :class="{
+                          '!text-blue-500': act.icon === 'grid',
+                          '!text-purple-500': act.icon === 'form',
+                          '!text-[#FF9052]': act.icon === 'kanban',
+                          '!text-pink-500': act.icon === 'gallery',
+                        }"
+                      />
+                      <div v-else-if="act.icon" class="cmdk-action-icon max-w-4 flex items-center justify-center">
+                        <LazyGeneralEmojiPicker class="!text-sm !h-4 !w-4" size="small" :emoji="act.icon" readonly />
+                      </div>
+                    </template>
                     <a-tooltip overlay-class-name="!px-2 !py-1 !rounded-lg">
                       <template #title>
                         {{ act.title }}
diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 0a542e680c..08ff2c6182 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -420,12 +420,12 @@ const projectDelete = () => {
           </NcButton>
 
           <div class="flex items-center mr-1" @click="onProjectClick(base)">
-            <div v-e="['c:base:emojiSelect']" class="flex items-center select-none w-6 h-full">
+            <div v-e="['c:base:iconColorChange']" class="flex items-center select-none w-6 h-full">
               <a-spin v-if="base.isLoading" class="!ml-1.25 !flex !flex-row !items-center !my-0.5 w-8" :indicator="indicator" />
 
-              <LazyGeneralBaseIconColorPicker
+              <GeneralBaseIconColorPicker
                 v-else
-                :key="parseProp(base.meta).iconHue"
+                :key="`${base.id}_${parseProp(base.meta).iconHue}`"
                 :hue="parseProp(base.meta).iconHue"
                 size="small"
                 :readonly="base?.type && base?.type !== 'database'"
@@ -434,7 +434,7 @@ const projectDelete = () => {
                 <template #default>
                   <GeneralProjectIcon :type="base?.type" />
                 </template>
-              </LazyGeneralBaseIconColorPicker>
+              </GeneralBaseIconColorPicker>
             </div>
           </div>
 
diff --git a/packages/nocodb/src/services/command-palette.service.ts b/packages/nocodb/src/services/command-palette.service.ts
index 7bf3ac2585..f57bb59c77 100644
--- a/packages/nocodb/src/services/command-palette.service.ts
+++ b/packages/nocodb/src/services/command-palette.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { type UserType, ViewTypes } from 'nocodb-sdk';
 import { Base } from '~/models';
 import { TablesService } from '~/services/tables.service';
+import { deserializeJSON } from '~/utils/serialize';
 
 const viewTypeAlias: Record<number, string> = {
   [ViewTypes.GRID]: 'grid',
@@ -28,6 +29,7 @@ export class CommandPaletteService {
             id: `p-${base.id}`,
             title: base.title,
             icon: 'project',
+            iconHue: deserializeJSON(base.meta)?.iconHue,
             section: 'Bases',
             scopePayload: {
               scope: `p-${base.id}`,
@@ -70,6 +72,7 @@ export class CommandPaletteService {
             id: `p-${b.id}`,
             title: b.title,
             icon: 'project',
+            iconHue: deserializeJSON(b.meta)?.iconHue,
             section: 'Bases',
           });
         }

From 4522a99d0e1a9cd5ac461feb2bb0411aafeb2cf2 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:57 +0000
Subject: [PATCH 163/253] fix(nc-gui): lazy import slider color picker

---
 .../general/BaseIconColorPicker.vue           | 17 ++----
 .../general/ColorHueSliderWrapper.vue         | 59 +++++++++++++++++++
 2 files changed, 64 insertions(+), 12 deletions(-)
 create mode 100644 packages/nc-gui/components/general/ColorHueSliderWrapper.vue

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 0f9381d702..72a91bcabd 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import { Slider } from '@ckpack/vue-color'
 import tinycolor from 'tinycolor2'
 
 import { BASE_ICON_COLOR_HUE_DATA as preDefinedHueData } from '#imports'
@@ -122,7 +121,7 @@ watch(
                     ? `hsv(${preDefinedHueData[`_${colorRef.h}`].tint.h},${preDefinedHueData[`_${colorRef.h}`].tint.s}%, ${
                         preDefinedHueData[`_${colorRef.h}`].tint.v
                       }%)`
-                    : `hsv(${colorRef.h ?? defaultHueValue}, 30%, 100%)`,
+                    : `hsv(${colorRef.h ?? defaultHueValue}, 50%, 100%)`,
                 ).toHexString()
               "
             />
@@ -181,20 +180,14 @@ watch(
             <template #overlay>
               <div class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg flex flex-col space-y-4">
                 <div>{{ $t('labels.customHue') }}</div>
-
-                <Slider
+                
+                <LazyGeneralColorHueSliderWrapper
                   :model-value="colorRef"
-                  class="nc-hue-color-picker"
-                  :style="{
-                    ['--nc-hue-slider-pointer-color']: tinycolor(
-                      `hsv(${colorRef.h ?? defaultHueValue}, 100%, 100%)`,
-                    ).toHexString(),
-                  }"
                   @update:model-value="
                     (value) => {
-                      if (!value?.hsv?.h) return
+                      if (value?.h !== 0 && !value?.h) return
 
-                      colorRef.h = value.hsv.h
+                      colorRef.h = value.h
                     }
                   "
                 />
diff --git a/packages/nc-gui/components/general/ColorHueSliderWrapper.vue b/packages/nc-gui/components/general/ColorHueSliderWrapper.vue
new file mode 100644
index 0000000000..500dfc87a8
--- /dev/null
+++ b/packages/nc-gui/components/general/ColorHueSliderWrapper.vue
@@ -0,0 +1,59 @@
+<script lang="ts" setup>
+import { Slider } from '@ckpack/vue-color'
+import tinycolor from 'tinycolor2'
+
+interface Props {
+  modelValue?: any
+  mode?: 'hsl' | 'hsv'
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  modelValue: () => ({ h: 199, s: 0, v: 0 }),
+  mode: () => 'hsv',
+})
+
+const emit = defineEmits(['update:modelValue', 'input'])
+
+const picked = computed({
+  get: () => props.modelValue || { h: 199, s: 0, v: 0 },
+  set: (val) => {
+    emit('update:modelValue', val[props.mode] || null)
+    emit('input', val[props.mode] || null)
+  },
+})
+</script>
+
+<template>
+  <Slider
+    v-model="picked"
+    class="nc-hue-slider-wrapper min-w-[200px]"
+    :style="{
+      ['--nc-hue-slider-pointer-color']: tinycolor(`hsv(${picked.h ?? 199}, 100%, 100%)`).toHexString(),
+    }"
+  />
+</template>
+
+<style lang="scss" scoped>
+.nc-hue-slider-wrapper {
+  &.vc-slider {
+    @apply !w-full;
+  }
+  :deep(.vc-slider-swatches) {
+    @apply hidden;
+  }
+
+  :deep(.vc-slider-hue-warp) {
+    @apply h-1.5;
+    .vc-hue {
+      @apply rounded-lg;
+    }
+    .vc-hue-pointer {
+      top: -3px !important;
+    }
+    .vc-hue-picker {
+      background-color: white;
+      box-shadow: 0 0 0 3px var(--nc-hue-slider-pointer-color) !important;
+    }
+  }
+}
+</style>

From 30d4edc3dfbbaa6988d180debb81caf3b2303c55 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:57 +0000
Subject: [PATCH 164/253] fix(nc-gui): update base icon color picker  model
 with new design

---
 .../general/BaseIconColorPicker.vue           | 138 +++++++-----------
 ...iderWrapper.vue => ColorSliderWrapper.vue} |  18 ++-
 packages/nc-gui/lang/en.json                  |   2 +-
 packages/nc-gui/store/bases.ts                |   1 +
 4 files changed, 65 insertions(+), 94 deletions(-)
 rename packages/nc-gui/components/general/{ColorHueSliderWrapper.vue => ColorSliderWrapper.vue} (62%)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 72a91bcabd..316358b558 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -16,28 +16,29 @@ const emit = defineEmits(['colorSelected'])
 const { hue, size = 'medium', readonly } = props
 
 const defaultHueColor = {
-  h: 0,
-  s: 0,
-  v: 0,
+  h: 199,
+  s: 79,
+  v: 100,
 }
 
 const defaultHueValue = 199
 
 const isOpen = ref(false)
 
-const isOpenHuePicker = ref(false)
-
 const colorRef = ref({
   ...defaultHueColor,
   h: !(hue !== 0 && !hue) ? hue : defaultHueValue,
 })
 
+const updateColorHue = (value?: string | number | null) => {
+  colorRef.value.h = !isNaN(parseInt(`${value}`)) ? +Math.min(parseInt(`${value}`), 360) : 0
+}
+
 function selectColor(value: number) {
   colorRef.value.h = value
 
   emit('colorSelected', value)
 
-  isOpenHuePicker.value = false
   isOpen.value = false
 }
 
@@ -50,14 +51,10 @@ const onClick = (e: Event) => {
 }
 
 watch(
-  isOpenHuePicker,
-  () => {
-    if (!isOpenHuePicker.value && colorRef.value.h !== hue) {
-      if (hue !== 0 && !hue) {
-        colorRef.value.h = defaultHueValue
-      } else {
-        colorRef.value.h = hue
-      }
+  isOpen,
+  (value) => {
+    if (!value && colorRef.value.h !== hue) {
+      emit('colorSelected', colorRef.value.h)
     }
   },
   {
@@ -130,15 +127,12 @@ watch(
       </template>
     </div>
     <template #overlay>
-      <div class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg">
-        <div class="w-[164px] flex flex-wrap">
+      <div class="relative bg-white rounded-lg border-1 border-gray-200 shadow-lg">
+        <div class="flex items-center p-2 space-x-2">
           <div
             v-for="(h, i) of Object.keys(preDefinedHueData)"
             :key="i"
             class="nc-pre-defined-hue-item p-1 rounded cursor-pointer hover:bg-gray-200"
-            :class="{
-              'mt-3': i > 4,
-            }"
           >
             <div
               class="rounded h-6 w-6"
@@ -151,55 +145,35 @@ watch(
               @click="selectColor(preDefinedHueData[h].tint.h)"
             ></div>
           </div>
+        </div>
 
-          <a-dropdown
-            v-model:visible="isOpenHuePicker"
-            :trigger="['click']"
-            :disabled="readonly"
-            placement="bottom"
-            overlay-class-name="!left-9"
-          >
-            <div
-              class="nc-custom-hue-picker-item p-1 rounded cursor-pointer hover:bg-gray-200 mt-3"
-              :class="{
-                'bg-gray-200': isOpenHuePicker,
-              }"
-            >
-              <div
-                class="rounded overflow-hidden h-6 w-6"
-                :class="{
-                  selected: hue !== undefined && hue !== null && !preDefinedHueData[`_${hue}`],
-                }"
-                :style="{
-                  backgroundColor: tinycolor(`hsv(${hue}, 30%, 100%) `).toHexString(),
-                }"
-              >
-                <img src="~/assets/img/hue-colors.png" class="" alt="Hue picker" />
-              </div>
-            </div>
-            <template #overlay>
-              <div class="relative bg-white rounded-lg p-3 border-1 border-gray-200 shadow-lg flex flex-col space-y-4">
-                <div>{{ $t('labels.customHue') }}</div>
-                
-                <LazyGeneralColorHueSliderWrapper
-                  :model-value="colorRef"
-                  @update:model-value="
-                    (value) => {
-                      if (value?.h !== 0 && !value?.h) return
-
-                      colorRef.h = value.h
-                    }
-                  "
-                />
-
-                <div class="flex items-center justify-end">
-                  <NcButton type="secondary" size="small" @click="selectColor(colorRef.h ?? defaultHueValue)">
-                    {{ $t('general.apply') }}
-                  </NcButton>
-                </div>
-              </div>
-            </template>
-          </a-dropdown>
+        <div class="p-2 border-t-1 border-gray-200 flex flex-col space-y-4">
+          <div class="uppercase text-xs font-medium">{{ $t('labels.customColour') }}</div>
+
+          <div class="flex flex-row items-center gap-x-3">
+            <input
+              :value="parseInt(`${colorRef.h ?? 0}`)"
+              class="nc-color-hue-input"
+              type="number"
+              @input="
+                (value) => {
+                  updateColorHue(value.target?.value)
+                }
+              "
+              :min="0"
+              :max="360"
+            />
+
+            <LazyGeneralColorSliderWrapper
+              :model-value="colorRef"
+              class="!min-w-none ml-3"
+              @update:model-value="
+                (value) => {
+                  updateColorHue(value?.h)
+                }
+              "
+            />
+          </div>
         </div>
       </div>
     </template>
@@ -214,25 +188,19 @@ watch(
   }
 }
 
-:deep(.nc-hue-color-picker) {
-  &.vc-slider {
-    width: 297px;
-  }
-  .vc-slider-swatches {
-    @apply hidden;
-  }
-  .vc-hue {
-    @apply rounded-lg;
+.nc-color-hue-input {
+  @apply outline-none text-sm rounded-lg border-gray-200 py-1 px-3 w-14 text-center;
+  -moz-appearance: textfield;
+
+  &:focus {
+    @apply ring-transparent border-brand-500;
   }
-  .vc-slider-hue-warp {
-    height: 6px;
-    .vc-hue-pointer {
-      top: -3px !important;
-    }
-    .vc-hue-picker {
-      background-color: white;
-      box-shadow: 0 0 0 3px var(--nc-hue-slider-pointer-color) !important;
-    }
+
+  /* Chrome, Safari, Edge, Opera */
+  &::-webkit-outer-spin-button,
+  &::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
   }
 }
 </style>
diff --git a/packages/nc-gui/components/general/ColorHueSliderWrapper.vue b/packages/nc-gui/components/general/ColorSliderWrapper.vue
similarity index 62%
rename from packages/nc-gui/components/general/ColorHueSliderWrapper.vue
rename to packages/nc-gui/components/general/ColorSliderWrapper.vue
index 500dfc87a8..3ac7f7a7c1 100644
--- a/packages/nc-gui/components/general/ColorHueSliderWrapper.vue
+++ b/packages/nc-gui/components/general/ColorSliderWrapper.vue
@@ -8,17 +8,19 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  modelValue: () => ({ h: 199, s: 0, v: 0 }),
+  modelValue: () => '#3069FE',
   mode: () => 'hsv',
 })
 
 const emit = defineEmits(['update:modelValue', 'input'])
 
 const picked = computed({
-  get: () => props.modelValue || { h: 199, s: 0, v: 0 },
+  get: () => tinycolor(props.modelValue || '#3069FE').toHsv() as any,
   set: (val) => {
-    emit('update:modelValue', val[props.mode] || null)
-    emit('input', val[props.mode] || null)
+    if (val) {
+      emit('update:modelValue', val[props.mode] || null)
+      emit('input', val[props.mode] || null)
+    }
   },
 })
 </script>
@@ -26,15 +28,15 @@ const picked = computed({
 <template>
   <Slider
     v-model="picked"
-    class="nc-hue-slider-wrapper min-w-[200px]"
+    class="nc-color-slider-wrapper min-w-[200px]"
     :style="{
-      ['--nc-hue-slider-pointer-color']: tinycolor(`hsv(${picked.h ?? 199}, 100%, 100%)`).toHexString(),
+      ['--nc-color-slider-pointer']: tinycolor(`hsv(${picked.h ?? 199}, 100%, 100%)`).toHexString(),
     }"
   />
 </template>
 
 <style lang="scss" scoped>
-.nc-hue-slider-wrapper {
+.nc-color-slider-wrapper {
   &.vc-slider {
     @apply !w-full;
   }
@@ -52,7 +54,7 @@ const picked = computed({
     }
     .vc-hue-picker {
       background-color: white;
-      box-shadow: 0 0 0 3px var(--nc-hue-slider-pointer-color) !important;
+      box-shadow: 0 0 0 3px var(--nc-color-slider-pointer) !important;
     }
   }
 }
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 93783fee1b..3182ef6537 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -700,7 +700,7 @@
     "limitOptions": "Limit ptions",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
     "clearSelection": "Clear selection",
-    "customHue": "Custom Hue"
+    "customColour": "Custom colour"
   },
   "activity": {
     "noRange": "Calendar view requires a date range",
diff --git a/packages/nc-gui/store/bases.ts b/packages/nc-gui/store/bases.ts
index 69c720115b..f16ea12753 100644
--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@@ -201,6 +201,7 @@ export const useBases = defineStore('basesStore', () => {
       isExpanded: route.value.params.baseId === baseId || existingProject.isExpanded,
       // isLoading is managed by Sidebar
       isLoading: existingProject.isLoading,
+      meta: { ...parseProp(existingProject.meta), ...parseProp(_project.meta) },
     }
 
     bases.value.set(baseId, base)

From 7b4cb84c6324363ef4590f3973e59af6c928a8e6 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:57 +0000
Subject: [PATCH 165/253] chore(nc-gui): lint

---
 .../nc-gui/components/general/BaseIconColorPicker.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 316358b558..82b22391c2 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -127,7 +127,7 @@ watch(
       </template>
     </div>
     <template #overlay>
-      <div class="relative bg-white rounded-lg border-1 border-gray-200 shadow-lg">
+      <div class="nc-base-icon-color-picker-dropdown relative bg-white rounded-lg border-1 border-gray-200">
         <div class="flex items-center p-2 space-x-2">
           <div
             v-for="(h, i) of Object.keys(preDefinedHueData)"
@@ -147,7 +147,7 @@ watch(
           </div>
         </div>
 
-        <div class="p-2 border-t-1 border-gray-200 flex flex-col space-y-4">
+        <div class="p-2 border-t-1 border-gray-200 flex flex-col space-y-2.5">
           <div class="uppercase text-xs font-medium">{{ $t('labels.customColour') }}</div>
 
           <div class="flex flex-row items-center gap-x-3">
@@ -155,13 +155,13 @@ watch(
               :value="parseInt(`${colorRef.h ?? 0}`)"
               class="nc-color-hue-input"
               type="number"
+              :min="0"
+              :max="360"
               @input="
                 (value) => {
                   updateColorHue(value.target?.value)
                 }
               "
-              :min="0"
-              :max="360"
             />
 
             <LazyGeneralColorSliderWrapper
@@ -181,6 +181,9 @@ watch(
 </template>
 
 <style lang="scss" scoped>
+.nc-base-icon-color-picker-dropdown {
+  box-shadow: 0px 8px 8px -4px #0000000a, 0px 20px 24px -4px #0000001a;
+}
 .nc-pre-defined-hue-item,
 .nc-custom-hue-picker-item {
   .selected {

From 0bff1c2ce25e84b59d2bb46210ecd00f9eec979e Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:57 +0000
Subject: [PATCH 166/253] fix(nc-gui): console errors

---
 .../dashboard/TreeView/ProjectNode.vue        | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 08ff2c6182..8d6e0e9c73 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -423,18 +423,19 @@ const projectDelete = () => {
             <div v-e="['c:base:iconColorChange']" class="flex items-center select-none w-6 h-full">
               <a-spin v-if="base.isLoading" class="!ml-1.25 !flex !flex-row !items-center !my-0.5 w-8" :indicator="indicator" />
 
-              <GeneralBaseIconColorPicker
-                v-else
-                :key="`${base.id}_${parseProp(base.meta).iconHue}`"
-                :hue="parseProp(base.meta).iconHue"
-                size="small"
-                :readonly="base?.type && base?.type !== 'database'"
-                @color-selected="setColor($event, base)"
-              >
-                <template #default>
-                  <GeneralProjectIcon :type="base?.type" />
-                </template>
-              </GeneralBaseIconColorPicker>
+              <div v-else>
+                <GeneralBaseIconColorPicker
+                  :key="`${base.id}_${parseProp(base.meta).iconHue}`"
+                  :hue="parseProp(base.meta).iconHue"
+                  size="small"
+                  :readonly="base?.type && base?.type !== 'database'"
+                  @color-selected="setColor($event, base)"
+                >
+                  <template #default>
+                    <GeneralProjectIcon :type="base?.type" />
+                  </template>
+                </GeneralBaseIconColorPicker>
+              </div>
             </div>
           </div>
 

From c322b29642ca2184e74e2dd5166b2bef4069f423 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:58 +0000
Subject: [PATCH 167/253] test: fix pw test

---
 .../general/BaseIconColorPicker.vue           | 220 +++++++++---------
 1 file changed, 111 insertions(+), 109 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 82b22391c2..0af88e27ac 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -64,120 +64,122 @@ watch(
 </script>
 
 <template>
-  <a-dropdown v-model:visible="isOpen" :trigger="['click']" :disabled="readonly">
-    <div
-      class="flex flex-row justify-center items-center select-none rounded-md nc-emoji"
-      :class="{
-        'hover:bg-gray-500 hover:bg-opacity-15 cursor-pointer': !readonly,
-        'bg-gray-500 bg-opacity-15': isOpen,
-        'h-6 w-6 text-lg': size === 'small',
-        'h-8 w-8 text-xl': size === 'medium',
-        'h-10 w-10 text-2xl': size === 'large',
-        'h-14 w-16 text-5xl': size === 'xlarge',
-      }"
-      @click.stop="onClick"
-    >
-      <template v-if="hue !== 0 && !hue && colorRef.h === defaultHueValue">
-        <slot name="default" />
-      </template>
-      <template v-else>
-        <svg width="16" height="16" viewBox="0 0 1073 1073" fill="none" xmlns="http://www.w3.org/2000/svg" :class="iconClass">
-          <mask
-            id="mask0_1749_80944"
-            style="mask-type: luminance"
-            maskUnits="userSpaceOnUse"
-            x="94"
-            y="40"
-            width="885"
-            height="993"
-          >
-            <path d="M978.723 40H94V1033H978.723V40Z" fill="white" />
-          </mask>
-          <g mask="url(#mask0_1749_80944)">
-            <path
-              fill-rule="evenodd"
-              clip-rule="evenodd"
-              d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
-              :fill="
-                tinycolor(
-                  preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
-                    ? `hsv(${preDefinedHueData[`_${colorRef.h}`].shade.h},${preDefinedHueData[`_${colorRef.h}`].shade.s}%, ${
-                        preDefinedHueData[`_${colorRef.h}`].shade.v
-                      }%)`
-                    : `hsv(${colorRef.h ?? defaultHueValue}, 100%, 30%)`,
-                ).toHexString()
-              "
-            />
-            <path
-              fill-rule="evenodd"
-              clip-rule="evenodd"
-              d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
-              :fill="
-                tinycolor(
-                  preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
-                    ? `hsv(${preDefinedHueData[`_${colorRef.h}`].tint.h},${preDefinedHueData[`_${colorRef.h}`].tint.s}%, ${
-                        preDefinedHueData[`_${colorRef.h}`].tint.v
-                      }%)`
-                    : `hsv(${colorRef.h ?? defaultHueValue}, 50%, 100%)`,
-                ).toHexString()
-              "
-            />
-          </g>
-        </svg>
-      </template>
-    </div>
-    <template #overlay>
-      <div class="nc-base-icon-color-picker-dropdown relative bg-white rounded-lg border-1 border-gray-200">
-        <div class="flex items-center p-2 space-x-2">
-          <div
-            v-for="(h, i) of Object.keys(preDefinedHueData)"
-            :key="i"
-            class="nc-pre-defined-hue-item p-1 rounded cursor-pointer hover:bg-gray-200"
-          >
+  <div>
+    <a-dropdown v-model:visible="isOpen" :trigger="['click']" :disabled="readonly">
+      <div
+        class="flex flex-row justify-center items-center select-none rounded-md nc-emoji"
+        :class="{
+          'hover:bg-gray-500 hover:bg-opacity-15 cursor-pointer': !readonly,
+          'bg-gray-500 bg-opacity-15': isOpen,
+          'h-6 w-6 text-lg': size === 'small',
+          'h-8 w-8 text-xl': size === 'medium',
+          'h-10 w-10 text-2xl': size === 'large',
+          'h-14 w-16 text-5xl': size === 'xlarge',
+        }"
+        @click.stop="onClick"
+      >
+        <template v-if="hue !== 0 && !hue && colorRef.h === defaultHueValue">
+          <slot name="default" />
+        </template>
+        <template v-else>
+          <svg width="16" height="16" viewBox="0 0 1073 1073" fill="none" xmlns="http://www.w3.org/2000/svg" :class="iconClass">
+            <mask
+              id="mask0_1749_80944"
+              style="mask-type: luminance"
+              maskUnits="userSpaceOnUse"
+              x="94"
+              y="40"
+              width="885"
+              height="993"
+            >
+              <path d="M978.723 40H94V1033H978.723V40Z" fill="white" />
+            </mask>
+            <g mask="url(#mask0_1749_80944)">
+              <path
+                fill-rule="evenodd"
+                clip-rule="evenodd"
+                d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
+                :fill="
+                  tinycolor(
+                    preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
+                      ? `hsv(${preDefinedHueData[`_${colorRef.h}`].shade.h},${preDefinedHueData[`_${colorRef.h}`].shade.s}%, ${
+                          preDefinedHueData[`_${colorRef.h}`].shade.v
+                        }%)`
+                      : `hsv(${colorRef.h ?? defaultHueValue}, 100%, 30%)`,
+                  ).toHexString()
+                "
+              />
+              <path
+                fill-rule="evenodd"
+                clip-rule="evenodd"
+                d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
+                :fill="
+                  tinycolor(
+                    preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
+                      ? `hsv(${preDefinedHueData[`_${colorRef.h}`].tint.h},${preDefinedHueData[`_${colorRef.h}`].tint.s}%, ${
+                          preDefinedHueData[`_${colorRef.h}`].tint.v
+                        }%)`
+                      : `hsv(${colorRef.h ?? defaultHueValue}, 50%, 100%)`,
+                  ).toHexString()
+                "
+              />
+            </g>
+          </svg>
+        </template>
+      </div>
+      <template #overlay>
+        <div class="nc-base-icon-color-picker-dropdown relative bg-white rounded-lg border-1 border-gray-200">
+          <div class="flex items-center p-2 space-x-2">
             <div
-              class="rounded h-6 w-6"
-              :class="{
-                selected: preDefinedHueData[h].tint.h === hue || (h === '_199' && hue !== 0 && !hue),
-              }"
-              :style="{
-                backgroundColor: preDefinedHueData[h].pickerColor,
-              }"
-              @click="selectColor(preDefinedHueData[h].tint.h)"
-            ></div>
+              v-for="(h, i) of Object.keys(preDefinedHueData)"
+              :key="i"
+              class="nc-pre-defined-hue-item p-1 rounded cursor-pointer hover:bg-gray-200"
+            >
+              <div
+                class="rounded h-6 w-6"
+                :class="{
+                  selected: preDefinedHueData[h].tint.h === hue || (h === '_199' && hue !== 0 && !hue),
+                }"
+                :style="{
+                  backgroundColor: preDefinedHueData[h].pickerColor,
+                }"
+                @click="selectColor(preDefinedHueData[h].tint.h)"
+              ></div>
+            </div>
           </div>
-        </div>
 
-        <div class="p-2 border-t-1 border-gray-200 flex flex-col space-y-2.5">
-          <div class="uppercase text-xs font-medium">{{ $t('labels.customColour') }}</div>
-
-          <div class="flex flex-row items-center gap-x-3">
-            <input
-              :value="parseInt(`${colorRef.h ?? 0}`)"
-              class="nc-color-hue-input"
-              type="number"
-              :min="0"
-              :max="360"
-              @input="
-                (value) => {
-                  updateColorHue(value.target?.value)
-                }
-              "
-            />
-
-            <LazyGeneralColorSliderWrapper
-              :model-value="colorRef"
-              class="!min-w-none ml-3"
-              @update:model-value="
-                (value) => {
-                  updateColorHue(value?.h)
-                }
-              "
-            />
+          <div class="p-2 border-t-1 border-gray-200 flex flex-col space-y-2.5">
+            <div class="uppercase text-xs font-medium">{{ $t('labels.customColour') }}</div>
+
+            <div class="flex flex-row items-center gap-x-3">
+              <input
+                :value="parseInt(`${colorRef.h ?? 0}`)"
+                class="nc-color-hue-input"
+                type="number"
+                :min="0"
+                :max="360"
+                @input="
+                  (value) => {
+                    updateColorHue(value.target?.value)
+                  }
+                "
+              />
+
+              <LazyGeneralColorSliderWrapper
+                :model-value="colorRef"
+                class="!min-w-none ml-3"
+                @update:model-value="
+                  (value) => {
+                    updateColorHue(value?.h)
+                  }
+                "
+              />
+            </div>
           </div>
         </div>
-      </div>
-    </template>
-  </a-dropdown>
+      </template>
+    </a-dropdown>
+  </div>
 </template>
 
 <style lang="scss" scoped>

From c7a5b139d2c05b6f4057aa9bf93eabf603838838 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:58 +0000
Subject: [PATCH 168/253] fix(nc-gui): remove lazy loading baseIconColorPicker
 component

---
 packages/nc-gui/components/cmd-k/index.vue                    | 4 ++--
 packages/nc-gui/components/dlg/ProjectDelete.vue              | 4 ++--
 packages/nc-gui/components/dlg/share-and-collaborate/View.vue | 4 ++--
 packages/nc-gui/components/project/View.vue                   | 4 ++--
 packages/nc-gui/components/workspace/ProjectList.vue          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/cmd-k/index.vue b/packages/nc-gui/components/cmd-k/index.vue
index fe5bfcb37d..a5e2db2de0 100644
--- a/packages/nc-gui/components/cmd-k/index.vue
+++ b/packages/nc-gui/components/cmd-k/index.vue
@@ -387,11 +387,11 @@ defineExpose({
                 >
                   <div class="cmdk-action-content w-full">
                     <template v-if="title === 'Bases' || act.icon === 'project'">
-                      <LazyGeneralBaseIconColorPicker :key="act.iconHue" :hue="act.iconHue" size="small" readonly>
+                      <GeneralBaseIconColorPicker :key="act.iconHue" :hue="act.iconHue" size="small" readonly>
                         <template #default>
                           <GeneralProjectIcon type="database" />
                         </template>
-                      </LazyGeneralBaseIconColorPicker>
+                      </GeneralBaseIconColorPicker>
                     </template>
                     <template v-else>
                       <component
diff --git a/packages/nc-gui/components/dlg/ProjectDelete.vue b/packages/nc-gui/components/dlg/ProjectDelete.vue
index 305277439e..3ca95f4f85 100644
--- a/packages/nc-gui/components/dlg/ProjectDelete.vue
+++ b/packages/nc-gui/components/dlg/ProjectDelete.vue
@@ -52,7 +52,7 @@ const onDelete = async () => {
   <GeneralDeleteModal v-model:visible="visible" :entity-name="$t('objects.project')" :on-delete="onDelete">
     <template #entity-preview>
       <div v-if="base" class="flex flex-row items-center py-2 px-2.25 bg-gray-50 rounded-lg text-gray-700 mb-4">
-        <LazyGeneralBaseIconColorPicker
+        <GeneralBaseIconColorPicker
           :key="parseProp(base.meta).iconHue"
           :hue="parseProp(base.meta).iconHue"
           size="small"
@@ -63,7 +63,7 @@ const onDelete = async () => {
           <template #default>
             <GeneralProjectIcon :type="base.type" class="nc-view-icon w-6 h-6" />
           </template>
-        </LazyGeneralBaseIconColorPicker>
+        </GeneralBaseIconColorPicker>
         <div
           class="capitalize text-ellipsis overflow-hidden select-none w-full pl-1.75"
           :style="{ wordBreak: 'keep-all', whiteSpace: 'nowrap', display: 'inline' }"
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
index 06933990b7..0a3bc6839d 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
@@ -154,7 +154,7 @@ watch(showShareModal, (val) => {
       </div>
       <div class="share-base">
         <div class="flex flex-row items-center gap-x-2 px-4 pt-3 pb-3 select-none">
-          <LazyGeneralBaseIconColorPicker
+          <GeneralBaseIconColorPicker
             :key="parseProp(base.meta).iconHue"
             :hue="parseProp(base.meta).iconHue"
             size="small"
@@ -165,7 +165,7 @@ watch(showShareModal, (val) => {
             <template #default>
               <GeneralProjectIcon :type="base.type" class="nc-view-icon group-hover" />
             </template>
-          </LazyGeneralBaseIconColorPicker>
+          </GeneralBaseIconColorPicker>
 
           <div>{{ $t('activity.shareBase.label') }}</div>
           <div
diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index 0dabfe1a66..e51a3c7c8a 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -82,7 +82,7 @@ watch(
       <div class="flex flex-row items-center gap-x-3">
         <GeneralOpenLeftSidebarBtn />
         <div class="flex flex-row items-center h-full gap-x-2.5">
-          <LazyGeneralBaseIconColorPicker
+          <GeneralBaseIconColorPicker
             :key="parseProp(openedProject?.meta).iconHue"
             :hue="parseProp(openedProject?.meta).iconHue"
             size="small"
@@ -92,7 +92,7 @@ watch(
             <template #default>
               <GeneralProjectIcon :type="openedProject?.type" />
             </template>
-          </LazyGeneralBaseIconColorPicker>
+          </GeneralBaseIconColorPicker>
           <NcTooltip class="flex font-medium text-sm capitalize truncate max-w-150" show-on-truncate-only>
             <template #title> {{ openedProject?.title }}</template>
             <span class="truncate">
diff --git a/packages/nc-gui/components/workspace/ProjectList.vue b/packages/nc-gui/components/workspace/ProjectList.vue
index 543d7910b4..8c510becaa 100644
--- a/packages/nc-gui/components/workspace/ProjectList.vue
+++ b/packages/nc-gui/components/workspace/ProjectList.vue
@@ -251,7 +251,7 @@ const setColor = async (hue: number, base: BaseType) => {
         <template v-if="column.dataIndex === 'title'">
           <div class="flex items-center nc-base-title gap-2.5 max-w-full -ml-1.5">
             <div class="flex items-center gap-2 text-center">
-              <LazyGeneralBaseIconColorPicker
+              <GeneralBaseIconColorPicker
                 :key="parseProp(record.meta).iconHue"
                 :hue="parseProp(record.meta).iconHue"
                 size="small"
@@ -261,7 +261,7 @@ const setColor = async (hue: number, base: BaseType) => {
                 <template #default>
                   <GeneralProjectIcon :type="record.type" />
                 </template>
-              </LazyGeneralBaseIconColorPicker>
+              </GeneralBaseIconColorPicker>
               <!-- todo: replace with switch -->
             </div>
 

From e59b154d356e3c8b23706e714af3357cb4673e35 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:58 +0000
Subject: [PATCH 169/253] fix(nc-gui): move the base icon color input to right
 side and add border if custom color is active color

---
 .../general/BaseIconColorPicker.vue           | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 0af88e27ac..c67931d18c 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -133,28 +133,42 @@ watch(
             <div
               v-for="(h, i) of Object.keys(preDefinedHueData)"
               :key="i"
-              class="nc-pre-defined-hue-item p-1 rounded cursor-pointer hover:bg-gray-200"
+              class="nc-pre-defined-hue-item-wrapper p-1 rounded cursor-pointer hover:bg-gray-200"
             >
               <div
-                class="rounded h-6 w-6"
+                class="nc-pre-defined-hue-item rounded h-6 w-6"
+                :tabindex="0"
                 :class="{
-                  selected: preDefinedHueData[h].tint.h === hue || (h === '_199' && hue !== 0 && !hue),
+                  selected: `_${colorRef.h}` === h,
                 }"
                 :style="{
                   backgroundColor: preDefinedHueData[h].pickerColor,
                 }"
-                @click="selectColor(preDefinedHueData[h].tint.h)"
+                @click.stop="updateColorHue(preDefinedHueData[h].tint.h)"
+                @keydown.enter.stop="updateColorHue(preDefinedHueData[h].tint.h)"
               ></div>
             </div>
           </div>
 
-          <div class="p-2 border-t-1 border-gray-200 flex flex-col space-y-2.5">
+          <div class="p-3 border-t-1 border-gray-200 flex flex-col space-y-2.5">
             <div class="uppercase text-xs font-medium">{{ $t('labels.customColour') }}</div>
 
             <div class="flex flex-row items-center gap-x-3">
+              <LazyGeneralColorSliderWrapper
+                :model-value="colorRef"
+                class="!min-w-none"
+                @update:model-value="
+                  (value) => {
+                    updateColorHue(value?.h)
+                  }
+                "
+              />
               <input
                 :value="parseInt(`${colorRef.h ?? 0}`)"
                 class="nc-color-hue-input"
+                :class="{
+                  selected: !preDefinedHueData[`_${colorRef.h}`],
+                }"
                 type="number"
                 :min="0"
                 :max="360"
@@ -164,16 +178,6 @@ watch(
                   }
                 "
               />
-
-              <LazyGeneralColorSliderWrapper
-                :model-value="colorRef"
-                class="!min-w-none ml-3"
-                @update:model-value="
-                  (value) => {
-                    updateColorHue(value?.h)
-                  }
-                "
-              />
             </div>
           </div>
         </div>
@@ -186,9 +190,10 @@ watch(
 .nc-base-icon-color-picker-dropdown {
   box-shadow: 0px 8px 8px -4px #0000000a, 0px 20px 24px -4px #0000001a;
 }
-.nc-pre-defined-hue-item,
-.nc-custom-hue-picker-item {
-  .selected {
+.nc-pre-defined-hue-item-wrapper {
+  .nc-pre-defined-hue-item:focus,
+  .nc-pre-defined-hue-item.selected {
+    @apply outline-none;
     box-shadow: 0 0 0 2px #fff, 0 0 0 4px #3069fe;
   }
 }
@@ -197,7 +202,8 @@ watch(
   @apply outline-none text-sm rounded-lg border-gray-200 py-1 px-3 w-14 text-center;
   -moz-appearance: textfield;
 
-  &:focus {
+  &:focus,
+  &.selected {
     @apply ring-transparent border-brand-500;
   }
 

From a6f331e6cb335fd8d93e312506aee76ff700aacd Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:58 +0000
Subject: [PATCH 170/253] fix(nc-gui): duplicate base should also duplicate
 base icon color

---
 packages/nc-gui/components/dlg/ProjectDuplicate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/components/dlg/ProjectDuplicate.vue b/packages/nc-gui/components/dlg/ProjectDuplicate.vue
index ffb159ad15..5bc6d78644 100644
--- a/packages/nc-gui/components/dlg/ProjectDuplicate.vue
+++ b/packages/nc-gui/components/dlg/ProjectDuplicate.vue
@@ -62,6 +62,7 @@ const _duplicate = async () => {
             primaryColor: color,
             accentColor: complement.toHex8String(),
           },
+          iconHue: parseProp(props.base.meta).iconHue,
         }),
       },
     })

From 712f63d7371f35946cb574dc3f222e396140479b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:58 +0000
Subject: [PATCH 171/253] fix(nc-gui): add role permission for base icon color
 change

---
 packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue | 2 +-
 packages/nc-gui/components/general/BaseIconColorPicker.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 8d6e0e9c73..1db621b89e 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -428,7 +428,7 @@ const projectDelete = () => {
                   :key="`${base.id}_${parseProp(base.meta).iconHue}`"
                   :hue="parseProp(base.meta).iconHue"
                   size="small"
-                  :readonly="base?.type && base?.type !== 'database'"
+                  :readonly="(base?.type && base?.type !== 'database') || !isUIAllowed('baseRename')"
                   @color-selected="setColor($event, base)"
                 >
                   <template #default>
diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index c67931d18c..f0e33ee274 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -76,7 +76,7 @@ watch(
           'h-10 w-10 text-2xl': size === 'large',
           'h-14 w-16 text-5xl': size === 'xlarge',
         }"
-        @click.stop="onClick"
+        @click="onClick"
       >
         <template v-if="hue !== 0 && !hue && colorRef.h === defaultHueValue">
           <slot name="default" />

From d434efc9e0ca288cd46885066967233288adf832 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:59 +0000
Subject: [PATCH 172/253] chore(nc-gui): lint

---
 .../nc-gui/components/general/BaseIconColorPicker.vue     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index f0e33ee274..7195e3d929 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -34,14 +34,6 @@ const updateColorHue = (value?: string | number | null) => {
   colorRef.value.h = !isNaN(parseInt(`${value}`)) ? +Math.min(parseInt(`${value}`), 360) : 0
 }
 
-function selectColor(value: number) {
-  colorRef.value.h = value
-
-  emit('colorSelected', value)
-
-  isOpen.value = false
-}
-
 const onClick = (e: Event) => {
   if (readonly) return
 

From 21b47e4b283f4d89318320d781007f872e5b8f55 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:59 +0000
Subject: [PATCH 173/253] fix(nc-gui): revert unrelated changes

---
 packages/nc-gui/assets/img/hue-colors.png       | Bin 59616 -> 0 bytes
 .../dashboard/TreeView/ProjectNode.vue          |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 packages/nc-gui/assets/img/hue-colors.png

diff --git a/packages/nc-gui/assets/img/hue-colors.png b/packages/nc-gui/assets/img/hue-colors.png
deleted file mode 100644
index 6ea164a8f05e16472f41214ba9f5f5332b6d9d9d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59616
zcmeI5T})eL7=XXiR(2%RbvR>XD3we@kPN(-`^m=Ir3=FaoQRQ`;0jY0b<xG$G=Ysm
z3<PK5{0W*R3vjV5Z~-V6ZqX$jixSNOiJ94O%T`4pIt&oPugW~%*B?6Q;mV7JJQt*;
z=d`2WIp=$y?|I+zu5oX1fjv1bSqNb--0dw9LN}i3Lbn(X+rRZ5G#<1gB?UW0M_>9M
z#xLI2$_igEDiYahH?83fVUxQUKWWB~5Y`q=SdB+bzSd%iZq-GLb>X?(@!Zf0hlFs8
zLa(RPuZ;}+^5*rIo!;lSjNa+{{)@?8-STD5mLL1FFN8k5@>2KECHv*Ss!pD{J~KN0
z)_CRk?=wxa&-G0WpFP^u?YS_w&G&HS@!U;+ADTa2wcR~=G`QhpdG+~$gA@C2+}7Gh
zC$4r4t_sXf`%etMk})?l-CQx{pDDljYG=c~iTuy}zSZZ?{IK!XkrTfS_RfuuZ>{O+
z%l&33lr(?Q{z3n#*=bM4h7AA2#*9;)$NF2-I`c2TbE~GYq59a&o^4}KJofI6pZcr6
zvtQ}|=fj(`1-DaI&!&&1t{!>3`KhYm$u%GEA1wMe(;X0+#il!4i=I?kk^*I|zb<(_
zyl3s#0WJ8b*~XTD<|=F7o#0dDyMrQ>wDjLouekRHg(K(1^@;u<V+Wr&Y&H2%SC&uc
zP1&glzl-k36X#5}xEyQqgl*45jfsarcZwS(TO4|_Q`DV)-)l00DdKIDExPT#6mhX+
zm)YPaiA{@+Mr^$5jKkt<%UrYga7A{o2G*Huv3NAAyQ}o0*eBin#5kOG4kw3`tJB8S
zsit2hTN{(DJQIkW#7>1kpinJjE6)VTmW7I1ps-M3-Ko}_tUJ*NQXilZutLhvA^Fe<
zXoRrEMI)dQ)R};Smq{2j0vbUj#?T081T=!eWi$dBLE$nQ0ga$4RVXfz1uAF+Gy)m{
zjj&LfMl}M}2vj4e>j8~`Mo?9}XaqC@8eyTppK1g&0vZ905WD>bjetf#BcKt`2n&#e
zMnEH=5!A8?jetf_c#uFN47KIVMtcFM2_qUqsOpnLhK?tW5=V)n#L<{+2%zH=#8F~r
zc=;XIc7@nU>?C#)JBgkDZ|vMLGVrwBXyewCcc)|cK$|T&V_}5jrr*Qj+Fd~@Zj&>4
zv#2-k?3FH_Su&YN+HTcb9tc#J_vcy_FzvF{8nF77X_}__%vzuMvO>aX-ujHM$<dVO
zIVUaGrku5yf|zLy<_Z!}h?@o%fd}9LcpygrJOB@j5vT<Zzyo6hSXRsYE_eVQfCu0~
z)SzMyzyt6AJcwj$zyt6AJOB^CgUASA4`dph<O22pdmu*uJOB^C1MmPmh!n_y2XX|!
z1MmPmFfIh;ktj{1_JG<0Y7ZjKDX<6N!99rwgPYeq80`hX%^FxfFka2rBmuE}SUxNt
zmJiE^<%=5uF#evzc+eem2i-w;H3FbJ=nlGr?x1@dxMJWzchH>#Jqh~g2&|9<y=!Wu
zMHiyp^LfqHnNViMz8d)j17exxVlI)={O5XkEyM+gXu~$way`^^ap~;VMhRC5-m5Ry
zL(LK#Yb(wS7l$l)uVuL&Y9g<?{gWkc3I73nO<xvA)8XQzbtZFd+H|I%dJ8kHW+9-o
z28f$bkm1C^1MooJv<4o42eKm`cmN*Aj(Fe!cmN(Kk%c_~52Vt>9)Jf@gJTcC19B)v
zatM1M(@fw2cmN)RE9$TZ-~skPRU=S)03Lt`QlP95Jn%pJ)ioiqo-FiwO7TLGTPa8z
z;e|*Wh3h2oLU<v(5MC%!|BM$}A>aq>0ei7qAxHv}1SAP)+^9p1kem~+d{{m#-wLvP
zz#gy%?8WY<1@?eFU{3`FV2_F~6&tDeS}7@AU=P>>_JF-;a~p$nsNcivQNJgZ7Ulim
z!OF&i+Ml}*qzNJ3tC%nE?=881ZGJ2ihR^?ya5iP9hM`}@26bITqQ$cR35u=9?MTmk
SWFpV_cu}~k*xRwwSN9)c{wVGM

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 1db621b89e..1fc91b1d1c 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -235,7 +235,7 @@ async function addNewProjectChildEntity() {
   isAddNewProjectChildEntityLoading.value = true
 
   const isProjectPopulated = basesStore.isProjectPopulated(base.value.id!)
-  if (!isProjectPopulated && base.value?.type === NcProjectType.DB) {
+  if (!isProjectPopulated && base.value.type === NcProjectType.DB) {
     // We do not wait for tables api, so that add new table is seamless.
     // Only con would be while saving table duplicate table name FE validation might not work
     // If the table list api takes time to load before the table name validation
@@ -245,7 +245,7 @@ async function addNewProjectChildEntity() {
   try {
     openTableCreateDialog()
 
-    if (!base.value.isExpanded && base.value?.type !== NcProjectType.DB) {
+    if (!base.value.isExpanded && base.value.type !== NcProjectType.DB) {
       base.value.isExpanded = true
     }
   } finally {
@@ -736,7 +736,7 @@ const projectDelete = () => {
     </div>
     <template v-if="!isSharedBase" #overlay>
       <NcMenu class="!py-0 rounded text-sm">
-        <template v-if="contextMenuTarget.type === 'base' && base?.type === 'database'"></template>
+        <template v-if="contextMenuTarget.type === 'base' && base.type === 'database'"></template>
 
         <template v-else-if="contextMenuTarget.type === 'source'"></template>
 

From b36de0bd088ea3d97e33a3753eca7a5c9627627c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:59 +0000
Subject: [PATCH 174/253] feat(nc-gui): add tooltip for base icon

---
 .../general/BaseIconColorPicker.vue           | 99 ++++++++++---------
 packages/nc-gui/lang/en.json                  |  3 +-
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 7195e3d929..9ec6df0f70 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -70,54 +70,57 @@ watch(
         }"
         @click="onClick"
       >
-        <template v-if="hue !== 0 && !hue && colorRef.h === defaultHueValue">
-          <slot name="default" />
-        </template>
-        <template v-else>
-          <svg width="16" height="16" viewBox="0 0 1073 1073" fill="none" xmlns="http://www.w3.org/2000/svg" :class="iconClass">
-            <mask
-              id="mask0_1749_80944"
-              style="mask-type: luminance"
-              maskUnits="userSpaceOnUse"
-              x="94"
-              y="40"
-              width="885"
-              height="993"
-            >
-              <path d="M978.723 40H94V1033H978.723V40Z" fill="white" />
-            </mask>
-            <g mask="url(#mask0_1749_80944)">
-              <path
-                fill-rule="evenodd"
-                clip-rule="evenodd"
-                d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
-                :fill="
-                  tinycolor(
-                    preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
-                      ? `hsv(${preDefinedHueData[`_${colorRef.h}`].shade.h},${preDefinedHueData[`_${colorRef.h}`].shade.s}%, ${
-                          preDefinedHueData[`_${colorRef.h}`].shade.v
-                        }%)`
-                      : `hsv(${colorRef.h ?? defaultHueValue}, 100%, 30%)`,
-                  ).toHexString()
-                "
-              />
-              <path
-                fill-rule="evenodd"
-                clip-rule="evenodd"
-                d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
-                :fill="
-                  tinycolor(
-                    preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
-                      ? `hsv(${preDefinedHueData[`_${colorRef.h}`].tint.h},${preDefinedHueData[`_${colorRef.h}`].tint.s}%, ${
-                          preDefinedHueData[`_${colorRef.h}`].tint.v
-                        }%)`
-                      : `hsv(${colorRef.h ?? defaultHueValue}, 50%, 100%)`,
-                  ).toHexString()
-                "
-              />
-            </g>
-          </svg>
-        </template>
+        <NcTooltip placement="topLeft" :disabled="readonly">
+          <template #title> {{ $t('tooltip.changeIconColour') }} </template>
+          <template v-if="hue !== 0 && !hue && colorRef.h === defaultHueValue">
+            <slot name="default" />
+          </template>
+          <template v-else>
+            <svg width="16" height="16" viewBox="0 0 1073 1073" fill="none" xmlns="http://www.w3.org/2000/svg" :class="iconClass">
+              <mask
+                id="mask0_1749_80944"
+                style="mask-type: luminance"
+                maskUnits="userSpaceOnUse"
+                x="94"
+                y="40"
+                width="885"
+                height="993"
+              >
+                <path d="M978.723 40H94V1033H978.723V40Z" fill="white" />
+              </mask>
+              <g mask="url(#mask0_1749_80944)">
+                <path
+                  fill-rule="evenodd"
+                  clip-rule="evenodd"
+                  d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
+                  :fill="
+                    tinycolor(
+                      preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
+                        ? `hsv(${preDefinedHueData[`_${colorRef.h}`].shade.h},${preDefinedHueData[`_${colorRef.h}`].shade.s}%, ${
+                            preDefinedHueData[`_${colorRef.h}`].shade.v
+                          }%)`
+                        : `hsv(${colorRef.h ?? defaultHueValue}, 100%, 30%)`,
+                    ).toHexString()
+                  "
+                />
+                <path
+                  fill-rule="evenodd"
+                  clip-rule="evenodd"
+                  d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
+                  :fill="
+                    tinycolor(
+                      preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
+                        ? `hsv(${preDefinedHueData[`_${colorRef.h}`].tint.h},${preDefinedHueData[`_${colorRef.h}`].tint.s}%, ${
+                            preDefinedHueData[`_${colorRef.h}`].tint.v
+                          }%)`
+                        : `hsv(${colorRef.h ?? defaultHueValue}, 50%, 100%)`,
+                    ).toHexString()
+                  "
+                />
+              </g>
+            </svg>
+          </template>
+        </NcTooltip>
       </div>
       <template #overlay>
         <div class="nc-base-icon-color-picker-dropdown relative bg-white rounded-lg border-1 border-gray-200">
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 3182ef6537..aeb31f2d34 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -967,7 +967,8 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "changeIconColour": "Change Icon Colour",
+    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {

From e4c917d3a4f4cb87d9c3ea43a9fb5270ceb93e73 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:59 +0000
Subject: [PATCH 175/253] fix(nc-gui): use colour picker for base icon instead
 of hue picker

---
 packages/nc-gui/components/cmd-k/index.vue    |   7 +-
 .../dashboard/TreeView/ProjectNode.vue        |  20 +-
 .../nc-gui/components/dlg/ProjectDelete.vue   |  13 +-
 .../components/dlg/ProjectDuplicate.vue       |   2 +-
 .../dlg/share-and-collaborate/View.vue        |  13 +-
 .../general/BaseIconColorPicker.vue           | 191 ++++--------------
 .../nc-gui/components/general/ColorPicker.vue | 104 +++++-----
 .../nc-gui/components/general/ProjectIcon.vue |  48 ++++-
 packages/nc-gui/components/project/View.vue   |  12 +-
 .../nc-gui/components/smartsheet/Form.vue     |  14 +-
 .../smartsheet/toolbar/ViewInfo.vue           |   2 +-
 .../components/workspace/ProjectList.vue      |  19 +-
 .../src/services/command-palette.service.ts   |   4 +-
 13 files changed, 175 insertions(+), 274 deletions(-)

diff --git a/packages/nc-gui/components/cmd-k/index.vue b/packages/nc-gui/components/cmd-k/index.vue
index a5e2db2de0..948dbeee67 100644
--- a/packages/nc-gui/components/cmd-k/index.vue
+++ b/packages/nc-gui/components/cmd-k/index.vue
@@ -17,7 +17,7 @@ interface CmdAction {
   keywords?: string[]
   section?: string
   is_default?: number | null
-  iconHue?: number
+  iconColor?: string
 }
 
 const props = defineProps<{
@@ -387,10 +387,7 @@ defineExpose({
                 >
                   <div class="cmdk-action-content w-full">
                     <template v-if="title === 'Bases' || act.icon === 'project'">
-                      <GeneralBaseIconColorPicker :key="act.iconHue" :hue="act.iconHue" size="small" readonly>
-                        <template #default>
-                          <GeneralProjectIcon type="database" />
-                        </template>
+                      <GeneralBaseIconColorPicker :key="act.iconColor" :color="act.iconColor" type="database" readonly>
                       </GeneralBaseIconColorPicker>
                     </template>
                     <template v-else>
diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 1fc91b1d1c..b93837f00f 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -75,6 +75,8 @@ useTabs()
 
 const { meta: metaKey, ctrlKey } = useMagicKeys()
 
+const { refreshCommandPalette } = useCommandPalette()
+
 const editMode = ref(false)
 
 const tempTitle = ref('')
@@ -172,18 +174,20 @@ defineExpose({
   enableEditMode,
 })
 
-const setColor = async (hue: number, base: BaseType) => {
+const setColor = async (color: string, base: BaseType) => {
   try {
     const meta = {
       ...parseProp(base.meta),
-      iconHue: hue,
+      iconColor: color,
     }
 
     basesStore.updateProject(base.id!, { meta: JSON.stringify(meta) })
 
-    $e('a:base:icon:color:navdraw', { iconHue: hue })
+    $e('a:base:icon:color:navdraw', { iconColor: color })
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
+  } finally {
+    refreshCommandPalette()
   }
 }
 
@@ -425,15 +429,13 @@ const projectDelete = () => {
 
               <div v-else>
                 <GeneralBaseIconColorPicker
-                  :key="`${base.id}_${parseProp(base.meta).iconHue}`"
-                  :hue="parseProp(base.meta).iconHue"
+                  :key="`${base.id}_${parseProp(base.meta).iconColor}`"
+                  :type="base?.type"
+                  :model-value="parseProp(base.meta).iconColor"
                   size="small"
                   :readonly="(base?.type && base?.type !== 'database') || !isUIAllowed('baseRename')"
-                  @color-selected="setColor($event, base)"
+                  @update:model-value="setColor($event, base)"
                 >
-                  <template #default>
-                    <GeneralProjectIcon :type="base?.type" />
-                  </template>
                 </GeneralBaseIconColorPicker>
               </div>
             </div>
diff --git a/packages/nc-gui/components/dlg/ProjectDelete.vue b/packages/nc-gui/components/dlg/ProjectDelete.vue
index 3ca95f4f85..cf0e898bd2 100644
--- a/packages/nc-gui/components/dlg/ProjectDelete.vue
+++ b/packages/nc-gui/components/dlg/ProjectDelete.vue
@@ -52,18 +52,7 @@ const onDelete = async () => {
   <GeneralDeleteModal v-model:visible="visible" :entity-name="$t('objects.project')" :on-delete="onDelete">
     <template #entity-preview>
       <div v-if="base" class="flex flex-row items-center py-2 px-2.25 bg-gray-50 rounded-lg text-gray-700 mb-4">
-        <GeneralBaseIconColorPicker
-          :key="parseProp(base.meta).iconHue"
-          :hue="parseProp(base.meta).iconHue"
-          size="small"
-          class="!w-auto !h-auto"
-          icon-class="nc-view-icon w-6 h-6"
-          readonly
-        >
-          <template #default>
-            <GeneralProjectIcon :type="base.type" class="nc-view-icon w-6 h-6" />
-          </template>
-        </GeneralBaseIconColorPicker>
+        <GeneralProjectIcon :color="parseProp(base.meta).iconColor" :type="base.type" class="nc-view-icon w-6 h-6 mx-1" />
         <div
           class="capitalize text-ellipsis overflow-hidden select-none w-full pl-1.75"
           :style="{ wordBreak: 'keep-all', whiteSpace: 'nowrap', display: 'inline' }"
diff --git a/packages/nc-gui/components/dlg/ProjectDuplicate.vue b/packages/nc-gui/components/dlg/ProjectDuplicate.vue
index 5bc6d78644..176d4c2177 100644
--- a/packages/nc-gui/components/dlg/ProjectDuplicate.vue
+++ b/packages/nc-gui/components/dlg/ProjectDuplicate.vue
@@ -62,7 +62,7 @@ const _duplicate = async () => {
             primaryColor: color,
             accentColor: complement.toHex8String(),
           },
-          iconHue: parseProp(props.base.meta).iconHue,
+          iconColor: parseProp(props.base.meta).iconColor,
         }),
       },
     })
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
index 0a3bc6839d..dd2742470a 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
@@ -154,18 +154,7 @@ watch(showShareModal, (val) => {
       </div>
       <div class="share-base">
         <div class="flex flex-row items-center gap-x-2 px-4 pt-3 pb-3 select-none">
-          <GeneralBaseIconColorPicker
-            :key="parseProp(base.meta).iconHue"
-            :hue="parseProp(base.meta).iconHue"
-            size="small"
-            class="!w-auto !h-auto"
-            icon-class="nc-view-icon group-hover"
-            readonly
-          >
-            <template #default>
-              <GeneralProjectIcon :type="base.type" class="nc-view-icon group-hover" />
-            </template>
-          </GeneralBaseIconColorPicker>
+          <GeneralProjectIcon :color="parseProp(base.meta).iconColor" :type="base.type" class="nc-view-icon group-hover" />
 
           <div>{{ $t('activity.shareBase.label') }}</div>
           <div
diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 9ec6df0f70..17e9fb0ed7 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -1,37 +1,37 @@
 <script lang="ts" setup>
 import tinycolor from 'tinycolor2'
 
-import { BASE_ICON_COLOR_HUE_DATA as preDefinedHueData } from '#imports'
-
-const props = defineProps<{
-  hue?: number | null
-  size?: 'small' | 'medium' | 'large' | 'xlarge'
-  readonly?: boolean
-  disableClearing?: boolean
-  iconClass?: string
-}>()
-
-const emit = defineEmits(['colorSelected'])
+import { NcProjectType } from '#imports'
+
+const props = withDefaults(
+  defineProps<{
+    type?: NcProjectType | string
+    modelValue?: string
+    size?: 'small' | 'medium' | 'large' | 'xlarge'
+    readonly?: boolean
+    iconClass?: string
+  }>(),
+  {
+    type: NcProjectType.DB,
+    size: 'small',
+  },
+)
 
-const { hue, size = 'medium', readonly } = props
+const emit = defineEmits(['update:modelValue'])
 
-const defaultHueColor = {
-  h: 199,
-  s: 79,
-  v: 100,
-}
+const defaultIconColors = ['#36BFFF', '#FA8231', '#FCBE3A', '#27D665', '#6A7184', '#FF4A3F', '#FC3AC6', '#7D26CD']
 
-const defaultHueValue = 199
+const { modelValue, size, readonly } = props
 
 const isOpen = ref(false)
 
-const colorRef = ref({
-  ...defaultHueColor,
-  h: !(hue !== 0 && !hue) ? hue : defaultHueValue,
-})
+const colorRef = ref(tinycolor(modelValue).isValid() ? modelValue : defaultIconColors[0])
 
-const updateColorHue = (value?: string | number | null) => {
-  colorRef.value.h = !isNaN(parseInt(`${value}`)) ? +Math.min(parseInt(`${value}`), 360) : 0
+const updateIconColor = (color: string) => {
+  const tcolor = tinycolor(color)
+  if (tcolor.isValid()) {
+    colorRef.value = color
+  }
 }
 
 const onClick = (e: Event) => {
@@ -45,8 +45,8 @@ const onClick = (e: Event) => {
 watch(
   isOpen,
   (value) => {
-    if (!value && colorRef.value.h !== hue) {
-      emit('colorSelected', colorRef.value.h)
+    if (!value && colorRef.value !== modelValue) {
+      emit('update:modelValue', colorRef.value)
     }
   },
   {
@@ -72,108 +72,25 @@ watch(
       >
         <NcTooltip placement="topLeft" :disabled="readonly">
           <template #title> {{ $t('tooltip.changeIconColour') }} </template>
-          <template v-if="hue !== 0 && !hue && colorRef.h === defaultHueValue">
-            <slot name="default" />
-          </template>
-          <template v-else>
-            <svg width="16" height="16" viewBox="0 0 1073 1073" fill="none" xmlns="http://www.w3.org/2000/svg" :class="iconClass">
-              <mask
-                id="mask0_1749_80944"
-                style="mask-type: luminance"
-                maskUnits="userSpaceOnUse"
-                x="94"
-                y="40"
-                width="885"
-                height="993"
-              >
-                <path d="M978.723 40H94V1033H978.723V40Z" fill="white" />
-              </mask>
-              <g mask="url(#mask0_1749_80944)">
-                <path
-                  fill-rule="evenodd"
-                  clip-rule="evenodd"
-                  d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
-                  :fill="
-                    tinycolor(
-                      preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
-                        ? `hsv(${preDefinedHueData[`_${colorRef.h}`].shade.h},${preDefinedHueData[`_${colorRef.h}`].shade.s}%, ${
-                            preDefinedHueData[`_${colorRef.h}`].shade.v
-                          }%)`
-                        : `hsv(${colorRef.h ?? defaultHueValue}, 100%, 30%)`,
-                    ).toHexString()
-                  "
-                />
-                <path
-                  fill-rule="evenodd"
-                  clip-rule="evenodd"
-                  d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
-                  :fill="
-                    tinycolor(
-                      preDefinedHueData && preDefinedHueData[`_${colorRef.h}`]
-                        ? `hsv(${preDefinedHueData[`_${colorRef.h}`].tint.h},${preDefinedHueData[`_${colorRef.h}`].tint.s}%, ${
-                            preDefinedHueData[`_${colorRef.h}`].tint.v
-                          }%)`
-                        : `hsv(${colorRef.h ?? defaultHueValue}, 50%, 100%)`,
-                    ).toHexString()
-                  "
-                />
-              </g>
-            </svg>
-          </template>
+
+          <div>
+            <GeneralProjectIcon :color="colorRef" :type="type" />
+          </div>
         </NcTooltip>
       </div>
-      <template #overlay>
-        <div class="nc-base-icon-color-picker-dropdown relative bg-white rounded-lg border-1 border-gray-200">
-          <div class="flex items-center p-2 space-x-2">
-            <div
-              v-for="(h, i) of Object.keys(preDefinedHueData)"
-              :key="i"
-              class="nc-pre-defined-hue-item-wrapper p-1 rounded cursor-pointer hover:bg-gray-200"
-            >
-              <div
-                class="nc-pre-defined-hue-item rounded h-6 w-6"
-                :tabindex="0"
-                :class="{
-                  selected: `_${colorRef.h}` === h,
-                }"
-                :style="{
-                  backgroundColor: preDefinedHueData[h].pickerColor,
-                }"
-                @click.stop="updateColorHue(preDefinedHueData[h].tint.h)"
-                @keydown.enter.stop="updateColorHue(preDefinedHueData[h].tint.h)"
-              ></div>
-            </div>
-          </div>
 
-          <div class="p-3 border-t-1 border-gray-200 flex flex-col space-y-2.5">
-            <div class="uppercase text-xs font-medium">{{ $t('labels.customColour') }}</div>
-
-            <div class="flex flex-row items-center gap-x-3">
-              <LazyGeneralColorSliderWrapper
-                :model-value="colorRef"
-                class="!min-w-none"
-                @update:model-value="
-                  (value) => {
-                    updateColorHue(value?.h)
-                  }
-                "
-              />
-              <input
-                :value="parseInt(`${colorRef.h ?? 0}`)"
-                class="nc-color-hue-input"
-                :class="{
-                  selected: !preDefinedHueData[`_${colorRef.h}`],
-                }"
-                type="number"
-                :min="0"
-                :max="360"
-                @input="
-                  (value) => {
-                    updateColorHue(value.target?.value)
-                  }
-                "
-              />
-            </div>
+      <template #overlay>
+        <div
+          class="nc-base-icon-color-picker-dropdown relative bg-white rounded-lg border-1 border-gray-200 overflow-hidden max-w-[342px]"
+        >
+          <div class="flex justify-start">
+            <GeneralColorPicker
+              :model-value="colorRef"
+              :colors="defaultIconColors"
+              :is-new-design="true"
+              class="nc-base-icon-color-picker"
+              @input="updateIconColor"
+            />
           </div>
         </div>
       </template>
@@ -185,28 +102,4 @@ watch(
 .nc-base-icon-color-picker-dropdown {
   box-shadow: 0px 8px 8px -4px #0000000a, 0px 20px 24px -4px #0000001a;
 }
-.nc-pre-defined-hue-item-wrapper {
-  .nc-pre-defined-hue-item:focus,
-  .nc-pre-defined-hue-item.selected {
-    @apply outline-none;
-    box-shadow: 0 0 0 2px #fff, 0 0 0 4px #3069fe;
-  }
-}
-
-.nc-color-hue-input {
-  @apply outline-none text-sm rounded-lg border-gray-200 py-1 px-3 w-14 text-center;
-  -moz-appearance: textfield;
-
-  &:focus,
-  &.selected {
-    @apply ring-transparent border-brand-500;
-  }
-
-  /* Chrome, Safari, Edge, Opera */
-  &::-webkit-outer-spin-button,
-  &::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-  }
-}
 </style>
diff --git a/packages/nc-gui/components/general/ColorPicker.vue b/packages/nc-gui/components/general/ColorPicker.vue
index c3e748a653..727d2f8ee8 100644
--- a/packages/nc-gui/components/general/ColorPicker.vue
+++ b/packages/nc-gui/components/general/ColorPicker.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import tinycolor from 'tinycolor2'
 import { computed, enumColor, ref, watch } from '#imports'
 
 interface Props {
@@ -7,7 +8,7 @@ interface Props {
   rowSize?: number
   advanced?: boolean
   pickButton?: boolean
-  borders?: string[]
+  colorBoxBorder?: boolean
   isNewDesign?: boolean
 }
 
@@ -17,6 +18,7 @@ const props = withDefaults(defineProps<Props>(), {
   rowSize: 10,
   advanced: true,
   pickButton: false,
+  colorBoxBorder: false,
   isNewDesign: false,
 })
 
@@ -41,7 +43,8 @@ const selectColor = (color: string, closeModal = false) => {
 
 const isPickerOn = ref(false)
 
-const compare = (colorA: string, colorB: string) => colorA.toLowerCase() === colorB.toLowerCase()
+const compare = (colorA: string, colorB: string) =>
+  colorA.toLowerCase() === colorB.toLowerCase() || colorA.toLowerCase() === tinycolor(colorB).toHex8String().toLowerCase()
 
 watch(picked, (n, _o) => {
   vModel.value = n
@@ -50,31 +53,57 @@ watch(picked, (n, _o) => {
 
 <template>
   <div class="color-picker">
-    <div v-for="colId in Math.ceil(props.colors.length / props.rowSize)" :key="colId" class="color-picker-row">
-      <button
+    <div
+      v-for="colId in Math.ceil(props.colors.length / props.rowSize)"
+      :key="colId"
+      class="color-picker-row"
+      :class="{
+        'mt-2': colId > 1,
+      }"
+    >
+      <div
         v-for="(color, i) of colors.slice((colId - 1) * rowSize, colId * rowSize)"
         :key="`color-${colId}-${i}`"
-        class="color-selector"
-        :class="{ 'selected': compare(picked, color), 'new-design': isNewDesign }"
-        :style="{
-          'background-color': `${color}`,
-          'border': borders?.length && borders[i] ? `1px solid ${borders[i]}` : undefined,
+        class="p-1 rounded-md flex h-8"
+        :class="{
+          'hover:bg-gray-200': isNewDesign,
         }"
-        @click="selectColor(color, true)"
       >
-        {{ compare(picked, color) && !isNewDesign ? '&#10003;' : '' }}
-      </button>
-      <button class="h-6 w-6 mt-2.7 ml-1 border-1 border-[grey] rounded-md" @click="isPickerOn = !isPickerOn">
-        <GeneralTooltip>
-          <template #title>{{ $t('activity.moreColors') }}</template>
-          <div class="flex items-center justify-center">
-            <GeneralIcon :icon="isPickerOn ? 'minus' : 'plus'" class="w-4 h-4" />
-          </div>
-        </GeneralTooltip>
-      </button>
+        <button
+          class="color-selector"
+          :class="{ 'selected': compare(picked, color), 'new-design': isNewDesign }"
+          :style="{
+            'background-color': `${color}`,
+            'border': colorBoxBorder ? `1px solid ${tinycolor(color).darken(30).toString()}` : undefined,
+          }"
+          @click="selectColor(color, true)"
+        >
+          {{ compare(picked, color) && !isNewDesign ? '&#10003;' : '' }}
+        </button>
+      </div>
+      <div
+        class="p-1 rounded-md h-8"
+        :class="{
+          'hover:bg-gray-200': isNewDesign,
+        }"
+      >
+        <button class="nc-more-colors-trigger h-6 w-6 border-1 border-gray-400 rounded" @click="isPickerOn = !isPickerOn">
+          <GeneralTooltip>
+            <template #title>{{ $t('activity.moreColors') }}</template>
+            <div class="flex items-center justify-center">
+              <GeneralIcon :icon="isPickerOn ? 'minus' : 'plus'" class="w-4 h-4" />
+            </div>
+          </GeneralTooltip>
+        </button>
+      </div>
     </div>
 
-    <a-card v-if="props.advanced" class="w-full mt-2" :body-style="{ padding: '0px' }" :bordered="false">
+    <a-card
+      v-if="props.advanced"
+      class="w-full mt-2"
+      :body-style="{ paddingLeft: '4px !important', paddingRight: '4px !important' }"
+      :bordered="false"
+    >
       <div v-if="isPickerOn" class="flex justify-center">
         <LazyGeneralChromeWrapper v-model="picked" class="!w-full !shadow-none" />
       </div>
@@ -82,25 +111,15 @@ watch(picked, (n, _o) => {
   </div>
 </template>
 
-<style scoped>
+<style lansg="scss" scoped>
 .color-picker {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-  background: white;
-  padding: 10px;
+  @apply flex flex-col items-center justify-center bg-white p-2.5;
 }
 .color-picker-row {
-  display: flex;
-  flex-direction: row;
+  @apply flex flex-row space-x-1;
 }
 .color-selector {
-  position: relative;
-  height: 25px;
-  width: 25px;
-  margin: 10px 5px;
-  border-radius: 5px;
+  @apply h-6 w-6 rounded;
   -webkit-text-stroke-width: 1px;
   -webkit-text-stroke-color: white;
 }
@@ -108,19 +127,14 @@ watch(picked, (n, _o) => {
   filter: brightness(90%);
   -webkit-filter: brightness(90%);
 }
-
-.color-selector.selected:not(.new-design) {
-  filter: brightness(90%);
-  -webkit-filter: brightness(90%);
-}
-.color-selector:focus.new-design {
+.color-selector:focus,
+.color-selector.selected,
+.nc-more-colors-trigger:focus {
   outline: none;
   box-shadow: 0px 0px 0px 2px #fff, 0px 0px 0px 4px #3069fe;
 }
-.color-selector.selected.new-design {
-  box-shadow: 0px 0px 0px 2px #fff, 0px 0px 0px 4px #3069fe;
-}
+
 :deep(.vc-chrome-toggle-icon) {
-  @apply ml-3!important;
+  @apply !ml-3;
 }
 </style>
diff --git a/packages/nc-gui/components/general/ProjectIcon.vue b/packages/nc-gui/components/general/ProjectIcon.vue
index d732cafc7f..857bbd4fbe 100644
--- a/packages/nc-gui/components/general/ProjectIcon.vue
+++ b/packages/nc-gui/components/general/ProjectIcon.vue
@@ -1,18 +1,58 @@
 <script lang="ts" setup>
-const { hoverable } = defineProps<{
+import tinycolor from 'tinycolor2'
+const { hoverable, color } = defineProps<{
   type?: string
   hoverable?: boolean
+  color?: string
 }>()
+
+const iconColor = computed(() => {
+  return color
+    ? {
+        tint: tinycolor(color || '#36BFFF')
+          .lighten(10)
+          .toHexString(),
+        shade: tinycolor(color || '#36BFFF')
+          .darken(40)
+          .toHexString(),
+      }
+    : {
+        tint: '#36BFFF',
+        shade: '#142966',
+      }
+})
 </script>
 
 <template>
-  <GeneralIcon
-    icon="project"
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 1073 1073"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
     class="text-[#2824FB] base"
     :class="{
       'nc-base-icon-hoverable': hoverable,
     }"
-  />
+  >
+    <mask id="mask0_1749_80944" style="mask-type: luminance" maskUnits="userSpaceOnUse" x="94" y="40" width="885" height="993">
+      <path d="M978.723 40H94V1033H978.723V40Z" fill="white" />
+    </mask>
+    <g mask="url(#mask0_1749_80944)">
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M638.951 291.265L936.342 462.949C966.129 480.145 980.256 502.958 978.723 525.482V774.266C980.256 796.789 966.129 819.602 936.342 836.798L638.951 1008.48C582.292 1041.19 490.431 1041.19 433.773 1008.48L136.381 836.798C106.595 819.602 92.4675 796.789 93.9999 774.266L93.9999 525.482C92.4675 502.957 106.595 480.145 136.381 462.949L433.773 291.265C490.431 258.556 582.292 258.556 638.951 291.265Z"
+        :fill="iconColor.shade"
+      />
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M638.951 65.0055L936.342 236.69C966.129 253.886 980.256 276.699 978.723 299.222V548.006C980.256 570.529 966.129 593.343 936.342 610.538L638.951 782.223C582.292 814.931 490.431 814.931 433.773 782.223L136.381 610.538C106.595 593.343 92.4675 570.529 93.9999 548.006L93.9999 299.222C92.4675 276.699 106.595 253.886 136.381 236.69L433.773 65.0055C490.431 32.2968 582.292 32.2968 638.951 65.0055Z"
+        :fill="iconColor.tint"
+      />
+    </g>
+  </svg>
 </template>
 
 <style scoped>
diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index e51a3c7c8a..9410035e29 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -82,17 +82,7 @@ watch(
       <div class="flex flex-row items-center gap-x-3">
         <GeneralOpenLeftSidebarBtn />
         <div class="flex flex-row items-center h-full gap-x-2.5">
-          <GeneralBaseIconColorPicker
-            :key="parseProp(openedProject?.meta).iconHue"
-            :hue="parseProp(openedProject?.meta).iconHue"
-            size="small"
-            class="!w-auto !h-auto"
-            readonly
-          >
-            <template #default>
-              <GeneralProjectIcon :type="openedProject?.type" />
-            </template>
-          </GeneralBaseIconColorPicker>
+          <GeneralProjectIcon :type="openedProject?.type" :color="parseProp(openedProject?.meta).iconColor" />
           <NcTooltip class="flex font-medium text-sm capitalize truncate max-w-150" show-on-truncate-only>
             <template #title> {{ openedProject?.title }}</template>
             <span class="truncate">
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index b92c41185f..781d336817 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1541,19 +1541,9 @@ useEventListener(
                           '#E5D4F5',
                           '#FFCFE6',
                         ]"
-                        :borders="[
-                          '#6A7184',
-                          '#FF4A3F',
-                          '#FA8231',
-                          '#FCBE3A',
-                          '#27D665',
-                          '#36BFFF',
-                          '#FC3AC6',
-                          '#7D26CD',
-                          '#B33771',
-                        ]"
+                        :color-box-border="true"
                         :is-new-design="true"
-                        class="nc-form-theme-color-picker !p-0 !-ml-1"
+                        class="nc-form-theme-color-picker !pb-0"
                         @input="handleChangeBackground"
                       />
                     </div>
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
index cf881c5b72..0c06e7dd56 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewInfo.vue
@@ -50,7 +50,7 @@ const openedBaseUrl = computed(() => {
           </template>
           <div class="flex flex-row items-center gap-x-1.5">
             <GeneralProjectIcon
-              :meta="{ type: base?.type }"
+              :type="base?.type"
               class="!grayscale min-w-4"
               :style="{
                 filter: 'grayscale(100%) brightness(115%)',
diff --git a/packages/nc-gui/components/workspace/ProjectList.vue b/packages/nc-gui/components/workspace/ProjectList.vue
index 8c510becaa..5909400f33 100644
--- a/packages/nc-gui/components/workspace/ProjectList.vue
+++ b/packages/nc-gui/components/workspace/ProjectList.vue
@@ -182,16 +182,16 @@ function onProjectTitleClick(index: number) {
   }
 }
 
-const setColor = async (hue: number, base: BaseType) => {
+const setColor = async (color: string, base: BaseType) => {
   try {
     const meta = {
       ...parseProp(base.meta),
-      iconHue: hue,
+      iconColor: color,
     }
 
     basesStore.updateProject(base.id!, { meta: JSON.stringify(meta) })
 
-    $e('a:base:icon:color:navdraw', { iconHue: hue })
+    $e('a:base:icon:color:navdraw', { iconColor: color })
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
   }
@@ -252,15 +252,12 @@ const setColor = async (hue: number, base: BaseType) => {
           <div class="flex items-center nc-base-title gap-2.5 max-w-full -ml-1.5">
             <div class="flex items-center gap-2 text-center">
               <GeneralBaseIconColorPicker
-                :key="parseProp(record.meta).iconHue"
-                :hue="parseProp(record.meta).iconHue"
-                size="small"
-                readonly
-                @color-selected="setColor($event, record)"
+                :key="`${record.id}_${parseProp(record.meta).iconColor}`"
+                :type="record?.type"
+                :model-value="parseProp(record.meta).iconColor"
+                :readonly="(record?.type && record?.type !== 'database') || !isUIAllowed('baseRename')"
+                @update:model-value="setColor($event, record)"
               >
-                <template #default>
-                  <GeneralProjectIcon :type="record.type" />
-                </template>
               </GeneralBaseIconColorPicker>
               <!-- todo: replace with switch -->
             </div>
diff --git a/packages/nocodb/src/services/command-palette.service.ts b/packages/nocodb/src/services/command-palette.service.ts
index f57bb59c77..6076461a02 100644
--- a/packages/nocodb/src/services/command-palette.service.ts
+++ b/packages/nocodb/src/services/command-palette.service.ts
@@ -29,7 +29,7 @@ export class CommandPaletteService {
             id: `p-${base.id}`,
             title: base.title,
             icon: 'project',
-            iconHue: deserializeJSON(base.meta)?.iconHue,
+            iconColor: deserializeJSON(base.meta)?.iconColor,
             section: 'Bases',
             scopePayload: {
               scope: `p-${base.id}`,
@@ -72,7 +72,7 @@ export class CommandPaletteService {
             id: `p-${b.id}`,
             title: b.title,
             icon: 'project',
-            iconHue: deserializeJSON(b.meta)?.iconHue,
+            iconColor: deserializeJSON(b.meta)?.iconColor,
             section: 'Bases',
           });
         }

From 70bde415684493246292b43a4576cea86aa1399c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:59 +0000
Subject: [PATCH 176/253] chore(nc-gui): revert unrelated changes

---
 .../dashboard/TreeView/ProjectNode.vue        |  2 +-
 packages/nc-gui/lang/en.json                  |  3 +-
 packages/nc-gui/lib/constants.ts              | 60 -------------------
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index b93837f00f..334469dab3 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -424,7 +424,7 @@ const projectDelete = () => {
           </NcButton>
 
           <div class="flex items-center mr-1" @click="onProjectClick(base)">
-            <div v-e="['c:base:iconColorChange']" class="flex items-center select-none w-6 h-full">
+            <div class="flex items-center select-none w-6 h-full">
               <a-spin v-if="base.isLoading" class="!ml-1.25 !flex !flex-row !items-center !my-0.5 w-8" :indicator="indicator" />
 
               <div v-else>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index aeb31f2d34..d174147bc0 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -699,8 +699,7 @@
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
     "limitOptions": "Limit ptions",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
-    "clearSelection": "Clear selection",
-    "customColour": "Custom colour"
+    "clearSelection": "Clear selection"
   },
   "activity": {
     "noRange": "Calendar view requires a date range",
diff --git a/packages/nc-gui/lib/constants.ts b/packages/nc-gui/lib/constants.ts
index 653db51438..f8257bebfa 100644
--- a/packages/nc-gui/lib/constants.ts
+++ b/packages/nc-gui/lib/constants.ts
@@ -18,63 +18,3 @@ export const GROUP_BY_VARS = {
     __nc_false__: 'Unchecked',
   } as Record<string, string>,
 }
-
-export const BASE_ICON_COLOR_HUE_DATA: Record<
-  string,
-  { tint: { h: number; s: number; v: number }; shade: { h: number; s: number; v: number }; pickerColor: string }
-> = {
-  // blue
-  _199: {
-    tint: { h: 199, s: 79, v: 100 },
-    shade: { h: 255, s: 80, v: 40 },
-    pickerColor: '#36BFFF',
-  },
-  // orange
-  _24: {
-    tint: { h: 24, s: 64, v: 98 },
-    shade: { h: 24, s: 81, v: 59 },
-    pickerColor: '#FA8231',
-  },
-  // yellow
-  _41: {
-    tint: { h: 41, s: 62, v: 99 },
-    shade: { h: 41, s: 77, v: 40 },
-    pickerColor: '#FCBE3A',
-  },
-  // green
-  _141: {
-    tint: { h: 141, s: 63, v: 87 },
-    shade: { h: 141, s: 81, v: 34 },
-    pickerColor: '#27D665',
-  },
-  // gray
-  _217: {
-    tint: { h: 217, s: 12, v: 69 },
-    shade: { h: 217, s: 32, v: 32 },
-    pickerColor: '#6A7184',
-  },
-  // red
-  _4: {
-    tint: { h: 4, s: 60, v: 100 },
-    shade: { h: 4, s: 74, v: 49 },
-    pickerColor: '#FF4A3F',
-  },
-  // pink
-  _317: {
-    tint: { h: 317, s: 62, v: 99 },
-    shade: { h: 317, s: 77, v: 40 },
-    pickerColor: '#FC3AC6',
-  },
-  // purple
-  _271: {
-    tint: { h: 271, s: 62, v: 84 },
-    shade: { h: 271, s: 82, v: 32 },
-    pickerColor: '#7D26CD',
-  },
-  // maroon
-  _332: {
-    tint: { h: 332, s: 58, v: 83 },
-    shade: { h: 332, s: 93, v: 41 },
-    pickerColor: '#B33771',
-  },
-}

From eadb4fe2e1d96b36aba7eec5c3d69b064452e882 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:44:59 +0000
Subject: [PATCH 177/253] fix(nc-gui): form bg color picker left padding issue

---
 packages/nc-gui/components/smartsheet/Form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 781d336817..1b64240091 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1543,7 +1543,7 @@ useEventListener(
                         ]"
                         :color-box-border="true"
                         :is-new-design="true"
-                        class="nc-form-theme-color-picker !pb-0"
+                        class="nc-form-theme-color-picker !pb-0 !pl-0 -ml-1"
                         @input="handleChangeBackground"
                       />
                     </div>

From ba0e765e8c5e47593abc74531044a2bb48a6cc62 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:45:00 +0000
Subject: [PATCH 178/253] chore: case change

---
 packages/nc-gui/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index d174147bc0..90092a7530 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -966,7 +966,7 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "changeIconColour": "Change Icon Colour",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 520038c69463ef44206d6ad8eaf3a1bf6d571514 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:45:00 +0000
Subject: [PATCH 179/253] feat(nc-gui): assign random base icon color for new
 base

---
 .../general/BaseIconColorPicker.vue           |  6 ++----
 .../components/workspace/CreateProjectDlg.vue | 20 +++++++++++++++++--
 packages/nc-gui/store/bases.ts                |  4 ++++
 packages/nc-gui/utils/colorsUtils.ts          |  2 ++
 packages/nocodb/src/models/Base.ts            |  5 +++++
 packages/nocodb/src/schema/swagger-v2.json    |  4 ++++
 packages/nocodb/src/schema/swagger.json       |  4 ++++
 7 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 17e9fb0ed7..c8368e2303 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -19,13 +19,11 @@ const props = withDefaults(
 
 const emit = defineEmits(['update:modelValue'])
 
-const defaultIconColors = ['#36BFFF', '#FA8231', '#FCBE3A', '#27D665', '#6A7184', '#FF4A3F', '#FC3AC6', '#7D26CD']
-
 const { modelValue, size, readonly } = props
 
 const isOpen = ref(false)
 
-const colorRef = ref(tinycolor(modelValue).isValid() ? modelValue : defaultIconColors[0])
+const colorRef = ref(tinycolor(modelValue).isValid() ? modelValue : baseIconColors[0])
 
 const updateIconColor = (color: string) => {
   const tcolor = tinycolor(color)
@@ -86,7 +84,7 @@ watch(
           <div class="flex justify-start">
             <GeneralColorPicker
               :model-value="colorRef"
-              :colors="defaultIconColors"
+              :colors="baseIconColors"
               :is-new-design="true"
               class="nc-base-icon-color-picker"
               @input="updateIconColor"
diff --git a/packages/nc-gui/components/workspace/CreateProjectDlg.vue b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
index 7c4212203c..9809f582f7 100644
--- a/packages/nc-gui/components/workspace/CreateProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
@@ -3,7 +3,16 @@ import type { RuleObject } from 'ant-design-vue/es/form'
 import type { Form, Input } from 'ant-design-vue'
 import type { VNodeRef } from '@vue/runtime-core'
 import { computed } from '@vue/reactivity'
-import { NcProjectType, baseTitleValidator, extractSdkResponseErrorMsg, ref, useGlobal, useI18n, useVModel } from '#imports'
+import {
+  NcProjectType,
+  baseIconColors,
+  baseTitleValidator,
+  extractSdkResponseErrorMsg,
+  ref,
+  useGlobal,
+  useI18n,
+  useVModel,
+} from '#imports'
 
 const props = defineProps<{
   modelValue: boolean
@@ -38,6 +47,9 @@ const form = ref<typeof Form>()
 
 const formState = ref({
   title: '',
+  meta: {
+    iconColor: baseIconColors[Math.floor(Math.random() * 1000) % baseIconColors.length],
+  },
 })
 
 const creating = ref(false)
@@ -48,6 +60,7 @@ const createProject = async () => {
     const base = await _createProject({
       type: baseType.value,
       title: formState.value.title,
+      meta: formState.value.meta,
     })
 
     navigateToProject({
@@ -77,6 +90,9 @@ watch(dialogShow, async (n, o) => {
 
     formState.value = {
       title: 'Base',
+      meta: {
+        iconColor: baseIconColors[Math.floor(Math.random() * 1000) % baseIconColors.length],
+      },
     }
 
     await nextTick()
@@ -100,7 +116,7 @@ const typeLabel = computed(() => {
     <template #header>
       <!-- Create A New Table -->
       <div class="flex flex-row items-center">
-        <GeneralProjectIcon :type="baseType" class="mr-2.5 !text-lg !h-4" />
+        <GeneralProjectIcon :color="formState.meta.iconColor" :type="baseType" class="mr-2.5 !text-lg !h-4" />
         {{
           $t('general.createEntity', {
             entity: typeLabel,
diff --git a/packages/nc-gui/store/bases.ts b/packages/nc-gui/store/bases.ts
index f16ea12753..cf453fbeca 100644
--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@@ -242,11 +242,15 @@ export const useBases = defineStore('basesStore', () => {
     workspaceId?: string
     type: string
     linkedDbProjectIds?: string[]
+    meta?: Record<string, unknown>
   }) => {
     const result = await api.base.create(
       {
         title: basePayload.title,
         linked_db_project_ids: basePayload.linkedDbProjectIds,
+        meta: JSON.stringify({
+          ...(basePayload.meta || {}),
+        }),
       },
       {
         baseURL: getBaseUrl('nc'),
diff --git a/packages/nc-gui/utils/colorsUtils.ts b/packages/nc-gui/utils/colorsUtils.ts
index dbb67f5612..e1e47beb52 100644
--- a/packages/nc-gui/utils/colorsUtils.ts
+++ b/packages/nc-gui/utils/colorsUtils.ts
@@ -111,6 +111,8 @@ export const baseThemeColors = [
   '#333333',
 ]
 
+export const baseIconColors = ['#36BFFF', '#FA8231', '#FCBE3A', '#27D665', '#6A7184', '#FF4A3F', '#FC3AC6', '#7D26CD']
+
 const designSystem = {
   light: [
     // '#EBF0FF',
diff --git a/packages/nocodb/src/models/Base.ts b/packages/nocodb/src/models/Base.ts
index 7d59562d48..73f1b67fb5 100644
--- a/packages/nocodb/src/models/Base.ts
+++ b/packages/nocodb/src/models/Base.ts
@@ -62,6 +62,11 @@ export default class Base implements BaseType {
       insertObj.order = await ncMeta.metaGetNextOrder(MetaTable.PROJECT, {});
     }
 
+    // stringify meta
+    if (insertObj.meta) {
+      insertObj.meta = stringifyMetaProp(insertObj);
+    }
+
     const { id: baseId } = await ncMeta.metaInsert2(
       null,
       null,
diff --git a/packages/nocodb/src/schema/swagger-v2.json b/packages/nocodb/src/schema/swagger-v2.json
index 6dba37ce76..48884eeac3 100644
--- a/packages/nocodb/src/schema/swagger-v2.json
+++ b/packages/nocodb/src/schema/swagger-v2.json
@@ -16352,6 +16352,10 @@
             "items": {
               "type": "string"
             }
+          },
+          "meta": {
+            "$ref": "#/components/schemas/Meta",
+            "description": "Base Meta"
           }
         },
         "required": [
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index a0ed0e8050..0dfe0409da 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -22522,6 +22522,10 @@
             "items": {
               "type": "string"
             }
+          },
+          "meta": {
+            "$ref": "#/components/schemas/Meta",
+            "description": "Base Meta"
           }
         },
         "required": [

From f70eab6b35f77597947cce6689cb70c4d71585a6 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:45:00 +0000
Subject: [PATCH 180/253] fix(nc-gui): PR review changes

---
 packages/nc-gui/components/general/BaseIconColorPicker.vue | 7 ++++---
 packages/nc-gui/components/general/ColorPicker.vue         | 4 ++--
 packages/nc-gui/components/general/ColorSliderWrapper.vue  | 6 +++---
 packages/nc-gui/components/smartsheet/Form.vue             | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index c8368e2303..ec4e381657 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -19,11 +19,12 @@ const props = withDefaults(
 
 const emit = defineEmits(['update:modelValue'])
 
-const { modelValue, size, readonly } = props
+const { modelValue } = toRefs(props)
+const { size, readonly } = props
 
 const isOpen = ref(false)
 
-const colorRef = ref(tinycolor(modelValue).isValid() ? modelValue : baseIconColors[0])
+const colorRef = ref(tinycolor(modelValue.value).isValid() ? modelValue.value : baseIconColors[0])
 
 const updateIconColor = (color: string) => {
   const tcolor = tinycolor(color)
@@ -43,7 +44,7 @@ const onClick = (e: Event) => {
 watch(
   isOpen,
   (value) => {
-    if (!value && colorRef.value !== modelValue) {
+    if (!value && colorRef.value !== modelValue.value) {
       emit('update:modelValue', colorRef.value)
     }
   },
diff --git a/packages/nc-gui/components/general/ColorPicker.vue b/packages/nc-gui/components/general/ColorPicker.vue
index 727d2f8ee8..98c7aedfd5 100644
--- a/packages/nc-gui/components/general/ColorPicker.vue
+++ b/packages/nc-gui/components/general/ColorPicker.vue
@@ -73,8 +73,8 @@ watch(picked, (n, _o) => {
           class="color-selector"
           :class="{ 'selected': compare(picked, color), 'new-design': isNewDesign }"
           :style="{
-            'background-color': `${color}`,
-            'border': colorBoxBorder ? `1px solid ${tinycolor(color).darken(30).toString()}` : undefined,
+            backgroundColor: `${color}`,
+            border: colorBoxBorder ? `1px solid ${tinycolor(color).darken(30).toString()}` : undefined,
           }"
           @click="selectColor(color, true)"
         >
diff --git a/packages/nc-gui/components/general/ColorSliderWrapper.vue b/packages/nc-gui/components/general/ColorSliderWrapper.vue
index 3ac7f7a7c1..4bfc2b4147 100644
--- a/packages/nc-gui/components/general/ColorSliderWrapper.vue
+++ b/packages/nc-gui/components/general/ColorSliderWrapper.vue
@@ -8,8 +8,8 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  modelValue: () => '#3069FE',
-  mode: () => 'hsv',
+  modelValue: '#3069FE',
+  mode: 'hsv',
 })
 
 const emit = defineEmits(['update:modelValue', 'input'])
@@ -30,7 +30,7 @@ const picked = computed({
     v-model="picked"
     class="nc-color-slider-wrapper min-w-[200px]"
     :style="{
-      ['--nc-color-slider-pointer']: tinycolor(`hsv(${picked.h ?? 199}, 100%, 100%)`).toHexString(),
+      '--nc-color-slider-pointer': tinycolor(`hsv(${picked.h ?? 199}, 100%, 100%)`).toHexString(),
     }"
   />
 </template>
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 1b64240091..59ad63bfa0 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -1541,8 +1541,8 @@ useEventListener(
                           '#E5D4F5',
                           '#FFCFE6',
                         ]"
-                        :color-box-border="true"
-                        :is-new-design="true"
+                        color-box-border
+                        is-new-design
                         class="nc-form-theme-color-picker !pb-0 !pl-0 -ml-1"
                         @input="handleChangeBackground"
                       />

From 5eabbb77c166037641764ac708d78fa630b97791 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:45:00 +0000
Subject: [PATCH 181/253] fix(nc-gui): add support to show base emoji if exist

---
 packages/nc-gui/components/cmd-k/index.vue             | 10 ++++++++--
 .../components/dashboard/TreeView/ProjectNode.vue      |  1 +
 .../nc-gui/components/general/BaseIconColorPicker.vue  |  7 ++++++-
 packages/nc-gui/components/workspace/ProjectList.vue   |  1 +
 .../nocodb/src/services/command-palette.service.ts     |  4 ++--
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cmd-k/index.vue b/packages/nc-gui/components/cmd-k/index.vue
index 948dbeee67..66b2a37dfb 100644
--- a/packages/nc-gui/components/cmd-k/index.vue
+++ b/packages/nc-gui/components/cmd-k/index.vue
@@ -386,8 +386,14 @@ defineExpose({
                   @click="fireAction(act)"
                 >
                   <div class="cmdk-action-content w-full">
-                    <template v-if="title === 'Bases' || act.icon === 'project'">
-                      <GeneralBaseIconColorPicker :key="act.iconColor" :color="act.iconColor" type="database" readonly>
+                    <template v-if="title === 'Bases'">
+                      <GeneralBaseIconColorPicker
+                        :key="act.iconColor"
+                        :model-value="act.iconColor"
+                        :emoji="typeof act.icon === 'string' ? act.icon : ''"
+                        type="database"
+                        readonly
+                      >
                       </GeneralBaseIconColorPicker>
                     </template>
                     <template v-else>
diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 334469dab3..1351b1aa1f 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -432,6 +432,7 @@ const projectDelete = () => {
                   :key="`${base.id}_${parseProp(base.meta).iconColor}`"
                   :type="base?.type"
                   :model-value="parseProp(base.meta).iconColor"
+                  :emoji="parseProp(base.meta).icon"
                   size="small"
                   :readonly="(base?.type && base?.type !== 'database') || !isUIAllowed('baseRename')"
                   @update:model-value="setColor($event, base)"
diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index ec4e381657..4215501d79 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -7,6 +7,7 @@ const props = withDefaults(
   defineProps<{
     type?: NcProjectType | string
     modelValue?: string
+    emoji?: string
     size?: 'small' | 'medium' | 'large' | 'xlarge'
     readonly?: boolean
     iconClass?: string
@@ -73,7 +74,11 @@ watch(
           <template #title> {{ $t('tooltip.changeIconColour') }} </template>
 
           <div>
-            <GeneralProjectIcon :color="colorRef" :type="type" />
+            <LazyGeneralEmojiPicker :key="emoji" :emoji="emoji" readonly size="small">
+              <template #default>
+                <GeneralProjectIcon :color="colorRef" :type="type" />
+              </template>
+            </LazyGeneralEmojiPicker>
           </div>
         </NcTooltip>
       </div>
diff --git a/packages/nc-gui/components/workspace/ProjectList.vue b/packages/nc-gui/components/workspace/ProjectList.vue
index 5909400f33..325f59c2b6 100644
--- a/packages/nc-gui/components/workspace/ProjectList.vue
+++ b/packages/nc-gui/components/workspace/ProjectList.vue
@@ -255,6 +255,7 @@ const setColor = async (color: string, base: BaseType) => {
                 :key="`${record.id}_${parseProp(record.meta).iconColor}`"
                 :type="record?.type"
                 :model-value="parseProp(record.meta).iconColor"
+                :emoji="parseProp(record.meta).icon"
                 :readonly="(record?.type && record?.type !== 'database') || !isUIAllowed('baseRename')"
                 @update:model-value="setColor($event, record)"
               >
diff --git a/packages/nocodb/src/services/command-palette.service.ts b/packages/nocodb/src/services/command-palette.service.ts
index 6076461a02..ccb00f39a3 100644
--- a/packages/nocodb/src/services/command-palette.service.ts
+++ b/packages/nocodb/src/services/command-palette.service.ts
@@ -28,7 +28,7 @@ export class CommandPaletteService {
           cmdData.push({
             id: `p-${base.id}`,
             title: base.title,
-            icon: 'project',
+            icon: deserializeJSON(base.meta)?.icon,
             iconColor: deserializeJSON(base.meta)?.iconColor,
             section: 'Bases',
             scopePayload: {
@@ -71,7 +71,7 @@ export class CommandPaletteService {
           cmdData.push({
             id: `p-${b.id}`,
             title: b.title,
-            icon: 'project',
+            icon: deserializeJSON(b.meta)?.icon,
             iconColor: deserializeJSON(b.meta)?.iconColor,
             section: 'Bases',
           });

From 5c089aa8736f186aefe42c4bedca5b52b5b7ea8e Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:45:00 +0000
Subject: [PATCH 182/253] fix(nc-gui): update prefillform info tooltip text

---
 packages/nc-gui/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 90092a7530..c4c4e88232 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -967,7 +967,7 @@
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
     "changeIconColour": "Change icon colour",
-    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {

From 5baa8da556efd4e33fa05da996a3a6357cbdb82e Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:45:01 +0000
Subject: [PATCH 183/253] fix(nc-gui): revert show base emoji if exist changes

---
 packages/nc-gui/components/cmd-k/index.vue             | 10 ++--------
 .../components/dashboard/TreeView/ProjectNode.vue      |  1 -
 .../nc-gui/components/general/BaseIconColorPicker.vue  |  9 ++-------
 packages/nc-gui/components/workspace/ProjectList.vue   |  1 -
 .../nocodb/src/services/command-palette.service.ts     |  4 ++--
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/packages/nc-gui/components/cmd-k/index.vue b/packages/nc-gui/components/cmd-k/index.vue
index 66b2a37dfb..f7320a430f 100644
--- a/packages/nc-gui/components/cmd-k/index.vue
+++ b/packages/nc-gui/components/cmd-k/index.vue
@@ -386,14 +386,8 @@ defineExpose({
                   @click="fireAction(act)"
                 >
                   <div class="cmdk-action-content w-full">
-                    <template v-if="title === 'Bases'">
-                      <GeneralBaseIconColorPicker
-                        :key="act.iconColor"
-                        :model-value="act.iconColor"
-                        :emoji="typeof act.icon === 'string' ? act.icon : ''"
-                        type="database"
-                        readonly
-                      >
+                    <template v-if="title === 'Bases' || act.icon === 'project'">
+                      <GeneralBaseIconColorPicker :key="act.iconColor" :model-value="act.iconColor" type="database" readonly>
                       </GeneralBaseIconColorPicker>
                     </template>
                     <template v-else>
diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 1351b1aa1f..334469dab3 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -432,7 +432,6 @@ const projectDelete = () => {
                   :key="`${base.id}_${parseProp(base.meta).iconColor}`"
                   :type="base?.type"
                   :model-value="parseProp(base.meta).iconColor"
-                  :emoji="parseProp(base.meta).icon"
                   size="small"
                   :readonly="(base?.type && base?.type !== 'database') || !isUIAllowed('baseRename')"
                   @update:model-value="setColor($event, base)"
diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 4215501d79..0951d68510 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -7,7 +7,6 @@ const props = withDefaults(
   defineProps<{
     type?: NcProjectType | string
     modelValue?: string
-    emoji?: string
     size?: 'small' | 'medium' | 'large' | 'xlarge'
     readonly?: boolean
     iconClass?: string
@@ -59,7 +58,7 @@ watch(
   <div>
     <a-dropdown v-model:visible="isOpen" :trigger="['click']" :disabled="readonly">
       <div
-        class="flex flex-row justify-center items-center select-none rounded-md nc-emoji"
+        class="flex flex-row justify-center items-center select-none rounded-md nc-base-icon-picker-trigger"
         :class="{
           'hover:bg-gray-500 hover:bg-opacity-15 cursor-pointer': !readonly,
           'bg-gray-500 bg-opacity-15': isOpen,
@@ -74,11 +73,7 @@ watch(
           <template #title> {{ $t('tooltip.changeIconColour') }} </template>
 
           <div>
-            <LazyGeneralEmojiPicker :key="emoji" :emoji="emoji" readonly size="small">
-              <template #default>
-                <GeneralProjectIcon :color="colorRef" :type="type" />
-              </template>
-            </LazyGeneralEmojiPicker>
+            <GeneralProjectIcon :color="colorRef" :type="type" />
           </div>
         </NcTooltip>
       </div>
diff --git a/packages/nc-gui/components/workspace/ProjectList.vue b/packages/nc-gui/components/workspace/ProjectList.vue
index 325f59c2b6..5909400f33 100644
--- a/packages/nc-gui/components/workspace/ProjectList.vue
+++ b/packages/nc-gui/components/workspace/ProjectList.vue
@@ -255,7 +255,6 @@ const setColor = async (color: string, base: BaseType) => {
                 :key="`${record.id}_${parseProp(record.meta).iconColor}`"
                 :type="record?.type"
                 :model-value="parseProp(record.meta).iconColor"
-                :emoji="parseProp(record.meta).icon"
                 :readonly="(record?.type && record?.type !== 'database') || !isUIAllowed('baseRename')"
                 @update:model-value="setColor($event, record)"
               >
diff --git a/packages/nocodb/src/services/command-palette.service.ts b/packages/nocodb/src/services/command-palette.service.ts
index ccb00f39a3..6076461a02 100644
--- a/packages/nocodb/src/services/command-palette.service.ts
+++ b/packages/nocodb/src/services/command-palette.service.ts
@@ -28,7 +28,7 @@ export class CommandPaletteService {
           cmdData.push({
             id: `p-${base.id}`,
             title: base.title,
-            icon: deserializeJSON(base.meta)?.icon,
+            icon: 'project',
             iconColor: deserializeJSON(base.meta)?.iconColor,
             section: 'Bases',
             scopePayload: {
@@ -71,7 +71,7 @@ export class CommandPaletteService {
           cmdData.push({
             id: `p-${b.id}`,
             title: b.title,
-            icon: deserializeJSON(b.meta)?.icon,
+            icon: 'project',
             iconColor: deserializeJSON(b.meta)?.iconColor,
             section: 'Bases',
           });

From 95507c1896493dae58bb0d6a7eb1e481c9728113 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:45:01 +0000
Subject: [PATCH 184/253] fix(nc-gui): base icon predefined color lightness
 issue

---
 .../general/BaseIconColorPicker.vue           |  2 +-
 .../nc-gui/components/general/ProjectIcon.vue | 32 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index 0951d68510..d88ca36ebb 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import tinycolor from 'tinycolor2'
 
-import { NcProjectType } from '#imports'
+import { NcProjectType, baseIconColors } from '#imports'
 
 const props = withDefaults(
   defineProps<{
diff --git a/packages/nc-gui/components/general/ProjectIcon.vue b/packages/nc-gui/components/general/ProjectIcon.vue
index 857bbd4fbe..e926f38c5c 100644
--- a/packages/nc-gui/components/general/ProjectIcon.vue
+++ b/packages/nc-gui/components/general/ProjectIcon.vue
@@ -1,24 +1,28 @@
 <script lang="ts" setup>
 import tinycolor from 'tinycolor2'
-const { hoverable, color } = defineProps<{
-  type?: string
-  hoverable?: boolean
-  color?: string
-}>()
+import { baseIconColors } from '#imports'
+
+const props = withDefaults(
+  defineProps<{
+    type?: string
+    hoverable?: boolean
+    color?: string
+  }>(),
+  {
+    color: baseIconColors[0],
+  },
+)
+const { color } = toRefs(props)
 
 const iconColor = computed(() => {
-  return color
+  return color.value && tinycolor(color.value).isValid()
     ? {
-        tint: tinycolor(color || '#36BFFF')
-          .lighten(10)
-          .toHexString(),
-        shade: tinycolor(color || '#36BFFF')
-          .darken(40)
-          .toHexString(),
+        tint: baseIconColors.includes(color.value) ? color.value : tinycolor(color.value).lighten(10).toHexString(),
+        shade: tinycolor(color.value).darken(40).toHexString(),
       }
     : {
-        tint: '#36BFFF',
-        shade: '#142966',
+        tint: baseIconColors[0],
+        shade: tinycolor(baseIconColors[0]).darken(40).toHexString(),
       }
 })
 </script>

From 0884327f437e0cba5cb584a9c33dfe911006d69a Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 12 Mar 2024 12:15:24 +0530
Subject: [PATCH 185/253] fix: missing calendar optmzin on oss

---
 .../calendar/DayView/DateTimeField.vue        | 91 +++++++++---------
 .../smartsheet/calendar/MonthView.vue         | 93 ++++++++++---------
 .../calendar/WeekView/DateTimeField.vue       | 91 +++++++++---------
 3 files changed, 139 insertions(+), 136 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index db85b39042..412c3c822a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -969,51 +969,52 @@ const newRecord = (hour: dayjs.Dayjs) => {
     </div>
     <div class="absolute inset-0 pointer-events-none">
       <div class="relative !ml-[60px]" data-testid="nc-calendar-day-record-container">
-        <div
-          v-for="(record, rowIndex) in recordsAcrossAllRange.record"
-          :key="rowIndex"
-          :data-testid="`nc-calendar-day-record-${record.row[displayField!.title!]}`"
-          :data-unique-id="record.rowMeta.id"
-          :style="record.rowMeta.style"
-          class="absolute draggable-record group cursor-pointer pointer-events-auto"
-          @mousedown="dragStart($event, record)"
-          @mouseleave="hoverRecord = null"
-          @mouseover="hoverRecord = record.rowMeta.id as string"
-          @dragover.prevent
-        >
-          <LazySmartsheetRow :row="record">
-            <LazySmartsheetCalendarVRecordCard
-              :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
-              :selected="record.rowMeta.id === dragRecord?.rowMeta?.id"
-              :position="record.rowMeta!.position"
-              :record="record"
-              :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
-              color="blue"
-              @resize-start="onResizeStart"
-            >
-              <template v-if="!isRowEmpty(record, displayField)">
-                <LazySmartsheetCalendarCell
-                  v-if="!isRowEmpty(record, displayField!)"
-                  v-model="record.row[displayField!.title!]"
-                  :bold="getFieldStyle(displayField!).bold"
-                  :column="displayField!"
-                  :italic="getFieldStyle(displayField!).italic"
-                  :underline="getFieldStyle(displayField!).underline"
-                />
-              </template>
-              <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
-                <LazySmartsheetCalendarCell
-                  v-if="!isRowEmpty(record, field!)"
-                  v-model="record.row[field!.title!]"
-                  :bold="getFieldStyle(field).bold"
-                  :column="field"
-                  :italic="getFieldStyle(field).italic"
-                  :underline="getFieldStyle(field).underline"
-                />
-              </template>
-            </LazySmartsheetCalendarVRecordCard>
-          </LazySmartsheetRow>
-        </div>
+        <template v-for="(record, rowIndex) in recordsAcrossAllRange.record" :key="rowIndex">
+          <div
+            v-if="record.rowMeta.style?.display !== 'none'"
+            :data-testid="`nc-calendar-day-record-${record.row[displayField!.title!]}`"
+            :data-unique-id="record.rowMeta.id"
+            :style="record.rowMeta.style"
+            class="absolute draggable-record group cursor-pointer pointer-events-auto"
+            @mousedown="dragStart($event, record)"
+            @mouseleave="hoverRecord = null"
+            @mouseover="hoverRecord = record.rowMeta.id as string"
+            @dragover.prevent
+          >
+            <LazySmartsheetRow :row="record">
+              <LazySmartsheetCalendarVRecordCard
+                :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
+                :selected="record.rowMeta.id === dragRecord?.rowMeta?.id"
+                :position="record.rowMeta!.position"
+                :record="record"
+                :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
+                color="blue"
+                @resize-start="onResizeStart"
+              >
+                <template v-if="!isRowEmpty(record, displayField)">
+                  <LazySmartsheetCalendarCell
+                    v-if="!isRowEmpty(record, displayField!)"
+                    v-model="record.row[displayField!.title!]"
+                    :bold="getFieldStyle(displayField!).bold"
+                    :column="displayField!"
+                    :italic="getFieldStyle(displayField!).italic"
+                    :underline="getFieldStyle(displayField!).underline"
+                  />
+                </template>
+                <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
+                  <LazySmartsheetCalendarCell
+                    v-if="!isRowEmpty(record, field!)"
+                    v-model="record.row[field!.title!]"
+                    :bold="getFieldStyle(field).bold"
+                    :column="field"
+                    :italic="getFieldStyle(field).italic"
+                    :underline="getFieldStyle(field).underline"
+                  />
+                </template>
+              </LazySmartsheetCalendarVRecordCard>
+            </LazySmartsheetRow>
+          </div>
+        </template>
       </div>
     </div>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 020f665540..c95915106a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -772,52 +772,53 @@ const addRecord = (date: dayjs.Dayjs) => {
       </div>
     </div>
     <div class="absolute inset-0 pointer-events-none mt-8 pb-7.5" data-testid="nc-calendar-month-record-container">
-      <div
-        v-for="(record, recordIndex) in recordsToDisplay.records"
-        :key="recordIndex"
-        :data-testid="`nc-calendar-month-record-${record.row[displayField!.title!]}`"
-        :data-unique-id="record.rowMeta.id"
-        :style="{
-          ...record.rowMeta.style,
-          zIndex: record.rowMeta.id === draggingId ? 100 : 0,
-        }"
-        class="absolute group draggable-record cursor-pointer pointer-events-auto"
-        @mouseleave="hoverRecord = null"
-        @mouseover="hoverRecord = record.rowMeta.id"
-        @mousedown.stop="dragStart($event, record)"
-      >
-        <LazySmartsheetRow :row="record">
-          <LazySmartsheetCalendarRecordCard
-            :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === draggingId"
-            :position="record.rowMeta.position"
-            :record="record"
-            :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
-            :selected="dragRecord?.rowMeta?.id === record.rowMeta.id || resizeRecord?.rowMeta?.id === record.rowMeta.id"
-            @resize-start="onResizeStart"
-            @dblclick.stop="emit('expandRecord', record)"
-          >
-            <template v-if="!isRowEmpty(record, displayField)">
-              <LazySmartsheetCalendarCell
-                v-model="record.row[displayField!.title!]"
-                :bold="getFieldStyle(displayField).bold"
-                :column="displayField"
-                :italic="getFieldStyle(displayField).italic"
-                :underline="getFieldStyle(displayField).underline"
-              />
-            </template>
-            <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
-              <LazySmartsheetCalendarCell
-                v-if="!isRowEmpty(record, field!)"
-                v-model="record.row[field!.title!]"
-                :bold="getFieldStyle(field).bold"
-                :column="field"
-                :italic="getFieldStyle(field).italic"
-                :underline="getFieldStyle(field).underline"
-              />
-            </template>
-          </LazySmartsheetCalendarRecordCard>
-        </LazySmartsheetRow>
-      </div>
+      <template v-for="(record, recordIndex) in recordsToDisplay.records" :key="recordIndex">
+        <div
+          v-if="record.rowMeta.style?.display !== 'none'"
+          :data-testid="`nc-calendar-month-record-${record.row[displayField!.title!]}`"
+          :data-unique-id="record.rowMeta.id"
+          :style="{
+            ...record.rowMeta.style,
+            zIndex: record.rowMeta.id === draggingId ? 100 : 0,
+          }"
+          class="absolute group draggable-record cursor-pointer pointer-events-auto"
+          @mouseleave="hoverRecord = null"
+          @mouseover="hoverRecord = record.rowMeta.id"
+          @mousedown.stop="dragStart($event, record)"
+        >
+          <LazySmartsheetRow :row="record">
+            <LazySmartsheetCalendarRecordCard
+              :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === draggingId"
+              :position="record.rowMeta.position"
+              :record="record"
+              :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
+              :selected="dragRecord?.rowMeta?.id === record.rowMeta.id || resizeRecord?.rowMeta?.id === record.rowMeta.id"
+              @resize-start="onResizeStart"
+              @dblclick.stop="emit('expandRecord', record)"
+            >
+              <template v-if="!isRowEmpty(record, displayField)">
+                <LazySmartsheetCalendarCell
+                  v-model="record.row[displayField!.title!]"
+                  :bold="getFieldStyle(displayField).bold"
+                  :column="displayField"
+                  :italic="getFieldStyle(displayField).italic"
+                  :underline="getFieldStyle(displayField).underline"
+                />
+              </template>
+              <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
+                <LazySmartsheetCalendarCell
+                  v-if="!isRowEmpty(record, field!)"
+                  v-model="record.row[field!.title!]"
+                  :bold="getFieldStyle(field).bold"
+                  :column="field"
+                  :italic="getFieldStyle(field).italic"
+                  :underline="getFieldStyle(field).underline"
+                />
+              </template>
+            </LazySmartsheetCalendarRecordCard>
+          </LazySmartsheetRow>
+        </div>
+      </template>
     </div>
   </div>
 </template>
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index ec1bb35475..6b9544bca7 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -805,51 +805,52 @@ const addRecord = (date: dayjs.Dayjs) => {
         class="absolute pointer-events-none inset-0 overflow-hidden !mt-[29px]"
         data-testid="nc-calendar-week-record-container"
       >
-        <div
-          v-for="(record, rowIndex) in recordsAcrossAllRange.records"
-          :key="rowIndex"
-          :data-testid="`nc-calendar-week-record-${record.row[displayField!.title!]}`"
-          :data-unique-id="record.rowMeta!.id"
-          :style="record.rowMeta!.style "
-          class="absolute draggable-record w-1/7 group cursor-pointer pointer-events-auto"
-          @mousedown.stop="dragStart($event, record)"
-          @mouseleave="hoverRecord = null"
-          @mouseover="hoverRecord = record.rowMeta.id"
-          @dragover.prevent
-        >
-          <LazySmartsheetRow :row="record">
-            <LazySmartsheetCalendarVRecordCard
-              :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
-              :position="record.rowMeta!.position"
-              :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
-              :record="record"
-              color="blue"
-              :selected="record.rowMeta!.id === dragRecord?.rowMeta?.id"
-              @resize-start="onResizeStart"
-            >
-              <template v-if="!isRowEmpty(record, displayField)">
-                <LazySmartsheetCalendarCell
-                  v-if="!isRowEmpty(record, displayField!)"
-                  v-model="record.row[displayField!.title!]"
-                  :bold="getFieldStyle(displayField).bold"
-                  :column="displayField"
-                  :italic="getFieldStyle(displayField).italic"
-                  :underline="getFieldStyle(displayField).underline"
-                />
-              </template>
-              <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
-                <LazySmartsheetCalendarCell
-                  v-if="!isRowEmpty(record, field!)"
-                  v-model="record.row[field!.title!]"
-                  :bold="getFieldStyle(field).bold"
-                  :column="field"
-                  :italic="getFieldStyle(field).italic"
-                  :underline="getFieldStyle(field).underline"
-                />
-              </template>
-            </LazySmartsheetCalendarVRecordCard>
-          </LazySmartsheetRow>
-        </div>
+        <template v-for="(record, rowIndex) in recordsAcrossAllRange.records" :key="rowIndex">
+          <div
+            v-if="record.rowMeta.style?.display !== 'none'"
+            :data-testid="`nc-calendar-week-record-${record.row[displayField!.title!]}`"
+            :data-unique-id="record.rowMeta!.id"
+            :style="record.rowMeta!.style "
+            class="absolute draggable-record w-1/7 group cursor-pointer pointer-events-auto"
+            @mousedown.stop="dragStart($event, record)"
+            @mouseleave="hoverRecord = null"
+            @mouseover="hoverRecord = record.rowMeta.id"
+            @dragover.prevent
+          >
+            <LazySmartsheetRow :row="record">
+              <LazySmartsheetCalendarVRecordCard
+                :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
+                :position="record.rowMeta!.position"
+                :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
+                :record="record"
+                color="blue"
+                :selected="record.rowMeta!.id === dragRecord?.rowMeta?.id"
+                @resize-start="onResizeStart"
+              >
+                <template v-if="!isRowEmpty(record, displayField)">
+                  <LazySmartsheetCalendarCell
+                    v-if="!isRowEmpty(record, displayField!)"
+                    v-model="record.row[displayField!.title!]"
+                    :bold="getFieldStyle(displayField).bold"
+                    :column="displayField"
+                    :italic="getFieldStyle(displayField).italic"
+                    :underline="getFieldStyle(displayField).underline"
+                  />
+                </template>
+                <template v-for="(field, id) in fieldsWithoutDisplay" :key="id">
+                  <LazySmartsheetCalendarCell
+                    v-if="!isRowEmpty(record, field!)"
+                    v-model="record.row[field!.title!]"
+                    :bold="getFieldStyle(field).bold"
+                    :column="field"
+                    :italic="getFieldStyle(field).italic"
+                    :underline="getFieldStyle(field).underline"
+                  />
+                </template>
+              </LazySmartsheetCalendarVRecordCard>
+            </LazySmartsheetRow>
+          </div>
+        </template>
       </div>
     </div>
   </div>

From b1e28ae66fdc6ed6947e4d1888311ef1d7c467ea Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 12 Mar 2024 07:23:56 +0000
Subject: [PATCH 186/253] fix(nc-gui): row height menu dropdown ui changes

---
 .../smartsheet/toolbar/RowHeight.vue          | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue b/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
index 9679db74ed..8caed6f502 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
@@ -3,6 +3,25 @@ import { OrgUserRoles, ProjectRoles, extractRolesObj } from 'nocodb-sdk'
 import type { GridType } from 'nocodb-sdk'
 import { ActiveViewInj, IsLockedInj, iconMap, inject, ref, storeToRefs, useMenuCloseOnEsc, useUndoRedo } from '#imports'
 
+const rowHeightOptions: { icon: keyof typeof iconMap; heightClass: string }[] = [
+  {
+    icon: 'heightShort',
+    heightClass: 'short',
+  },
+  {
+    icon: 'heightMedium',
+    heightClass: 'medium',
+  },
+  {
+    icon: 'heightTall',
+    heightClass: 'tall',
+  },
+  {
+    icon: 'heightExtra',
+    heightClass: 'extra',
+  },
+]
+
 const { isSharedBase } = storeToRefs(useBase())
 
 const view = inject(ActiveViewInj, ref())
@@ -75,38 +94,21 @@ useMenuCloseOnEsc(open)
     </div>
     <template #overlay>
       <div
-        class="w-full bg-white shadow-lg p-1.5 menu-filter-dropdown border-1 border-gray-200 rounded-md overflow-hidden"
+        class="w-full bg-white shadow-lg p-1.5 menu-filter-dropdown border-1 border-gray-200 rounded-md overflow-hidden w-[160px]"
         data-testid="nc-height-menu"
       >
         <div class="flex flex-col w-full text-sm" @click.stop>
           <div class="text-xs text-gray-500 px-3 pt-2 pb-1 select-none">{{ $t('objects.rowHeight') }}</div>
-          <div class="nc-row-height-option" @click="updateRowHeight(0)">
-            <GeneralIcon icon="heightShort" class="nc-row-height-icon" />
-            {{ $t('objects.heightClass.short') }}
-            <component :is="iconMap.check" v-if="!(view?.view as GridType).row_height" class="text-primary w-4 h-4" />
-          </div>
-          <div class="nc-row-height-option" @click="updateRowHeight(1)">
-            <GeneralIcon icon="heightMedium" class="nc-row-height-icon" />
-            {{ $t('objects.heightClass.medium') }}
-            <component :is="iconMap.check" v-if=" (view?.view as GridType).row_height === 1" class="text-primary w-4 h-4" />
-          </div>
-          <div
-            class="nc-row-height-option"
-            :class="{'active': (view?.view as GridType).row_height === 2}"
-            @click="updateRowHeight(2)"
-          >
-            <GeneralIcon icon="heightTall" class="nc-row-height-icon" />
-            {{ $t('objects.heightClass.tall') }}
-            <component :is="iconMap.check" v-if=" (view?.view as GridType).row_height === 2" class="text-primary w-4 h-4" />
-          </div>
-          <div
-            class="nc-row-height-option"
-            :class="{'active': (view?.view as GridType).row_height === 3}"
-            @click="updateRowHeight(3)"
-          >
-            <GeneralIcon icon="heightExtra" class="nc-row-height-icon" />
-            {{ $t('objects.heightClass.extra') }}
-            <component :is="iconMap.check" v-if=" (view?.view as GridType).row_height === 3" class="text-primary w-4 h-4" />
+          <div v-for="(item, i) of rowHeightOptions" class="nc-row-height-option" @click="updateRowHeight(i)">
+            <div class="flex items-center gap-2">
+              <GeneralIcon :icon="item.icon" class="nc-row-height-icon" />
+              {{ $t(`objects.heightClass.${item.heightClass}`) }}
+            </div>
+            <component
+              :is="iconMap.check"
+              v-if="i === 0 ? !(view?.view as GridType).row_height: (view?.view as GridType).row_height === i"
+              class="text-primary w-4 h-4"
+            />
           </div>
         </div>
       </div>
@@ -116,7 +118,7 @@ useMenuCloseOnEsc(open)
 
 <style scoped>
 .nc-row-height-option {
-  @apply flex items-center gap-2 p-2 justify-start hover:bg-gray-100 rounded-md cursor-pointer text-gray-600;
+  @apply flex items-center gap-2 p-2 justify-between hover:bg-gray-100 rounded-md cursor-pointer text-gray-600;
 }
 
 .nc-row-height-icon {

From 6125c2fca3c7b9a130c46612118bbb61fdf6a9c9 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 12 Mar 2024 11:09:14 +0000
Subject: [PATCH 187/253] feat: gui

---
 packages/nc-gui/components/nc/Modal.vue       |  12 +-
 .../components/project/AccessSettings.vue     |  20 +-
 .../components/project/ShareBaseDlg.vue       | 296 ++++++++++++++++++
 packages/nc-gui/components/roles/Selector.vue |   2 +-
 .../components/workspace/InviteSection.vue    |   2 +-
 packages/nc-gui/lang/en.json                  |   4 +
 packages/nocodb/src/schema/swagger.json       |   1 -
 7 files changed, 330 insertions(+), 7 deletions(-)
 create mode 100644 packages/nc-gui/components/project/ShareBaseDlg.vue

diff --git a/packages/nc-gui/components/nc/Modal.vue b/packages/nc-gui/components/nc/Modal.vue
index 564fb50d73..f85dc9824f 100644
--- a/packages/nc-gui/components/nc/Modal.vue
+++ b/packages/nc-gui/components/nc/Modal.vue
@@ -6,19 +6,21 @@ const props = withDefaults(
     size?: 'small' | 'medium' | 'large'
     destroyOnClose?: boolean
     maskClosable?: boolean
+    showSeparator?: boolean
     wrapClassName?: string
   }>(),
   {
     size: 'medium',
     destroyOnClose: true,
     maskClosable: true,
+    showSeparator: true,
     wrapClassName: '',
   },
 )
 
 const emits = defineEmits(['update:visible'])
 
-const { width: propWidth, destroyOnClose, maskClosable, wrapClassName: _wrapClassName } = props
+const { width: propWidth, destroyOnClose, maskClosable, wrapClassName: _wrapClassName, showSeparator } = props
 
 const { isMobileMode } = useGlobal()
 
@@ -98,7 +100,13 @@ const slots = useSlots()
         maxHeight: height,
       }"
     >
-      <div v-if="slots.header" class="flex pb-2 mb-2 text-lg font-medium border-b-1 border-gray-100">
+      <div
+        v-if="slots.header"
+        :class="{
+          'border-b-1 border-gray-100': showSeparator,
+        }"
+        class="flex pb-2 mb-2 text-lg font-medium"
+      >
         <slot name="header" />
       </div>
 
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 9070a744c2..fa0516e241 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -9,8 +9,8 @@ import {
   timeAgo,
 } from 'nocodb-sdk'
 import type { Roles, WorkspaceUserRoles } from 'nocodb-sdk'
-import { isEeUI, storeToRefs, useUserSorts } from '#imports'
 import type { User } from '#imports'
+import { isEeUI, storeToRefs, useUserSorts } from '#imports'
 
 const basesStore = useBases()
 const { getBaseUsers, createProjectUser, updateProjectUser, removeProjectUser } = basesStore
@@ -22,6 +22,8 @@ const { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData } = u
 
 const isSuper = computed(() => orgRoles.value?.[OrgUserRoles.SUPER_ADMIN])
 
+const isInviteModalVisible = ref(false)
+
 interface Collaborators {
   id: string
   email: string
@@ -132,20 +134,34 @@ onMounted(async () => {
     isLoading.value = false
   }
 })
+
+watch(isInviteModalVisible, () => {
+  if (!isInviteModalVisible.value) {
+    loadCollaborators()
+  }
+})
 </script>
 
 <template>
   <div class="nc-collaborator-table-container mt-4 nc-access-settings-view h-[calc(100vh-8rem)]">
+    <LazyProjectShareBaseDlg v-model:model-value="isInviteModalVisible" />
     <div v-if="isLoading" class="nc-collaborators-list items-center justify-center">
       <GeneralLoader size="xlarge" />
     </div>
     <template v-else>
-      <div class="w-full flex flex-row justify-between items-baseline mt-6.5 mb-2 pr-0.25">
+      <div class="w-full flex flex-row justify-between items-baseline max-w-350 mt-6.5 mb-2 pr-0.25">
         <a-input v-model:value="userSearchText" class="!max-w-90 !rounded-md" :placeholder="$t('title.searchMembers')">
           <template #prefix>
             <PhMagnifyingGlassBold class="!h-3.5 text-gray-500" />
           </template>
         </a-input>
+
+        <NcButton size="small" @click="isInviteModalVisible = true">
+          <div class="flex gap-1">
+            <component :is="iconMap.plus" class="w-4 h-4" />
+            {{ $t('activity.addMembers') }}
+          </div>
+        </NcButton>
       </div>
 
       <div v-if="isSearching" class="nc-collaborators-list items-center justify-center">
diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/project/ShareBaseDlg.vue
new file mode 100644
index 0000000000..82c775172a
--- /dev/null
+++ b/packages/nc-gui/components/project/ShareBaseDlg.vue
@@ -0,0 +1,296 @@
+<script setup lang="ts">
+import { OrderedProjectRoles, ProjectRoles } from 'nocodb-sdk'
+import type { User } from '#imports'
+const props = defineProps<{
+  modelValue: boolean
+  baseId: string
+}>()
+const emit = defineEmits(['update:modelValue'])
+
+const dialogShow = useVModel(props, 'modelValue', emit)
+
+const inviteData = reactive({
+  email: '',
+  roles: ProjectRoles.NO_ACCESS,
+})
+
+const { baseRoles } = useRoles()
+
+const basesStore = useBases()
+
+const { activeProjectId } = storeToRefs(basesStore)
+
+const { createProjectUser } = basesStore
+
+const divRef = ref<HTMLDivElement>()
+
+const focusRef = ref<HTMLInputElement>()
+const isDivFocused = ref(false)
+
+const emailValidation = reactive({
+  isError: true,
+  message: '',
+})
+
+const allowedRoles = ref<ProjectRoles[]>([])
+
+onMounted(async () => {
+  try {
+    const currentRoleIndex = OrderedProjectRoles.findIndex(
+      (role) => baseRoles.value && Object.keys(baseRoles.value).includes(role),
+    )
+    if (currentRoleIndex !== -1) {
+      allowedRoles.value = OrderedProjectRoles.slice(currentRoleIndex + 1).filter((r) => r)
+    }
+  } catch (e: any) {
+    message.error(await extractSdkResponseErrorMsg(e))
+  }
+})
+const singleEmailValue = ref('')
+
+const emailBadges = ref<Array<string>>([])
+
+const insertOrUpdateString = (str: string) => {
+  // Check if the string already exists in the array
+  const index = emailBadges.value.indexOf(str)
+
+  if (index !== -1) {
+    // If the string exists, remove it
+    emailBadges.value.splice(index, 1)
+  }
+
+  // Add the new string to the array
+  emailBadges.value.push(str)
+}
+
+const emailInputValidation = (input: string): boolean => {
+  if (!input.length) {
+    emailValidation.isError = true
+    emailValidation.message = 'Email should not be empty'
+    return false
+  }
+  if (!validateEmail(input.trim())) {
+    emailValidation.isError = true
+    emailValidation.message = 'Invalid Email'
+    return false
+  }
+  return true
+}
+
+const isInvitButtonDiabled = computed(() => {
+  if (!emailBadges.value.length && !singleEmailValue.value.length) {
+    return true
+  }
+  if (emailBadges.value.length && inviteData.email) {
+    return true
+  }
+})
+
+watch(inviteData, (newVal) => {
+  // when user only want to enter a single email
+  // we dont convert that as badge
+
+  const isSingleEmailValid = validateEmail(newVal.email)
+  if (isSingleEmailValid && !emailBadges.value.length) {
+    singleEmailValue.value = newVal.email
+    emailValidation.isError = false
+    return
+  }
+  singleEmailValue.value = ''
+
+  // when user enters multiple emails comma sepearted or space sepearted
+  const isNewEmail = newVal.email.charAt(newVal.email.length - 1) === ',' || newVal.email.charAt(newVal.email.length - 1) === ' '
+  if (isNewEmail && newVal.email.trim().length) {
+    const emailToAdd = newVal.email.split(',')[0].trim() || newVal.email.split(' ')[0].trim()
+    if (!validateEmail(emailToAdd)) {
+      emailValidation.isError = true
+      emailValidation.message = 'Invalid Email'
+      return
+    }
+    /**
+     if email is already enterd we delete the already
+     existing email and add new one
+     **/
+    if (emailBadges.value.includes(emailToAdd)) {
+      insertOrUpdateString(emailToAdd)
+      inviteData.email = ''
+      return
+    }
+    emailBadges.value.push(emailToAdd)
+    inviteData.email = ''
+    singleEmailValue.value = ''
+  }
+  if (!newVal.email.length && emailValidation.isError) {
+    emailValidation.isError = false
+  }
+})
+
+const handleEnter = () => {
+  const isEmailIsValid = emailInputValidation(inviteData.email)
+  if (!isEmailIsValid) return
+
+  inviteData.email += ' '
+  emailValidation.isError = false
+  emailValidation.message = ''
+}
+
+const focusOnDiv = () => {
+  focusRef.value?.focus()
+  isDivFocused.value = true
+}
+
+// remove one email per backspace
+onKeyStroke('Backspace', () => {
+  if (isDivFocused.value && inviteData.email.length < 1) {
+    emailBadges.value.pop()
+  }
+})
+
+watch(dialogShow, (newVal) => {
+  if (newVal) {
+    setTimeout(() => {
+      focusOnDiv()
+    }, 100)
+  }
+})
+
+// when bulk email is pasted
+const onPaste = (e: ClipboardEvent) => {
+  const pastedText = e.clipboardData?.getData('text')
+
+  const inputArray = pastedText?.split(',') || pastedText?.split(' ')
+
+  // if data is pasted to a already existing text in input
+  // we add existingInput + pasted data
+  if (inputArray?.length === 1 && inviteData.email.length) {
+    inputArray[0] = inviteData.email += inputArray[0]
+  }
+
+  inputArray?.forEach((el) => {
+    const isEmailIsValid = emailInputValidation(el)
+
+    if (!isEmailIsValid) return
+
+    /**
+     if email is already enterd we delete the already
+     existing email and add new one
+     **/
+    if (emailBadges.value.includes(el)) {
+      insertOrUpdateString(el)
+      return
+    }
+    emailBadges.value.push(el)
+
+    inviteData.email = ''
+  })
+  inviteData.email = ''
+}
+
+const inviteProjectCollaborator = async () => {
+  try {
+    const payloadData = singleEmailValue.value || emailBadges.value.join(',')
+    if (!payloadData.includes(',')) {
+      const validationStatus = validateEmail(payloadData)
+      if (!validationStatus) {
+        emailValidation.isError = true
+        emailValidation.message = 'invalid email'
+      }
+    }
+    await createProjectUser(activeProjectId.value!, {
+      email: payloadData,
+      roles: inviteData.roles,
+    } as unknown as User)
+
+    message.success('Invitation sent successfully')
+    inviteData.email = ''
+    emailBadges.value = []
+    dialogShow.value = false
+  } catch (e: any) {
+    message.error(await extractSdkResponseErrorMsg(e))
+  } finally {
+    singleEmailValue.value = ''
+  }
+}
+</script>
+
+<template>
+  <NcModal
+    v-model:visible="dialogShow"
+    :show-separator="false"
+    :header="$t('activity.createTable')"
+    size="medium"
+    @keydown.esc="dialogShow = false"
+  >
+    <template #header>
+      <div class="flex flex-row items-center gap-x-2">
+        {{ $t('activity.addMember') }}
+      </div>
+    </template>
+    <div class="flex items-center justify-between gap-3 mt-2">
+      <div class="flex w-full flex-col">
+        <div class="flex justify-between gap-3 w-full">
+          <div
+            ref="divRef"
+            class="flex items-center border-1 gap-1 w-full overflow-x-scroll nc-scrollbar-x-md items-center h-10 rounded-lg !min-w-96"
+            tabindex="0"
+            :class="{
+              'border-primary/100': isDivFocused,
+              'p-1': emailBadges?.length > 1,
+            }"
+            @click="focusOnDiv"
+            @blur="isDivFocused = false"
+          >
+            <span
+              v-for="(email, index) in emailBadges"
+              :key="email"
+              class="border-1 text-gray-800 bg-gray-100 rounded-md flex items-center px-2 py-1"
+            >
+              {{ email }}
+              <component
+                :is="iconMap.close"
+                class="ml-0.5 hover:cursor-pointer mt-0.5 w-4 h-4"
+                @click="emailBadges.splice(index, 1)"
+              />
+            </span>
+            <input
+              id="email"
+              ref="focusRef"
+              v-model="inviteData.email"
+              :placeholder="$t('activity.enterEmail')"
+              class="w-full min-w-36 outline-none px-2"
+              data-testid="email-input"
+              @keyup.enter="handleEnter"
+              @blur="isDivFocused = false"
+              @paste.prevent="onPaste"
+            />
+          </div>
+          <RolesSelector
+            size="lg"
+            class="nc-invite-role-selector"
+            :role="inviteData.roles"
+            :roles="allowedRoles"
+            :on-role-change="(role: ProjectRoles) => (inviteData.roles = role)"
+            :description="false"
+          />
+        </div>
+
+        <span v-if="emailValidation.isError && emailValidation.message" class="ml-2 text-red-500 text-[10px] mt-1.5">{{
+          emailValidation.message
+        }}</span>
+      </div>
+    </div>
+    <div class="flex mt-8 justify-end">
+      <div class="flex gap-2">
+        <NcButton type="secondary" @click="dialogShow = false"> {{ $t('labels.cancel') }} </NcButton>
+        <NcButton
+          type="primary"
+          size="medium"
+          :disabled="isInvitButtonDiabled || emailValidation.isError"
+          @click="inviteProjectCollaborator"
+        >
+          {{ $t('activity.inviteToBase') }}
+        </NcButton>
+      </div>
+    </div>
+  </NcModal>
+</template>
diff --git a/packages/nc-gui/components/roles/Selector.vue b/packages/nc-gui/components/roles/Selector.vue
index c6079daf01..79308fb1ef 100644
--- a/packages/nc-gui/components/roles/Selector.vue
+++ b/packages/nc-gui/components/roles/Selector.vue
@@ -11,7 +11,7 @@ const props = withDefaults(
     description?: boolean
     inherit?: string
     onRoleChange: (role: keyof typeof RoleLabels) => void
-    size: 'sm' | 'md'
+    size: 'sm' | 'md' | 'lg'
   }>(),
   {
     description: true,
diff --git a/packages/nc-gui/components/workspace/InviteSection.vue b/packages/nc-gui/components/workspace/InviteSection.vue
index 00694079ed..0f88e387ed 100644
--- a/packages/nc-gui/components/workspace/InviteSection.vue
+++ b/packages/nc-gui/components/workspace/InviteSection.vue
@@ -6,7 +6,7 @@ import { validateEmail } from '~/utils/validation'
 
 const inviteData = reactive({
   email: '',
-  roles: WorkspaceUserRoles.VIEWER,
+  roles: WorkspaceUserRoles.NO_ACCESS,
 })
 
 const focusRef = ref<HTMLInputElement>()
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 36d7238165..8a7f755b2d 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -701,6 +701,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json
index a0ed0e8050..81c86c6d7e 100644
--- a/packages/nocodb/src/schema/swagger.json
+++ b/packages/nocodb/src/schema/swagger.json
@@ -22601,7 +22601,6 @@
         "type": "object",
         "properties": {
           "email": {
-            "format": "email",
             "type": "string",
             "description": "Base User Email"
           },

From e22b06fa9b07160b2b8a21888aa0a687831b9e7a Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 12 Mar 2024 11:09:14 +0000
Subject: [PATCH 188/253] fix: base acl

---
 packages/nc-gui/lib/acl.ts                    |  9 +++-
 packages/nocodb-sdk/src/lib/enums.ts          |  7 +++
 .../extract-ids/extract-ids.middleware.ts     |  1 +
 packages/nocodb/src/models/BaseUser.ts        | 43 +++++++++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lib/acl.ts b/packages/nc-gui/lib/acl.ts
index 1497026071..b13b2b9524 100644
--- a/packages/nc-gui/lib/acl.ts
+++ b/packages/nc-gui/lib/acl.ts
@@ -2,7 +2,14 @@ import { OrgUserRoles, ProjectRoles } from 'nocodb-sdk'
 
 const roleScopes = {
   org: [OrgUserRoles.VIEWER, OrgUserRoles.CREATOR],
-  base: [ProjectRoles.VIEWER, ProjectRoles.COMMENTER, ProjectRoles.EDITOR, ProjectRoles.CREATOR, ProjectRoles.OWNER],
+  base: [
+    ProjectRoles.NO_ACCESS,
+    ProjectRoles.VIEWER,
+    ProjectRoles.COMMENTER,
+    ProjectRoles.EDITOR,
+    ProjectRoles.CREATOR,
+    ProjectRoles.OWNER,
+  ],
 }
 
 interface Perm {
diff --git a/packages/nocodb-sdk/src/lib/enums.ts b/packages/nocodb-sdk/src/lib/enums.ts
index 4136a17d82..dd77534f27 100644
--- a/packages/nocodb-sdk/src/lib/enums.ts
+++ b/packages/nocodb-sdk/src/lib/enums.ts
@@ -19,6 +19,7 @@ export enum WorkspaceUserRoles {
   VIEWER = 'workspace-level-viewer',
   EDITOR = 'workspace-level-editor',
   COMMENTER = 'workspace-level-commenter',
+  NO_ACCESS = 'workspace-level-no-access',
 }
 
 export enum AppEvents {
@@ -167,6 +168,7 @@ export const RoleLabels = {
   [WorkspaceUserRoles.EDITOR]: 'editor',
   [WorkspaceUserRoles.COMMENTER]: 'commenter',
   [WorkspaceUserRoles.VIEWER]: 'viewer',
+  [WorkspaceUserRoles.NO_ACCESS]: 'noaccess',
   [ProjectRoles.OWNER]: 'owner',
   [ProjectRoles.CREATOR]: 'creator',
   [ProjectRoles.EDITOR]: 'editor',
@@ -184,6 +186,7 @@ export const RoleColors = {
   [WorkspaceUserRoles.EDITOR]: 'green',
   [WorkspaceUserRoles.COMMENTER]: 'orange',
   [WorkspaceUserRoles.VIEWER]: 'yellow',
+  [WorkspaceUserRoles.NO_ACCESS]: 'red',
   [ProjectRoles.OWNER]: 'purple',
   [ProjectRoles.CREATOR]: 'blue',
   [ProjectRoles.EDITOR]: 'green',
@@ -203,6 +206,7 @@ export const RoleDescriptions = {
   [WorkspaceUserRoles.COMMENTER]:
     'Can view and comment data in workspace bases',
   [WorkspaceUserRoles.VIEWER]: 'Can view data in workspace bases',
+  [WorkspaceUserRoles.NO_ACCESS]: 'Cannot access this workspace',
   [ProjectRoles.OWNER]: 'Full access to base',
   [ProjectRoles.CREATOR]:
     'Can create tables, views, setup webhook, invite collaborators and more',
@@ -222,6 +226,7 @@ export const RoleIcons = {
   [WorkspaceUserRoles.EDITOR]: 'role_editor',
   [WorkspaceUserRoles.COMMENTER]: 'role_commenter',
   [WorkspaceUserRoles.VIEWER]: 'role_viewer',
+  [WorkspaceUserRoles.NO_ACCESS]: 'role_no_access',
   [ProjectRoles.OWNER]: 'role_owner',
   [ProjectRoles.CREATOR]: 'role_creator',
   [ProjectRoles.EDITOR]: 'role_editor',
@@ -239,6 +244,7 @@ export const WorkspaceRolesToProjectRoles = {
   [WorkspaceUserRoles.EDITOR]: ProjectRoles.EDITOR,
   [WorkspaceUserRoles.COMMENTER]: ProjectRoles.COMMENTER,
   [WorkspaceUserRoles.VIEWER]: ProjectRoles.VIEWER,
+  [WorkspaceUserRoles.NO_ACCESS]: ProjectRoles.NO_ACCESS,
 };
 
 export const OrderedWorkspaceRoles = [
@@ -247,6 +253,7 @@ export const OrderedWorkspaceRoles = [
   WorkspaceUserRoles.EDITOR,
   WorkspaceUserRoles.COMMENTER,
   WorkspaceUserRoles.VIEWER,
+  WorkspaceUserRoles.NO_ACCESS,
 ];
 
 export const OrderedOrgRoles = [
diff --git a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
index 12cdef3be0..22bbf1bb45 100644
--- a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
+++ b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
@@ -35,6 +35,7 @@ export const rolesLabel = {
   [ProjectRoles.VIEWER]: 'Base Viewer',
   [ProjectRoles.EDITOR]: 'Base Editor',
   [ProjectRoles.COMMENTER]: 'Base Commenter',
+  [ProjectRoles.NO_ACCESS]: 'No Access',
 };
 
 export function getRolesLabels(
diff --git a/packages/nocodb/src/models/BaseUser.ts b/packages/nocodb/src/models/BaseUser.ts
index 2f7be5a8c4..da83e643cb 100644
--- a/packages/nocodb/src/models/BaseUser.ts
+++ b/packages/nocodb/src/models/BaseUser.ts
@@ -26,6 +26,49 @@ export default class BaseUser {
     return baseUser && new BaseUser(baseUser);
   }
 
+  public static async bulkInsert(
+    baseUsers: Partial<BaseUser>[],
+    ncMeta = Noco.ncMeta,
+  ) {
+    const insertObj = baseUsers.map((baseUser) =>
+      extractProps(baseUser, ['fk_user_id', 'base_id', 'roles']),
+    );
+
+    console.log('insertObj', insertObj);
+
+    const bulkData = await ncMeta.bulkMetaInsert(
+      null,
+      null,
+      MetaTable.PROJECT_USERS,
+      insertObj,
+      true,
+    );
+
+    const uniqueFks: string[] = [
+      ...new Set(bulkData.map((d) => d.base_id)),
+    ] as string[];
+
+    for (const fk of uniqueFks) {
+      await NocoCache.deepDel(
+        `${CacheScope.BASE_USER}:${fk}:list`,
+        CacheDelDirection.PARENT_TO_CHILD,
+      );
+    }
+
+    for (const d of bulkData) {
+      await NocoCache.set(
+        `${CacheScope.BASE_USER}:${d.base_id}:${d.fk_user_id}`,
+        d,
+      );
+
+      await NocoCache.appendToList(
+        CacheScope.BASE_USER,
+        [d.base_id],
+        `${CacheScope.BASE_USER}:${d.base_id}:${d.fk_user_id}`,
+      );
+    }
+  }
+
   public static async insert(
     baseUser: Partial<BaseUser>,
     ncMeta = Noco.ncMeta,

From 6f4c54c6bce846e6380cdb7cd8b5a8c92a6a4660 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 12 Mar 2024 11:09:14 +0000
Subject: [PATCH 189/253] fix: remove log

---
 packages/nocodb/src/models/BaseUser.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/nocodb/src/models/BaseUser.ts b/packages/nocodb/src/models/BaseUser.ts
index da83e643cb..12c6dceb50 100644
--- a/packages/nocodb/src/models/BaseUser.ts
+++ b/packages/nocodb/src/models/BaseUser.ts
@@ -34,8 +34,6 @@ export default class BaseUser {
       extractProps(baseUser, ['fk_user_id', 'base_id', 'roles']),
     );
 
-    console.log('insertObj', insertObj);
-
     const bulkData = await ncMeta.bulkMetaInsert(
       null,
       null,

From fc9fbd234cdf4771e96c1a653bd9239da19f4fff Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 12 Mar 2024 11:09:15 +0000
Subject: [PATCH 190/253] fix: update roles

---
 packages/nc-gui/components/project/View.vue   | 2 +-
 packages/nc-gui/composables/useRoles/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index 5ecfe7182a..7dc3218199 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -140,7 +140,7 @@ watch(
           </template>
           <ProjectAccessSettings />
         </a-tab-pane>
-        <a-tab-pane v-if="isUIAllowed('baseCreate')" key="data-source">
+        <a-tab-pane v-if="isUIAllowed('sourceCreate')" key="data-source">
           <template #tab>
             <div class="tab-title" data-testid="proj-view-tab__data-sources">
               <GeneralIcon icon="database" />
diff --git a/packages/nc-gui/composables/useRoles/index.ts b/packages/nc-gui/composables/useRoles/index.ts
index 7f410f1ffb..89707ed247 100644
--- a/packages/nc-gui/composables/useRoles/index.ts
+++ b/packages/nc-gui/composables/useRoles/index.ts
@@ -1,8 +1,8 @@
 import { isString } from '@vue/shared'
 import type { Roles, RolesObj, WorkspaceUserRoles } from 'nocodb-sdk'
 import { extractRolesObj } from 'nocodb-sdk'
-import { computed, createSharedComposable, rolePermissions, useApi, useGlobal } from '#imports'
 import type { Permission } from '#imports'
+import { computed, createSharedComposable, rolePermissions, useApi, useGlobal } from '#imports'
 
 const hasPermission = (role: Exclude<Roles, WorkspaceUserRoles>, hasRole: boolean, permission: Permission | string) => {
   const rolePermission = rolePermissions[role]

From fc21e1dec5021ab1518f8418108ce8629420a73c Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@users.noreply.github.com>
Date: Wed, 13 Mar 2024 06:46:37 +0300
Subject: [PATCH 191/253] Add support for URLENCODE function (#6831)

Fixes #6811.

Co-authored-by: Dmitry Shachnev <dshachnev@interfacefinancial.com>
---
 .../060.formula/030.string-functions.md       | 21 +++++++++++++++++++
 packages/nocodb-sdk/src/lib/formulaHelpers.ts | 16 ++++++++++++++
 .../src/db/functionMappings/commonFns.ts      | 11 ++++++++++
 .../tests/db/columns/columnFormula.spec.ts    | 10 +++++++++
 4 files changed, 58 insertions(+)

diff --git a/packages/noco-docs/docs/070.fields/040.field-types/060.formula/030.string-functions.md b/packages/noco-docs/docs/070.fields/040.field-types/060.formula/030.string-functions.md
index 5285182fd3..85e00d4aad 100644
--- a/packages/noco-docs/docs/070.fields/040.field-types/060.formula/030.string-functions.md
+++ b/packages/noco-docs/docs/070.fields/040.field-types/060.formula/030.string-functions.md
@@ -216,6 +216,27 @@ URL(text)
 URL('https://www.example.com') => a clickable link for https://www.example.com
 ```
 
+## URLENCODE
+The URLENCODE function percent-encodes special characters in a string so it can
+be substituted as a query parameter into a URL.
+
+It is similar to JavaScript `encodeURIComponent()` function, except it encodes
+only characters that have a special meaning according to RFC 3986 section 2.2
+and also percent signs and spaces; other characters such as letters from
+non-Latin alphabets will not be encoded. Like `encodeURIComponent()`, it should
+be used only for encoding URL components, not whole URLs.
+
+#### Syntax
+```plaintext
+URLENCODE(text)
+```
+
+#### Sample
+```plaintext
+'https://example.com/q?param=' & URLENCODE('Hello, world')
+=> 'https://example.com/q?param=Hello%2C%20world'
+```
+
 
 ## Related Articles
 - [Numeric and Logical Operators](015.operators.md)
diff --git a/packages/nocodb-sdk/src/lib/formulaHelpers.ts b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
index 0ba7e1dc54..b935faa93d 100644
--- a/packages/nocodb-sdk/src/lib/formulaHelpers.ts
+++ b/packages/nocodb-sdk/src/lib/formulaHelpers.ts
@@ -1056,6 +1056,22 @@ export const formulas: Record<string, FormulaMeta> = {
     examples: ['URL("https://github.com/nocodb/nocodb")', 'URL({column1})'],
     returnType: FormulaDataTypes.STRING,
   },
+  URLENCODE: {
+    docsUrl:
+      'https://docs.nocodb.com/fields/field-types/formula/string-functions#urlencode',
+
+    validation: {
+      args: {
+        rqd: 1,
+        type: FormulaDataTypes.STRING,
+      },
+    },
+    description:
+      'Percent-encode the input parameter for use in URLs',
+    syntax: 'URLENCODE(str)',
+    examples: ['URLENCODE("Hello, world") => "Hello%2C%20world"', 'URLENCODE({column1})'],
+    returnType: FormulaDataTypes.STRING,
+  },
   WEEKDAY: {
     docsUrl:
       'https://docs.nocodb.com/fields/field-types/formula/date-functions#weekday',
diff --git a/packages/nocodb/src/db/functionMappings/commonFns.ts b/packages/nocodb/src/db/functionMappings/commonFns.ts
index 3a1c267075..79b285acec 100644
--- a/packages/nocodb/src/db/functionMappings/commonFns.ts
+++ b/packages/nocodb/src/db/functionMappings/commonFns.ts
@@ -384,4 +384,15 @@ export default {
       builder: knex.raw(`(${valueBuilder} IS NOT NULL)${colAlias}`),
     };
   },
+  URLENCODE: async ({ fn, knex, pt, colAlias }: MapFnArgs) => {
+    const specialCharacters = '% :/?#[]@$&+,;=';
+    let str = (await fn(pt.arguments[0])).builder;
+    // Pass the characters as bound parameters to avoid problems with ? sign.
+    for (const c of specialCharacters) {
+      str = `REPLACE(${str}, ?, '${encodeURIComponent(c)}')`;
+    }
+    return {
+      builder: knex.raw(`${str} ${colAlias}`, specialCharacters.split('')),
+    };
+  },
 };
diff --git a/tests/playwright/tests/db/columns/columnFormula.spec.ts b/tests/playwright/tests/db/columns/columnFormula.spec.ts
index b9ca6de3ce..29053a016b 100644
--- a/tests/playwright/tests/db/columns/columnFormula.spec.ts
+++ b/tests/playwright/tests/db/columns/columnFormula.spec.ts
@@ -143,6 +143,16 @@ const formulaDataByDbType = (context: NcContext, index: number) => {
         result: ['A Corua (La Corua)', 'Abha', 'Abu Dhabi', 'Acua', 'Ad...'],
         unSupDbType: ['sqlite3'],
       },
+      {
+        formula: 'URLENCODE({City})',
+        result: [
+          'A%20Corua%20(La%20Corua)',
+          'Abha',
+          'Abu%20Dhabi',
+          'Acua',
+          'Adana',
+        ],
+      },
     ];
   else
     return [

From 252b0cbbda84b52a04d030bd9b404efd704ef187 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:08 +0000
Subject: [PATCH 192/253] Update source file en.json

---
 packages/nc-gui/lang/en.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 36d7238165..c4c4e88232 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 04b7b04445a0295861b99790dde385b2504b5f08 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:12 +0000
Subject: [PATCH 193/253] New translations en.json (French)

---
 packages/nc-gui/lang/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index ed32d80c90..0dea63b74e 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "Liste"
+    "list": "Liste",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Jour",
@@ -965,6 +966,7 @@
     "clientKey": "Selectionner un fichier .key",
     "clientCert": "Selectionner un fichier .cert",
     "clientCA": "Selectionner un fichier d'authentification",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 43c990b9acc1f5fce99a5316087ba20dae85676a Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:13 +0000
Subject: [PATCH 194/253] New translations en.json (Spanish)

---
 packages/nc-gui/lang/es.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
index afe8b139e2..227cc388d7 100644
--- a/packages/nc-gui/lang/es.json
+++ b/packages/nc-gui/lang/es.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Día",
@@ -965,6 +966,7 @@
     "clientKey": "Seleccionar archivo .key",
     "clientCert": "Seleccionar archivo .cert",
     "clientCA": "Seleccionar archivo CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From d761b03ff4e0f314d53e271f33b01482600e9e2c Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:14 +0000
Subject: [PATCH 195/253] New translations en.json (Arabic)

---
 packages/nc-gui/lang/ar.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json
index 121bc83379..758a943cde 100644
--- a/packages/nc-gui/lang/ar.json
+++ b/packages/nc-gui/lang/ar.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "اختر .الملف الرئيسي",
     "clientCert": "اختر .ملف الشهادة",
     "clientCA": "حدد ملف CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 1065e8a7e67c38eb122dc7eed75e246cb823ab26 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:15 +0000
Subject: [PATCH 196/253] New translations en.json (Czech)

---
 packages/nc-gui/lang/cs.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json
index 8db7f01f7b..d438c678db 100644
--- a/packages/nc-gui/lang/cs.json
+++ b/packages/nc-gui/lang/cs.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Vyberte soubor .key",
     "clientCert": "Vyberte soubor .cert",
     "clientCA": "Vyberte soubor CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 6a078d12d7ea86224b0926f878625e5b6ca2450b Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:16 +0000
Subject: [PATCH 197/253] New translations en.json (Danish)

---
 packages/nc-gui/lang/da.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
index f558a46c5d..1084967984 100644
--- a/packages/nc-gui/lang/da.json
+++ b/packages/nc-gui/lang/da.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Vælg .Key File.",
     "clientCert": "Vælg .cert File.",
     "clientCA": "Vælg CA File.",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From df99bf4da3a6bfa9a76299c688d035d28c337948 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:17 +0000
Subject: [PATCH 198/253] New translations en.json (German)

---
 packages/nc-gui/lang/de.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index 38150acb9b..875a8fef9e 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown-Liste",
-    "list": "Liste"
+    "list": "Liste",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Tag",
@@ -965,6 +966,7 @@
     "clientKey": "Auswahl .key-Datei",
     "clientCert": "Auswahl .cert-Datei",
     "clientCA": "Auswahl CA-Datei",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 3d034258a6436fc86980e1f2124053301c091efa Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:18 +0000
Subject: [PATCH 199/253] New translations en.json (Basque)

---
 packages/nc-gui/lang/eu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
index b03f08d7a7..da57bb6bac 100644
--- a/packages/nc-gui/lang/eu.json
+++ b/packages/nc-gui/lang/eu.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 73f7947c1fae18b7daa40b756510722adc23d601 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:19 +0000
Subject: [PATCH 200/253] New translations en.json (Finnish)

---
 packages/nc-gui/lang/fi.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
index ce3e5f6e4f..21a1fec1e9 100644
--- a/packages/nc-gui/lang/fi.json
+++ b/packages/nc-gui/lang/fi.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Valitse .key-tiedosto",
     "clientCert": "Valitse .cert-tiedosto",
     "clientCA": "Valitse CA-tiedosto",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From bb07b7c7f970588e4d9088d4c945cef5fffd549c Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:21 +0000
Subject: [PATCH 201/253] New translations en.json (Hebrew)

---
 packages/nc-gui/lang/he.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json
index f62fad94e5..c75a1fa2ce 100644
--- a/packages/nc-gui/lang/he.json
+++ b/packages/nc-gui/lang/he.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "בחר קובץ .key.",
     "clientCert": "בחר קובץ .cert.",
     "clientCA": "בחר קובץ CA.",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 66580c5adfdbc02a2dd3654e0431c2ec9065dd85 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:22 +0000
Subject: [PATCH 202/253] New translations en.json (Italian)

---
 packages/nc-gui/lang/it.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json
index d6f8d33e71..8bdb39810e 100644
--- a/packages/nc-gui/lang/it.json
+++ b/packages/nc-gui/lang/it.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Seleziona file .key",
     "clientCert": "Seleziona file .cert",
     "clientCA": "Seleziona file CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From ec216793a2650ecd2571896428e2df9baa1960d5 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:23 +0000
Subject: [PATCH 203/253] New translations en.json (Japanese)

---
 packages/nc-gui/lang/ja.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json
index de3ffa1651..dedcb0084f 100644
--- a/packages/nc-gui/lang/ja.json
+++ b/packages/nc-gui/lang/ja.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": ".key ファイルを選択してください",
     "clientCert": ".cert ファイルを選択してください",
     "clientCA": "CA ファイルを選択してください",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From d1c4a3920992281c609f236c016454a1ed030932 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:24 +0000
Subject: [PATCH 204/253] New translations en.json (Korean)

---
 packages/nc-gui/lang/ko.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
index 3e47547d76..51aa53ee6f 100644
--- a/packages/nc-gui/lang/ko.json
+++ b/packages/nc-gui/lang/ko.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "키 파일을 선택하십시오",
     "clientCert": ".cert 파일을 선택하십시오",
     "clientCA": "CA 파일을 선택하십시오",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 00630495a1d9cca0bf8c7448fc5bbae00f4965d6 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:25 +0000
Subject: [PATCH 205/253] New translations en.json (Dutch)

---
 packages/nc-gui/lang/nl.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
index a138f81c07..c3b9bcdbb8 100644
--- a/packages/nc-gui/lang/nl.json
+++ b/packages/nc-gui/lang/nl.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Selecteer .key-bestand",
     "clientCert": "Selecteer .cert-bestand",
     "clientCA": "Selecteer CA-bestand",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 1b8366d16810a57beb92206584927844d6649cb2 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:26 +0000
Subject: [PATCH 206/253] New translations en.json (Norwegian)

---
 packages/nc-gui/lang/no.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
index ea56767107..3cba3382b1 100644
--- a/packages/nc-gui/lang/no.json
+++ b/packages/nc-gui/lang/no.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Velg .KEY-fil",
     "clientCert": "Velg .CERT-fil",
     "clientCA": "Velg CA-fil",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 9c04792ae614370de4e32516f346e460cb792473 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:27 +0000
Subject: [PATCH 207/253] New translations en.json (Polish)

---
 packages/nc-gui/lang/pl.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
index a7b819cc6b..9cf6d05737 100644
--- a/packages/nc-gui/lang/pl.json
+++ b/packages/nc-gui/lang/pl.json
@@ -197,7 +197,8 @@
     "banner": "Baner",
     "logo": "Logo",
     "dropdown": "Rozwijane menu",
-    "list": "Lista"
+    "list": "Lista",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Dzień",
@@ -965,6 +966,7 @@
     "clientKey": "Wybierz plik .key.",
     "clientCert": "Wybierz plik .Cert.",
     "clientCA": "Wybierz plik CA.",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generuj URL formularza udostępniania z wstępnie wypełnionymi danymi pola. Aby uzyskać link z wstępnie wypełnionymi danymi, upewnij się, że wypełniłeś wymagane pola w kreatorze widoku formularza.",
     "surveyFormInfo": "Tryb formularza z jednym polem na stronę"
   },

From 55063db9ae2b12bd48f2b3ba1221892e12abb239 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:28 +0000
Subject: [PATCH 208/253] New translations en.json (Portuguese)

---
 packages/nc-gui/lang/pt.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
index f67484dcd8..2b43db0aa9 100644
--- a/packages/nc-gui/lang/pt.json
+++ b/packages/nc-gui/lang/pt.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Seleccione ficheiro .key",
     "clientCert": "Seleccione ficheiro .cert",
     "clientCA": "Seleccione ficheiro CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 6d801b7d80b55ae0546742cd3be8e4a09a7b72ea Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:29 +0000
Subject: [PATCH 209/253] New translations en.json (Russian)

---
 packages/nc-gui/lang/ru.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
index 4825a25e5e..4c13bf0aae 100644
--- a/packages/nc-gui/lang/ru.json
+++ b/packages/nc-gui/lang/ru.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Выберите файл .key.",
     "clientCert": "Выберите файл .cert",
     "clientCA": "Выберите файл CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 2e12dce630cfb6af7d30f28d4d725a82e145e6fd Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:30 +0000
Subject: [PATCH 210/253] New translations en.json (Slovak)

---
 packages/nc-gui/lang/sk.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json
index bab47e9e56..7ce01366d6 100644
--- a/packages/nc-gui/lang/sk.json
+++ b/packages/nc-gui/lang/sk.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Vyberte súbor .key",
     "clientCert": "Vyberte súbor .cert",
     "clientCA": "Vyberte súbor CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 0305190384bc20f2f7f1f6e45f3cccbbd89570d0 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:31 +0000
Subject: [PATCH 211/253] New translations en.json (Slovenian)

---
 packages/nc-gui/lang/sl.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json
index bbdc43518b..4055115c5b 100644
--- a/packages/nc-gui/lang/sl.json
+++ b/packages/nc-gui/lang/sl.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Izberi .key datoteko",
     "clientCert": "Izberi .cert datoteko",
     "clientCA": "Izberit CA datoteko",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 26f4cc6c0d7fa75b07894a7fcd1ae7c6c463fb2e Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:32 +0000
Subject: [PATCH 212/253] New translations en.json (Swedish)

---
 packages/nc-gui/lang/sv.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
index 313add4d53..8750f07c3e 100644
--- a/packages/nc-gui/lang/sv.json
+++ b/packages/nc-gui/lang/sv.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Välj. Key-filen",
     "clientCert": "Välj .cert-fil",
     "clientCA": "Välj CA-fil",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From a161f3281918881baf163e36b5d417d6a523ab6a Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:34 +0000
Subject: [PATCH 213/253] New translations en.json (Turkish)

---
 packages/nc-gui/lang/tr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json
index 637488d008..506d4bbe23 100644
--- a/packages/nc-gui/lang/tr.json
+++ b/packages/nc-gui/lang/tr.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": ".key dosyasını seçin",
     "clientCert": ".cert dosyasını seçin",
     "clientCA": "CA dosyasını seçin",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 90c76f2b2b265b142c5590a710be0b7f8600d898 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:35 +0000
Subject: [PATCH 214/253] New translations en.json (Ukrainian)

---
 packages/nc-gui/lang/uk.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json
index 7f447cff21..c2017b38c2 100644
--- a/packages/nc-gui/lang/uk.json
+++ b/packages/nc-gui/lang/uk.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Виберіть .key файл",
     "clientCert": "Виберіть .cert файл",
     "clientCA": "Виберіть файл CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 2b8e8ed7cd1f52cd18eff88f0c5fc413cd5f17ab Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:36 +0000
Subject: [PATCH 215/253] New translations en.json (Chinese Simplified)

---
 packages/nc-gui/lang/zh-Hans.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json
index 5ef9f5edc9..0cbb59faf7 100644
--- a/packages/nc-gui/lang/zh-Hans.json
+++ b/packages/nc-gui/lang/zh-Hans.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "选择 .key 文件",
     "clientCert": "选择 .cert 文件",
     "clientCA": "选择 CA 文件",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From e6e9aa2298c5f6cdd550e2a26a0cdb93437dc363 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:37 +0000
Subject: [PATCH 216/253] New translations en.json (Chinese Traditional)

---
 packages/nc-gui/lang/zh-Hant.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json
index b2638f2739..625088af9b 100644
--- a/packages/nc-gui/lang/zh-Hant.json
+++ b/packages/nc-gui/lang/zh-Hant.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "選擇 .key 檔案",
     "clientCert": "選擇 .cert 檔案",
     "clientCA": "選擇 CA 檔案",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 18ad1ff628b16362773e531bf4465ee84e7b00e5 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:38 +0000
Subject: [PATCH 217/253] New translations en.json (English)

---
 packages/nc-gui/lang/en.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index c4c4e88232..18b0e169d2 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -695,9 +695,9 @@
     "appearanceSettings": "Appearance Settings",
     "backgroundColor": "Background Color",
     "hideNocodbBranding": "Hide NocoDB Branding",
-    "showOnConditions": "Show on condtions",
+    "showOnConditions": "Show on conditions",
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
-    "limitOptions": "Limit ptions",
+    "limitOptions": "Limit options",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
     "clearSelection": "Clear selection"
   },
@@ -929,8 +929,8 @@
     "addFieldFromFormView": "Add Field",
     "selectAllFields": "Select all fields",
     "preFilledFields": {
-      "title": "Enable Pre-fill",
-      "default": "Default",
+      "title": "Pre-filled Fields",
+      "default": "Allow pre-filling fields",
       "locked": "Lock pre-filled fields as read-only",
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
@@ -966,8 +966,8 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "changeIconColour": "Change icon colour",
-    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "changeIconColour": "Change Icon Colour",
+    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {

From 0b71f1cf5092a47cd262c04228a4e6806fa75673 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:39 +0000
Subject: [PATCH 218/253] New translations en.json (Vietnamese)

---
 packages/nc-gui/lang/vi.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json
index e32fa3ae30..8fbc2d4133 100644
--- a/packages/nc-gui/lang/vi.json
+++ b/packages/nc-gui/lang/vi.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Chọn tệp .key.",
     "clientCert": "Chọn tệp .cert",
     "clientCA": "Chọn CA Tệp",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From c971e25b5b9c8f452887cb8f4d4d366d4892eab0 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:40 +0000
Subject: [PATCH 219/253] New translations en.json (Portuguese, Brazilian)

---
 packages/nc-gui/lang/pt_BR.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
index 05d78d02e5..4d02c4ed1a 100644
--- a/packages/nc-gui/lang/pt_BR.json
+++ b/packages/nc-gui/lang/pt_BR.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Dia",
@@ -965,6 +966,7 @@
     "clientKey": "Selecione arquivo .key",
     "clientCert": "Selecione arquivo .cert",
     "clientCA": "Selecione arquivo CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From c5ee66ad140c44cf1e6c4668c17f2ef979aa0489 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:42 +0000
Subject: [PATCH 220/253] New translations en.json (Indonesian)

---
 packages/nc-gui/lang/id.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
index 096da83df0..894fe24de6 100644
--- a/packages/nc-gui/lang/id.json
+++ b/packages/nc-gui/lang/id.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Pilih .Key File.",
     "clientCert": "Pilih file .cert.",
     "clientCA": "Pilih CA File.",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From a8cc16025bbf12f448333d8590c0136b95178ae7 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:43 +0000
Subject: [PATCH 221/253] New translations en.json (Persian)

---
 packages/nc-gui/lang/fa.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json
index 91e4c03847..8bbe27b1c4 100644
--- a/packages/nc-gui/lang/fa.json
+++ b/packages/nc-gui/lang/fa.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "انتخاب فایل key.",
     "clientCert": "انتخاب فایل cert.",
     "clientCA": "انتخاب فایل CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From bfa4f2c669f94755da643c72474892086bc6ad5e Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:44 +0000
Subject: [PATCH 222/253] New translations en.json (Thai)

---
 packages/nc-gui/lang/th.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
index 6d492fa46f..8446c4468a 100644
--- a/packages/nc-gui/lang/th.json
+++ b/packages/nc-gui/lang/th.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "เลือก. ไฟล์. คีย์",
     "clientCert": "เลือกไฟล์ .cert",
     "clientCA": "เลือกไฟล์ CA",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 3f68fc6b0e3f445299e27327be6ba7b5f0b9b394 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:45 +0000
Subject: [PATCH 223/253] New translations en.json (Croatian)

---
 packages/nc-gui/lang/hr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json
index bc750b0488..3d9bb97891 100644
--- a/packages/nc-gui/lang/hr.json
+++ b/packages/nc-gui/lang/hr.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Odaberite .Kekey datoteku",
     "clientCert": "Odaberite .cert datoteku",
     "clientCA": "Odaberite CA datoteku",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From a33eff1aeb7ac2dd4b66661ddedcfef538b2be53 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:47 +0000
Subject: [PATCH 224/253] New translations en.json (Latvian)

---
 packages/nc-gui/lang/lv.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json
index 72d69d5e07..3f4d5e6bb3 100644
--- a/packages/nc-gui/lang/lv.json
+++ b/packages/nc-gui/lang/lv.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": "Izvēlēties .key datni",
     "clientCert": "Izvēlēties .cert datni",
     "clientCA": "Izvēlēties CA datni",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 66753fe87a842e45e99185354c7c451c4bf19f2b Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:48 +0000
Subject: [PATCH 225/253] New translations en.json (Hindi)

---
 packages/nc-gui/lang/hi.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json
index b17a62e92e..e2955fcffd 100644
--- a/packages/nc-gui/lang/hi.json
+++ b/packages/nc-gui/lang/hi.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": ".Key फ़ाइल का चयन करें",
     "clientCert": ".Cert फ़ाइल का चयन करें",
     "clientCA": "सीए फ़ाइल का चयन करें",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From e8a28121ff6bd2bc743404ace9f5354b2f59d7f5 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Wed, 13 Mar 2024 10:37:49 +0000
Subject: [PATCH 226/253] New translations en.json (Bengali, India)

---
 packages/nc-gui/lang/bn_IN.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json
index 43d1e24ab5..c165e2d28a 100644
--- a/packages/nc-gui/lang/bn_IN.json
+++ b/packages/nc-gui/lang/bn_IN.json
@@ -197,7 +197,8 @@
     "banner": "Banner",
     "logo": "Logo",
     "dropdown": "Dropdown",
-    "list": "List"
+    "list": "List",
+    "apply": "Apply"
   },
   "objects": {
     "day": "Day",
@@ -965,6 +966,7 @@
     "clientKey": ".key ফাইল নির্বাচন করুন",
     "clientCert": ".cert ফাইল নির্বাচন করুন",
     "clientCA": "সিএ ফাইল নির্বাচন করুন",
+    "changeIconColour": "Change icon colour",
     "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },

From 50dd31da9467ebf67d1a78c34e28afb64c682c52 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 13 Mar 2024 20:57:08 +0000
Subject: [PATCH 227/253] fix: disable default source menu/action options if
 it's disabled

---
 .../nc-gui/components/dashboard/TreeView/ProjectNode.vue     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index 334469dab3..e1a70265c6 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -523,7 +523,7 @@ const projectDelete = () => {
                   </NcMenuItem>
 
                   <!-- ERD View -->
-                  <NcMenuItem key="erd" data-testid="nc-sidebar-base-relations" @click="openErdView(base?.sources?.[0]!)">
+                  <NcMenuItem v-if="base?.sources?.[0]?.enabled" key="erd" data-testid="nc-sidebar-base-relations" @click="openErdView(base?.sources?.[0]!)">
                     <div v-e="['c:base:erd']" class="flex gap-2 items-center">
                       <GeneralIcon icon="erd" />
                       {{ $t('title.relations') }}
@@ -549,7 +549,7 @@ const projectDelete = () => {
                   </NcMenuItem>
                 </template>
 
-                <template v-if="base.sources && base.sources[0] && showBaseOption">
+                <template v-if="base?.sources?.[0]?.enabled && showBaseOption">
                   <NcDivider />
                   <DashboardTreeViewBaseOptions v-model:base="base" :source="base.sources[0]" />
                 </template>
@@ -584,6 +584,7 @@ const projectDelete = () => {
           </NcDropdown>
 
           <NcButton
+            :disabled="!base?.sources?.[0]?.enabled"
             v-if="isUIAllowed('tableCreate', { roles: baseRole })"
             v-e="['c:base:create-table']"
             class="nc-sidebar-node-btn"

From 2de23bde9b9ffca19e0a9c4e8e379f67cd261500 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:12 +0000
Subject: [PATCH 228/253] fix(nc-gui): invalid prop type check failed for prop
 `direction`

---
 packages/nc-gui/components/account/UserMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/account/UserMenu.vue b/packages/nc-gui/components/account/UserMenu.vue
index f125eeae3b..7fb5e180aa 100644
--- a/packages/nc-gui/components/account/UserMenu.vue
+++ b/packages/nc-gui/components/account/UserMenu.vue
@@ -4,7 +4,7 @@ import type { UsersSortType } from '~/lib'
 
 const { field, direction, handleUserSort } = defineProps<{
   field: UsersSortType['field']
-  direction: UsersSortType['direction']
+  direction?: UsersSortType['direction']
   handleUserSort: Function
 }>()
 

From e27be408b4070646205b4eec559443fdeed6fa34 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:12 +0000
Subject: [PATCH 229/253] fix(nc-gui): Property `workspaceRole` was accessed
 during render but is not defined on instance

---
 packages/nc-gui/components/workspace/CollaboratorsList.vue | 2 +-
 packages/nc-gui/store/workspace.ts                         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index f40602c2d2..4815dcb5df 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -8,7 +8,7 @@ const workspaceStore = useWorkspace()
 
 const { removeCollaborator, updateCollaborator: _updateCollaborator } = workspaceStore
 
-const { collaborators } = storeToRefs(workspaceStore)
+const { collaborators, workspaceRole } = storeToRefs(workspaceStore)
 
 const { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData } = useUserSorts('Workspace')
 
diff --git a/packages/nc-gui/store/workspace.ts b/packages/nc-gui/store/workspace.ts
index 36f6d1df16..3d5751c8c2 100644
--- a/packages/nc-gui/store/workspace.ts
+++ b/packages/nc-gui/store/workspace.ts
@@ -48,6 +48,8 @@ export const useWorkspace = defineStore('workspaceStore', () => {
     return { id: 'default', title: 'default', meta: {}, roles: '' } as any
   })
 
+  const workspaceRole = computed(() => activeWorkspace.value?.roles)
+
   const activeWorkspaceMeta = computed<Record<string, any>>(() => {
     const defaultMeta = {}
     if (!activeWorkspace.value) return defaultMeta
@@ -253,6 +255,7 @@ export const useWorkspace = defineStore('workspaceStore', () => {
     isWorkspaceSettingsPageOpened,
     workspaceUserCount,
     getPlanLimit,
+    workspaceRole,
   }
 })
 

From 5569ff9fb75c58218cfbf555de30e7d02ef64b1a Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:12 +0000
Subject: [PATCH 230/253] fix(nc-gui): Failed to resolve component - Empty

---
 packages/nc-gui/components/project/AccessSettings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index fa0516e241..9b004a550c 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -172,7 +172,7 @@ watch(isInviteModalVisible, () => {
         v-else-if="!filteredCollaborators?.length"
         class="nc-collaborators-list w-full h-full flex flex-col items-center justify-center mt-36"
       >
-        <Empty description="$t('title.noMembersFound')" />
+        <a-empty description="$t('title.noMembersFound')" />
       </div>
       <div v-else class="nc-collaborators-list mt-6 h-full">
         <div class="flex flex-col rounded-lg overflow-hidden border-1 max-w-350 max-h-[calc(100%-8rem)]">

From 33d8cba0259ed950ed2d347a012cb7ebbd704e15 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 231/253] fix(nc-gui): rich text switch input warnings

---
 packages/nc-gui/components/nc/Switch.vue                    | 6 ++++--
 .../nc-gui/components/smartsheet/column/LongTextOptions.vue | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/nc/Switch.vue b/packages/nc-gui/components/nc/Switch.vue
index 7551b87b83..9f50ce0d38 100644
--- a/packages/nc-gui/components/nc/Switch.vue
+++ b/packages/nc-gui/components/nc/Switch.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
-const props = defineProps<{ checked: boolean; disabled?: boolean }>()
+const props = withDefaults(defineProps<{ checked: boolean; disabled?: boolean; size?: 'default' | 'small' }>(), {
+  size: 'small',
+})
 
 const emit = defineEmits(['change', 'update:checked'])
 
@@ -11,7 +13,7 @@ const onChange = (e: boolean) => {
 </script>
 
 <template>
-  <a-switch v-model:checked="checked" :disabled="props.disabled" class="nc-switch" size="small" @change="onChange"> </a-switch>
+  <a-switch v-model:checked="checked" :disabled="disabled" class="nc-switch" :size="size" @change="onChange"> </a-switch>
   <span v-if="$slots.default" class="cursor-pointer pl-2" @click="checked = !checked">
     <slot />
   </span>
diff --git a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
index 0c506fb002..1e56b6c5d2 100644
--- a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
@@ -12,7 +12,7 @@ const emit = defineEmits(['update:value'])
 const vModel = useVModel(props, 'value', emit)
 
 const richMode = computed({
-  get: () => vModel.value.meta?.richMode,
+  get: () => !!vModel.value.meta?.richMode,
   set: (value) => {
     if (!vModel.value.meta) vModel.value.meta = {}
 
@@ -29,7 +29,7 @@ watch(richMode, () => {
   <div class="flex flex-col mt-2 gap-2">
     <a-form-item>
       <div class="flex flex-row items-center">
-        <NcSwitch v-model:checked="richMode" :name="$t('labels.enableRichText')" size="small">
+        <NcSwitch v-model:checked="richMode">
           <div class="text-xs">{{ $t('labels.enableRichText') }}</div>
         </NcSwitch>
       </div>

From d0790d329de9a817c1f08479ae70cf1f650c423c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 232/253] fix(nc-gui): Invalid prop: type check failed for prop
 "gutter"

---
 .../nc-gui/components/smartsheet/column/AttachmentOptions.vue   | 2 +-
 .../nc-gui/components/smartsheet/column/CurrencyOptions.vue     | 2 +-
 packages/nc-gui/components/smartsheet/column/LinkOptions.vue    | 2 +-
 .../nc-gui/components/smartsheet/column/PgBinaryOptions.vue     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue b/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue
index 7dd3884cb7..414849058e 100644
--- a/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue
@@ -82,7 +82,7 @@ watch(searchValue, (value) => {
 </script>
 
 <template>
-  <a-row class="my-2" gutter="8">
+  <a-row class="my-2" :gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.maxNumberOfAttachments']" label="Max Number of Attachments">
         <a-input-number v-model:value="vModel.meta.maxNumberOfAttachments" :min="1" class="!w-full nc-attachment-max-count" />
diff --git a/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue b/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
index 24b72e5924..bd326156d9 100644
--- a/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
@@ -77,7 +77,7 @@ currencyLocales().then((locales) => {
 </script>
 
 <template>
-  <a-row gutter="8">
+  <a-row :gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.currency_locale']" :label="$t('title.currencyLocale')">
         <a-select
diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
index 195f36c017..2847e352a5 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -49,7 +49,7 @@ vModel.value.meta = {
 </script>
 
 <template>
-  <a-row class="my-2" gutter="8">
+  <a-row class="my-2" :gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.singular']" :label="$t('labels.singularLabel')">
         <a-input
diff --git a/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue b/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
index 925ac2a00a..b1696cdd35 100644
--- a/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
@@ -21,7 +21,7 @@ vModel.value.meta = {
 </script>
 
 <template>
-  <a-row class="my-2" gutter="8">
+  <a-row class="my-2" :gutter="8">
     <a-col :span="24">
       <a-form-item v-bind="validateInfos['meta.format']" :label="$t('labels.binaryEncodingFormat')">
         <a-select

From 747ff6652842e1ff5e2546824bdfb4eebe2f5dd7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 233/253] fix(nc-gui): Invalid prop: type check failed for prop
 "value". Expected Number with value 0, got String with value "0"

---
 packages/nc-gui/components/cell/Rating.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/Rating.vue b/packages/nc-gui/components/cell/Rating.vue
index 8d4553b081..fdba44d773 100644
--- a/packages/nc-gui/components/cell/Rating.vue
+++ b/packages/nc-gui/components/cell/Rating.vue
@@ -37,7 +37,7 @@ const ratingMeta = computed(() => {
 })
 
 const vModel = computed({
-  get: () => modelValue ?? NaN,
+  get: () => Number(modelValue),
   set: (val) => emits('update:modelValue', val),
 })
 

From 642d5ed61fd8f762f7884d0908d7d30c693dc021 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 234/253] fix(nc-gui): Missing required prop: "isEdit"

---
 packages/nc-gui/components/smartsheet/column/PercentOptions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/column/PercentOptions.vue b/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
index ef0108e3a7..485d484803 100644
--- a/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
@@ -3,7 +3,7 @@ import { useVModel } from '#imports'
 
 const props = defineProps<{
   value: any
-  isEdit: boolean
+  isEdit?: boolean
 }>()
 
 const emit = defineEmits(['update:value'])

From 5e0c842ae33479a4fd147ac7c6b936a638b8d9c0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 235/253] fix(nc-gui): monaco editor, Invalid prop: type check
 failed for prop "modelValue"

---
 packages/nc-gui/components/monaco/Editor.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 706f700e9a..66420b4bfb 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -16,6 +16,7 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
+  modelValue: '',
   lang: 'json',
   validate: true,
   disableDeepCompare: false,
@@ -24,7 +25,9 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emits = defineEmits(['update:modelValue'])
 
-const { hideMinimap, lang, validate, disableDeepCompare, modelValue, readOnly, autoFocus } = props
+const { modelValue } = toRefs(props)
+
+const { hideMinimap, lang, validate, disableDeepCompare, readOnly, autoFocus } = props
 
 const vModel = computed<string>({
   get: () => {

From 67801754c0ac6d1a265bd95308666ec0b04f4999 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 236/253] fix(nc-gui): some browser console warnings

---
 packages/nc-gui/components/account/Profile.vue    |  2 +-
 packages/nc-gui/components/account/Token.vue      |  6 +++---
 packages/nc-gui/components/account/UserList.vue   |  4 ++--
 packages/nc-gui/components/nc/Switch.vue          |  3 ++-
 .../nc-gui/components/project/AccessSettings.vue  |  2 +-
 packages/nc-gui/components/roles/Selector.vue     |  4 ++--
 packages/nc-gui/components/smartsheet/Form.vue    |  2 +-
 .../smartsheet/toolbar/ViewActionMenu.vue         | 15 ++++++++++-----
 .../components/workspace/CollaboratorsList.vue    |  2 +-
 .../nc-gui/components/workspace/InviteSection.vue |  2 +-
 10 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/packages/nc-gui/components/account/Profile.vue b/packages/nc-gui/components/account/Profile.vue
index 30fbc61c7d..8aeaed23a5 100644
--- a/packages/nc-gui/components/account/Profile.vue
+++ b/packages/nc-gui/components/account/Profile.vue
@@ -94,7 +94,7 @@ const onValidate = async (_: any, valid: boolean) => {
             <a-input
               v-model:value="email"
               class="w-full !rounded-md !py-1.5"
-              :placeholder="$t('general.email')"
+              :placeholder="$t('labels.email')"
               disabled
               data-testid="nc-account-settings-email-input"
             />
diff --git a/packages/nc-gui/components/account/Token.vue b/packages/nc-gui/components/account/Token.vue
index 9c3d612fb0..70ede150e8 100644
--- a/packages/nc-gui/components/account/Token.vue
+++ b/packages/nc-gui/components/account/Token.vue
@@ -312,17 +312,17 @@ const handleCancel = () => {
               class="flex pl-5 py-3 justify-between token items-center border-l-1 border-r-1 border-b-1"
             >
               <span class="text-black font-bold text-3.5 text-start w-2/9">
-                <GeneralTruncateText placement="top" length="20">
+                <GeneralTruncateText placement="top" :length="20">
                   {{ el.description }}
                 </GeneralTruncateText>
               </span>
               <span class="text-gray-500 font-medium text-3.5 text-start w-2/9">
-                <GeneralTruncateText placement="top" length="20">
+                <GeneralTruncateText placement="top" :length="20">
                   {{ el.created_by }}
                 </GeneralTruncateText>
               </span>
               <span class="text-gray-500 font-medium text-3.5 text-start w-3/9">
-                <GeneralTruncateText v-if="el.token === selectedToken.id && selectedToken.isShow" placement="top" length="29">
+                <GeneralTruncateText v-if="el.token === selectedToken.id && selectedToken.isShow" placement="top" :length="29">
                   {{ el.token }}
                 </GeneralTruncateText>
                 <span v-else>************************************</span>
diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue
index 410e23e820..87458a8467 100644
--- a/packages/nc-gui/components/account/UserList.vue
+++ b/packages/nc-gui/components/account/UserList.vue
@@ -239,11 +239,11 @@ const openDeleteModal = (user: UserType) => {
                 <template #title>
                   {{ el.email }}
                 </template>
-                <GeneralTruncateText length="29">
+                <GeneralTruncateText :length="29">
                   {{ el.display_name }}
                 </GeneralTruncateText>
               </NcTooltip>
-              <GeneralTruncateText v-else length="29">
+              <GeneralTruncateText v-else :length="29">
                 {{ el.email }}
               </GeneralTruncateText>
             </div>
diff --git a/packages/nc-gui/components/nc/Switch.vue b/packages/nc-gui/components/nc/Switch.vue
index 9f50ce0d38..f5d9af077e 100644
--- a/packages/nc-gui/components/nc/Switch.vue
+++ b/packages/nc-gui/components/nc/Switch.vue
@@ -13,7 +13,8 @@ const onChange = (e: boolean) => {
 </script>
 
 <template>
-  <a-switch v-model:checked="checked" :disabled="disabled" class="nc-switch" :size="size" @change="onChange"> </a-switch>
+  <a-switch v-model:checked="checked" :disabled="disabled" class="nc-switch" v-bind="$attrs" :size="size" @change="onChange">
+  </a-switch>
   <span v-if="$slots.default" class="cursor-pointer pl-2" @click="checked = !checked">
     <slot />
   </span>
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 9b004a550c..6c5b16f420 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -224,7 +224,7 @@ watch(isInviteModalVisible, () => {
                         : null
                     "
                     :description="false"
-                    :on-role-change="(role: ProjectRoles) => updateCollaborator(collab, role)"
+                    :on-role-change="(role) => updateCollaborator(collab, role as ProjectRoles)"
                   />
                 </template>
                 <template v-else>
diff --git a/packages/nc-gui/components/roles/Selector.vue b/packages/nc-gui/components/roles/Selector.vue
index 79308fb1ef..f3ba95290e 100644
--- a/packages/nc-gui/components/roles/Selector.vue
+++ b/packages/nc-gui/components/roles/Selector.vue
@@ -11,7 +11,7 @@ const props = withDefaults(
     description?: boolean
     inherit?: string
     onRoleChange: (role: keyof typeof RoleLabels) => void
-    size: 'sm' | 'md' | 'lg'
+    size?: 'sm' | 'md' | 'lg'
   }>(),
   {
     description: true,
@@ -38,7 +38,7 @@ function onChangeRole(val: SelectValue) {
   <div ref="dropdownRef" size="lg" class="nc-roles-selector relative" @click="isDropdownOpen = !isDropdownOpen">
     <RolesBadge data-testid="roles" :role="roleRef" :inherit="inheritRef === role" :size="sizeRef" clickable />
     <a-select
-      v-model:value="roleRef"
+      :value="roleRef"
       :open="isDropdownOpen"
       :dropdown-match-select-width="false"
       dropdown-class-name="!rounded-lg !h-fit max-w-[350px] nc-role-selector-dropdown"
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 59ad63bfa0..33b6c275cf 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -456,7 +456,7 @@ async function submitCallback() {
 }
 
 const updateColMeta = useDebounceFn(async (col: Record<string, any>) => {
-  if (col.id) {
+  if (col.id && isEditable) {
     try {
       await $api.dbView.formColumnUpdate(col.id, col)
     } catch (e: any) {
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
index b171b0c9c1..65a0efd5bc 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
@@ -3,11 +3,16 @@ import type { TableType, ViewType } from 'nocodb-sdk'
 import { ViewTypes } from 'nocodb-sdk'
 import { LockType } from '~/lib'
 
-const props = defineProps<{
-  view: ViewType
-  table: TableType
-  inSidebar: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    view: ViewType
+    table: TableType
+    inSidebar?: boolean
+  }>(),
+  {
+    inSidebar: false,
+  },
+)
 
 const emits = defineEmits(['rename', 'closeModal', 'delete'])
 
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 4815dcb5df..32292bdd62 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -118,7 +118,7 @@ onMounted(async () => {
                     :roles="accessibleRoles"
                     :description="false"
                     class="cursor-pointer"
-                    :on-role-change="(role: WorkspaceUserRoles) => updateCollaborator(collab, role)"
+                    :on-role-change="(role) => updateCollaborator(collab, role as WorkspaceUserRoles)"
                   />
                 </div>
               </template>
diff --git a/packages/nc-gui/components/workspace/InviteSection.vue b/packages/nc-gui/components/workspace/InviteSection.vue
index 0f88e387ed..6b8ab2710d 100644
--- a/packages/nc-gui/components/workspace/InviteSection.vue
+++ b/packages/nc-gui/components/workspace/InviteSection.vue
@@ -242,7 +242,7 @@ const onPaste = (e: ClipboardEvent) => {
         class="px-1 min-w-[152px] nc-invite-role-selector"
         :role="inviteData.roles"
         :roles="allowedRoles"
-        :on-role-change="(role: WorkspaceUserRoles) => (inviteData.roles = role)"
+        :on-role-change="(role) => (inviteData.roles = role as WorkspaceUserRoles)"
         :description="true"
       />
 

From c01458ee5171803815d93f14e0b134c7339be140 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 237/253] fix(nc-gui): pr review changes

---
 packages/nc-gui/components/monaco/Editor.vue | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 66420b4bfb..49831adebf 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -15,20 +15,18 @@ interface Props {
   autoFocus?: boolean
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  modelValue: '',
-  lang: 'json',
-  validate: true,
-  disableDeepCompare: false,
-  autoFocus: true,
-})
+const {
+  hideMinimap,
+  lang = 'json',
+  validate = true,
+  disableDeepCompare = false,
+  readOnly,
+  autoFocus = true,
+  modelValue = '',
+} = defineProps<Props>()
 
 const emits = defineEmits(['update:modelValue'])
 
-const { modelValue } = toRefs(props)
-
-const { hideMinimap, lang, validate, disableDeepCompare, readOnly, autoFocus } = props
-
 const vModel = computed<string>({
   get: () => {
     if (typeof modelValue === 'object') {

From 5695241e59c317e1bf1212d3004042f444fdf7cc Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 238/253] fix(nc-gui): Type '"sm"' is not assignable to type
 'NcButtonSize

---
 packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index 4c5a444300..3a2dbcc6ae 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -470,7 +470,7 @@ useMenuCloseOnEsc(open)
           <NcButton
             v-if="!filterQuery"
             class="nc-fields-show-all-fields !text-gray-500 !w-1/2"
-            size="sm"
+            size="small"
             type="ghost"
             @click="showAllColumns = !showAllColumns"
           >
@@ -479,7 +479,7 @@ useMenuCloseOnEsc(open)
           <NcButton
             v-if="!isPublic && !filterQuery"
             class="nc-fields-show-system-fields !text-gray-500 !w-1/2"
-            size="sm"
+            size="small"
             type="ghost"
             @click="showSystemField = !showSystemField"
           >

From d89eee8bb72085cfe7c3bdce0e57e7bc2b5fe9ca Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 239/253] fix(nc-gui):  Invalid prop: type check failed for
 prop "baseRole".

---
 .../dashboard/TreeView/ProjectWrapper.vue         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
index 1d1a6930f8..36ee2a4267 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
@@ -2,15 +2,20 @@
 import type { BaseType } from 'nocodb-sdk'
 import { ProjectInj, ProjectRoleInj } from '#imports'
 
-const props = defineProps<{
-  baseRole: string | string[]
-  base: BaseType
-}>()
+const props = withDefaults(
+  defineProps<{
+    baseRole: string | string[]
+    base: BaseType
+  }>(),
+  {
+    baseRole: '',
+  },
+)
 
 const baseRole = toRef(props, 'baseRole')
 const base = toRef(props, 'base')
 
-provide(ProjectRoleInj, baseRole)
+provide(ProjectRoleInj, baseRole ?? '')
 provide(ProjectInj, base)
 </script>
 

From 1d0edbd48e9ce99bef84e3d0afc425dc64f9cff7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 240/253] fix(nc-gui): Failed to resolve component:
 AccountUserManagement

---
 packages/nc-gui/pages/account/index/[page].vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/pages/account/index/[page].vue b/packages/nc-gui/pages/account/index/[page].vue
index 9650cb5152..f957e10fbb 100644
--- a/packages/nc-gui/pages/account/index/[page].vue
+++ b/packages/nc-gui/pages/account/index/[page].vue
@@ -3,9 +3,10 @@ const { appInfo } = useGlobal()
 </script>
 
 <template>
-  <AccountUserManagement v-if="$route.params.page === 'users'" />
-  <AccountToken v-else-if="$route.params.page === 'tokens'" />
-  <AccountProfile v-else-if="$route.params.page === 'profile'" />
-  <AccountAppStore v-else-if="$route.params.page === 'apps' && !appInfo.isCloud" />
-  <span v-else></span>
+  <div>
+    <AccountToken v-if="$route.params.page === 'tokens'" />
+    <AccountProfile v-else-if="$route.params.page === 'profile'" />
+    <AccountAppStore v-else-if="$route.params.page === 'apps' && !appInfo.isCloud" />
+    <span v-else></span>
+  </div>
 </template>

From cb7a7ec84fcd4c205cc5bdd284b92effc5f1e4a8 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 241/253] fix(nc-gui): Type '"sm"

---
 packages/nc-gui/components/roles/Badge.vue                  | 2 +-
 packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/roles/Badge.vue b/packages/nc-gui/components/roles/Badge.vue
index 863afd9b64..8da82c3c19 100644
--- a/packages/nc-gui/components/roles/Badge.vue
+++ b/packages/nc-gui/components/roles/Badge.vue
@@ -8,7 +8,7 @@ const props = withDefaults(
     clickable?: boolean
     inherit?: boolean
     border?: boolean
-    size?: 'sm' | 'md'
+    size?: 'sm' | 'md' | 'lg'
   }>(),
   {
     clickable: false,
diff --git a/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue b/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
index 8caed6f502..7f60d6c14c 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
@@ -99,7 +99,7 @@ useMenuCloseOnEsc(open)
       >
         <div class="flex flex-col w-full text-sm" @click.stop>
           <div class="text-xs text-gray-500 px-3 pt-2 pb-1 select-none">{{ $t('objects.rowHeight') }}</div>
-          <div v-for="(item, i) of rowHeightOptions" class="nc-row-height-option" @click="updateRowHeight(i)">
+          <div v-for="(item, i) of rowHeightOptions" :key="i" class="nc-row-height-option" @click="updateRowHeight(i)">
             <div class="flex items-center gap-2">
               <GeneralIcon :icon="item.icon" class="nc-row-height-icon" />
               {{ $t(`objects.heightClass.${item.heightClass}`) }}

From 68ba6a78e6370702d3c8bceab82daacd16bd30f3 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 242/253] fix(nc-gui): Missing required prop: "baseId"

---
 packages/nc-gui/components/project/ShareBaseDlg.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/project/ShareBaseDlg.vue
index 82c775172a..192d796efa 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/project/ShareBaseDlg.vue
@@ -3,7 +3,7 @@ import { OrderedProjectRoles, ProjectRoles } from 'nocodb-sdk'
 import type { User } from '#imports'
 const props = defineProps<{
   modelValue: boolean
-  baseId: string
+  baseId?: string
 }>()
 const emit = defineEmits(['update:modelValue'])
 

From c0add74a1f623b3a5ba320a4f157a65436515036 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 243/253] fix(nc-gui): Invalid prop: type check failed for prop
 "saml". Expected Object, got Undefined

---
 packages/nc-gui/components/project/ShareBaseDlg.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/project/ShareBaseDlg.vue
index 192d796efa..e44d77678d 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/project/ShareBaseDlg.vue
@@ -269,7 +269,7 @@ const inviteProjectCollaborator = async () => {
             class="nc-invite-role-selector"
             :role="inviteData.roles"
             :roles="allowedRoles"
-            :on-role-change="(role: ProjectRoles) => (inviteData.roles = role)"
+            :on-role-change="(role) => (inviteData.roles = role as ProjectRoles)"
             :description="false"
           />
         </div>

From 47a08e9e60402a0a31d83f2b263434dd8c06b904 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:15 +0000
Subject: [PATCH 244/253] fix(nc-gui): Cannot read properties of undefined
 (reading 'id')

---
 packages/nc-gui/components/smartsheet/Gallery.vue        | 2 +-
 packages/nc-gui/components/smartsheet/Kanban.vue         | 2 +-
 packages/nc-gui/components/smartsheet/Map.vue            | 2 +-
 packages/nc-gui/components/smartsheet/calendar/index.vue | 2 +-
 packages/nc-gui/components/smartsheet/grid/index.vue     | 2 +-
 packages/nc-gui/composables/useExpandedFormStore.ts      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Gallery.vue b/packages/nc-gui/components/smartsheet/Gallery.vue
index 5ad503ed50..bb4e3f7f02 100644
--- a/packages/nc-gui/components/smartsheet/Gallery.vue
+++ b/packages/nc-gui/components/smartsheet/Gallery.vue
@@ -372,7 +372,7 @@ watch(
 
   <Suspense>
     <LazySmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue
index eece578637..943f9c1c39 100644
--- a/packages/nc-gui/components/smartsheet/Kanban.vue
+++ b/packages/nc-gui/components/smartsheet/Kanban.vue
@@ -753,7 +753,7 @@ const getRowId = (row: RowType) => {
 
   <Suspense>
     <LazySmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       :key="route.query.rowId"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 3fc53b12be..05e07a98cd 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -245,7 +245,7 @@ const count = computed(() => paginationData.value.totalRows)
   </Suspense>
   <Suspense v-if="!isPublic">
     <LazySmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index e54d7d5caa..81a3e6ffcb 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -331,7 +331,7 @@ const headerText = computed(() => {
 
   <Suspense>
     <LazySmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       v-model="expandedFormOnRowIdDlg"
       close-after-save
       :meta="meta"
diff --git a/packages/nc-gui/components/smartsheet/grid/index.vue b/packages/nc-gui/components/smartsheet/grid/index.vue
index 15cb8c523b..559bc61726 100644
--- a/packages/nc-gui/components/smartsheet/grid/index.vue
+++ b/packages/nc-gui/components/smartsheet/grid/index.vue
@@ -267,7 +267,7 @@ const goToPreviousRow = () => {
       />
     </Suspense>
     <SmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index 43236a7743..96cf8e78ff 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -304,7 +304,7 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
   }
 
   const loadRow = async (rowId?: string, onlyVirtual = false) => {
-    if (isPublic.value) return
+    if (isPublic.value || !meta.value?.id) return
     let record = await $api.dbTableRow.read(
       NOCO,
       // todo: base_id missing on view type

From 4551d1c620a9ebdb0b9ab98c072ff5d5edc1fa3e Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:15 +0000
Subject: [PATCH 245/253] fix(nc-gui): small changes

---
 .../nc-gui/components/dashboard/TreeView/ProjectWrapper.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
index 36ee2a4267..0242136ce5 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
@@ -15,7 +15,7 @@ const props = withDefaults(
 const baseRole = toRef(props, 'baseRole')
 const base = toRef(props, 'base')
 
-provide(ProjectRoleInj, baseRole ?? '')
+provide(ProjectRoleInj, baseRole)
 provide(ProjectInj, base)
 </script>
 

From 491e8f3cac75d28cb84d9a7e6268bace5f6fd952 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:15 +0000
Subject: [PATCH 246/253] fix(nc-gui): pr review changes

---
 packages/nc-gui/components/project/ShareBaseDlg.vue        | 5 ++++-
 packages/nc-gui/components/workspace/CollaboratorsList.vue | 2 +-
 packages/nc-gui/components/workspace/InviteSection.vue     | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/project/ShareBaseDlg.vue
index e44d77678d..7ab942402a 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/project/ShareBaseDlg.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { RoleLabels } from 'nocodb-sdk'
 import { OrderedProjectRoles, ProjectRoles } from 'nocodb-sdk'
 import type { User } from '#imports'
 const props = defineProps<{
@@ -211,6 +212,8 @@ const inviteProjectCollaborator = async () => {
     singleEmailValue.value = ''
   }
 }
+
+const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role as ProjectRoles)
 </script>
 
 <template>
@@ -269,7 +272,7 @@ const inviteProjectCollaborator = async () => {
             class="nc-invite-role-selector"
             :role="inviteData.roles"
             :roles="allowedRoles"
-            :on-role-change="(role) => (inviteData.roles = role as ProjectRoles)"
+            :on-role-change="onRoleChange"
             :description="false"
           />
         </div>
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 32292bdd62..cdd342a7b9 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -118,7 +118,7 @@ onMounted(async () => {
                     :roles="accessibleRoles"
                     :description="false"
                     class="cursor-pointer"
-                    :on-role-change="(role) => updateCollaborator(collab, role as WorkspaceUserRoles)"
+                    :on-role-change="(role) => updateCollaborator(collab, role)"
                   />
                 </div>
               </template>
diff --git a/packages/nc-gui/components/workspace/InviteSection.vue b/packages/nc-gui/components/workspace/InviteSection.vue
index 6b8ab2710d..48b2fbe87a 100644
--- a/packages/nc-gui/components/workspace/InviteSection.vue
+++ b/packages/nc-gui/components/workspace/InviteSection.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { onKeyStroke } from '@vueuse/core'
+import type { RoleLabels } from 'nocodb-sdk'
 import { OrderedWorkspaceRoles, WorkspaceUserRoles } from 'nocodb-sdk'
 import { extractSdkResponseErrorMsg, useWorkspace } from '#imports'
 import { validateEmail } from '~/utils/validation'
@@ -192,6 +193,8 @@ const onPaste = (e: ClipboardEvent) => {
   })
   inviteData.email = ''
 }
+
+const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role as WorkspaceUserRoles)
 </script>
 
 <template>
@@ -242,7 +245,7 @@ const onPaste = (e: ClipboardEvent) => {
         class="px-1 min-w-[152px] nc-invite-role-selector"
         :role="inviteData.roles"
         :roles="allowedRoles"
-        :on-role-change="(role) => (inviteData.roles = role as WorkspaceUserRoles)"
+        :on-role-change="onRoleChange"
         :description="true"
       />
 

From 4058f34dc2e2c99d26e16b717d752d55569bcdd4 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:15 +0000
Subject: [PATCH 247/253] fix(nc-gui): use withDefaults insted of directly
 assigning default props value in defineProps call

---
 packages/nc-gui/components/monaco/Editor.vue | 28 +++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 49831adebf..63203a7149 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -15,28 +15,30 @@ interface Props {
   autoFocus?: boolean
 }
 
-const {
-  hideMinimap,
-  lang = 'json',
-  validate = true,
-  disableDeepCompare = false,
-  readOnly,
-  autoFocus = true,
-  modelValue = '',
-} = defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  modelValue: '',
+  lang: 'json',
+  validate: true,
+  disableDeepCompare: false,
+  autoFocus: true,
+})
+
+const { modelValue } = toRefs(props)
+
+const { hideMinimap, lang, validate, disableDeepCompare, readOnly, autoFocus } = props
 
 const emits = defineEmits(['update:modelValue'])
 
 const vModel = computed<string>({
   get: () => {
-    if (typeof modelValue === 'object') {
-      return JSON.stringify(modelValue, null, 2)
+    if (typeof modelValue.value === 'object') {
+      return JSON.stringify(modelValue.value, null, 2)
     } else {
-      return modelValue
+      return modelValue.value ?? ''
     }
   },
   set: (newVal: string | Record<string, any>) => {
-    if (typeof modelValue === 'object') {
+    if (typeof modelValue.value === 'object') {
       try {
         emits('update:modelValue', typeof newVal === 'object' ? newVal : JSON.parse(newVal))
       } catch (e) {

From 8edad3be55caabbf58d0491bca5497cbf798dd7e Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Thu, 14 Mar 2024 03:09:15 +0000
Subject: [PATCH 248/253] New Crowdin updates (#7852)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Arabic)

* New translations en.json (Czech)

* New translations en.json (Danish)

* New translations en.json (German)

* New translations en.json (Basque)

* New translations en.json (Finnish)

* New translations en.json (Hebrew)

* New translations en.json (Italian)

* New translations en.json (Japanese)

* New translations en.json (Korean)

* New translations en.json (Dutch)

* New translations en.json (Norwegian)

* New translations en.json (Polish)

* New translations en.json (Portuguese)

* New translations en.json (Russian)

* New translations en.json (Slovak)

* New translations en.json (Slovenian)

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Chinese Traditional)

* New translations en.json (English)

* New translations en.json (Vietnamese)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Indonesian)

* New translations en.json (Persian)

* New translations en.json (Thai)

* New translations en.json (Croatian)

* New translations en.json (Latvian)

* New translations en.json (Hindi)

* New translations en.json (Bengali, India)
---
 packages/nc-gui/lang/ar.json      |   4 +
 packages/nc-gui/lang/bn_IN.json   |   4 +
 packages/nc-gui/lang/cs.json      |   4 +
 packages/nc-gui/lang/da.json      |   4 +
 packages/nc-gui/lang/de.json      |   4 +
 packages/nc-gui/lang/en.json      |  12 +--
 packages/nc-gui/lang/es.json      |   4 +
 packages/nc-gui/lang/eu.json      |   4 +
 packages/nc-gui/lang/fa.json      |   4 +
 packages/nc-gui/lang/fi.json      |   4 +
 packages/nc-gui/lang/fr.json      |   4 +
 packages/nc-gui/lang/he.json      |   4 +
 packages/nc-gui/lang/hi.json      |   4 +
 packages/nc-gui/lang/hr.json      |   4 +
 packages/nc-gui/lang/id.json      |   4 +
 packages/nc-gui/lang/it.json      |   4 +
 packages/nc-gui/lang/ja.json      |   4 +
 packages/nc-gui/lang/ko.json      |   4 +
 packages/nc-gui/lang/lv.json      |   4 +
 packages/nc-gui/lang/nl.json      |   4 +
 packages/nc-gui/lang/no.json      |   4 +
 packages/nc-gui/lang/pl.json      |   4 +
 packages/nc-gui/lang/pt.json      | 160 +++++++++++++++---------------
 packages/nc-gui/lang/pt_BR.json   |   4 +
 packages/nc-gui/lang/ru.json      |   4 +
 packages/nc-gui/lang/sk.json      |   4 +
 packages/nc-gui/lang/sl.json      |   4 +
 packages/nc-gui/lang/sv.json      |   4 +
 packages/nc-gui/lang/th.json      |   4 +
 packages/nc-gui/lang/tr.json      |   4 +
 packages/nc-gui/lang/uk.json      |   4 +
 packages/nc-gui/lang/vi.json      |   4 +
 packages/nc-gui/lang/zh-Hans.json |   4 +
 packages/nc-gui/lang/zh-Hant.json |   4 +
 34 files changed, 216 insertions(+), 84 deletions(-)

diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json
index 758a943cde..9a48203ea8 100644
--- a/packages/nc-gui/lang/ar.json
+++ b/packages/nc-gui/lang/ar.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json
index c165e2d28a..2310652475 100644
--- a/packages/nc-gui/lang/bn_IN.json
+++ b/packages/nc-gui/lang/bn_IN.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json
index d438c678db..b17351cc1b 100644
--- a/packages/nc-gui/lang/cs.json
+++ b/packages/nc-gui/lang/cs.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
index 1084967984..0c8684f2bd 100644
--- a/packages/nc-gui/lang/da.json
+++ b/packages/nc-gui/lang/da.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index 875a8fef9e..c8046cc3df 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index bbb9cf19bf..8544f9a17e 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -695,9 +695,9 @@
     "appearanceSettings": "Appearance Settings",
     "backgroundColor": "Background Color",
     "hideNocodbBranding": "Hide NocoDB Branding",
-    "showOnConditions": "Show on conditions",
+    "showOnConditions": "Show on condtions",
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
-    "limitOptions": "Limit options",
+    "limitOptions": "Limit ptions",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
     "clearSelection": "Clear selection"
   },
@@ -933,8 +933,8 @@
     "addFieldFromFormView": "Add Field",
     "selectAllFields": "Select all fields",
     "preFilledFields": {
-      "title": "Pre-filled Fields",
-      "default": "Allow pre-filling fields",
+      "title": "Enable Pre-fill",
+      "default": "Default",
       "locked": "Lock pre-filled fields as read-only",
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
@@ -970,8 +970,8 @@
     "clientKey": "Select .key file",
     "clientCert": "Select .cert file",
     "clientCA": "Select CA file",
-    "changeIconColour": "Change icon colour",
-    "preFillFormInfo": "Generate share form URL with pre-filled field data. To get a pre-filled link, make sure you’ve filled the necessary fields in the form view builder.",
+    "changeIconColour": "Change Icon Colour",
+    "preFillFormInfo": "To get a prefilled link, make sure you’ve filled the necessary fields in the form view builder.",
     "surveyFormInfo": "Form mode with one field per page"
   },
   "placeholder": {
diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
index 227cc388d7..1ec0c7b264 100644
--- a/packages/nc-gui/lang/es.json
+++ b/packages/nc-gui/lang/es.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "La vista del calendario requiere un rango de fechas",
     "goToToday": "Ir a Hoy",
     "toggleSidebar": "Alternar Barra Lateral",
diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
index da57bb6bac..943c06fd57 100644
--- a/packages/nc-gui/lang/eu.json
+++ b/packages/nc-gui/lang/eu.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json
index 8bbe27b1c4..36c17558d6 100644
--- a/packages/nc-gui/lang/fa.json
+++ b/packages/nc-gui/lang/fa.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
index 21a1fec1e9..efa2f54cb0 100644
--- a/packages/nc-gui/lang/fi.json
+++ b/packages/nc-gui/lang/fi.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index 0dea63b74e..3af8a1226e 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json
index c75a1fa2ce..f0ec6f4bdc 100644
--- a/packages/nc-gui/lang/he.json
+++ b/packages/nc-gui/lang/he.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json
index e2955fcffd..fbfbe1f9a6 100644
--- a/packages/nc-gui/lang/hi.json
+++ b/packages/nc-gui/lang/hi.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json
index 3d9bb97891..a31b789de7 100644
--- a/packages/nc-gui/lang/hr.json
+++ b/packages/nc-gui/lang/hr.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
index 894fe24de6..09a928fa91 100644
--- a/packages/nc-gui/lang/id.json
+++ b/packages/nc-gui/lang/id.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json
index 8bdb39810e..37f5de219c 100644
--- a/packages/nc-gui/lang/it.json
+++ b/packages/nc-gui/lang/it.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json
index dedcb0084f..e28e562d1a 100644
--- a/packages/nc-gui/lang/ja.json
+++ b/packages/nc-gui/lang/ja.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
index 51aa53ee6f..49b7497188 100644
--- a/packages/nc-gui/lang/ko.json
+++ b/packages/nc-gui/lang/ko.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json
index 3f4d5e6bb3..13a8dc188d 100644
--- a/packages/nc-gui/lang/lv.json
+++ b/packages/nc-gui/lang/lv.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
index c3b9bcdbb8..650c68fbb4 100644
--- a/packages/nc-gui/lang/nl.json
+++ b/packages/nc-gui/lang/nl.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
index 3cba3382b1..9fae7cbf82 100644
--- a/packages/nc-gui/lang/no.json
+++ b/packages/nc-gui/lang/no.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
index 9cf6d05737..e812dd0c61 100644
--- a/packages/nc-gui/lang/pl.json
+++ b/packages/nc-gui/lang/pl.json
@@ -702,6 +702,10 @@
     "clearSelection": "Wyczyść wybór"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Widok kalendarza wymaga zakresu dat",
     "goToToday": "Przejdź do dzisiaj",
     "toggleSidebar": "Przełącz pasek boczny",
diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
index 2b43db0aa9..0b2345522c 100644
--- a/packages/nc-gui/lang/pt.json
+++ b/packages/nc-gui/lang/pt.json
@@ -198,13 +198,13 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
-    "apply": "Apply"
+    "apply": "Aplicar"
   },
   "objects": {
-    "day": "Day",
-    "week": "Week",
-    "month": "Month",
-    "year": "Year",
+    "day": "Dia",
+    "week": "Semana",
+    "month": "Mês",
+    "year": "Ano",
     "workspace": "Área de trabalho",
     "workspaces": "Áreas de trabalho",
     "project": "Projeto",
@@ -251,7 +251,7 @@
     "sqlVIew": "Vista SQL",
     "rowHeight": "Record Height",
     "heightClass": {
-      "short": "Short",
+      "short": "Curto",
       "medium": "Médio",
       "tall": "Alto",
       "extra": "Extra"
@@ -331,45 +331,45 @@
     "updateSelectedRows": "Actualizar os registos selecionados",
     "noFiltersAdded": "Nenhum filtro adicionado",
     "editCards": "Editar cartões",
-    "noFieldsFound": "No fields found",
-    "displayValue": "Display Value",
-    "expand": "Expand",
-    "hideAll": "Hide all",
-    "hideSystemFields": "Hide system fields",
-    "removeFile": "Remove File",
-    "hasMany": "Has Many",
-    "manyToMany": "Many to Many",
-    "virtualRelation": "Virtual Relation",
-    "linkMore": "Link More",
-    "linkMoreRecords": "Link more records",
-    "linkRecords": "Link Records",
-    "downloadFile": "Download File",
-    "renameTable": "Rename Table",
-    "renamingTable": "Renaming Table",
-    "renamingWs": "Renaming Workspace",
-    "renameWs": "Rename Workspace",
-    "deleteWs": "Delete Workspace",
-    "deletingWs": "Deleting Workspace",
-    "copyAuthToken": "Copy Auth Token",
-    "copiedAuthToken": "Copied Auth Token",
-    "copyInviteToken": "Copy Invite Token",
-    "showSidebar": "Show Sidebar",
-    "hideSidebar": "Hide Sidebar",
-    "creatingTable": "Creating Table",
+    "noFieldsFound": "Não foram encontrados campos",
+    "displayValue": "Exibir valor",
+    "expand": "Expandir",
+    "hideAll": "Esconder todos",
+    "hideSystemFields": "Ocultar campos do sistema",
+    "removeFile": "Remover ficheiro",
+    "hasMany": "Tem muitos",
+    "manyToMany": "De muitos para muitos",
+    "virtualRelation": "Relação virtual",
+    "linkMore": "Vincular mais",
+    "linkMoreRecords": "Vincular mais registos",
+    "linkRecords": "Vincular registos",
+    "downloadFile": "Transferir ficheiro",
+    "renameTable": "Mudar o nome da tabela",
+    "renamingTable": "Renomeando a tabela",
+    "renamingWs": "Renomeado espaço de trabalho",
+    "renameWs": "Renomear espaço de trabalho",
+    "deleteWs": "Eliminar espaço de trabalho",
+    "deletingWs": "Eliminando espaço de trabalho",
+    "copyAuthToken": "Copie token de autenticação",
+    "copiedAuthToken": "Token de autenticação copiado",
+    "copyInviteToken": "Copiar token de convite",
+    "showSidebar": "Mostrar barra lateral",
+    "hideSidebar": "Esconder barra lateral",
+    "creatingTable": "Criando tabela",
     "erdView": "Vista ERD",
-    "newBase": "New Data Source",
+    "newBase": "Nova fonte de dados",
     "newProj": "Novo Projecto",
-    "createBase": "Create Base",
+    "createBase": "Criar projecto",
     "myProject": "Os meus Projectos",
     "formTitle": "Título de forma",
-    "collaborative": "Collaborative",
-    "locked": "Locked",
-    "personal": "Personal",
+    "collaborative": "Colaborativo",
+    "locked": "Bloqueado",
+    "personal": "Pessoal",
     "appStore": "Loja de Aplicações",
     "teamAndAuth": "Equipa & Autenticação",
     "rolesUserMgmt": "Papéis & Gestão de Utilizadores",
     "userMgmt": "Gestão de Utilizadores",
-    "apiTokens": "API Tokens",
+    "apiTokens": "Tokens de API",
     "apiTokenMgmt": "Gestão de Tokens API Tokens",
     "rolesMgmt": "Gestão de papéis",
     "projMeta": "Metadados do Projecto",
@@ -515,29 +515,29 @@
     "viewingAttachmentsOf": "Viewing Attachments of",
     "readOnly": "Readonly",
     "dropHere": "Drop here",
-    "createdOn": "Created On",
+    "createdOn": "Criado em",
     "notifyVia": "Notificar via.",
     "projName": "Nome do Projeto",
-    "profile": "Profile",
-    "accountDetails": "Account Details",
-    "controlAppearance": "Control your Appearance.",
-    "accountEmailID": "Account Email ID",
-    "backToWorkspace": "Back to Workspace",
-    "untitledToken": "Untitled token",
+    "profile": "Perfil",
+    "accountDetails": "Detalhes da conta",
+    "controlAppearance": "Controlar a sua aparência.",
+    "accountEmailID": "ID da conta de e-mail",
+    "backToWorkspace": "Voltar ao espaço de trabalho",
+    "untitledToken": "Token sem título",
     "tableName": "Nome da tabela",
-    "dashboardName": "Dashboard name",
-    "createView": "Create a View",
-    "creatingView": "Creating View",
-    "duplicateView": "Duplicate View",
-    "duplicateGridView": "Duplicate Grid View",
-    "createGridView": "Create Grid View",
-    "duplicateGalleryView": "Duplicate Gallery View",
-    "createGalleryView": "Create Gallery View",
-    "duplicateFormView": "Duplicate Form View",
-    "createFormView": "Create Form View",
-    "duplicateKanbanView": "Duplicate Kanban View",
-    "duplicateCalendarView": "Duplicate Calendar View",
-    "createKanbanView": "Create Kanban View",
+    "dashboardName": "Nome do painel",
+    "createView": "Criar uma vista",
+    "creatingView": "Criando visualização",
+    "duplicateView": "Vista duplicada",
+    "duplicateGridView": "Vista duplicada em grelha",
+    "createGridView": "Criar vista de grelha",
+    "duplicateGalleryView": "Duplicar vista de galeria",
+    "createGalleryView": "Criar vista de galeria",
+    "duplicateFormView": "Duplicar vista de formulário",
+    "createFormView": "Criar visualização de formulário",
+    "duplicateKanbanView": "Duplicar vista kanban",
+    "duplicateCalendarView": "Duplicar vista de calendário",
+    "createKanbanView": "Criar visualização kanban",
     "createCalendarView": "Criar visualização de calendário",
     "viewName": "Visualizar nome",
     "viewLink": "View link.",
@@ -549,7 +549,7 @@
     "databaseType": "Digite o banco de dados",
     "lengthValue": "Comprimento / valor",
     "dbType": "Tipo de Base de Dados",
-    "servername": "servername / hostAddr",
+    "servername": "nomeServidor /endrCliente",
     "sqliteFile": "Ficheiro SQLite",
     "hostAddress": "Endereço do servidor",
     "port": "Número da Porta",
@@ -569,12 +569,12 @@
     "where": "Onde",
     "cache": "Cache",
     "chat": "Bate-papo",
-    "showOrHide": "Show or Hide",
+    "showOrHide": "Mostrar ou ocultar",
     "airtable": "Airtable",
     "csv": "CSV",
-    "csvFile": "CSV File",
+    "csvFile": "Ficheiro CSV",
     "json": "JSON",
-    "jsonFile": "JSON File",
+    "jsonFile": "Ficheiro JSON",
     "excel": "Excel",
     "microsoftExcel": "Microsoft Excel",
     "email": "Correio electrónico",
@@ -585,13 +585,13 @@
     "created": "Criado",
     "sqlOutput": "Saída SQL.",
     "addOption": "Adicionar opção",
-    "interfaceColor": "Interface Color",
+    "interfaceColor": "Cor da interface",
     "qrCodeValueColumn": "Coluna com valor de código QR",
     "barcodeValueColumn": "Coluna com valor de código de barras",
     "barcodeFormat": "Formato do código de barras",
     "qrCodeValueTooLong": "Demasiados caracteres para um código QR",
     "barcodeValueTooLong": "Demasiados caracteres para um código de barras",
-    "currentLocation": "Current Location",
+    "currentLocation": "Localização atual",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Função agregada",
@@ -614,17 +614,17 @@
       "joinCommunity": "Junte-se à Comunidade NocoDB",
       "joinReddit": "Junte-se /r/NocoDB",
       "followNocodb": "Siga NocoDB",
-      "communityTranslated": "(Community Translated)"
+      "communityTranslated": "(Traduzido pela comunidade)"
     },
     "twitter": "Twitter",
     "docReference": "Referência do documento",
     "selectUserRole": "Selecione a função do usuário",
     "childTable": "Mesa de criança",
     "childColumn": "Coluna de criança",
-    "childField": "Child field",
-    "joinCloudForFree": "Join Cloud for Free",
+    "childField": "Campo filho",
+    "joinCloudForFree": "Adira ao Cloud gratuitamente",
     "linkToAnotherRecord": "Link para outro registo",
-    "links": "Links",
+    "links": "Ligações",
     "onUpdate": "Na atualização",
     "onDelete": "Em excluir",
     "account": "Conta",
@@ -634,21 +634,21 @@
     "customTheme": "Tema personalizado",
     "requestDataSource": "Solicitar uma fonte de dados de que necessita?",
     "apiKey": "Chave API",
-    "personalAccessToken": "Personal Access Token",
-    "sharedBaseUrl": "Shared Base URL",
+    "personalAccessToken": "Token de acesso pessoal",
+    "sharedBaseUrl": "URL de base partilhado",
     "importData": "Dados de importação",
     "importSecondaryViews": "Importar vistas secundárias",
     "importRollupColumns": "Importar Colunas de Rollup",
     "importLookupColumns": "Importar colunas de pesquisa",
     "importAttachmentColumns": "Colunas de Anexos de Importação",
     "importFormulaColumns": "Colunas de Fórmula de Importação",
-    "importUsers": "Import Users (by email)",
+    "importUsers": "Importar utilizadores (por e-mail)",
     "noData": "Sem dados",
     "goToDashboard": "Ir para Painel de controlo",
     "importing": "Importação",
-    "formatJson": "Format JSON",
-    "autoSelectFieldTypes": "Auto-Select Field Types",
-    "firstRowAsHeaders": "Use First Record as Headers",
+    "formatJson": "Formato JSON",
+    "autoSelectFieldTypes": "Seleção automática de tipos de campo",
+    "firstRowAsHeaders": "Utilize o primeiro registo como cabeçalho",
     "flattenNested": "Ninhada achatada",
     "downloadAllowed": "Download permitido",
     "weAreHiring": "Estamos a contratar!",
@@ -667,12 +667,12 @@
     "inviteOnlySignup": "Permitir a inscrição apenas utilizando a url de convite",
     "nextRow": "Fila seguinte",
     "prevRow": "Fila Anterior",
-    "addRowGrid": "Manually add data in grid view",
-    "addRowForm": "Enter record data through a form",
-    "noAccess": "No access",
-    "restApis": "Rest APIs",
+    "addRowGrid": "Adicione manualmente dados na vista de grelha",
+    "addRowForm": "Introduza dados de registo através de um formulário",
+    "noAccess": "Sem acesso",
+    "restApis": "APIs Rest",
     "apis": "APIs",
-    "includeData": "Include Data",
+    "includeData": "Incluir dados",
     "includeView": "Include View",
     "includeWebhook": "Include Webhook",
     "zoomInToViewColumns": "Zoom in to view columns",
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
index 4d02c4ed1a..1bbc6e153c 100644
--- a/packages/nc-gui/lang/pt_BR.json
+++ b/packages/nc-gui/lang/pt_BR.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
index 4c13bf0aae..b0bfc41c59 100644
--- a/packages/nc-gui/lang/ru.json
+++ b/packages/nc-gui/lang/ru.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json
index 7ce01366d6..f82ee2e964 100644
--- a/packages/nc-gui/lang/sk.json
+++ b/packages/nc-gui/lang/sk.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json
index 4055115c5b..9c7550fb08 100644
--- a/packages/nc-gui/lang/sl.json
+++ b/packages/nc-gui/lang/sl.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
index 8750f07c3e..3871039a79 100644
--- a/packages/nc-gui/lang/sv.json
+++ b/packages/nc-gui/lang/sv.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
index 8446c4468a..67a1485167 100644
--- a/packages/nc-gui/lang/th.json
+++ b/packages/nc-gui/lang/th.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json
index 506d4bbe23..46ca6876da 100644
--- a/packages/nc-gui/lang/tr.json
+++ b/packages/nc-gui/lang/tr.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json
index c2017b38c2..1f58b80be2 100644
--- a/packages/nc-gui/lang/uk.json
+++ b/packages/nc-gui/lang/uk.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json
index 8fbc2d4133..bb8b6f9525 100644
--- a/packages/nc-gui/lang/vi.json
+++ b/packages/nc-gui/lang/vi.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json
index 0cbb59faf7..5a54802e1b 100644
--- a/packages/nc-gui/lang/zh-Hans.json
+++ b/packages/nc-gui/lang/zh-Hans.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",
diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json
index 625088af9b..7cfd258f35 100644
--- a/packages/nc-gui/lang/zh-Hant.json
+++ b/packages/nc-gui/lang/zh-Hant.json
@@ -702,6 +702,10 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "addMembers": "Add Members",
+    "enterEmail": "Enter email addresses",
+    "inviteToBase": "Invite to Base",
+    "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
     "toggleSidebar": "Toggle Sidebar",

From 031d261a1d8a03a668e13ee1cb3e7d6bd0ef1bab Mon Sep 17 00:00:00 2001
From: Anbarasu <anbarasun123@gmail.com>
Date: Thu, 14 Mar 2024 09:16:39 +0530
Subject: [PATCH 249/253] fix(nc-gui): Update offset of LinkedRecords in
 accordance with links and unlinks (#7841)

* fix(nc-gui): update links

* fix(nc-gui): update offset

* fix(nc-gui): offset reset

* fix: offset issue

* fix: loading state not working

* fix: tests

* fix: failign tests

* fix: update offset if same or greater than count
---
 .../components/virtual-cell/BelongsTo.vue     |  2 +-
 .../components/virtual-cell/HasMany.vue       |  4 +-
 .../nc-gui/components/virtual-cell/Links.vue  |  6 +-
 .../components/virtual-cell/ManyToMany.vue    |  4 +-
 .../{ListChildItems.vue => LinkedItems.vue}   | 73 ++++++++++-------
 .../virtual-cell/components/ListItem.vue      |  3 +-
 .../{ListItems.vue => UnLinkedItems.vue}      | 80 +++++++++++--------
 packages/nc-gui/composables/useLTARStore.ts   | 69 +++++++++++-----
 .../pages/Dashboard/ExpandedForm/index.ts     |  2 +-
 .../columns/columnLinkToAnotherRecord.spec.ts |  1 -
 10 files changed, 144 insertions(+), 100 deletions(-)
 rename packages/nc-gui/components/virtual-cell/components/{ListChildItems.vue => LinkedItems.vue} (89%)
 rename packages/nc-gui/components/virtual-cell/components/{ListItems.vue => UnLinkedItems.vue} (90%)

diff --git a/packages/nc-gui/components/virtual-cell/BelongsTo.vue b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
index cb4d7cf3d4..a695eb127e 100644
--- a/packages/nc-gui/components/virtual-cell/BelongsTo.vue
+++ b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
@@ -121,7 +121,7 @@ watch([listItemsDlg], () => {
       />
     </div>
 
-    <LazyVirtualCellComponentsListItems
+    <LazyVirtualCellComponentsUnLinkedItems
       v-if="listItemsDlg"
       v-model="listItemsDlg"
       :column="belongsToColumn"
diff --git a/packages/nc-gui/components/virtual-cell/HasMany.vue b/packages/nc-gui/components/virtual-cell/HasMany.vue
index 2cbdb17a6d..5ce0888c06 100644
--- a/packages/nc-gui/components/virtual-cell/HasMany.vue
+++ b/packages/nc-gui/components/virtual-cell/HasMany.vue
@@ -132,9 +132,9 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
       />
     </div>
 
-    <LazyVirtualCellComponentsListItems v-if="listItemsDlg || childListDlg" v-model="listItemsDlg" :column="hasManyColumn" />
+    <LazyVirtualCellComponentsUnLinkedItems v-if="listItemsDlg || childListDlg" v-model="listItemsDlg" :column="hasManyColumn" />
 
-    <LazyVirtualCellComponentsListChildItems
+    <LazyVirtualCellComponentsLinkedItems
       v-if="listItemsDlg || childListDlg"
       v-model="childListDlg"
       :cell-value="localCellValue"
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 20c9b9371d..2b078fdade 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed } from '@vue/reactivity'
 import type { ColumnType } from 'nocodb-sdk'
-import { ref } from 'vue'
 import type { Ref } from 'vue'
+import { ref } from 'vue'
 import { ActiveCellInj, CellValueInj, ColumnInj, IsUnderLookupInj, inject, useSelectedCellKeyupListener } from '#imports'
 
 const value = inject(CellValueInj, ref(0))
@@ -151,13 +151,13 @@ watch([listItemsDlg], () => {
         @click.stop="openListDlg"
       />
     </div>
-    <LazyVirtualCellComponentsListItems
+    <LazyVirtualCellComponentsUnLinkedItems
       v-if="listItemsDlg || childListDlg"
       v-model="listItemsDlg"
       :column="relatedTableDisplayColumn"
     />
 
-    <LazyVirtualCellComponentsListChildItems
+    <LazyVirtualCellComponentsLinkedItems
       v-if="listItemsDlg || childListDlg"
       v-model="childListDlg"
       :items="toatlRecordsLinked"
diff --git a/packages/nc-gui/components/virtual-cell/ManyToMany.vue b/packages/nc-gui/components/virtual-cell/ManyToMany.vue
index 2534b0fb07..a0ebdc4b43 100644
--- a/packages/nc-gui/components/virtual-cell/ManyToMany.vue
+++ b/packages/nc-gui/components/virtual-cell/ManyToMany.vue
@@ -133,9 +133,9 @@ const m2mColumn = computed(
       />
     </div>
 
-    <LazyVirtualCellComponentsListItems v-if="listItemsDlg || childListDlg" v-model="listItemsDlg" :column="m2mColumn" />
+    <LazyVirtualCellComponentsUnLinkedItems v-if="listItemsDlg || childListDlg" v-model="listItemsDlg" :column="m2mColumn" />
 
-    <LazyVirtualCellComponentsListChildItems
+    <LazyVirtualCellComponentsLinkedItems
       v-if="listItemsDlg || childListDlg"
       v-model="childListDlg"
       :cell-value="localCellValue"
diff --git a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
similarity index 89%
rename from packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
rename to packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
index 9fd8672aab..443e1d2c34 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListChildItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
@@ -47,6 +47,8 @@ const {
   childrenListCount,
   loadChildrenList,
   childrenListPagination,
+  childrenExcludedOffsetCount,
+  childrenListOffsetCount,
   relatedTableDisplayValueProp,
   displayValueTypeAndFormatProp,
   unlink,
@@ -121,9 +123,8 @@ watch(
 )
 
 watch(expandedFormDlg, () => {
-  if (!expandedFormDlg.value) {
-    loadChildrenList()
-  }
+  childrenExcludedOffsetCount.value = 0
+  childrenListOffsetCount.value = 0
 })
 
 /*
@@ -199,6 +200,12 @@ onMounted(() => {
   window.addEventListener('keydown', linkedShortcuts)
 })
 
+const childrenListRef = ref<HTMLDivElement>()
+
+watch(childrenListPagination, () => {
+  childrenListRef.value?.scrollTo({ top: 0, behavior: 'smooth' })
+})
+
 onUnmounted(() => {
   childrenListPagination.query = ''
   window.removeEventListener('keydown', linkedShortcuts)
@@ -208,22 +215,22 @@ onUnmounted(() => {
 <template>
   <NcModal
     v-model:visible="vModel"
+    :body-style="{ 'max-height': '640px', 'height': '85vh' }"
     :class="{ active: vModel }"
-    :footer="null"
     :closable="false"
-    size="medium"
+    :footer="null"
     :width="isForm ? 600 : 800"
-    :body-style="{ 'max-height': '640px', 'height': '85vh' }"
+    size="medium"
     wrap-class-name="nc-modal-child-list"
   >
     <LazyVirtualCellComponentsHeader
       v-if="!isForm"
-      :relation="relation"
-      :linked-records="childrenListCount"
-      :table-title="meta?.title"
+      :display-value="headerDisplayValue"
       :header="$t('activity.linkedRecords')"
+      :linked-records="childrenListCount"
       :related-table-title="relatedTableMeta?.title"
-      :display-value="headerDisplayValue"
+      :relation="relation"
+      :table-title="meta?.title"
     />
     <div v-if="!isForm" class="flex mt-2 mb-2 items-center gap-2">
       <div class="flex items-center border-1 p-1 rounded-md w-full border-gray-200 !focus-within:border-primary">
@@ -231,10 +238,11 @@ onUnmounted(() => {
         <a-input
           ref="filterQueryRef"
           v-model:value="childrenListPagination.query"
+          :bordered="false"
           :placeholder="`Search in ${relatedTableMeta?.title}`"
           class="w-full !sm:rounded-md xs:min-h-8 !xs:rounded-xl"
           size="small"
-          :bordered="false"
+          @change="childrenListPagination.page = 1"
           @keydown.capture.stop="
             (e) => {
               if (e.key === 'Escape') {
@@ -242,39 +250,38 @@ onUnmounted(() => {
               }
             }
           "
-          @change="childrenListPagination.page = 1"
         >
         </a-input>
       </div>
     </div>
-    <div class="flex flex-col flex-grow nc-scrollbar-md cursor-pointer pr-1">
+    <div ref="childrenListRef" class="flex flex-col flex-grow nc-scrollbar-md cursor-pointer pr-1">
       <div v-if="isDataExist || isChildrenLoading" class="mt-2 mb-2">
         <div class="cursor-pointer pr-1">
           <template v-if="isChildrenLoading">
             <div
-              v-for="(x, i) in Array.from({ length: skeletonCount })"
+              v-for="(_x, i) in Array.from({ length: skeletonCount })"
               :key="i"
               class="!border-2 flex flex-row gap-2 mb-2 transition-all !rounded-xl relative !border-gray-200 hover:bg-gray-50"
             >
               <a-skeleton-image class="h-24 w-24 !rounded-xl" />
               <div class="flex flex-col m-[.5rem] gap-2 flex-grow justify-center">
-                <a-skeleton-input class="!w-48 !rounded-xl" active size="small" />
+                <a-skeleton-input active class="!w-48 !rounded-xl" size="small" />
                 <div class="flex flex-row gap-6 w-10/12">
                   <div class="flex flex-col gap-0.5">
-                    <a-skeleton-input class="!h-4 !w-12" active size="small" />
-                    <a-skeleton-input class="!h-4 !w-24" active size="small" />
+                    <a-skeleton-input active class="!h-4 !w-12" size="small" />
+                    <a-skeleton-input active class="!h-4 !w-24" size="small" />
                   </div>
                   <div class="flex flex-col gap-0.5">
-                    <a-skeleton-input class="!h-4 !w-12" active size="small" />
-                    <a-skeleton-input class="!h-4 !w-24" active size="small" />
+                    <a-skeleton-input active class="!h-4 !w-12" size="small" />
+                    <a-skeleton-input active class="!h-4 !w-24" size="small" />
                   </div>
                   <div class="flex flex-col gap-0.5">
-                    <a-skeleton-input class="!h-4 !w-12" active size="small" />
-                    <a-skeleton-input class="!h-4 !w-24" active size="small" />
+                    <a-skeleton-input active class="!h-4 !w-12" size="small" />
+                    <a-skeleton-input active class="!h-4 !w-24" size="small" />
                   </div>
                   <div class="flex flex-col gap-0.5">
-                    <a-skeleton-input class="!h-4 !w-12" active size="small" />
-                    <a-skeleton-input class="!h-4 !w-24" active size="small" />
+                    <a-skeleton-input active class="!h-4 !w-12" size="small" />
+                    <a-skeleton-input active class="!h-4 !w-24" size="small" />
                   </div>
                 </div>
               </div>
@@ -284,24 +291,28 @@ onUnmounted(() => {
             <LazyVirtualCellComponentsListItem
               v-for="(refRow, id) in childrenList?.list ?? state?.[colTitle] ?? []"
               :key="id"
-              :row="refRow"
-              :fields="fields"
-              data-testid="nc-child-list-item"
               :attachment="attachmentCol"
-              :related-table-display-value-prop="relatedTableDisplayValueProp"
               :display-value-type-and-format-prop="displayValueTypeAndFormatProp"
+              :fields="fields"
               :is-linked="childrenList?.list ? isChildrenListLinked[Number.parseInt(id)] : true"
               :is-loading="isChildrenListLoading[Number.parseInt(id)]"
+              :related-table-display-value-prop="relatedTableDisplayValueProp"
+              :row="refRow"
+              data-testid="nc-child-list-item"
+              @click="linkOrUnLink(refRow, id)"
               @expand="onClick(refRow)"
               @keydown.space.prevent="linkOrUnLink(refRow, id)"
               @keydown.enter.prevent="() => onClick(refRow, id)"
-              @click="linkOrUnLink(refRow, id)"
             />
           </template>
         </div>
       </div>
       <div v-else class="pt-1 flex flex-col gap-4 my-auto items-center justify-center text-gray-500 text-center">
-        <img src="~assets/img/placeholder/link-records.png" class="!w-[18.5rem] flex-none" />
+        <img
+          :alt="$t('msg.clickLinkRecordsToAddLinkFromTable', { tableName: relatedTableMeta?.title })"
+          class="!w-[18.5rem] flex-none"
+          src="~assets/img/placeholder/link-records.png"
+        />
         <div class="text-2xl text-gray-700 font-bold">{{ $t('msg.noLinkedRecords') }}</div>
         <div class="text-gray-700">
           {{ $t('msg.clickLinkRecordsToAddLinkFromTable', { tableName: relatedTableMeta?.title }) }}
@@ -352,7 +363,7 @@ onUnmounted(() => {
         />
       </div>
       <div class="flex flex-row gap-2">
-        <NcButton v-if="!isForm" type="ghost" class="nc-close-btn" @click="vModel = false"> {{ $t('general.finish') }} </NcButton>
+        <NcButton v-if="!isForm" class="nc-close-btn" type="ghost" @click="vModel = false"> {{ $t('general.finish') }} </NcButton>
         <NcButton
           v-if="!readOnly && childrenListCount > 0"
           v-e="['c:links:link']"
@@ -388,7 +399,7 @@ onUnmounted(() => {
   </NcModal>
 </template>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 :deep(.nc-nested-list-item .ant-card-body) {
   @apply !px-1 !py-0;
 }
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItem.vue b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
index 79e16aed3f..c4b210e10a 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItem.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
@@ -94,7 +94,6 @@ const displayValue = computed(() => {
     :class="{
       '!bg-white': isLoading,
       '!border-1': isLinked && !isLoading,
-      '!hover:border-gray-400': !isLinked,
       '!cursor-auto !hover:bg-white': readOnly,
     }"
     :body-style="{ padding: 0 }"
@@ -179,7 +178,7 @@ const displayValue = computed(() => {
       v-if="!isForm && !isPublic && !readOnly"
       v-e="['c:row-expand:open']"
       type="text"
-      size="lg"
+      size="medium"
       class="!px-2 nc-expand-item !group-hover:block !hidden !border-1 !shadow-sm !border-gray-200 !bg-white !absolute right-3 bottom-3"
       :class="{
         '!group-hover:right-1.8 !group-hover:bottom-1.7': fields.length === 0,
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItems.vue b/packages/nc-gui/components/virtual-cell/components/UnLinkedItems.vue
similarity index 90%
rename from packages/nc-gui/components/virtual-cell/components/ListItems.vue
rename to packages/nc-gui/components/virtual-cell/components/UnLinkedItems.vue
index d5628b7c2a..7419a0db30 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/UnLinkedItems.vue
@@ -35,6 +35,8 @@ const { $e } = useNuxtApp()
 const {
   childrenExcludedList,
   isChildrenExcludedListLinked,
+  childrenExcludedOffsetCount,
+  childrenListOffsetCount,
   isChildrenExcludedListLoading,
   isChildrenExcludedLoading,
   childrenListCount,
@@ -166,6 +168,8 @@ watch(expandedFormDlg, () => {
     }
     loadChildrenExcludedList(rowState.value)
   }
+  childrenExcludedOffsetCount.value = 0
+  childrenListOffsetCount.value = 0
 })
 
 watch(filterQueryRef, () => {
@@ -237,6 +241,12 @@ const linkedShortcuts = (e: KeyboardEvent) => {
   }
 }
 
+const childrenExcludedListRef = ref<HTMLDivElement>()
+
+watch(childrenExcludedListPagination, () => {
+  childrenExcludedListRef.value?.scrollTo({ top: 0, behavior: 'smooth' })
+})
+
 onMounted(() => {
   window.addEventListener('keydown', linkedShortcuts)
 })
@@ -250,20 +260,20 @@ onUnmounted(() => {
 <template>
   <NcModal
     v-model:visible="vModel"
+    :body-style="{ 'max-height': '640px', 'height': '85vh' }"
     :class="{ active: vModel }"
+    :closable="false"
     :footer="null"
     :width="isForm ? 600 : 800"
-    :closable="false"
-    :body-style="{ 'max-height': '640px', 'height': '85vh' }"
     wrap-class-name="nc-modal-link-record"
   >
     <LazyVirtualCellComponentsHeader
       v-if="!isForm"
-      :relation="relation"
-      :table-title="meta?.title"
-      :related-table-title="relatedTableMeta?.title"
       :display-value="headerDisplayValue"
       :header="$t('activity.addNewLink')"
+      :related-table-title="relatedTableMeta?.title"
+      :relation="relation"
+      :table-title="meta?.title"
     />
     <div class="flex mt-2 mb-2 items-center gap-2">
       <div class="flex items-center border-1 p-1 rounded-md w-full border-gray-200 !focus-within:border-primary">
@@ -271,10 +281,11 @@ onUnmounted(() => {
         <a-input
           ref="filterQueryRef"
           v-model:value="childrenExcludedListPagination.query"
+          :bordered="false"
           :placeholder="`${$t('general.searchIn')} ${relatedTableMeta?.title}`"
           class="w-full !rounded-md nc-excluded-search xs:min-h-8"
           size="small"
-          :bordered="false"
+          @change="childrenExcludedListPagination.page = 1"
           @keydown.capture.stop="
             (e) => {
               if (e.key === 'Escape') {
@@ -282,7 +293,6 @@ onUnmounted(() => {
               }
             }
           "
-          @change="childrenExcludedListPagination.page = 1"
         >
         </a-input>
       </div>
@@ -293,9 +303,9 @@ onUnmounted(() => {
       <NcButton
         v-if="!isPublic"
         v-e="['c:row-expand:open']"
-        type="secondary"
         :size="isMobileMode ? 'medium' : 'small'"
         class="!text-brand-500"
+        type="secondary"
         @click="addNewRecord"
       >
         <div class="flex items-center gap-1 px-4"><MdiPlus v-if="!isMobileMode" /> {{ $t('activity.newRecord') }}</div>
@@ -303,32 +313,32 @@ onUnmounted(() => {
     </div>
 
     <template v-if="childrenExcludedList?.pageInfo?.totalRows">
-      <div class="overflow-scroll nc-scrollbar-md pr-1 cursor-pointer flex flex-col flex-grow">
+      <div ref="childrenExcludedListRef" class="overflow-scroll nc-scrollbar-md pr-1 cursor-pointer flex flex-col flex-grow">
         <template v-if="isChildrenExcludedLoading">
           <div
-            v-for="(x, i) in Array.from({ length: 10 })"
+            v-for="(_x, i) in Array.from({ length: 10 })"
             :key="i"
             class="!border-2 flex flex-row gap-2 mb-2 transition-all !rounded-xl relative !border-gray-200 hover:bg-gray-50"
           >
             <a-skeleton-image class="h-24 w-24 !rounded-xl" />
             <div class="flex flex-col m-[.5rem] gap-2 flex-grow justify-center">
-              <a-skeleton-input class="!xs:w-30 !w-48 !rounded-xl" active size="small" />
+              <a-skeleton-input active class="!xs:w-30 !w-48 !rounded-xl" size="small" />
               <div class="flex flex-row gap-6 w-10/12">
                 <div class="flex flex-col gap-0.5">
-                  <a-skeleton-input class="!h-4 !w-12" active size="small" />
-                  <a-skeleton-input class="!xs:hidden !h-4 !w-24" active size="small" />
+                  <a-skeleton-input active class="!h-4 !w-12" size="small" />
+                  <a-skeleton-input active class="!xs:hidden !h-4 !w-24" size="small" />
                 </div>
                 <div class="flex flex-col gap-0.5">
-                  <a-skeleton-input class="!h-4 !w-12" active size="small" />
-                  <a-skeleton-input class="!xs:hidden !h-4 !w-24" active size="small" />
+                  <a-skeleton-input active class="!h-4 !w-12" size="small" />
+                  <a-skeleton-input active class="!xs:hidden !h-4 !w-24" size="small" />
                 </div>
                 <div class="flex flex-col gap-0.5">
-                  <a-skeleton-input class="!h-4 !w-12" active size="small" />
-                  <a-skeleton-input class="!xs:hidden !h-4 !w-24" active size="small" />
+                  <a-skeleton-input active class="!h-4 !w-12" size="small" />
+                  <a-skeleton-input active class="!xs:hidden !h-4 !w-24" size="small" />
                 </div>
                 <div class="flex flex-col gap-0.5">
-                  <a-skeleton-input class="!h-4 !w-12" active size="small" />
-                  <a-skeleton-input class="!xs:hidden !h-4 !w-24" active size="small" />
+                  <a-skeleton-input active class="!h-4 !w-12" size="small" />
+                  <a-skeleton-input active class="!xs:hidden !h-4 !w-24" size="small" />
                 </div>
               </div>
             </div>
@@ -338,14 +348,15 @@ onUnmounted(() => {
           <LazyVirtualCellComponentsListItem
             v-for="(refRow, id) in childrenExcludedList?.list ?? []"
             :key="id"
-            data-testid="nc-excluded-list-item"
-            :row="refRow"
-            :fields="fields"
             :attachment="attachmentCol"
-            :related-table-display-value-prop="relatedTableDisplayValueProp"
             :display-value-type-and-format-prop="displayValueTypeAndFormatProp"
-            :is-loading="isChildrenExcludedListLoading[Number.parseInt(id)]"
+            :fields="fields"
             :is-linked="isChildrenExcludedListLinked[Number.parseInt(id)]"
+            :is-loading="isChildrenExcludedListLoading[Number.parseInt(id)]"
+            :related-table-display-value-prop="relatedTableDisplayValueProp"
+            :row="refRow"
+            data-testid="nc-excluded-list-item"
+            @click="() => onClick(refRow, id)"
             @expand="
               () => {
                 expandedFormRow = refRow
@@ -354,7 +365,6 @@ onUnmounted(() => {
             "
             @keydown.space.prevent="() => onClick(refRow, id)"
             @keydown.enter.prevent="() => onClick(refRow, id)"
-            @click="() => onClick(refRow, id)"
           />
         </template>
       </div>
@@ -372,7 +382,7 @@ onUnmounted(() => {
         v-if="childrenExcludedList?.pageInfo"
         v-model:current="childrenExcludedListPagination.page"
         v-model:page-size="childrenExcludedListPagination.size"
-        :total="+childrenExcludedList.pageInfo.totalRows"
+        :total="+childrenExcludedList?.pageInfo?.totalRows"
         entity-name="links-excluded-list"
       />
     </div>
@@ -390,7 +400,7 @@ onUnmounted(() => {
           v-if="childrenExcludedList?.pageInfo"
           v-model:current="childrenExcludedListPagination.page"
           v-model:page-size="childrenExcludedListPagination.size"
-          :total="+childrenExcludedList.pageInfo.totalRows"
+          :total="+childrenExcludedList?.pageInfo?.totalRows"
           entity-name="links-excluded-list"
           mode="simple"
         />
@@ -401,7 +411,15 @@ onUnmounted(() => {
       <LazySmartsheetExpandedForm
         v-if="expandedFormDlg"
         v-model="expandedFormDlg"
+        :close-after-save="isExpandedFormCloseAfterSave"
         :meta="relatedTableMeta"
+        :new-record-header="
+          isExpandedFormCloseAfterSave
+            ? $t('activity.tableNameCreateNewRecord', {
+                tableName: relatedTableMeta?.title,
+              })
+            : undefined
+        "
         :row="{
           row: expandedFormRow,
           oldRow: {},
@@ -415,14 +433,6 @@ onUnmounted(() => {
         :row-id="extractPkFromRow(expandedFormRow, relatedTableMeta.columns as ColumnType[])"
         :state="newRowState"
         use-meta-fields
-        :close-after-save="isExpandedFormCloseAfterSave"
-        :new-record-header="
-          isExpandedFormCloseAfterSave
-            ? $t('activity.tableNameCreateNewRecord', {
-                tableName: relatedTableMeta?.title,
-              })
-            : undefined
-        "
         @created-record="onCreatedRecord"
       />
     </Suspense>
diff --git a/packages/nc-gui/composables/useLTARStore.ts b/packages/nc-gui/composables/useLTARStore.ts
index 14b43b745c..e0bcb2e0b8 100644
--- a/packages/nc-gui/composables/useLTARStore.ts
+++ b/packages/nc-gui/composables/useLTARStore.ts
@@ -1,4 +1,3 @@
-import { UITypes, dateFormats, parseStringDateTime, timeFormats } from 'nocodb-sdk'
 import type {
   type ColumnType,
   type LinkToAnotherRecordType,
@@ -7,7 +6,9 @@ import type {
   type RequestParams,
   type TableType,
 } from 'nocodb-sdk'
+import { UITypes, dateFormats, parseStringDateTime, timeFormats } from 'nocodb-sdk'
 import type { ComputedRef, Ref } from 'vue'
+import type { Row } from '#imports'
 import {
   IsPublicInj,
   Modal,
@@ -30,7 +31,6 @@ import {
   useSharedView,
   watch,
 } from '#imports'
-import type { Row } from '#imports'
 
 interface DataApiResponse {
   list: Record<string, any>
@@ -43,7 +43,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
     column: Ref<Required<ColumnType>>,
     row: Ref<Row>,
     isNewRow: ComputedRef<boolean> | Ref<boolean>,
-    reloadData = (_params: { shouldShowLoading?: boolean }) => {},
+    _reloadData = (_params: { shouldShowLoading?: boolean }) => {},
   ) => {
     // state
     const { metas, getMeta } = useMetas()
@@ -66,6 +66,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
       query: '',
       size: 10,
     })
+    const childrenExcludedOffsetCount = ref(0)
 
     const childrenListPagination = reactive({
       page: 1,
@@ -73,6 +74,8 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
       size: 10,
     })
 
+    const childrenListOffsetCount = ref(0)
+
     const isChildrenLoading = ref(false)
 
     const isChildrenListLoading = ref<Array<boolean>>([])
@@ -114,7 +117,6 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
         .join('___'),
     )
 
-    // actions
     const getRelatedTableRowId = (row: Record<string, any>) => {
       return relatedTableMeta.value?.columns
         ?.filter((c) => c.pk)
@@ -122,6 +124,8 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
         .join('___')
     }
 
+    // actions
+
     const loadRelatedTableMeta = async () => {
       await getMeta(colOptions.value.fk_related_model_id as string)
     }
@@ -182,6 +186,13 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
     const loadChildrenExcludedList = async (activeState?: any) => {
       if (activeState) newRowState.state = activeState
       try {
+        let offset =
+          childrenExcludedListPagination.size * (childrenExcludedListPagination.page - 1) - childrenExcludedOffsetCount.value
+
+        if (offset < 0) {
+          offset = 0
+          childrenExcludedOffsetCount.value = 0
+        }
         isChildrenExcludedLoading.value = true
         if (isPublic.value) {
           const router = useRouter()
@@ -198,7 +209,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
               },
               query: {
                 limit: childrenExcludedListPagination.size,
-                offset: childrenExcludedListPagination.size * (childrenExcludedListPagination.page - 1),
+                offset,
                 where:
                   childrenExcludedListPagination.query &&
                   `(${relatedTableDisplayValueProp.value},like,${childrenExcludedListPagination.query})`,
@@ -215,7 +226,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
             relatedTableMeta?.value?.id as string,
             {
               limit: childrenExcludedListPagination.size,
-              offset: childrenExcludedListPagination.size * (childrenExcludedListPagination.page - 1),
+              offset,
               where:
                 childrenExcludedListPagination.query &&
                 `(${relatedTableDisplayValueProp.value},like,${childrenExcludedListPagination.query})`,
@@ -232,7 +243,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
             column?.value?.id,
             {
               limit: String(childrenExcludedListPagination.size),
-              offset: String(childrenExcludedListPagination.size * (childrenExcludedListPagination.page - 1)),
+              offset: String(offset),
               // todo: where clause is missing from type
               where:
                 childrenExcludedListPagination.query &&
@@ -278,6 +289,15 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
         isChildrenLoading.value = true
         if (colOptions.value.type === 'bt') return
         if (!rowId.value || !column.value) return
+        let offset = childrenListPagination.size * (childrenListPagination.page - 1) + childrenListOffsetCount.value
+
+        if (offset < 0) {
+          offset = 0
+          childrenListOffsetCount.value = 0
+        } else if (offset >= childrenListCount.value) {
+          offset = 0
+        }
+
         if (isPublic.value) {
           childrenList.value = await $api.public.dataNestedList(
             sharedView.value?.uuid as string,
@@ -286,7 +306,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
             column.value.id,
             {
               limit: String(childrenListPagination.size),
-              offset: String(childrenListPagination.size * (childrenListPagination.page - 1)),
+              offset: String(offset),
               where:
                 childrenListPagination.query && `(${relatedTableDisplayValueProp.value},like,${childrenListPagination.query})`,
             } as any,
@@ -306,7 +326,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
             column?.value?.id,
             {
               limit: String(childrenListPagination.size),
-              offset: String(childrenListPagination.size * (childrenListPagination.page - 1)),
+              offset: String(offset),
               where:
                 childrenListPagination.query && `(${relatedTableDisplayValueProp.value},like,${childrenListPagination.query})`,
             } as any,
@@ -349,7 +369,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
               return false
             }
 
-            reloadData?.({ shouldShowLoading: false })
+            _reloadData?.({ shouldShowLoading: false })
 
             /** reload child list if not a new row */
             if (!isNewRow?.value) {
@@ -386,6 +406,10 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
       // }
       try {
         // todo: audit
+
+        childrenListOffsetCount.value = childrenListOffsetCount.value - 1
+        childrenExcludedOffsetCount.value = childrenExcludedOffsetCount.value - 1
+
         isChildrenExcludedListLoading.value[index] = true
         isChildrenListLoading.value[index] = true
         await $api.dbTableRow.nestedRemove(
@@ -420,14 +444,11 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
       } catch (e: any) {
         message.error(`${t('msg.error.unlinkFailed')}: ${await extractSdkResponseErrorMsg(e)}`)
       } finally {
-        // To Keep the Loading State for Minimum 600ms
-        setTimeout(() => {
-          isChildrenExcludedListLoading.value[index] = false
-          isChildrenListLoading.value[index] = false
-        }, 600)
+        isChildrenExcludedListLoading.value[index] = false
+        isChildrenListLoading.value[index] = false
       }
 
-      reloadData?.({ shouldShowLoading: false })
+      _reloadData?.({ shouldShowLoading: false })
       $e('a:links:unlink')
     }
 
@@ -435,7 +456,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
       row: Record<string, any>,
       { metaValue = meta.value }: { metaValue?: TableType } = {},
       undo = false,
-      index: number,
+      index: number, // Index is For Loading and Linked State of Row
     ) => {
       // todo: handle new record
       //   const pid = this._extractRowId(parent, this.parentMeta);
@@ -454,6 +475,9 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
         isChildrenExcludedListLoading.value[index] = true
         isChildrenListLoading.value[index] = true
 
+        childrenListOffsetCount.value = childrenListOffsetCount.value + 1
+        childrenExcludedOffsetCount.value = childrenExcludedOffsetCount.value + 1
+
         await $api.dbTableRow.nestedAdd(
           NOCO,
           base.value.id as string,
@@ -480,6 +504,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
         }
         isChildrenExcludedListLinked.value[index] = true
         isChildrenListLinked.value[index] = true
+
         if (colOptions.value.type !== 'bt') {
           childrenListCount.value = childrenListCount.value + 1
         } else {
@@ -491,13 +516,11 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
       } finally {
         // To Keep the Loading State for Minimum 600ms
 
-        setTimeout(() => {
-          isChildrenExcludedListLoading.value[index] = false
-          isChildrenListLoading.value[index] = false
-        }, 600)
+        isChildrenExcludedListLoading.value[index] = false
+        isChildrenListLoading.value[index] = false
       }
 
-      reloadData?.({ shouldShowLoading: false })
+      _reloadData?.({ shouldShowLoading: false })
       $e('a:links:link')
     }
 
@@ -525,6 +548,8 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
       childrenExcludedList,
       childrenList,
       childrenListCount,
+      childrenListOffsetCount,
+      childrenExcludedOffsetCount,
       rowId,
       childrenExcludedListPagination,
       childrenListPagination,
diff --git a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
index bcc92d406b..1a76a78d59 100644
--- a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
+++ b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
@@ -68,7 +68,7 @@ export class ExpandedFormPage extends BasePage {
   }
 
   async fillField({ columnTitle, value, type = 'text' }: { columnTitle: string; value: string; type?: string }) {
-    const field = this.get().locator(`[data-testid="nc-expand-col-${columnTitle}"]`);
+    const field = this.get().getByTestId(`nc-expand-col-${columnTitle}`);
     switch (type) {
       case 'text':
         await field.locator('input').fill(value);
diff --git a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
index 03bdb301c2..9b932c6d26 100644
--- a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
@@ -45,7 +45,6 @@ test.describe('LTAR create & update', () => {
       childTable: 'Sheet2',
       relationType: 'Many To many',
     });
-    await dashboard.closeTab({ title: 'Sheet1' });
 
     await dashboard.treeView.openTable({ title: 'Sheet2', networkResponse: false });
     await dashboard.grid.column.create({

From 417f17a1138a4aa248bfc5475d05d21edeb13e9f Mon Sep 17 00:00:00 2001
From: iron3oxide <hello@iron3oxi.de>
Date: Thu, 14 Mar 2024 05:13:07 +0100
Subject: [PATCH 250/253] fix: Correct typo in swagger response definition
 (#7849)

Change "BadReqeust" to "BadRequest"

closes #7848
---
 .../src/services/api-docs/swaggerV2/swagger-base.json      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/services/api-docs/swaggerV2/swagger-base.json b/packages/nocodb/src/services/api-docs/swaggerV2/swagger-base.json
index 5c43b8914a..a8ec46234e 100644
--- a/packages/nocodb/src/services/api-docs/swaggerV2/swagger-base.json
+++ b/packages/nocodb/src/services/api-docs/swaggerV2/swagger-base.json
@@ -9,8 +9,7 @@
       "url": "http://localhost:8080"
     }
   ],
-  "paths": {
-  },
+  "paths": {},
   "components": {
     "schemas": {
       "Paginated": {
@@ -86,7 +85,7 @@
     },
     "responses": {
       "BadRequest": {
-        "description": "BadReqeust",
+        "description": "BadRequest",
         "content": {
           "application/json": {
             "schema": {
@@ -125,4 +124,4 @@
       "xcToken": []
     }
   ]
-}
+}
\ No newline at end of file

From e0c05570396eaca1e66d9f42cb008e17bbd2ad70 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 14 Mar 2024 06:18:05 +0000
Subject: [PATCH 251/253] fix: sync both filename and connection.filename when
 updating sqlite datasource

---
 .../components/dashboard/settings/data-sources/EditBase.vue  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue b/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue
index 8c2d04918f..f9e0149e98 100644
--- a/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue
+++ b/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue
@@ -222,6 +222,11 @@ const editBase = async () => {
 
     const config = { ...formState.value.dataSource, connection }
 
+    // todo: refactor and remove this duplicate path in config
+    if(config.client === ClientType.SQLITE && config.connection?.connection?.filename) {
+      config.connection.filename = config.connection.connection.filename;
+    }
+
     await api.source.update(base.value?.id, props.sourceId, {
       alias: formState.value.title,
       type: formState.value.dataSource.client,

From 2cd0a1c74a172e114b07bbbfd2caee81d6620b19 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:25:56 +0530
Subject: [PATCH 252/253] Nc feat/survey form v2 (#7843)

* fix(nc-gui): survey form v2 setup

* fix(nc-gui): survey form ui updated

* fix(nc-gui): survery form ui changes for oss

* chore(nc-gui): lint

* chore(nc-gui): lint

* chore(nc-gui): revert unrelated changes

* test(nc-gui): update pw test of survey form

* fix(nc-gui): update survey form according to new design

* fix(nc-gui): add survey form slide animation

* fix(nc-gui): hide survey form pagination in first slide

* fix(nc-gui): optimize shared form for mobile screen

* chore(nc-gui): lint

* fix(nc-gui): pw test fail issue

* fix(nc-gui): some of the pr review changes

* fix(nc-gui): add placeholder for datetime related fields

* fix(nc-gui): allow upload same file next time

* fix(nc-gui): gallery image display issue nocodb/nocodb/issues/7851

* chore(nc-gui): lint

* fix(nc-gui): survey form ui changes for oss

* fix(nc-gui): use i18n for survey form

* fix(nc-gui): use keydown space for date, datetime fields to open modal in survey form
---
 .../nc-gui/assets/nc-icons/arrow-left.svg     |   6 +
 .../nc-gui/assets/nc-icons/arrow-right.svg    |   6 +
 .../nc-gui/assets/nc-icons/circle-check.svg   |   4 +
 packages/nc-gui/components/cell/Checkbox.vue  |   6 +-
 .../nc-gui/components/cell/DatePicker.vue     |  27 +-
 .../nc-gui/components/cell/DateTimePicker.vue |  28 +-
 .../nc-gui/components/cell/TimePicker.vue     |  28 +-
 .../nc-gui/components/cell/YearPicker.vue     |  28 +-
 .../components/cell/attachment/index.vue      |   6 +-
 .../components/cell/attachment/utils.ts       |   4 +-
 .../dashboard/TreeView/TableNode.vue          |   2 +-
 packages/nc-gui/components/nc/Badge.vue       |   2 +-
 .../nc-gui/components/smartsheet/Form.vue     |  42 +-
 .../nc-gui/components/smartsheet/Gallery.vue  |   2 +-
 .../smartsheet/calendar/DayView/DateField.vue |   6 +-
 .../calendar/DayView/DateTimeField.vue        |   4 +-
 .../smartsheet/calendar/MonthView.vue         |   8 +-
 .../smartsheet/calendar/SideMenu.vue          |   4 +-
 .../calendar/WeekView/DateField.vue           |   6 +-
 .../calendar/WeekView/DateTimeField.vue       |   4 +-
 .../composables/useSharedFormViewStore.ts     |   6 +-
 packages/nc-gui/lang/en.json                  |   5 +-
 .../index/[typeOrId]/form/[viewId]/index.vue  |   5 +-
 .../[typeOrId]/form/[viewId]/index/index.vue  |  31 +-
 .../[typeOrId]/form/[viewId]/index/survey.vue | 521 ++++++++++--------
 packages/nc-gui/utils/iconUtils.ts            |   7 +
 .../pages/Dashboard/SurveyForm/index.ts       |  42 +-
 .../db/views/viewFormShareSurvey.spec.ts      |  14 +-
 28 files changed, 551 insertions(+), 303 deletions(-)
 create mode 100644 packages/nc-gui/assets/nc-icons/arrow-left.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/arrow-right.svg
 create mode 100644 packages/nc-gui/assets/nc-icons/circle-check.svg

diff --git a/packages/nc-gui/assets/nc-icons/arrow-left.svg b/packages/nc-gui/assets/nc-icons/arrow-left.svg
new file mode 100644
index 0000000000..31d190cef8
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/arrow-left.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12.6666 8H3.33331" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round"
+        stroke-linejoin="round" />
+    <path d="M7.99998 12.6666L3.33331 7.99998L7.99998 3.33331" stroke="currentColor" stroke-width="1.33333"
+        stroke-linecap="round" stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/packages/nc-gui/assets/nc-icons/arrow-right.svg b/packages/nc-gui/assets/nc-icons/arrow-right.svg
new file mode 100644
index 0000000000..9e95a99f1b
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/arrow-right.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3.33331 8H12.6666" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round"
+        stroke-linejoin="round" />
+    <path d="M8 3.33331L12.6667 7.99998L8 12.6666" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round"
+        stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/packages/nc-gui/assets/nc-icons/circle-check.svg b/packages/nc-gui/assets/nc-icons/circle-check.svg
new file mode 100644
index 0000000000..ffa3ea1303
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/circle-check.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22 11.0799V11.9999C21.9988 14.1563 21.3005 16.2545 20.0093 17.9817C18.7182 19.7088 16.9033 20.9723 14.8354 21.5838C12.7674 22.1952 10.5573 22.1218 8.53447 21.3744C6.51168 20.6271 4.78465 19.246 3.61096 17.4369C2.43727 15.6279 1.87979 13.4879 2.02168 11.3362C2.16356 9.18443 2.99721 7.13619 4.39828 5.49694C5.79935 3.85768 7.69279 2.71525 9.79619 2.24001C11.8996 1.76477 14.1003 1.9822 16.07 2.85986" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22 4L12 14.01L9 11.01" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/components/cell/Checkbox.vue b/packages/nc-gui/components/cell/Checkbox.vue
index 38bc569923..efa710d539 100644
--- a/packages/nc-gui/components/cell/Checkbox.vue
+++ b/packages/nc-gui/components/cell/Checkbox.vue
@@ -4,6 +4,7 @@ import {
   ColumnInj,
   EditColumnInj,
   IsFormInj,
+  IsSurveyFormInj,
   ReadonlyInj,
   getMdiIcon,
   inject,
@@ -44,6 +45,8 @@ const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))
 
 const rowHeight = inject(RowHeightInj, ref())
 
+const isSurveyForm = inject(IsSurveyFormInj, ref(false))
+
 const checkboxMeta = computed(() => {
   return {
     icon: {
@@ -98,7 +101,8 @@ useSelectedCellKeyupListener(active, (e) => {
     }"
     :tabindex="readOnly ? -1 : 0"
     @click="onClick(false, $event)"
-    @keydown.enter.stop="onClick(true, $event)"
+    @keydown.enter.stop="!isSurveyForm ? onClick(true, $event) : undefined"
+    @keydown.space.stop="isSurveyForm ? onClick(true, $event) : undefined"
   >
     <div
       class="flex items-center"
diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
index f801a6722a..9b0cc6d98b 100644
--- a/packages/nc-gui/components/cell/DatePicker.vue
+++ b/packages/nc-gui/components/cell/DatePicker.vue
@@ -7,6 +7,7 @@ import {
   ColumnInj,
   EditColumnInj,
   EditModeInj,
+  IsSurveyFormInj,
   ReadonlyInj,
   computed,
   inject,
@@ -45,6 +46,10 @@ const active = inject(ActiveCellInj, ref(false))
 
 const editable = inject(EditModeInj, ref(false))
 
+const isForm = inject(IsFormInj, ref(false))
+
+const isSurveyForm = inject(IsSurveyFormInj, ref(false))
+
 const isDateInvalid = ref(false)
 
 const dateFormat = computed(() => parseProp(columnMeta?.value?.meta)?.date_format ?? 'YYYY-MM-DD')
@@ -98,7 +103,9 @@ watch(
 )
 
 const placeholder = computed(() => {
-  if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
+  if (isForm.value && !isDateInvalid.value) {
+    return dateFormat.value
+  } else if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
     return t('labels.optional')
   } else if (modelValue === null && showNull.value) {
     return t('general.null').toUpperCase()
@@ -232,6 +239,22 @@ const clickHandler = () => {
   }
   cellClickHandler()
 }
+
+const handleKeydown = (e: KeyboardEvent) => {
+  switch (e.key) {
+    case ' ':
+      if (isSurveyForm.value) {
+        open.value = !open.value
+      }
+      break
+
+    case 'Enter':
+      if (!isSurveyForm.value) {
+        open.value = !open.value
+      }
+      break
+  }
+}
 </script>
 
 <template>
@@ -251,7 +274,7 @@ const clickHandler = () => {
     :open="isOpen"
     @click="clickHandler"
     @update:open="updateOpen"
-    @keydown.enter="open = !open"
+    @keydown="handleKeydown"
   >
     <template #suffixIcon></template>
   </a-date-picker>
diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index 5e320e7f5c..b36173092b 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -6,6 +6,8 @@ import {
   CellClickHookInj,
   ColumnInj,
   EditColumnInj,
+  IsFormInj,
+  IsSurveyFormInj,
   ReadonlyInj,
   inject,
   isDrawerOrModalExist,
@@ -35,6 +37,10 @@ const active = inject(ActiveCellInj, ref(false))
 
 const editable = inject(EditModeInj, ref(false))
 
+const isForm = inject(IsFormInj, ref(false))
+
+const isSurveyForm = inject(IsSurveyFormInj, ref(false))
+
 const { t } = useI18n()
 
 const isEditColumn = inject(EditColumnInj, ref(false))
@@ -151,7 +157,9 @@ watch(
 )
 
 const placeholder = computed(() => {
-  if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
+  if (isForm.value && !isDateInvalid.value) {
+    return dateTimeFormat.value
+  } else if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
     return t('labels.optional')
   } else if (modelValue === null && showNull.value) {
     return t('general.null').toUpperCase()
@@ -286,6 +294,22 @@ const clickHandler = () => {
 const isColDisabled = computed(() => {
   return isSystemColumn(column.value) || readOnly.value || (localState.value && isPk)
 })
+
+const handleKeydown = (e: KeyboardEvent) => {
+  switch (e.key) {
+    case ' ':
+      if (isSurveyForm.value) {
+        open.value = !open.value
+      }
+      break
+
+    case 'Enter':
+      if (!isSurveyForm.value) {
+        open.value = !open.value
+      }
+      break
+  }
+}
 </script>
 
 <template>
@@ -304,7 +328,7 @@ const isColDisabled = computed(() => {
     :open="isOpen"
     @click="clickHandler"
     @ok="okHandler"
-    @keydown.enter="open = !open"
+    @keydown="handleKeydown"
   >
     <template #suffixIcon></template>
   </a-date-picker>
diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue
index f650091b92..72bdfb4847 100644
--- a/packages/nc-gui/components/cell/TimePicker.vue
+++ b/packages/nc-gui/components/cell/TimePicker.vue
@@ -3,6 +3,8 @@ import dayjs from 'dayjs'
 import {
   ActiveCellInj,
   EditColumnInj,
+  IsFormInj,
+  IsSurveyFormInj,
   ReadonlyInj,
   inject,
   onClickOutside,
@@ -32,6 +34,10 @@ const editable = inject(EditModeInj, ref(false))
 
 const isEditColumn = inject(EditColumnInj, ref(false))
 
+const isForm = inject(IsFormInj, ref(false))
+
+const isSurveyForm = inject(IsSurveyFormInj, ref(false))
+
 const column = inject(ColumnInj)!
 
 const isTimeInvalid = ref(false)
@@ -90,7 +96,9 @@ watch(
 )
 
 const placeholder = computed(() => {
-  if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
+  if (isForm.value && !isTimeInvalid.value) {
+    return 'HH:mm'
+  } else if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
     return t('labels.optional')
   } else if (modelValue === null && showNull.value) {
     return t('general.null').toUpperCase()
@@ -107,6 +115,22 @@ const isOpen = computed(() => {
   return (readOnly.value || (localState.value && isPk)) && !active.value && !editable.value ? false : open.value
 })
 
+const handleKeydown = (e: KeyboardEvent) => {
+  switch (e.key) {
+    case ' ':
+      if (isSurveyForm.value) {
+        open.value = !open.value
+      }
+      break
+
+    case 'Enter':
+      if (!isSurveyForm.value) {
+        open.value = !open.value
+      }
+      break
+  }
+}
+
 useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
   switch (e.key) {
     case 'Enter':
@@ -126,6 +150,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
 <template>
   <a-time-picker
     v-model:value="localState"
+    :tabindex="0"
     :disabled="readOnly"
     :show-time="true"
     :bordered="false"
@@ -138,6 +163,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
     :input-read-only="true"
     :open="isOpen"
     :popup-class-name="`${randomClass} nc-picker-time children:border-1 children:border-gray-200 ${open ? 'active' : ''}`"
+    @keydown="handleKeydown"
     @click="open = (active || editable) && !open"
     @ok="open = !open"
   >
diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue
index d9a21f7e74..4bdcf19c05 100644
--- a/packages/nc-gui/components/cell/YearPicker.vue
+++ b/packages/nc-gui/components/cell/YearPicker.vue
@@ -3,6 +3,8 @@ import dayjs from 'dayjs'
 import {
   ActiveCellInj,
   EditColumnInj,
+  IsFormInj,
+  IsSurveyFormInj,
   ReadonlyInj,
   computed,
   inject,
@@ -31,6 +33,10 @@ const editable = inject(EditModeInj, ref(false))
 
 const isEditColumn = inject(EditColumnInj, ref(false))
 
+const isForm = inject(IsFormInj, ref(false))
+
+const isSurveyForm = inject(IsSurveyFormInj, ref(false))
+
 const isYearInvalid = ref(false)
 
 const { t } = useI18n()
@@ -77,7 +83,9 @@ watch(
 )
 
 const placeholder = computed(() => {
-  if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
+  if (isForm.value && !isYearInvalid.value) {
+    return 'YYYY'
+  } else if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
     return t('labels.optional')
   } else if (modelValue === null && showNull.value) {
     return t('general.null').toUpperCase()
@@ -94,6 +102,22 @@ const isOpen = computed(() => {
   return (readOnly.value || (localState.value && isPk)) && !active.value && !editable.value ? false : open.value
 })
 
+const handleKeydown = (e: KeyboardEvent) => {
+  switch (e.key) {
+    case ' ':
+      if (isSurveyForm.value) {
+        open.value = !open.value
+      }
+      break
+
+    case 'Enter':
+      if (!isSurveyForm.value) {
+        open.value = !open.value
+      }
+      break
+  }
+}
+
 useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
   switch (e.key) {
     case 'Enter':
@@ -123,10 +147,10 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
     :input-read-only="true"
     :open="isOpen"
     :dropdown-class-name="`${randomClass} nc-picker-year children:border-1 children:border-gray-200 ${open ? 'active' : ''}`"
+    @keydown="handleKeydown"
     @click="open = (active || editable) && !open"
     @change="open = (active || editable) && !open"
     @ok="open = !open"
-    @keydown.enter="open = !open"
   >
     <template #suffixIcon></template>
   </a-date-picker>
diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index 5ec6f19b08..dda4da5a83 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -9,6 +9,7 @@ import {
   IsExpandedFormOpenInj,
   IsGalleryInj,
   IsKanbanInj,
+  IsSurveyFormInj,
   RowHeightInj,
   iconMap,
   inject,
@@ -49,6 +50,8 @@ const isKanban = inject(IsKanbanInj, ref(false))
 
 const isExpandedForm = inject(IsExpandedFormOpenInj, ref(false))
 
+const isSurveyForm = inject(IsSurveyFormInj, ref(false))
+
 const { isSharedForm } = useSmartsheetStoreOrThrow()!
 
 const { isMobileMode } = useGlobal()
@@ -208,7 +211,8 @@ const onImageClick = (item: any) => {
       data-testid="attachment-cell-file-picker-button"
       tabindex="0"
       @click="open"
-      @keydown.enter="open"
+      @keydown.enter="!isSurveyForm ? open($event) : undefined"
+      @keydown.space="isSurveyForm ? open($event) : undefined"
     >
       <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />
 
diff --git a/packages/nc-gui/components/cell/attachment/utils.ts b/packages/nc-gui/components/cell/attachment/utils.ts
index 64bec30923..9ee1db4210 100644
--- a/packages/nc-gui/components/cell/attachment/utils.ts
+++ b/packages/nc-gui/components/cell/attachment/utils.ts
@@ -63,7 +63,9 @@ export const [useProvideAttachmentCell, useAttachmentCell] = useInjectionState(
 
     const { api, isLoading } = useApi()
 
-    const { files, open } = useFileDialog()
+    const { files, open } = useFileDialog({
+      reset: true,
+    })
 
     const { appInfo } = useGlobal()
 
diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 45f7fe848d..1adafd52bb 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -146,7 +146,7 @@ const isTableOpened = computed(() => {
   return openedTableId.value === table.value?.id && (activeView.value?.is_default || !activeViewTitleOrId.value)
 })
 
-let tableTimeout: number
+let tableTimeout: NodeJS.Timeout
 
 watch(openedTableId, () => {
   if (tableTimeout) {
diff --git a/packages/nc-gui/components/nc/Badge.vue b/packages/nc-gui/components/nc/Badge.vue
index bf8ee1d7e8..4ba282e4a4 100644
--- a/packages/nc-gui/components/nc/Badge.vue
+++ b/packages/nc-gui/components/nc/Badge.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 const props = withDefaults(
   defineProps<{
-    color: string
+    color?: string
     border?: boolean
     size?: 'sm' | 'md' | 'lg'
   }>(),
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 33b6c275cf..5155938350 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -750,27 +750,29 @@ useEventListener(
                     </template>
                   </a-alert>
 
-                  <div v-if="formViewData.show_blank_form" class="text-gray-400 mt-4">
-                    {{
-                      $t('msg.newFormWillBeLoaded', {
-                        seconds: secondsRemain,
-                      })
-                    }}
-                  </div>
+                  <div class="mt-16 w-full flex justify-between items-center gap-3">
+                    <div v-if="formViewData.show_blank_form" class="text-gray-400">
+                      {{
+                        $t('msg.newFormWillBeLoaded', {
+                          seconds: secondsRemain,
+                        })
+                      }}
+                    </div>
 
-                  <div v-if="formViewData.submit_another_form || !isPublic" class="text-right mt-4">
-                    <NcButton
-                      type="primary"
-                      size="medium"
-                      @click="
-                        () => {
-                          submitted = false
-                          clearForm()
-                        }
-                      "
-                    >
-                      {{ $t('activity.submitAnotherForm') }}
-                    </NcButton>
+                    <div v-if="formViewData.submit_another_form || !isPublic" class="flex-1 flex justify-end">
+                      <NcButton
+                        type="primary"
+                        size="small"
+                        @click="
+                          () => {
+                            submitted = false
+                            clearForm()
+                          }
+                        "
+                      >
+                        {{ $t('activity.submitAnotherForm') }}
+                      </NcButton>
+                    </div>
                   </div>
                 </div>
               </div>
diff --git a/packages/nc-gui/components/smartsheet/Gallery.vue b/packages/nc-gui/components/smartsheet/Gallery.vue
index bb4e3f7f02..d5f1518d1f 100644
--- a/packages/nc-gui/components/smartsheet/Gallery.vue
+++ b/packages/nc-gui/components/smartsheet/Gallery.vue
@@ -285,7 +285,7 @@ watch(
                     <LazyCellAttachmentImage
                       v-if="isImage(attachment.title, attachment.mimetype ?? attachment.type)"
                       :key="`carousel-${record.row.id}-${index}`"
-                      class="h-52 object-cover"
+                      class="h-52 !object-contain"
                       :srcs="getPossibleAttachmentSrc(attachment)"
                       @click="expandFormClick($event, record)"
                     />
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 1f7ba889e3..7d890ed86a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expandRecord', 'newRecord'])
+const emit = defineEmits(['expand-record', 'new-record'])
 
 const meta = inject(MetaInj, ref())
 
@@ -192,7 +192,7 @@ const newRecord = () => {
       [calendarRange.value[0].fk_from_col!.title!]: selectedDate.value.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('newRecord', record)
+  emit('new-record', record)
 }
 </script>
 
@@ -221,7 +221,7 @@ const newRecord = () => {
           :resize="false"
           color="blue"
           size="small"
-          @click="emit('expandRecord', record)"
+          @click="emit('expand-record', record)"
         >
           <template v-if="!isRowEmpty(record, displayField)">
             <LazySmartsheetCalendarCell
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 412c3c822a..418d16d468 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expandRecord', 'newRecord'])
+const emit = defineEmits(['expandRecord', 'new-record'])
 
 const {
   // activeCalendarView,
@@ -847,7 +847,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
       [calendarRange.value[0].fk_from_col!.title!]: hour.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('newRecord', record)
+  emit('new-record', record)
 }
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index c95915106a..4b41e63a25 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['newRecord', 'expandRecord'])
+const emit = defineEmits(['new-record', 'expandRecord'])
 
 const {
   selectedDate,
@@ -635,7 +635,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('newRecord', newRecord)
+  emit('new-record', newRecord)
 }
 </script>
 
@@ -710,7 +710,7 @@ const addRecord = (date: dayjs.Dayjs) => {
                             [range.fk_from_col!.title!]: dayjs(day).format('YYYY-MM-DD HH:mm:ssZ'),
                           },
                         }
-                        emit('newRecord', record)
+                        emit('new-record', record)
                       }
                     "
                   >
@@ -738,7 +738,7 @@ const addRecord = (date: dayjs.Dayjs) => {
                       [calendarRange[0].fk_from_col!.title!]: (day).format('YYYY-MM-DD HH:mm:ssZ'),
                     },
                   }
-                  emit('newRecord', record)
+                  emit('new-record', record)
                 }
               "
             >
diff --git a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
index 8cfa4b8980..f636a27097 100644
--- a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue
@@ -8,7 +8,7 @@ const props = defineProps<{
   visible: boolean
 }>()
 
-const emit = defineEmits(['expandRecord', 'newRecord'])
+const emit = defineEmits(['expand-record', 'newRecord'])
 
 const INFINITY_SCROLL_THRESHOLD = 100
 
@@ -428,7 +428,7 @@ onUnmounted(() => {
               "
                 color="blue"
                 data-testid="nc-sidebar-record-card"
-                @click="emit('expandRecord', record)"
+                @click="emit('expand-record', record)"
                 @dragstart="dragStart($event, record)"
                 @dragover.prevent
               >
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index f58bf648b8..59ffbfbf97 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -5,7 +5,7 @@ import type { Row } from '~/lib'
 import { computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emits = defineEmits(['expandRecord', 'newRecord'])
+const emits = defineEmits(['expandRecord'])
 
 const { selectedDateRange, formattedData, formattedSideBarData, calendarRange, selectedDate, displayField, updateRowProperty } =
   useCalendarViewStoreOrThrow()
@@ -529,7 +529,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('newRecord', newRecord)
+  emits('new-record', newRecord)
 }
 </script>
 
@@ -586,7 +586,7 @@ const addRecord = (date: dayjs.Dayjs) => {
               :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
               :selected="dragRecord?.rowMeta?.id === record.rowMeta.id"
               color="blue"
-              @dblclick.stop="emits('expandRecord', record)"
+              @dblclick.stop="emits('expand-record', record)"
               @resize-start="onResizeStart"
             >
               <template v-if="!isRowEmpty(record, displayField)">
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index 6b9544bca7..f34494d76d 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -5,7 +5,7 @@ import type { Row } from '~/lib'
 import { computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emits = defineEmits(['expandRecord', 'newRecord'])
+const emits = defineEmits(['expandRecord'])
 
 const {
   selectedDateRange,
@@ -733,7 +733,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('newRecord', newRecord)
+  emits('new-record', newRecord)
 }
 </script>
 
diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index ee76defc11..72e5881226 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -467,11 +467,12 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
     return preFillValue
   }
 
+  let intvl: NodeJS.Timeout
   /** reset form if show_blank_form is true */
   watch(submitted, (nextVal) => {
     if (nextVal && sharedFormView.value?.show_blank_form) {
       secondsRemain.value = 5
-      const intvl = setInterval(() => {
+      intvl = setInterval(() => {
         secondsRemain.value = secondsRemain.value - 1
 
         if (secondsRemain.value < 0) {
@@ -486,6 +487,9 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
 
     /** reset form state and validation */
     if (!nextVal) {
+      if (sharedFormView.value?.show_blank_form) {
+        clearInterval(intvl)
+      }
       additionalState.value = {}
       formState.value = {}
       v$.value?.$reset()
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 8544f9a17e..00857cae81 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -429,7 +429,8 @@
       "setDefault": "Set Default"
     },
     "selectFieldsFromRightPannelToAddHere": "Select fields from right panel to add here",
-    "noOptionsFound": "No options found"
+    "noOptionsFound": "No options found",
+    "surveyFormSubmitConfirmMsg": "Are you sure you want to submit this form?"
   },
   "labels": {
     "selectYear": "Select Year",
@@ -681,7 +682,7 @@
     "sourceNameRequired": "Source name is required",
     "changeWsName": "Change Workspace Name",
     "pressEnter": "Press Enter",
-    "newFormLoaded": "New form will be loaded after",
+    "newFormLoaded": "Loading new form in",
     "webhook": "Webhook",
     "multiField": {
       "newField": "New field",
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
index 6657d3b99f..36e47bdcb4 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index.vue
@@ -28,7 +28,10 @@ router.afterEach((to) => shouldRedirect(to.name as string))
 
 <template>
   <div
-    class="scrollbar-thin-dull h-[100vh] overflow-y-auto overflow-x-hidden flex flex-col color-transition p-4 lg:p-10 nc-form-view relative min-h-[600px]"
+    class="scrollbar-thin-dull h-[100vh] overflow-y-auto overflow-x-hidden color-transition p-4 lg:p-10 nc-form-view relative min-h-[600px]"
+    :class="{
+      'children:(!h-auto my-auto)': sharedViewMeta?.surveyMode,
+    }"
     :style="{
       background: parseProp(sharedFormView?.meta)?.background_color || '#F9F9FA',
     }"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index 4e8d4083ad..99ed38c919 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -19,6 +19,8 @@ const {
   progress,
 } = useSharedFormStoreOrThrow()
 
+const { isMobileMode } = storeToRefs(useConfigStore())
+
 function isRequired(_columnObj: Record<string, any>, required = false) {
   let columnObj = _columnObj
   if (
@@ -125,14 +127,25 @@ const onDecode = async (scannedCodeValue: string) => {
                 </template>
               </a-alert>
 
-              <p v-if="sharedFormView.show_blank_form" class="text-xs text-slate-500 dark:text-slate-300 my-4">
-                {{ $t('msg.newFormWillBeLoaded', { seconds: secondsRemain }) }}
-              </p>
+              <div
+                v-if="sharedFormView.show_blank_form || sharedFormView.submit_another_form"
+                class="mt-16 w-full flex justify-between items-center flex-wrap gap-3"
+              >
+                <p v-if="sharedFormView?.show_blank_form" class="text-sm text-gray-500 dark:text-slate-300 m-0">
+                  {{ $t('labels.newFormLoaded') }} {{ secondsRemain }} {{ $t('general.seconds').toLowerCase() }}
+                </p>
 
-              <div v-if="sharedFormView.submit_another_form" class="text-right">
-                <NcButton type="primary" size="medium" @click="submitted = false">
-                  {{ $t('activity.submitAnotherForm') }}
-                </NcButton>
+                <div class="flex-1 self-end flex justify-end">
+                  <NcButton
+                    v-if="sharedFormView?.submit_another_form"
+                    type="secondary"
+                    :size="isMobileMode ? 'medium' : 'small'"
+                    data-testid="nc-survey-form__btn-submit-another-form"
+                    @click="submitted = false"
+                  >
+                    {{ $t('activity.submitAnotherForm') }}
+                  </NcButton>
+                </div>
               </div>
             </div>
           </div>
@@ -239,7 +252,7 @@ const onDecode = async (scannedCodeValue: string) => {
                 <NcButton
                   html-type="reset"
                   type="secondary"
-                  size="small"
+                  :size="isMobileMode ? 'medium' : 'small'"
                   :disabled="isLoading"
                   class="nc-shared-form-button shared-form-clear-button"
                   data-testid="shared-form-clear-button"
@@ -252,7 +265,7 @@ const onDecode = async (scannedCodeValue: string) => {
                   html-type="submit"
                   :disabled="progress"
                   type="primary"
-                  size="small"
+                  :size="isMobileMode ? 'medium' : 'small'"
                   class="nc-shared-form-button shared-form-submit-button"
                   data-testid="shared-form-submit-button"
                   @click="submitForm"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
index 0724623a40..5d408becf6 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
@@ -6,7 +6,6 @@ import {
   DropZoneRef,
   IsSurveyFormInj,
   computed,
-  iconMap,
   isValidURL,
   onKeyStroke,
   onMounted,
@@ -39,6 +38,8 @@ const { v$, formState, formColumns, submitForm, submitted, secondsRemain, shared
 
 const { t } = useI18n()
 
+const { isMobileMode } = storeToRefs(useConfigStore())
+
 const isTransitioning = ref(false)
 
 const transitionName = ref<TransitionDirection>(TransitionDirection.Left)
@@ -47,13 +48,19 @@ const animationTarget = ref<AnimationTarget>(AnimationTarget.ArrowRight)
 
 const isAnimating = ref(false)
 
+const isStarted = ref(false)
+
+const dialogShow = ref(false)
+
 const el = ref<HTMLDivElement>()
 
+const activeCell = ref<HTMLElement>()
+
 provide(DropZoneRef, el)
 
 provide(IsSurveyFormInj, ref(true))
 
-const transitionDuration = computed(() => sharedViewMeta.value.transitionDuration || 50)
+const transitionDuration = computed(() => sharedViewMeta.value.transitionDuration || 100)
 
 const steps = computed(() => {
   if (!formColumns.value) return []
@@ -139,7 +146,7 @@ async function validateColumn() {
 async function goNext(animationTarget?: AnimationTarget) {
   columnValidationError.value = false
 
-  if (isLast.value || submitted.value) return
+  if (isLast.value || !isStarted.value || submitted.value) return
 
   if (!field.value || !field.value.title) return
 
@@ -165,7 +172,9 @@ async function goNext(animationTarget?: AnimationTarget) {
 }
 
 async function goPrevious(animationTarget?: AnimationTarget) {
-  if (isFirst.value || submitted.value) return
+  if (isFirst.value || !isStarted.value || submitted.value) return
+
+  columnValidationError.value = false
 
   animate(animationTarget || AnimationTarget.ArrowLeft)
 
@@ -178,11 +187,13 @@ function focusInput() {
   if (document && typeof document !== 'undefined') {
     const inputEl =
       (document.querySelector('.nc-cell input') as HTMLInputElement) ||
-      (document.querySelector('.nc-cell textarea') as HTMLTextAreaElement)
+      (document.querySelector('.nc-cell textarea') as HTMLTextAreaElement) ||
+      (document.querySelector('.nc-cell [tabindex="0"]') as HTMLInputElement)
 
     if (inputEl) {
-      inputEl.select()
-      inputEl.focus()
+      activeCell.value = inputEl
+      inputEl?.select?.()
+      inputEl?.focus?.()
     }
   }
 }
@@ -190,17 +201,33 @@ function focusInput() {
 function resetForm() {
   v$.value.$reset()
   submitted.value = false
+  isStarted.value = false
   transition(TransitionDirection.Right)
   goTo(steps.value[0])
 }
 
 async function submit() {
   if (submitted.value || !(await validateColumn())) return
+  dialogShow.value = false
   submitForm()
 }
 
 onReset(resetForm)
 
+const onStart = () => {
+  isStarted.value = true
+
+  setTimeout(() => {
+    focusInput()
+  }, 100)
+}
+
+const handleFocus = () => {
+  if (document?.activeElement !== activeCell.value) {
+    focusInput()
+  }
+}
+
 onKeyStroke(['ArrowLeft', 'ArrowDown'], () => {
   goPrevious(AnimationTarget.ArrowLeft)
 })
@@ -208,16 +235,34 @@ onKeyStroke(['ArrowRight', 'ArrowUp'], () => {
   goNext(AnimationTarget.ArrowRight)
 })
 onKeyStroke(['Enter', 'Space'], () => {
-  if (isLast.value) {
-    submit()
-  } else {
-    goNext(AnimationTarget.OkButton, true)
+  if (submitted.value) return
+
+  if (!isStarted.value && !submitted.value) {
+    onStart()
+  } else if (isStarted.value) {
+    if (isLast.value) {
+      if (dialogShow.value) {
+        submit()
+      } else {
+        dialogShow.value = true
+      }
+    } else {
+      const activeElement = document.activeElement as HTMLElement
+
+      if (activeElement?.classList && activeElement.classList.contains('nc-survey-form__btn-next')) return
+
+      goNext(AnimationTarget.OkButton, true)
+    }
   }
 })
 
-onMounted(() => {
-  focusInput()
+onKeyStroke('Escape', () => {
+  if (document) {
+    ;(document.activeElement as HTMLElement)?.blur?.()
+  }
+})
 
+onMounted(() => {
   if (!md.value) {
     const { direction } = usePointerSwipe(el, {
       onSwipe: () => {
@@ -232,162 +277,40 @@ onMounted(() => {
     })
   }
 })
+
+watch(
+  formState,
+  () => {
+    columnValidationError.value = false
+  },
+  {
+    deep: true,
+  },
+)
 </script>
 
 <template>
-  <div ref="el" class="survey pt-8 md:p-0 w-full h-full flex flex-col">
-    <div
-      v-if="sharedFormView"
-      style="height: max(40vh, 225px); min-height: 225px"
-      class="w-full max-w-[max(33%,600px)] mx-auto flex flex-col justify-end"
-    >
-      <div class="px-4 md:px-0 flex flex-col justify-end">
-        <h1 class="text-2xl font-bold text-gray-900 self-center text-center my-4" data-testid="nc-survey-form__heading">
-          {{ sharedFormView.heading }}
-        </h1>
-        <div v-if="sharedFormView.subheading?.trim()" class="w-full">
-          <LazyCellRichText
-            :value="sharedFormView.subheading"
-            class="font-medium text-base text-gray-500 dark:text-slate-300 !h-auto mb-4 -ml-1"
-            is-form-field
-            read-only
-            sync-value-change
-            data-testid="nc-survey-form__sub-heading"
+  <div class="h-full">
+    <div class="survey md:p-0 w-full h-full flex flex-col max-w-[max(33%,688px)] mx-auto mb-4rem lg:mb-10rem">
+      <div v-if="sharedFormView" class="my-auto">
+        <template v-if="!isStarted || submitted">
+          <GeneralFormBanner
+            v-if="sharedFormView && !parseProp(sharedFormView?.meta).hide_banner"
+            :banner-image-url="sharedFormView.banner_image_url"
+            class="flex-none mb-4"
           />
-        </div>
-      </div>
-    </div>
-
-    <div class="h-full w-full flex items-center px-4 md:px-0">
-      <Transition :name="`slide-${transitionName}`" :duration="transitionDuration" mode="out-in">
-        <div
-          ref="el"
-          :key="field?.title"
-          class="color-transition h-full flex flex-col mt-6 gap-4 w-full max-w-[max(33%,600px)] m-auto"
-        >
-          <div v-if="field && !submitted" class="flex flex-col gap-2">
-            <div class="nc-form-column-label text-sm font-semibold text-gray-800" data-testid="nc-form-column-label">
-              <span>
-                {{ field.label || field.title }}
-              </span>
-              <span v-if="isRequired(field, field.required)" class="text-red-500 text-base leading-[18px]">&nbsp;*</span>
-            </div>
-            <div
-              v-if="field?.description"
-              class="nc-form-column-description text-gray-500 text-sm"
-              data-testid="nc-survey-form__field-description"
-            >
-              <LazyCellRichText :value="field?.description" class="!h-auto -ml-1" is-form-field read-only sync-value-change />
-            </div>
-
-            <NcTooltip :disabled="!field?.read_only">
-              <template #title> {{ $t('activity.preFilledFields.lockedFieldTooltip') }} </template>
-              <LazySmartsheetDivDataCell v-if="field.title" class="relative nc-form-data-cell">
-                <LazySmartsheetVirtualCell
-                  v-if="isVirtualCol(field)"
-                  v-model="formState[field.title]"
-                  class="mt-0 nc-input h-auto"
-                  :class="{
-                    readonly: field?.read_only,
-                  }"
-                  :row="{ row: {}, oldRow: {}, rowMeta: {} }"
-                  :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
-                  :column="field"
-                  :read-only="field?.read_only"
-                />
-
-                <LazySmartsheetCell
-                  v-else
-                  v-model="formState[field.title]"
-                  class="nc-input h-auto"
-                  :class="{ 'layout-list': parseProp(field?.meta)?.isList, 'readonly': field?.read_only }"
-                  :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
-                  :column="field"
-                  :edit-enabled="!field?.read_only"
-                  :read-only="field?.read_only"
-                />
-
-                <div class="flex flex-col gap-2 text-slate-500 dark:text-slate-300 text-[0.75rem] my-2 px-1">
-                  <div v-for="error of v$.localState[field.title]?.$errors" :key="error" class="text-red-500">
-                    {{ error.$message }}
-                  </div>
-
-                  <div v-if="field.uidt === UITypes.LongText" class="text-sm text-gray-500 flex flex-wrap items-center">
-                    {{ $t('general.shift') }} <MdiAppleKeyboardShift class="mx-1 text-primary" /> + {{ $t('general.enter') }}
-                    <MaterialSymbolsKeyboardReturn class="mx-1 text-primary" /> {{ $t('msg.makeLineBreak') }}
-                  </div>
-                </div>
-              </LazySmartsheetDivDataCell>
-            </NcTooltip>
-          </div>
-
-          <div class="ml-1 mt-4 flex w-full text-lg">
-            <div class="flex-1 flex justify-center">
-              <div v-if="isLast && !submitted && !v$.$invalid" class="text-center my-4">
-                <NcButton
-                  :class="
-                    animationTarget === AnimationTarget.SubmitButton && isAnimating
-                      ? 'transform translate-y-[1px] translate-x-[1px] ring ring-accent ring-opacity-100'
-                      : ''
-                  "
-                  html-type="submit"
-                  data-testid="nc-survey-form__btn-submit"
-                  @click="submit"
-                >
-                  {{ $t('general.submit') }}
-                </NcButton>
-              </div>
-
-              <div v-else-if="!submitted" class="flex items-center gap-3 flex-col">
-                <a-tooltip
-                  :title="
-                    v$.localState[field.title]?.$error ? v$.localState[field.title].$errors[0].$message : $t('msg.info.goToNext')
-                  "
-                  :mouse-enter-delay="0.25"
-                  :mouse-leave-delay="0"
-                >
-                  <!-- Ok button for question -->
-                  <NcButton
-                    data-testid="nc-survey-form__btn-next"
-                    :class="[
-                      v$.localState[field.title]?.$error || columnValidationError ? 'after:!bg-gray-100 after:!ring-red-500' : '',
-                      animationTarget === AnimationTarget.OkButton && isAnimating
-                        ? 'transform translate-y-[2px] translate-x-[2px] after:(!ring !ring-accent !ring-opacity-100)'
-                        : '',
-                    ]"
-                    @click="goNext()"
-                  >
-                    <div class="flex items-center gap-1">
-                      <Transition name="fade">
-                        <span v-if="!v$.localState[field.title]?.$error" class="uppercase text-white">Ok</span>
-                      </Transition>
-
-                      <Transition name="slide-right" mode="out-in">
-                        <component
-                          :is="iconMap.closeCircle"
-                          v-if="v$.localState[field.title]?.$error || columnValidationError"
-                          class="text-red-500 md:text-md"
-                        />
-                        <component :is="iconMap.check" v-else class="text-white md:text-md" />
-                      </Transition>
-                    </div>
-                  </NcButton>
-                </a-tooltip>
-
-                <div class="hidden md:flex text-sm text-gray-500 items-center gap-1">
-                  {{ $t('labels.pressEnter') }} <MaterialSymbolsKeyboardReturn class="text-primary" />
-                </div>
-              </div>
-            </div>
-          </div>
+          <div class="rounded-3xl border-1 border-gray-200 p-6 lg:p-12 bg-white">
+            <h1 class="text-2xl font-bold text-gray-900 mb-4" data-testid="nc-survey-form__heading">
+              {{ sharedFormView.heading }}
+            </h1>
 
-          <Transition name="slide-left">
             <div v-if="submitted" class="flex flex-col justify-center items-center text-center">
               <a-alert
-                class="!my-4 !py-4 !rounded-lg text-left w-full"
+                class="nc-survey-form__success-msg !p-4 !rounded-lg text-left w-full !bg-white !border-gray-200 !items-start"
                 type="success"
                 data-testid="nc-survey-form__success-msg"
                 outlined
+                show-icon
               >
                 <template #message>
                   <LazyCellRichText
@@ -405,85 +328,237 @@ onMounted(() => {
                 <template v-if="!sharedFormView?.success_msg?.trim()" #description>
                   {{ $t('msg.info.submittedFormData') }}
                 </template>
+
+                <template #icon>
+                  <div>
+                    <GeneralIcon icon="circleCheck2" class="text-[#27D665]"></GeneralIcon>
+                  </div>
+                </template>
               </a-alert>
 
-              <div v-if="sharedFormView" class="mt-3 w-full">
-                <p v-if="sharedFormView?.show_blank_form" class="text-xs text-slate-500 dark:text-slate-300 text-left my-4">
-                  {{ $t('labels.newFormLoaded') }} {{ secondsRemain }} {{ $t('general.seconds') }}
+              <div
+                v-if="sharedFormView.show_blank_form || sharedFormView.submit_another_form"
+                class="mt-16 w-full flex justify-between items-center flex-wrap gap-3"
+              >
+                <p v-if="sharedFormView?.show_blank_form" class="text-sm text-gray-500 dark:text-slate-300 m-0">
+                  {{ $t('labels.newFormLoaded') }} {{ secondsRemain }} {{ $t('general.seconds').toLowerCase() }}
                 </p>
 
-                <div v-if="sharedFormView?.submit_another_form" class="text-right">
-                  <NcButton type="primary" size="medium" data-testid="nc-survey-form__btn-submit-another-form" @click="resetForm">
+                <div class="flex-1 self-end flex justify-end">
+                  <NcButton
+                    v-if="sharedFormView?.submit_another_form"
+                    type="secondary"
+                    :size="isMobileMode ? 'medium' : 'small'"
+                    data-testid="nc-survey-form__btn-submit-another-form"
+                    @click="resetForm"
+                  >
                     {{ $t('activity.submitAnotherForm') }}
                   </NcButton>
                 </div>
               </div>
             </div>
-          </Transition>
-        </div>
-      </Transition>
-    </div>
+            <template v-else-if="!isStarted">
+              <div v-if="sharedFormView.subheading?.trim()">
+                <LazyCellRichText
+                  :value="sharedFormView.subheading"
+                  class="font-medium text-base text-gray-500 dark:text-slate-300 !h-auto mb-4 -ml-1"
+                  is-form-field
+                  read-only
+                  sync-value-change
+                  data-testid="nc-survey-form__sub-heading"
+                />
+              </div>
 
-    <template v-if="!submitted">
-      <div class="mb-24 md:my-4 select-none text-center text-gray-500 dark:text-slate-200" data-testid="nc-survey-form__footer">
-        {{ index + 1 }} / {{ formColumns?.length }}
+              <div class="flex justify-end mt-12">
+                <div class="flex items-center gap-3">
+                  <div class="hidden md:flex text-sm items-center gap-1 text-gray-800">
+                    <span>
+                      {{ $t('labels.pressEnter') }}
+                    </span>
+                    <NcBadge class="pl-4 pr-1 h-[21px] text-gray-600"> ↵ </NcBadge>
+                  </div>
+                  <NcButton
+                    :size="isMobileMode ? 'medium' : 'small'"
+                    data-testid="nc-survey-form__fill-form-btn"
+                    @click="onStart()"
+                  >
+                    Fill Form
+                  </NcButton>
+                </div>
+              </div>
+            </template>
+          </div>
+        </template>
+        <template v-if="isStarted && !submitted">
+          <Transition :name="`slide-${transitionName}`" :duration="transitionDuration" mode="out-in">
+            <div
+              ref="el"
+              :key="field?.title"
+              class="flex flex-col gap-4 w-full m-auto rounded-xl border-1 border-gray-200 bg-white p-6 lg:p-12"
+            >
+              <div class="select-none text-gray-500 mb-4 md:mb-2" data-testid="nc-survey-form__footer">
+                {{ index + 1 }} / {{ formColumns?.length }}
+              </div>
+
+              <div v-if="field" class="flex flex-col gap-2">
+                <div class="nc-form-column-label text-sm font-semibold text-gray-800" data-testid="nc-form-column-label">
+                  <span>
+                    {{ field.label || field.title }}
+                  </span>
+                  <span v-if="isRequired(field, field.required)" class="text-red-500 text-base leading-[18px]">&nbsp;*</span>
+                </div>
+                <div
+                  v-if="field?.description"
+                  class="nc-form-column-description text-gray-500 text-sm"
+                  data-testid="nc-survey-form__field-description"
+                >
+                  <LazyCellRichText :value="field?.description" class="!h-auto -ml-1" is-form-field read-only sync-value-change />
+                </div>
+
+                <NcTooltip :disabled="!field?.read_only">
+                  <template #title> {{ $t('activity.preFilledFields.lockedFieldTooltip') }} </template>
+                  <SmartsheetDivDataCell v-if="field.title" class="relative nc-form-data-cell" @click.stop="handleFocus">
+                    <LazySmartsheetVirtualCell
+                      v-if="isVirtualCol(field)"
+                      v-model="formState[field.title]"
+                      class="mt-0 nc-input h-auto"
+                      :class="{
+                        readonly: field?.read_only,
+                      }"
+                      :row="{ row: {}, oldRow: {}, rowMeta: {} }"
+                      :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
+                      :column="field"
+                      :read-only="field?.read_only"
+                    />
+
+                    <LazySmartsheetCell
+                      v-else
+                      v-model="formState[field.title]"
+                      class="nc-input h-auto"
+                      :class="{ 'layout-list': parseProp(field?.meta)?.isList, 'readonly': field?.read_only }"
+                      :data-testid="`nc-survey-form__input-${field.title.replaceAll(' ', '')}`"
+                      :column="field"
+                      :edit-enabled="!field?.read_only"
+                      :read-only="field?.read_only"
+                    />
+
+                    <div class="flex flex-col gap-2 text-slate-500 dark:text-slate-300 text-[0.75rem] my-2 px-1">
+                      <div v-for="error of v$.localState[field.title]?.$errors" :key="error" class="text-red-500">
+                        {{ error.$message }}
+                      </div>
+
+                      <div v-if="field.uidt === UITypes.LongText" class="text-sm text-gray-500 flex flex-wrap items-center">
+                        {{ $t('general.shift') }} <MdiAppleKeyboardShift class="mx-1 text-primary" /> + {{ $t('general.enter') }}
+                        <MaterialSymbolsKeyboardReturn class="mx-1 text-primary" /> {{ $t('msg.info.makeLineBreak') }}
+                      </div>
+                    </div>
+                  </SmartsheetDivDataCell>
+                </NcTooltip>
+              </div>
+
+              <div class="ml-1 mt-4 flex w-full text-lg">
+                <div class="flex-1 flex justify-end">
+                  <div v-if="isLast && !v$.$invalid">
+                    <NcButton
+                      :size="isMobileMode ? 'medium' : 'small'"
+                      :class="
+                        animationTarget === AnimationTarget.SubmitButton && isAnimating
+                          ? 'transform translate-y-[1px] translate-x-[1px] ring ring-accent ring-opacity-100'
+                          : ''
+                      "
+                      :disabled="v$.localState[field.title]?.$error || columnValidationError"
+                      data-testid="nc-survey-form__btn-submit-confirm"
+                      @click="dialogShow = true"
+                    >
+                      {{ $t('general.submit') }} form
+                    </NcButton>
+                  </div>
+
+                  <div v-else class="flex items-center gap-3">
+                    <div
+                      class="hidden md:flex text-sm items-center gap-1"
+                      :class="v$.localState[field.title]?.$error || columnValidationError ? 'text-gray-200' : 'text-gray-800'"
+                    >
+                      <span>
+                        {{ $t('labels.pressEnter') }}
+                      </span>
+                      <NcBadge
+                        class="pl-4 pr-1 h-[21px]"
+                        :class="v$.localState[field.title]?.$error || columnValidationError ? 'text-gray-200' : 'text-gray-600'"
+                      >
+                        ↵
+                      </NcBadge>
+                    </div>
+                    <NcButton
+                      :size="isMobileMode ? 'medium' : 'small'"
+                      data-testid="nc-survey-form__btn-next"
+                      class="nc-survey-form__btn-next"
+                      :class="[
+                        animationTarget === AnimationTarget.OkButton && isAnimating
+                          ? 'transform translate-y-[2px] translate-x-[2px] after:(!ring !ring-accent !ring-opacity-100)'
+                          : '',
+                      ]"
+                      :disabled="v$.localState[field.title]?.$error || columnValidationError"
+                      @click="goNext()"
+                    >
+                      {{ $t('labels.next') }}
+                    </NcButton>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </Transition>
+        </template>
       </div>
-    </template>
-
-    <div class="relative flex w-full items-end">
-      <Transition name="fade">
-        <div
-          v-if="!submitted"
-          class="color-transition shadow-sm absolute bottom-18 right-1/2 transform translate-x-[50%] md:bottom-4 md:(right-12 transform-none) flex items-center bg-white border dark:bg-slate-500 rounded divide-x-1"
-        >
-          <a-tooltip :title="isFirst ? '' : $t('msg.info.goToPrevious')" :mouse-enter-delay="0.25" :mouse-leave-delay="0">
-            <button
-              :class="
-                animationTarget === AnimationTarget.ArrowLeft && isAnimating
-                  ? 'transform translate-y-[1px] translate-x-[1px] text-primary'
-                  : ''
-              "
-              class="p-0.5 flex items-center group color-transition"
+      <div class="md:(absolute bottom-0 left-0 right-0 px-4 pb-4) lg:px-10 lg:pb-10">
+        <div class="flex justify-end items-center gap-4">
+          <div class="flex justify-center">
+            <GeneralFormBranding class="inline-flex mx-auto" />
+          </div>
+          <div v-if="isStarted && !submitted" class="flex items-center gap-3">
+            <NcButton
+              type="secondary"
+              :size="isMobileMode ? 'medium' : 'small'"
               data-testid="nc-survey-form__icon-prev"
+              :disabled="isFirst || v$.localState[field.title]?.$error"
               @click="goPrevious()"
             >
-              <component
-                :is="iconMap.chevronLeft"
-                :class="isFirst ? 'text-gray-300' : 'group-hover:text-accent'"
-                class="text-2xl md:text-md"
-              />
-            </button>
-          </a-tooltip>
-
-          <a-tooltip
-            :title="v$.localState[field.title]?.$error ? '' : $t('msg.info.goToNext')"
-            :mouse-enter-delay="0.25"
-            :mouse-leave-delay="0"
-          >
-            <button
-              :class="
-                animationTarget === AnimationTarget.ArrowRight && isAnimating
-                  ? 'transform translate-y-[1px] translate-x-[-1px] text-primary'
-                  : ''
-              "
-              class="p-0.5 flex items-center group color-transition"
+              <GeneralIcon icon="ncArrowLeft"
+            /></NcButton>
+
+            <NcButton
+              :size="isMobileMode ? 'medium' : 'small'"
+              type="secondary"
               data-testid="nc-survey-form__icon-next"
+              :disabled="isLast || v$.localState[field.title]?.$error || columnValidationError"
               @click="goNext()"
             >
-              <component
-                :is="iconMap.chevronRight"
-                :class="[isLast || v$.localState[field.title]?.$error ? 'text-gray-300' : 'group-hover:text-accent']"
-                class="text-2xl md:text-md"
-              />
-            </button>
-          </a-tooltip>
+              <GeneralIcon icon="ncArrowRight" />
+            </NcButton>
+          </div>
         </div>
-      </Transition>
-
-      <div class="w-full flex justify-center">
-        <GeneralFormBranding class="inline-flex mx-auto" />
       </div>
     </div>
+
+    <NcModal v-model:visible="dialogShow" size="small" class="nc-survery-form__confirmation_modal">
+      <div>
+        <div class="text-lg font-bold">{{ $t('general.submit') }} {{ $t('objects.viewType.form') }}</div>
+        <div class="mt-1 text-sm">{{ $t('title.surveyFormSubmitConfirmMsg') }}</div>
+        <div class="flex justify-end mt-7 gap-x-2">
+          <NcButton type="secondary" :size="isMobileMode ? 'medium' : 'small'" @click="dialogShow = false">{{
+            $t('general.back')
+          }}</NcButton>
+          <NcButton
+            type="primary"
+            :size="isMobileMode ? 'medium' : 'small'"
+            data-testid="nc-survey-form__btn-submit"
+            @click="submit"
+          >
+            {{ $t('general.submit') }}
+          </NcButton>
+        </div>
+      </div>
+    </NcModal>
   </div>
 </template>
 
@@ -494,10 +569,6 @@ onMounted(() => {
 
 .survey {
   .nc-form-column-label {
-    > * {
-      @apply !prose-lg;
-    }
-
     .nc-icon {
       @apply mr-2;
     }
@@ -514,5 +585,11 @@ onMounted(() => {
       @apply !border-none;
     }
   }
+
+  .nc-survey-form__success-msg {
+    .ant-alert-icon {
+      @apply flex items-start;
+    }
+  }
 }
 </style>
diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index 484e6a937c..38130ce6f0 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -120,6 +120,8 @@ import NcCopy from '~icons/nc-icons/copy'
 import NcPaste from '~icons/nc-icons/paste'
 import NcArrowUp from '~icons/nc-icons/arrow-up'
 import NcArrowDown from '~icons/nc-icons/arrow-down'
+import NcArrowLeft from '~icons/nc-icons/arrow-left'
+import NcArrowRight from '~icons/nc-icons/arrow-right'
 import NcUpload from '~icons/nc-icons/upload'
 import NcDownload from '~icons/nc-icons/download'
 // import NcProjectGray from '~icons/nc-icons/project-gray'
@@ -163,6 +165,8 @@ import NcCellSystemUser from '~icons/nc-icons/system-user'
 import NcCellSystemText from '~icons/nc-icons/system-text'
 import NcCellAttachment from '~icons/nc-icons/cell-attachment'
 
+import NcCircleCheck from '~icons/nc-icons/circle-check'
+
 // keep it for reference
 // todo: remove it after all icons are migrated
 /* export const iconMapOld = {
@@ -555,11 +559,14 @@ export const iconMap = {
   ncEdit: NcEdit,
   ncArrowUp: NcArrowUp,
   ncArrowDown: NcArrowDown,
+  ncArrowLeft: NcArrowLeft,
+  ncArrowRight: NcArrowRight,
   underline: NcUnderline,
   bold: NcBold,
   italic: NcItalic,
   phoneCall: NcPhoneCall,
   crop: NcCrop,
+  circleCheck2: NcCircleCheck,
 }
 
 export const getMdiIcon = (type: string): any => {
diff --git a/tests/playwright/pages/Dashboard/SurveyForm/index.ts b/tests/playwright/pages/Dashboard/SurveyForm/index.ts
index 26e9d8aaca..c6a429a6ca 100644
--- a/tests/playwright/pages/Dashboard/SurveyForm/index.ts
+++ b/tests/playwright/pages/Dashboard/SurveyForm/index.ts
@@ -5,6 +5,8 @@ import { getTextExcludeIconText } from '../../../tests/utils/general';
 export class SurveyFormPage extends BasePage {
   readonly formHeading: Locator;
   readonly formSubHeading: Locator;
+  readonly fillFormButton: Locator;
+  readonly submitConfirmationButton: Locator;
   readonly submitButton: Locator;
   readonly nextButton: Locator;
   readonly nextSlideButton: Locator;
@@ -16,7 +18,11 @@ export class SurveyFormPage extends BasePage {
     super(rootPage);
     this.formHeading = this.get().locator('[data-testid="nc-survey-form__heading"]');
     this.formSubHeading = this.get().locator('[data-testid="nc-survey-form__sub-heading"]');
-    this.submitButton = this.get().locator('[data-testid="nc-survey-form__btn-submit"]');
+    this.fillFormButton = this.get().locator('[data-testid="nc-survey-form__fill-form-btn"]');
+    this.submitConfirmationButton = this.get().locator('[data-testid="nc-survey-form__btn-submit-confirm"]');
+    this.submitButton = this.rootPage.locator(
+      '.nc-survery-form__confirmation_modal [data-testid="nc-survey-form__btn-submit"]'
+    );
     this.nextButton = this.get().locator('[data-testid="nc-survey-form__btn-next"]');
     this.nextSlideButton = this.get().locator('[data-testid="nc-survey-form__icon-next"]');
     this.prevSlideButton = this.get().locator('[data-testid="nc-survey-form__icon-prev"]');
@@ -28,20 +34,15 @@ export class SurveyFormPage extends BasePage {
     return this.rootPage.locator('html >> .nc-form-view');
   }
 
-  async validate({
-    heading,
-    subHeading,
-    fieldLabel,
-    footer,
-  }: {
-    heading: string;
-    subHeading: string;
-    fieldLabel: string;
-    footer: string;
-  }) {
+  async validateHeaders({ heading, subHeading }: { heading: string; subHeading: string }) {
     await expect(this.get()).toBeVisible();
     await expect(this.formHeading).toHaveText(heading);
     await expect(this.formSubHeading).toHaveText(subHeading);
+  }
+
+  async validate({ fieldLabel, footer }: { fieldLabel: string; footer: string }) {
+    await expect(this.get()).toBeVisible();
+
     await expect(this.formFooter).toHaveText(footer);
 
     const locator = this.get().locator(`[data-testid="nc-form-column-label"]`);
@@ -62,7 +63,7 @@ export class SurveyFormPage extends BasePage {
       isLastSlide = true;
     }
     if (isLastSlide) {
-      await expect(this.submitButton).toBeVisible();
+      await expect(this.submitConfirmationButton).toBeVisible();
     } else {
       await expect(this.nextButton).toBeVisible();
     }
@@ -88,6 +89,8 @@ export class SurveyFormPage extends BasePage {
   }
 
   async validateSuccessMessage(param: { message: string; showAnotherForm?: boolean }) {
+    await this.get().locator('[data-testid="nc-survey-form__success-msg"]').waitFor({ state: 'visible' });
+
     await expect(
       this.get().locator(`[data-testid="nc-survey-form__success-msg"]:has-text("${param.message}")`)
     ).toBeVisible();
@@ -96,4 +99,17 @@ export class SurveyFormPage extends BasePage {
       await expect(this.get().locator(`button:has-text("Submit Another Form")`)).toBeVisible();
     }
   }
+
+  async clickFillForm() {
+    await this.fillFormButton.click();
+  }
+
+  async confirmAndSubmit() {
+    await this.submitConfirmationButton.click();
+    await this.submitButton.waitFor({ state: 'visible' });
+
+    await this.submitButton.click();
+
+    await this.submitButton.waitFor({ state: 'hidden' });
+  }
 }
diff --git a/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
index 198bf9a20e..84da7e03f6 100644
--- a/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
+++ b/tests/playwright/tests/db/views/viewFormShareSurvey.spec.ts
@@ -46,9 +46,15 @@ test.describe('Share form', () => {
     await dashboard.rootPage.waitForTimeout(2000);
 
     surveyForm = new SurveyFormPage(dashboard.rootPage);
-    await surveyForm.validate({
+
+    await surveyForm.validateHeaders({
       heading: 'Country Title',
       subHeading: 'Country Form Subtitle',
+    });
+
+    await surveyForm.clickFillForm();
+
+    await surveyForm.validate({
       fieldLabel: 'Country *',
       footer: '1 / 3',
     });
@@ -59,8 +65,6 @@ test.describe('Share form', () => {
     });
 
     await surveyForm.validate({
-      heading: 'Country Title',
-      subHeading: 'Country Form Subtitle',
       fieldLabel: 'LastUpdate',
       footer: '2 / 3',
     });
@@ -70,12 +74,10 @@ test.describe('Share form', () => {
     });
 
     await surveyForm.validate({
-      heading: 'Country Title',
-      subHeading: 'Country Form Subtitle',
       fieldLabel: 'Cities',
       footer: '3 / 3',
     });
-    await surveyForm.submitButton.click();
+    await surveyForm.confirmAndSubmit();
 
     // validate post submit data
     await surveyForm.validateSuccessMessage({

From 2899d957acde0c45cda5c93e3614752cce422c4b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:50:56 +0530
Subject: [PATCH 253/253] fix(nc-gui): lint errors (#7857)

---
 .../nc-gui/components/dashboard/TreeView/ProjectNode.vue | 9 +++++++--
 .../dashboard/settings/data-sources/EditBase.vue         | 4 ++--
 packages/nc-gui/components/monaco/Editor.vue             | 4 ++--
 .../components/smartsheet/calendar/DayView/DateField.vue | 6 +++---
 .../smartsheet/calendar/DayView/DateTimeField.vue        | 4 ++--
 .../nc-gui/components/smartsheet/calendar/MonthView.vue  | 8 ++++----
 .../smartsheet/calendar/WeekView/DateField.vue           | 6 +++---
 .../smartsheet/calendar/WeekView/DateTimeField.vue       | 4 ++--
 8 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index e1a70265c6..44611a4b0a 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -523,7 +523,12 @@ const projectDelete = () => {
                   </NcMenuItem>
 
                   <!-- ERD View -->
-                  <NcMenuItem v-if="base?.sources?.[0]?.enabled" key="erd" data-testid="nc-sidebar-base-relations" @click="openErdView(base?.sources?.[0]!)">
+                  <NcMenuItem
+                    v-if="base?.sources?.[0]?.enabled"
+                    key="erd"
+                    data-testid="nc-sidebar-base-relations"
+                    @click="openErdView(base?.sources?.[0]!)"
+                  >
                     <div v-e="['c:base:erd']" class="flex gap-2 items-center">
                       <GeneralIcon icon="erd" />
                       {{ $t('title.relations') }}
@@ -584,9 +589,9 @@ const projectDelete = () => {
           </NcDropdown>
 
           <NcButton
-            :disabled="!base?.sources?.[0]?.enabled"
             v-if="isUIAllowed('tableCreate', { roles: baseRole })"
             v-e="['c:base:create-table']"
+            :disabled="!base?.sources?.[0]?.enabled"
             class="nc-sidebar-node-btn"
             size="xxsmall"
             type="text"
diff --git a/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue b/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue
index f9e0149e98..7bc88241c7 100644
--- a/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue
+++ b/packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue
@@ -223,8 +223,8 @@ const editBase = async () => {
     const config = { ...formState.value.dataSource, connection }
 
     // todo: refactor and remove this duplicate path in config
-    if(config.client === ClientType.SQLITE && config.connection?.connection?.filename) {
-      config.connection.filename = config.connection.connection.filename;
+    if (config.client === ClientType.SQLITE && config.connection?.connection?.filename) {
+      config.connection.filename = config.connection.connection.filename
     }
 
     await api.source.update(base.value?.id, props.sourceId, {
diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 63203a7149..9fe4a2382a 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -23,12 +23,12 @@ const props = withDefaults(defineProps<Props>(), {
   autoFocus: true,
 })
 
+const emits = defineEmits(['update:modelValue'])
+
 const { modelValue } = toRefs(props)
 
 const { hideMinimap, lang, validate, disableDeepCompare, readOnly, autoFocus } = props
 
-const emits = defineEmits(['update:modelValue'])
-
 const vModel = computed<string>({
   get: () => {
     if (typeof modelValue.value === 'object') {
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 7d890ed86a..1f7ba889e3 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expand-record', 'new-record'])
+const emit = defineEmits(['expandRecord', 'newRecord'])
 
 const meta = inject(MetaInj, ref())
 
@@ -192,7 +192,7 @@ const newRecord = () => {
       [calendarRange.value[0].fk_from_col!.title!]: selectedDate.value.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', record)
+  emit('newRecord', record)
 }
 </script>
 
@@ -221,7 +221,7 @@ const newRecord = () => {
           :resize="false"
           color="blue"
           size="small"
-          @click="emit('expand-record', record)"
+          @click="emit('expandRecord', record)"
         >
           <template v-if="!isRowEmpty(record, displayField)">
             <LazySmartsheetCalendarCell
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 418d16d468..412c3c822a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expandRecord', 'new-record'])
+const emit = defineEmits(['expandRecord', 'newRecord'])
 
 const {
   // activeCalendarView,
@@ -847,7 +847,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
       [calendarRange.value[0].fk_from_col!.title!]: hour.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', record)
+  emit('newRecord', record)
 }
 </script>
 
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index 4b41e63a25..c95915106a 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['new-record', 'expandRecord'])
+const emit = defineEmits(['newRecord', 'expandRecord'])
 
 const {
   selectedDate,
@@ -635,7 +635,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', newRecord)
+  emit('newRecord', newRecord)
 }
 </script>
 
@@ -710,7 +710,7 @@ const addRecord = (date: dayjs.Dayjs) => {
                             [range.fk_from_col!.title!]: dayjs(day).format('YYYY-MM-DD HH:mm:ssZ'),
                           },
                         }
-                        emit('new-record', record)
+                        emit('newRecord', record)
                       }
                     "
                   >
@@ -738,7 +738,7 @@ const addRecord = (date: dayjs.Dayjs) => {
                       [calendarRange[0].fk_from_col!.title!]: (day).format('YYYY-MM-DD HH:mm:ssZ'),
                     },
                   }
-                  emit('new-record', record)
+                  emit('newRecord', record)
                 }
               "
             >
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index 59ffbfbf97..f58bf648b8 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -5,7 +5,7 @@ import type { Row } from '~/lib'
 import { computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emits = defineEmits(['expandRecord'])
+const emits = defineEmits(['expandRecord', 'newRecord'])
 
 const { selectedDateRange, formattedData, formattedSideBarData, calendarRange, selectedDate, displayField, updateRowProperty } =
   useCalendarViewStoreOrThrow()
@@ -529,7 +529,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('new-record', newRecord)
+  emits('newRecord', newRecord)
 }
 </script>
 
@@ -586,7 +586,7 @@ const addRecord = (date: dayjs.Dayjs) => {
               :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
               :selected="dragRecord?.rowMeta?.id === record.rowMeta.id"
               color="blue"
-              @dblclick.stop="emits('expand-record', record)"
+              @dblclick.stop="emits('expandRecord', record)"
               @resize-start="onResizeStart"
             >
               <template v-if="!isRowEmpty(record, displayField)">
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index f34494d76d..6b9544bca7 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -5,7 +5,7 @@ import type { Row } from '~/lib'
 import { computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emits = defineEmits(['expandRecord'])
+const emits = defineEmits(['expandRecord', 'newRecord'])
 
 const {
   selectedDateRange,
@@ -733,7 +733,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('new-record', newRecord)
+  emits('newRecord', newRecord)
 }
 </script>