fix(dynamic-forms): removed regex for name (#1155)

* fix(dynamic-forms): removed regex for name * fix(dynamic-forms): modified regex to allow japanese/chinese chars * fix(dynamic-forms): got rid of spaces
Teradata · May 25, 2018 · ddf8a6b · ddf8a6b
1 parent 7e217df
commit ddf8a6b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 15 deletions.
diff --git a/src/platform/dynamic-forms/services/dynamic-forms.service.spec.ts b/src/platform/dynamic-forms/services/dynamic-forms.service.spec.ts
@@ -16,37 +16,49 @@ describe('Service: TdDynamicFormsService', () => {
     });
   }));
 
-  it('expect to validate element names correctly',
-    async(inject([TdDynamicFormsService], (service: TdDynamicFormsService) => {
+  it('expect to validate element names correctly',	
+    async(inject([TdDynamicFormsService], (service: TdDynamicFormsService) => {	
+      try {
+        service.validateDynamicElementName('normal-name');	
+      } catch (e) {
+        expect(e).toBeFalsy('name should be validated correctly');	
+      }
+
       try {
-        service.validateDynamicElementName('normal-name');
+        service.validateDynamicElementName('normal_22_name');	
       } catch (e) {
-        expect(e).toBeFalsy('name should be validated correctly');
+        expect(e).toBeFalsy('name should be validated correctly');	
       }
 
       try {
-        service.validateDynamicElementName('normal_22_name');
+        service.validateDynamicElementName('normal_22-name_22');	
       } catch (e) {
-        expect(e).toBeFalsy('name should be validated correctly');
+        expect(e).toBeFalsy('name should be validated correctly');	
       }
 
       try {
-        service.validateDynamicElementName('normal_22-name_22');
+        service.validateDynamicElementName('王先生');	
       } catch (e) {
-        expect(e).toBeFalsy('name should be validated correctly');
+        expect(e).toBeFalsy('王先生 (chinese) name should be validated correctly');	
       }
 
       try {
-        service.validateDynamicElementName('2normal_22-name_22');
-        expect(false).toBeTruthy('2normal_22-name_22 name should not be validated correctly');
+        service.validateDynamicElementName('日本語');	
+      } catch (e) {
+        expect(e).toBeFalsy('日本語 (japanese) name should be validated correctly');	
+      }
+
+      try {
+        service.validateDynamicElementName('2normal_22-name_22');	
+        expect(false).toBeTruthy('2normal_22-name_22 name should not be validated correctly');	
       } catch (e) { /* */ }
 
       try {
-        service.validateDynamicElementName('normal@22-name_22');
-        expect(false).toBeTruthy('normal@22-name_22 name should not be validated correctly');
+        service.validateDynamicElementName('normal@22-name_22');	
+        expect(false).toBeTruthy('normal@22-name_22 name should not be validated correctly');	
       } catch (e) { /* */ }
 
-    }),
+    }),	
   ));
 
   it('expect to return components depending on type | element',

diff --git a/src/platform/dynamic-forms/services/dynamic-forms.service.ts b/src/platform/dynamic-forms/services/dynamic-forms.service.ts
@@ -49,7 +49,7 @@ export interface ITdDynamicElementConfig {
   validators?: ITdDynamicElementValidator[];
 }
 
-export const DYNAMIC_ELEMENT_NAME_REGEX: RegExp = /^[a-zA-Z]+[a-zA-Z0-9-_]*$/;
+export const DYNAMIC_ELEMENT_NAME_REGEX: RegExp = /^[^0-9][^\@]*$/;
 
 @Injectable()
 export class TdDynamicFormsService {
@@ -60,7 +60,7 @@ export class TdDynamicFormsService {
    */
   validateDynamicElementName(name: string): void {
     if (!DYNAMIC_ELEMENT_NAME_REGEX.test(name)) {
-      throw new Error(`Dynamic element name: "${name}" is not valid.`);
+      throw new Error('Dynamic element name: "${name}" is not valid.');
     }
   }