Validation for date-related fields

ManageIQ · Jun 18, 2019 · ec8f8c6 · ec8f8c6
1 parent b2a4c8c
commit ec8f8c6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/dialog-user/services/dialogData.ts b/src/dialog-user/services/dialogData.ts
@@ -153,6 +153,10 @@ export default class DialogDataService {
     };
     validation.field = field.label;
 
+    let dateField = (field.type === 'DialogFieldDateTimeControl' ||
+                     field.type === 'DialogFieldDateControl');
+    let validDateField = (dateField && _.isDate(field.dateField));
+
     if (field.required) {
       if (field.type === 'DialogFieldCheckBox' && fieldValue === 'f') {
         validation.isValid = false;
@@ -162,7 +166,7 @@ export default class DialogDataService {
           validation.isValid = false;
           validation.message = __('This field is required');
         }
-      } else if (_.isEmpty(fieldValue) && !_.isDate(fieldValue)) {
+      } else if (_.isEmpty(fieldValue) && !validDateField) {
         validation.isValid = false;
         validation.message = __('This field is required');
       }
@@ -179,8 +183,7 @@ export default class DialogDataService {
       }
     }
 
-    if (field.type === 'DialogFieldDateControl' &&
-        !(fieldValue instanceof Date)) {
+    if (dateField && !validDateField) {
       validation.isValid = false;
       validation.message = __('Select a valid date');
     }