@webiny/app-headless-cms 5.40.6-beta.1 → 5.40.6-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/admin/plugins/fieldRenderers/dateTime/DateTimeWithTimezone.js +11 -20
  2. package/admin/plugins/fieldRenderers/dateTime/DateTimeWithTimezone.js.map +1 -1
  3. package/admin/plugins/fieldRenderers/dateTime/DateTimeWithoutTimezone.js +6 -14
  4. package/admin/plugins/fieldRenderers/dateTime/DateTimeWithoutTimezone.js.map +1 -1
  5. package/admin/plugins/fieldRenderers/dateTime/utils.d.ts +2 -0
  6. package/admin/plugins/fieldRenderers/dateTime/utils.js +16 -1
  7. package/admin/plugins/fieldRenderers/dateTime/utils.js.map +1 -1
  8. package/package.json +28 -28
package/admin/plugins/fieldRenderers/dateTime/DateTimeWithTimezone.js CHANGED
@@ -1,6 +1,5 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
@@ -8,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
8
7
  exports.DateTimeWithTimezone = void 0;
9
8
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
10
9
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
- var _react = _interopRequireWildcard(require("react"));
10
+ var _react = _interopRequireDefault(require("react"));
12
11
  var _Input = require("./Input");
13
12
  var _Select = require("./Select");
14
13
  var _Grid = require("@webiny/ui/Grid");
@@ -33,11 +32,11 @@ var parseDateTime = function parseDateTime(value) {
33
32
  rest: rest
34
33
  };
35
34
  };
