Skip to content

[Fixes #2184] Saving map layer settings for a dataset calls the wrong URL #2185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
giohappy merged 4 commits into from
Nov 1, 2025
Merged

[Fixes #2184] Saving map layer settings for a dataset calls the wrong URL #2185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f2ef39
#2184: Fix - Saving map layer settings for a dataset calls the wrong URL
dsuren1 Oct 16, 2025
24efec6
code refactor
dsuren1 Oct 16, 2025
d99a378
typo fix
dsuren1 Oct 16, 2025
6a7b66b
Merge branch 'master' into #2184_save_fix
giohappy Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion geonode_mapstore_client/client/js/epics/gnresource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ import {
import {
canAddResource,
getInitialDatasetLayer,
getInitialDatasetLayerStyle,
getResourceData,
getResourceId,
getResourceThumbnail
Expand Down Expand Up @@ -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(
Expand Down
14 changes: 10 additions & 4 deletions geonode_mapstore_client/client/js/epics/gnsave.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ import {
getResourceId,
getDataPayload,
getCompactPermissions,
getExtentPayload
getExtentPayload,
getInitialDatasetLayerStyle
} from '@js/selectors/resource';

import {
Expand Down Expand Up @@ -113,9 +114,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({
Expand Down Expand Up @@ -228,7 +229,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();
Expand All @@ -238,6 +239,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),
Expand Down
21 changes: 16 additions & 5 deletions geonode_mapstore_client/client/js/selectors/resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -308,11 +318,12 @@ 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 isStyleEqual = isEmpty(initialStyle) || isEmpty(selectedLayer?.style) ? true
: selectedLayer?.style === initialStyle;
const isAttributesEqual = isEmpty(selectedLayer) ? true
: !isEmpty(initialLayerData) && isEqual(
isEmpty(initialLayerData?.fields) ? {} : initialLayerData?.fields,
Expand Down