mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-05 07:57:46 +02:00
Code Issues Releases Wiki Activity

Extension state exceptions

Browse Source
This commit is contained in:
SychO9
2021-09-29 11:03:13 +01:00
parent e19c9ea67c
commit 77f0dca47e
10 changed files with 101 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
extensions/package-manager/js/dist/admin.js vendored
View File

@@ -646,13 +646,30 @@ __webpack_require__.r(__webpack_exports__);
/* harmony default export */ __webpack_exports__["default"] = (function (e) {
var error = e.response.errors[0];
if (error.code !== 'composer_command_failure') {
if (!['composer_command_failure', 'extension_already_installed', 'extension_not_installed'].includes(error.code)) {
throw e;
}
flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default.a.modal.show(_components_ComposerFailureModal__WEBPACK_IMPORTED_MODULE_1__["default"], {
error: error
});
switch (error.code) {
case 'composer_command_failure':
flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default.a.modal.show(_components_ComposerFailureModal__WEBPACK_IMPORTED_MODULE_1__["default"], {
error: error
});
break;
case 'extension_already_installed':
flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default.a.alerts.show({
type: 'error'
}, flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default.a.translator.trans('sycho-package-manager.admin.exceptions.extension_already_installed'));
flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default.a.modal.close();
break;
case 'extension_not_installed':
flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default.a.alerts.show({
type: 'error'
}, flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default.a.translator.trans('sycho-package-manager.admin.exceptions.extension_not_installed'));
flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default.a.modal.close();
}
});
/***/ }),

2
extensions/package-manager/js/dist/admin.js.map vendored
View File

File diff suppressed because one or more lines are too long

17
extensions/package-manager/js/src/admin/utils/errorHandler.ts
View File

@@ -4,9 +4,22 @@ import ComposerFailureModal from "../components/ComposerFailureModal";
export default function (e: any) {
const error = e.response.errors[0];
if (error.code !== 'composer_command_failure') {
if (!['composer_command_failure', 'extension_already_installed', 'extension_not_installed'].includes(error.code)) {
throw e;
}
app.modal.show(ComposerFailureModal, { error });
switch (error.code) {
case 'composer_command_failure':
app.modal.show(ComposerFailureModal, { error });
break;
case 'extension_already_installed':
app.alerts.show({ type: 'error' }, app.translator.trans('sycho-package-manager.admin.exceptions.extension_already_installed'));
app.modal.close();
break;
case 'extension_not_installed':
app.alerts.show({ type: 'error' }, app.translator.trans('sycho-package-manager.admin.exceptions.extension_not_installed'));
app.modal.close();
}
}