From b981d24595ad4b48e5ef5c856e74e682c03a907d Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Thu, 25 Mar 2021 15:27:20 +0200 Subject: [PATCH] [ACA-4339] Libraries - Delete action for non-site members is rendered (#2046) * show selection action only if role is manager * update expectation data * differentiate actions between member and non member --- .../libraries/test-data-libraries.ts | 18 ++++++++++-------- src/assets/app.extensions.json | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/e2e/suites/actions-available/libraries/test-data-libraries.ts b/e2e/suites/actions-available/libraries/test-data-libraries.ts index 8cf5abec8..d79af9a78 100644 --- a/e2e/suites/actions-available/libraries/test-data-libraries.ts +++ b/e2e/suites/actions-available/libraries/test-data-libraries.ts @@ -34,8 +34,10 @@ export const trashActions = ['Permanently Delete', 'Restore']; const memberFavContextMenu = ['Leave Library', 'Delete', 'Remove Favorite']; const memberNotFavContextMenu = ['Leave Library', 'Delete', 'Favorite']; const memberToolbarPrimary = ['Leave Library', 'View Details', 'More Actions']; -const favToolbarMore = ['Delete', 'Remove Favorite']; -const notFavToolbarMore = ['Delete', 'Favorite']; +const favToolbarMore = ['Remove Favorite']; +const notFavToolbarMore = ['Favorite']; +const memberFavToolbarMore = ['Delete', 'Remove Favorite']; +const memberNotFavToolbarMore = ['Delete', 'Favorite']; const searchMemberToolbarPrimary = ['Toggle search filter', 'Leave Library', 'View Details', 'More Actions']; const searchReqJoinToolbarPrimary = ['Toggle search filter', 'Cancel Join Request', 'More Actions']; const searchNotMemberToolbarPrimary = ['Toggle search filter', 'Join', 'More Actions']; @@ -51,7 +53,7 @@ export const publicUserMemberFav = { description: 'public site, user member, user favorite', contextMenu: memberFavContextMenu, toolbarPrimary: memberToolbarPrimary, - toolbarMore: favToolbarMore, + toolbarMore: memberFavToolbarMore, searchToolbarPrimary: searchMemberToolbarPrimary }; @@ -61,7 +63,7 @@ export const privateUserMemberFav = { description: 'private site, user member, user favorite', contextMenu: memberFavContextMenu, toolbarPrimary: memberToolbarPrimary, - toolbarMore: favToolbarMore, + toolbarMore: memberFavToolbarMore, searchToolbarPrimary: searchMemberToolbarPrimary }; @@ -71,7 +73,7 @@ export const moderatedUserMemberFav = { description: 'moderated site, user member, user favorite', contextMenu: memberFavContextMenu, toolbarPrimary: memberToolbarPrimary, - toolbarMore: favToolbarMore, + toolbarMore: memberFavToolbarMore, searchToolbarPrimary: searchMemberToolbarPrimary }; @@ -81,7 +83,7 @@ export const publicUserMemberNotFav = { description: 'public site, user member, not favorite', contextMenu: memberNotFavContextMenu, toolbarPrimary: memberToolbarPrimary, - toolbarMore: notFavToolbarMore, + toolbarMore: memberNotFavToolbarMore, searchToolbarPrimary: searchMemberToolbarPrimary }; @@ -91,7 +93,7 @@ export const privateUserMemberNotFav = { description: 'private site, user member, not favorite', contextMenu: memberNotFavContextMenu, toolbarPrimary: memberToolbarPrimary, - toolbarMore: notFavToolbarMore, + toolbarMore: memberNotFavToolbarMore, searchToolbarPrimary: searchMemberToolbarPrimary }; @@ -101,7 +103,7 @@ export const moderatedUserMemberNotFav = { description: 'moderated site, user member, not favorite', contextMenu: memberNotFavContextMenu, toolbarPrimary: memberToolbarPrimary, - toolbarMore: notFavToolbarMore, + toolbarMore: memberNotFavToolbarMore, searchToolbarPrimary: searchMemberToolbarPrimary }; diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json index 9ab7dc079..0573a6dac 100644 --- a/src/assets/app.extensions.json +++ b/src/assets/app.extensions.json @@ -560,7 +560,7 @@ "click": "DELETE_LIBRARY" }, "rules": { - "visible": "app.selection.library" + "visible": "app.toolbar.favorite.canEditMetadata" } } ]