Skip to content

[5.2] MediaManager: improve error handling #38536

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
Hackwar merged 10 commits into from
Jan 18, 2025
Merged

[5.2] MediaManager: improve error handling #38536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3ba695b
MediaManager: improve error handling
Fedik Aug 19, 2022
b5feda2
jscs
Fedik Aug 19, 2022
f941ab7
Sync. Merge branch '4.3-dev' into mediamanager-erroring
Fedik May 3, 2023
07ad15c
Redo changes after conflict
Fedik May 3, 2023
647fd18
Redo changes after conflict
Fedik May 3, 2023
2b382f1
Merge branch '4.3-dev' into mediamanager-erroring
QuyTon Jul 21, 2023
1fbc4b7
Merge branch '4.3-dev' into mediamanager-erroring
obuisard Aug 10, 2023
2e13c16
Merge branch '5.2-dev' into mediamanager-erroring
Hackwar Jan 16, 2025
8b01df6
Merge branch '5.2-dev' into mediamanager-erroring
richard67 Jan 18, 2025
7887000
Merge branch '5.2-dev' into mediamanager-erroring
Hackwar Jan 18, 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
12 changes: 12 additions & 0 deletions administrator/components/com_media/resources/scripts/app/Api.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,18 @@ function handleError(error) {
const response = JSON.parse(error.response);
if (response.message) {
notifications.error(response.message);
// Check for App messages queue
if (response.messages) {
Object.keys(response.messages).forEach((type) => {
response.messages[type].forEach((message) => {
if (type === 'error') {
notifications.error(message);
} else {
notifications.notify(message);
}
});
});
}
} else {
switch (error.status) {
case 409:
Expand Down
11 changes: 10 additions & 1 deletion administrator/components/com_media/resources/scripts/app/Notifications.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function notify(message, options) {
}

const notifications = {
/* Send and success notification */
/* Send a success notification */
success: (message, options) => {
notify(message, {
type: 'message', // @todo rename it to success
Expand All @@ -38,6 +38,15 @@ const notifications = {
});
},

/* Send a general notification */
notify: (message, options) => {
notify(message, {
type: 'message',
dismiss: true,
...options,
});
},

/* Ask the user a question */
ask: (message) => window.confirm(message),
};
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/lib_joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload. You can change the limits for your site in the component options."
JLIB_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
JLIB_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
JLIB_MEDIA_ERROR_WARNIEXSS="The file looks suspicious, therefore cannot be uploaded."
JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/lib_joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
JLIB_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
JLIB_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
JLIB_MEDIA_ERROR_WARNIEXSS="The file looks suspicious, therefore cannot be uploaded."
JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
Expand Down