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

Refactor tooltip rendering and update dependencies #55

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Refactor tooltip rendering and update dependencies #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96497fe
Refactor tooltip rendering in Settings.vue
stephdl Oct 29, 2024
2817f9e
vscode autoformat
stephdl Oct 29, 2024
24ec6ba
Update @nethserver/ns8-ui-lib to version 1.1.4
stephdl Oct 29, 2024
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
2 changes: 1 addition & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@carbon/icons-vue": "^10.37.0",
"@carbon/vue": "^2.40.0",
"@nethserver/ns8-ui-lib": "^0.1.20",
"@nethserver/ns8-ui-lib": "^1.1.4",
"await-to-js": "^3.0.0",
"axios": "^0.21.2",
"carbon-components": "^10.41.0",
Expand Down
19 changes: 11 additions & 8 deletions ui/src/views/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
tooltipDirection="right"
>
<template slot="tooltip">
<div
v-html="
<div>
{{
$t(
'settings.hostname_must_be_relevant_for_user_authentication'
"settings.hostname_must_be_relevant_for_user_authentication"
)
"
></div>
}}
</div>
</template>
</NsTextInput>
<NsComboBox
Expand Down Expand Up @@ -100,7 +100,7 @@
ref="webadmin"
>
<template slot="tooltip">
<span v-html="$t('settings.admin_login_tips')"></span>
<span>{{ $t("settings.admin_login_tips") }}</span>
</template>
<template slot="text-left">{{
$t("settings.disabled")
Expand All @@ -114,7 +114,9 @@
kind="ghost"
class="mg-left"
:icon="Launch20"
:disabled="loading.getConfiguration || loading.configureModule"
:disabled="
loading.getConfiguration || loading.configureModule
"
@click="goToEjabberdWebAdmin"
>
{{ $t("settings.open_ejabberd_webapp") }}
Expand Down Expand Up @@ -489,7 +491,8 @@ export default {
}
//validate normal speed < fast speed
if (parseInt(this.shaper_normal) > parseInt(this.shaper_fast)) {
this.error.shaper_normal = "error.shaper_normal_must_be_inferior_to_shaper_fast";
this.error.shaper_normal =
"error.shaper_normal_must_be_inferior_to_shaper_fast";
this.shaper_normal = this.shaper_fast;
if (isValidationOk) {
this.focusElement("shaper_normal");
Expand Down
8 changes: 4 additions & 4 deletions ui/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,10 +1012,10 @@
call-me-maybe "^1.0.1"
glob-to-regexp "^0.3.0"

"@nethserver/ns8-ui-lib@^0.1.20":
version "0.1.20"
resolved "https://registry.yarnpkg.com/@nethserver/ns8-ui-lib/-/ns8-ui-lib-0.1.20.tgz#375e662fec47d7d4a29e33b349636707b6ac777a"
integrity sha512-xRak1AS4lXU6+r5CJMYzux4gHI15qqz9Gu2qphOSW7jT13u6eUnp3NtYTjuDGv9P6Up0BLbK3VCjEBlHLi+BZQ==
"@nethserver/ns8-ui-lib@^1.1.4":
version "1.1.4"
resolved "https://registry.npmmirror.com/@nethserver/ns8-ui-lib/-/ns8-ui-lib-1.1.4.tgz#6e8a47356c43773527c2d410e907c3dbe41326e2"
integrity sha512-z5lpixFPFlhBejMIYOFG6+YS74wcoppg1bat3WM1HTVo5gmpE3GVMOOIz+A2ThO9S/4ecWs6LG/GT/syQI2k5A==
dependencies:
"@rollup/plugin-json" "^4.1.0"
core-js "^3.15.2"
Expand Down
Loading