diff --git a/package.json b/package.json index 64004f37..da3b8435 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "salix": "cd ../salix && gulp back", "db": "cd ../salix && gulp docker", "cy:open": "npm run db && cypress open", - "test:e2e": "npm run db && cypress run", + "test:e2e": "npm run db && cypress run --headed --config video=false", "test:unit": "vitest", "build": "rm -rf dist/ ; quasar build", "clean": "rm -rf dist/", diff --git a/quasar.config.js b/quasar.config.js index 84e934d1..a9d50c62 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -23,7 +23,7 @@ module.exports = configure(function (ctx) { // app boot file (/src/boot) // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli-webpack/boot-files - boot: ['i18n', 'axios', 'vnDate', 'error-handler', 'app'], + boot: ['i18n', 'axios', 'vnDate', 'app'], // https://v2.quasar.dev/quasar-cli-webpack/quasar-config-js#Property%3A-css css: ['app.scss', 'width.scss', 'responsive.scss'], diff --git a/src/boot/error-handler.js b/src/boot/error-handler.js deleted file mode 100644 index 1e11c952..00000000 --- a/src/boot/error-handler.js +++ /dev/null @@ -1,66 +0,0 @@ -export default async ({ app }) => { - /* - window.addEventListener('error', - e => onWindowError(e)); - window.addEventListener('unhandledrejection', - e => onWindowRejection(e)); - - ,onWindowError(event) { - errorHandler(event.error); - } - ,onWindowRejection(event) { - errorHandler(event.reason); - } -*/ - app.config.errorHandler = (err, vm, info) => { - errorHandler(err, vm) - } - - function errorHandler (err, vm) { - let message - let tMessage - let res = err.response - - // XXX: Compatibility with old JSON service - if (err.name === 'JsonException') { - res = { - status: err.statusCode, - data: { error: { message: err.message } } - } - } - - if (res) { - const status = res.status - - if (status >= 400 && status < 500) { - switch (status) { - case 401: - tMessage = 'loginFailed' - break - case 403: - tMessage = 'authenticationRequired' - vm.$router.push('/login') - break - case 404: - tMessage = 'notFound' - break - default: - message = res.data.error.message - } - } else if (status >= 500) { - tMessage = 'internalServerError' - } - } else { - tMessage = 'somethingWentWrong' - console.error(err) - } - - if (tMessage) { - message = vm.$t(tMessage) - } - vm.$q.notify({ - message, - type: 'negative' - }) - } -} diff --git a/src/components/common/FormModel.vue b/src/components/common/FormModel.vue new file mode 100644 index 00000000..fc5d1217 --- /dev/null +++ b/src/components/common/FormModel.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue index 508ce132..7dcf1164 100644 --- a/src/components/common/VnInput.vue +++ b/src/components/common/VnInput.vue @@ -1,15 +1,20 @@