Merge pull request #3200 from huridocs/1.9.1-datepicker-hotfix

1.9.1 datepicker hotfix

app/react/Forms/components/DatePicker.js

@@ -15,7 +15,7 @@ const removeOffset = (useTimezone, value) => {
       newValue.subtract(moment().utcOffset(), 'minute');
     }
 
-    datePickerValue = parseInt(newValue.format('x'), 10);
+    datePickerValue = parseInt(newValue.locale('en').format('x'), 10);
   }
 
   return datePickerValue;
@@ -49,7 +49,7 @@ class DatePicker extends Component {
       onChange(null);
     } else {
       const newValue = addOffset(useTimezone, endOfDay, datePickerValue);
-      onChange(parseInt(newValue.format('X'), 10));
+      onChange(parseInt(newValue.locale('en').format('X'), 10));
     }
   }
 

app/react/Forms/components/specs/DatePicker.spec.js

@@ -3,6 +3,7 @@ import { shallow } from 'enzyme';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
+import baseMoment from 'moment';
 import moment from 'moment-timezone';
 import DatePickerComponent from 'react-datepicker';
 import DatePicker from '../DatePicker';
@@ -45,12 +46,39 @@ describe('DatePicker', () => {
   });
 
   describe('onChange', () => {
-    it('should set the value to timestamp offsetting to UTC', () => {
+    const expectCorrectOnChange = () => {
       const newDate = new Date('2020-08-18');
       render();
       input.simulate('change', newDate);
       const expectedOnChangeValue = moment.utc(newDate).add(moment().utcOffset(), 'minute');
       expect(props.onChange).toHaveBeenCalledWith(Number(expectedOnChangeValue.format('X')));
+    };
+
+    it('should set the value to timestamp offsetting to UTC', () => {
+      expectCorrectOnChange();
+    });
+
+    describe('When locale is a non-latin locale', () => {
+      let originalLocale;
+
+      beforeEach(() => {
+        originalLocale = baseMoment.locale();
+        baseMoment.locale('ar');
+      });
+
+      afterEach(() => {
+        baseMoment.locale(originalLocale);
+      });
+
+      it('should render a latin-based value (until correct locales are implemented)', () => {
+        render();
+        const expectedSelectedValue = date.clone().subtract(moment().utcOffset(), 'minute');
+        expect(input.props().selected).toBe(parseInt(expectedSelectedValue.format('x'), 10));
+      });
+
+      it('should not fail on change', () => {
+        expectCorrectOnChange();
+      });
     });
 
     describe('when clearing the input', () => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uwazi",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
   "keywords": [
     "react"