YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Improve UX in validation

Browse source
This commit is contained in:
ljf 2021-09-13 02:36:16 +02:00
parent b9b0dd906f
commit abfd018a46
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/components/globals/CardForm.vue
View file

@ -46,12 +46,12 @@ export default {
computed: { computed: {
disabled () { disabled () {
return this.validation ? this.validation.$invalid : false return false // this.validation ? this.validation.$invalid : false
}, },
errorFeedback () { errorFeedback () {
if (this.serverError) return this.serverError if (this.serverError) return this.serverError
else if (this.validation && this.validation.$invalid) { else if (this.validation && this.validation.$anyError) {
return this.$t('invalid_form') return this.$i18n.t('form_errors.invalid_form')
} else return '' } else return ''
} }
}, },

2
app/src/components/globals/FormField.vue
View file

@ -36,7 +36,7 @@
</div> </div>
<vue-showdown :markdown="description" flavor="github" v-if="description" <vue-showdown :markdown="description" flavor="github" v-if="description"
:class="{ ['alert p-1 px-2 alert-' + descriptionVariant]: descriptionVariant }" :class="{ ['alert p-1 px-2 alert-' + descriptionVariant]: descriptionVariant }"
/> />
</template> </template>
<!-- Slot available to overwrite the one above --> <!-- Slot available to overwrite the one above -->

3
app/src/components/globals/formItems/ReadOnlyAlertItem.vue
View file

@ -2,7 +2,8 @@
<b-alert :variant="type" show> <b-alert :variant="type" show>
<icon :iname="icon_" /> <icon :iname="icon_" />
<vue-showdown :markdown="label" flavor="github" <vue-showdown :markdown="label" flavor="github"
tag="span" class="markdown" /> tag="span" class="markdown"
/>
</b-alert> </b-alert>
</template> </template>

2
app/src/helpers/yunohostArguments.js
View file

@ -100,7 +100,7 @@ export function formatYunoHostArgument (arg) {
if (!isNaN(parseInt(arg.max))) { if (!isNaN(parseInt(arg.max))) {
validation.maxValue = validators.maxValue(parseInt(arg.max)) validation.maxValue = validators.maxValue(parseInt(arg.max))
} }
validation.numValue = validators.numeric validation.numValue = validators.helpers.regex('Please provide an integer', new RegExp('^-?[0-9]+$'))
} }
}, },
{ {

3
app/src/i18n/locales/en.json
View file

@ -183,7 +183,8 @@
"passwordMatch": "Passwords don't match.", "passwordMatch": "Passwords don't match.",
"required": "Field is required.", "required": "Field is required.",
"remote": "{message}", "remote": "{message}",
"pattern": "{type}" "pattern": "{type}",
"invalid_form": "The form contains some errors."
}, },
"form_input_example": "Example: {example}", "form_input_example": "Example: {example}",
"from_to": "from {0} to {1}", "from_to": "from {0} to {1}",

1
app/src/views/user/UserList.vue
View file

@ -26,7 +26,6 @@
<icon iname="download" /> {{ $t('users_export') }} <icon iname="download" /> {{ $t('users_export') }}
</b-dropdown-item> </b-dropdown-item>
</b-dropdown> </b-dropdown>
</template> </template>
<b-list-group> <b-list-group>