Fix - Edit permission (#2083)

Author: dsuren1

geonode_mapstore_client/client/js/epics/gnsave.js

@@ -214,6 +214,7 @@ export const gnSaveContent = (action$, store) =>
                 ...(data && { 'data': JSON.parse(JSON.stringify(data)) }),
                 ...(extent && { extent })
             };
+            const { compactPermissions } = getPermissionsPayload(state);
             return Observable.defer(() => SaveAPI[contentType](state, action.id, body, action.reload))
                 .switchMap((response) => {
                     const [resource, ...actions] = castArray(response);
@@ -226,22 +227,34 @@ export const gnSaveContent = (action$, store) =>
                         window.location.reload();
                         return Observable.empty();
                     }
-                    return Observable.of(
-                        saveSuccess(resource),
-                        setResource({
-                            ...currentResource,
-                            ...body,
-                            ...resource
-                        }),
-                        updateResource(resource),
-                        ...(action.showNotifications
-                            ? [
-                                action.showNotifications === true
-                                    ? successNotification({title: "saveDialog.saveSuccessTitle", message: "saveDialog.saveSuccessMessage"})
-                                    : warningNotification(action.showNotifications)
-                            ]
-                            : []),
-                        ...actions // additional actions to be dispatched
+                    return Observable.merge(
+                        Observable.of(
+                            saveSuccess(resource),
+                            setResource({
+                                ...currentResource,
+                                ...body,
+                                ...resource
+                            }),
+                            updateResource(resource),
+                            ...(action.showNotifications
+                                ? [
+                                    action.showNotifications === true
+                                        ? successNotification({title: "saveDialog.saveSuccessTitle", message: "saveDialog.saveSuccessMessage"})
+                                        : warningNotification(action.showNotifications)
+                                ]
+                                : []),
+                            ...actions // additional actions to be dispatched
+                        ),
+                        ...(compactPermissions ? [
+                            Observable.defer(() =>
+                                updateCompactPermissionsByPk(action.id, cleanCompactPermissions(compactPermissions))
+                                    .then(output => ({ resource: currentResource, output, processType: ProcessTypes.PERMISSIONS_RESOURCE }))
+                                    .catch((error) => ({ resource: currentResource, error: error?.data?.detail || error?.statusText || error?.message || true, processType: ProcessTypes.PERMISSIONS_RESOURCE }))
+                            )
+                                .switchMap((payload) => {
+                                    return Observable.of(startAsyncProcess(payload));
+                                })
+                        ] : [])
                     );
                 })
                 .catch((error) => {
@@ -297,8 +310,7 @@ export const gnSaveDirectContent = (action$, store) =>
             const state = store.getState();
             const mapInfo = mapInfoSelector(state);
             const resourceId = mapInfo?.id || getResourceId(state);
-            const { compactPermissions, geoLimits } = getPermissionsPayload(state);
-            const currentResource = getResourceData(state);
+            const { geoLimits } = getPermissionsPayload(state);
 
             return Observable.defer(() => axios.all([
                 getResourceByPk(resourceId),
@@ -322,30 +334,18 @@ export const gnSaveDirectContent = (action$, store) =>
                         extension: resource?.extension,
                         href: resource?.href
                     };
-                    return Observable.concat(
-                        ...(compactPermissions ? [
-                            Observable.defer(() =>
-                                updateCompactPermissionsByPk(resourceId, cleanCompactPermissions(compactPermissions))
-                                    .then(output => ({ resource: currentResource, output, processType: ProcessTypes.PERMISSIONS_RESOURCE }))
-                                    .catch((error) => ({ resource: currentResource, error: error?.data?.detail || error?.statusText || error?.message || true, processType: ProcessTypes.PERMISSIONS_RESOURCE }))
-                            )
-                                .switchMap((payload) => {
-                                    return Observable.of(startAsyncProcess(payload));
-                                })
-                        ] : []),
-                        Observable.of(
-                            saveContent(
-                                resourceId,
-                                metadata,
-                                false,
-                                geoLimitsErrors.length > 0
-                                    ? {
-                                        title: 'gnviewer.warningGeoLimitsSaveTitle',
-                                        message: 'gnviewer.warningGeoLimitsSaveMessage'
-                                    }
-                                    : true /* showNotification */),
-                            resetGeoLimits()
-                        )
+                    return Observable.of(
+                        saveContent(
+                            resourceId,
+                            metadata,
+                            false,
+                            geoLimitsErrors.length > 0
+                                ? {
+                                    title: 'gnviewer.warningGeoLimitsSaveTitle',
+                                    message: 'gnviewer.warningGeoLimitsSaveMessage'
+                                }
+                                : true /* showNotification */),
+                        resetGeoLimits()
                     );
                 })
                 .catch((error) => {