[Fixes #935] Share permissions form not showing for users in groups w…

…ith manage permission (#1047)
GeoNode · Jun 23, 2022 · f6d094c · f6d094c
1 parent c4d227e
commit f6d094c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/geonode_mapstore_client/client/js/selectors/__tests__/resource-test.js b/geonode_mapstore_client/client/js/selectors/__tests__/resource-test.js
@@ -14,7 +14,8 @@ import {
     getGeonodeResourceFromDashboard,
     getResourceThumbnail,
     updatingThumbnailResource,
-    isThumbnailChanged
+    isThumbnailChanged,
+    canEditPermissions
 } from '../resource';
 
 const testState = {
@@ -25,6 +26,9 @@ const testState = {
             thumbnailChanged: true,
             thumbnail_url: 'thumbnail.jpeg',
             updatingThumbnail: true
+        },
+        compactPermissions: {
+            groups: [{name: 'test-group', permissions: 'manage'}]
         }
     },
     geostory: {
@@ -36,6 +40,13 @@ const testState = {
         originalData: {
             widgets: [{widgetType: 'map', name: 'test widget', map: {extraParams: {pk: 1}}}, {widgetType: 'map', name: 'test widget 2', map: {pk: 1}}]
         }
+    },
+    security: {
+        user: {
+            info: {
+                groups: ['test-group']
+            }
+        }
     }
 };
 
@@ -65,4 +76,8 @@ describe('resource selector', () => {
     it('should get resource thumbnail updating status', () => {
         expect(updatingThumbnailResource(testState)).toBeTruthy();
     });
+
+    it('should get permissions from users in groups with manage rights', () => {
+        expect(canEditPermissions(testState)).toBeTruthy();
+    });
 });
diff --git a/geonode_mapstore_client/client/js/selectors/resource.js b/geonode_mapstore_client/client/js/selectors/resource.js
@@ -102,9 +102,13 @@ export const getPermissionsPayload = (state) => {
 export const canEditPermissions = (state) => {
     const compactPermissions = getCompactPermissions(state);
     const users = compactPermissions.users || [];
+    const groups = compactPermissions.groups || [];
+    const organizations = compactPermissions.organizations || [];
     const user = state?.security?.user;
     const { permissions } = user && users.find(({ id }) => id === user.pk) || {};
-    return ['owner', 'manage'].includes(permissions);
+    const { permissions: allowedGroups } = user && groups.find((group) => user.info.groups.includes(group.name)) || {};
+    const { permissions: allowedOrganizations } = user && organizations.find((organization) => user.info.groups.includes(organization.name)) || {};
+    return ['owner', 'manage'].includes(permissions) || ['manage'].includes(allowedGroups) || ['manage'].includes(allowedOrganizations);
 };
 
 export const getSelectedLayerPermissions = (state) => {