Merge pull request #6605 from nocodb/nc-fix/table-pagination

Fixed issue with single query cache not getting cleared on column update actions and table pagination UI

packages/nc-gui/components/nc/Pagination.vue

@@ -70,8 +70,11 @@ const pagesList = computed(() => {
     >
       <GeneralIcon icon="arrowLeft" />
     </NcButton>
-    <div class="text-gray-600">
+    <div v-if="!isMobileMode" class="text-gray-600">
       <a-select v-model:value="current" class="!mr-[2px]" virtual>
+        <template #suffixIcon>
+          <GeneralIcon icon="arrowDown" class="text-gray-500 nc-select-expand-btn" />
+        </template>
         <a-select-option v-for="p of pagesList" :key="`p-${p}`" @click="changePage({ set: p })">{{ p }}</a-select-option>
       </a-select>
       <span class="mx-1"> {{ mode !== 'full' ? '/' : 'of' }} </span>
@@ -104,3 +107,13 @@ const pagesList = computed(() => {
     </NcButton>
   </div>
 </template>
+
+<style lang="scss" scoped>
+:deep(.ant-select-selector) {
+  @apply !border-gray-200 !rounded-lg;
+}
+
+:deep(.ant-select-dropdown) {
+  @apply !rounded-lg !overflow-hidden;
+}
+</style>

packages/nc-gui/components/smartsheet/column/LookupOptions.vue

@@ -86,7 +86,7 @@ const cellIcon = (column: ColumnType) =>
 
 <template>
   <div class="p-6 w-full flex flex-col border-2 mb-2 mt-4">
-    <div class="w-full flex flex-row space-x-2">
+    <div v-if="refTables.length" class="w-full flex flex-row space-x-2">
       <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.links')" v-bind="validateInfos.fk_relation_column_id">
         <a-select
           v-model:value="vModel.fk_relation_column_id"
@@ -121,6 +121,7 @@ const cellIcon = (column: ColumnType) =>
         </a-select>
       </a-form-item>
     </div>
+    <div v-else>{{ $t('msg.linkColumnClearNotSupportedYet') }}</div>
   </div>
 </template>
 

packages/nc-gui/lang/en.json

@@ -870,8 +870,9 @@
     "newFormWillBeLoaded": "New form will be loaded after {seconds} seconds",
     "optimizedQueryDisabled": "Optimized query is disabled",
     "optimizedQueryEnabled": "Optimized query is enabled",
+    "lookupNonBtWarning": "Lookup column is not supported for non-Belongs to relation",
     "invalidTime": "Invalid Time",
-    "linkColumnClearNotSupportedYet": "Link column clear is not supported yet",
+    "linkColumnClearNotSupportedYet": "You don't have any supported links for Lookup",
     "recordCouldNotBeFound": "Record could not be found",
     "invalidPhoneNumber": "Invalid phone number",
     "pageSizeChanged": "Page size changed",

packages/nocodb/src/models/Column.ts

@@ -191,6 +191,11 @@ export default class Column<T = any> implements ColumnType {
       ncMeta,
     );
 
+    await NocoCache.delAll(
+      CacheScope.SINGLE_QUERY,
+      `${column.fk_model_id}:default:*`,
+    );
+
     return col;
   }
 
@@ -1159,6 +1164,9 @@ export default class Column<T = any> implements ColumnType {
       },
       colId,
     );
+
+    const column = await Column.get({ colId }, ncMeta);
+    await NocoCache.delAll(CacheScope.SINGLE_QUERY, `${column.fk_model_id}:*`);
   }
 
   public getValidators(): any {