From 9e31cf10be7de71722fc853e6a5de24f574421a4 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Tue, 13 Sep 2016 12:24:17 +0100
Subject: [PATCH] #726 form field validators (base support)

---
 .../widgets/checkbox/checkbox.widget.html     |  1 +
 .../widgets/core/form-field-types.ts          |  1 +
 .../widgets/core/form-field-validator.ts      | 72 +++++++++++++++++++
 .../widgets/core/form-field.model.ts          | 16 ++++-
 .../src/components/widgets/core/form.model.ts |  1 +
 .../src/components/widgets/core/index.ts      |  1 +
 .../widgets/number/number.widget.html         |  1 +
 7 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts

diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/checkbox/checkbox.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/checkbox/checkbox.widget.html
index 67862db94d..1e7ba71ff5 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/checkbox/checkbox.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/checkbox/checkbox.widget.html
@@ -1,6 +1,7 @@
 <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" [attr.for]="field.id">
     <input type="checkbox"
            [attr.id]="field.id"
+           [attr.required]="isRequired()"
            class="mdl-checkbox__input"
            [(ngModel)]="field.value"
            (ngModelChange)="checkVisibility(field)"
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts
index 2f66c51901..4884865bc2 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-types.ts
@@ -30,6 +30,7 @@ export class FormFieldTypes {
     static FUNCTIONAL_GROUP: string = 'functional-group';
     static PEOPLE: string = 'people';
     static BOOLEAN: string = 'boolean';
+    static NUMBER: string = 'integer';
 
     static READONLY_TYPES: string[] = [
         FormFieldTypes.HYPERLINK,
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts
new file mode 100644
index 0000000000..60b243b38a
--- /dev/null
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts
@@ -0,0 +1,72 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { FormFieldModel } from './form-field.model';
+import { FormFieldTypes } from './form-field-types';
+
+export interface FormFieldValidator {
+
+    isSupported(field: FormFieldModel): boolean;
+    validate(field: FormFieldModel): boolean;
+
+}
+
+export class RequiredFieldValidator implements FormFieldValidator {
+
+    private supportedTypes = [
+        FormFieldTypes.TEXT,
+        FormFieldTypes.MULTILINE_TEXT,
+        FormFieldTypes.NUMBER
+    ];
+
+    isSupported(field: FormFieldModel): boolean {
+        return field &&
+            field.required &&
+            this.supportedTypes.indexOf(field.type) > -1;
+    }
+
+    validate(field: FormFieldModel): boolean {
+        if (this.isSupported(field)) {
+            if (!field.value) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+}
+
+export class NumberFieldValidator implements FormFieldValidator {
+
+    private supportedTypes = [
+        FormFieldTypes.NUMBER
+    ];
+
+    private pattern: string = '-?[0-9]*(\.[0-9]+)?';
+
+    isSupported(field: FormFieldModel): boolean {
+        return field && this.supportedTypes.indexOf(field.type) > -1;
+    }
+
+    validate(field: FormFieldModel): boolean {
+        if (this.isSupported(field)) {
+            return !(this.pattern && field.value && (field.value.length > 0) && !field.value.match(new RegExp('^' + this.pattern + '$')));
+        }
+        return true;
+    }
+
+}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
index 44b0eccad8..b4821e37ed 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts
@@ -19,6 +19,7 @@ import { FormWidgetModel } from './form-widget.model';
 import { FormFieldOption } from './form-field-option';
 import { FormFieldTypes } from './form-field-types';
 import { FormFieldMetadata } from './form-field-metadata';
+import { FormFieldValidator, RequiredFieldValidator, NumberFieldValidator } from './form-field-validator';
 import { FormModel } from './form.model';
 import { WidgetVisibilityModel } from '../../../models/widget-visibility.model';
 
@@ -49,6 +50,8 @@ export class FormFieldModel extends FormWidgetModel {
     isVisible: boolean = true;
     visibilityCondition: WidgetVisibilityModel = null;
 
+    validators: FormFieldValidator[] = [];
+
     get value(): any {
         return this._value;
     }
@@ -67,9 +70,11 @@ export class FormFieldModel extends FormWidgetModel {
 
     isValid(): boolean {
 
-        if (this.required) {
-            if (this.type === FormFieldTypes.TEXT || this.type === FormFieldTypes.MULTILINE_TEXT) {
-                return this._value ? true : false;
+        if (this.validators && this.validators.length > 0) {
+            for (let i = 0; i < this.validators.length; i++) {
+                if (!this.validators[i].validate(this)) {
+                    return false;
+                }
             }
         }
 
@@ -105,6 +110,11 @@ export class FormFieldModel extends FormWidgetModel {
             this._value = this.parseValue(json);
             this.updateForm();
         }
+
+        this.validators = [
+            new RequiredFieldValidator(),
+            new NumberFieldValidator()
+        ];
     }
 
     parseValue(json: any): any {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts
index a05690360e..40b16001f4 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.ts
@@ -124,6 +124,7 @@ export class FormModel {
                 );
             }
         }
+        this.validateForm();
     }
 
     onFormFieldChanged(field: FormFieldModel) {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/index.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/index.ts
index 7a28d27c75..f2ba0588ae 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/index.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/index.ts
@@ -27,3 +27,4 @@ export * from './container.model';
 export * from './tab.model';
 export * from './form-outcome.model';
 export * from './form-outcome-event.model';
+export * from './form-field-validator';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html
index 3a5bd8b474..147c0b72bf 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html
@@ -3,6 +3,7 @@
            type="text"
            pattern="-?[0-9]*(\.[0-9]+)?"
            [attr.id]="field.id"
+           [attr.required]="isRequired()"
            [(ngModel)]="field.value"
            (ngModelChange)="checkVisibility(field)"
            [disabled]="field.readOnly">