From 7da186455f6fad9afd62be7f5802a4ee30667ef6 Mon Sep 17 00:00:00 2001 From: Vasiliy Sisko Date: Tue, 20 Nov 2018 14:13:48 +0700 Subject: [PATCH] IGNITE-9946 Web Console: Fixed fields validation order. --- .../frontend/app/primitives/datepicker/index.pug | 6 +++--- .../frontend/app/primitives/form-field/dropdown.pug | 6 +++--- .../frontend/app/primitives/form-field/email.pug | 6 +++--- .../frontend/app/primitives/form-field/number.pug | 6 +++--- .../frontend/app/primitives/form-field/password.pug | 8 ++++---- .../frontend/app/primitives/form-field/phone.pug | 5 +++-- .../frontend/app/primitives/form-field/text.pug | 6 +++--- .../frontend/app/primitives/form-field/typeahead.pug | 6 +++--- .../frontend/app/primitives/timepicker/index.pug | 6 +++--- 9 files changed, 28 insertions(+), 27 deletions(-) diff --git a/modules/web-console/frontend/app/primitives/datepicker/index.pug b/modules/web-console/frontend/app/primitives/datepicker/index.pug index 28cd1a06c24c2..dd586dc7d39b8 100644 --- a/modules/web-console/frontend/app/primitives/datepicker/index.pug +++ b/modules/web-console/frontend/app/primitives/datepicker/index.pug @@ -58,8 +58,8 @@ mixin form-field__datepicker({ label, model, name, mindate, maxdate, minview = 1 ng-messages=`$input.$error` ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid` ) - if block - block - if required +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) + + if block + block diff --git a/modules/web-console/frontend/app/primitives/form-field/dropdown.pug b/modules/web-console/frontend/app/primitives/form-field/dropdown.pug index 96d8482cfc8af..b13a17749b19f 100644 --- a/modules/web-console/frontend/app/primitives/form-field/dropdown.pug +++ b/modules/web-console/frontend/app/primitives/form-field/dropdown.pug @@ -50,8 +50,8 @@ mixin form-field__dropdown({ label, model, name, disabled, required, multiple, p ng-messages=`$input.$error` ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid` ) - if block - block - if required +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) + + if block + block diff --git a/modules/web-console/frontend/app/primitives/form-field/email.pug b/modules/web-console/frontend/app/primitives/form-field/email.pug index 5fb0c3019fc67..b1e120254cdd3 100644 --- a/modules/web-console/frontend/app/primitives/form-field/email.pug +++ b/modules/web-console/frontend/app/primitives/form-field/email.pug @@ -29,10 +29,10 @@ mixin form-field__email({ label, model, name, disabled, required, placeholder, t ng-messages=`$input.$error` ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid` ) - if block - block - if required +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) +form-field__error({ error: 'email', message: `${errLbl} has invalid format!` }) + + if block + block diff --git a/modules/web-console/frontend/app/primitives/form-field/number.pug b/modules/web-console/frontend/app/primitives/form-field/number.pug index ea907090e69d2..dfcfff36937bd 100644 --- a/modules/web-console/frontend/app/primitives/form-field/number.pug +++ b/modules/web-console/frontend/app/primitives/form-field/number.pug @@ -33,9 +33,6 @@ mixin form-field__number({ label, model, name, disabled, required, placeholder, ng-messages=`$input.$error` ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid` ) - if block - block - if required +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) @@ -46,3 +43,6 @@ mixin form-field__number({ label, model, name, disabled, required, placeholder, +form-field__error({ error: 'step', message: `${errLbl} step should be ${step || 1}` }) +form-field__error({ error: 'number', message: 'Only numbers allowed' }) + + if block + block diff --git a/modules/web-console/frontend/app/primitives/form-field/password.pug b/modules/web-console/frontend/app/primitives/form-field/password.pug index 374d768213639..5103281fd7c50 100644 --- a/modules/web-console/frontend/app/primitives/form-field/password.pug +++ b/modules/web-console/frontend/app/primitives/form-field/password.pug @@ -44,10 +44,10 @@ mixin form-field__password({ label, model, name, disabled, required, placeholder ($input2.$dirty || $input2.$touched || $input2.$submitted) && $input2.$invalid ` ) - if block - block - if required +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) - + +form-field__error({ error: 'mismatch', message: `Password does not match the confirm password!` }) + + if block + block diff --git a/modules/web-console/frontend/app/primitives/form-field/phone.pug b/modules/web-console/frontend/app/primitives/form-field/phone.pug index 9b60a40457b0b..4c794772dc621 100644 --- a/modules/web-console/frontend/app/primitives/form-field/phone.pug +++ b/modules/web-console/frontend/app/primitives/form-field/phone.pug @@ -29,8 +29,9 @@ mixin form-field__phone({ label, model, name, disabled, required, optional, plac ng-messages=`$input.$error` ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid` ) + if required + +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) + if block block - if required - +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) diff --git a/modules/web-console/frontend/app/primitives/form-field/text.pug b/modules/web-console/frontend/app/primitives/form-field/text.pug index ab8d14d2cbd26..5a2595ecc4c79 100644 --- a/modules/web-console/frontend/app/primitives/form-field/text.pug +++ b/modules/web-console/frontend/app/primitives/form-field/text.pug @@ -29,8 +29,8 @@ mixin form-field__text({ label, model, name, disabled, required, placeholder, ti ng-messages=`$input.$error` ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid` ) - if block - block - if required +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) + + if block + block diff --git a/modules/web-console/frontend/app/primitives/form-field/typeahead.pug b/modules/web-console/frontend/app/primitives/form-field/typeahead.pug index b2c62ae3d464e..ee2312f56366d 100644 --- a/modules/web-console/frontend/app/primitives/form-field/typeahead.pug +++ b/modules/web-console/frontend/app/primitives/form-field/typeahead.pug @@ -48,8 +48,8 @@ mixin form-field__typeahead({ label, model, name, disabled, required, placeholde ng-messages=`$input.$error` ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid` ) - if block - block - if required +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) + + if block + block diff --git a/modules/web-console/frontend/app/primitives/timepicker/index.pug b/modules/web-console/frontend/app/primitives/timepicker/index.pug index f97a5a2ce956a..9a4dd97bfb394 100644 --- a/modules/web-console/frontend/app/primitives/timepicker/index.pug +++ b/modules/web-console/frontend/app/primitives/timepicker/index.pug @@ -56,8 +56,8 @@ mixin form-field__timepicker({ label, model, name, mindate, maxdate, disabled, r ng-messages=`$input.$error` ng-show=`($input.$dirty || $input.$touched || $input.$submitted) && $input.$invalid` ) - if block - block - if required +form-field__error({ error: 'required', message: `${errLbl} could not be empty!` }) + + if block + block