@webiny/app-headless-cms 5.20.0 → 5.22.0-beta.1

package/admin/plugins/fieldRenderers/dateTime/DateTimeWithTimezone.js

@@ -1,14 +1,17 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import React, { useState, useEffect } from "react";
-import Input from "./Input";
-import Select from "./Select";
+import React, { useEffect } from "react";
+import { Input } from "./Input";
+import { Select } from "./Select";
 import { Grid, Cell } from "@webiny/ui/Grid";
-import { UTC_TIMEZONES, DEFAULT_TIME, DEFAULT_DATE, DEFAULT_TIMEZONE, RemoveFieldButton } from "./utils";
+import { UTC_TIMEZONES, RemoveFieldButton, getDefaultFieldValue, DEFAULT_TIMEZONE, getCurrentDate, getCurrentLocalTime, getCurrentTimeZone } from "./utils";
 
 var parseDateTime = function parseDateTime(value) {
   if (!value || typeof value !== "string") {
-    return {};
+    return {
+      date: "",
+      rest: ""
+    };
   }
 
   var _value$split = value.split("T"),
@@ -21,14 +24,17 @@ var parseDateTime = function parseDateTime(value) {
   }
 
   return {
-    formattedDate: formattedDate,
+    date: formattedDate,
     rest: rest
   };
 };
 
 var parseTime = function parseTime(value) {
   if (!value) {
-    return {};
+    return {
+      time: "",
+      timezone: ""
+    };
   }
 
   var sign = value.includes("+") ? "+" : "-";
@@ -39,50 +45,39 @@ var parseTime = function parseTime(value) {
       zone = _value$split4[1];
 
   return {
-    formattedTime: fullTime,
-    formattedTimezone: sign + zone
+    time: fullTime,
+    timezone: sign + zone
   };
 };
 
-var DateTimeWithTimezone = function DateTimeWithTimezone(_ref) {
+export var DateTimeWithTimezone = function DateTimeWithTimezone(_ref) {
   var bind = _ref.bind,
       trailingIcon = _ref.trailingIcon,
       field = _ref.field;
+  var defaultTimeZone = getCurrentTimeZone() || DEFAULT_TIMEZONE; // "2020-05-18T09:00+10:00"
 
-  // "2020-05-18T09:00+10:00"
-  var _parseDateTime = parseDateTime(bind.value),
-      formattedDate = _parseDateTime.formattedDate,
+  var initialValue = getDefaultFieldValue(field, bind, function () {
+    var date = new Date();
+    return "".concat(getCurrentDate(date), "T").concat(getCurrentLocalTime(date)).concat(defaultTimeZone);
+  });
+
+  var _parseDateTime = parseDateTime(initialValue),
+      date = _parseDateTime.date,
       rest = _parseDateTime.rest;
 
   var _parseTime = parseTime(rest),
-      formattedTime = _parseTime.formattedTime,
-      formattedTimezone = _parseTime.formattedTimezone;
-
-  var _useState = useState({
-    date: formattedDate || DEFAULT_DATE,
-    time: formattedTime || DEFAULT_TIME,
-    timezone: formattedTimezone || DEFAULT_TIMEZONE
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      state = _useState2[0],
-      setState = _useState2[1];
-
-  var date = state.date,
-      time = state.time,
-      timezone = state.timezone;
+      time = _parseTime.time,
+      _parseTime$timezone = _parseTime.timezone,
+      timezone = _parseTime$timezone === void 0 ? defaultTimeZone : _parseTime$timezone;
+
+  var bindValue = bind.value || "";
   useEffect(function () {
-    if (!formattedDate || !formattedTime || !formattedTimezone) {
+    if (!date || !time || !timezone || bindValue === initialValue) {
       return;
     }
 
-    setState(function () {
-      return {
-        date: formattedDate,
-        time: formattedTime,
-        timezone: formattedTimezone
-      };
-    });
-  }, [formattedDate, formattedTime, formattedTimezone]);
+    bind.onChange(initialValue);
+  }, [bindValue]);
   var cellSize = trailingIcon ? 3 : 4;
   return /*#__PURE__*/React.createElement(Grid, null, /*#__PURE__*/React.createElement(Cell, {
     span: 4
@@ -90,12 +85,15 @@ var DateTimeWithTimezone = function DateTimeWithTimezone(_ref) {
     bind: _objectSpread(_objectSpread({}, bind), {}, {
       value: date,
       onChange: function onChange(value) {
-        setState(function (prev) {
-          return _objectSpread(_objectSpread({}, prev), {}, {
-            date: value
-          });
-        });
-        return bind.onChange("".concat(value, "T").concat(time).concat(timezone));
+        if (!value) {
+          if (!bind.value) {
+            return;
+          }
+
+          return bind.onChange("");
+        }
+
+        return bind.onChange("".concat(value, "T").concat(time || getCurrentLocalTime()).concat(timezone || defaultTimeZone));
       }
     }),
     field: _objectSpread(_objectSpread({}, field), {}, {
@@ -108,12 +106,15 @@ var DateTimeWithTimezone = function DateTimeWithTimezone(_ref) {
     bind: _objectSpread(_objectSpread({}, bind), {}, {
       value: time,
       onChange: function onChange(value) {
-        setState(function (prev) {
-          return _objectSpread(_objectSpread({}, prev), {}, {
-            time: value
-          });
-        });
-        return bind.onChange("".concat(date, "T").concat(value).concat(timezone));
+        if (!value) {
+          if (!bind.value) {
+            return;
+          }
+
+          return bind.onChange("");
+        }
+
+        return bind.onChange("".concat(date || getCurrentDate(), "T").concat(value).concat(timezone || defaultTimeZone));
       }
     }),
     field: _objectSpread(_objectSpread({}, field), {}, {
@@ -125,14 +126,17 @@ var DateTimeWithTimezone = function DateTimeWithTimezone(_ref) {
     span: cellSize
   }, /*#__PURE__*/React.createElement(Select, {
     label: "Timezone",
-    value: timezone,
+    value: timezone || defaultTimeZone,
     onChange: function onChange(value) {
-      setState(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), {}, {
-          timezone: value
-        });
-      });
-      return bind.onChange("".concat(date, "T").concat(time).concat(value));
+      if (!value) {
+        if (!bind.value) {
+          return;
+        }
+
+        return bind.onChange("");
+      }
+
+      return bind.onChange("".concat(date || getCurrentDate(), "T").concat(time || getCurrentLocalTime()).concat(value));
     },
     options: UTC_TIMEZONES.map(function (t) {
       return {
@@ -143,6 +147,4 @@ var DateTimeWithTimezone = function DateTimeWithTimezone(_ref) {
   })), /*#__PURE__*/React.createElement(RemoveFieldButton, {
     trailingIcon: trailingIcon
   }));
-};
-
-export default DateTimeWithTimezone;
+};

package/admin/plugins/fieldRenderers/dateTime/DateTimeWithoutTimezone.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
-interface DateTimeWithoutTimezoneProps {
+import { CmsEditorField } from "../../../../types";
+export interface Props {
     bind: any;
     trailingIcon?: any;
-    field: any;
+    field: CmsEditorField;
 }
-declare const DateTimeWithoutTimezone: React.FunctionComponent<DateTimeWithoutTimezoneProps>;
-export default DateTimeWithoutTimezone;
+export declare const DateTimeWithoutTimezone: React.FunctionComponent<Props>;

package/admin/plugins/fieldRenderers/dateTime/DateTimeWithoutTimezone.js

@@ -1,74 +1,71 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
 import { Grid, Cell } from "@webiny/ui/Grid";
-import { DEFAULT_DATE, DEFAULT_TIME, RemoveFieldButton } from "./utils";
-import Input from "./Input";
+import { getCurrentDate, getCurrentLocalTime, getDefaultFieldValue, RemoveFieldButton } from "./utils";
+import { Input } from "./Input";
 
 var parseDateTime = function parseDateTime(value) {
   if (!value) {
-    return {};
+    return {
+      date: "",
+      time: ""
+    };
   }
 
   if (value.includes("T")) {
     var _value$split$0$split = value.split(".")[0].split("T"),
         _value$split$0$split2 = _slicedToArray(_value$split$0$split, 2),
-        _formattedDate = _value$split$0$split2[0],
-        _formattedTime = _value$split$0$split2[1];
+        _date = _value$split$0$split2[0],
+        _time = _value$split$0$split2[1];
 
     return {
-      formattedDate: _formattedDate,
-      formattedTime: _formattedTime
+      date: _date,
+      time: _time
     };
   }
 
   var _value$split = value.split(" "),
       _value$split2 = _slicedToArray(_value$split, 2),
-      formattedDate = _value$split2[0],
-      formattedTime = _value$split2[1];
+      date = _value$split2[0],
+      time = _value$split2[1];
 
-  if (!formattedDate || !formattedTime) {
-    throw new Error("Could not extract date and time from \"".concat(value, "\"."));
+  if (!date || !time) {
+    console.error("Could not extract date and time from \"".concat(value, "\"."));
+    return {
+      date: "",
+      time: ""
+    };
   }
 
   return {
-    formattedDate: formattedDate,
-    formattedTime: formattedTime
+    date: date,
+    time: time
   };
 };
 
-var DateTimeWithoutTimezone = function DateTimeWithoutTimezone(_ref) {
+export var DateTimeWithoutTimezone = function DateTimeWithoutTimezone(_ref) {
   var field = _ref.field,
       bind = _ref.bind,
       trailingIcon = _ref.trailingIcon;
-
   // "2020-05-18 09:00:00"
-  var _parseDateTime = parseDateTime(bind.value),
-      formattedDate = _parseDateTime.formattedDate,
-      formattedTime = _parseDateTime.formattedTime;
+  var initialValue = getDefaultFieldValue(field, bind, function () {
+    var date = new Date();
+    return "".concat(getCurrentDate(date), " ").concat(getCurrentLocalTime(date));
+  });
 
-  var _useState = useState({
-    date: formattedDate || DEFAULT_DATE,
-    time: formattedTime || DEFAULT_TIME
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      state = _useState2[0],
-      setState = _useState2[1];
+  var _parseDateTime = parseDateTime(initialValue),
+      date = _parseDateTime.date,
+      time = _parseDateTime.time;
 
-  var date = state.date,
-      time = state.time;
+  var bindValue = bind.value || "";
   useEffect(function () {
-    if (!formattedDate || !formattedTime) {
+    if (!date || !time || bindValue === initialValue) {
       return;
     }
 
-    setState(function () {
-      return {
-        date: formattedDate,
-        time: formattedTime
-      };
-    });
-  }, [formattedDate, formattedTime]);
+    bind.onChange(initialValue);
+  }, [bindValue]);
   var cellSize = trailingIcon ? 5 : 6;
   return /*#__PURE__*/React.createElement(Grid, null, /*#__PURE__*/React.createElement(Cell, {
     span: 6
@@ -76,12 +73,15 @@ var DateTimeWithoutTimezone = function DateTimeWithoutTimezone(_ref) {
     bind: _objectSpread(_objectSpread({}, bind), {}, {
       value: date,
       onChange: function onChange(value) {
-        setState(function (prev) {
-          return _objectSpread(_objectSpread({}, prev), {}, {
-            date: value
-          });
-        });
-        return bind.onChange("".concat(value, " ").concat(time));
+        if (!value) {
+          if (!bind.value) {
+            return;
+          }
+
+          return bind.onChange("");
+        }
+
+        return bind.onChange("".concat(value, " ").concat(time || getCurrentLocalTime()));
       }
     }),
     field: _objectSpread(_objectSpread({}, field), {}, {
@@ -94,12 +94,15 @@ var DateTimeWithoutTimezone = function DateTimeWithoutTimezone(_ref) {
     bind: _objectSpread(_objectSpread({}, bind), {}, {
       value: time,
       onChange: function onChange(value) {
-        setState(function (prev) {
-          return _objectSpread(_objectSpread({}, prev), {}, {
-            time: value
-          });
-        });
-        return bind.onChange("".concat(date, " ").concat(value));
+        if (!value) {
+          if (!bind.value) {
+            return;
+          }
+
+          return bind.onChange("");
+        }
+
+        return bind.onChange("".concat(date || getCurrentDate(), " ").concat(value));
       }
     }),
     field: _objectSpread(_objectSpread({}, field), {}, {
@@ -110,6 +113,4 @@ var DateTimeWithoutTimezone = function DateTimeWithoutTimezone(_ref) {
   })), /*#__PURE__*/React.createElement(RemoveFieldButton, {
     trailingIcon: trailingIcon
   }));
-};
-
-export default DateTimeWithoutTimezone;
+};

package/admin/plugins/fieldRenderers/dateTime/Input.d.ts

@@ -1,16 +1,15 @@
 import * as React from "react";
 import { CmsEditorField } from "../../../../types";
 import { BindComponentRenderProp } from "@webiny/form";
-declare type TrailingIconType = {
+export interface TrailingIcon {
     icon: React.ReactNode;
     onClick: any;
-};
-declare type Props = {
+}
+export interface Props {
     step?: number;
     type?: string;
     bind: BindComponentRenderProp;
     field: CmsEditorField;
-    trailingIcon?: TrailingIconType;
-};
-declare const Input: ({ bind, ...props }: Props) => JSX.Element;
-export default Input;
+    trailingIcon?: TrailingIcon;
+}
+export declare const Input: React.FC<Props>;

package/admin/plugins/fieldRenderers/dateTime/Input.js

@@ -2,8 +2,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["bind"];
 import * as React from "react";
 import { Input as UiInput } from "@webiny/ui/Input";
-
-var Input = function Input(_ref) {
+export var Input = function Input(_ref) {
   var bind = _ref.bind,
       props = _objectWithoutProperties(_ref, _excluded);
 
@@ -21,6 +20,4 @@ var Input = function Input(_ref) {
     type: props.type,
     trailingIcon: props.trailingIcon
   }));
-};
-
-export default Input;
+};

package/admin/plugins/fieldRenderers/dateTime/Select.d.ts

@@ -1,3 +1,10 @@
-/// <reference types="react" />
-declare const Select: (props: any) => JSX.Element;
-export default Select;
+import * as React from "react";
+import { SelectProps } from "@webiny/ui/Select";
+export interface Option {
+    value: string;
+    label: string;
+}
+export interface Props extends SelectProps {
+    options: Option[];
+}
+export declare const Select: React.FC<Props>;

package/admin/plugins/fieldRenderers/dateTime/Select.js

@@ -1,13 +1,10 @@
 import * as React from "react";
 import { Select as UiSelect } from "@webiny/ui/Select";
-
-var Select = function Select(props) {
+export var Select = function Select(props) {
   return /*#__PURE__*/React.createElement(UiSelect, props, props.options.map(function (t) {
     return /*#__PURE__*/React.createElement("option", {
       key: t.value,
       value: t.value
     }, t.label);
   }));
-};
-
-export default Select;
+};

package/admin/plugins/fieldRenderers/dateTime/Time.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const Time: (props: any) => JSX.Element;
-export default Time;
+import React from "react";
+import { Props } from "./Input";
+export declare const Time: React.FC<Props>;

package/admin/plugins/fieldRenderers/dateTime/Time.js

@@ -1,13 +1,37 @@
-import React from "react";
-import Input from "./Input";
+import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import React, { useEffect } from "react";
+import { Input } from "./Input";
+import { getCurrentLocalTime, getDefaultFieldValue } from "./utils";
+export var Time = function Time(props) {
+  var field = props.field,
+      bind = props.bind;
+  var time = getDefaultFieldValue(field, bind, function () {
+    return getCurrentLocalTime(new Date());
+  });
+  var bindValue = bind.value || "";
+  useEffect(function () {
+    if (!time || bindValue === time) {
+      return;
+    }
 
-var Time = function Time(props) {
-  // "09:00:00"
+    bind.onChange(time);
+  }, [bindValue]);
   return /*#__PURE__*/React.createElement(Input, Object.assign({}, props, {
+    bind: _objectSpread(_objectSpread({}, bind), {}, {
+      value: time,
+      onChange: function onChange(value) {
+        if (!value) {
+          if (bind.value) {
+            return;
+          }
+
+          return bind.onChange("");
+        }
+
+        return bind.onChange(value);
+      }
+    }),
     type: "time",
-    step: 5,
-    trailingIcon: props.trailingIcon
+    step: 5
   }));
-};
-
-export default Time;
+};

package/admin/plugins/fieldRenderers/dateTime/dateTimeField.js

@@ -5,10 +5,10 @@ var _templateObject, _templateObject2;
 import React from "react";
 import get from "lodash/get";
 import { i18n } from "@webiny/app/i18n";
-import DateTimeWithoutTimezone from "./DateTimeWithoutTimezone";
-import DateTimeWithTimezone from "./DateTimeWithTimezone";
-import Time from "./Time";
-import Input from "./Input";
+import { DateOnly } from "./DateOnly";
+import { DateTimeWithoutTimezone } from "./DateTimeWithoutTimezone";
+import { DateTimeWithTimezone } from "./DateTimeWithTimezone";
+import { Time } from "./Time";
 var t = i18n.ns("app-headless-cms/admin/fields/date-time");
 var plugin = {
   type: "cms-editor-field-renderer",
@@ -31,26 +31,21 @@ var plugin = {
             field: field,
             bind: bind
           });
-        }
-
-        if (field.settings.type === "dateTimeWithTimezone") {
+        } else if (field.settings.type === "dateTimeWithTimezone") {
           return /*#__PURE__*/React.createElement(DateTimeWithTimezone, {
             field: field,
             bind: bind
           });
-        }
-
-        if (field.settings.type === "time") {
+        } else if (field.settings.type === "time") {
           return /*#__PURE__*/React.createElement(Time, {
             field: field,
             bind: bind
           });
         }
 
-        return /*#__PURE__*/React.createElement(Input, {
+        return /*#__PURE__*/React.createElement(DateOnly, {
           bind: bind,
-          field: field,
-          type: field.settings.type
+          field: field
         });
       });
     }

package/admin/plugins/fieldRenderers/dateTime/dateTimeFields.js

@@ -1,17 +1,17 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 import React from "react";
 import get from "lodash/get";
-import { i18n } from "@webiny/app/i18n";
-import { ReactComponent as DeleteIcon } from "@svgr/webpack!../../../icons/close.svg";
 import DynamicSection from "../DynamicSection";
-import DateTimeWithoutTimezone from "./DateTimeWithoutTimezone";
-import DateTimeWithTimezone from "./DateTimeWithTimezone";
-import Time from "./Time";
-import Input from "./Input";
+import { i18n } from "@webiny/app/i18n";
+import { ReactComponent as DeleteIcon } from "../../../icons/close.svg";
+import { DateTimeWithoutTimezone } from "./DateTimeWithoutTimezone";
+import { DateTimeWithTimezone } from "./DateTimeWithTimezone";
+import { DateOnly } from "./DateOnly";
+import { Time } from "./Time";
 var t = i18n.ns("app-headless-cms/admin/fields/date-time");
 var plugin = {
   type: "cms-editor-field-renderer",
@@ -60,21 +60,17 @@ var plugin = {
               })
             }),
             bind: bind.index,
-            label: t(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["Value {number}"])))({
-              number: index + 1
-            }),
             trailingIcon: trailingIcon
           });
         }
 
-        return /*#__PURE__*/React.createElement(Input, {
+        return /*#__PURE__*/React.createElement(DateOnly, {
           bind: bind.index,
           field: _objectSpread(_objectSpread({}, props.field), {}, {
-            label: props.field.label + t(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral([" Value {number}"])))({
+            label: props.field.label + t(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral([" Value {number}"])))({
               number: index + 1
             })
           }),
-          type: field.settings.type,
           trailingIcon: trailingIcon
         });
       });

package/admin/plugins/fieldRenderers/dateTime/utils.d.ts

@@ -1,15 +1,16 @@
 /// <reference types="react" />
+import { CmsEditorField } from "../../../../types";
 export declare const UTC_TIMEZONES: {
     value: string;
     label: string;
 }[];
-/**
- * @returns Current date string in format `YYYY-MM-DD`
- */
-export declare const getCurrentDateString: () => string;
-export declare const DEFAULT_TIME = "00:00:00";
-export declare const DEFAULT_DATE: string;
 export declare const DEFAULT_TIMEZONE = "+01:00";
+export declare const getDefaultFieldValue: (field: CmsEditorField, bind: {
+    value: string | null | undefined;
+}, getCurrent: () => string) => string;
+export declare const getCurrentTimeZone: (date?: Date) => string;
+export declare const getCurrentLocalTime: (date?: Date) => string;
+export declare const getCurrentDate: (date?: Date) => string;
 export declare const RemoveFieldButton: ({ trailingIcon }: {
     trailingIcon: any;
 }) => JSX.Element;