Merge pull request #844 from dadi/develop

Datetime picker fixes

app/components/TextInputWithDatePicker/TextInputWithDatePicker.jsx

@@ -140,9 +140,15 @@ export default class TextInputWithDatePicker extends React.Component {
   handleInputChange(event) {
     const {format, onChange} = this.props
     const {value} = event.target
-    const newDate = new DateTime(event.target.value, format)
+    const newDate = new DateTime(
+      event.target.value,
+      format === 'unix' ? 'YYYY/MM/DD HH:mm' : format
+    )
 
-    if (value.length === format.length && newDate.isValid()) {
+    if (
+      (format === 'unix' || value.length === format.length) &&
+      newDate.isValid()
+    ) {
       if (typeof onChange === 'function') {
         const utcDate = newDate.getDate({toUTC: true})
 
@@ -219,6 +225,7 @@ export default class TextInputWithDatePicker extends React.Component {
       containerClassName
     )
     const showTimePicker =
+      format === 'unix' ||
       typeof format !== 'string' ||
       format.includes('HH') ||
       format.includes('mm')

app/lib/datetime.js

@@ -63,12 +63,11 @@ export default class DateTime {
   }
 
   format(format, convertToUTC = true) {
+    // convertToUTC - this param doesn't seem to be ever used in the code... so always defaults to true
     let output = null
 
     try {
-      const date = convertToUTC
-        ? this._getUTCDateFromLocalDate(this.localDate)
-        : this.localDate
+      const date = this.localDate
 
       if (format === 'unix') {
         output =
@@ -85,7 +84,10 @@ export default class DateTime {
     return output
   }
 
-  getDate() {
+  getDate(options ={toUTC:false}) {
+    if(options.toUTC){
+      return this._getUTCDateFromLocalDate(this.localDate)
+    }
     return this.localDate
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dadi/publish",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "DADI Publish",
   "main": "index.js",
   "scripts": {