diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue index ac2d15d5fe..bbd30a8ddb 100644 --- a/packages/nc-gui/components/smartsheet/header/Menu.vue +++ b/packages/nc-gui/components/smartsheet/header/Menu.vue @@ -225,14 +225,14 @@ const hideField = async () => { -
+
{{ $t('general.hideField') }} @@ -254,21 +254,21 @@ const hideField = async () => { v-if="column.uidt !== UITypes.LinkToAnotherRecord && column.uidt !== UITypes.Lookup && !column.pk" @click="duplicateColumn" > -
+
{{ t('general.duplicate') }}
-
+
{{ t('general.insertAfter') }}
-
+
{{ t('general.insertBefore') }} diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts index 7c599d1211..48107c7800 100644 --- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts +++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts @@ -190,7 +190,7 @@ export class ColumnPageObject extends BasePage { await this.get().locator('.ant-select-selection-search-input[aria-expanded="true"]').fill(type); // Select column type - await this.rootPage.locator(`text=${type}:visible`).nth(1).click(); + await this.rootPage.locator('.rc-virtual-list-holder-inner > div').locator(`text="${type}"`).click(); } async changeReferencedColumnForQrCode({ titleOfReferencedColumn }: { titleOfReferencedColumn: string }) { @@ -258,7 +258,12 @@ export class ColumnPageObject extends BasePage { async hideColumn({ title }: { title: string }) { await this.grid.get().locator(`th[data-title="${title}"] .nc-ui-dt-dropdown`).click(); - await this.rootPage.locator('li[role="menuitem"]:has-text("Hide Field"):visible').click(); + + await this.waitForResponse({ + uiAction: this.rootPage.locator('li[role="menuitem"]:has-text("Hide Field"):visible').click(), + requestUrlPathToMatch: 'api/v1/db/meta/views', + httpMethodsToMatch: ['PATCH'], + }); await expect(this.grid.get().locator(`th[data-title="${title}"]`)).toHaveCount(0); } diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts index ca04a11b83..22052a2ca6 100644 --- a/tests/playwright/pages/Dashboard/common/Cell/index.ts +++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts @@ -193,6 +193,6 @@ export class CellPageObject extends BasePage { ) { await this.get({ index, columnHeader }).click(...clickOptions); - await this.get({ index, columnHeader }).press('Control+C'); + await this.get({ index, columnHeader }).press((await this.isMacOs()) ? 'Meta+C' : 'Control+C'); } }