Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/MapStore2
Submodule MapStore2 updated 185 files
1 change: 0 additions & 1 deletion geonode_mapstore_client/client/js/epics/gnresource.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ const resourceTypes = {
? axios.all([{...resource}, getGeoAppByPk(mapViewers?.pk, {api_preset: 'catalog_list', include: ['data', 'linked_resources']})])
: Promise.resolve([{...resource}]);
})
.catch(() => null)
]))
.switchMap(([baseConfig, resource]) => {
const [mapResource, mapViewerResource] = resource ?? [];
Expand Down
7 changes: 6 additions & 1 deletion geonode_mapstore_client/client/js/routes/Viewer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ function ViewerRoute({
const Loader = loaderComponent;
const className = `page-${resourceType || name}-viewer page-viewer`;

if (configErrorStatus && configErrorStatus === 401) {
window.location.href = `/account/login/?next=${encodeURIComponent(window.location.pathname + window.location.hash)}`;
return null;
}

return (
<>
{resource && <MetaTags
Expand All @@ -135,7 +140,7 @@ function ViewerRoute({
params={params}
/>
{loading && Loader && <Loader style={loaderStyle}/>}
{(configErrorStatus && configErrorStatus == 403) ? <Error403Fallback /> : (configError && <MainEventView msgId={configError}/>)}
{(configErrorStatus && configErrorStatus === 403) ? <Error403Fallback /> : (configError && <MainEventView msgId={configError}/>)}
</>
);
}
Expand Down
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
geonode-mapstore-client-v5.0.x-a5d7fabcd2ce1534e6ab19e6ed234f3214d4713c
geonode-mapstore-client-v5.0.x-9c4fb1d6c3fddee0d9aebc8a8d45b58f17500486

This file was deleted.

Loading
Loading