36
- var parseTime = function parseTime(value) {
35
+ var parseTime = function parseTime(value, defaultTimeZone) {
37
36
  if (!value) {
38
37
  return {
39
38
  time: "",
40
- timezone: ""
39
+ timezone: defaultTimeZone || ""
41
40
  };
42
41
  }
43
42
  var sign = value.includes("+") ? "+" : "-";
@@ -57,24 +56,16 @@ var DateTimeWithTimezone = exports.DateTimeWithTimezone = function DateTimeWithT
57
56
  var defaultTimeZone = (0, _utils.getCurrentTimeZone)() || _utils.DEFAULT_TIMEZONE;
58
57
 
59
58
  // "2020-05-18T09:00+10:00"
60
- var initialValue = (0, _utils.getDefaultFieldValue)(field, bind, function () {
59
+ var value = bind.value || (0, _utils.getDefaultFieldValue)(field, bind, function () {
61
60
  var date = new Date();
62
61
  return "".concat((0, _utils.getCurrentDate)(date), "T").concat((0, _utils.getCurrentLocalTime)(date)).concat(defaultTimeZone);
63
62
  });
64
- var _parseDateTime = parseDateTime(initialValue),
63
+ var _parseDateTime = parseDateTime(value),
65
64
  date = _parseDateTime.date,
66
65
  rest = _parseDateTime.rest;
67
- var _parseTime = parseTime(rest),
66
+ var _parseTime = parseTime(rest, defaultTimeZone),
68
67
  time = _parseTime.time,
69
- _parseTime$timezone = _parseTime.timezone,
70
- timezone = _parseTime$timezone === void 0 ? defaultTimeZone : _parseTime$timezone;
71
- var bindValue = bind.value || "";
72
- (0, _react.useEffect)(function () {
73
- if (!date || !time || !timezone || bindValue === initialValue) {
74
- return;
75
- }
76
- bind.onChange(initialValue);
77
- }, [bindValue]);
68
+ timezone = _parseTime.timezone;
78
69
  var cellSize = trailingIcon ? 3 : 4;
79
70
  return /*#__PURE__*/_react.default.createElement(_Grid.Grid, null, /*#__PURE__*/_react.default.createElement(_Grid.Cell, {
80
71
  span: 4
@@ -88,7 +79,7 @@ var DateTimeWithTimezone = exports.DateTimeWithTimezone = function DateTimeWithT
88
79
  }
89
80
  return bind.onChange("");
90
81
  }
91
- return bind.onChange("".concat(value, "T").concat(time || (0, _utils.getCurrentLocalTime)()).concat(timezone || defaultTimeZone));
82
+ return bind.onChange("".concat(value, "T").concat((0, _utils.getHHmmss)(time)).concat(timezone));
92
83
  }
93
84
  }),
94
85
  field: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
@@ -99,7 +90,7 @@ var DateTimeWithTimezone = exports.DateTimeWithTimezone = function DateTimeWithT
99
90
  span: 4
100
91
  }, /*#__PURE__*/_react.default.createElement(_Input.Input, {
101
92
  bind: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, bind), {}, {
102
- value: time,
93
+ value: (0, _utils.getHHmm)(time),
103
94
  onChange: async function onChange(value) {
104
95
  if (!value) {
105
96
  if (!bind.value) {
@@ -107,7 +98,7 @@ var DateTimeWithTimezone = exports.DateTimeWithTimezone = function DateTimeWithT
107
98
  }
108
99
  return bind.onChange("");
109
100
  }
110
- return bind.onChange("".concat(date || (0, _utils.getCurrentDate)(), "T").concat(value).concat(timezone || defaultTimeZone));
101
+ return bind.onChange("".concat(date || (0, _utils.getCurrentDate)(), "T").concat((0, _utils.getHHmmss)(value)).concat(timezone));
111
102
  }
112
103
  }),
113
104
  field: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
@@ -119,7 +110,7 @@ var DateTimeWithTimezone = exports.DateTimeWithTimezone = function DateTimeWithT
119
110
  span: cellSize
120
111
  }, /*#__PURE__*/_react.default.createElement(_Select.Select, {
121
112
  label: "Timezone",
122
- value: timezone || defaultTimeZone,
113
+ value: timezone,
123
114
  onChange: function onChange(value) {
124
115
  if (!value) {
125
116
  if (!bind.value) {
package/admin/plugins/fieldRenderers/dateTime/DateTimeWithTimezone.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireWildcard","require","_Input","_Select","_Grid","_utils","_utils2","parseDateTime","value","date","rest","_value$split","split","_value$split2","_slicedToArray2","default","formattedDate","Error","concat","parseTime","time","timezone","sign","includes","_value$split3","_value$split4","fullTime","zone","DateTimeWithTimezone","exports","_ref","bind","trailingIcon","field","defaultTimeZone","getCurrentTimeZone","DEFAULT_TIMEZONE","initialValue","getDefaultFieldValue","Date","getCurrentDate","getCurrentLocalTime","_parseDateTime","_parseTime","_parseTime$timezone","bindValue","useEffect","onChange","cellSize","createElement","Grid","Cell","span","Input","_objectSpread2","label","type","step","Select","options","UTC_TIMEZONES","map","t","RemoveFieldButton"],"sources":["DateTimeWithTimezone.tsx"],"sourcesContent":["import React, { useEffect } from \"react\";\nimport { Input } from \"./Input\";\nimport { Select } from \"./Select\";\nimport { Grid, Cell } from \"@webiny/ui/Grid\";\nimport {\n RemoveFieldButton,\n getDefaultFieldValue,\n DEFAULT_TIMEZONE,\n getCurrentDate,\n getCurrentLocalTime,\n getCurrentTimeZone\n} from \"./utils\";\nimport { CmsModelField } from \"~/types\";\nimport { BindComponentRenderProp } from \"@webiny/form\";\nimport { UTC_TIMEZONES } from \"@webiny/utils\";\n\ninterface State {\n date: string;\n time: string;\n timezone: string;\n}\n\nconst parseDateTime = (value?: string): Pick<State, \"date\"> & { rest: string } => {\n if (!value || typeof value !== \"string\") {\n return {\n date: \"\",\n rest: \"\"\n };\n }\n const [formattedDate, rest] = value.split(\"T\");\n if (!formattedDate || !rest) {\n throw new Error(`Could not extract date and time from \"${value}\".`);\n }\n return {\n date: formattedDate,\n rest\n };\n};\n\nconst parseTime = (value?: string): Pick<State, \"time\" | \"timezone\"> => {\n if (!value) {\n return {\n time: \"\",\n timezone: \"\"\n };\n }\n const sign = value.includes(\"+\") ? \"+\" : \"-\";\n const [fullTime, zone] = value.split(sign);\n\n return {\n time: fullTime,\n timezone: sign + zone\n };\n};\n\nexport interface DateTimeWithTimezoneProps {\n bind: BindComponentRenderProp;\n trailingIcon?: any;\n field: CmsModelField;\n}\nexport const DateTimeWithTimezone = ({ bind, trailingIcon, field }: DateTimeWithTimezoneProps) => {\n const defaultTimeZone = getCurrentTimeZone() || DEFAULT_TIMEZONE;\n\n // \"2020-05-18T09:00+10:00\"\n const initialValue = getDefaultFieldValue(field, bind, () => {\n const date = new Date();\n return `${getCurrentDate(date)}T${getCurrentLocalTime(date)}${defaultTimeZone}`;\n });\n const { date, rest } = parseDateTime(initialValue);\n const { time, timezone = defaultTimeZone } = parseTime(rest);\n\n const bindValue = bind.value || \"\";\n useEffect(() => {\n if (!date || !time || !timezone || bindValue === initialValue) {\n return;\n }\n bind.onChange(initialValue);\n }, [bindValue]);\n\n const cellSize = trailingIcon ? 3 : 4;\n\n return (\n <Grid>\n <Cell span={4}>\n <Input\n bind={{\n ...bind,\n value: date,\n onChange: async (value: string) => {\n if (!value) {\n if (!bind.value) {\n return;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(\n `${value}T${time || getCurrentLocalTime()}${\n timezone || defaultTimeZone\n }`\n );\n }\n }}\n field={{\n ...field,\n label: `${field.label} date`\n }}\n type={\"date\"}\n />\n </Cell>\n <Cell span={4}>\n <Input\n bind={{\n ...bind,\n value: time,\n onChange: async value => {\n if (!value) {\n if (!bind.value) {\n return;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(\n `${date || getCurrentDate()}T${value}${timezone || defaultTimeZone}`\n );\n }\n }}\n field={{\n ...field,\n label: `${field.label} time`\n }}\n type={\"time\"}\n step={60}\n />\n </Cell>\n <Cell span={cellSize}>\n <Select\n label=\"Timezone\"\n value={timezone || defaultTimeZone}\n onChange={value => {\n if (!value) {\n if (!bind.value) {\n return null;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(\n `${date || getCurrentDate()}T${time || getCurrentLocalTime()}${value}`\n );\n }}\n options={UTC_TIMEZONES.map(t => ({ value: t.value, label: t.label }))}\n />\n </Cell>\n <RemoveFieldButton trailingIcon={trailingIcon} />\n </Grid>\n );\n};\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","_interopRequireDefault","require","_Input","_Select","_Grid","_utils","_utils2","parseDateTime","value","date","rest","_value$split","split","_value$split2","_slicedToArray2","default","formattedDate","Error","concat","parseTime","defaultTimeZone","time","timezone","sign","includes","_value$split3","_value$split4","fullTime","zone","DateTimeWithTimezone","exports","_ref","bind","trailingIcon","field","getCurrentTimeZone","DEFAULT_TIMEZONE","getDefaultFieldValue","Date","getCurrentDate","getCurrentLocalTime","_parseDateTime","_parseTime","cellSize","createElement","Grid","Cell","span","Input","_objectSpread2","onChange","getHHmmss","label","type","getHHmm","step","Select","options","UTC_TIMEZONES","map","t","RemoveFieldButton"],"sources":["DateTimeWithTimezone.tsx"],"sourcesContent":["import React from \"react\";\nimport { Input } from \"./Input\";\nimport { Select } from \"./Select\";\nimport { Grid, Cell } from \"@webiny/ui/Grid\";\nimport {\n RemoveFieldButton,\n getDefaultFieldValue,\n DEFAULT_TIMEZONE,\n getCurrentDate,\n getCurrentLocalTime,\n getCurrentTimeZone,\n getHHmmss,\n getHHmm\n} from \"./utils\";\nimport { CmsModelField } from \"~/types\";\nimport { BindComponentRenderProp } from \"@webiny/form\";\nimport { UTC_TIMEZONES } from \"@webiny/utils\";\n\ninterface State {\n date: string;\n time: string;\n timezone: string;\n}\n\nconst parseDateTime = (value?: string): Pick<State, \"date\"> & { rest: string } => {\n if (!value || typeof value !== \"string\") {\n return {\n date: \"\",\n rest: \"\"\n };\n }\n const [formattedDate, rest] = value.split(\"T\");\n if (!formattedDate || !rest) {\n throw new Error(`Could not extract date and time from \"${value}\".`);\n }\n return {\n date: formattedDate,\n rest\n };\n};\n\nconst parseTime = (value?: string, defaultTimeZone?: string): Pick<State, \"time\" | \"timezone\"> => {\n if (!value) {\n return {\n time: \"\",\n timezone: defaultTimeZone || \"\"\n };\n }\n const sign = value.includes(\"+\") ? \"+\" : \"-\";\n const [fullTime, zone] = value.split(sign);\n\n return {\n time: fullTime,\n timezone: sign + zone\n };\n};\n\nexport interface DateTimeWithTimezoneProps {\n bind: BindComponentRenderProp;\n trailingIcon?: any;\n field: CmsModelField;\n}\nexport const DateTimeWithTimezone = ({ bind, trailingIcon, field }: DateTimeWithTimezoneProps) => {\n const defaultTimeZone = getCurrentTimeZone() || DEFAULT_TIMEZONE;\n\n // \"2020-05-18T09:00+10:00\"\n const value =\n bind.value ||\n getDefaultFieldValue(field, bind, () => {\n const date = new Date();\n return `${getCurrentDate(date)}T${getCurrentLocalTime(date)}${defaultTimeZone}`;\n });\n\n const { date, rest } = parseDateTime(value);\n const { time, timezone } = parseTime(rest, defaultTimeZone);\n\n const cellSize = trailingIcon ? 3 : 4;\n\n return (\n <Grid>\n <Cell span={4}>\n <Input\n bind={{\n ...bind,\n value: date,\n onChange: async (value: string) => {\n if (!value) {\n if (!bind.value) {\n return;\n }\n return bind.onChange(\"\");\n }\n\n return bind.onChange(`${value}T${getHHmmss(time)}${timezone}`);\n }\n }}\n field={{\n ...field,\n label: `${field.label} date`\n }}\n type={\"date\"}\n />\n </Cell>\n <Cell span={4}>\n <Input\n bind={{\n ...bind,\n value: getHHmm(time),\n onChange: async value => {\n if (!value) {\n if (!bind.value) {\n return;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(\n `${date || getCurrentDate()}T${getHHmmss(value)}${timezone}`\n );\n }\n }}\n field={{\n ...field,\n label: `${field.label} time`\n }}\n type={\"time\"}\n step={60}\n />\n </Cell>\n <Cell span={cellSize}>\n <Select\n label=\"Timezone\"\n value={timezone}\n onChange={value => {\n if (!value) {\n if (!bind.value) {\n return null;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(\n `${date || getCurrentDate()}T${time || getCurrentLocalTime()}${value}`\n );\n }}\n options={UTC_TIMEZONES.map(t => ({ value: t.value, label: t.label }))}\n />\n </Cell>\n <RemoveFieldButton trailingIcon={trailingIcon} />\n </Grid>\n );\n};\n"],"mappings":"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","ignoreList":[]}
package/admin/plugins/fieldRenderers/dateTime/DateTimeWithoutTimezone.js CHANGED
@@ -1,6 +1,5 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
@@ -8,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
8
7
  exports.DateTimeWithoutTimezone = void 0;
9
8
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
10
9
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
- var _react = _interopRequireWildcard(require("react"));
10
+ var _react = _interopRequireDefault(require("react"));
12
11
  var _Grid = require("@webiny/ui/Grid");
13
12
  var _utils = require("./utils");
14
13
  var _Input = require("./Input");
@@ -50,20 +49,13 @@ var DateTimeWithoutTimezone = exports.DateTimeWithoutTimezone = function DateTim
50
49
  bind = _ref.bind,
51
50
  trailingIcon = _ref.trailingIcon;
52
51
  // "2020-05-18 09:00:00"
53
- var initialValue = (0, _utils.getDefaultFieldValue)(field, bind, function () {
52
+ var value = bind.value || (0, _utils.getDefaultFieldValue)(field, bind, function () {
54
53
  var date = new Date();
55
54
  return "".concat((0, _utils.getCurrentDate)(date), " ").concat((0, _utils.getCurrentLocalTime)(date));
56
55
  });
57
- var _parseDateTime = parseDateTime(initialValue),
56
+ var _parseDateTime = parseDateTime(value),
58
57
  date = _parseDateTime.date,
59
58
  time = _parseDateTime.time;
60
- var bindValue = bind.value || "";
61
- (0, _react.useEffect)(function () {
62
- if (!date || !time || bindValue === initialValue) {
63
- return;
64
- }
65
- bind.onChange(initialValue);
66
- }, [bindValue]);
67
59
  var cellSize = trailingIcon ? 5 : 6;
68
60
  return /*#__PURE__*/_react.default.createElement(_Grid.Grid, null, /*#__PURE__*/_react.default.createElement(_Grid.Cell, {
69
61
  span: 6
@@ -77,7 +69,7 @@ var DateTimeWithoutTimezone = exports.DateTimeWithoutTimezone = function DateTim
77
69
  }
78
70
  return bind.onChange("");
79
71
  }
80
- return bind.onChange("".concat(value, " ").concat(time || (0, _utils.getCurrentLocalTime)()));
72
+ return bind.onChange("".concat(value, " ").concat((0, _utils.getHHmmss)(time)));
81
73
  }
82
74
  }),
83
75
  field: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
@@ -88,7 +80,7 @@ var DateTimeWithoutTimezone = exports.DateTimeWithoutTimezone = function DateTim
88
80
  span: cellSize
89
81
  }, /*#__PURE__*/_react.default.createElement(_Input.Input, {
90
82
  bind: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, bind), {}, {
91
- value: time,
83
+ value: (0, _utils.getHHmm)(time),
92
84
  onChange: async function onChange(value) {
93
85
  if (!value) {
94
86
  if (!bind.value) {
@@ -96,7 +88,7 @@ var DateTimeWithoutTimezone = exports.DateTimeWithoutTimezone = function DateTim
96
88
  }
97
89
  return bind.onChange("");
98
90
  }
99
- return bind.onChange("".concat(date || (0, _utils.getCurrentDate)(), " ").concat(value));
91
+ return bind.onChange("".concat(date || (0, _utils.getCurrentDate)(), " ").concat((0, _utils.getHHmmss)(value)));
100
92
  }
101
93
  }),
102
94
  field: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
package/admin/plugins/fieldRenderers/dateTime/DateTimeWithoutTimezone.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireWildcard","require","_Grid","_utils","_Input","parseDateTime","value","date","time","includes","_value$split$0$split","split","_value$split$0$split2","_slicedToArray2","default","_value$split","_value$split2","console","error","concat","DateTimeWithoutTimezone","exports","_ref","field","bind","trailingIcon","initialValue","getDefaultFieldValue","Date","getCurrentDate","getCurrentLocalTime","_parseDateTime","bindValue","useEffect","onChange","cellSize","createElement","Grid","Cell","span","Input","_objectSpread2","label","type","step","RemoveFieldButton"],"sources":["DateTimeWithoutTimezone.tsx"],"sourcesContent":["import React, { useEffect } from \"react\";\nimport { Grid, Cell } from \"@webiny/ui/Grid\";\nimport {\n getCurrentDate,\n getCurrentLocalTime,\n getDefaultFieldValue,\n RemoveFieldButton\n} from \"./utils\";\nimport { Input } from \"./Input\";\nimport { CmsModelField } from \"~/types\";\nimport { BindComponentRenderProp } from \"@webiny/form\";\n\ninterface State {\n date: string;\n time: string;\n}\n\nconst parseDateTime = (value?: string): State => {\n if (!value) {\n return {\n date: \"\",\n time: \"\"\n };\n }\n if (value.includes(\"T\")) {\n const [date, time] = value.split(\".\")[0].split(\"T\");\n return {\n date,\n time\n };\n }\n const [date, time] = value.split(\" \");\n if (!date || !time) {\n console.error(`Could not extract date and time from \"${value}\".`);\n\n return {\n date: \"\",\n time: \"\"\n };\n }\n return {\n date,\n time\n };\n};\n\nexport interface DateTimeWithoutTimezoneProps {\n bind: BindComponentRenderProp;\n trailingIcon?: any;\n field: CmsModelField;\n}\nexport const DateTimeWithoutTimezone = ({\n field,\n bind,\n trailingIcon\n}: DateTimeWithoutTimezoneProps) => {\n // \"2020-05-18 09:00:00\"\n const initialValue = getDefaultFieldValue(field, bind, () => {\n const date = new Date();\n return `${getCurrentDate(date)} ${getCurrentLocalTime(date)}`;\n });\n\n const { date, time } = parseDateTime(initialValue);\n\n const bindValue = bind.value || \"\";\n\n useEffect(() => {\n if (!date || !time || bindValue === initialValue) {\n return;\n }\n bind.onChange(initialValue);\n }, [bindValue]);\n\n const cellSize = trailingIcon ? 5 : 6;\n\n return (\n <Grid>\n <Cell span={6}>\n <Input\n bind={{\n ...bind,\n value: date,\n onChange: async value => {\n if (!value) {\n if (!bind.value) {\n return;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(`${value} ${time || getCurrentLocalTime()}`);\n }\n }}\n field={{\n ...field,\n label: `${field.label} date`\n }}\n type={\"date\"}\n />\n </Cell>\n <Cell span={cellSize}>\n <Input\n bind={{\n ...bind,\n value: time,\n onChange: async value => {\n if (!value) {\n if (!bind.value) {\n return;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(`${date || getCurrentDate()} ${value}`);\n }\n }}\n field={{\n ...field,\n label: `${field.label} time`\n }}\n type={\"time\"}\n step={60}\n />\n </Cell>\n <RemoveFieldButton trailingIcon={trailingIcon} />\n </Grid>\n );\n};\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","_interopRequireDefault","require","_Grid","_utils","_Input","parseDateTime","value","date","time","includes","_value$split$0$split","split","_value$split$0$split2","_slicedToArray2","default","_value$split","_value$split2","console","error","concat","DateTimeWithoutTimezone","exports","_ref","field","bind","trailingIcon","getDefaultFieldValue","Date","getCurrentDate","getCurrentLocalTime","_parseDateTime","cellSize","createElement","Grid","Cell","span","Input","_objectSpread2","onChange","getHHmmss","label","type","getHHmm","step","RemoveFieldButton"],"sources":["DateTimeWithoutTimezone.tsx"],"sourcesContent":["import React from \"react\";\nimport { Grid, Cell } from \"@webiny/ui/Grid\";\nimport {\n getCurrentDate,\n getCurrentLocalTime,\n getDefaultFieldValue,\n getHHmm,\n getHHmmss,\n RemoveFieldButton\n} from \"./utils\";\nimport { Input } from \"./Input\";\nimport { CmsModelField } from \"~/types\";\nimport { BindComponentRenderProp } from \"@webiny/form\";\n\ninterface State {\n date: string;\n time: string;\n}\n\nconst parseDateTime = (value?: string): State => {\n if (!value) {\n return {\n date: \"\",\n time: \"\"\n };\n }\n if (value.includes(\"T\")) {\n const [date, time] = value.split(\".\")[0].split(\"T\");\n return {\n date,\n time\n };\n }\n const [date, time] = value.split(\" \");\n if (!date || !time) {\n console.error(`Could not extract date and time from \"${value}\".`);\n\n return {\n date: \"\",\n time: \"\"\n };\n }\n return {\n date,\n time\n };\n};\n\nexport interface DateTimeWithoutTimezoneProps {\n bind: BindComponentRenderProp;\n trailingIcon?: any;\n field: CmsModelField;\n}\nexport const DateTimeWithoutTimezone = ({\n field,\n bind,\n trailingIcon\n}: DateTimeWithoutTimezoneProps) => {\n // \"2020-05-18 09:00:00\"\n const value =\n bind.value ||\n getDefaultFieldValue(field, bind, () => {\n const date = new Date();\n return `${getCurrentDate(date)} ${getCurrentLocalTime(date)}`;\n });\n\n const { date, time } = parseDateTime(value);\n\n const cellSize = trailingIcon ? 5 : 6;\n\n return (\n <Grid>\n <Cell span={6}>\n <Input\n bind={{\n ...bind,\n value: date,\n onChange: async value => {\n if (!value) {\n if (!bind.value) {\n return;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(`${value} ${getHHmmss(time)}`);\n }\n }}\n field={{\n ...field,\n label: `${field.label} date`\n }}\n type={\"date\"}\n />\n </Cell>\n <Cell span={cellSize}>\n <Input\n bind={{\n ...bind,\n value: getHHmm(time),\n onChange: async value => {\n if (!value) {\n if (!bind.value) {\n return;\n }\n return bind.onChange(\"\");\n }\n return bind.onChange(`${date || getCurrentDate()} ${getHHmmss(value)}`);\n }\n }}\n field={{\n ...field,\n label: `${field.label} time`\n }}\n type={\"time\"}\n step={60}\n />\n </Cell>\n <RemoveFieldButton trailingIcon={trailingIcon} />\n </Grid>\n );\n};\n"],"mappings":"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","ignoreList":[]}
package/admin/plugins/fieldRenderers/dateTime/utils.d.ts CHANGED
@@ -7,6 +7,8 @@ export declare const getDefaultFieldValue: (field: CmsModelField, bind: {
7
7
  export declare const getCurrentTimeZone: (date?: Date) => string | null;
8
8
  export declare const getCurrentLocalTime: (date?: Date) => string;
9
9
  export declare const getCurrentDate: (date?: Date) => string;
10
+ export declare const getHHmm: (time?: string) => string;
11
+ export declare const getHHmmss: (time?: string) => string;
10
12
  interface RemoveFieldButtonProps {
11
13
  trailingIcon: any;
12
14
  }
package/admin/plugins/fieldRenderers/dateTime/utils.js CHANGED
@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.getDefaultFieldValue = exports.getCurrentTimeZone = exports.getCurrentLocalTime = exports.getCurrentDate = exports.RemoveFieldButton = exports.DEFAULT_TIMEZONE = void 0;
7
+ exports.getHHmmss = exports.getHHmm = exports.getDefaultFieldValue = exports.getCurrentTimeZone = exports.getCurrentLocalTime = exports.getCurrentDate = exports.RemoveFieldButton = exports.DEFAULT_TIMEZONE = void 0;
8
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
8
9
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
9
10
  var _react = _interopRequireDefault(require("react"));
10
11
  var _emotion = require("emotion");
@@ -52,6 +53,20 @@ var getCurrentDate = exports.getCurrentDate = function getCurrentDate(date) {
52
53
  var day = String(date.getDate()).padStart(2, "0");
53
54
  return "".concat(year, "-").concat(month, "-").concat(day);
54
55
  };
56
+ var getHHmm = exports.getHHmm = function getHHmm(time) {
57
+ if (!time) {
58
+ return "";
59
+ }
60
+ var parsableTime = time || getCurrentLocalTime();
61
+ return parsableTime.split(":").slice(0, 2).join(":");
62
+ };
63
+
64
+ // Ensure a valid HH:mm:ss string, ending with :00 for seconds.
65
+ var getHHmmss = exports.getHHmmss = function getHHmmss(time) {
66
+ var parsableTime = time || getCurrentLocalTime();
67
+ var parts = [].concat((0, _toConsumableArray2.default)(parsableTime.split(":").slice(0, 2)), ["00"]);
68
+ return parts.join(":");
69
+ };
55
70
  var deleteIconStyles = (0, _emotion.css)({
56
71
  width: "100% !important",
57
72
  height: "100% !important",
package/admin/plugins/fieldRenderers/dateTime/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireDefault","require","_emotion","_Grid","_Button","DEFAULT_TIMEZONE","exports","getDefaultFieldValue","field","bind","getCurrent","def","settings","defaultSetValue","value","getCurrentTimeZone","date","Date","toTimeString","matches","match","timezone","concat","slice","getCurrentLocalTime","_value$split","split","_value$split2","_slicedToArray2","default","time","getCurrentDate","year","String","getFullYear","padStart","month","getMonth","day","getDate","deleteIconStyles","css","width","height","color","RemoveFieldButton","_ref","trailingIcon","createElement","Cell","span","IconButton","className","onClick","icon"],"sources":["utils.tsx"],"sourcesContent":["import React from \"react\";\nimport { css } from \"emotion\";\nimport { Cell } from \"@webiny/ui/Grid\";\nimport { IconButton } from \"@webiny/ui/Button\";\nimport { CmsModelField } from \"~/types\";\n\nexport const DEFAULT_TIMEZONE = \"+01:00\";\n\nexport const getDefaultFieldValue = (\n field: CmsModelField,\n bind: {\n value: string | null | undefined;\n },\n getCurrent: () => string\n): string => {\n const def = field.settings ? field.settings.defaultSetValue || \"null\" : \"null\";\n if (bind.value || def !== \"current\") {\n return bind.value || \"\";\n }\n return getCurrent();\n};\n\nexport const getCurrentTimeZone = (date?: Date): string | null => {\n if (!date) {\n date = new Date();\n }\n const value = date.toTimeString();\n\n const matches = value.match(/GMT([+-][0-9]{4})/);\n if (!matches) {\n return null;\n }\n const timezone = matches[1];\n return `${timezone.slice(0, 3)}:${timezone.slice(3)}`;\n};\n\nexport const getCurrentLocalTime = (date?: Date): string => {\n if (!date) {\n date = new Date();\n }\n const value = date.toTimeString();\n\n const [time] = value.split(\" \");\n if (!time || time.match(/^([0-9]{2}):([0-9]{2}):([0-9]{2})$/) === null) {\n return \"00:00:00\";\n }\n return time;\n};\n\nexport const getCurrentDate = (date?: Date): string => {\n if (!date) {\n date = new Date();\n }\n const year = String(date.getFullYear()).padStart(4, \"0\");\n const month = String(date.getMonth() + 1).padStart(2, \"0\");\n const day = String(date.getDate()).padStart(2, \"0\");\n\n return `${year}-${month}-${day}`;\n};\n\nconst deleteIconStyles = css({\n width: \"100% !important\",\n height: \"100% !important\",\n color: \"var(--mdc-theme-text-secondary-on-background) !important\"\n});\n\ninterface RemoveFieldButtonProps {\n trailingIcon: any;\n}\nexport const RemoveFieldButton = ({ trailingIcon }: RemoveFieldButtonProps) => {\n if (!trailingIcon) {\n return null;\n }\n return (\n <Cell span={1}>\n <IconButton\n className={deleteIconStyles}\n onClick={trailingIcon.onClick}\n icon={trailingIcon.icon}\n />\n </Cell>\n );\n};\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","_interopRequireDefault","require","_emotion","_Grid","_Button","DEFAULT_TIMEZONE","exports","getDefaultFieldValue","field","bind","getCurrent","def","settings","defaultSetValue","value","getCurrentTimeZone","date","Date","toTimeString","matches","match","timezone","concat","slice","getCurrentLocalTime","_value$split","split","_value$split2","_slicedToArray2","default","time","getCurrentDate","year","String","getFullYear","padStart","month","getMonth","day","getDate","getHHmm","parsableTime","join","getHHmmss","parts","_toConsumableArray2","deleteIconStyles","css","width","height","color","RemoveFieldButton","_ref","trailingIcon","createElement","Cell","span","IconButton","className","onClick","icon"],"sources":["utils.tsx"],"sourcesContent":["import React from \"react\";\nimport { css } from \"emotion\";\nimport { Cell } from \"@webiny/ui/Grid\";\nimport { IconButton } from \"@webiny/ui/Button\";\nimport { CmsModelField } from \"~/types\";\n\nexport const DEFAULT_TIMEZONE = \"+01:00\";\n\nexport const getDefaultFieldValue = (\n field: CmsModelField,\n bind: {\n value: string | null | undefined;\n },\n getCurrent: () => string\n): string => {\n const def = field.settings ? field.settings.defaultSetValue || \"null\" : \"null\";\n if (bind.value || def !== \"current\") {\n return bind.value || \"\";\n }\n return getCurrent();\n};\n\nexport const getCurrentTimeZone = (date?: Date): string | null => {\n if (!date) {\n date = new Date();\n }\n const value = date.toTimeString();\n\n const matches = value.match(/GMT([+-][0-9]{4})/);\n if (!matches) {\n return null;\n }\n const timezone = matches[1];\n return `${timezone.slice(0, 3)}:${timezone.slice(3)}`;\n};\n\nexport const getCurrentLocalTime = (date?: Date): string => {\n if (!date) {\n date = new Date();\n }\n const value = date.toTimeString();\n\n const [time] = value.split(\" \");\n if (!time || time.match(/^([0-9]{2}):([0-9]{2}):([0-9]{2})$/) === null) {\n return \"00:00:00\";\n }\n return time;\n};\n\nexport const getCurrentDate = (date?: Date): string => {\n if (!date) {\n date = new Date();\n }\n const year = String(date.getFullYear()).padStart(4, \"0\");\n const month = String(date.getMonth() + 1).padStart(2, \"0\");\n const day = String(date.getDate()).padStart(2, \"0\");\n\n return `${year}-${month}-${day}`;\n};\n\nexport const getHHmm = (time?: string) => {\n if (!time) {\n return \"\";\n }\n const parsableTime = time || getCurrentLocalTime();\n return parsableTime.split(\":\").slice(0, 2).join(\":\");\n};\n\n// Ensure a valid HH:mm:ss string, ending with :00 for seconds.\nexport const getHHmmss = (time?: string) => {\n const parsableTime = time || getCurrentLocalTime();\n const parts = [...parsableTime.split(\":\").slice(0, 2), \"00\"];\n\n return parts.join(\":\");\n};\n\nconst deleteIconStyles = css({\n width: \"100% !important\",\n height: \"100% !important\",\n color: \"var(--mdc-theme-text-secondary-on-background) !important\"\n});\n\ninterface RemoveFieldButtonProps {\n trailingIcon: any;\n}\nexport const RemoveFieldButton = ({ trailingIcon }: RemoveFieldButtonProps) => {\n if (!trailingIcon) {\n return null;\n }\n return (\n <Cell span={1}>\n <IconButton\n className={deleteIconStyles}\n onClick={trailingIcon.onClick}\n icon={trailingIcon.icon}\n />\n </Cell>\n );\n};\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/app-headless-cms",
3
- "version": "5.40.6-beta.1",
3
+ "version": "5.40.6-beta.2",
4
4
  "main": "index.js",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,30 +28,30 @@
28
28
  "@material-design-icons/svg": "0.14.13",
29
29
  "@svgr/webpack": "6.5.1",
30
30
  "@types/react": "18.2.79",
31
- "@webiny/app": "5.40.6-beta.1",
32
- "@webiny/app-aco": "5.40.6-beta.1",
33
- "@webiny/app-admin": "5.40.6-beta.1",
34
- "@webiny/app-graphql-playground": "5.40.6-beta.1",
35
- "@webiny/app-headless-cms-common": "5.40.6-beta.1",
36
- "@webiny/app-i18n": "5.40.6-beta.1",
37
- "@webiny/app-plugin-admin-welcome-screen": "5.40.6-beta.1",
38
- "@webiny/app-security": "5.40.6-beta.1",
39
- "@webiny/app-tenancy": "5.40.6-beta.1",
40
- "@webiny/app-trash-bin": "5.40.6-beta.1",
41
- "@webiny/error": "5.40.6-beta.1",
42
- "@webiny/feature-flags": "5.40.6-beta.1",
43
- "@webiny/form": "5.40.6-beta.1",
44
- "@webiny/lexical-editor": "5.40.6-beta.1",
45
- "@webiny/lexical-nodes": "5.40.6-beta.1",
46
- "@webiny/lexical-theme": "5.40.6-beta.1",
47
- "@webiny/plugins": "5.40.6-beta.1",
48
- "@webiny/react-composition": "5.40.6-beta.1",
49
- "@webiny/react-properties": "5.40.6-beta.1",
50
- "@webiny/react-router": "5.40.6-beta.1",
51
- "@webiny/theme": "5.40.6-beta.1",
52
- "@webiny/ui": "5.40.6-beta.1",
53
- "@webiny/utils": "5.40.6-beta.1",
54
- "@webiny/validation": "5.40.6-beta.1",
31
+ "@webiny/app": "5.40.6-beta.2",
32
+ "@webiny/app-aco": "5.40.6-beta.2",
33
+ "@webiny/app-admin": "5.40.6-beta.2",
34
+ "@webiny/app-graphql-playground": "5.40.6-beta.2",
35
+ "@webiny/app-headless-cms-common": "5.40.6-beta.2",
36
+ "@webiny/app-i18n": "5.40.6-beta.2",
37
+ "@webiny/app-plugin-admin-welcome-screen": "5.40.6-beta.2",
38
+ "@webiny/app-security": "5.40.6-beta.2",
39
+ "@webiny/app-tenancy": "5.40.6-beta.2",
40
+ "@webiny/app-trash-bin": "5.40.6-beta.2",
41
+ "@webiny/error": "5.40.6-beta.2",
42
+ "@webiny/feature-flags": "5.40.6-beta.2",
43
+ "@webiny/form": "5.40.6-beta.2",
44
+ "@webiny/lexical-editor": "5.40.6-beta.2",
45
+ "@webiny/lexical-nodes": "5.40.6-beta.2",
46
+ "@webiny/lexical-theme": "5.40.6-beta.2",
47
+ "@webiny/plugins": "5.40.6-beta.2",
48
+ "@webiny/react-composition": "5.40.6-beta.2",
49
+ "@webiny/react-properties": "5.40.6-beta.2",
50
+ "@webiny/react-router": "5.40.6-beta.2",
51
+ "@webiny/theme": "5.40.6-beta.2",
52
+ "@webiny/ui": "5.40.6-beta.2",
53
+ "@webiny/utils": "5.40.6-beta.2",
54
+ "@webiny/validation": "5.40.6-beta.2",
55
55
  "apollo-cache": "1.3.5",
56
56
  "apollo-client": "2.6.10",
57
57
  "apollo-link": "1.2.14",
@@ -85,8 +85,8 @@
85
85
  "@babel/preset-react": "7.24.1",
86
86
  "@babel/preset-typescript": "7.24.1",
87
87
  "@emotion/babel-plugin": "11.11.0",
88
- "@webiny/cli": "5.40.6-beta.1",
89
- "@webiny/project-utils": "5.40.6-beta.1",
88
+ "@webiny/cli": "5.40.6-beta.2",
89
+ "@webiny/project-utils": "5.40.6-beta.2",
90
90
  "babel-plugin-module-resolver": "5.0.0",
91
91
  "rimraf": "5.0.5",
92
92
  "ttypescript": "1.5.15",
@@ -115,5 +115,5 @@
115
115
  ]
116
116
  }
117
117
  },
118
- "gitHead": "8e5c47c1cbad8da50813bea5257f9ab1eb8718c8"
118
+ "gitHead": "ddc00124276d952934007571d9409a5d88583b5a"
119
119
  }