fix(nc-gui): small changes

packages/nc-gui/components/smartsheet/header/Menu.vue

@@ -395,59 +395,55 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
           </NcMenuItem>
         </template>
 
-        <a-divider v-if="!column?.pk" class="!my-0" />
+        <a-divider class="!my-0" />
-
+
-        <template v-if="true">
+        <NcTooltip :disabled="isFilterSupported && !isFilterLimitExceeded">
-          <NcTooltip :disabled="isFilterSupported && !isFilterLimitExceeded">
+          <template #title>
-            <template #title>
+            {{
-              {{
+              !isFilterSupported
-                !isFilterSupported
+                ? "This field type doesn't support filtering"
-                  ? "This field type doesn't support filtering"
+                : isFilterLimitExceeded
-                  : isFilterLimitExceeded
+                ? 'Filter by limit exceeded'
-                  ? 'Filter by limit exceeded'
-                  : ''
-              }}
-            </template>
-            <NcMenuItem
-              @click="filterOrGroupByThisField(SmartsheetStoreEvents.FILTER_ADD)"
-              :disabled="!isFilterSupported || isFilterLimitExceeded"
-            >
-              <div v-e="['a:field:add:filter']" class="nc-column-filter nc-header-menu-item">
-                <component :is="iconMap.filter" class="text-gray-700" />
-                <!-- Filter by this field -->
-                Filter by this field
-              </div>
-            </NcMenuItem>
-          </NcTooltip>
-
-          <NcTooltip
-            :disabled="(isGroupBySupported && !isGroupByLimitExceeded) || isGroupedByThisField || !(isEeUI && !isPublic)"
-          >
-            <template #title>{{
-              !isGroupBySupported
-                ? "This field type doesn't support grouping"
-                : isGroupByLimitExceeded
-                ? 'Group by limit exceeded'
                 : ''
-            }}</template>
+            }}
-            <NcMenuItem
+          </template>
-              :disabled="isEeUI && !isPublic && (!isGroupBySupported || isGroupByLimitExceeded) && !isGroupedByThisField"
+          <NcMenuItem
-              @click="
+            :disabled="!isFilterSupported || isFilterLimitExceeded"
-                filterOrGroupByThisField(
+            @click="filterOrGroupByThisField(SmartsheetStoreEvents.FILTER_ADD)"
-                  isGroupedByThisField ? SmartsheetStoreEvents.GROUP_BY_REMOVE : SmartsheetStoreEvents.GROUP_BY_ADD,
+          >
-                )
+            <div v-e="['a:field:add:filter']" class="nc-column-filter nc-header-menu-item">
-              "
+              <component :is="iconMap.filter" class="text-gray-700" />
-            >
+              <!-- Filter by this field -->
-              <div v-e="['a:field:add:groupby']" class="nc-column-groupby nc-header-menu-item">
+              Filter by this field
-                <component :is="iconMap.group" class="text-gray-700" />
+            </div>
-                <!-- Group by this field -->
+          </NcMenuItem>
-                {{ isGroupedByThisField ? "Don't group by this field" : 'Group by this field' }}
+        </NcTooltip>
-              </div>
+
-            </NcMenuItem>
+        <NcTooltip :disabled="(isGroupBySupported && !isGroupByLimitExceeded) || isGroupedByThisField || !(isEeUI && !isPublic)">
-          </NcTooltip>
+          <template #title>{{
-
+            !isGroupBySupported
-          <a-divider class="!my-0" />
+              ? "This field type doesn't support grouping"
-        </template>
+              : isGroupByLimitExceeded
+              ? 'Group by limit exceeded'
+              : ''
+          }}</template>
+          <NcMenuItem
+            :disabled="isEeUI && !isPublic && (!isGroupBySupported || isGroupByLimitExceeded) && !isGroupedByThisField"
+            @click="
+              filterOrGroupByThisField(
+                isGroupedByThisField ? SmartsheetStoreEvents.GROUP_BY_REMOVE : SmartsheetStoreEvents.GROUP_BY_ADD,
+              )
+            "
+          >
+            <div v-e="['a:field:add:groupby']" class="nc-column-groupby nc-header-menu-item">
+              <component :is="iconMap.group" class="text-gray-700" />
+              <!-- Group by this field -->
+              {{ isGroupedByThisField ? "Don't group by this field" : 'Group by this field' }}
+            </div>
+          </NcMenuItem>
+        </NcTooltip>
+
+        <a-divider class="!my-0" />
 
         <NcMenuItem v-if="!column?.pk" :disabled="!isDuplicateAllowed" @click="openDuplicateDlg">
           <div v-e="['a:field:duplicate']" class="nc-column-duplicate nc-header-menu-item">

packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue

@@ -29,8 +29,6 @@ interface Props {
   webHook?: boolean
   draftFilter?: Partial<FilterType>
 }
-const excludedFilterColUidt = [UITypes.QrCode, UITypes.Barcode]
-
 const props = withDefaults(defineProps<Props>(), {
   nestedLevel: 0,
   autoSave: true,
@@ -42,6 +40,8 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits(['update:filtersLength', 'update:draftFilter'])
 
+const excludedFilterColUidt = [UITypes.QrCode, UITypes.Barcode]
+
 const draftFilter = useVModel(props, 'draftFilter', emit)
 
 const { nestedLevel, parentId, autoSave, hookId, modelValue, showLoading, webHook } = toRefs(props)

packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ColumnType, LinkToAnotherRecordType, LookupType } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
 import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
 import {
   ActiveViewInj,