chore: sync various (#8671)

Signed-off-by: mertmit <mertmit99@gmail.com>

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

@@ -904,7 +904,7 @@ const changeToDynamic = async (filter, i) => {
             'mt-1 mb-2': filters.length,
           }"
         >
-          <NcButton ref="addFilterBtnRef" class="nc-btn-focus" size="small" type="text" @click.stop="addFilter()">
+          <NcButton :ref="addFilterBtnRef" class="nc-btn-focus" size="small" type="text" @click.stop="addFilter()">
             <div class="flex items-center gap-1">
               <component :is="iconMap.plus" />
               <!-- Add Filter -->

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

@@ -66,13 +66,27 @@ const options = computed<SelectProps['options']>(() =>
     })
   )
     // sort and keep system columns at the end
-    ?.sort((field1, field2) => +isSystemColumn(field2) - +isSystemColumn(field1))
+    ?.sort((field1, field2) => {
+      let orderVal1 = 0
+      let orderVal2 = 0
+
+      if (isSystemColumn(field1)) {
+        orderVal1 = 1
+      }
+      if (isSystemColumn(field2)) {
+        orderVal2 = 1
+      }
+
+      return orderVal1 - orderVal2
+    })
     ?.map((c: ColumnType) => ({
       value: c.id,
       label: c.title,
       icon: h(
         isVirtualCol(c) ? resolveComponent('SmartsheetHeaderVirtualCellIcon') : resolveComponent('SmartsheetHeaderCellIcon'),
-        { columnMeta: c },
+        {
+          columnMeta: c,
+        },
       ),
       c,
     })),

packages/nc-gui/lib/acl.ts

@@ -34,6 +34,8 @@ const rolePermissions = {
       baseDelete: true,
       baseDuplicate: true,
       newUser: true,
+      tableRename: true,
+      tableDelete: true,
       viewCreateOrEdit: true,
       baseReorder: true,
       orgAdminPanel: true,

packages/nocodb/src/modules/jobs/jobs/health-check.processor.ts

@@ -1,30 +0,0 @@
-import { Process, Processor } from '@nestjs/bull';
-import { Inject, Logger } from '@nestjs/common';
-import { JOBS_QUEUE, JobTypes } from '~/interface/Jobs';
-import { IJobsService } from '~/modules/jobs/jobs-service.interface';
-
-@Processor(JOBS_QUEUE)
-export class HealthCheckProcessor {
-  private logger = new Logger(HealthCheckProcessor.name);
-
-  constructor(
-    @Inject('JobsService') protected readonly jobsService: IJobsService,
-  ) {}
-
-  @Process(JobTypes.HealthCheck)
-  async healthCheck() {
-    const queue = this.jobsService.jobsQueue;
-
-    if (queue) {
-      queue
-        .getJobCounts()
-        .then((stats) => {
-          // log stats periodically
-          this.logger.log({ stats });
-        })
-        .catch((err) => {
-          this.logger.error(err);
-        });
-    }
-  }
-}

tests/playwright/tests/db/columns/columnAttachments.spec.ts

@@ -111,7 +111,4 @@ test.describe('Attachment column', () => {
     expect(cells[1]).toBe('1');
     expect(cells[2].includes('5.json(http://localhost:8080/dltemp/')).toBe(true);
   });
-
-  // dummy commit to trigger build
-  //
 });