Merge branch 'develop' into fix/attachments-gallery

packages/nc-gui/lang/ru.json

@@ -206,7 +206,7 @@
     "advancedSettings": "Расширенные настройки",
     "codeSnippet": "Сниппет кода",
     "keyboardShortcut": "Горячие клавиши",
-    "generateRandomName": "Generate Random Name"
+    "generateRandomName": "Сгенерировать случайное имя"
   },
   "labels": {
     "createdBy": "Автор",

packages/nocodb/src/lib/version-upgrader/ncAttachmentUpgrader.ts

@@ -1,3 +1,4 @@
+import { Knex } from 'knex';
 import { NcUpgraderCtx } from './NcUpgrader';
 import { MetaTable } from '../utils/globals';
 import Base from '../models/Base';
@@ -29,7 +30,7 @@ function getTnPath(knex: XKnex, tb: Model) {
   const schema = (knex as any).searchPath?.();
   const clientType = knex.clientType();
   if (clientType === 'mssql' && schema) {
-    return knex.raw('??.??', [schema, tb.table_name]);
+    return knex.raw('??.??', [schema, tb.table_name]).toQuery();
   } else if (clientType === 'snowflake') {
     return [
       knex.client.config.connection.database,
@@ -45,26 +46,71 @@ export default async function ({ ncMeta }: NcUpgraderCtx) {
   const bases: BaseType[] = await ncMeta.metaList2(null, null, MetaTable.BASES);
   for (const _base of bases) {
     const base = new Base(_base);
-    const knex: XKnex = base.is_meta
+
+    // skip if the prodect_id is missing
+    if (!base.project_id) {
+      continue;
+    }
+
+    const project = await ncMeta.metaGet2(null, null, MetaTable.PROJECT, {
+      id: base.project_id,
+    });
+
+    // skip if the project is missing
+    if (!project) {
+      continue;
+    }
+
+    const isProjectDeleted = project.deleted;
+
+    const knex: Knex = base.is_meta
       ? ncMeta.knexConnection
       : NcConnectionMgrv2.get(base);
     const models = await base.getModels(ncMeta);
+
     for (const model of models) {
+      try {
+        // if the table is missing in database, skip
+        if (!(await knex.schema.hasTable(getTnPath(knex, model)))) {
+          continue;
+        }
+
         const updateRecords = [];
-      const columns = await (
-        await Model.get(model.id, ncMeta)
-      ).getColumns(ncMeta);
+
+        // get all attachment & primary key columns
+        // and filter out the columns that are missing in database
+        const columns = await (await Model.get(model.id, ncMeta))
+          .getColumns(ncMeta)
+          .then(async (columns) => {
+            const filteredColumns = [];
+
+            for (const column of columns) {
+              if (column.uidt !== UITypes.Attachment && !column.pk) continue;
+              if (
+                !(await knex.schema.hasColumn(
+                  getTnPath(knex, model),
+                  column.column_name
+                ))
+              )
+                continue;
+              filteredColumns.push(column);
+            }
+
+            return filteredColumns;
+          });
+
         const attachmentColumns = columns
           .filter((c) => c.uidt === UITypes.Attachment)
           .map((c) => c.column_name);
         if (attachmentColumns.length === 0) {
           continue;
         }
-      const primaryKeys = columns.filter((c) => c.pk).map((c) => c.column_name);
-      const records = await knex(getTnPath(knex, model)).select([
-        ...primaryKeys,
-        ...attachmentColumns,
-      ]);
+        const primaryKeys = columns
+          .filter((c) => c.pk)
+          .map((c) => c.column_name);
+
+        const records = await knex(getTnPath(knex, model)).select();
+
         for (const record of records) {
           for (const attachmentColumn of attachmentColumns) {
             let attachmentMeta: Array<{
@@ -121,6 +167,12 @@ export default async function ({ ncMeta }: NcUpgraderCtx) {
           }
         }
         await Promise.all(updateRecords);
+      } catch (e) {
+        // ignore the error related to deleted project
+        if (!isProjectDeleted) {
+          throw e;
+        }
+      }
     }
   }
 }

tests/playwright/pages/Dashboard/Grid/index.ts

@@ -308,18 +308,41 @@ export class GridPage extends BasePage {
   }
 
   async copyWithKeyboard() {
+    // retry to avoid flakiness, until text is copied to clipboard
+    //
+    let text = '';
+    let retryCount = 5;
+    while (text === '') {
       await this.get().press((await this.isMacOs()) ? 'Meta+C' : 'Control+C');
       await this.verifyToast({ message: 'Copied to clipboard' });
+      text = await this.getClipboardText();
 
-    return this.getClipboardText();
+      // retry if text is empty till count is reached
+      retryCount--;
+      if (0 === retryCount) {
+        break;
+      }
+    }
+    return text;
   }
 
   async copyWithMouse({ index, columnHeader }: CellProps) {
+    // retry to avoid flakiness, until text is copied to clipboard
+    //
+    let text = '';
+    let retryCount = 5;
+    while (text === '') {
       await this.cell.get({ index, columnHeader }).click({ button: 'right' });
       await this.get().page().getByTestId('context-menu-item-copy').click();
-
       await this.verifyToast({ message: 'Copied to clipboard' });
+      text = await this.getClipboardText();
 
-    return this.getClipboardText();
+      // retry if text is empty till count is reached
+      retryCount--;
+      if (0 === retryCount) {
+        break;
+      }
+    }
+    return text;
   }
 }