added wait for group to load (keycloak#34814)

fixes: keycloak#34605 Signed-off-by: Erik Jan de Wit <[email protected]> (cherry picked from commit 6a46667)
edewit · Dec 11, 2024 · c79446a · c79446a
1 parent e96ffa1
commit c79446a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/js/apps/admin-ui/cypress/e2e/group_test.spec.ts b/js/apps/admin-ui/cypress/e2e/group_test.spec.ts
@@ -121,7 +121,7 @@ describe("Group test", () => {
 
     it.skip("Duplicate group", () => {
       groupPage
-        .duplicateGroupItem(groupNames[0], true)
+        .duplicateGroupItem(groupNames[0])
         .assertNotificationGroupDuplicated();
     });
 

diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/groups/GroupPage.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/groups/GroupPage.ts
@@ -113,11 +113,11 @@ export default class GroupPage extends PageObject {
     return this;
   }
 
-  duplicateGroupItem(groupName: string, confirmModal = true) {
+  duplicateGroupItem(groupName: string) {
+    cy.intercept("/admin/realms/master/groups/*").as("fetchGroup");
     listingPage.duplicateItem(groupName);
-    if (confirmModal) {
-      groupModal.confirmDuplicateModal();
-    }
+    cy.wait("@fetchGroup");
+    groupModal.confirmDuplicateModal();
     return this;
   }
 

diff --git a/js/apps/admin-ui/src/authentication/execution-model.ts b/js/apps/admin-ui/src/authentication/execution-model.ts
@@ -93,7 +93,7 @@ export class ExecutionList {
         return ex;
       }
       current.index++;
-      if (ex.executionList) {
+      if (ex.executionList && !ex.isCollapsed) {
         const found = this.findExecution(index, current, ex.executionList);
         if (found) {
           return found;

diff --git a/js/apps/admin-ui/src/groups/components/GroupTree.tsx b/js/apps/admin-ui/src/groups/components/GroupTree.tsx
@@ -133,7 +133,7 @@ const GroupTreeContextMenu = ({
           <DropdownItem key="create" onClick={toggleCreateOpen}>
             {t("createChildGroup")}
           </DropdownItem>
-          <Divider key="separator" />,
+          <Divider key="separator" />
           <DropdownItem key="delete" onClick={toggleDeleteOpen}>
             {t("delete")}
           </DropdownItem>