Enhance pending state handler for dataset (#2079)

Author: dsuren1

geonode_mapstore_client/client/js/epics/gnresource.js

@@ -95,10 +95,10 @@ import {
 } from '@js/utils/ResourceUtils';
 import {
     canAddResource,
+    getInitialDatasetLayer,
     getResourceData,
     getResourceId,
-    getResourceThumbnail,
-    getSelectedLayer
+    getResourceThumbnail
 } from '@js/selectors/resource';
 import { updateAdditionalLayer } from '@mapstore/framework/actions/additionallayers';
 import { STYLE_OWNER_NAME } from '@mapstore/framework/utils/StyleEditorUtils';
@@ -431,7 +431,7 @@ const resourceTypes = {
 // collect all the reset action needed before changing a viewer
 const getResetActions = (state, isSameResource) => {
     const initialResource = state?.gnresource?.initialResource;
-    const initialLayer = initialResource && initialResource.resource_type === ResourceTypes.DATASET && resourceToLayerConfig(initialResource);
+    const initialLayer = getInitialDatasetLayer(state);
     return [
         resetControls(),
         ...(!isSameResource
@@ -537,7 +537,7 @@ export const gnViewerRequestResourceConfig = (action$, store) =>
                     ...action.options,
                     isSamePreviousResource,
                     resourceData,
-                    selectedLayer: isSamePreviousResource && getSelectedLayer(state),
+                    selectedLayer: isSamePreviousResource && getInitialDatasetLayer(state),
                     params: {...action?.options?.params, query}
                 }),
                 Observable.of(

geonode_mapstore_client/client/js/epics/gnsave.js

@@ -11,6 +11,7 @@ import { Observable } from 'rxjs';
 import get from 'lodash/get';
 import castArray from 'lodash/castArray';
 import omit from 'lodash/omit';
+import isEmpty from 'lodash/isEmpty';
 
 import { mapInfoSelector } from '@mapstore/framework/selectors/map';
 import { userSelector } from '@mapstore/framework/selectors/security';
@@ -62,8 +63,7 @@ import {
     getResourceId,
     getDataPayload,
     getCompactPermissions,
-    getExtentPayload,
-    getSelectedLayer
+    getExtentPayload
 } from '@js/selectors/resource';
 
 import {
@@ -102,16 +102,18 @@ function parseMapBody(body) {
 }
 
 const setDefaultStyle = (state, id) => {
-    const {style: currentStyle} = getSelectedNode(state) ?? {};
-    const {style: initalStyle} = getSelectedLayer(state) ?? {};
-
     const layer = getUpdatedLayer(state);
     const styleName = selectedStyleSelector(state);
-    const defaultStyle = layer.availableStyles.filter(({ name }) => styleName === name);
-    const filteredStyles = layer.availableStyles.filter(({ name }) => styleName !== name);
-    const availableStyles = [...defaultStyle, ...filteredStyles];
+    let availableStyles = [];
+    if (!isEmpty(layer.availableStyles)) {
+        const defaultStyle = layer.availableStyles.filter(({ name }) => styleName === name);
+        const filteredStyles = layer.availableStyles.filter(({ name }) => styleName !== name);
+        availableStyles =  [...defaultStyle, ...filteredStyles];
+    }
+    const {style: currentStyleName} = getSelectedNode(state) ?? {};
+    const initalStyleName = layer?.availableStyles?.[0]?.name;
 
-    if (id && currentStyle !== initalStyle) {
+    if (id && initalStyleName && currentStyleName !== initalStyleName) {
         const { baseUrl = '' } = styleServiceSelector(state);
         return {
             request: () => LayersAPI.updateDefaultStyle({

geonode_mapstore_client/client/js/selectors/resource.js

@@ -12,7 +12,7 @@ import { compareMapChanges } from '@mapstore/framework/utils/MapUtils';
 import { currentStorySelector } from '@mapstore/framework/selectors/geostory';
 import { originalDataSelector } from '@mapstore/framework/selectors/dashboard';
 import { widgetsConfig } from '@mapstore/framework/selectors/widgets';
-import { ResourceTypes, RESOURCE_MANAGEMENT_PROPERTIES } from '@js/utils/ResourceUtils';
+import { ResourceTypes, RESOURCE_MANAGEMENT_PROPERTIES, resourceToLayerConfig } from '@js/utils/ResourceUtils';
 import {
     getCurrentResourceDeleteLoading,
     getCurrentResourceCopyLoading
@@ -228,6 +228,11 @@ 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) {
+    const initialResource = state?.gnresource?.initialResource;
+    return initialResource && initialResource.resource_type === ResourceTypes.DATASET && resourceToLayerConfig(omit(initialResource, ['default_style']));
+}
+
 function isResourceDataEqual(state, initialData = {}, currentData = {}) {
     const resourceType = state?.gnresource?.type;
     if (isEmpty(initialData) || isEmpty(currentData)) {
@@ -300,11 +305,10 @@ function isResourceDataEqual(state, initialData = {}, currentData = {}) {
         const selectedLayerInitial = getSelectedLayer(state);
         const initialLayerData = {...selectedLayerInitial, ...initialData};
 
-        const isSettingsEqual = compareObjects(currentData, initialLayerData);
-        const isStyleEqual = selectedLayer?.style === initialLayerData?.style;
-        const isAttributesEqual = !isEmpty(initialLayerData)
-            && !isEmpty(selectedLayer)
-            && isEqual(initialLayerData?.fields, selectedLayer.fields);
+        const isSettingsEqual = compareObjects(omit(currentData, ['style', 'fields']), omit(initialLayerData, ['style', 'fields']));
+        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);
 
         return isSettingsEqual && isAttributesEqual && isStyleEqual;
     }