Skip to content

Commit

Permalink
Merge branch 'master' into FAT-18034-C490900
Browse files Browse the repository at this point in the history
  • Loading branch information
ostapwd authored Jan 15, 2025
2 parents 7fe7e38 + dc1f95a commit 75e7e39
Show file tree
Hide file tree
Showing 18 changed files with 758 additions and 220 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,24 +79,17 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
permissions.bulkEditQueryView.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
permissions.bulkEditQueryView.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
permissions.bulkEditQueryView.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditHoldings.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,22 +86,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,16 @@ describe('Bulk-edit', () => {
]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
cy.assignAffiliationToUser(Affiliations.University, user.userId);
cy.setTenant(Affiliations.University);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);

cy.resetTenant();
[Affiliations.College, Affiliations.University].forEach((affiliation) => {
cy.assignAffiliationToUser(affiliation, user.userId);
cy.setTenant(affiliation);
cy.assignPermissionsToExistingUser(user.userId, [
permissions.bulkEditEdit.gui,
permissions.uiInventoryViewCreateEditItems.gui,
]);
cy.resetTenant();
});

cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
instanceTypeId = instanceTypeData[0].id;
});
Expand Down
Loading

0 comments on commit 75e7e39

Please sign in to comment.