Add fixes ECS EUREKA

cypress/e2e/consortia/consortium-manager/central-tenant-has-access-to-consortium-manager-app.cy.js

@@ -54,9 +54,11 @@ describe('Consortia', () => {
         TopMenuNavigation.navigateToApp('Consortium manager');
         ConsortiumManager.verifyStatusOfConsortiumManager();
         ConsortiumManager.verifyMembersSelected();
-        ConsortiumManager.verifyPaneIncludesSettings(settingsList.sort());
+        ConsortiumManager.verifyPaneIncludesSettings(settingsList);
         const randomSetting = Arrays.getRandomElement(settingsList);
         chooseSettingItem(randomSetting, 1);
+        cy.pause();
+        cy.wait(4000);
         ConsortiumManager.clickSelectMembers();
         SelectMembers.changeSelectAllCheckbox('check');
         SelectMembers.verifyStatusOfSelectMembersModal(1);

cypress/e2e/consortia/consortium-manager/manage-shared-settings/manage-shared-alternative-title-types/user-with-permission-is-able-add-edit-alternative-title-types.cy.js

@@ -91,9 +91,9 @@ describe('Consortia', () => {
 
             ConsortiumManagerApp.chooseSettingsItem(settingsItems.inventory);
             AlternativeTitleTypesConsortiumManager.choose();
-
             ConsortiaControlledVocabularyPaneset.createViaUi(true, alternativeTitleTypes3);
             ConsortiaControlledVocabularyPaneset.clickSave();
+
             let rowDataToCheck = [
               alternativeTitleTypes3.name,
               'consortium',
@@ -154,7 +154,7 @@ describe('Consortia', () => {
 
             SelectMembers.saveAndClose();
             ConsortiumManagerApp.verifyListIsEmpty();
-            ConsortiaControlledVocabularyPaneset.verifyNewButtonDisabled();
+            ConsortiaControlledVocabularyPaneset.verifyNewButtonAbsent();
 
             cy.visit(SettingsMenu.alternativeTitleTypes);
             ConsortiaControlledVocabularyPaneset.verifyRecordInTheList(rowDataToCheck.slice(0, -1));

cypress/e2e/consortia/consortium-manager/manage-shared-settings/manage-shared-patron-groups/user-with-permission-is-able-add-delete-patron-groups.cy.js

@@ -37,6 +37,7 @@ describe('Consortia', () => {
         const rowDataToCheck = [...Object.values(sharedPatronGroups1), moment().format('l'), 'All'];
 
         before('Create users data', () => {
+          cy.clearCookies({ domain: null });
           cy.getAdminToken()
             .then(() => {
               cy.createTempUser([

cypress/e2e/consortia/consortium-manager/user-is-not-able-to-edit-and-delete-from-member-tenant-circulation.cy.js

@@ -34,6 +34,7 @@ describe('Consortium manager', () => {
   describe('View settings', () => {
     describe('View Request cancellation reasons', () => {
       before('create test data', () => {
+        cy.clearCookies({ domain: null });
         cy.getAdminToken();
         RequestCancellationReasonsConsortiumManager.createViaApi(testData.centralSharedReason).then(
           (newReason) => {
@@ -66,7 +67,7 @@ describe('Consortium manager', () => {
             waiter: ConsortiumManagerApp.waitLoading,
           });
           SelectMembers.selectAllMembers();
-          ConsortiumManagerApp.verifyStatusOfConsortiumManager(7);
+          ConsortiumManagerApp.verifyStatusOfConsortiumManager(13);
           ConsortiumManagerApp.chooseSettingsItem(settingsItems.circulation);
           RequestCancellationReasonsConsortiumManager.choose();
 
@@ -118,7 +119,7 @@ describe('Consortium manager', () => {
           cy.login(testData.user400666.username, testData.user400666.password);
           ConsortiumManager.switchActiveAffiliation(tenantNames.central, tenantNames.college);
           cy.visit(SettingsMenu.circulationRequestCancellationReasonsPath);
-
+cy.wait(4000);
           CancellationReason.verifyReasonInTheList({
             name: testData.centralSharedReason.payload.name,
           });
@@ -127,10 +128,7 @@ describe('Consortium manager', () => {
             name: testData.collegeLocalReason.name,
             actions: ['edit', 'trash'],
           });
-
-          CancellationReason.clickTrashButtonForReason({
-            name: testData.collegeLocalReason.name,
-          });
+          CancellationReason.clickTrashButtonForReason(testData.collegeLocalReason.name);
 
           ConsortiumManager.switchActiveAffiliation(tenantNames.college, tenantNames.university);
           cy.visit(SettingsMenu.circulationRequestCancellationReasonsPath);

cypress/e2e/consortia/consortium-manager/user-is-not-able-to-edit-and-delete-from-member-tenant-inventory-holdings.cy.js

@@ -92,7 +92,6 @@ describe('Consortium manager', () => {
             name: testData.centralSharedHoldingsNoteTypes.payload.name,
             source: 'consortium',
           });
-
           HoldingsNoteTypes.verifyLocalHoldingsNoteTypesInTheList({
             name: testData.collegeLocalHoldingsNoteType.name,
             actions: ['edit', 'trash'],

cypress/e2e/consortia/consortium-manager/user-is-not-able-to-edit-and-delete-from-member-tenant-inventory-items.cy.js

@@ -76,7 +76,7 @@ describe('Consortium manager', () => {
             permissions.inventoryCRUDItemNoteTypes.gui,
             permissions.uiCreateEditDeleteLoanTypes.gui,
           ]);
-          ItemNoteTypes.createNoteTypeViaApi(testData.collegeLocalItemNoteTypes);
+          ItemNoteTypes.createItemNoteTypeViaApi(testData.collegeLocalItemNoteTypes);
           LoanTypes.createLoanTypesViaApi(testData.collegeLocalLoanTypes);
           cy.resetTenant();
           cy.getAdminToken();

cypress/e2e/consortia/consortium-manager/view-settings/view-departments/view-affiliated-departments-with-given-permissions.cy.js

@@ -43,6 +43,8 @@ describe('Consortium manager', () => {
   describe('View settings', () => {
     describe('View Departments', () => {
       before('create test data', () => {
+        cy.clearCookies({ domain: null });
+
         cy.getAdminToken();
         DepartmentsConsortiumManager.createViaApi(testData.centralSharedDepartment).then(
           (newDepartment) => {

cypress/e2e/consortia/edit-tenant-name-in-consortium-manager-settings.cy.js

@@ -72,7 +72,7 @@ describe('Consortia', () => {
         tenantErrors.code,
         tenantErrors.name,
       );
-      ConsortiumManager.cancelEditingTenantInformation(2);
+      ConsortiumManager.cancelEditingTenantInformation(6);
     },
   );
 });

cypress/support/fragments/consortium-manager/circulation/requestCancellationReasonsConsortiumManager.js

@@ -53,5 +53,6 @@ export default {
     ].forEach((header) => {
       cy.expect(MultiColumnListHeader(header).exists());
     });
+    cy.wait(4000);
   },
 };

cypress/support/fragments/consortium-manager/consortiaControlledVocabularyPaneset.js

@@ -31,6 +31,10 @@ export default {
     cy.expect(newButton.is({ disabled: status }));
   },
 
+  verifyNewButtonAbsent() {
+    cy.expect(newButton.absent());
+  },
+
   verifyEditModeIsActive() {
     this.verifyNewButtonDisabled();
     cy.expect([
@@ -52,6 +56,7 @@ export default {
       this.fillInTextField({ [textFieldName]: value });
     });
     cy.do(isShared && memberLibrariesShare.click());
+    cy.wait(4000);
   },
 
   clickCancel() {
@@ -60,6 +65,7 @@ export default {
 
   clickSave() {
     cy.do(saveButton.click());
+    cy.wait(4000);
   },
 
   confirmDelete() {
@@ -74,16 +80,14 @@ export default {
   performAction(recordName, action) {
     // actions are selected by button name: trash(delete) or edit
     cy.do(
-      MultiColumnListRow({ content: including(recordName) })
+      MultiColumnListRow({ isContainer: true, content: including(recordName) })
         .find(Button({ icon: action }))
         .click(),
     );
   },
 
   verifyRecordInTheList(record, actionButtons = []) {
-    MultiColumnListRow({
-      content: including(record[0]),
-    })
+    MultiColumnListRow({ isContainer: true, content: including(record[0]) })
       .rowIndexInParent()
       .then((rowIndexInParent) => {
         cy.wrap(record).each((text, columnIndex) => {
@@ -165,6 +169,6 @@ export default {
   },
 
   verifyRecordNotInTheList(name) {
-    cy.expect(MultiColumnListRow({ content: including(name) }).absent());
+    cy.expect(MultiColumnListRow({ isContainer: true, content: including(name) }).absent());
   },
 };

cypress/support/fragments/consortium-manager/consortiumManagerApp.js

@@ -26,6 +26,7 @@ export const messages = {
 };
 
 export const settingsItems = {
+  authorizationPolicies: 'Authorization policies',
   authorizationRoles: 'Authorization roles',
   circulation: 'Circulation',
   inventory: 'Inventory',

cypress/support/fragments/consortium-manager/inventory/instances/alternativeTitleTypesConsortiumManager.js

@@ -82,5 +82,6 @@ export default {
     ['Name', 'Source', 'Last updated', 'Member libraries', 'Actions'].forEach((header) => {
       cy.expect(MultiColumnListHeader(header).exists());
     });
+    cy.wait(4000);
   },
 };

cypress/support/fragments/settings/circulation/cancellationReason.js

@@ -56,42 +56,37 @@ export default {
   },
 
   verifyNoReasonInTheList(name) {
-    cy.expect(MultiColumnListRow({ content: including(name) }).absent());
+    cy.expect(MultiColumnListRow({ isContainer: true, content: including(name) }).absent());
   },
 
   verifyReasonInTheList({ name, description = '', publicDescription = '', actions = [] }) {
-    cy.get('div[class*="mclCell-"]')
-      .contains(name)
-      .parents('div[class*="mclRow-"]')
-      .then(($row) => {
-        if (description) {
-          cy.wrap($row).find('div[class*="mclCell-"]').eq(1).should('contain.text', description);
-        }
-
-        if (publicDescription) {
-          cy.wrap($row)
-            .find('div[class*="mclCell-"]')
-            .eq(2)
-            .should('contain.text', publicDescription);
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
+    const actionsCell = MultiColumnListCell({ columnIndex: 3 });
+    cy.expect([
+      row.exists(),
+      row.find(MultiColumnListCell({ columnIndex: 1, content: description })).exists(),
+      row.find(MultiColumnListCell({ columnIndex: 2, content: publicDescription })).exists(),
+    ]);
+    if (actions.length === 0) {
+      cy.expect(row.find(actionsCell).has({ content: '' }));
+    } else {
+      Object.values(reasonsActions).forEach((action) => {
+        const buttonSelector = row.find(actionsCell).find(Button({ icon: action }));
+        if (actions.includes(action)) {
+          cy.expect(buttonSelector.exists());
+        } else {
+          cy.expect(buttonSelector.absent());
         }
-
-        const actionsCell = $row.find('div[class*="mclCell-"]').eq(4);
-        actions.forEach((action) => {
-          if (action === 'edit') {
-            cy.get(actionsCell).find('button[icon="edit"]').should('exist');
-          } else if (action === 'trash') {
-            cy.get(actionsCell).find('button[icon="trash"]').should('exist');
-          }
-        });
       });
+    }
   },
   verifyReasonAbsentInTheList({ name }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     cy.expect(row.absent());
   },
 
   clickEditButtonForReason(name) {
-    const row = EditableListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     const actionsCell = MultiColumnListCell({ columnIndex: 3 });
     cy.do(
       row
@@ -102,14 +97,13 @@ export default {
   },
 
   clickTrashButtonForReason(name) {
-    const row = EditableListRow({ content: including(name) });
-    const actionsCell = MultiColumnListCell({ columnIndex: 3 });
-    cy.do(
-      row
-        .find(actionsCell)
+    cy.do([
+      MultiColumnListRow({ isContainer: true, content: including(name) })
+        .find(MultiColumnListCell({ columnIndex: 3 }))
         .find(Button({ icon: 'trash' }))
         .click(),
-    );
+      Button('Delete').click(),
+    ]);
   },
 
   clickTrashButtonConfirm() {

cypress/support/fragments/settings/inventory/holdings/holdingsNoteTypes.js

@@ -28,7 +28,7 @@ export default {
     isDefaultSearchParamsRequired: false,
   }),
   verifyConsortiumHoldingsNoteTypesInTheList({ name, source = 'consortium', actions = [] }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     const actionsCell = MultiColumnListCell({ columnIndex: 3 });
     cy.expect([
       row.exists(),
@@ -47,9 +47,10 @@ export default {
       });
     }
   },
+
 
   verifyLocalHoldingsNoteTypesInTheList({ name, source = 'local', actions = [] }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     const actionsCell = MultiColumnListCell({ columnIndex: 3 });
     cy.expect([
       row.exists(),
@@ -70,13 +71,13 @@ export default {
   },
 
   verifyHoldingsNoteTypesAbsentInTheList({ name }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     cy.expect(row.absent());
   },
 
   clickTrashButtonForHoldingsNoteTypes(name) {
     cy.do([
-      MultiColumnListRow({ content: including(name) })
+      MultiColumnListRow({ isContainer: true, content: including(name) })
         .find(MultiColumnListCell({ columnIndex: 3 }))
         .find(Button({ icon: 'trash' }))
         .click(),

cypress/support/fragments/settings/inventory/holdings/holdingsTypes.js

@@ -30,7 +30,7 @@ export default {
   }),
 
   verifyConsortiumHoldingsTypeInTheList({ name, source = 'consortium', actions = [] }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     const actionsCell = MultiColumnListCell({ columnIndex: 3 });
     cy.expect([
       row.exists(),
@@ -51,7 +51,7 @@ export default {
   },
 
   verifyLocalHoldingsTypeInTheList({ name, source = 'local', actions = [] }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     const actionsCell = MultiColumnListCell({ columnIndex: 3 });
     cy.expect([
       row.exists(),
@@ -72,13 +72,13 @@ export default {
   },
 
   verifyHoldingsTypesAbsentInTheList({ name }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     cy.expect(row.absent());
   },
 
   clickTrashButtonForHoldingsType(name) {
     cy.do([
-      MultiColumnListRow({ content: including(name) })
+      MultiColumnListRow({ isContainer: true, content: including(name) })
         .find(MultiColumnListCell({ columnIndex: 3 }))
         .find(Button({ icon: 'trash' }))
         .click(),

cypress/support/fragments/settings/inventory/items/itemNoteTypes.js

@@ -36,7 +36,7 @@ export default {
   },
 
   verifyConsortiumItemNoteTypesInTheList({ name, source = 'consortium', actions = [] }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     const actionsCell = MultiColumnListCell({ columnIndex: 3 });
     cy.expect([
       row.exists(),
@@ -57,7 +57,7 @@ export default {
   },
 
   verifyLocalItemNoteTypesInTheList({ name, source = 'local', actions = [] }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     const actionsCell = MultiColumnListCell({ columnIndex: 3 });
     cy.expect([
       row.exists(),
@@ -78,13 +78,13 @@ export default {
   },
 
   verifyItemNoteTypesAbsentInTheList({ name }) {
-    const row = MultiColumnListRow({ content: including(name) });
+    const row = MultiColumnListRow({ isContainer: true, content: including(name) });
     cy.expect(row.absent());
   },
 
   clickTrashButtonForItemNoteTypes(name) {
     cy.do([
-      MultiColumnListRow({ content: including(name) })
+      MultiColumnListRow({ isContainer: true, content: including(name) })
         .find(MultiColumnListCell({ columnIndex: 3 }))
         .find(Button({ icon: 'trash' }))
         .click(),