diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index aaf8539f..713048ec 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -14,7 +14,6 @@ "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "octref.vetur", - "shenjiaolong.vue-helper", "streetsidesoftware.code-spell-checker" ] } diff --git a/build-images.sh b/build-images.sh index 64c20d31..9f4d0b4c 100644 --- a/build-images.sh +++ b/build-images.sh @@ -37,7 +37,7 @@ buildah add "${container}" ui/dist /ui # Setup the entrypoint, ask to reserve one TCP port with the label and set a rootless container buildah config --entrypoint=/ \ --label="org.nethserver.max-per-node=1" \ - --label="org.nethserver.min-core=3.6.0-0" \ + --label="org.nethserver.min-core=3.20.1" \ --label="org.nethserver.volumes=dovecot-data" \ --label="org.nethserver.images=$(printf "${repobase}/mail-%s:${IMAGETAG:-latest} " \ dovecot \ diff --git a/tests/15__ui.robot b/tests/15__ui.robot index 55d1fe8e..7fae011f 100644 --- a/tests/15__ui.robot +++ b/tests/15__ui.robot @@ -1,5 +1,4 @@ *** Settings *** -Library Browser *** Variables *** ${ADMIN_USER} admin @@ -20,6 +19,7 @@ Login to cluster-admin Take screenshots [Tags] ui + Import Library Browser New Browser chromium headless=True New Context ignoreHTTPSErrors=True Login to cluster-admin diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js index 94b61b31..75603c23 100644 --- a/ui/.eslintrc.js +++ b/ui/.eslintrc.js @@ -8,7 +8,7 @@ module.exports = { parser: "@babel/eslint-parser", }, rules: { - "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", + "no-console": "off", "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off", }, }; diff --git a/ui/package.json b/ui/package.json index 2c42e902..0e2545e2 100644 --- a/ui/package.json +++ b/ui/package.json @@ -12,37 +12,37 @@ "dependencies": { "@carbon/icons-vue": "^10.37.0", "@carbon/vue": "^2.40.0", - "@nethserver/ns8-ui-lib": "^1.3.1", + "@nethserver/ns8-ui-lib": "^2.0.0", "await-to-js": "^3.0.0", - "axios": "^0.32.0", + "axios": "^1.18.1", "carbon-components": "^10.41.0", "core-js": "^3.6.5", "lottie-web-vue": "^1.2.0", "sass": "^1.34.1", - "vue": "^2.6.11", + "vue": "^2.7.0", "vue-axios": "^3.2.4", "vue-date-fns": "^2.0.1", "vue-i18n": "^8.24.4", "vue-infinite-loading": "^2.4.5", + "vue-loader": "^15.10.0", "vue-router": "^3.2.0", "vue2-debounce": "^1.0.1", "vuex": "^3.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.11.0", - "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-eslint": "~4.5.0", - "@vue/cli-plugin-router": "~4.5.0", - "@vue/cli-plugin-vuex": "~4.5.0", - "@vue/cli-service": "~4.5.0", + "@vue/cli-plugin-babel": "~4.5.18", + "@vue/cli-plugin-eslint": "~4.5.18", + "@vue/cli-plugin-router": "~4.5.18", + "@vue/cli-plugin-vuex": "~4.5.18", + "@vue/cli-service": "~4.5.18", "@vue/eslint-config-prettier": "^6.0.0", "eslint": "^6.7.2", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^6.2.2", "mark.js": "^8.11.1", "prettier": "^2.2.1", - "sass-loader": "^10.1.1", - "vue-template-compiler": "^2.6.11" + "sass-loader": "^10.1.1" }, "resolutions": { "@babel/traverse": "7.29.7" diff --git a/ui/src/assets/module_default_logo.png b/ui/src/assets/module_default_logo.png index e31a72f7..f719c00b 100644 Binary files a/ui/src/assets/module_default_logo.png and b/ui/src/assets/module_default_logo.png differ diff --git a/ui/src/components/AppMobileSideMenu.vue b/ui/src/components/AppMobileSideMenu.vue index 523e16ff..e46e91a4 100644 --- a/ui/src/components/AppMobileSideMenu.vue +++ b/ui/src/components/AppMobileSideMenu.vue @@ -6,13 +6,7 @@
diff --git a/ui/src/views/Status.vue b/ui/src/views/Status.vue index a25760af..845beb1c 100644 --- a/ui/src/views/Status.vue +++ b/ui/src/views/Status.vue @@ -150,7 +150,9 @@ :totalFileCountLabel="core.$t('backup.total_file_count')" :backupDisabledLabel="core.$t('common.disabled')" :showMoreLabel="core.$t('common.show_more')" - :multipleUncertainStatusLabel="core.$t('backup.some_backups_failed_or_are_pending')" + :multipleUncertainStatusLabel=" + core.$t('backup.some_backups_failed_or_are_pending') + " :moduleId="instanceName" :moduleUiName="instanceLabel" :repositories="backupRepositories" diff --git a/ui/src/views/settings/SettingsMailboxes.vue b/ui/src/views/settings/SettingsMailboxes.vue index 74eede13..221a0b67 100644 --- a/ui/src/views/settings/SettingsMailboxes.vue +++ b/ui/src/views/settings/SettingsMailboxes.vue @@ -203,7 +203,9 @@