From 5864c9806aefe0b786f5a48fe6ef2167b1c4c5a9 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 12 Jun 2023 14:49:18 +0530 Subject: [PATCH 1/2] feat: remove delete confirm dialog Signed-off-by: Pranav C --- .../nc-gui/components/smartsheet/Grid.vue | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue index c9b81b0e1e..4b001cb8a7 100644 --- a/packages/nc-gui/components/smartsheet/Grid.vue +++ b/packages/nc-gui/components/smartsheet/Grid.vue @@ -798,20 +798,11 @@ const closeAddColumnDropdown = (scrollToLastCol = false) => { } const confirmDeleteRow = (row: number) => { - Modal.confirm({ - title: `Do you want to delete this row?`, - wrapClassName: 'nc-modal-row-delete', - okText: 'Yes', - okType: 'danger', - cancelText: 'No', - onOk() { - try { - deleteRow(row) - } catch (e: any) { - message.error(e.message) - } - }, - }) + try { + deleteRow(row) + } catch (e: any) { + message.error(e.message) + } } const deleteSelectedRangeOfRows = () => { From d2e059e750813d8b840e918c5f3cf3e503d11250 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 12 Jun 2023 16:14:48 +0530 Subject: [PATCH 2/2] test(pw): confirm button click is no longer required Signed-off-by: Pranav C --- tests/playwright/pages/Dashboard/Grid/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/playwright/pages/Dashboard/Grid/index.ts b/tests/playwright/pages/Dashboard/Grid/index.ts index 1f78a2fb02..dedbdd956e 100644 --- a/tests/playwright/pages/Dashboard/Grid/index.ts +++ b/tests/playwright/pages/Dashboard/Grid/index.ts @@ -157,7 +157,7 @@ export class GridPage extends BasePage { // Click text=Delete Row await this.rootPage.locator('text=Delete Row').click(); - await this.rootPage.locator('text=Yes').click(); + // todo: improve selector await this.rootPage .locator('span.ant-dropdown-menu-title-content > nc-project-menu-item')