Merge pull request #5537 from nocodb/test/sync-hub

test: sync optimisation changes

tests/playwright/pages/Account/AppStore.ts

@@ -11,13 +11,11 @@ export class AccountAppStorePage extends BasePage {
   }
 
   async goto() {
-    await this.rootPage.goto('/#/account/apps', { waitUntil: 'networkidle' });
+    await this.waitForResponse({
-  }
+      uiAction: () => this.rootPage.goto('/#/account/apps', { waitUntil: 'networkidle' }),
-
+      httpMethodsToMatch: ['GET'],
-  async waitUntilContentLoads() {
+      requestUrlPathToMatch: 'api/v1/db/meta/plugins',
-    return this.rootPage.waitForResponse(
+    });
-      resp => resp.url().includes('api/v1/db/meta/plugins') && resp.status() === 200
-    );
   }
 
   get() {

tests/playwright/pages/Account/ChangePassword.ts

@@ -25,6 +25,14 @@ export class ChangePasswordPage extends BasePage {
     const newPassword = this.get().locator('input[data-testid="nc-user-settings-form__new-password"]');
     const confirmPassword = this.get().locator('input[data-testid="nc-user-settings-form__new-password-repeat"]');
 
+    await currentPassword.waitFor({ state: 'visible' });
+    await newPassword.waitFor({ state: 'visible' });
+    await confirmPassword.waitFor({ state: 'visible' });
+
+    // in-spite of the waitFor above, the input fields are not always ready to be filled
+    // this is a workaround
+    await this.rootPage.waitForTimeout(500);
+
     await currentPassword.fill(oldPass);
     await newPassword.fill(newPass);
     await confirmPassword.fill(repeatPass);

tests/playwright/pages/Account/Settings.ts

@@ -11,11 +11,12 @@ export class AccountSettingsPage extends BasePage {
   }
 
   async goto() {
-    await this.rootPage.goto('/#/account/users/settings', { waitUntil: 'networkidle' });
+    // await this.rootPage.goto('/#/account/users/settings', { waitUntil: 'networkidle' });
-  }
+    await this.waitForResponse({
-
+      uiAction: () => this.rootPage.goto('/#/account/users/settings', { waitUntil: 'networkidle' }),
-  async waitUntilContentLoads() {
+      httpMethodsToMatch: ['GET'],
-    return this.rootPage.waitForResponse(resp => resp.url().includes('api/v1/app-settings') && resp.status() === 200);
+      requestUrlPathToMatch: `api/v1/app-settings`,
+    });
   }
 
   get() {

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

@@ -252,7 +252,7 @@ export class ColumnPageObject extends BasePage {
   async delete({ title }: { title: string }) {
     await this.getColumnHeader(title).locator('div.ant-dropdown-trigger').locator('.nc-ui-dt-dropdown').click();
     // await this.rootPage.locator('li[role="menuitem"]:has-text("Delete")').waitFor();
-    await this.rootPage.locator('li[role="menuitem"]:has-text("Delete")').click();
+    await this.rootPage.locator('li[role="menuitem"]:has-text("Delete"):visible').click();
 
     await this.rootPage.locator('button:has-text("Delete")').click();
 

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

@@ -72,10 +72,12 @@ export class GridPage extends BasePage {
     networkValidation?: boolean;
   } = {}) {
     const rowValue = value ?? `Row ${index}`;
+    // wait for render to complete before count
+    if (index !== 0) await this.get().locator('.nc-grid-row').nth(0).waitFor({ state: 'attached' });
     const rowCount = await this.get().locator('.nc-grid-row').count();
     await this.get().locator('.nc-grid-add-new-cell').click();
 
-    await expect(this.get().locator('.nc-grid-row')).toHaveCount(rowCount + 1);
+    await expect(await this.get().locator('.nc-grid-row')).toHaveCount(rowCount + 1);
 
     await this._fillRow({ index, columnHeader, value: rowValue });
 

tests/playwright/pages/Dashboard/TreeView.ts

@@ -82,7 +82,7 @@ export class TreeViewPage extends BasePage {
       await this.dashboard.waitForTabRender({ title, mode });
     } else {
       await this.get().locator(`.nc-project-tree-tbl-${title}`).click();
-      await this.rootPage.waitForTimeout(3000);
+      await this.rootPage.waitForTimeout(1000);
     }
   }
 

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

@@ -46,6 +46,7 @@ export class ViewSidebarPage extends BasePage {
 
   private async createView({ title, locator }: { title: string; locator: Locator }) {
     await locator.click();
+    await this.rootPage.locator('input[id="form_item_title"]:visible').waitFor({ state: 'visible' });
     await this.rootPage.locator('input[id="form_item_title"]:visible').fill(title);
     const submitAction = () =>
       this.rootPage.locator('.ant-modal-content').locator('button:has-text("Submit"):visible').click();

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

@@ -68,25 +68,16 @@ export class WebhookFormPage extends BasePage {
     await this.get().locator(`.nc-check-box-hook-condition`).click();
     const modal = await this.get().locator(`.menu-filter-dropdown`).last();
 
-    // todo: All delays are for api calls that filter does, which rerenders
-    await this.rootPage.waitForTimeout(1000);
-
     await modal.locator(`button:has-text("Add Filter")`).click();
 
-    await this.rootPage.waitForTimeout(1500);
-
     await modal.locator('.nc-filter-field-select').click();
     const modalField = await this.dashboard.rootPage.locator('.nc-dropdown-toolbar-field-list:visible');
     await modalField.locator(`.ant-select-item:has-text("${column}")`).click();
 
-    await this.rootPage.waitForTimeout(1500);
-
     await modal.locator('.nc-filter-operation-select').click();
     const modalOp = await this.dashboard.rootPage.locator('.nc-dropdown-filter-comp-op:visible');
     await modalOp.locator(`.ant-select-item:has-text("${operator}")`).click();
 
-    await this.rootPage.waitForTimeout(1500);
-
     if (operator != 'is null' && operator != 'is not null') {
       await modal.locator('.nc-filter-value-select > input').fill(value);
     }

tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts

@@ -56,7 +56,7 @@ export class ToolbarFilterPage extends BasePage {
   }) {
     if (!openModal) await this.get().locator(`button:has-text("Add Filter")`).first().click();
 
-    const selectedField = await this.rootPage.locator('.nc-filter-field-select').textContent();
+    const selectedField = await getTextExcludeIconText(await this.rootPage.locator('.nc-filter-field-select'));
     if (selectedField !== title) {
       await this.rootPage.locator('.nc-filter-field-select').last().click();
       await this.rootPage
@@ -65,7 +65,7 @@ export class ToolbarFilterPage extends BasePage {
         .click();
     }
 
-    const selectedOpType = await this.rootPage.locator('.nc-filter-operation-select').textContent();
+    const selectedOpType = await getTextExcludeIconText(await this.rootPage.locator('.nc-filter-operation-select'));
     if (selectedOpType !== operation) {
       await this.rootPage.locator('.nc-filter-operation-select').click();
       // first() : filter list has >, >=
@@ -78,7 +78,9 @@ export class ToolbarFilterPage extends BasePage {
 
     // subtype for date
     if (dataType === UITypes.Date && subOperation) {
-      const selectedSubType = await this.rootPage.locator('.nc-filter-sub_operation-select').textContent();
+      const selectedSubType = await getTextExcludeIconText(
+        await this.rootPage.locator('.nc-filter-sub_operation-select')
+      );
       if (selectedSubType !== subOperation) {
         await this.rootPage.locator('.nc-filter-sub_operation-select').click();
         // first() : filter list has >, >=
@@ -197,6 +199,18 @@ export class ToolbarFilterPage extends BasePage {
     await this.toolbar.clickFilter();
   }
 
+  async remove({ networkValidation = true }: { networkValidation?: boolean } = {}) {
+    if (networkValidation) {
+      await this.waitForResponse({
+        uiAction: () => this.get().locator('.nc-filter-item-remove-btn').click(),
+        httpMethodsToMatch: ['DELETE'],
+        requestUrlPathToMatch: '/api/v1/db/meta/filters/',
+      });
+    } else {
+      await this.get().locator('.nc-filter-item-remove-btn').click();
+    }
+  }
+
   async columnOperatorList(param: { columnTitle: string }) {
     await this.get().locator(`button:has-text("Add Filter")`).first().click();
 

tests/playwright/pages/Dashboard/index.ts

@@ -212,4 +212,15 @@ export class DashboardPage extends BasePage {
   async waitForLoaderToDisappear() {
     await this.rootPage.locator('[data-testid="nc-loading"]').waitFor({ state: 'hidden' });
   }
+
+  async closeAllTabs() {
+    await this.tabBar.locator(`.ant-tabs-tab`).waitFor({ state: 'visible' });
+    const tab = await this.tabBar.locator(`.ant-tabs-tab`);
+    const tabCount = await tab.count();
+
+    for (let i = 0; i < tabCount; i++) {
+      await tab.nth(i).locator('button.ant-tabs-tab-remove').click();
+      await tab.nth(i).waitFor({ state: 'detached' });
+    }
+  }
 }

tests/playwright/playwright.config.ts

@@ -11,7 +11,7 @@ require('dotenv').config();
  * See https://playwright.dev/docs/test-configuration.
  */
 const config: PlaywrightTestConfig = {
-  testDir: process.env.PW_QUICK_TEST ? './quickTests' : './tests',
+  testDir: process.env.PW_QUICK_TEST ? './quickTests' : './tests/db',
   /* Maximum time one test can run for. */
   timeout: process.env.CI ? 140 * 1000 : 100 * 1000,
   expect: {

tests/playwright/quickTests/quickTests.spec.ts

@@ -4,6 +4,7 @@ import { LoginPage } from '../pages/LoginPage';
 import { ProjectsPage } from '../pages/ProjectsPage';
 import { quickVerify } from './commonTest';
 import { NcContext } from '../setup';
+import { getDefaultPwd } from '../tests/utils/general';
 
 test.describe('Quick tests', () => {
   let dashboard: DashboardPage;
@@ -12,7 +13,7 @@ test.describe('Quick tests', () => {
     const loginPage = new LoginPage(page);
     await loginPage.goto();
     await loginPage.fillEmail({ email: 'user@nocodb.com', withoutPrefix: true });
-    await loginPage.fillPassword('Password123.');
+    await loginPage.fillPassword(getDefaultPwd());
     await loginPage.submit();
 
     const projectsPage = new ProjectsPage(page);

tests/playwright/scripts/docker-compose-playwright-pg.yml

@@ -1,4 +1,4 @@
-version: "2.1"
+version: "2.2"
 
 services:
     pg147:

tests/playwright/tests/db/01-webhook.spec.ts

@@ -1,11 +1,11 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import makeServer from '../setup/server';
+import makeServer from '../../setup/server';
-import { WebhookFormPage } from '../pages/Dashboard/WebhookForm';
+import { WebhookFormPage } from '../../pages/Dashboard/WebhookForm';
-import { isSubset } from './utils/general';
+import { isSubset } from '../utils/general';
 import { Api, UITypes } from 'nocodb-sdk';
-import { isMysql, isPg, isSqlite } from '../setup/db';
+import { isMysql, isPg, isSqlite } from '../../setup/db';
 
 const hookPath = 'http://localhost:9090/hook';
 let api: Api<any>;
@@ -427,8 +427,8 @@ test.describe.serial('Webhook', () => {
     async function verifyBulkOperationTrigger(rsp, type) {
       for (let i = 0; i < rsp.length; i++) {
         expect(rsp[i].type).toBe(type);
-        expect(rsp[i].data.table_name).toBe('numberBased');
+        expect(rsp[i].data.table_name).toBe('Test');
-        expect(rsp[i].data.view_name).toBe('numberBased');
+        expect(rsp[i].data.view_name).toBe('Test');
 
         // only for insert, rows inserted will not be returned in response. just count
         if (type === 'records.after.bulkInsert') {
@@ -476,8 +476,8 @@ test.describe.serial('Webhook', () => {
     try {
       project = await api.project.read(context.project.id);
       table = await api.base.tableCreate(context.project.id, project.bases?.[0].id, {
-        table_name: 'numberBased',
+        table_name: 'Test',
-        title: 'numberBased',
+        title: 'Test',
         columns: columns,
       });
     } catch (e) {
@@ -485,7 +485,7 @@ test.describe.serial('Webhook', () => {
     }
 
     await page.reload();
-    await dashboard.treeView.openTable({ title: 'numberBased' });
+    await dashboard.treeView.openTable({ title: 'Test' });
 
     // create after insert webhook
     await webhook.create({
@@ -508,7 +508,6 @@ test.describe.serial('Webhook', () => {
     }));
     await api.dbTableRow.bulkCreate('noco', context.project.id, table.id, rowAttributesForInsert);
     await page.reload();
-    // 50 records inserted, we expect 2 webhook responses
     let rsp = await getWebhookResponses({ request, count: 1 });
     await verifyBulkOperationTrigger(rsp, 'records.after.bulkInsert');
 

tests/playwright/tests/db/accountLicense.spec.ts

@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../pages/Account';
+import { AccountPage } from '../../pages/Account';
-import setup from '../setup';
+import setup from '../../setup';
-import { AccountLicensePage } from '../pages/Account/License';
+import { AccountLicensePage } from '../../pages/Account/License';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
 
 test.describe('Enterprise License', () => {
   // @ts-ignore
@@ -11,7 +11,7 @@ test.describe('Enterprise License', () => {
   let accountLicensePage: AccountLicensePage, accountPage: AccountPage, context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     accountPage = new AccountPage(page);
     accountLicensePage = new AccountLicensePage(accountPage);
     dashboard = new DashboardPage(page, context.project);

tests/playwright/tests/db/accountTokenManagement.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../pages/Account';
+import { AccountPage } from '../../pages/Account';
-import { AccountTokenPage } from '../pages/Account/Token';
+import { AccountTokenPage } from '../../pages/Account/Token';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('User roles', () => {
   let accountTokenPage: AccountTokenPage;
@@ -10,7 +10,7 @@ test.describe('User roles', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     accountPage = new AccountPage(page);
     accountTokenPage = new AccountTokenPage(accountPage);
   });

tests/playwright/tests/db/accountUserManagement.spec.ts

@@ -1,9 +1,10 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../pages/Account';
+import { AccountPage } from '../../pages/Account';
-import { AccountUsersPage } from '../pages/Account/Users';
+import { AccountUsersPage } from '../../pages/Account/Users';
-import { ProjectsPage } from '../pages/ProjectsPage';
+import { ProjectsPage } from '../../pages/ProjectsPage';
-import { SignupPage } from '../pages/SignupPage';
+import { SignupPage } from '../../pages/SignupPage';
-import setup from '../setup';
+import setup from '../../setup';
+import { getDefaultPwd } from '../utils/general';
 
 const roleDb = [
   { email: 'creator@nocodb.com', role: 'Organization Level Creator', url: '' },
@@ -19,7 +20,7 @@ test.describe('User roles', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     accountPage = new AccountPage(page);
     accountUsersPage = new AccountUsersPage(accountPage);
 
@@ -68,7 +69,7 @@ test.describe('User roles', () => {
 
     await signupPage.signUp({
       email: roleDb[roleIdx].email,
-      password: 'Password123.',
+      password: getDefaultPwd(),
     });
 
     await projectsPage.checkProjectCreateButton({

tests/playwright/tests/db/accountUserSettings.spec.ts

@@ -1,8 +1,9 @@
 import { test } from '@playwright/test';
-import { AccountPage } from '../pages/Account';
+import { AccountPage } from '../../pages/Account';
-import { AccountSettingsPage } from '../pages/Account/Settings';
+import { AccountSettingsPage } from '../../pages/Account/Settings';
-import { SignupPage } from '../pages/SignupPage';
+import { SignupPage } from '../../pages/SignupPage';
-import setup from '../setup';
+import setup from '../../setup';
+import { getDefaultPwd } from '../utils/general';
 
 test.describe('App settings', () => {
   let accountSettingsPage: AccountSettingsPage;
@@ -11,7 +12,7 @@ test.describe('App settings', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     accountPage = new AccountPage(page);
     accountSettingsPage = accountPage.settings;
   });
@@ -24,8 +25,6 @@ test.describe('App settings', () => {
     // todo: remove after route navigation issue resolved
     await accountSettingsPage.rootPage.reload({ waitUntil: 'networkidle' });
 
-    await accountSettingsPage.waitUntilContentLoads();
-
     // enable invite only signup
     if (!(await accountSettingsPage.getInviteOnlyCheckboxValue())) {
       await accountSettingsPage.toggleInviteOnlyCheckbox();
@@ -39,7 +38,7 @@ test.describe('App settings', () => {
 
     await signupPage.signUp({
       email: 'test-user-1@nocodb.com',
-      password: 'Password123.',
+      password: getDefaultPwd(),
       expectedError: 'Not allowed to signup, contact super admin.',
     });
 
@@ -47,8 +46,6 @@ test.describe('App settings', () => {
 
     await accountSettingsPage.goto();
 
-    await accountSettingsPage.waitUntilContentLoads();
-
     await accountSettingsPage.checkInviteOnlySignupCheckbox(true);
     await accountSettingsPage.toggleInviteOnlyCheckbox();
     await accountSettingsPage.checkInviteOnlySignupCheckbox(false);
@@ -59,7 +56,7 @@ test.describe('App settings', () => {
 
     await signupPage.signUp({
       email: 'test-user-1@nocodb.com',
-      password: 'Password123.',
+      password: getDefaultPwd(),
     });
   });
 });

tests/playwright/tests/db/authChangePassword.spec.ts

@@ -1,11 +1,12 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { LoginPage } from '../pages/LoginPage';
+import { LoginPage } from '../../pages/LoginPage';
-import { SettingsPage, SettingTab } from '../pages/Dashboard/Settings';
+import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import { SignupPage } from '../pages/SignupPage';
+import { SignupPage } from '../../pages/SignupPage';
-import { ProjectsPage } from '../pages/ProjectsPage';
+import { ProjectsPage } from '../../pages/ProjectsPage';
-import { AccountPage } from '../pages/Account';
+import { AccountPage } from '../../pages/Account';
+import { getDefaultPwd } from '../utils/general';
 
 test.describe('Auth', () => {
   let context: any;
@@ -16,7 +17,7 @@ test.describe('Auth', () => {
   let accountPage: AccountPage;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     signupPage = new SignupPage(page);
     projectsPage = new ProjectsPage(page);
@@ -41,7 +42,7 @@ test.describe('Auth', () => {
     await dashboard.rootPage.goto(url);
     await signupPage.signUp({
       email: 'user-1@nocodb.com',
-      password: 'Password123.',
+      password: getDefaultPwd(),
     });
 
     await projectsPage.openPasswordChangeModal();
@@ -56,7 +57,7 @@ test.describe('Auth', () => {
 
     // New pass and repeat pass mismatch
     await accountPage.users.changePasswordPage.changePassword({
-      oldPass: 'Password123.',
+      oldPass: getDefaultPwd(),
       newPass: '123456789',
       repeatPass: '987654321',
       networkValidation: false,
@@ -65,7 +66,7 @@ test.describe('Auth', () => {
 
     // All good
     await accountPage.users.changePasswordPage.changePassword({
-      oldPass: 'Password123.',
+      oldPass: getDefaultPwd(),
       newPass: 'NewPasswordConfigured',
       repeatPass: 'NewPasswordConfigured',
       networkValidation: true,

tests/playwright/tests/db/baseShare.spec.ts

@@ -1,9 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { LoginPage } from '../pages/LoginPage';
+import { LoginPage } from '../../pages/LoginPage';
-import { ProjectsPage } from '../pages/ProjectsPage';
+import { ProjectsPage } from '../../pages/ProjectsPage';
+import { getDefaultPwd } from '../utils/general';
 
 test.describe('Shared base', () => {
   let dashboard: DashboardPage;
@@ -47,7 +48,7 @@ test.describe('Shared base', () => {
   }
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     projectPage = new ProjectsPage(page);
     toolbar = dashboard.grid.toolbar;
@@ -77,7 +78,7 @@ test.describe('Shared base', () => {
 
     await loginPage.signIn({
       email: 'user@nocodb.com',
-      password: 'Password123.',
+      password: getDefaultPwd(),
       withoutPrefix: true,
     });
 

tests/playwright/tests/db/cellSelection.spec.ts

@@ -1,109 +1,98 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Verify cell selection', () => {
   let dashboard: DashboardPage, grid: GridPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     grid = dashboard.grid;
+    await dashboard.closeAllTabs();
   });
 
-  test('#1 when range is selected, it has correct number of selected cells', async () => {
+  test('Suite-1', async () => {
+    // #1 when range is selected, it has correct number of selected cells
     await dashboard.treeView.openTable({ title: 'Customer' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'FirstName' },
       end: { index: 2, columnHeader: 'Email' },
     });
-
     expect(await grid.selectedCount()).toBe(9);
-  });
+    await dashboard.closeAllTabs();
 
-  test('#2 when copied with clipboard, it copies correct text', async () => {
+    // #2 when copied with clipboard, it copies correct text
     await dashboard.treeView.openTable({ title: 'Customer' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'FirstName' },
       end: { index: 1, columnHeader: 'LastName' },
     });
-
     expect(await grid.copyWithKeyboard()).toBe('MARY \t SMITH\n' + ' PATRICIA \t JOHNSON\n');
-  });
+    await dashboard.closeAllTabs();
 
-  test('#3 when copied with mouse, it copies correct text', async () => {
+    // #3 when copied with mouse, it copies correct text
     await dashboard.treeView.openTable({ title: 'Customer' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'FirstName' },
       end: { index: 1, columnHeader: 'LastName' },
     });
-
     expect(await grid.copyWithMouse({ index: 0, columnHeader: 'FirstName' })).toBe(
       'MARY \t SMITH\n' + ' PATRICIA \t JOHNSON\n'
     );
+    await dashboard.closeAllTabs();
   });
 
-  // FIXME: this is edge case, better be moved to integration tests
+  test('Suite-2', async ({ page }) => {
-  test('#4 when cell inside selection range is clicked, it clears previous selection', async () => {
+    // #4 when cell inside selection range is clicked, it clears previous selection
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
       end: { index: 2, columnHeader: 'City List' },
     });
-
     expect(await grid.selectedCount()).toBe(9);
-
     await grid.cell.get({ index: 0, columnHeader: 'Country' }).click();
-
     expect(await grid.selectedCount()).toBe(1);
     expect(await grid.cell.verifyCellActiveSelected({ index: 0, columnHeader: 'Country' }));
-  });
+    await dashboard.closeAllTabs();
 
-  // FIXME: this is edge case, better be moved to integration tests
+    // #5 when cell outside selection range is clicked, it clears previous selection
-  test('#5 when cell outside selection range is clicked, it clears previous selection', async () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
       end: { index: 2, columnHeader: 'City List' },
     });
-
     expect(await grid.selectedCount()).toBe(9);
-
     await grid.cell.get({ index: 5, columnHeader: 'Country' }).click();
-
     expect(await grid.selectedCount()).toBe(1);
     expect(await grid.cell.verifyCellActiveSelected({ index: 5, columnHeader: 'Country' }));
-  });
+    await dashboard.closeAllTabs();
 
-  // FIXME: this is edge case, better be moved to integration tests
+    // #6 when selection ends on locked field, it still works as expected
-  test('#6 when selection ends on locked field, it still works as expected', async () => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await dashboard.grid.toolbar.fields.toggleShowSystemFields();
     await grid.selectRange({
       start: { index: 2, columnHeader: 'City List' },
       end: { index: 0, columnHeader: 'Country' },
     });
-
     expect(await grid.selectedCount()).toBe(12);
-
     await grid.cell.get({ index: 1, columnHeader: 'Country' }).click();
-
     expect(await grid.selectedCount()).toBe(1);
     expect(await grid.cell.verifyCellActiveSelected({ index: 1, columnHeader: 'Country' }));
-  });
+    await dashboard.grid.toolbar.fields.toggleShowSystemFields();
+    await dashboard.closeAllTabs();
 
-  // FIXME: this is edge case, better be moved to integration tests
+    // #7 when navigated with keyboard, only active cell is affected
-  test('#7 when navigated with keyboard, only active cell is affected', async ({ page }) => {
     await dashboard.treeView.openTable({ title: 'Country' });
     await grid.selectRange({
       start: { index: 0, columnHeader: 'Country' },
       end: { index: 2, columnHeader: 'City List' },
     });
-
     await page.keyboard.press('ArrowRight');
     expect(await grid.selectedCount()).toBe(1);
     expect(await grid.cell.verifyCellActiveSelected({ index: 0, columnHeader: 'LastUpdate' }));
+    await dashboard.closeAllTabs();
   });
 });

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

@@ -1,16 +1,16 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { SharedFormPage } from '../pages/SharedForm';
+import { SharedFormPage } from '../../pages/SharedForm';
-import setup from '../setup';
+import setup from '../../setup';
-import { AccountPage } from '../pages/Account';
+import { AccountPage } from '../../pages/Account';
-import { AccountLicensePage } from '../pages/Account/License';
+import { AccountLicensePage } from '../../pages/Account/License';
 
 test.describe('Attachment column', () => {
   let dashboard: DashboardPage;
   let accountLicensePage: AccountLicensePage, accountPage: AccountPage, context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     accountPage = new AccountPage(page);
     accountLicensePage = new AccountLicensePage(accountPage);

tests/playwright/tests/db/columnBarcode.spec.ts

@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
 
 interface ExpectedBarcodeData {
   referencedValue: string;
@@ -14,7 +14,7 @@ test.describe('Virtual Columns', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     grid = dashboard.grid;
   });

tests/playwright/tests/db/columnCheckbox.spec.ts

@@ -1,7 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
+import { UITypes } from 'nocodb-sdk';
+import { Api } from 'nocodb-sdk';
+let api: Api<any>;
 
 test.describe('Checkbox - cell, filter, sort', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
@@ -37,23 +40,61 @@ test.describe('Checkbox - cell, filter, sort', () => {
   }
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
+
+    api = new Api({
+      baseURL: `http://localhost:8080/`,
+      headers: {
+        'xc-auth': context.token,
+      },
+    });
+
+    const columns = [
+      {
+        column_name: 'Id',
+        title: 'Id',
+        uidt: UITypes.ID,
+      },
+      {
+        column_name: 'Title',
+        title: 'Title',
+        uidt: UITypes.SingleLineText,
+      },
+    ];
+
+    try {
+      const project = await api.project.read(context.project.id);
+      const table = await api.base.tableCreate(context.project.id, project.bases?.[0].id, {
+        table_name: 'Sheet-1',
+        title: 'Sheet-1',
+        columns: columns,
+      });
+
+      const rowAttributes = [];
+      for (let i = 0; i < 6; i++) {
+        const row = {
+          Id: i + 1,
+          Title: `1${String.fromCharCode(97 + i)}`,
+        };
+        rowAttributes.push(row);
+      }
+
+      await api.dbTableRow.bulkCreate('noco', context.project.id, table.id, rowAttributes);
+    } catch (e) {
+      console.error(e);
+    }
+
+    // page reload
+    await page.reload();
   });
 
   test('Checkbox', async () => {
     // close 'Team & Auth' tab
     await dashboard.closeTab({ title: 'Team & Auth' });
 
-    await dashboard.treeView.createTable({ title: 'Sheet1' });
+    await dashboard.treeView.openTable({ title: 'Sheet-1' });
-
-    await dashboard.grid.addNewRow({ index: 0, value: '1a' });
-    await dashboard.grid.addNewRow({ index: 1, value: '1b' });
-    await dashboard.grid.addNewRow({ index: 2, value: '1c' });
-    await dashboard.grid.addNewRow({ index: 3, value: '1d' });
-    await dashboard.grid.addNewRow({ index: 4, value: '1e' });
-    await dashboard.grid.addNewRow({ index: 5, value: '1f' });
 
     // Create Checkbox column
     await dashboard.grid.column.create({

tests/playwright/tests/db/columnDateTime.spec.ts

@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
 
 const dateTimeData = [
   {
@@ -61,7 +61,7 @@ test.describe('DateTime Column', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/columnDuration.spec.ts

@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
 
 // Storing one additional dummy value "10" at end of every input array
 // this will trigger update to previously committed data
@@ -45,7 +45,7 @@ test.describe.skip('Duration column', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/columnFormula.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup, { NcContext } from '../setup';
+import setup, { NcContext } from '../../setup';
-import { isPg, isSqlite } from '../setup/db';
+import { isPg, isSqlite } from '../../setup/db';
 
 // Add formula to be verified here & store expected results for 5 rows
 // Column data from City table (Sakila DB)
@@ -141,7 +141,7 @@ test.describe('Virtual Columns', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/columnGeoData.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
 
 test.describe('Geo Data column', () => {
   let dashboard: DashboardPage;
@@ -9,7 +9,7 @@ test.describe('Geo Data column', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     grid = dashboard.grid;
   });

tests/playwright/tests/db/columnLinkToAnotherRecord.spec.ts

@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('LTAR create & update', () => {
   let dashboard: DashboardPage;
@@ -10,7 +10,7 @@ test.describe('LTAR create & update', () => {
   test.setTimeout(150000);
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/columnLookupRollup.spec.ts

@@ -1,13 +1,13 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Virtual columns', () => {
   let dashboard: DashboardPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/columnMenuOperations.spec.ts

@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
 
 const columns = [
   {
@@ -43,7 +43,7 @@ test.describe('Column menu operations', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/columnMultiSelect.spec.ts

@@ -1,15 +1,15 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
 
 test.describe('Multi select', () => {
   let dashboard: DashboardPage, grid: GridPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     grid = dashboard.grid;
 

tests/playwright/tests/db/columnQrCode.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
 
 type ExpectedQrCodeData = {
   referencedValue: string;
@@ -14,7 +14,7 @@ test.describe('Virtual Columns', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     grid = dashboard.grid;
   });

tests/playwright/tests/db/columnRating.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
 
 test.describe('Rating - cell, filter, sort', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
@@ -37,7 +37,7 @@ test.describe('Rating - cell, filter, sort', () => {
   }
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
   });

tests/playwright/tests/db/columnRelationalExtendedTests.spec.ts

@@ -1,14 +1,14 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { isPg } from '../setup/db';
+import { isPg } from '../../setup/db';
 
 test.describe('Relational Columns', () => {
   let dashboard: DashboardPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/columnSingleSelect.spec.ts

@@ -1,15 +1,15 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
 
 test.describe('Single select', () => {
   let dashboard: DashboardPage, grid: GridPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     grid = dashboard.grid;
 

tests/playwright/tests/db/erd.spec.ts

@@ -5,13 +5,13 @@ import {
   pgSakilaSqlViews,
   pgSakilaTables,
   sqliteSakilaSqlViews,
-} from './utils/sakila';
+} from '../utils/sakila';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsSubTab, SettingTab } from '../pages/Dashboard/Settings';
+import { SettingsSubTab, SettingTab } from '../../pages/Dashboard/Settings';
-import setup from '../setup';
+import setup from '../../setup';
-import { isMysql, isPg, isSqlite } from '../setup/db';
+import { isMysql, isPg, isSqlite } from '../../setup/db';
-import { SettingsErdPage } from '../pages/Dashboard/Settings/Erd';
+import { SettingsErdPage } from '../../pages/Dashboard/Settings/Erd';
-import { defaultBaseName } from '../constants';
+import { defaultBaseName } from '../../constants';
 
 test.describe('Erd', () => {
   let dashboard: DashboardPage;
@@ -21,7 +21,7 @@ test.describe('Erd', () => {
   test.slow();
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
 
     if (isPg(context)) {

tests/playwright/tests/db/expandedFormUrl.spec.ts

@@ -1,16 +1,16 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { GalleryPage } from '../pages/Dashboard/Gallery';
+import { GalleryPage } from '../../pages/Dashboard/Gallery';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
 
 test.describe('Expanded form URL', () => {
   let dashboard: DashboardPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/filters.spec.ts

@@ -1,10 +1,10 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
 import { UITypes } from 'nocodb-sdk';
 import { Api } from 'nocodb-sdk';
-import { rowMixedValue } from '../setup/xcdb-records';
+import { rowMixedValue } from '../../setup/xcdb-records';
 import dayjs from 'dayjs';
 
 let dashboard: DashboardPage, toolbar: ToolbarPage;
@@ -89,7 +89,6 @@ async function verifyFilter(param: {
     return;
   }
 
-  await toolbar.clickFilter();
   await toolbar.filter.add({
     title: param.column,
     operation: param.opType,
@@ -97,16 +96,13 @@ async function verifyFilter(param: {
     value: param.value,
     locallySaved: false,
     dataType: param?.dataType,
+    openModal: true,
   });
-  await toolbar.clickFilter();
 
   // verify filtered rows
   await validateRowArray({
     rowCount: param.result.rowCount,
   });
-
-  // Reset filter
-  await toolbar.filter.reset();
 }
 
 // Number based filters
@@ -206,6 +202,8 @@ test.describe('Filter Tests: Numerical', () => {
       },
     ];
 
+    await toolbar.clickFilter();
+    await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
         column: dataType,
@@ -218,7 +216,7 @@ test.describe('Filter Tests: Numerical', () => {
   }
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
 
@@ -305,6 +303,8 @@ test.describe('Filter Tests: Numerical', () => {
     } catch (e) {
       console.error(e);
     }
+
+    await page.reload();
   });
 
   test('Filter: Number', async () => {
@@ -327,7 +327,7 @@ test.describe('Filter Tests: Numerical', () => {
     await numBasedFilterTest('Rating', '3', '2');
   });
 
-  test('Filter: Duration', async () => {
+  test.skip('Filter: Duration', async () => {
     await numBasedFilterTest('Duration', '00:01', '01:03');
   });
 
@@ -405,6 +405,8 @@ test.describe('Filter Tests: Text based', () => {
       },
     ];
 
+    await toolbar.clickFilter();
+    await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
         column: dataType,
@@ -416,7 +418,7 @@ test.describe('Filter Tests: Text based', () => {
   }
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
 
@@ -485,6 +487,7 @@ test.describe('Filter Tests: Text based', () => {
     } catch (e) {
       console.error(e);
     }
+    await page.reload();
   });
 
   test('Filter: Single Line Text', async () => {
@@ -577,6 +580,8 @@ test.describe('Filter Tests: Select based', () => {
       },
     ];
 
+    await toolbar.clickFilter();
+    await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
         column: dataType,
@@ -587,8 +592,9 @@ test.describe('Filter Tests: Select based', () => {
       });
     }
   }
+
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
 
@@ -641,14 +647,16 @@ test.describe('Filter Tests: Select based', () => {
     } catch (e) {
       console.error(e);
     }
+    await page.reload();
   });
 
   test('Filter: Single Select', async () => {
-    await selectBasedFilterTest('SingleSelect', 'jan', 'jan,feb,mar', '');
+    // hack. jan inserted twice as in filter, toggling operation is not clearing value
+    await selectBasedFilterTest('SingleSelect', 'jan', 'jan,jan,feb,mar', '');
   });
 
   test('Filter: Multi Select', async () => {
-    await selectBasedFilterTest('MultiSelect', '', 'jan,feb,mar', 'jan,feb,mar');
+    await selectBasedFilterTest('MultiSelect', '', 'jan,jan,feb,mar', 'jan,feb,mar');
   });
 });
 
@@ -933,7 +941,7 @@ test.describe('Filter Tests: Date based', () => {
   }
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
 
@@ -978,6 +986,7 @@ test.describe('Filter Tests: Date based', () => {
     } catch (e) {
       console.error(e);
     }
+    await page.reload();
   });
 
   test('Date : filters-1', async () => {
@@ -1018,6 +1027,8 @@ test.describe('Filter Tests: AddOn', () => {
       },
     ];
 
+    await toolbar.clickFilter();
+    await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
         column: dataType,
@@ -1029,7 +1040,7 @@ test.describe('Filter Tests: AddOn', () => {
     }
   }
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
 
@@ -1080,6 +1091,7 @@ test.describe('Filter Tests: AddOn', () => {
     } catch (e) {
       console.error(e);
     }
+    await page.reload();
   });
 
   test('Filter: Checkbox', async () => {
@@ -1108,6 +1120,8 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
       { op: 'is not blank', value: null, rowCount: 109 },
     ];
 
+    await toolbar.clickFilter();
+    await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
         column: 'City List',
@@ -1144,6 +1158,8 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
       { op: 'is not blank', value: null, rowCount: 599 },
     ];
 
+    await toolbar.clickFilter();
+    await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
         column: 'Lookup',
@@ -1181,6 +1197,8 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
       { op: 'is not blank', value: null, rowCount: 598 },
     ];
 
+    await toolbar.clickFilter();
+    await toolbar.filter.clickAddFilter();
     for (let i = 0; i < filterList.length; i++) {
       await verifyFilter({
         column: 'Lookup',
@@ -1193,7 +1211,7 @@ test.describe('Filter Tests: Link to another record, Lookup, Rollup', () => {
   }
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
 
@@ -1237,7 +1255,7 @@ test.describe('Filter Tests: Toggle button', () => {
    */
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
   });

tests/playwright/tests/db/findRowByScanner.spec.ts

@@ -1,8 +1,8 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { FormPage } from '../pages/Dashboard/Form';
+import { FormPage } from '../../pages/Dashboard/Form';
-import setup from '../setup';
+import setup from '../../setup';
 
 // Skip for now as it is not working in CI atm
 test.describe.skip('Find row by scanner', () => {

tests/playwright/tests/db/import.spec.ts

@@ -1,9 +1,9 @@
 import { test } from '@playwright/test';
-import { airtableApiBase, airtableApiKey } from '../constants';
+import { airtableApiBase, airtableApiKey } from '../../constants';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { quickVerify } from '../quickTests/commonTest';
+import { quickVerify } from '../../quickTests/commonTest';
-import setup from '../setup';
+import setup from '../../setup';
-import { isPg, isSqlite } from '../setup/db';
+import { isPg, isSqlite } from '../../setup/db';
 
 test.describe('Import', () => {
   let dashboard: DashboardPage;

tests/playwright/tests/db/keyboardShortcuts.spec.ts

@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../setup';
+import setup from '../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
 
 let api: Api<any>;
@@ -11,7 +11,7 @@ test.describe('Verify shortcuts', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     grid = dashboard.grid;
   });

tests/playwright/tests/db/language.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { ProjectsPage } from '../pages/ProjectsPage';
+import { ProjectsPage } from '../../pages/ProjectsPage';
-import setup from '../setup';
+import setup from '../../setup';
 
 const langMenu = [
   'help-translate',
@@ -47,7 +47,7 @@ test.describe('Common', () => {
   let projectsPage: ProjectsPage;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     projectsPage = new ProjectsPage(page);
   });
@@ -58,7 +58,7 @@ test.describe('Common', () => {
     // Index is the order in which menu options appear
     for (let i = 1; i < langMenu.length; i++) {
       // scripts/playwright/tests/language.spec.ts
-      const json = require(`../../../packages/nc-gui/lang/${langMenu[i]}`);
+      const json = require(`../../../../packages/nc-gui/lang/${langMenu[i]}`);
       await projectsPage.openLanguageMenu();
       await projectsPage.selectLanguage({ index: i });
       await projectsPage.verifyLanguage({ json });

tests/playwright/tests/db/megaTable.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@playwright/test';
-import setup from '../setup';
+import setup from '../../setup';
 import { UITypes } from 'nocodb-sdk';
 import { Api } from 'nocodb-sdk';
 let api: Api<any>;

tests/playwright/tests/db/metaSync.spec.ts

@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsPage, SettingTab } from '../pages/Dashboard/Settings';
+import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import setup, { NcContext } from '../setup';
+import setup, { NcContext } from '../../setup';
-import { isMysql, isPg, isSqlite, mysqlExec, pgExec, sqliteExec } from '../setup/db';
+import { isMysql, isPg, isSqlite, mysqlExec, pgExec, sqliteExec } from '../../setup/db';
 
 test.describe('Meta sync', () => {
   let dashboard: DashboardPage;
@@ -11,7 +11,7 @@ test.describe('Meta sync', () => {
   let dbExec;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     settings = dashboard.settings;
 

tests/playwright/tests/db/mobileMode.spec.ts

@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { FormPage } from '../pages/Dashboard/Form';
+import { FormPage } from '../../pages/Dashboard/Form';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Mobile Mode', () => {
   let dashboard: DashboardPage;
@@ -11,7 +11,7 @@ test.describe('Mobile Mode', () => {
   let form: FormPage;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     form = dashboard.form;
     toolbar = dashboard.grid.toolbar;

tests/playwright/tests/db/pagination.spec.ts

@@ -1,13 +1,13 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Grid pagination', () => {
   let dashboard: DashboardPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/projectOperations.spec.ts

@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { ProjectsPage } from '../pages/ProjectsPage';
+import { ProjectsPage } from '../../pages/ProjectsPage';
 import { Api } from 'nocodb-sdk';
 
 test.describe('Project operations', () => {

tests/playwright/tests/db/rolesCreate.spec.ts

@@ -1,9 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { SettingsPage, SettingTab } from '../pages/Dashboard/Settings';
+import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import { SignupPage } from '../pages/SignupPage';
+import { SignupPage } from '../../pages/SignupPage';
-import { ProjectsPage } from '../pages/ProjectsPage';
+import { ProjectsPage } from '../../pages/ProjectsPage';
+import { getDefaultPwd } from '../utils/general';
 
 const roleDb = [
   { email: 'creator@nocodb.com', role: 'creator', url: '' },
@@ -20,7 +21,7 @@ test.describe('User roles', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     settings = dashboard.settings;
     signupPage = new SignupPage(page);
@@ -110,7 +111,7 @@ test.describe('User roles', () => {
     await dashboard.rootPage.goto(roleDb[roleIdx].url);
     await signupPage.signUp({
       email: roleDb[roleIdx].email,
-      password: 'Password123.',
+      password: getDefaultPwd(),
     });
 
     await projectsPage.openProject({

tests/playwright/tests/db/rolesPreview.spec.ts

@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import { SettingsPage, SettingTab } from '../pages/Dashboard/Settings';
+import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
 
 const roles = ['Editor', 'Commenter', 'Viewer'];
 
@@ -16,7 +16,7 @@ test.describe('Preview Mode', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
     settings = dashboard.settings;

tests/playwright/tests/db/rolesSuperUser.spec.ts

@@ -1,13 +1,13 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Super user', () => {
   let dashboard: DashboardPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/swagger.spec.ts

@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Table Column Operations', () => {
   let grid: GridPage, dashboard: DashboardPage;

tests/playwright/tests/db/tableColumnOperation.spec.ts

@@ -1,14 +1,14 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Table Column Operations', () => {
   let grid: GridPage, dashboard: DashboardPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.project);
     grid = dashboard.grid;
 

tests/playwright/tests/db/tableOperations.spec.ts

@@ -1,14 +1,14 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { SettingsPage, SettingTab } from '../pages/Dashboard/Settings';
+import { SettingsPage, SettingTab } from '../../pages/Dashboard/Settings';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Table Operations', () => {
   let dashboard: DashboardPage, settings: SettingsPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     settings = dashboard.settings;
   });

tests/playwright/tests/db/toolbarOperations.spec.ts

@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Toolbar operations (GRID)', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
@@ -16,7 +16,7 @@ test.describe('Toolbar operations (GRID)', () => {
   }
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
   });

tests/playwright/tests/db/undo-redo.spec.ts

@@ -1,10 +1,10 @@
 import { expect, Page, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
 import { Api, UITypes } from 'nocodb-sdk';
-import { rowMixedValue } from '../setup/xcdb-records';
+import { rowMixedValue } from '../../setup/xcdb-records';
-import { GridPage } from '../pages/Dashboard/Grid';
+import { GridPage } from '../../pages/Dashboard/Grid';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
 
 let dashboard: DashboardPage,
   grid: GridPage,

tests/playwright/tests/db/viewForm.spec.ts

@@ -1,10 +1,10 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { FormPage } from '../pages/Dashboard/Form';
+import { FormPage } from '../../pages/Dashboard/Form';
-import { SharedFormPage } from '../pages/SharedForm';
+import { SharedFormPage } from '../../pages/SharedForm';
-import { AccountPage } from '../pages/Account';
+import { AccountPage } from '../../pages/Account';
-import { AccountAppStorePage } from '../pages/Account/AppStore';
+import { AccountAppStorePage } from '../../pages/Account/AppStore';
 
 // todo: Move most of the ui actions to page object and await on the api response
 test.describe('Form view', () => {
@@ -15,7 +15,7 @@ test.describe('Form view', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     form = dashboard.form;
     accountPage = new AccountPage(page);
@@ -177,8 +177,6 @@ test.describe('Form view', () => {
 
     // activate SMTP plugin
     await accountAppStorePage.goto();
-    await accountAppStorePage.rootPage.reload({ waitUntil: 'networkidle' });
-    await accountAppStorePage.waitUntilContentLoads();
 
     // install SMTP
     await accountAppStorePage.install({ name: 'SMTP' });
@@ -205,8 +203,6 @@ test.describe('Form view', () => {
 
     // Uninstall SMTP
     await accountAppStorePage.goto();
-    await accountAppStorePage.rootPage.reload({ waitUntil: 'networkidle' });
-    await accountAppStorePage.waitUntilContentLoads();
     await accountAppStorePage.uninstall({ name: 'SMTP' });
 
     await dashboard.verifyToast({

tests/playwright/tests/db/viewFormShareSurvey.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { SurveyFormPage } from '../pages/Dashboard/SurveyForm';
+import { SurveyFormPage } from '../../pages/Dashboard/SurveyForm';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Share form', () => {
   let dashboard: DashboardPage;
@@ -9,7 +9,7 @@ test.describe('Share form', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/viewGridShare.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { isMysql, isPg, isSqlite } from '../setup/db';
+import { isMysql, isPg, isSqlite } from '../../setup/db';
 
 test.describe('Shared view', () => {
   let dashboard: DashboardPage;
@@ -10,7 +10,7 @@ test.describe('Shared view', () => {
   let sharedLink: string;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/viewKanban.spec.ts

@@ -1,9 +1,9 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
 
-import setup from '../setup';
+import setup from '../../setup';
-import { isPg, isSqlite } from '../setup/db';
+import { isPg, isSqlite } from '../../setup/db';
 
 const filmRatings = ['G', 'PG', 'PG-13', 'R', 'NC-17'];
 
@@ -12,7 +12,7 @@ test.describe('View', () => {
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     toolbar = toolbar = dashboard.kanban.toolbar;
 

tests/playwright/tests/db/viewMap.spec.ts

@@ -1,8 +1,8 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
 
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Map View', () => {
   let dashboard: DashboardPage, toolbar: ToolbarPage;
@@ -15,7 +15,7 @@ test.describe('Map View', () => {
   const longitudeInShortDecimalLength = '30.5234';
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.map.toolbar;
 

tests/playwright/tests/db/viewMenu.spec.ts

@@ -1,14 +1,14 @@
 import { test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import setup from '../setup';
+import setup from '../../setup';
-import { isPg } from '../setup/db';
+import { isPg } from '../../setup/db';
 
 test.describe('Grid view locked', () => {
   let dashboard: DashboardPage;
   let context: any;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
   });
 

tests/playwright/tests/db/views.spec.ts

@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
-import { DashboardPage } from '../pages/Dashboard';
+import { DashboardPage } from '../../pages/Dashboard';
-import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
+import { ToolbarPage } from '../../pages/Dashboard/common/Toolbar';
-import setup from '../setup';
+import setup from '../../setup';
 
 test.describe('Views CRUD Operations', () => {
   let dashboard: DashboardPage;
@@ -9,7 +9,7 @@ test.describe('Views CRUD Operations', () => {
   let toolbar: ToolbarPage;
 
   test.beforeEach(async ({ page }) => {
-    context = await setup({ page });
+    context = await setup({ page, isEmptyProject: false });
     dashboard = new DashboardPage(page, context.project);
     toolbar = dashboard.grid.toolbar;
   });

tests/playwright/tests/utils/general.ts

@@ -19,6 +19,14 @@ async function getTextExcludeIconText(selector) {
   return text.trim();
 }
 
+async function getIconText(selector) {
+  // List of icons
+  const icons = await selector.locator('.material-symbols-outlined');
+
+  await icons.nth(0).waitFor();
+  return await icons.nth(0).textContent();
+}
+
 function isSubset(obj, potentialSubset) {
   for (const prop in potentialSubset) {
     // eslint-disable-next-line no-prototype-builtins
@@ -38,4 +46,8 @@ function isSubset(obj, potentialSubset) {
   return true;
 }
 
-export { getTextExcludeIconText, isSubset };
+function getDefaultPwd() {
+  return 'Password123.';
+}
+
+export { getTextExcludeIconText, isSubset, getIconText, getDefaultPwd };