orc-shared 1.3.0-dev.8 → 1.3.0-dev.9

package/dist/components/MaterialUI/Inputs/DatePicker.js

@@ -17,6 +17,12 @@ var _TimePicker = _interopRequireDefault(require("./TimePicker"));
 
 var _styles = require("@material-ui/core/styles");
 
+var _timezoneHelper = require("../../../utils/timezoneHelper");
+
+var _metadata = require("../../../selectors/metadata");
+
+var _reactRedux = require("react-redux");
+
 var _excluded = ["value", "useTime", "useDate", "onChange", "dateFormat", "showTimeZone", "timeInputLabel", "readOnly", "showTimeSelectOnly", "metadata", "timePickerTimeZone", "error"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -185,12 +191,14 @@ var WrappedDatePicker = function WrappedDatePicker(_ref) {
   var classes = useStyles({
     readOnly: readOnly
   });
-  var startDate = value ? new Date(value) : null;
+  var timeZoneName = (0, _timezoneHelper.getTimeZoneByName)(timePickerTimeZone);
+  var startDate = value ? timePickerTimeZone ? (0, _timezoneHelper.convertTimeToLocalTimeZone)(new Date(value), timeZoneName) : new Date(value) : null;
   var disabledCls = (0, _classnames.default)(_defineProperty({}, classes.disabled, props.disabled));
+  var localizedTimeZoneName = (0, _reactRedux.useSelector)((0, _metadata.namedLookupLocalizedSelector)("customer", "TimeZone", timePickerTimeZone));
 
   var updateDate = function updateDate(date, metadata) {
     if (onChange) {
-      onChange(date, metadata);
+      onChange(useTime && timePickerTimeZone ? (0, _timezoneHelper.convertTimeToOtherTimeZone)(date, timeZoneName) : date, metadata);
     }
   };
 
@@ -210,7 +218,7 @@ var WrappedDatePicker = function WrappedDatePicker(_ref) {
     useTime: useTime != null ? useTime : false,
     customTimeInput: useTime ? /*#__PURE__*/_react.default.createElement(_TimePicker.default, {
       showTimeZone: showTimeZone,
-      requestedTimeZone: timePickerTimeZone
+      requestedTimeZone: localizedTimeZoneName
     }) : null,
     timeInputLabel: timeInputLabel != null ? timeInputLabel : "",
     readOnly: readOnly,
@@ -225,12 +233,12 @@ var WrappedDatePicker = function WrappedDatePicker(_ref) {
   }, error));
 };
 
