fix: fix date, dateTime & time with i18n

gregberge · gregberge · commit 272a595b6ca5 · 2019-07-04T14:43:35.000+02:00
diff --git a/packages/smooth-backend-wordpress/src/acf/config/index.test.js b/packages/smooth-backend-wordpress/src/acf/config/index.test.js
@@ -35,9 +35,22 @@ describe('#generateConfig', () => {
       ['String @field(type: longText)', { type: 'textarea' }],
       ['String @field(type: richText)', { type: 'wysiwyg' }],
       ['Boolean @field', { type: 'true_false' }],
-      ['Date @field', { type: 'date_picker' }],
-      ['DateTime @field', { type: 'date_time_picker' }],
-      ['Time @field', { type: 'time_picker' }],
+      [
+        'Date @field',
+        { type: 'date_picker', display_format: 'd/m/Y', return_format: 'c' },
+      ],
+      [
+        'DateTime @field',
+        {
+          type: 'date_time_picker',
+          display_format: 'd/m/Y g:i a',
+          return_format: 'c',
+        },
+      ],
+      [
+        'Time @field',
+        { type: 'time_picker', display_format: 'g:i a', return_format: 'c' },
+      ],
       ['Int @field', { type: 'number' }],
       ['Float @field', { type: 'number' }],
       ['Image @field', { type: 'image' }],
diff --git a/packages/smooth-backend-wordpress/src/acf/config/oneField.js b/packages/smooth-backend-wordpress/src/acf/config/oneField.js
@@ -36,15 +36,19 @@ const handlers = {
   },
   date(infos) {
     preventList(infos)
-    return { type: 'date_picker' }
+    return { type: 'date_picker', display_format: 'd/m/Y', return_format: 'c' }
   },
   dateTime(infos) {
     preventList(infos)
-    return { type: 'date_time_picker' }
+    return {
+      type: 'date_time_picker',
+      display_format: 'd/m/Y g:i a',
+      return_format: 'c',
+    }
   },
   time(infos) {
     preventList(infos)
-    return { type: 'time_picker' }
+    return { type: 'time_picker', display_format: 'g:i a', return_format: 'c' }
   },
   shortText({ list }) {
     if (list) return { type: 'textarea' }
diff --git a/packages/smooth-backend-wordpress/src/acf/resolvers/createDefaultResolvers.js b/packages/smooth-backend-wordpress/src/acf/resolvers/createDefaultResolvers.js
@@ -1,4 +1,4 @@
-import { toRelativeUrl, formatDate, formatDateTime, formatTime } from './util'
+import { toRelativeUrl, formatDate } from './util'
 
 function acfField(object, name) {
   if (object.acf) {
@@ -15,11 +15,11 @@ const handlers = {
   },
   dateTime({ name, list }) {
     if (list) return null
-    return object => formatDateTime(acfField(object, name))
+    return object => formatDate(acfField(object, name))
   },
   time({ name, list }) {
     if (list) return null
-    return object => formatTime(acfField(object, name))
+    return object => formatDate(acfField(object, name))
   },
   link({ name, list }, helpers, state) {
     const { homeUrl } = state.options
diff --git a/packages/smooth-backend-wordpress/src/acf/resolvers/util.js b/packages/smooth-backend-wordpress/src/acf/resolvers/util.js
@@ -7,32 +7,7 @@ export function toRelativeUrl(baseUrl, url) {
   return finalUrl
 }
 
-function formatDateString(value) {
-  return value
-    .split('/')
-    .reverse()
-    .join('-')
-}
-
 export function formatDate(value) {
   if (typeof value !== 'string' || value === '') return null
-  return new Date(formatDateString(value))
-}
-
-export function formatDateTime(value) {
-  if (typeof value !== 'string' || value === '') return null
-  const [date, time, period] = value.split(' ')
-  return new Date(`${formatDateString(date)} ${time} ${period} UTC`)
-}
-
-export function formatTime(value) {
-  if (typeof value !== 'string' || value === '') return null
-  const [, hours, minutes, type] = value.match(/^(\d+):(\d+)\s+([ap]m)$/)
-  return `${[
-    type === 'pm' ? ((12 + Number(hours)) % 24).toString() : hours,
-    minutes,
-    '0',
-  ]
-    .map(x => x.padStart(2, '0'))
-    .join(':')}Z`
+  return new Date(value)
 }
diff --git a/packages/smooth-backend-wordpress/src/acf/resolvers/util.test.js b/packages/smooth-backend-wordpress/src/acf/resolvers/util.test.js
@@ -1,9 +1,9 @@
-import { toRelativeUrl, formatDate, formatDateTime, formatTime } from './util'
+import { toRelativeUrl, formatDate } from './util'
 
 describe('util', () => {
   describe('#formatDate', () => {
     it('should format date', () => {
-      expect(formatDate('21/05/1989').toJSON()).toBe('1989-05-21T00:00:00.000Z')
+      expect(formatDate('1989-05-21').toJSON()).toBe('1989-05-21T00:00:00.000Z')
     })
 
     it('should return null if not a string (or empty)', () => {
@@ -13,34 +13,6 @@ describe('util', () => {
     })
   })
 
-  describe('#formatDateTime', () => {
-    it('should format datetime', () => {
-      expect(formatDateTime('21/05/1989 02:00 am').toJSON()).toBe(
-        '1989-05-21T02:00:00.000Z',
-      )
-    })
-
-    it('should return null if not a string (or empty)', () => {
-      expect(formatDateTime(null)).toBe(null)
-      expect(formatDateTime('')).toBe(null)
-      expect(formatDateTime(undefined)).toBe(null)
-    })
-  })
-
-  describe('#formatTime', () => {
-    it('should format time', () => {
-      expect(formatTime('2:30 am')).toBe('02:30:00Z')
-      expect(formatTime('7:45 pm')).toBe('19:45:00Z')
-      expect(formatTime('12:15 pm')).toBe('00:15:00Z')
-    })
-
-    it('should return null if not a string (or empty)', () => {
-      expect(formatTime(null)).toBe(null)
-      expect(formatTime('')).toBe(null)
-      expect(formatTime(undefined)).toBe(null)
-    })
-  })
-
   describe('#toRelativeUrl', () => {
     it('should support baseUrl without end slash', () => {
       expect(
