Correct IF for validateDateTime & validateGuid

heldersepu · heldersepu · commit 11768b16bfd0 · 2017-09-22T11:30:07.000-04:00
diff --git a/src/core/utils.js b/src/core/utils.js
@@ -501,13 +501,13 @@ export const validateString = ( val ) => {
 }
 
 export const validateDateTime = (val) => {
-    if (val && typeof val !== "string") {
+    if (!isNaN(Date.parse(val))) {
         return "Value must be a DateTime"
     }
 }
 
 export const validateGuid = (val) => {
-    if (val && typeof val !== "string") {
+    if (!/^[{(]?[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}[)}]?$/.test(val)) {
         return "Value must be a Guid"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -501,13 +501,13 @@ export const validateString = ( val ) => {`
`501`	`501`	`}`
`502`	`502`
`503`	`503`	`export const validateDateTime = (val) => {`
`504`		`- if (val && typeof val !== "string") {`
	`504`	`+ if (!isNaN(Date.parse(val))) {`
`505`	`505`	`return "Value must be a DateTime"`
`506`	`506`	`}`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`export const validateGuid = (val) => {`
`510`		`- if (val && typeof val !== "string") {`
	`510`	`+ if (!/^[{(]?[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}[)}]?$/.test(val)) {`
`511`	`511`	`return "Value must be a Guid"`
`512`	`512`	`}`
`513`	`513`	`}`