Convert the component value to Date after refresh from Automate

ManageIQ · Jun 17, 2019 · b2a4c8c · b2a4c8c
1 parent 1744f67
commit b2a4c8c
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/dialog-user/services/dialogData.ts b/src/dialog-user/services/dialogData.ts
@@ -43,6 +43,14 @@ export default class DialogDataService {
       }
     }
 
+    if (field.type === 'DialogFieldDateControl') {
+      if (_.isNull(field.default_value) || _.isUndefined(field.default_value)) {
+        field.dateField = field.timeField = new Date();
+      } else {
+        field.dateField = field.timeField = new Date(data.default_value);
+      }
+    }
+
     field.default_value = this.setDefaultValue(field);
 
     return field;
@@ -95,14 +103,14 @@ export default class DialogDataService {
       defaultValue = data.values[firstOption][fieldValue];
     }
 
-    if (data.type === 'DialogFieldDateControl' || data.type === 'DialogFieldDateTimeControl') {
-      defaultValue = data.values ? new Date(data.values) : new Date();
-    }
-
     if (data.default_value) {
       defaultValue = data.default_value;
     }
 
+    if (data.type === 'DialogFieldDateControl' || data.type === 'DialogFieldDateTimeControl') {
+      defaultValue = data.dateField ? new Date(data.dateField) : new Date();
+    }
+
     if (data.type === 'DialogFieldDropDownList' && data.options.force_multi_value && data.default_value) {
       defaultValue = JSON.parse(data.default_value);
     }