Skip to content

#2628: Fix - Display error instead of indefinite loading in resource viewer #2629

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

Open
dsuren1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#2628: Fix - Display error instead of indefinite loading in resource viewer #2629

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 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 @@ -136,7 +136,7 @@ import {
import { setContext, setResource as setResourceContext } 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 { getStatusMessage, parseDevHostname } from '@js/utils/APIUtils';
import { ProcessTypes } from '@js/utils/ResourceServiceUtils';
import { catalogClose, addLayerAndDescribe } from '@mapstore/framework/actions/catalog';
import { VisualizationModes } from '@mapstore/framework/utils/MapTypeUtils';
Expand Down Expand Up @@ -604,7 +604,7 @@ export const gnViewerRequestNewResourceConfig = (action$, store) =>
.catch((error) => {
return Observable.of(
...getResetActions(),
resourceConfigError(error?.data?.detail || error?.statusText || error?.message)
resourceConfigError(error?.data?.detail || getStatusMessage(error) || error?.message)
);
});
});
Expand Down Expand Up @@ -660,7 +660,7 @@ export const gnViewerRequestResourceConfig = (action$, store) =>
.catch((error) => {
return Observable.of(
...getResetActions(),
resourceConfigError(error?.data?.detail || error?.statusText || error?.message)
resourceConfigError(error?.data?.detail || getStatusMessage(error) || error?.message)
);
});
});
Expand Down
16 changes: 16 additions & 0 deletions geonode_mapstore_client/client/js/utils/APIUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,22 @@ export const paramsSerializer = () => {
};
};

/**
* A simple fallback for status text, which may be empty in HTTP/2 responses.
* This is used to avoid infinite loading (spinner) on resource viewer.
* @param {object} error error object
* @returns {string} status message
*/
export const getStatusMessage = (error) => {
const statusMessages = {
401: 'Unauthorized',
403: 'Forbidden',
404: 'Not Found',
500: 'Internal Server Error'
};
return error?.statusText || statusMessages[error?.status] || 'Unknown Error';
};

export const getResourcesSearchIndex = () => {
return getGeoNodeLocalConfig('geoNodeSettings.resourcesSearchIndex');
};
Expand Down
Loading