diff --git a/cypress/support/pages/admin_console/ListingPage.ts b/cypress/support/pages/admin_console/ListingPage.ts index f50031e1a0..2b48326884 100644 --- a/cypress/support/pages/admin_console/ListingPage.ts +++ b/cypress/support/pages/admin_console/ListingPage.ts @@ -1,26 +1,15 @@ export default class ListingPage { - searchInput: string; - itemsRows: string; - itemRowDrpDwn: string; - exportBtn: string; - deleteBtn: string; - searchBtn: string; - createBtn: string; - importBtn: string; - - constructor() { - this.searchInput = '.pf-c-toolbar__item [type="search"]:visible'; - this.itemsRows = "table"; - this.itemRowDrpDwn = ".pf-c-dropdown > button"; - this.exportBtn = '[role="menuitem"]:nth-child(1)'; - this.deleteBtn = '[role="menuitem"]:nth-child(2)'; - this.searchBtn = - ".pf-c-page__main .pf-c-toolbar__content-section button.pf-m-control:visible"; - this.createBtn = - ".pf-c-page__main .pf-c-toolbar__content-section button.pf-m-primary:visible"; - this.importBtn = - ".pf-c-page__main .pf-c-toolbar__content-section button.pf-m-link"; - } + private searchInput = '.pf-c-toolbar__item [type="search"]:visible'; + private itemsRows = "table"; + private itemRowDrpDwn = ".pf-c-dropdown__toggle"; + public exportBtn = '[role="menuitem"]:nth-child(1)'; + public deleteBtn = '[role="menuitem"]:nth-child(2)'; + private searchBtn = + ".pf-c-page__main .pf-c-toolbar__content-section button.pf-m-control:visible"; + private createBtn = + ".pf-c-page__main .pf-c-toolbar__content-section button.pf-m-primary:visible"; + private importBtn = + ".pf-c-page__main .pf-c-toolbar__content-section button.pf-m-link"; goToCreateItem() { cy.get(this.createBtn).click(); @@ -50,7 +39,7 @@ export default class ListingPage { clickRowDetails(itemName: string) { cy.get(this.itemsRows) .contains(itemName) - .parentsUntil("tr") + .parentsUntil("tbody") .find(this.itemRowDrpDwn) .click(); return this; diff --git a/src/client-scopes/ClientScopesSection.tsx b/src/client-scopes/ClientScopesSection.tsx index 94a3350667..0d44bb0197 100644 --- a/src/client-scopes/ClientScopesSection.tsx +++ b/src/client-scopes/ClientScopesSection.tsx @@ -83,7 +83,14 @@ export const ClientScopesSection = () => { onConfirm: async () => { try { for (const scope of selectedScopes) { - await removeScope(adminClient, scope); + try { + await removeScope(adminClient, scope); + } catch (error) { + console.warn( + "could not remove scope", + error.response?.data?.errorMessage || error + ); + } await adminClient.clientScopes.del({ id: scope.id! }); } addAlert(t("deletedSuccess"), AlertVariant.success);