From 223a9e4060786d7050363e73cf75474f172a9922 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 11 Nov 2020 20:03:53 +0000 Subject: [PATCH] Removed clearable from most forms, it's too "busy" and fucks up the look of the form for not much benefit maybe in future can look at only showing on mobile or something or when the field is active? --- ayanova/src/views/adm-translation.vue | 4 ---- ayanova/src/views/adm-user.vue | 7 ------ ayanova/src/views/ay-data-list-view.vue | 1 - ayanova/src/views/ay-report-edit.vue | 16 -------------- ayanova/src/views/cust-customer.vue | 22 ++++++++++++++----- ayanova/src/views/cust-user.vue | 4 ---- ayanova/src/views/home-notify-direct.vue | 1 - .../src/views/home-notify-subscription.vue | 2 +- ayanova/src/views/home-user-settings.vue | 9 +------- .../src/views/ops-notification-settings.vue | 12 ---------- ayanova/src/views/ops-server-state.vue | 1 - ayanova/src/views/widget.vue | 3 --- 12 files changed, 18 insertions(+), 64 deletions(-) diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue index 6087bcdf..0c34d464 100644 --- a/ayanova/src/views/adm-translation.vue +++ b/ayanova/src/views/adm-translation.vue @@ -60,9 +60,6 @@ v-model="obj.name" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('name')" - :counter="255" :label="$ay.t('Name')" :rules="[form().required(this, 'name')]" :error-messages="form().serverErrors(this, 'name')" @@ -132,7 +129,6 @@ v-model="props.item.display" label="Edit" single-line - :counter="255" > diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue index e26c1348..1ca28aa4 100644 --- a/ayanova/src/views/adm-user.vue +++ b/ayanova/src/views/adm-user.vue @@ -17,9 +17,6 @@ v-model="obj.name" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('name')" - :counter="255" :label="$ay.t('Name')" :rules="[form().required(this, 'name')]" :error-messages="form().serverErrors(this, 'name')" @@ -55,9 +52,6 @@ v-model="obj.employeeNumber" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('employeeNumber')" - :counter="255" :label="$ay.t('UserEmployeeNumber')" :error-messages="form().serverErrors(this, 'employeeNumber')" ref="employeeNumber" @@ -177,7 +171,6 @@ data-cy="notes" @input="fieldValueChanged('notes')" auto-grow - :clearable="!formState.readOnly" > diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue index 05fcef2e..8a82d045 100644 --- a/ayanova/src/views/ay-data-list-view.vue +++ b/ayanova/src/views/ay-data-list-view.vue @@ -13,7 +13,6 @@ :disabled="formState.readOnly" :clearable="!formState.readOnly" @click:clear="fieldValueChanged('name')" - :counter="255" :label="$ay.t('Name')" :rules="[form().required(this, 'name')]" :error-messages="form().serverErrors(this, 'name')" diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue index 8ec4bd9b..372a5fb1 100644 --- a/ayanova/src/views/ay-report-edit.vue +++ b/ayanova/src/views/ay-report-edit.vue @@ -60,9 +60,6 @@ v-model="obj.name" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('name')" - :counter="255" :label="$ay.t('ReportName')" :rules="[form().required(this, 'name')]" :error-messages="form().serverErrors(this, 'name')" @@ -110,7 +107,6 @@ data-cy="notes" @input="fieldValueChanged('notes')" auto-grow - :clearable="!formState.readOnly" > @@ -146,7 +142,6 @@ data-cy="headerTemplate" @input="fieldValueChanged('headerTemplate', 'formPDF')" auto-grow - :clearable="!formState.readOnly" > @@ -161,7 +156,6 @@ data-cy="footerTemplate" @input="fieldValueChanged('footerTemplate', 'formPDF')" auto-grow - :clearable="!formState.readOnly" > @@ -199,8 +193,6 @@ v-model="obj.marginOptionsBottom" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('marginOptionsBottom')" :label="$ay.t('ReportMarginOptionsBottom')" :error-messages=" form().serverErrors(this, 'marginOptionsBottom') @@ -216,8 +208,6 @@ v-model="obj.marginOptionsLeft" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('marginOptionsLeft')" :label="$ay.t('ReportMarginOptionsLeft')" :error-messages="form().serverErrors(this, 'marginOptionsLeft')" ref="marginOptionsLeft" @@ -231,8 +221,6 @@ v-model="obj.marginOptionsRight" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('marginOptionsRight')" :label="$ay.t('ReportMarginOptionsRight')" :error-messages=" form().serverErrors(this, 'marginOptionsRight') @@ -248,8 +236,6 @@ v-model="obj.marginOptionsTop" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('marginOptionsTop')" :label="$ay.t('ReportMarginOptionsTop')" :error-messages="form().serverErrors(this, 'marginOptionsTop')" ref="marginOptionsTop" @@ -289,8 +275,6 @@ v-model="obj.scale" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('scale')" :label="$ay.t('ReportScale')" :rules="[ form().decimalValid(this, 'scale'), diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue index 976eec76..f8ceb51d 100644 --- a/ayanova/src/views/cust-customer.vue +++ b/ayanova/src/views/cust-customer.vue @@ -12,10 +12,7 @@ v-model="obj.name" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('name')" - :counter="255" - :label="$ay.t('WidgetName')" + :label="$ay.t('CustomerName')" :rules="[form().required(this, 'name')]" :error-messages="form().serverErrors(this, 'name')" ref="name" @@ -52,11 +49,13 @@ > @@ -75,6 +74,8 @@ ref="emailAddress" data-cy="emailAddress" type="email" + :error-messages="form().serverErrors(this, 'emailAddress')" + @input="fieldValueChanged('emailAddress')" > @@ -93,6 +94,8 @@ ref="phone1" data-cy="phone1" type="tel" + :error-messages="form().serverErrors(this, 'phone1')" + @input="fieldValueChanged('phone1')" > @@ -111,6 +114,8 @@ ref="phone2" data-cy="phone2" type="tel" + :error-messages="form().serverErrors(this, 'phone2')" + @input="fieldValueChanged('phone2')" > @@ -129,6 +134,8 @@ ref="phone3" data-cy="phone3" type="tel" + :error-messages="form().serverErrors(this, 'phone3')" + @input="fieldValueChanged('phone3')" > @@ -147,6 +154,8 @@ ref="phone4" data-cy="phone4" type="tel" + :error-messages="form().serverErrors(this, 'phone4')" + @input="fieldValueChanged('phone4')" > @@ -165,6 +174,8 @@ ref="phone5" data-cy="phone5" type="tel" + :error-messages="form().serverErrors(this, 'phone5')" + @input="fieldValueChanged('phone5')" > @@ -179,7 +190,6 @@ data-cy="notes" @input="fieldValueChanged('notes')" auto-grow - :clearable="!formState.readOnly" > diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue index 99c38a1c..2e177184 100644 --- a/ayanova/src/views/cust-user.vue +++ b/ayanova/src/views/cust-user.vue @@ -59,9 +59,6 @@ v-model="obj.name" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('name')" - :counter="255" :label="$ay.t('Name')" :rules="[form().required(this, 'name')]" :error-messages="form().serverErrors(this, 'name')" @@ -182,7 +179,6 @@ data-cy="notes" @input="fieldValueChanged('notes')" auto-grow - :clearable="!formState.readOnly" > diff --git a/ayanova/src/views/home-notify-direct.vue b/ayanova/src/views/home-notify-direct.vue index c513ad32..f97b57d6 100644 --- a/ayanova/src/views/home-notify-direct.vue +++ b/ayanova/src/views/home-notify-direct.vue @@ -44,7 +44,6 @@ :label="$ay.t('MemoMessage')" ref="message" auto-grow - :clearable="!formState.readOnly" @input="checkSave()" > diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue index eb18ba2a..ca08359f 100644 --- a/ayanova/src/views/home-notify-subscription.vue +++ b/ayanova/src/views/home-notify-subscription.vue @@ -102,7 +102,7 @@ :disabled="formState.readOnly" :clearable="!formState.readOnly" @click:clear="fieldValueChanged('deliveryAddress')" - :counter="255" + :label="$ay.t('NotifyDeliveryAddress')" :rules="[form().required(this, 'deliveryAddress')]" :error-messages="form().serverErrors(this, 'deliveryAddress')" diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue index 329abfdb..5c37b88c 100644 --- a/ayanova/src/views/home-user-settings.vue +++ b/ayanova/src/views/home-user-settings.vue @@ -22,13 +22,12 @@ @@ -37,8 +36,6 @@ v-model="obj.currencyName" hint="e.g. USD, EUR, GBP, AUD, CAD etc" :readonly="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('currencyName')" :label="$ay.t('CurrencyCode')" :rules="[form().required(this, 'currencyName')]" :error-messages="form().serverErrors(this, 'currencyName')" @@ -63,8 +60,6 @@ v-model="obj.languageOverride" :placeholder="locale().getBrowserFirstLanguage()" :readonly="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('languageOverride')" :label="$ay.t('LanguageCode')" :error-messages="form().serverErrors(this, 'languageOverride')" ref="languageOverride" @@ -77,8 +72,6 @@ v-model="obj.timeZoneOverride" :placeholder="locale().getBrowserTimeZoneName()" :readonly="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('timeZoneOverride')" :label="$ay.t('TimeZone')" :error-messages="form().serverErrors(this, 'timeZoneOverride')" ref="timeZoneOverride" diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue index 345a91a9..8f9a6103 100644 --- a/ayanova/src/views/ops-notification-settings.vue +++ b/ayanova/src/views/ops-notification-settings.vue @@ -62,8 +62,6 @@ v-model="obj.smtpServerAddress" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('smtpServerAddress')" :label="$ay.t('SmtpServerAddress')" :rules="[form().required(this, 'smtpServerAddress')]" :error-messages="form().serverErrors(this, 'smtpServerAddress')" @@ -77,8 +75,6 @@ v-model="obj.smtpAccount" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('smtpAccount')" :label="$ay.t('SmtpAccount')" :rules="[form().required(this, 'smtpAccount')]" :error-messages="form().serverErrors(this, 'smtpAccount')" @@ -93,8 +89,6 @@ v-model="obj.smtpPassword" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('smtpPassword')" :label="$ay.t('SmtpPassword')" :rules="[form().required(this, 'smtpPassword')]" :error-messages="form().serverErrors(this, 'smtpPassword')" @@ -129,8 +123,6 @@ v-model="obj.smtpServerPort" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('smtpServerPort')" :label="$ay.t('SmtpServerPort')" :rules="[ form().integerValid(this, 'smtpServerPort'), @@ -149,8 +141,6 @@ v-model="obj.notifyFromAddress" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('notifyFromAddress')" :label="$ay.t('NotifyFromAddress')" :rules="[form().required(this, 'notifyFromAddress')]" :error-messages="form().serverErrors(this, 'notifyFromAddress')" @@ -165,8 +155,6 @@ v-model="obj.ayaNovaServerURL" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('ayaNovaServerURL')" :label="$ay.t('AyaNovaServerURL')" :rules="[form().required(this, 'ayaNovaServerURL')]" :error-messages="form().serverErrors(this, 'ayaNovaServerURL')" diff --git a/ayanova/src/views/ops-server-state.vue b/ayanova/src/views/ops-server-state.vue index d90a83fa..4cb58f52 100644 --- a/ayanova/src/views/ops-server-state.vue +++ b/ayanova/src/views/ops-server-state.vue @@ -35,7 +35,6 @@ data-cy="reason" @input="fieldValueChanged('reason')" auto-grow - :clearable="!formState.readOnly" > diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue index ebfeca91..7ea5e41b 100644 --- a/ayanova/src/views/widget.vue +++ b/ayanova/src/views/widget.vue @@ -12,9 +12,6 @@ v-model="obj.name" :readonly="formState.readOnly" :disabled="formState.readOnly" - :clearable="!formState.readOnly" - @click:clear="fieldValueChanged('name')" - :counter="255" :label="$ay.t('WidgetName')" :rules="[form().required(this, 'name')]" :error-messages="form().serverErrors(this, 'name')"