-__signature__(WrappedDatePicker, "useStyles{classes}", function () {
-  return [useStyles];
+__signature__(WrappedDatePicker, "useStyles{classes}\nuseSelector{localizedTimeZoneName}", function () {
+  return [useStyles, _reactRedux.useSelector];
 });
 
-__signature__(WrappedDatePicker, "useStyles{classes}", function () {
-  return [useStyles];
+__signature__(WrappedDatePicker, "useStyles{classes}\nuseSelector{localizedTimeZoneName}", function () {
+  return [useStyles, _reactRedux.useSelector];
 });
 
 var _default = WrappedDatePicker;

package/dist/utils/timezoneHelper.js

@@ -1,7 +1,11 @@
 "use strict";
 
 exports.__esModule = true;
-exports.timeZonesList = exports.getTimeZoneName = exports.getTimeZoneByName = exports.getTimeZone = void 0;
+exports.timeZonesList = exports.getTimeZoneName = exports.getTimeZoneByName = exports.getTimeZone = exports.convertTimeToOtherTimeZone = exports.convertTimeToLocalTimeZone = void 0;
+
+var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
@@ -61,9 +65,32 @@ var getTimeZoneName = function getTimeZoneName() {
   var customerTimezone = getTimeZone();
   var timezoneName = timeZonesList.get(customerTimezone);
   return timezoneName;
-};
+}; //converting time from other timezone to local
+
 
 exports.getTimeZoneName = getTimeZoneName;
+
+var convertTimeToLocalTimeZone = function convertTimeToLocalTimeZone(date, timezone) {
+  var dateWithoutZone = _momentTimezone.default.tz(date, timezone).format("YYYY-MM-DDTHH:mm:ss.SSS");
+
+  var localZone = (0, _momentTimezone.default)(dateWithoutZone).format("Z");
+  var dateWithLocalZone = [dateWithoutZone, localZone].join("");
+  return new Date(dateWithLocalZone);
+}; //converting time from local timezone to other
+
+
+exports.convertTimeToLocalTimeZone = convertTimeToLocalTimeZone;
+
+var convertTimeToOtherTimeZone = function convertTimeToOtherTimeZone(date, timezone) {
+  var dateWithoutZone = (0, _momentTimezone.default)(date).format("YYYY-MM-DDTHH:mm:ss.SSS");
+
+  var otherZone = _momentTimezone.default.tz(date, timezone).format("Z");
+
+  var dateWithOtherZone = [dateWithoutZone, otherZone].join("");
+  return new Date(dateWithOtherZone);
+};
+
+exports.convertTimeToOtherTimeZone = convertTimeToOtherTimeZone;
 var timeZonesList = new Map([["Africa/Bangui", "W. Central Africa Standard Time"], ["Africa/Cairo", "Egypt Standard Time"], ["Africa/Casablanca", "Morocco Standard Time"], ["Africa/Harare", "South Africa Standard Time"], ["Africa/Johannesburg", "South Africa Standard Time"], ["Africa/Lagos", "W. Central Africa Standard Time"], ["Africa/Monrovia", "Greenwich Standard Time"], ["Africa/Nairobi", "E. Africa Standard Time"], ["Africa/Windhoek", "Namibia Standard Time"], ["America/Anchorage", "Alaskan Standard Time"], ["America/Argentina/San_Juan", "Argentina Standard Time"], ["America/Asuncion", "Paraguay Standard Time"], ["America/Bahia", "Bahia Standard Time"], ["America/Bogota", "SA Pacific Standard Time"], ["America/Buenos_Aires", "Argentina Standard Time"], ["America/Caracas", "Venezuela Standard Time"], ["America/Cayenne", "SA Eastern Standard Time"], ["America/Chicago", "Central Standard Time"], ["America/Chihuahua", "Mountain Standard Time (Mexico)"], ["America/Cuiaba", "Central Brazilian Standard Time"], ["America/Denver", "Mountain Standard Time"], ["America/Fortaleza", "SA Eastern Standard Time"], ["America/Godthab", "Greenland Standard Time"], ["America/Guatemala", "Central America Standard Time"], ["America/Halifax", "Atlantic Standard Time"], ["America/Indianapolis", "US Eastern Standard Time"], ["America/Indiana/Indianapolis", "US Eastern Standard Time"], ["America/La_Paz", "SA Western Standard Time"], ["America/Los_Angeles", "Pacific Standard Time"], ["America/Mexico_City", "Mexico Standard Time"], ["America/Montevideo", "Montevideo Standard Time"], ["America/New_York", "Eastern Standard Time"], ["America/Noronha", "UTC-02"], ["America/Phoenix", "US Mountain Standard Time"], ["America/Regina", "Canada Central Standard Time"], ["America/Santa_Isabel", "Pacific Standard Time (Mexico)"], ["America/Santiago", "Pacific SA Standard Time"], ["America/Sao_Paulo", "E. South America Standard Time"], ["America/St_Johns", "Newfoundland Standard Time"], ["America/Tijuana", "Pacific Standard Time"], ["Antarctica/McMurdo", "New Zealand Standard Time"], ["Atlantic/South_Georgia", "UTC-02"], ["Asia/Almaty", "Central Asia Standard Time"], ["Asia/Amman", "Jordan Standard Time"], ["Asia/Baghdad", "Arabic Standard Time"], ["Asia/Baku", "Azerbaijan Standard Time"], ["Asia/Bangkok", "SE Asia Standard Time"], ["Asia/Beirut", "Middle East Standard Time"], ["Asia/Calcutta", "India Standard Time"], ["Asia/Colombo", "Sri Lanka Standard Time"], ["Asia/Damascus", "Syria Standard Time"], ["Asia/Dhaka", "Bangladesh Standard Time"], ["Asia/Dubai", "Arabian Standard Time"], ["Asia/Irkutsk", "North Asia East Standard Time"], ["Asia/Jerusalem", "Israel Standard Time"], ["Asia/Kabul", "Afghanistan Standard Time"], ["Asia/Kamchatka", "Kamchatka Standard Time"], ["Asia/Karachi", "Pakistan Standard Time"], ["Asia/Katmandu", "Nepal Standard Time"], ["Asia/Kolkata", "India Standard Time"], ["Asia/Krasnoyarsk", "North Asia Standard Time"], ["Asia/Kuala_Lumpur", "Singapore Standard Time"], ["Asia/Kuwait", "Arab Standard Time"], ["Asia/Magadan", "Magadan Standard Time"], ["Asia/Muscat", "Arabian Standard Time"], ["Asia/Novosibirsk", "N. Central Asia Standard Time"], ["Asia/Oral", "West Asia Standard Time"], ["Asia/Rangoon", "Myanmar Standard Time"], ["Asia/Riyadh", "Arab Standard Time"], ["Asia/Seoul", "Korea Standard Time"], ["Asia/Shanghai", "China Standard Time"], ["Asia/Singapore", "Singapore Standard Time"], ["Asia/Taipei", "Taipei Standard Time"], ["Asia/Tashkent", "West Asia Standard Time"], ["Asia/Tbilisi", "Georgian Standard Time"], ["Asia/Tehran", "Iran Standard Time"], ["Asia/Tokyo", "Tokyo Standard Time"], ["Asia/Ulaanbaatar", "Ulaanbaatar Standard Time"], ["Asia/Vladivostok", "Vladivostok Standard Time"], ["Asia/Yakutsk", "Yakutsk Standard Time"], ["Asia/Yekaterinburg", "Ekaterinburg Standard Time"], ["Asia/Yerevan", "Armenian Standard Time"], ["Atlantic/Azores", "Azores Standard Time"], ["Atlantic/Cape_Verde", "Cape Verde Standard Time"], ["Atlantic/Reykjavik", "Greenwich Standard Time"], ["Australia/Adelaide", "Cen. Australia Standard Time"], ["Australia/Brisbane", "E. Australia Standard Time"], ["Australia/Darwin", "AUS Central Standard Time"], ["Australia/Hobart", "Tasmania Standard Time"], ["Australia/Perth", "W. Australia Standard Time"], ["Australia/Sydney", "AUS Eastern Standard Time"], ["UTC", "UTC"], ["Etc/GMT+11", "UTC-11"], ["Etc/GMT+12", "Dateline Standard Time"], ["Etc/GMT+2", "UTC-02"], ["Etc/GMT-12", "UTC+12"], ["Europe/Amsterdam", "W. Europe Standard Time"], ["Europe/Athens", "GTB Standard Time"], ["Europe/Belgrade", "Central Europe Standard Time"], ["Europe/Berlin", "W. Europe Standard Time"], ["Europe/Brussels", "Romance Standard Time"], ["Europe/Budapest", "Central Europe Standard Time"], ["Europe/Dublin", "GMT Standard Time"], ["Europe/Helsinki", "FLE Standard Time"], ["Europe/Istanbul", "GTB Standard Time"], ["Europe/Kiev", "FLE Standard Time"], ["Europe/London", "GMT Standard Time"], ["Europe/Minsk", "E. Europe Standard Time"], ["Europe/Moscow", "Russian Standard Time"], ["Europe/Paris", "Romance Standard Time"], ["Europe/Sarajevo", "Central European Standard Time"], ["Europe/Warsaw", "Central European Standard Time"], ["Indian/Mauritius", "Mauritius Standard Time"], ["Pacific/Apia", "Samoa Standard Time"], ["Pacific/Auckland", "New Zealand Standard Time"], ["Pacific/Fiji", "Fiji Standard Time"], ["Pacific/Guadalcanal", "Central Pacific Standard Time"], ["Pacific/Guam", "West Pacific Standard Time"], ["Pacific/Honolulu", "Hawaiian Standard Time"], ["Pacific/Pago_Pago", "UTC-11"], ["Pacific/Port_Moresby", "West Pacific Standard Time"], ["Pacific/Tongatapu", "Tonga Standard Time"]]);
 exports.timeZonesList = timeZonesList;
 ;
@@ -78,6 +105,8 @@ exports.timeZonesList = timeZonesList;
   reactHotLoader.register(getTimeZone, "getTimeZone", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
   reactHotLoader.register(getTimeZoneByName, "getTimeZoneByName", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
   reactHotLoader.register(getTimeZoneName, "getTimeZoneName", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
+  reactHotLoader.register(convertTimeToLocalTimeZone, "convertTimeToLocalTimeZone", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
+  reactHotLoader.register(convertTimeToOtherTimeZone, "convertTimeToOtherTimeZone", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
   reactHotLoader.register(timeZonesList, "timeZonesList", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
 })();
 
@@ -100,6 +129,8 @@ exports.timeZonesList = timeZonesList;
   reactHotLoader.register(getTimeZone, "getTimeZone", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
   reactHotLoader.register(getTimeZoneByName, "getTimeZoneByName", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
   reactHotLoader.register(getTimeZoneName, "getTimeZoneName", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
+  reactHotLoader.register(convertTimeToLocalTimeZone, "convertTimeToLocalTimeZone", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
+  reactHotLoader.register(convertTimeToOtherTimeZone, "convertTimeToOtherTimeZone", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
   reactHotLoader.register(timeZonesList, "timeZonesList", "/home/vsts/work/1/s/src/utils/timezoneHelper.js");
 })();
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "1.3.0-dev.8",
+	"version": "1.3.0-dev.9",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

package/src/components/Form/InputField.test.js

@@ -59,6 +59,24 @@ describe("InputField", () => {
 				field_fieldName: { wasBlurred: true },
 				activeForm_fieldName: { wasBlurred: true },
 			},
+			metadata: {
+				lookups: {
+					customer: {
+						index: {
+							TimeZone: {
+								values: {
+									UTC: {
+										value: "UTC",
+										displayName: {
+											"en-US": "(UTC) Coordinated Universal Time",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
 		});
 		store = {
 			subscribe: () => {},

package/src/components/Form/Inputs/Date.test.js

@@ -14,6 +14,24 @@ describe("DateInput", () => {
 			locale: {
 				locale: "en-CA",
 			},
+			metadata: {
+				lookups: {
+					customer: {
+						index: {
+							TimeZone: {
+								values: {
+									UTC: {
+										value: "UTC",
+										displayName: {
+											"en-US": "(UTC) Coordinated Universal Time",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
 		});
 
 		store = {

package/src/components/MaterialUI/Inputs/DatePicker.js

@@ -5,6 +5,13 @@ import DatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
 import TimePicker from "./TimePicker";
 import { makeStyles } from "@material-ui/core/styles";
+import {
+	getTimeZoneByName,
+	convertTimeToOtherTimeZone,
+	convertTimeToLocalTimeZone,
+} from "../../../utils/timezoneHelper";
+import { namedLookupLocalizedSelector } from "../../../selectors/metadata";
+import { useSelector } from "react-redux";
 
 const useStyles = makeStyles(theme => ({
 	container: {
@@ -131,12 +138,18 @@ const WrappedDatePicker = ({
 	...props
 }) => {
 	const classes = useStyles({ readOnly });
-	const startDate = value ? new Date(value) : null;
+	const timeZoneName = getTimeZoneByName(timePickerTimeZone);
+	const startDate = value
+		? timePickerTimeZone
+			? convertTimeToLocalTimeZone(new Date(value), timeZoneName)
+			: new Date(value)
+		: null;
 	const disabledCls = classNames({ [classes.disabled]: props.disabled });
+	const localizedTimeZoneName = useSelector(namedLookupLocalizedSelector("customer", "TimeZone", timePickerTimeZone));
 
 	const updateDate = (date, metadata) => {
 		if (onChange) {
-			onChange(date, metadata);
+			onChange(useTime && timePickerTimeZone ? convertTimeToOtherTimeZone(date, timeZoneName) : date, metadata);
 		}
 	};
 
@@ -152,7 +165,7 @@ const WrappedDatePicker = ({
 						showTimeInput={useTime ?? false}
 						useTime={useTime ?? false}
 						customTimeInput={
-							useTime ? <TimePicker showTimeZone={showTimeZone} requestedTimeZone={timePickerTimeZone} /> : null
+							useTime ? <TimePicker showTimeZone={showTimeZone} requestedTimeZone={localizedTimeZoneName} /> : null
 						}
 						timeInputLabel={timeInputLabel ?? ""}
 						readOnly={readOnly}

package/src/components/MaterialUI/Inputs/DatePicker.test.js

@@ -15,8 +15,25 @@ describe("DatePicker", () => {
 			locale: {
 				locale: "en-CA",
 			},
+			metadata: {
+				lookups: {
+					customer: {
+						index: {
+							TimeZone: {
+								values: {
+									UTC: {
+										value: "Eastern Standard Time",
+										displayName: {
+											"en-US": "Eastern Standard Time",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
 		});
-
 		store = {
 			subscribe: () => {},
 			dispatch: () => {},
@@ -311,6 +328,103 @@ describe("DatePicker", () => {
 
 		input.at(0).simulate("change", event);
 	});
+
+	it("should call onChange prop with timezone", () => {
+		const onChangeMock = jest.fn();
+		const date = new Date("2020-06-30T00:00:00");
+		const event = {
+			preventDefault() {},
+			target: { value: "" },
+		};
+		const requestTimeZone = "Eastern Standard Time";
+
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider>
+				<DatePicker
+					onChange={onChangeMock}
+					value={date}
+					useTime={true}
+					useDate={false}
+					showTimeSelectOnly={true}
+					timePickerTimeZone={requestTimeZone}
+				/>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const input = mountedComponent.find("input");
+		input.at(0).simulate("change", event);
+		expect(onChangeMock.mock.calls.length, "to equal", 1);
+	});
+
+	it("should call onChange prop with null timezone", () => {
+		const onChangeMock = jest.fn();
+		const date = new Date("2020-06-30T00:00:00");
+		const event = {
+			preventDefault() {},
+			target: { value: "" },
+		};
+
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider>
+				<DatePicker
+					onChange={onChangeMock}
+					value={date}
+					useTime={true}
+					useDate={false}
+					showTimeSelectOnly={true}
+					timePickerTimeZone={null}
+				/>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const input = mountedComponent.find("input");
+		input.at(0).simulate("change", event);
+		expect(onChangeMock.mock.calls.length, "to equal", 1);
+	});
+
+	it("should call onChange prop with timezone without date value", () => {
+		const onChangeMock = jest.fn();
+		const event = {
+			preventDefault() {},
+			target: { value: "" },
+		};
+		const requestTimeZone = "Eastern Standard Time";
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider>
+				<DatePicker
+					onChange={onChangeMock}
+					useTime={true}
+					useDate={false}
+					showTimeSelectOnly={true}
+					timePickerTimeZone={requestTimeZone}
+				/>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const input = mountedComponent.find("input");
+		input.at(0).simulate("change", event);
+	});
+
+	it("should call onChange prop with timezone and not use time", () => {
+		const date = new Date("2020-06-30T00:00:00");
+		const event = {
+			preventDefault() {},
+			target: { value: "" },
+		};
+		const requestTimeZone = "Eastern Standard Time";
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider>
+				<DatePicker value={date} useDate={false} showTimeSelectOnly={true} timePickerTimeZone={requestTimeZone} />
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const input = mountedComponent.find("input");
+		input.at(0).simulate("change", event);
+	});
 });
 
 describe("createFormat", () => {

package/src/utils/timezoneHelper.js

@@ -1,3 +1,5 @@
+import moment from "moment-timezone";
+
 export const getTimeZone = () => Intl.DateTimeFormat().resolvedOptions().timeZone;
 
 export const getTimeZoneByName = name => {
@@ -14,6 +16,22 @@ export const getTimeZoneName = () => {
 	return timezoneName;
 };
 
+//converting time from other timezone to local
+export const convertTimeToLocalTimeZone = (date, timezone) => {
+	const dateWithoutZone = moment.tz(date, timezone).format("YYYY-MM-DDTHH:mm:ss.SSS");
+	const localZone = moment(dateWithoutZone).format("Z");
+	const dateWithLocalZone = [dateWithoutZone, localZone].join("");
+	return new Date(dateWithLocalZone);
+};
+
+//converting time from local timezone to other
+export const convertTimeToOtherTimeZone = (date, timezone) => {
+	const dateWithoutZone = moment(date).format("YYYY-MM-DDTHH:mm:ss.SSS");
+	const otherZone = moment.tz(date, timezone).format("Z");
+	const dateWithOtherZone = [dateWithoutZone, otherZone].join("");
+	return new Date(dateWithOtherZone);
+};
+
 export const timeZonesList = new Map([
 	["Africa/Bangui", "W. Central Africa Standard Time"],
 	["Africa/Cairo", "Egypt Standard Time"],

package/src/utils/timezoneHelper.test.js

@@ -1,4 +1,10 @@
-import { getTimeZone, getTimeZoneByName, getTimeZoneName } from "./timezoneHelper";
+import {
+	getTimeZone,
+	getTimeZoneByName,
+	getTimeZoneName,
+	convertTimeToLocalTimeZone,
+	convertTimeToOtherTimeZone,
+} from "./timezoneHelper";
 
 describe("Timezone Helper", () => {
 	beforeEach(() => {
@@ -30,4 +36,18 @@ describe("Timezone Helper", () => {
 	it("Retrieves user timezone name", () => {
 		expect(getTimeZoneName, "called with", [], "to satisfy", "W. Europe Standard Time");
 	});
+
+	it("Retrieves user local timezone date", () => {
+		const timezoneName = "America/New_York";
+		const date = "Mon Apr 04 2022 13:00:00 GMT+0300 (Eastern European Summer Time)";
+		const expectedDate = new Date("2022-04-04T09:00:00Z");
+		expect(convertTimeToLocalTimeZone, "called with", [date, timezoneName], "to satisfy", expectedDate);
+	});
+
+	it("Retrieves user other timezone date", () => {
+		const timezoneName = "America/New_York";
+		const date = "Mon Apr 04 2022 03:00:00 GMT+0300 (Eastern European Summer Time)";
+		const expectedDate = new Date("2022-04-04T04:00:00Z");
+		expect(convertTimeToOtherTimeZone, "called with", [date, timezoneName], "to satisfy", expectedDate);
+	});
 });