Merge pull request #2526 from DenverCoder544/admin_permissions_effici…

…ency_issues Admin permissions efficiency issues
oskariorg · Dec 5, 2023 · 68e9744 · 68e9744
2 parents e8d7358 + 8c5293d
commit 68e9744
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/bundles/admin/admin-permissions/handler/layerRightsHandler.js b/bundles/admin/admin-permissions/handler/layerRightsHandler.js
@@ -12,7 +12,7 @@ class UIHandler extends StateHandler {
             loading: false,
             changedIds: new Set(),
             pagination: {
-                pageSize: 50,
+                pageSize: 20,
                 page: 1,
                 filter: ''
             }

diff --git a/bundles/admin/admin-permissions/view/LayerRightsTable.jsx b/bundles/admin/admin-permissions/view/LayerRightsTable.jsx
@@ -41,16 +41,26 @@ const getPermissionNames = (nameToLabel) => {
     return [...names, ...additionalNames];
 };
 
+const VIEW_LAYER = 'VIEW_LAYER';
+const VIEW_PUBLISHED = 'VIEW_PUBLISHED';
+const PUBLISH = 'PUBLISH';
+const DOWNLOAD = 'DOWNLOAD';
+
+const DEFAULT_PERMISSIONS = [VIEW_LAYER, VIEW_PUBLISHED, PUBLISH, DOWNLOAD];
+const isDefaultPermissionType = (permissionName) => {
+    return DEFAULT_PERMISSIONS.includes(permissionName);
+};
+
 const getPermissionTableHeader = (permissionType, permissionName) => {
     const translation = <Message messageKey={`rights.${permissionType}`} defaultMsg={permissionName} bundleKey='admin-permissions' />;
     switch (permissionType) {
-        case 'VIEW_LAYER':
+        case VIEW_LAYER:
             return <Tooltip title={translation}><StyledIcon><UnorderedListOutlined /></StyledIcon></Tooltip>
-        case 'VIEW_PUBLISHED':
+        case VIEW_PUBLISHED:
             return <Tooltip title={translation}><StyledIcon><EyeOutlined /></StyledIcon></Tooltip>
-        case 'PUBLISH':
+        case PUBLISH:
             return <Tooltip title={translation}><StyledIcon><ImportOutlined /></StyledIcon></Tooltip>
-        case 'DOWNLOAD':
+        case DOWNLOAD:
             return <Tooltip title={translation}><StyledIcon><ExportOutlined /></StyledIcon></Tooltip>
         default:
             // permissions might have server side localization as "name" that defaults to id if not given
@@ -105,13 +115,15 @@ export const LayerRightsTable = ThemeConsumer(({ theme, controller, state }) =>
             }
         });
         permissionNames.forEach((permissionType, index) => {
+            const permissionName = state.permissions.names[permissionType];
             columnSettings.push({
                 align: 'left',
+                width: isDefaultPermissionType(permissionName) ? '5em' : '10em',
                 title: () => {
                     const allCurrentLayersHavePermission = allChecked(permissionType);
                     return (
                         <HeaderCell>
-                            {getPermissionTableHeader(permissionType, state.permissions.names[permissionType])}
+                            {getPermissionTableHeader(permissionType, permissionName)}
                             <CheckAllCheckbox
                                 checked={allCurrentLayersHavePermission}
                                 onChange={() => controller.setCheckAllForPermission(permissionType, !allCurrentLayersHavePermission)}