mirror of
https://gitlab.com/bramw/baserow.git
synced 2025-04-03 04:35:31 +00:00
Fix various validations and errors
This commit is contained in:
Bram Wiepjes
parent
bd2d1817f8
commit
89ec974dfc
11 changed files with 20 additions and 41 deletions
enterprise/web-frontend/modules/baserow_enterprise/components/admin
premium/web-frontend/modules/baserow_premium/components/license
web-frontend/modules
core
components
locales
pages
database/components
|
|
@ -3,7 +3,7 @@
|
|||
<FormGroup
|
||||
small-label
|
||||
required
|
||||
:error="fieldHasErrors('domain')"
|
||||
:error="fieldHasErrors('domain') || !!serverErrors.domain"
|
||||
class="margin-bottom-2"
|
||||
>
|
||||
<template #label>
|
||||
|
|
@ -21,13 +21,15 @@
|
|||
ref="domain"
|
||||
v-model="v$.values.domain.$model"
|
||||
size="large"
|
||||
:error="fieldHasErrors('domain') || serverErrors.domain"
|
||||
:error="fieldHasErrors('domain') || !!serverErrors.domain"
|
||||
:placeholder="$t('samlSettingsForm.domainPlaceholder')"
|
||||
@input="onDomainInput()"
|
||||
@blur="v$.values.domain.$touch"
|
||||
></FormInput>
|
||||
<template #error>
|
||||
{{ v$.values.domain.$errors[0]?.$message }}
|
||||
{{
|
||||
v$.values.domain.$errors[0]?.$message || serverErrors.domain[0].error
|
||||
}}
|
||||
</template>
|
||||
</FormGroup>
|
||||
|
||||
|
|
@ -42,14 +44,17 @@
|
|||
ref="metadata"
|
||||
v-model="v$.values.metadata.$model"
|
||||
:rows="12"
|
||||
:error="fieldHasErrors('metadata') || serverErrors.metadata"
|
||||
:error="fieldHasErrors('metadata') || !!serverErrors.metadata"
|
||||
:placeholder="$t('samlSettingsForm.metadataPlaceholder')"
|
||||
@input="onMetadataInput()"
|
||||
@blur="v$.values.metadata.$touch"
|
||||
></FormTextarea>
|
||||
|
||||
<template #error>
|
||||
{{ v$.values.metadata.$errors[0]?.$message }}
|
||||
{{
|
||||
v$.values.metadata.$errors[0]?.$message ||
|
||||
serverErrors.metadata[0].error
|
||||
}}
|
||||
</template>
|
||||
</FormGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
<DownloadLink
|
||||
:url="finishedJob.url"
|
||||
:filename="getExportedFilename(finishedJob)"
|
||||
loading-class="button-icon--loading"
|
||||
>
|
||||
<template #default="{ loading: downloadLoading }">
|
||||
<div v-if="downloadLoading" class="loading"></div>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
v-model="v$.values.license.$model"
|
||||
:error="fieldHasErrors('license')"
|
||||
:rows="6"
|
||||
@blur="v$.values.license.$touch()"
|
||||
/>
|
||||
|
||||
<template #error>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
:label="$t('changePasswordForm.newPassword')"
|
||||
class="margin-bottom-2"
|
||||
>
|
||||
{{ v$.values }}
|
||||
<PasswordInput
|
||||
v-model="values.password"
|
||||
:validation-state="v$.values.password"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
v-model="v$.values.url.$model"
|
||||
size="large"
|
||||
:error="v$.values.url.$error"
|
||||
@blur="v$.values.url.$touch()"
|
||||
>
|
||||
</FormInput>
|
||||
|
||||
|
|
|
|||
|
|
@ -477,10 +477,7 @@
|
|||
"passwordPlaceholder": "Enter your password..",
|
||||
"passwordRepeatPlaceholder": "Confirm your password..",
|
||||
"loginText": "Already have an account?",
|
||||
"login": "Login",
|
||||
"agreeTerms": "By creating an account, you agree to the {0} {1} {2}",
|
||||
"terms": "Terms of Service",
|
||||
"privacyPolicy": "Privacy Policy"
|
||||
"login": "Login"
|
||||
},
|
||||
"forgotPassword": {
|
||||
"title": "Forgot password",
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<div>
|
||||
<div
|
||||
v-for="(status, checkName) in healthChecks"
|
||||
:key="status"
|
||||
:key="checkName"
|
||||
class="admin-health__check-item"
|
||||
>
|
||||
<div class="admin-health__check-item-label">
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ export default {
|
|||
const token = this.$route.params.token
|
||||
await AuthService(this.$client).resetPassword(
|
||||
token,
|
||||
this.state.password
|
||||
this.account.password
|
||||
)
|
||||
this.success = true
|
||||
this.loading = false
|
||||
|
|
|
|||
|
|
@ -36,11 +36,7 @@
|
|||
</template>
|
||||
<template v-else>
|
||||
<template v-if="loginButtons.length">
|
||||
<LoginButtons
|
||||
:invitation="invitation"
|
||||
:original="original"
|
||||
:hide-if-no-buttons="true"
|
||||
/>
|
||||
<LoginButtons :invitation="invitation" :hide-if-no-buttons="true" />
|
||||
|
||||
<div class="auth__separator">
|
||||
{{ $t('common.or') }}
|
||||
|
|
@ -57,25 +53,7 @@
|
|||
<LoginActions
|
||||
v-if="!shouldShowAdminSignupPage"
|
||||
:invitation="invitation"
|
||||
>
|
||||
<!-- <li class="auth__action-link">
|
||||
<i18n path="signup.agreeTerms" tag="span">
|
||||
<a
|
||||
href="https://baserow.io/terms-and-conditions"
|
||||
target="_blank"
|
||||
@click.stop
|
||||
>{{ $t('signup.terms') }}
|
||||
</a>
|
||||
{{ $t('common.and') }}
|
||||
<a
|
||||
href="https://baserow.io/privacy-policy"
|
||||
target="_blank"
|
||||
@click.stop
|
||||
>{{ $t('signup.privacyPolicy') }}
|
||||
</a>
|
||||
</i18n>
|
||||
</li> -->
|
||||
</LoginActions>
|
||||
></LoginActions>
|
||||
</template>
|
||||
</template>
|
||||
</div>
|
||||
|
|
@ -135,11 +113,6 @@ export default {
|
|||
loginButtons: 'authProvider/getAllLoginButtons',
|
||||
passwordLoginEnabled: 'authProvider/getPasswordLoginEnabled',
|
||||
}),
|
||||
termsofServiceURL() {
|
||||
return this.$nuxt.$router.resolve({
|
||||
name: 'terms',
|
||||
}).href
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
next(params) {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
v-model="v$.values.name.$model"
|
||||
:error="fieldHasErrors('name')"
|
||||
:placeholder="$t('fieldForm.name')"
|
||||
@blur="v$.values.name.$touch()"
|
||||
@input="isPrefilledWithSuggestedFieldName = false"
|
||||
@keydown.enter="handleKeydownEnter($event)"
|
||||
></FormInput>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
v-model="v$.values.name.$model"
|
||||
size="large"
|
||||
:error="fieldHasErrors('name')"
|
||||
@blur="v$.values.name.$touch()"
|
||||
>
|
||||
</FormInput>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue