Skip to content

[Backport 5.0.x] Fix: Swipe not initialization correctly with saved config #2249

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
allyoucanmap merged 1 commit into from
Nov 26, 2025
Merged

[Backport 5.0.x] Fix: Swipe not initialization correctly with saved config #2249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 23 additions & 9 deletions 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 @@ -121,6 +121,7 @@ import {
setCreationStep
} from '@mapstore/framework/actions/contextcreator';
import { setContext } from '@mapstore/framework/actions/context';
import { REDUCERS_LOADED } from '@mapstore/framework/actions/storemanager';
import { wrapStartStop } from '@mapstore/framework/observables/epics';
import { parseDevHostname } from '@js/utils/APIUtils';
import { ProcessTypes } from '@js/utils/ResourceServiceUtils';
Expand Down Expand Up @@ -231,22 +232,34 @@ const resourceTypes = {
]))
.switchMap(([baseConfig, resource]) => {
const [mapResource, mapViewerResource] = resource ?? [];
const viewerData = mapViewerResource?.data ?? null;
const viewerPk = mapViewerResource?.pk;
const mapConfig = options.data
? options.data
: toMapStoreMapConfig(mapResource, baseConfig);
return Observable.of(
configureMap(mapConfig),
setControlProperty('toolbar', 'expanded', false),
setContext(mapViewerResource ? mapViewerResource.data : null),
setResource(mapResource),

const initialActions = Observable.of(
setContext(viewerData),
setResourceId(pk),
setResource(mapResource),
setMapViewerLinkedResource(mapViewerResource),
setResourcePathParameters({
...options?.params,
appPk: mapViewerResource?.pk,
hasViewer: !!mapViewerResource?.pk
})
appPk: viewerPk,
hasViewer: !!viewerPk
}),
setControlProperty("toolbar", "expanded", false)
);

// Wait for module plugin reducers to load before configuring map
// This ensures dynamic plugin reducers are ready to restore state
const waitForReducers$ = viewerData && options?.action$
? Observable.race(
options.action$.ofType(REDUCERS_LOADED).take(1),
Observable.timer(5000) // timeout as safety fallback only
) : Observable.of(null);

return Observable.concat(initialActions, waitForReducers$.map(() => configureMap(mapConfig)));
}),
newResourceObservable: (options) => {
const queryDatasetParts = (options?.query?.['gn-dataset'] || '').split(':');
Expand Down Expand Up @@ -540,7 +553,8 @@ export const gnViewerRequestResourceConfig = (action$, store) =>
isSamePreviousResource,
resourceData,
selectedLayer: isSamePreviousResource && {...getInitialDatasetLayer(state), style: getInitialDatasetLayerStyle(state)},
params: {...action?.options?.params, query}
params: {...action?.options?.params, query},
action$
}),
Observable.of(
loadingResourceConfig(false)
Expand Down