Skip to content

Commit cc9581c

Browse files
committed
code refactor
1 parent 0393a4c commit cc9581c

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

geonode_mapstore_client/client/js/plugins/ResourceDetails/ResourceDetails.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ function ResourceDetailsPanel({
252252
"type": "settings",
253253
"id": "settings",
254254
"labelId": "gnviewer.settings",
255-
"disableIf": "{!context.canManageResourceSettings(state('gnResourceData')) && !context.canAccessPermissions(state('gnResourceData'))}",
255+
"disableIf": "{!context.canManageResourceSettings(state('gnResourceData'))}",
256256
"items": [true]
257257
}
258258
],

geonode_mapstore_client/client/js/utils/ResourceUtils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ export const canManageResourceOptions = (resource) => {
891891
};
892892

893893
export const canManageResourceSettings = (resource) => {
894-
return canManageResourcePublishing(resource) && canManageResourceOptions(resource);
894+
return !!(canManageResourcePublishing(resource) || canManageResourceOptions(resource));
895895
};
896896

897897
export const canAccessPermissions = (resource) => {

geonode_mapstore_client/client/js/utils/__tests__/ResourceUtils-test.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,23 +1055,16 @@ describe('Test Resource Utils', () => {
10551055
});
10561056
it('canManageResourceSettings', () => {
10571057
expect(canManageResourceSettings({ perms: ['change_resourcebase'] })).toBeTruthy();
1058-
1058+
expect(canManageResourceSettings({ perms: ['change_resourcebase', 'view_resourcebase'] })).toBeTruthy();
10591059
expect(canManageResourceSettings({ perms: ['approve_resourcebase', 'publish_resourcebase'] })).toBeTruthy();
10601060
expect(canManageResourceSettings({ perms: ['approve_resourcebase', 'feature_resourcebase'] })).toBeTruthy();
1061-
1062-
expect(canManageResourceSettings({ perms: ['approve_resourcebase'] })).toBeFalsy();
1063-
1064-
expect(canManageResourceSettings({ perms: ['publish_resourcebase'] })).toBeFalsy();
1065-
expect(canManageResourceSettings({ perms: ['feature_resourcebase'] })).toBeFalsy();
1061+
expect(canManageResourceSettings({ perms: ['approve_resourcebase', 'change_resourcebase'] })).toBeTruthy();
1062+
expect(canManageResourceSettings({ perms: ['publish_resourcebase', 'change_resourcebase'] })).toBeTruthy();
10661063

10671064
expect(canManageResourceSettings({ perms: ['view_resourcebase'] })).toBeFalsy();
1068-
10691065
expect(canManageResourceSettings({ perms: [] })).toBeFalsy();
1070-
10711066
expect(canManageResourceSettings({})).toBeFalsy();
1072-
10731067
expect(canManageResourceSettings(undefined)).toBeFalsy();
1074-
10751068
expect(canManageResourceSettings(null)).toBeFalsy();
10761069
});
10771070
it('canAccessPermissions', () => {

0 commit comments

Comments
 (0)