Skip to content
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

[Backport 4.x][Fixes 1174] Error not correctly shown error (#1176) #1184

Merged
merged 1 commit into from
Sep 9, 2022
Merged

[Backport 4.x][Fixes 1174] Error not correctly shown error (#1176) #1184

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
4 changes: 2 additions & 2 deletions geonode_mapstore_client/client/js/routes/upload/UploadCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ function UploadCard({
: null}
{(state === 'INVALID' || status === 'failed')
? <>
{!errorLog ? <ErrorMessageWithTooltip tooltipId={<Message msgId={`gnviewer.${getUploadErrorMessageFromCode(error?.code)}`} msgParams={{ limit: getUploadErrorMessageFromCode(error?.code) === 'fileExceeds' ? maxAllowedSize : maxParallelUploads }} />} />
: <ErrorMessageWithTooltip tooltip={getUploadErrorMessageFromCode(null, errorLog)} />
{!errorLog ? <ErrorMessageWithTooltip tooltipPosition="left" tooltipId={<Message msgId={`gnviewer.${getUploadErrorMessageFromCode(error?.code)}`} msgParams={{ limit: getUploadErrorMessageFromCode(error?.code) === 'fileExceeds' ? maxAllowedSize : maxParallelUploads }} />} />
: <ErrorMessageWithTooltip tooltipPosition="left" tooltip={getUploadErrorMessageFromCode(null, errorLog)} />
}
</>
: null}
Expand Down
4 changes: 3 additions & 1 deletion geonode_mapstore_client/client/js/utils/ErrorUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

export const getUploadErrorMessageFromCode = (code, log) => {
if (log) {
return log;
// Make the error log more human readable
const errorMsg = log.replace(/[()]/g, '')?.replace(/[\[\]']+/g, '')?.split('ErrorDetailstring=')?.join(' ');
return errorMsg;
}
switch (code) {
case 'upload_parallelism_limit_exceeded': {
Expand Down