merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>

2 files changed, 141 insertions, 0 deletions

diff --git a/vid-webpack-master/src/app/shared/validators/uniqueName/uniqueName.validator.spec.ts b/vid-webpack-master/src/app/shared/validators/uniqueName/uniqueName.validator.spec.ts
new file mode 100644
index 000000000..35d3c48e8
--- /dev/null
+++ b/vid-webpack-master/src/app/shared/validators/uniqueName/uniqueName.validator.spec.ts
@@ -0,0 +1,41 @@
+import {FormControl, ValidatorFn} from "@angular/forms";
+import {CustomValidators} from "./uniqueName.validator";
+import {FileUnit} from "../../components/formControls/component/file/fileUnit.enum";
+
+
+describe('Custom Validator Functions', () => {
+  test('isValidJson Validator should return null when value is valid and correct object when invalid', () => {
+
+    let isValidJsonFunction: ValidatorFn = CustomValidators.isValidJson();
+
+    expect(isValidJsonFunction(new FormControl("{ 'key': 'value', 'array': ['first',]}"))).toEqual({ isValidJson: true });
+
+    expect(isValidJsonFunction(new FormControl('{ "key": "value", "array": ["first"]'))).toEqual({ isValidJson: true });
+
+    expect(isValidJsonFunction(new FormControl('{ "key": "value", "array": ["first"]}'))).toEqual(null);
+
+    expect(isValidJsonFunction(new FormControl('{ "key": "value", "array": "first"}'))).toEqual(null);
+  });
+
+  test('isStringContainTags Validator should return null when value is valid and correct object when invalid', () => {
+
+    const isStringContainTagsFunction: ValidatorFn = CustomValidators.isStringContainTags();
+
+    expect(isStringContainTagsFunction(new FormControl('<asdf>'))).toEqual({isStringContainTags : true});
+
+    expect(isStringContainTagsFunction(new FormControl('1234<asfd56'))).toEqual(null);
+  });
+
+  test('isFileTooBig Validator should return null when value is valid and correct object when invalid', () => {
+
+    let isFileTooBigFunction: ValidatorFn = CustomValidators.isFileTooBig(FileUnit.MB, 5);
+
+    expect(isFileTooBigFunction(new FormControl({ size: 6000001 }))).toEqual({ isFileTooBig: true });
+
+    expect(isFileTooBigFunction(new FormControl({ size: 4000000}))).toEqual(null);
+
+    isFileTooBigFunction = CustomValidators.isFileTooBig(FileUnit.B, 5);
+
+    expect(isFileTooBigFunction(new FormControl({ size: 4000000}))).toEqual({ isFileTooBig: true });
+  })
+});
diff --git a/vid-webpack-master/src/app/shared/validators/uniqueName/uniqueName.validator.ts b/vid-webpack-master/src/app/shared/validators/uniqueName/uniqueName.validator.ts
new file mode 100644
index 000000000..4d3e3837b
--- /dev/null
+++ b/vid-webpack-master/src/app/shared/validators/uniqueName/uniqueName.validator.ts
@@ -0,0 +1,100 @@
+import {AbstractControl, ValidatorFn} from "@angular/forms";
+import {Injectable} from "@angular/core";
+import {NgRedux} from "@angular-redux/store";
+import {AppState} from "../../store/reducers";
+import {FileUnit} from "../../components/formControls/component/file/fileUnit.enum";
+import * as _ from 'lodash';
+
+@Injectable()
+export class CustomValidators {
+  static uniqueInstanceNameValidator(...args): ValidatorFn {
+    const store : NgRedux<AppState> = args[0];
+    const serviceId : string = args[1];
+    const originalName : string = args[2];
+    return (control: AbstractControl): {[key: string]: any} | null => {
+      const name = control.value;
+      if(name && name !== originalName) {
+        const result: boolean = CustomValidators.isUnique(store.getState().service.serviceInstance, serviceId, name, name === originalName);
+        if(!result){
+          return {
+            uniqueInstanceNameValidator : true
+          };
+        }else {
+          return null;
+        }
+      }
+      return null;
+    };
+  }
+
+  static isUnique(serviceInstance : any, serviceId : string, name: string, isEqualToOriginalInstanceName : boolean) : boolean {
+    const service = serviceInstance[serviceId];
+    if(service){
+      const existingNames = service.existingNames;
+      if(_.includes(existingNames, name)) return false;
+    }
+    return true;
+  }
+
+  static isStringContainHtmlTag(str: string): boolean{
+    var regex = RegExp("<[^>]*>");
+    return regex.test(str);
+  }
+
+  static isValidJson() : ValidatorFn {
+    return (control: AbstractControl): {[key: string]: any} | null => {
+      const content = control.value;
+      let invalid: boolean = false;
+      if (content)  {
+        try {
+          JSON.parse(content);
+        } catch (e) {
+          invalid = true;
+        }
+      }
+      return (invalid) ? {isValidJson : true} : null;
+    }
+  }
+
+  static isStringContainTags() : ValidatorFn {
+    return (control: AbstractControl): {[key: string]: any} | null => {
+      const content = control.value;
+      let invalid: boolean = false;
+      if (content)  {
+          invalid = CustomValidators.isStringContainHtmlTag(content);
+      }
+      return (invalid) ? {isStringContainTags : true} : null;
+    }
+  }
+
+  static isFileTooBig(...args) : ValidatorFn {
+    const unit : FileUnit = args[0];
+    const size : number = args[1];
+    return (control: AbstractControl): {[key: string]: any} | null => {
+      const file = control.value;
+      let sizeToByte: number;
+      if (file) {
+        switch (unit)  {
+          case FileUnit.b:
+            sizeToByte = 1/8;
+            break;
+          case FileUnit.B:
+            sizeToByte = 1;
+            break;
+          case FileUnit.KB:
+            sizeToByte = 1000;
+            break;
+          case FileUnit.MB:
+            sizeToByte = 1000000;
+            break;
+          default:
+            sizeToByte = 0;
+            break;
+
+        }
+        return (file.size > (sizeToByte * size)) ? {isFileTooBig: true} : null;
+      }
+      return null;
+    }
+  }
+}