From 679ef5dba98aad7e7acedd3a4bc4fa1aa37adf36 Mon Sep 17 00:00:00 2001 From: Florine Hea Date: Tue, 18 Feb 2025 16:59:19 +0100 Subject: [PATCH 1/4] edited method EditShopGroup for audit js errors --- .../pages/BO/advancedParameters/multistore/index.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts index cff86811..57776b14 100644 --- a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts +++ b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts @@ -80,6 +80,8 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { private readonly sortColumnDiv: (number: number) => string; + private readonly editGroupButton: string; + /** * @constructs * Setting up texts and selectors to use on multistore page @@ -123,6 +125,7 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { this.tableColumnActionsToggleButton = (row: number) => `${this.tableColumnActions(row)} button.dropdown-toggle`; this.tableColumnActionsDropdownMenu = (row: number) => `${this.tableColumnActions(row)} .dropdown-menu`; this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActionsDropdownMenu(row)} a.delete`; + this.editGroupButton = `#table-shop_group tbody tr:nth-child(1) td .btn-group a.edit`; // Confirmation modal this.deleteModalButtonYes = '#popup_ok'; @@ -220,7 +223,11 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { * @return {Promise} */ async gotoEditShopGroupPage(page: Page, row: number): Promise { - await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row)); + if (await this.elementVisible(page, this.tableColumnActionsEditLink(row), 2000)) { + await page.locator(this.tableColumnActionsEditLink(row)).click(); + return; + } + await page.locator(this.editGroupButton).click(); } /** From a0fcf92205fc76432a5fbec82c50c200b664d053 Mon Sep 17 00:00:00 2001 From: Florine Hea Date: Wed, 19 Feb 2025 22:49:07 +0100 Subject: [PATCH 2/4] made row parametrable --- .../pages/BO/advancedParameters/multistore/index.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts index 57776b14..4cb65649 100644 --- a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts +++ b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts @@ -80,7 +80,7 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { private readonly sortColumnDiv: (number: number) => string; - private readonly editGroupButton: string; + private readonly editGroupButton: (row: number) => string; /** * @constructs @@ -125,7 +125,7 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { this.tableColumnActionsToggleButton = (row: number) => `${this.tableColumnActions(row)} button.dropdown-toggle`; this.tableColumnActionsDropdownMenu = (row: number) => `${this.tableColumnActions(row)} .dropdown-menu`; this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActionsDropdownMenu(row)} a.delete`; - this.editGroupButton = `#table-shop_group tbody tr:nth-child(1) td .btn-group a.edit`; + this.editGroupButton = (row: number) => `${this.tableBodyColumn(row)} .btn-group a.edit`; // Confirmation modal this.deleteModalButtonYes = '#popup_ok'; @@ -223,11 +223,13 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { * @return {Promise} */ async gotoEditShopGroupPage(page: Page, row: number): Promise { + //row = 1; if (await this.elementVisible(page, this.tableColumnActionsEditLink(row), 2000)) { await page.locator(this.tableColumnActionsEditLink(row)).click(); return; } - await page.locator(this.editGroupButton).click(); + row = 1; + await page.locator(this.editGroupButton(row)).click(); } /** From 909322a53521f53e362ee6d463b1c7ef8f7260ea Mon Sep 17 00:00:00 2001 From: Florine Hea Date: Wed, 19 Feb 2025 22:58:18 +0100 Subject: [PATCH 3/4] fixed lint na-param-reassign --- .../pages/BO/advancedParameters/multistore/index.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts index 4cb65649..714c4d25 100644 --- a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts +++ b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts @@ -80,7 +80,7 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { private readonly sortColumnDiv: (number: number) => string; - private readonly editGroupButton: (row: number) => string; + private readonly editGroupButton: (row: number) => string; /** * @constructs @@ -223,13 +223,12 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { * @return {Promise} */ async gotoEditShopGroupPage(page: Page, row: number): Promise { - //row = 1; if (await this.elementVisible(page, this.tableColumnActionsEditLink(row), 2000)) { await page.locator(this.tableColumnActionsEditLink(row)).click(); return; } - row = 1; - await page.locator(this.editGroupButton(row)).click(); + const myDefaultRow = 1; + await page.locator(this.editGroupButton(myDefaultRow)).click(); } /** From e44f91df5d8ac4b55fc539da3582b71748115327 Mon Sep 17 00:00:00 2001 From: Florine Hea Date: Thu, 20 Feb 2025 09:31:17 +0100 Subject: [PATCH 4/4] changed row --- .../develop/pages/BO/advancedParameters/multistore/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts index 714c4d25..035e8353 100644 --- a/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts +++ b/src/versions/develop/pages/BO/advancedParameters/multistore/index.ts @@ -227,8 +227,7 @@ class BOMultistorePage extends BOBasePage implements BOMultistorePageInterface { await page.locator(this.tableColumnActionsEditLink(row)).click(); return; } - const myDefaultRow = 1; - await page.locator(this.editGroupButton(myDefaultRow)).click(); + await page.locator(this.editGroupButton(row)).click(); } /**