Merge commit 'ccef351258dddab5178d29c7780cc4d47b738b0a' into #2153_settings

Author: dsuren1

geonode_mapstore_client/client/js/api/geonode/v2/index.js

@@ -374,6 +374,11 @@ export const updateDataset = (pk, body) => {
         .then(({ data }) => (data.dataset));
 };
 
+export const updateResource = (pk, body) => {
+    return axios.patch(getEndpointUrl(RESOURCES, `/${pk}`), body)
+        .then(({ data }) => (data.resource));
+};
+
 export const updateDocument = (pk, body) => {
     return axios.patch(getEndpointUrl(DOCUMENTS, `/${pk}`), body)
         .then(({ data }) => data.document);
@@ -771,5 +776,6 @@ export default {
     deleteExecutionRequest,
     getResourceByTypeAndByPk,
     createDataset,
-    getMetadataDownloadLinkByPk
+    getMetadataDownloadLinkByPk,
+    updateResource
 };

geonode_mapstore_client/client/js/epics/gnresource.js

@@ -97,6 +97,7 @@ import {
 import {
     canAddResource,
     getInitialDatasetLayer,
+    getInitialDatasetLayerStyle,
     getResourceData,
     getResourceId,
     getResourceThumbnail
@@ -538,7 +539,7 @@ export const gnViewerRequestResourceConfig = (action$, store) =>
                     ...action.options,
                     isSamePreviousResource,
                     resourceData,
-                    selectedLayer: isSamePreviousResource && getInitialDatasetLayer(state),
+                    selectedLayer: isSamePreviousResource && {...getInitialDatasetLayer(state), style: getInitialDatasetLayerStyle(state)},
                     params: {...action?.options?.params, query}
                 }),
                 Observable.of(

geonode_mapstore_client/client/js/epics/gnsave.js

@@ -51,7 +51,9 @@ import {
     updateDocument,
     setMapThumbnail,
     updateCompactPermissionsByPk,
-    getResourceByUuid
+    getResourceByUuid,
+    updateDatasetTimeSeries,
+    updateResource as updateResourceAPI
 } from '@js/api/geonode/v2';
 import { parseDevHostname } from '@js/utils/APIUtils';
 import uuid from 'uuid';
@@ -63,7 +65,8 @@ import {
     getResourceId,
     getDataPayload,
     getCompactPermissions,
-    getExtentPayload
+    getExtentPayload,
+    getInitialDatasetLayerStyle
 } from '@js/selectors/resource';
 
 import {
@@ -80,13 +83,13 @@ import {
     toGeoNodeMapConfig,
     RESOURCE_PUBLISHING_PROPERTIES,
     RESOURCE_OPTIONS_PROPERTIES,
-    getDimensions
+    getDimensions,
+    isDefaultDatasetSubtype
 } from '@js/utils/ResourceUtils';
 import {
     ProcessTypes,
     ProcessStatus
 } from '@js/utils/ResourceServiceUtils';
-import { updateDatasetTimeSeries } from '@js/api/geonode/v2/index';
 import { updateNode, updateSettingsParams } from '@mapstore/framework/actions/layers';
 import { layersSelector, getSelectedLayer as getSelectedNode } from '@mapstore/framework/selectors/layers';
 import { styleServiceSelector, getUpdatedLayer, selectedStyleSelector } from '@mapstore/framework/selectors/styleeditor';
@@ -112,9 +115,9 @@ const setDefaultStyle = (state, id) => {
         availableStyles =  [...defaultStyle, ...filteredStyles];
     }
     const {style: currentStyleName} = getSelectedNode(state) ?? {};
-    const initalStyleName = layer?.availableStyles?.[0]?.name;
+    const initialStyleName = getInitialDatasetLayerStyle(state);
 
-    if (id && initalStyleName && currentStyleName !== initalStyleName) {
+    if (id && initialStyleName && currentStyleName !== initialStyleName) {
         const { baseUrl = '' } = styleServiceSelector(state);
         return {
             request: () => LayersAPI.updateDefaultStyle({
@@ -171,21 +174,23 @@ const SaveAPI = {
             ...(timeseries && { has_time: timeseries?.has_time })
         };
         const { request, actions } = setDefaultStyle(state, id); // set default style, if modified
-
-        return request().then(() => (id
+        return request().then(() => {
+            const patchResource = !isDefaultDatasetSubtype(currentResource?.subtype) ? updateResourceAPI : updateDataset;
+            return (id
             // perform dataset and timeseries updates sequentially to avoid race conditions
-            ? updateDataset(id, updatedBody).then((resource) =>
-                updateDatasetTimeSeries(id, timeseries).then(() => resource)
-            ) : Promise.resolve())
-            .then((_resource) => {
-                let resource = omit(_resource, 'default_style');
-                if (timeseries) {
-                    const layerId = layersSelector(state)?.find((l) => l.pk === resource?.pk)?.id;
-                    // actions to be dispacted are added to response array
-                    return [resource, updateNode(layerId, 'layers', { dimensions: get(resource, 'data.dimensions', []) }), ...actions];
-                }
-                return [resource, ...actions];
-            }));
+                ? patchResource(id, updatedBody).then((resource) =>
+                    timeseries ? updateDatasetTimeSeries(id, timeseries).then(() => resource) : Promise.resolve(resource)
+                ) : Promise.resolve())
+                .then((_resource) => {
+                    let resource = omit(_resource, 'default_style');
+                    if (timeseries) {
+                        const layerId = layersSelector(state)?.find((l) => l.pk === resource?.pk)?.id;
+                        // actions to be dispacted are added to response array
+                        return [resource, updateNode(layerId, 'layers', { dimensions: get(resource, 'data.dimensions', []) }), ...actions];
+                    }
+                    return [resource, ...actions];
+                });
+        });
     },
     [ResourceTypes.VIEWER]: (state, id, body) => {
         const user = userSelector(state);
@@ -225,7 +230,7 @@ export const gnSaveContent = (action$, store) =>
             const { compactPermissions } = getPermissionsPayload(state);
             return Observable.defer(() => SaveAPI[contentType](state, action.id, body, action.reload))
                 .switchMap((response) => {
-                    const [resource, ...actions] = castArray(response);
+                    let [resource, ...actions] = castArray(response);
                     if (action.reload) {
                         if (contentType === ResourceTypes.VIEWER) {
                             const sourcepk = get(state, 'router.location.pathname', '').split('/').pop();
@@ -235,6 +240,11 @@ export const gnSaveContent = (action$, store) =>
                         window.location.reload();
                         return Observable.empty();
                     }
+                    const selectedLayer = getSelectedNode(state);
+                    const currentStyle = selectedLayer?.availableStyles?.find(({ name }) => selectedLayer?.style?.includes(name));
+                    // adding default style upon saving resource for correct style comparison
+                    const defaultStyle =  currentStyle ? { sld_title: currentStyle.title, name: selectedLayer?.style } : null;
+                    resource = {...resource, default_style: defaultStyle};
                     return Observable.merge(
                         Observable.of(
                             saveSuccess(resource),

geonode_mapstore_client/client/js/selectors/resource.js

@@ -232,10 +232,20 @@ function isMapCenterEqual(initialCenter = {}, currentCenter = {}) {
     return initialCenter.crs === currentCenter.crs && Math.abs(initialCenter.x - currentCenter.x) < CENTER_EPS && Math.abs(initialCenter.y - currentCenter.y) < CENTER_EPS;
 }
 
-export function getInitialDatasetLayer(state) {
+export const getInitialDatasetResource = (state) => {
     const initialResource = state?.gnresource?.initialResource;
-    return initialResource && initialResource.resource_type === ResourceTypes.DATASET && resourceToLayerConfig(omit(initialResource, ['default_style']));
-}
+    return initialResource && initialResource.resource_type === ResourceTypes.DATASET ? initialResource : null;
+};
+
+export const getInitialDatasetLayer = (state) => {
+    const initialResource = getInitialDatasetResource(state);
+    return initialResource && resourceToLayerConfig(omit(initialResource, ['default_style']));
+};
+
+export const getInitialDatasetLayerStyle = (state) => {
+    const initialResource = getInitialDatasetResource(state);
+    return initialResource ? resourceToLayerConfig(initialResource)?.style : null;
+};
 
 function isResourceDataEqual(state, initialData = {}, currentData = {}) {
     const resourceType = state?.gnresource?.type;
@@ -308,12 +318,17 @@ function isResourceDataEqual(state, initialData = {}, currentData = {}) {
         const selectedLayer = getSelectedNode(state);
         const selectedLayerInitial = getSelectedLayer(state);
         const initialLayerData = {...selectedLayerInitial, ...initialData};
+        const initialStyle = getInitialDatasetLayerStyle(state);
 
         const isSettingsEqual = compareObjects(omit(currentData, ['style', 'fields']),
             omit(initialLayerData, ['style', 'fields', 'extendedParams', 'pk', '_v_', 'isDataset', 'perms']));
-        const isStyleEqual = isEmpty(selectedLayer?.availableStyles) || isEmpty(selectedLayer?.style) ? true
-            : selectedLayer?.style === selectedLayer?.availableStyles?.[0]?.name;
-        const isAttributesEqual = isEmpty(selectedLayer) ? true : !isEmpty(initialLayerData) && isEqual(initialLayerData?.fields, selectedLayer.fields);
+        const isStyleEqual = isEmpty(initialStyle) || isEmpty(selectedLayer?.style) ? true
+            : selectedLayer?.style === initialStyle;
+        const isAttributesEqual = isEmpty(selectedLayer) ? true
+            : !isEmpty(initialLayerData) && isEqual(
+                isEmpty(initialLayerData?.fields) ? {} : initialLayerData?.fields,
+                isEmpty(selectedLayer?.fields) ? {} : selectedLayer?.fields
+            );
 
         return isSettingsEqual && isAttributesEqual && isStyleEqual;
     }

geonode_mapstore_client/client/version.txt

@@ -1 +1 @@
-geonode-mapstore-client-v4.0.0-419786b06dee3a4bbc04b05d064eef1e0284bb84
+geonode-mapstore-client-v4.0.0-54c993e308fefb3edb52b11da971f733fc6ba0c6