#8448 - devToTest #1254

Merged
alexm merged 365 commits from 8448-devToTest into test 2025-01-21 10:44:46 +00:00
11 changed files with 61 additions and 45 deletions
Showing only changes of commit 5b415a8398 - Show all commits

View File

@ -2,9 +2,9 @@
import { ref } from 'vue'; import { ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnRow from '../ui/VnRow.vue'; import VnRow from '../ui/VnRow.vue';
import VnInput from './VnInput.vue';
import FetchData from '../FetchData.vue'; import FetchData from '../FetchData.vue';
import useNotify from 'src/composables/useNotify'; import useNotify from 'src/composables/useNotify';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const props = defineProps({ const props = defineProps({
submitFn: { type: Function, default: () => {} }, submitFn: { type: Function, default: () => {} },
@ -70,19 +70,19 @@ defineExpose({ show: () => changePassDialog.value.show() });
</QCardSection> </QCardSection>
<QForm ref="form"> <QForm ref="form">
<QCardSection> <QCardSection>
<VnInput <VnInputPassword
v-if="props.askOldPass" v-if="props.askOldPass"
:label="t('Old password')" :label="t('Old password')"
v-model="passwords.oldPassword" v-model="passwords.oldPassword"
type="password"
:required="true" :required="true"
:toggle-visibility="true"
autofocus autofocus
/> />
<VnInput <VnInputPassword
:label="t('New password')" :label="t('New password')"
v-model="passwords.newPassword" v-model="passwords.newPassword"
type="password"
:required="true" :required="true"
:toggle-visibility="true"
:info=" :info="
t('passwordRequirements', { t('passwordRequirements', {
length: requirements.length, length: requirements.length,
@ -95,10 +95,10 @@ defineExpose({ show: () => changePassDialog.value.show() });
autofocus autofocus
/> />
<VnInput <VnInputPassword
:label="t('Repeat password')" :label="t('Repeat password')"
v-model="passwords.repeatPassword" v-model="passwords.repeatPassword"
type="password" :toggle-visibility="true"
/> />
</QCardSection> </QCardSection>
</QForm> </QForm>

View File

@ -45,6 +45,7 @@ const $props = defineProps({
}); });
const vnInputRef = ref(null); const vnInputRef = ref(null);
const showPassword = ref(false);
const value = computed({ const value = computed({
get() { get() {
return $props.modelValue; return $props.modelValue;
@ -134,7 +135,7 @@ const handleInsertMode = (e) => {
hide-bottom-space hide-bottom-space
:data-cy="$attrs.dataCy ?? $attrs.label + '_input'" :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
> >
<template v-if="$slots.prepend" #prepend> <template #prepend>
<slot name="prepend" /> <slot name="prepend" />
</template> </template>
<template #append> <template #append>
@ -158,7 +159,7 @@ const handleInsertMode = (e) => {
emit('remove'); emit('remove');
} }
" "
></QIcon> />
<slot name="append" v-if="$slots.append && !$attrs.disabled" /> <slot name="append" v-if="$slots.append && !$attrs.disabled" />
<QIcon v-if="info" name="info"> <QIcon v-if="info" name="info">
<QTooltip max-width="350px"> <QTooltip max-width="350px">
@ -169,18 +170,3 @@ const handleInsertMode = (e) => {
</QInput> </QInput>
</div> </div>
</template> </template>
<i18n>
en:
inputMin: Must be more than {value}
maxLength: The value exceeds {value} characters
inputMax: Must be less than {value}
es:
inputMin: Debe ser mayor a {value}
maxLength: El valor excede los {value} carácteres
inputMax: Debe ser menor a {value}
</i18n>
<style lang="scss">
.q-field__append {
padding-inline: 0;
}
</style>

View File

@ -0,0 +1,31 @@
<script setup>
import VnInput from 'src/components/common/VnInput.vue';
import { ref } from 'vue';
const model = defineModel({ type: [Number, String] });
const $props = defineProps({
toggleVisibility: {
type: Boolean,
default: false,
},
});
const showPassword = ref(false);
</script>
<template>
<VnInput
v-bind="{ ...$attrs }"
v-model="model"
:type="
$props.toggleVisibility ? (showPassword ? 'text' : 'password') : $attrs.type
"
>
<template #append v-if="toggleVisibility">
<QIcon
:name="showPassword ? 'visibility_off' : 'visibility'"
class="cursor-pointer"
@click="showPassword = !showPassword"
/>
</template>
</VnInput>
</template>

View File

@ -6,6 +6,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import FetchData from 'components/FetchData.vue'; import FetchData from 'components/FetchData.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const { t } = useI18n(); const { t } = useI18n();
const router = useRouter(); const router = useRouter();
@ -61,10 +62,10 @@ const redirectToAccountBasicData = (_, { id }) => {
hide-selected hide-selected
:rules="validate('VnUser.roleFk')" :rules="validate('VnUser.roleFk')"
/> />
<VnInput <VnInputPassword
v-model="data.password" v-model="data.password"
:label="t('ldap.password')" :label="t('ldap.password')"
type="password" :toggle-visibility="true"
:rules="validate('VnUser.password')" :rules="validate('VnUser.password')"
/> />
<QCheckbox <QCheckbox

View File

@ -8,6 +8,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import { useArrayData } from 'src/composables/useArrayData'; import { useArrayData } from 'src/composables/useArrayData';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import axios from 'axios'; import axios from 'axios';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const { t } = useI18n(); const { t } = useI18n();
const { notify } = useNotify(); const { notify } = useNotify();
@ -128,10 +129,9 @@ onMounted(async () => await getInitialLdapConfig());
:required="true" :required="true"
:rules="validate('LdapConfig.rdn')" :rules="validate('LdapConfig.rdn')"
/> />
<VnInput <VnInputPassword
:label="t('ldap.password')" :label="t('ldap.password')"
clearable clearable
type="password"
v-model="data.password" v-model="data.password"
:required="true" :required="true"
:rules="validate('LdapConfig.password')" :rules="validate('LdapConfig.password')"

View File

@ -4,9 +4,9 @@ import { computed, ref } from 'vue';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import AccountSummary from './Card/AccountSummary.vue'; import AccountSummary from './Card/AccountSummary.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import VnInput from 'src/components/common/VnInput.vue';
import VnSection from 'src/components/common/VnSection.vue'; import VnSection from 'src/components/common/VnSection.vue';
import FetchData from 'src/components/FetchData.vue'; import FetchData from 'src/components/FetchData.vue';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const { t } = useI18n(); const { t } = useI18n();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
@ -168,10 +168,9 @@ function exprBuilder(param, value) {
> >
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<QCardSection> <QCardSection>
<VnInput <VnInputPassword
:label="t('Password')" :label="t('Password')"
v-model="data.password" v-model="data.password"
type="password"
:required="true" :required="true"
autocomplete="new-password" autocomplete="new-password"
/> />

View File

@ -8,6 +8,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import { useArrayData } from 'src/composables/useArrayData'; import { useArrayData } from 'src/composables/useArrayData';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import axios from 'axios'; import axios from 'axios';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const { t } = useI18n(); const { t } = useI18n();
const { notify } = useNotify(); const { notify } = useNotify();
@ -143,10 +144,9 @@ onMounted(async () => await getInitialSambaConfig());
v-model="data.adUser" v-model="data.adUser"
:rules="validate('SambaConfigs.adUser')" :rules="validate('SambaConfigs.adUser')"
/> />
<VnInput <VnInputPassword
:label="t('samba.passwordAD')" :label="t('samba.passwordAD')"
clearable clearable
type="password"
v-model="data.adPassword" v-model="data.adPassword"
/> />
<VnInput <VnInput

View File

@ -9,6 +9,7 @@ import { useArrayData } from 'src/composables/useArrayData';
import VnConfirm from 'src/components/ui/VnConfirm.vue'; import VnConfirm from 'src/components/ui/VnConfirm.vue';
import VnChangePassword from 'src/components/common/VnChangePassword.vue'; import VnChangePassword from 'src/components/common/VnChangePassword.vue';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const $props = defineProps({ const $props = defineProps({
hasAccount: { hasAccount: {
@ -97,14 +98,13 @@ async function sync() {
<QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip> <QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip>
</QIcon></QCheckbox </QIcon></QCheckbox
> >
<QInput <VnInputPassword
v-if="shouldSyncPassword" v-if="shouldSyncPassword"
:label="t('login.password')" :label="t('login.password')"
v-model="syncPassword" v-model="syncPassword"
class="full-width" class="full-width"
clearable clearable
clear-icon="close" clear-icon="close"
type="password"
/> />
</template> </template>
</VnConfirm> </VnConfirm>

View File

@ -3,7 +3,7 @@ import { ref } from 'vue';
import { Notify } from 'quasar'; import { Notify } from 'quasar';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
import { useSession } from 'src/composables/useSession'; import { useSession } from 'src/composables/useSession';
import { useLogin } from 'src/composables/useLogin'; import { useLogin } from 'src/composables/useLogin';
@ -63,11 +63,10 @@ async function onSubmit() {
:rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]" :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
color="primary" color="primary"
/> />
<VnInput <VnInputPassword
type="password"
v-model="password" v-model="password"
:label="t('login.password')" :label="t('login.password')"
lazy-rules :toggle-visibility="true"
:rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]" :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
class="red" class="red"
/> />

View File

@ -7,6 +7,7 @@ import axios from 'axios';
import VnInput from 'components/common/VnInput.vue'; import VnInput from 'components/common/VnInput.vue';
import VnOutForm from 'components/ui/VnOutForm.vue'; import VnOutForm from 'components/ui/VnOutForm.vue';
import VnInputPassword from 'src/components/common/VnInputPassword.vue';
const quasar = useQuasar(); const quasar = useQuasar();
const router = useRouter(); const router = useRouter();
@ -54,8 +55,7 @@ async function onSubmit() {
<template> <template>
<VnOutForm @submit="onSubmit" :title="t('globals.pageTitles.resetPassword')"> <VnOutForm @submit="onSubmit" :title="t('globals.pageTitles.resetPassword')">
<template #default> <template #default>
<VnInput <VnInputPassword
type="password"
:label="t('login.password')" :label="t('login.password')"
v-model="newPassword" v-model="newPassword"
:info=" :info="
@ -72,9 +72,8 @@ async function onSubmit() {
<template #prepend> <template #prepend>
<QIcon name="password" /> <QIcon name="password" />
</template> </template>
</VnInput> </VnInputPassword>
<VnInput <VnInputPassword
type="password"
:label="t('resetPassword.repeatPassword')" :label="t('resetPassword.repeatPassword')"
v-model="repeatPassword" v-model="repeatPassword"
required required
@ -82,7 +81,7 @@ async function onSubmit() {
<template #prepend> <template #prepend>
<QIcon name="password" /> <QIcon name="password" />
</template> </template>
</VnInput> </VnInputPassword>
</template> </template>
<template #buttons> <template #buttons>
<QBtn <QBtn

View File

@ -19,6 +19,7 @@ describe('Login', () => {
it('should fail to log in using wrong password', () => { it('should fail to log in using wrong password', () => {
cy.get('input[aria-label="Username"]').type('employee'); cy.get('input[aria-label="Username"]').type('employee');
cy.get('input[aria-label="Password"]').type('wrongPassword'); cy.get('input[aria-label="Password"]').type('wrongPassword');
cy.get('.q-field__append > .q-icon');
cy.get('button[type="submit"]').click(); cy.get('button[type="submit"]').click();
cy.get('.q-notification__message').should( cy.get('.q-notification__message').should(
'have.text', 'have.text',