fix: snapshot fixes

packages/nc-gui/components/dashboard/settings/base/index.vue

@@ -71,8 +71,8 @@ onMounted(() => {
     <!-- Data Pane -->
 
     <div class="flex flex-col w-[760px]">
-      <DashboardSettingsBaseSettingsSnapshots v-if="activeMenu === 'snapshots'" />
+      <DashboardSettingsBaseSnapshots v-if="activeMenu === 'snapshots'" />
-      <DashboardSettingsBaseSettingsVisibility v-if="activeMenu === 'visibility'" />
+      <DashboardSettingsBaseVisibility v-if="activeMenu === 'visibility'" />
     </div>
   </div>
 </template>

packages/nc-gui/components/general/WorkspaceIcon.vue

@@ -11,7 +11,7 @@ const props = defineProps<{
     iconType: WorkspaceIconType | string
   }
   hideLabel?: boolean
-  size?: 'small' | 'medium' | 'large' | 'xlarge' | 'middle'
+  size?: 'small' | 'medium' | 'large' | 'xlarge'
   isRounded?: boolean
 }>()
 
@@ -74,7 +74,6 @@ const size = computed(() => props.size || 'medium')
     :class="{
       'min-w-4 w-4 h-4 rounded': size === 'small',
       'min-w-6 w-6 h-6 rounded-md': size === 'medium',
-      'min-w-8 w-6 h-8 rounded-md': size === 'middle',
       'min-w-10 w-10 h-10 rounded-lg !text-base': size === 'large',
       'min-w-16 w-16 h-16 rounded-lg !text-4xl': size === 'xlarge',
       '!rounded-[50%]': props.isRounded,

packages/nc-gui/components/project/View.vue

@@ -210,7 +210,7 @@ watch(
               <div>{{ $t('activity.settings') }}</div>
             </div>
           </template>
-          <DashboardSettingsBaseSettings :base-id="base.id!" class="max-h-full" />
+          <DashboardSettingsBase :base-id="base.id!" class="max-h-full" />
         </a-tab-pane>
       </a-tabs>
     </div>

packages/nc-gui/composables/useBaseSettings.ts

@@ -1,5 +0,0 @@
-import { createSharedComposable } from '@vueuse/core'
-
-export const useBaseSettings = createSharedComposable(() => {
-  return {}
-})

packages/nocodb/src/models/Comment.ts

@@ -46,16 +46,45 @@ export default class Comment implements CommentType {
     fk_model_id: string,
     ncMeta = Noco.ncMeta,
   ): Promise<Comment[]> {
-    const commentList = await ncMeta
+    const READ_BATCH_SIZE = 1000;
-      .knex(MetaTable.COMMENTS)
+    const allComments: Comment[] = [];
-      .select(`${MetaTable.COMMENTS}.*`)
+    let fetchNextBatch = true;
-      .where('fk_model_id', fk_model_id)
+
-      .where(function () {
+    for (let offset = 0; fetchNextBatch; offset += READ_BATCH_SIZE) {
-        this.whereNull('is_deleted').orWhere('is_deleted', '!=', true);
+      const comments = await ncMeta.metaList2(
-      })
+        context.workspace_id,
-      .orderBy('created_at', 'asc');
+        context.base_id,
+        MetaTable.COMMENTS,
+        {
+          condition: {
+            fk_model_id,
+          },
+          orderBy: {
+            created_at: 'asc'
+          },
+          limit: READ_BATCH_SIZE + 1,
+          offset,
+          xcCondition: [
+            {
+              _or: [
+                { is_deleted: null },
+                { is_deleted: false },
+              ]
+            }
+          ]
+        }
+      );
 
-    return commentList.map((comment) => new Comment(comment));
+      const batchComments = comments
+        .slice(0, READ_BATCH_SIZE)
+        .map(comment => new Comment(comment));
+
+      allComments.push(...batchComments);
+
+      fetchNextBatch = comments.length > READ_BATCH_SIZE;
+    }
+
+    return allComments;
   }
 
   public static async list(

packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts

@@ -380,7 +380,7 @@ export class ExportService {
         }
       }
 
-      const searializedComments = [];
+      const serializedComments = [];
 
       if (!excludeComments) {
         const comments = await Comment.listByModel(context, model.id);
@@ -388,7 +388,7 @@ export class ExportService {
         for (const comment of comments) {
           idMap.set(comment.id, `${idMap.get(model.id)}::${comment.id}`);
 
-          searializedComments.push({
+          serializedComments.push({
             id: idMap.get(comment.id),
             fk_model_id: idMap.get(comment.fk_model_id),
             row_id: comment.row_id,
@@ -470,7 +470,7 @@ export class ExportService {
           view: view.view,
         })),
         hooks: serializedHooks,
-        comments: searializedComments,
+        comments: serializedComments,
       });
     }