fix(test): Integrated multiple sources changes with playwright

packages/nocodb/src/lib/models/Base.ts

@@ -77,7 +77,12 @@ export default class Base implements BaseType {
 
   public static async updateBase(
     baseId: string,
-    base: BaseType & { id: string; projectId: string; created_at?; updated_at? },
+    base: BaseType & {
+      id: string;
+      projectId: string;
+      created_at?;
+      updated_at?;
+    },
     ncMeta = Noco.ncMeta
   ) {
     const oldBase = await Base.get(baseId, ncMeta);
@@ -193,11 +198,18 @@ export default class Base implements BaseType {
     return baseData && new Base(baseData);
   }
 
-  static async reorderBases(projectId: string, keepBase?: string, ncMeta = Noco.ncMeta) {
+  static async reorderBases(
+    projectId: string,
+    keepBase?: string,
+    ncMeta = Noco.ncMeta
+  ) {
     const bases = await this.list({ projectId: projectId }, ncMeta);
 
     if (keepBase) {
-      const kpBase = bases.splice(bases.indexOf(bases.find((base) => base.id === keepBase)), 1);
+      const kpBase = bases.splice(
+        bases.indexOf(bases.find((base) => base.id === keepBase)),
+        1
+      );
       if (kpBase.length) {
         bases.splice(kpBase[0].order - 1, 0, kpBase[0]);
       }
@@ -265,10 +277,12 @@ export default class Base implements BaseType {
     return Project.get(this.project_id, ncMeta);
   }
 
-  async delete(ncMeta = Noco.ncMeta) {
+  async delete(ncMeta = Noco.ncMeta, { force }: { force?: boolean } = {}) {
     const bases = await Base.list({ projectId: this.project_id }, ncMeta);
 
-    if (bases[0].id === this.id) NcError.badRequest('Cannot delete first base');
+    if (bases[0].id === this.id && !force) {
+      NcError.badRequest('Cannot delete first base');
+    }
 
     const models = await Model.list(
       {

packages/nocodb/src/lib/services/test/TestResetService/index.ts

@@ -1,6 +1,7 @@
 import axios from 'axios';
 import Project from '../../../models/Project';
 import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2';
+import Noco from '../../../Noco';
 import resetMetaSakilaSqliteProject from './resetMetaSakilaSqliteProject';
 import resetMysqlSakilaProject from './resetMysqlSakilaProject';
 import resetPgSakilaProject from './resetPgSakilaProject';
@@ -111,8 +112,9 @@ export class TestResetService {
 
       const bases = await project.getBases();
 
-      if (bases.length > 0) {
-        await NcConnectionMgrv2.deleteAwait(bases[0]);
+      for (const base of bases) {
+        await NcConnectionMgrv2.deleteAwait(base);
+        await base.delete(Noco.ncMeta, { force: true });
       }
 
       await Project.delete(project.id);

tests/playwright/constants/index.ts

@@ -1,4 +1,6 @@
 const airtableApiKey = 'keyn1MR87qgyUsYg4';
 const airtableApiBase = 'https://airtable.com/shr4z0qmh6dg5s3eB';
 
-export { airtableApiKey, airtableApiBase };
+const defaultBaseName = 'Base';
+
+export { airtableApiKey, airtableApiBase, defaultBaseName };

tests/playwright/pages/Dashboard/Settings/Acl.ts

@@ -1,17 +1,16 @@
-import { expect, Locator } from '@playwright/test';
-import { SettingsPage } from '.';
 import BasePage from '../../Base';
+import { DataSourcesPage } from './DataSources';
 
 export class AclPage extends BasePage {
-  private readonly settings: SettingsPage;
+  readonly dataSources: DataSourcesPage;
 
-  constructor(settings: SettingsPage) {
-    super(settings.rootPage);
-    this.settings = settings;
+  constructor(dataSources: DataSourcesPage) {
+    super(dataSources.rootPage);
+    this.dataSources = dataSources;
   }
 
   get() {
-    return this.settings.get().locator(`[data-testid="nc-settings-subtab-UI Access Control"]`);
+    return this.dataSources.get();
   }
 
   async toggle({ table, role }: { table: string; role: string }) {

tests/playwright/pages/Dashboard/Settings/DataSources.ts

@@ -0,0 +1,40 @@
+import { SettingsPage } from '.';
+import { defaultBaseName } from '../../../constants';
+import BasePage from '../../Base';
+import { AclPage } from './Acl';
+import { SettingsErdPage } from './Erd';
+import { MetaDataPage } from './Metadata';
+
+export class DataSourcesPage extends BasePage {
+  private readonly settings: SettingsPage;
+  readonly erd: SettingsErdPage;
+  readonly acl: AclPage;
+  readonly metaData: MetaDataPage;
+
+  constructor(settings: SettingsPage) {
+    super(settings.rootPage);
+    this.settings = settings;
+    this.erd = new SettingsErdPage(this);
+    this.acl = new AclPage(this);
+    this.metaData = new MetaDataPage(this);
+  }
+
+  get() {
+    return this.settings.get().locator(`[data-nc="nc-settings-subtab-Data Sources"]`);
+  }
+
+  async openErd({ dataSourceName }: { dataSourceName: string }) {
+    await this.get().locator('.ds-table-row', { hasText: dataSourceName }).locator('button:has-text("ERD")').click();
+  }
+
+  async openAcl({ dataSourceName = defaultBaseName }: { dataSourceName?: string } = {}) {
+    await this.get().locator('.ds-table-row', { hasText: dataSourceName }).locator('button:has-text("UI ACL")').click();
+  }
+
+  async openMetaSync({ dataSourceName = defaultBaseName }: { dataSourceName?: string } = {}) {
+    await this.get()
+      .locator('.ds-table-row', { hasText: dataSourceName })
+      .locator('button:has-text("Sync Metadata")')
+      .click();
+  }
+}

tests/playwright/pages/Dashboard/Settings/Erd.ts

@@ -1,15 +1,15 @@
-import { SettingsPage } from '.';
 import { ErdBasePage } from '../commonBase/Erd';
+import { DataSourcesPage } from './DataSources';
 
 export class SettingsErdPage extends ErdBasePage {
-  readonly settings: SettingsPage;
+  readonly dataSources: DataSourcesPage;
 
-  constructor(settings: SettingsPage) {
-    super(settings.rootPage);
-    this.settings = settings;
+  constructor(dataSources: DataSourcesPage) {
+    super(dataSources.rootPage);
+    this.dataSources = dataSources;
   }
 
   get() {
-    return this.rootPage.locator(`[data-testid="nc-settings-subtab-ERD View"]`);
+    return this.dataSources.get();
   }
 }

tests/playwright/pages/Dashboard/Settings/Metadata.ts

@@ -1,17 +1,17 @@
 import { expect } from '@playwright/test';
-import { SettingsPage } from '.';
 import BasePage from '../../Base';
+import { DataSourcesPage } from './DataSources';
 
 export class MetaDataPage extends BasePage {
-  private readonly settings: SettingsPage;
+  private readonly dataSources: DataSourcesPage;
 
-  constructor(settings: SettingsPage) {
-    super(settings.rootPage);
-    this.settings = settings;
+  constructor(dataSources: DataSourcesPage) {
+    super(dataSources.rootPage);
+    this.dataSources = dataSources;
   }
 
   get() {
-    return this.settings.get().locator(`[data-testid="nc-settings-subtab-Metadata"]`);
+    return this.dataSources.get();
   }
 
   async clickReload() {

tests/playwright/pages/Dashboard/Settings/Miscellaneous.ts

@@ -1,4 +1,3 @@
-import { expect } from '@playwright/test';
 import { SettingsPage } from '.';
 import BasePage from '../../Base';
 
@@ -15,6 +14,11 @@ export class MiscSettingsPage extends BasePage {
   }
 
   async clickShowM2MTables() {
-    await this.get().locator('input[type="checkbox"]').click();
+    const clickAction = this.get().locator('input[type="checkbox"]').click();
+    await this.waitForResponse({
+      uiAction: clickAction,
+      requestUrlPathToMatch: 'tables?includeM2M',
+      httpMethodsToMatch: ['GET'],
+    });
   }
 }

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

@@ -1,18 +1,17 @@
 import { DashboardPage } from '..';
 import BasePage from '../../Base';
 import { AuditSettingsPage } from './Audit';
-import { SettingsErdPage } from './Erd';
-import { MetaDataPage } from './Metadata';
 import { AppStoreSettingsPage } from './AppStore';
 import { MiscSettingsPage } from './Miscellaneous';
 import { TeamsPage } from './Teams';
-import { AclPage } from './Acl';
+import { DataSourcesPage } from './DataSources';
 
 export enum SettingTab {
   TeamAuth = 'teamAndAuth',
   AppStore = 'appStore',
-  ProjectMetadata = 'projMetaData',
+  DataSources = 'dataSources',
   Audit = 'audit',
+  ProjectSettings = 'projectSettings',
 }
 
 export enum SettingsSubTab {
@@ -22,25 +21,19 @@ export enum SettingsSubTab {
 }
 
 export class SettingsPage extends BasePage {
-  private readonly dashboard: DashboardPage;
   readonly audit: AuditSettingsPage;
   readonly appStore: AppStoreSettingsPage;
-  readonly metaData: MetaDataPage;
   readonly miscellaneous: MiscSettingsPage;
-  readonly erd: SettingsErdPage;
+  readonly dataSources: DataSourcesPage;
   readonly teams: TeamsPage;
-  readonly acl: AclPage;
 
   constructor(dashboard: DashboardPage) {
     super(dashboard.rootPage);
-    this.dashboard = dashboard;
     this.audit = new AuditSettingsPage(this);
     this.appStore = new AppStoreSettingsPage(this);
-    this.metaData = new MetaDataPage(this);
     this.miscellaneous = new MiscSettingsPage(this);
-    this.erd = new SettingsErdPage(this);
+    this.dataSources = new DataSourcesPage(this);
     this.teams = new TeamsPage(this);
-    this.acl = new AclPage(this);
   }
 
   get() {

tests/playwright/pages/Dashboard/TreeView.ts

@@ -6,14 +6,12 @@ export class TreeViewPage extends BasePage {
   readonly dashboard: DashboardPage;
   readonly project: any;
   readonly quickImportButton: Locator;
-  readonly inviteTeamButton: Locator;
 
   constructor(dashboard: DashboardPage, project: any) {
     super(dashboard.rootPage);
     this.dashboard = dashboard;
     this.project = project;
     this.quickImportButton = dashboard.get().locator('.nc-import-menu');
-    this.inviteTeamButton = dashboard.get().locator('.nc-share-base');
   }
 
   get() {
@@ -131,13 +129,14 @@ export class TreeViewPage extends BasePage {
     await importMenu.locator(`.ant-dropdown-menu-title-content:has-text("${title}")`).click();
   }
 
+  // todo: Break this into smaller methods
   async validateRoleAccess(param: { role: string }) {
     // Add new table button
     await expect(this.get().locator(`.nc-add-new-table`)).toHaveCount(param.role === 'creator' ? 1 : 0);
     // Import menu
     await expect(this.get().locator(`.nc-import-menu`)).toHaveCount(param.role === 'creator' ? 1 : 0);
-    // Invite Team button
-    await expect(this.get().locator(`.nc-share-base`)).toHaveCount(param.role === 'creator' ? 1 : 0);
+    // Team and Settings button
+    await expect(this.get().locator(`.nc-new-base`)).toHaveCount(param.role === 'creator' ? 1 : 0);
     // Right click context menu
     await this.get().locator(`.nc-project-tree-tbl-Country`).click({
       button: 'right',

tests/playwright/tests/baseShare.spec.ts

@@ -58,15 +58,18 @@ test.describe('Shared base', () => {
     // close 'Team & Auth' tab
     await dashboard.closeTab({ title: 'Team & Auth' });
 
-    await dashboard.treeView.inviteTeamButton.click();
+    await dashboard.gotoSettings();
+    await dashboard.settings.teams.clickInviteTeamBtn();
     await dashboard.settings.teams.toggleSharedBase({ toggle: true });
     await dashboard.settings.teams.sharedBaseRole({ role: 'editor' });
     let url = await dashboard.settings.teams.getSharedBaseUrl();
     await dashboard.settings.teams.closeInvite();
+    await dashboard.settings.close();
 
     await dashboard.rootPage.waitForTimeout(2000);
     // access shared base link
     await dashboard.signOut();
+    await dashboard.rootPage.waitForTimeout(2000);
     // todo: Move this to a page object
     await dashboard.rootPage.goto(url);
 
@@ -81,11 +84,13 @@ test.describe('Shared base', () => {
     await projectPage.openProject({ title: context.project.title, withoutPrefix: true });
     await dashboard.closeTab({ title: 'Team & Auth' });
 
-    await dashboard.treeView.inviteTeamButton.click();
+    await dashboard.gotoSettings();
+    await dashboard.settings.teams.clickInviteTeamBtn();
     await dashboard.settings.teams.toggleSharedBase({ toggle: true });
     await dashboard.settings.teams.sharedBaseRole({ role: 'viewer' });
     url = await dashboard.settings.teams.getSharedBaseUrl();
     await dashboard.settings.teams.closeInvite();
+    await dashboard.settings.close();
 
     await dashboard.rootPage.waitForTimeout(2000);
     // access shared base link

tests/playwright/tests/erd.spec.ts

@@ -11,6 +11,7 @@ import { SettingsSubTab, SettingTab } from '../pages/Dashboard/Settings';
 import setup from '../setup';
 import { isMysql, isPg, isSqlite } from '../setup/db';
 import { SettingsErdPage } from '../pages/Dashboard/Settings/Erd';
+import { defaultBaseName } from '../constants';
 
 test.describe('Erd', () => {
   let dashboard: DashboardPage;
@@ -35,15 +36,21 @@ test.describe('Erd', () => {
     }
   });
 
-  const enableMM = async () => {
-    await dashboard.settings.selectTab({ tab: SettingTab.ProjectMetadata, subTab: SettingsSubTab.Miscellaneous });
+  const toggleMMAndOpenErd = async () => {
+    await dashboard.settings.selectTab({ tab: SettingTab.ProjectSettings, subTab: SettingsSubTab.Miscellaneous });
     await dashboard.settings.miscellaneous.clickShowM2MTables();
-    await dashboard.settings.selectSubTab({ subTab: SettingsSubTab.ERD });
+    await dashboard.settings.selectTab({ tab: SettingTab.DataSources });
+    await dashboard.settings.dataSources.openErd({
+      dataSourceName: defaultBaseName,
+    });
   };
 
   const openSettingsErd = async () => {
     await dashboard.gotoSettings();
-    await dashboard.settings.selectTab({ tab: SettingTab.ProjectMetadata, subTab: SettingsSubTab.ERD });
+    await dashboard.settings.selectTab({ tab: SettingTab.DataSources });
+    await dashboard.settings.dataSources.openErd({
+      dataSourceName: defaultBaseName,
+    });
   };
 
   const openErdOfATable = async (tableName: string) => {
@@ -54,9 +61,9 @@ test.describe('Erd', () => {
 
   test('Verify default config, all columns disabled, only PK and FK disabled, Sql views and MM table option, junction table names', async () => {
     await openSettingsErd();
-    await enableMM();
+    await toggleMMAndOpenErd();
 
-    const erd: SettingsErdPage = dashboard.settings.erd;
+    const erd: SettingsErdPage = dashboard.settings.dataSources.erd;
 
     await erd.dbClickShowColumnNames();
 
@@ -219,7 +226,7 @@ test.describe('Erd', () => {
     await dashboard.grid.column.create({ title: 'test_column' });
     // Verify in Settings ERD and table ERD
     await openSettingsErd();
-    await dashboard.settings.erd.verifyNode({
+    await dashboard.settings.dataSources.erd.verifyNode({
       tableName: `country`,
       columnName: 'test_column',
     });
@@ -242,7 +249,7 @@ test.describe('Erd', () => {
     });
     // Verify in Settings ERD and table ERD
     await openSettingsErd();
-    await dashboard.settings.erd.verifyNode({
+    await dashboard.settings.dataSources.erd.verifyNode({
       tableName: `country`,
       columnName: 'new_test_column',
     });
@@ -261,7 +268,7 @@ test.describe('Erd', () => {
     await dashboard.grid.column.delete({ title: 'new_test_column' });
     // Verify in Settings ERD and table ERD
     await openSettingsErd();
-    await dashboard.settings.erd.verifyNode({
+    await dashboard.settings.dataSources.erd.verifyNode({
       tableName: `country`,
       columnNameShouldNotExist: 'new_test_column',
     });
@@ -285,7 +292,7 @@ test.describe('Erd', () => {
     await dashboard.treeView.createTable({ title: 'Test' });
     // Verify in Settings ERD and table ERD
     await openSettingsErd();
-    await dashboard.settings.erd.verifyNode({
+    await dashboard.settings.dataSources.erd.verifyNode({
       tableName: `Test`,
     });
     await dashboard.settings.close();
@@ -293,14 +300,13 @@ test.describe('Erd', () => {
     // Delete table and verify ERD
     await dashboard.treeView.deleteTable({ title: 'Test' });
     await openSettingsErd();
-    await dashboard.settings.erd.verifyNodeDoesNotExist({
+    await dashboard.settings.dataSources.erd.verifyNodeDoesNotExist({
       tableName: `Test`,
     });
 
     // Verify that `show mm table` option disabled will not trigger easter in ERD options
-    await dashboard.settings.selectSubTab({ subTab: SettingsSubTab.Miscellaneous });
-    await dashboard.settings.miscellaneous.clickShowM2MTables(); // disable
-    await dashboard.settings.selectSubTab({ subTab: SettingsSubTab.ERD });
+    await dashboard.settings.dataSources.erd.dbClickShowColumnNames();
+    await dashboard.settings.dataSources.erd.verifyEasterEggNotShown();
     await dashboard.settings.close();
   });
 });

tests/playwright/tests/metaSync.spec.ts

@@ -4,7 +4,6 @@ import { SettingsPage, SettingTab } from '../pages/Dashboard/Settings';
 import setup, { NcContext } from '../setup';
 import { isMysql, isPg, isSqlite, mysqlExec, pgExec, sqliteExec } from '../setup/db';
 
-// todo: Enable when view bug is fixed
 test.describe('Meta sync', () => {
   let dashboard: DashboardPage;
   let settings: SettingsPage;
@@ -33,30 +32,31 @@ test.describe('Meta sync', () => {
     test.setTimeout(process.env.CI ? 100000 : 70000);
 
     await dashboard.gotoSettings();
-    await settings.selectTab({ tab: SettingTab.ProjectMetadata });
+    await settings.selectTab({ tab: SettingTab.DataSources });
+    await settings.dataSources.openMetaSync();
 
     await dbExec(`CREATE TABLE table1 (id INT NOT NULL, col1 INT NULL, PRIMARY KEY (id))`);
     await dbExec(`CREATE TABLE table2 (id INT NOT NULL, col1 INT NULL, PRIMARY KEY (id))`);
 
-    await settings.metaData.clickReload();
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.clickReload();
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 21 : 16,
       model: `table1`,
       state: 'New table',
     });
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 22 : 17,
       model: `table2`,
       state: 'New table',
     });
 
-    await settings.metaData.sync();
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.sync();
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 21 : 16,
       model: 'Table1',
       state: 'No change identified',
     });
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 22 : 17,
       model: 'Table2',
       state: 'No change identified',
@@ -72,16 +72,16 @@ test.describe('Meta sync', () => {
           `ALTER TABLE table1 ADD CONSTRAINT fk1 FOREIGN KEY (col1) REFERENCES table2 (id) ON DELETE NO ACTION ON UPDATE NO ACTION`
         );
       }
-      await settings.metaData.clickReload();
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.clickReload();
+      await settings.dataSources.metaData.verifyRow({
         index: isPg(context) ? 21 : 16,
         model: 'Table1',
         state: 'New relation added',
       });
 
       //verify after sync
-      await settings.metaData.sync();
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.sync();
+      await settings.dataSources.metaData.verifyRow({
         index: isPg(context) ? 21 : 16,
         model: 'Table1',
         state: 'No change identified',
@@ -94,16 +94,16 @@ test.describe('Meta sync', () => {
         await dbExec(`ALTER TABLE table1 DROP FOREIGN KEY fk1`);
         await dbExec(`ALTER TABLE table1 DROP INDEX fk1_idx`);
       }
-      await settings.metaData.clickReload();
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.clickReload();
+      await settings.dataSources.metaData.verifyRow({
         index: isPg(context) ? 21 : 16,
         model: 'Table1',
         state: 'Relation removed',
       });
 
       //verify after sync
-      await settings.metaData.sync();
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.sync();
+      await settings.dataSources.metaData.verifyRow({
         index: isPg(context) ? 21 : 16,
         model: 'Table1',
         state: 'No change identified',
@@ -119,16 +119,16 @@ test.describe('Meta sync', () => {
       await dbExec(`ALTER TABLE table1 ADD COLUMN newCol INT`);
     }
 
-    await settings.metaData.clickReload();
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.clickReload();
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 21 : 16,
       model: `Table1`,
       state: 'New column(newCol)',
     });
 
     //verify after sync
-    await settings.metaData.sync();
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.sync();
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 21 : 16,
       model: 'Table1',
       state: 'No change identified',
@@ -143,16 +143,16 @@ test.describe('Meta sync', () => {
       await dbExec(`ALTER TABLE table1 RENAME COLUMN newCol TO newColName`);
     }
 
-    await settings.metaData.clickReload();
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.clickReload();
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 21 : 16,
       model: `Table1`,
       state: 'New column(newColName), Column removed(newCol)',
     });
 
     //verify after sync
-    await settings.metaData.sync();
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.sync();
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 21 : 16,
       model: 'Table1',
       state: 'No change identified',
@@ -162,16 +162,16 @@ test.describe('Meta sync', () => {
     // todo: Add for sqlite
     if (!isSqlite(context)) {
       await dbExec(`ALTER TABLE table1 DROP COLUMN newColName`);
-      await settings.metaData.clickReload();
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.clickReload();
+      await settings.dataSources.metaData.verifyRow({
         index: isPg(context) ? 21 : 16,
         model: `Table1`,
         state: 'Column removed(newColName)',
       });
 
       //verify after sync
-      await settings.metaData.sync();
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.sync();
+      await settings.dataSources.metaData.verifyRow({
         index: isPg(context) ? 21 : 16,
         model: 'Table1',
         state: 'No change identified',
@@ -181,51 +181,51 @@ test.describe('Meta sync', () => {
     // Delete table
     await dbExec(`DROP TABLE table1`);
     await dbExec(`DROP TABLE table2`);
-    await settings.metaData.clickReload();
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.clickReload();
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 21 : 16,
       model: `table1`,
       state: 'Table removed',
     });
-    await settings.metaData.verifyRow({
+    await settings.dataSources.metaData.verifyRow({
       index: isPg(context) ? 22 : 17,
       model: `table2`,
       state: 'Table removed',
     });
 
     //verify after sync
-    await settings.metaData.sync();
+    await settings.dataSources.metaData.sync();
 
     if (isSqlite(context)) {
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.verifyRow({
         index: 16,
         model: 'CustomerList',
         state: 'No change identified',
       });
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.verifyRow({
         index: 17,
         model: 'FilmList',
         state: 'No change identified',
       });
     }
     if (isPg(context)) {
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.verifyRow({
         index: 21,
         model: 'ActorInfo',
         state: 'No change identified',
       });
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.verifyRow({
         index: 22,
         model: 'CustomerList',
         state: 'No change identified',
       });
     } else if (isMysql(context)) {
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.verifyRow({
         index: 16,
         model: 'ActorInfo',
         state: 'No change identified',
       });
-      await settings.metaData.verifyRow({
+      await settings.dataSources.metaData.verifyRow({
         index: 17,
         model: 'CustomerList',
         state: 'No change identified',
@@ -242,10 +242,11 @@ test.describe('Meta sync', () => {
     );
 
     await dashboard.gotoSettings();
-    await settings.selectTab({ tab: SettingTab.ProjectMetadata });
+    await settings.selectTab({ tab: SettingTab.DataSources });
+    await settings.dataSources.openMetaSync();
 
-    await settings.metaData.clickReload();
-    await settings.metaData.sync();
+    await settings.dataSources.metaData.clickReload();
+    await settings.dataSources.metaData.sync();
     await settings.close();
 
     await dashboard.treeView.openTable({ title: 'Table1' });

tests/playwright/tests/rolesCreate.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
 import { DashboardPage } from '../pages/Dashboard';
 import setup from '../setup';
-import { SettingsPage, SettingsSubTab, SettingTab } from '../pages/Dashboard/Settings';
+import { SettingsPage, SettingTab } from '../pages/Dashboard/Settings';
 import { SignupPage } from '../pages/SignupPage';
 import { ProjectsPage } from '../pages/ProjectsPage';
 
@@ -46,16 +46,16 @@ test.describe('User roles', () => {
     // configure access control
     await dashboard.gotoSettings();
     await settings.selectTab({
-      tab: SettingTab.ProjectMetadata,
-      subTab: SettingsSubTab.ACL,
+      tab: SettingTab.DataSources,
     });
-    await settings.acl.toggle({ table: 'Language', role: 'editor' });
-    await settings.acl.toggle({ table: 'Language', role: 'commenter' });
-    await settings.acl.toggle({ table: 'Language', role: 'viewer' });
-    await settings.acl.toggle({ table: 'CustomerList', role: 'editor' });
-    await settings.acl.toggle({ table: 'CustomerList', role: 'commenter' });
-    await settings.acl.toggle({ table: 'CustomerList', role: 'viewer' });
-    await settings.acl.save();
+    await settings.dataSources.openAcl();
+    await settings.dataSources.acl.toggle({ table: 'Language', role: 'editor' });
+    await settings.dataSources.acl.toggle({ table: 'Language', role: 'commenter' });
+    await settings.dataSources.acl.toggle({ table: 'Language', role: 'viewer' });
+    await settings.dataSources.acl.toggle({ table: 'CustomerList', role: 'editor' });
+    await settings.dataSources.acl.toggle({ table: 'CustomerList', role: 'commenter' });
+    await settings.dataSources.acl.toggle({ table: 'CustomerList', role: 'viewer' });
+    await settings.dataSources.acl.save();
     await settings.close();
 
     // Role test

tests/playwright/tests/rolesPreview.spec.ts

@@ -2,7 +2,7 @@ import { test } from '@playwright/test';
 import { DashboardPage } from '../pages/Dashboard';
 import setup from '../setup';
 import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
-import { SettingsPage, SettingsSubTab, SettingTab } from '../pages/Dashboard/Settings';
+import { SettingsPage, SettingTab } from '../pages/Dashboard/Settings';
 
 const roles = ['Editor', 'Commenter', 'Viewer'];
 
@@ -30,16 +30,16 @@ test.describe('Preview Mode', () => {
     // configure access control
     await dashboard.gotoSettings();
     await settings.selectTab({
-      tab: SettingTab.ProjectMetadata,
-      subTab: SettingsSubTab.ACL,
+      tab: SettingTab.DataSources,
     });
-    await settings.acl.toggle({ table: 'Language', role: 'editor' });
-    await settings.acl.toggle({ table: 'Language', role: 'commenter' });
-    await settings.acl.toggle({ table: 'Language', role: 'viewer' });
-    await settings.acl.toggle({ table: 'CustomerList', role: 'editor' });
-    await settings.acl.toggle({ table: 'CustomerList', role: 'commenter' });
-    await settings.acl.toggle({ table: 'CustomerList', role: 'viewer' });
-    await settings.acl.save();
+    await settings.dataSources.openAcl();
+    await settings.dataSources.acl.toggle({ table: 'Language', role: 'editor' });
+    await settings.dataSources.acl.toggle({ table: 'Language', role: 'commenter' });
+    await settings.dataSources.acl.toggle({ table: 'Language', role: 'viewer' });
+    await settings.dataSources.acl.toggle({ table: 'CustomerList', role: 'editor' });
+    await settings.dataSources.acl.toggle({ table: 'CustomerList', role: 'commenter' });
+    await settings.dataSources.acl.toggle({ table: 'CustomerList', role: 'viewer' });
+    await settings.dataSources.acl.save();
     await settings.close();
 
     // Role test