Merge pull request #12 from episerver/feature/AFORM-3564-add-textarea

Revamp validators type

src/@optimizely/forms-sdk/src/models/elements/Textarea.ts

@@ -7,6 +7,5 @@ export interface Textarea extends InputElementBase {
 }
 
 export interface TextareaProperties extends InputElementBaseProperties{
-    forms_ExternalSystemsFieldMappings: string[];
     autoComplete: string;
 }

src/@optimizely/forms-sdk/src/models/elements/base/ValidatableElementBase.ts

@@ -1,4 +1,4 @@
-import { Validators } from "../../validators/Validators";
+import { ValidatorBase } from "../../validators/base/";
 import { FormElementBase, FormElementPropertiesBase } from "./FormElementBase";
 
 /**
@@ -11,6 +11,6 @@ export interface ValidatableElementBase extends FormElementBase {
 }
 
 export interface ValidatableElementBaseProperties extends FormElementPropertiesBase {
-    validators: Validators[]
+    validators: ValidatorBase[]
     validatorMessages: string
 }

src/@optimizely/forms-sdk/src/models/validators/AllowedExtensionsValidator.ts

@@ -0,0 +1,9 @@
+import { InternalElementValidatorBase, ValidatorModelBase } from "./base";
+
+export interface AllowedExtensionsValidator extends InternalElementValidatorBase{
+    model: AllowedExtensionsValidatorModel
+}
+
+export interface AllowedExtensionsValidatorModel extends ValidatorModelBase {
+
+}

src/@optimizely/forms-sdk/src/models/validators/CaptchaValidator.ts

@@ -0,0 +1,5 @@
+import { InternalElementValidatorBase } from "./base";
+
+export interface CaptchaValidator extends InternalElementValidatorBase {
+
+}

src/@optimizely/forms-sdk/src/models/validators/DateDDMMYYYYValidator.ts

@@ -0,0 +1,5 @@
+import { RegularExpressionValidator } from "./RegularExpressionValidator";
+
+export interface DateDDMMYYYYValidator extends RegularExpressionValidator {
+
+}

src/@optimizely/forms-sdk/src/models/validators/DateMMDDYYYYValidator.ts

@@ -0,0 +1,5 @@
+import { RegularExpressionValidator } from "./RegularExpressionValidator";
+
+export interface DateMMDDYYYYValidator extends RegularExpressionValidator {
+
+}

src/@optimizely/forms-sdk/src/models/validators/DateYYYYMMDDValidator.ts

@@ -0,0 +1,5 @@
+import { RegularExpressionValidator } from "./RegularExpressionValidator";
+
+export interface DateYYYYMMDDValidator extends RegularExpressionValidator {
+
+}

src/@optimizely/forms-sdk/src/models/validators/EmailValidator.ts

@@ -0,0 +1,5 @@
+import { RegularExpressionValidator } from "./RegularExpressionValidator";
+
+export interface EmailValidator extends RegularExpressionValidator{
+
+}

src/@optimizely/forms-sdk/src/models/validators/IntegerValidator.ts

@@ -0,0 +1,5 @@
+import { RegularExpressionValidator } from "./RegularExpressionValidator";
+
+export interface IntegerValidator extends RegularExpressionValidator {
+
+}

src/@optimizely/forms-sdk/src/models/validators/MaxFileSizeValidator.ts

@@ -0,0 +1,9 @@
+import { InternalElementValidatorBase, ValidatorModelBase } from "./base";
+
+export interface MaxFileSizeValidator extends InternalElementValidatorBase {
+    model: MaxFileSizeValidationModel
+}
+
+export interface MaxFileSizeValidationModel extends ValidatorModelBase {
+    sizeInBytes: number
+}

src/@optimizely/forms-sdk/src/models/validators/NumericValidator.ts

@@ -0,0 +1,5 @@
+import { ElementValidatorBase } from "./base";
+
+export interface NumericValidator extends ElementValidatorBase {
+    isValidNumber: boolean
+}

src/@optimizely/forms-sdk/src/models/validators/PositiveIntegerValidator.ts

@@ -0,0 +1,5 @@
+import { RegularExpressionValidatorBase } from "./base";
+
+export interface PositiveIntegerValidator extends RegularExpressionValidatorBase {
+
+}

src/@optimizely/forms-sdk/src/models/validators/RegularExpressionValidator.ts

@@ -0,0 +1,5 @@
+import { RegularExpressionValidatorBase } from "./base";
+
+export interface RegularExpressionValidator extends RegularExpressionValidatorBase{
+}
+

src/@optimizely/forms-sdk/src/models/validators/RequiredValidator.ts

@@ -0,0 +1,5 @@
+import { ElementValidatorBase } from "./base";
+
+export interface RequiredValidator extends ElementValidatorBase {
+
+}

src/@optimizely/forms-sdk/src/models/validators/UrlValidator.ts

@@ -0,0 +1,5 @@
+import { RegularExpressionValidatorBase } from "./base";
+
+export interface UrlValidator extends RegularExpressionValidatorBase {
+
+}

src/@optimizely/forms-sdk/src/models/validators/base/ElementValidatorBase.ts

@@ -0,0 +1,4 @@
+export interface ElementValidatorBase {
+    validationOrder: number,
+    description: string
+}

src/@optimizely/forms-sdk/src/models/validators/base/InternalElementValidatorBase.ts

@@ -0,0 +1,5 @@
+import { ElementValidatorBase } from "./ElementValidatorBase";
+
+export interface InternalElementValidatorBase extends ElementValidatorBase{
+
+}

src/@optimizely/forms-sdk/src/models/validators/base/RegularExpressionValidatorBase.ts

@@ -0,0 +1,11 @@
+import { ElementValidatorBase } from "./ElementValidatorBase";
+import { ValidatorModelBase } from "./ValidatorsBase";
+
+export interface RegularExpressionValidatorBase extends ElementValidatorBase{
+    model: RegularExpressionValidatorModel
+}
+
+export interface RegularExpressionValidatorModel extends ValidatorModelBase {
+    jsPattern: string,
+    dotNetPattern: string
+}

src/@optimizely/forms-sdk/src/models/validators/base/ValidatorsBase.ts

@@ -0,0 +1,14 @@
+/** 
+*   Base class for validators
+*/
+export interface ValidatorBase {
+    type: string
+    description: string
+    model: ValidatorModelBase
+}
+
+export interface ValidatorModelBase {
+    message: string
+    validationCssClass: string
+    additionalAttributes: any
+}

src/@optimizely/forms-sdk/src/models/validators/base/index.ts

@@ -0,0 +1,4 @@
+export * from "./ValidatorsBase";
+export * from "./InternalElementValidatorBase";
+export * from "./RegularExpressionValidatorBase";
+export * from "./ElementValidatorBase";

src/@optimizely/forms-sdk/src/models/validators/index.ts

@@ -1,3 +1,14 @@
-export * from "./Validators";
-export * from "./models/EmailValidatorModel";
-export * from "./models/RequiredValidatorModel";
+export * from "./base"
+export * from "./AllowedExtensionsValidator";
+export * from "./CaptchaValidator";
+export * from "./DateDDMMYYYYValidator";
+export * from "./DateMMDDYYYYValidator";
+export * from "./DateYYYYMMDDValidator";
+export * from "./EmailValidator";
+export * from "./IntegerValidator";
+export * from "./MaxFileSizeValidator";
+export * from "./NumericValidator";
+export * from "./PositiveIntegerValidator"
+export * from "./RegularExpressionValidator";
+export * from "./RequiredValidator";
+export * from "./UrlValidator";