add user loginAs and mergeUser permission check

pkp · Dec 6, 2024 · fdfa394 · fdfa394
1 parent 70ecea1
commit fdfa394
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/src/managers/UserAccessManager/UserAccessManagerStore.js b/src/managers/UserAccessManager/UserAccessManagerStore.js
@@ -40,7 +40,11 @@ export const useUserAccessManagerStore = defineComponentStore(
 		} = useFetchPaginated(apiUrl, {
 			currentPage,
 			pageSize: countPerPage,
-			query: {searchPhrase: searchPhrase, status: 'all'},
+			query: {
+				searchPhrase: searchPhrase,
+				status: 'all',
+				includePermissions: true,
+			},
 		});
 		watch(
 			[currentPage, searchPhrase],

diff --git a/src/managers/UserAccessManager/useUserAccessManagerActions.js b/src/managers/UserAccessManager/useUserAccessManagerActions.js
@@ -34,11 +34,12 @@ export function useUserAccessManagerActions() {
 		});
 
 		if (getCurrentUserId() !== userObj.id) {
-			actions.push({
-				label: t('grid.action.logInAs'),
-				icon: 'LoginAs',
-				name: Actions.USER_ACCESS_LOGIN_AS,
-			});
+			userObj.canLoginAs &&
+				actions.push({
+					label: t('grid.action.logInAs'),
+					icon: 'LoginAs',
+					name: Actions.USER_ACCESS_LOGIN_AS,
+				});
 
 			actions.push({
 				label: t('grid.action.remove'),
@@ -56,11 +57,12 @@ export function useUserAccessManagerActions() {
 				isWarnable: true,
 			});
 
-			actions.push({
-				label: t('grid.action.mergeUser'),
-				icon: 'MergeUser',
-				name: Actions.USER_ACCESS_MERGE_USER,
-			});
+			userObj.canMergeUser &&
+				actions.push({
+					label: t('grid.action.mergeUser'),
+					icon: 'MergeUser',
+					name: Actions.USER_ACCESS_MERGE_USER,
+				});
 		}
 
 		return actions;