@webiny/app-headless-cms 5.22.0-beta.3 → 5.23.0-beta.0

package/admin/components/ContentEntryForm/functions/createValidators.js

@@ -9,7 +9,7 @@ export var createValidators = function createValidators(validation) {
     });
 
     if (!validatorPlugin || typeof validatorPlugin.validator.validate !== "function") {
-      return;
+      return null;
     }
 
     return /*#__PURE__*/function () {

package/admin/components/ContentEntryForm/useContentEntryForm.d.ts

@@ -17,6 +17,7 @@ export interface UseContentEntryFormParams {
     };
     onChange?: FormOnSubmit;
     onSubmit?: FormOnSubmit;
+    addEntryToListCache: boolean;
 }
 export declare function useContentEntryForm(params: UseContentEntryFormParams): UseContentEntryForm;
 export {};

package/admin/components/ContentEntryForm/useContentEntryForm.js

@@ -129,7 +129,7 @@ export function useContentEntryForm(params) {
 
                   resetInvalidFieldValues();
 
-                  if (typeof params.onSubmit !== "function") {
+                  if (params.addEntryToListCache) {
                     GQLCache.addEntryToListCache(contentModel, cache, entry, listQueryVariables);
                   }
                 }
@@ -172,7 +172,7 @@ export function useContentEntryForm(params) {
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [contentModel.modelId, listQueryVariables]);
+  }(), [contentModel.modelId, listQueryVariables, params.onSubmit, params.addEntryToListCache]);
   var updateContent = useCallback( /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(revision, data) {
       var response, error, entry;

package/admin/components/FieldEditor/EditFieldDialog/GeneralTab.js

@@ -52,7 +52,7 @@ var GeneralTab = function GeneralTab(_ref) {
     });
 
     if (!existingField) {
-      return;
+      return false;
     }
 
     if (existingField.id === field.id) {

package/admin/components/FieldEditor/FieldEditorContext.js

@@ -104,6 +104,7 @@ export var FieldEditorProvider = function FieldEditorProvider(_ref) {
         dropTarget: dropTarget
       });
     });
+    return null;
   }, []);
 
   var onEndDrag = function onEndDrag(_ref2, monitor) {
@@ -257,6 +258,8 @@ export var FieldEditorProvider = function FieldEditorProvider(_ref) {
           return dot.set(data, "fields.".concat(i), field);
         }
       }
+
+      return data;
     });
   };
   /**

package/admin/components/FieldEditor/utils/deleteField.js

@@ -18,7 +18,7 @@ export default (function (_ref) {
         });
 
         if (!field) {
-          return true;
+          return;
         }
 
         if (!Array.isArray(newLayout[currentRowIndex])) {

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

@@ -1,4 +1,6 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect } from "react";
 import { Input } from "./Input";
 import { getCurrentLocalTime, getDefaultFieldValue } from "./utils";
@@ -19,17 +21,44 @@ export var Time = function Time(props) {
   return /*#__PURE__*/React.createElement(Input, Object.assign({}, props, {
     bind: _objectSpread(_objectSpread({}, bind), {}, {
       value: time,
-      onChange: function onChange(value) {
-        if (!value) {
-          if (bind.value) {
-            return;
-          }
+      onChange: function () {
+        var _onChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  if (value) {
+                    _context.next = 4;
+                    break;
+                  }
 
-          return bind.onChange("");
+                  if (!bind.value) {
+                    _context.next = 3;
+                    break;
+                  }
+
+                  return _context.abrupt("return");
+
+                case 3:
+                  return _context.abrupt("return", bind.onChange(""));
+
+                case 4:
+                  return _context.abrupt("return", bind.onChange(value));
+
+                case 5:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function onChange(_x) {
+          return _onChange.apply(this, arguments);
         }
 
-        return bind.onChange(value);
-      }
+        return onChange;
+      }()
     }),
     type: "time",
     step: 5

package/admin/plugins/fieldRenderers/ref/components/ContentEntriesAutocomplete.js

@@ -7,9 +7,11 @@ import debounce from "lodash/debounce";
 import { AutoComplete } from "@webiny/ui/AutoComplete";
 import { i18n } from "@webiny/app/i18n";
 import { Link } from "@webiny/react-router";
+import { useNewRefEntry } from "../hooks/useNewRefEntry";
 import { useReference } from "./useReference";
 import { renderItem } from "./renderItem";
 import { createEntryUrl } from "./createEntryUrl";
+import NewRefEntryFormDialog, { NewEntryButton } from "./NewRefEntryFormDialog";
 var t = i18n.ns("app-headless-cms/admin/fields/ref");
 var unpublishedLabel = t(_templateObject || (_templateObject = _taggedTemplateLiteral(["Selected content entry is not published. Make sure to {publishItLink} before publishing the main content entry."])));
 var publishedLabel = t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Selected content entry is published. You can view it {here}."])));
@@ -26,7 +28,7 @@ function ContentEntriesAutocomplete(_ref) {
       setSearch = _useReference.setSearch,
       value = _useReference.value,
       loading = _useReference.loading,
-      onChange = _useReference.onChange;
+      _onChange = _useReference.onChange;
 
   var entryInfo = null;
 
@@ -47,9 +49,41 @@ function ContentEntriesAutocomplete(_ref) {
     });
   }
 
+  var _useNewRefEntry = useNewRefEntry({
+    field: field
+  }),
+      renderNewEntryModal = _useNewRefEntry.renderNewEntryModal,
+      refModelId = _useNewRefEntry.refModelId,
+      helpText = _useNewRefEntry.helpText;
+  /*
+   * Wrap AutoComplete input in NewRefEntry modal.
+   */
+
+
+  if (renderNewEntryModal) {
+    return /*#__PURE__*/React.createElement(NewRefEntryFormDialog, {
+      modelId: refModelId,
+      onChange: function onChange(entry) {
+        return _onChange(entry, entry);
+      }
+    }, /*#__PURE__*/React.createElement(AutoComplete, Object.assign({}, bind, {
+      renderItem: renderItem,
+      onChange: _onChange,
+      loading: loading,
+      value: value ? value.id : null,
+      options: options,
+      label: field.label,
+      description: /*#__PURE__*/React.createElement(React.Fragment, null, field.helpText, entryInfo),
+      onInput: debounce(function (search) {
+        return setSearch(search);
+      }, 250),
+      noResultFound: /*#__PURE__*/React.createElement(NewEntryButton, null)
+    })));
+  }
+
   return /*#__PURE__*/React.createElement(AutoComplete, Object.assign({}, bind, {
     renderItem: renderItem,
-    onChange: onChange,
+    onChange: _onChange,
     loading: loading,
     value: value ? value.id : null,
     options: options,
@@ -57,7 +91,8 @@ function ContentEntriesAutocomplete(_ref) {
     description: /*#__PURE__*/React.createElement(React.Fragment, null, field.helpText, entryInfo),
     onInput: debounce(function (search) {
       return setSearch(search);
-    }, 250)
+    }, 250),
+    noResultFound: helpText
   }));
 }
 

package/admin/plugins/fieldRenderers/ref/components/ContentEntriesMultiAutoComplete.js

@@ -1,14 +1,17 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
 var _templateObject;
 
-import React from "react";
+import React, { useCallback } from "react";
 import debounce from "lodash/debounce";
 import { MultiAutoComplete } from "@webiny/ui/AutoComplete";
 import { Link } from "@webiny/react-router";
 import { i18n } from "@webiny/app/i18n";
 import { useReferences } from "./useReferences";
 import { renderItem } from "./renderItem";
+import NewRefEntryFormDialog, { NewEntryButton } from "./NewRefEntryFormDialog";
+import { useNewRefEntry } from "../hooks/useNewRefEntry";
 var t = i18n.ns("app-headless-cms/admin/fields/ref");
 var warn = t(_templateObject || (_templateObject = _taggedTemplateLiteral(["Before publishing the main content entry, make sure you publish the following referenced entries: {entries}"])));
 
@@ -26,6 +29,13 @@ function ContentEntriesMultiAutocomplete(_ref) {
       loading = _useReferences.loading,
       onChange = _useReferences.onChange;
 
+  var _useNewRefEntry = useNewRefEntry({
+    field: field
+  }),
+      renderNewEntryModal = _useNewRefEntry.renderNewEntryModal,
+      refModelId = _useNewRefEntry.refModelId,
+      helpText = _useNewRefEntry.helpText;
+
   var entryWarning = function entryWarning(_ref2, index) {
     var id = _ref2.id,
         modelId = _ref2.modelId,
@@ -48,6 +58,32 @@ function ContentEntriesMultiAutocomplete(_ref) {
     });
   }
 
+  var refEntryOnChange = useCallback(function (value) {
+    /**
+     * Append new selected entry at the end of existing entries.
+     */
+    onChange([].concat(_toConsumableArray(entries), [value]));
+  }, [onChange, entries]);
+
+  if (renderNewEntryModal) {
+    return /*#__PURE__*/React.createElement(NewRefEntryFormDialog, {
+      modelId: refModelId,
+      onChange: refEntryOnChange
+    }, /*#__PURE__*/React.createElement(MultiAutoComplete, Object.assign({}, bind, {
+      renderItem: renderItem,
+      renderListItemLabel: renderItem,
+      useMultipleSelectionList: true,
+      onChange: onChange,
+      loading: loading,
+      value: entries,
+      options: options,
+      label: field.label,
+      onInput: debounce(setSearch, 250),
+      description: /*#__PURE__*/React.createElement(React.Fragment, null, field.helpText, warning),
+      noResultFound: /*#__PURE__*/React.createElement(NewEntryButton, null)
+    })));
+  }
+
   return /*#__PURE__*/React.createElement(MultiAutoComplete, Object.assign({}, bind, {
     renderItem: renderItem,
     renderListItemLabel: renderItem,
@@ -58,7 +94,8 @@ function ContentEntriesMultiAutocomplete(_ref) {
     options: options,
     label: field.label,
     onInput: debounce(setSearch, 250),
-    description: /*#__PURE__*/React.createElement(React.Fragment, null, field.helpText, warning)
+    description: /*#__PURE__*/React.createElement(React.Fragment, null, field.helpText, warning),
+    noResultFound: helpText
   }));
 }
 

package/admin/plugins/fieldRenderers/ref/components/MissingEntryHelpText.d.ts

@@ -1,4 +1,5 @@
 import React from "react";
+export declare const ReferenceMultipleModelsHelpText: () => JSX.Element;
 declare const MissingEntryHelpText: React.FC<{
     refModelId: string;
 }>;

package/admin/plugins/fieldRenderers/ref/components/MissingEntryHelpText.js

@@ -1,6 +1,6 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 
 import React from "react";
 import styled from "@emotion/styled";
@@ -10,10 +10,16 @@ import { createNewEntryUrl } from "./createEntryUrl";
 import { i18n } from "@webiny/app/i18n";
 var t = i18n.ns("app-headless-cms/admin/fields/ref");
 var missingEntryLabel = t(_templateObject || (_templateObject = _taggedTemplateLiteral(["If you can't find the intended reference value in the target model,\n         please close this dialog and populate the {newEntryLink} in the target model first."])));
+var referenceMultipleModelsLabel = t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["The creation of reference values from within this view is only supported\n when a single reference model is selected. To reference values from multiple models,\n please make sure the referenced values exist before setting the reference."])));
 var HelpTextTypography = /*#__PURE__*/styled(Typography, {
   label: "HelpTextTypography",
   target: "ex67440"
 })("&{display:inline-block;color:var(--mdc-theme-text-secondary-on-background) !important;}");
+export var ReferenceMultipleModelsHelpText = function ReferenceMultipleModelsHelpText() {
+  return /*#__PURE__*/React.createElement(HelpTextTypography, {
+    use: "caption"
+  }, referenceMultipleModelsLabel);
+};
 
 var MissingEntryHelpText = function MissingEntryHelpText(_ref) {
   var refModelId = _ref.refModelId;
@@ -23,7 +29,7 @@ var MissingEntryHelpText = function MissingEntryHelpText(_ref) {
     newEntryLink: /*#__PURE__*/React.createElement(Link, {
       to: createNewEntryUrl(refModelId),
       target: "_blank"
-    }, t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["entry"]))))
+    }, t(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["entry"]))))
   }));
 };
 

package/admin/plugins/fieldRenderers/ref/components/NewRefEntryFormDialog.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
@@ -36,7 +37,8 @@ var EntryForm = function EntryForm(_ref) {
     onForm: function onForm(form) {
       return setFormRef(form);
     },
-    entry: {}
+    entry: {},
+    addEntryToListCache: false
   });
 };
 
@@ -108,13 +110,20 @@ var NewRefEntryFormDialog = function NewRefEntryFormDialog(_ref2) {
     return setOpen(false);
   }, []);
   var onCreate = useCallback(function (entry) {
-    onChange(entry);
+    onChange(_objectSpread(_objectSpread({}, entry), {}, {
+      /*
+       * Format data for AutoComplete.
+       */
+      published: get(entry, "meta.status") === "published",
+      modelId: contentModel.modelId,
+      modelName: contentModel.name
+    }));
     /* 
     Close the modal
      */
 
     setOpen(false);
-  }, [modelId, onChange]);
+  }, [onChange, contentModel]);
 
   if (!contentModel) {
     return children;

package/admin/plugins/fieldRenderers/ref/components/useReference.js

@@ -143,7 +143,13 @@ export var useReference = function useReference(_ref) {
         }),
         query: "__latest__",
         limit: 10
-      }
+      },
+
+      /**
+       * We cannot update this query response in cache after a reference entry being created/deleted,
+       * which result in cached response being stale, therefore, we're setting the fetchPolicy to "network-only" to by passing cache.
+       */
+      fetchPolicy: "network-only"
     }).then(function (_ref3) {
       var data = _ref3.data;
       var latestEntryData = convertQueryDataToEntryList(data.content.data);

package/admin/plugins/fieldRenderers/ref/components/useReferences.js

@@ -111,7 +111,13 @@ export var useReferences = function useReferences(_ref) {
         }),
         query: "__latest__",
         limit: 10
-      }
+      },
+
+      /**
+       * We cannot update this query response in cache after a reference entry being created/deleted,
+       * which result in cached response being stale, therefore, we're setting the fetchPolicy to "network-only" to by passing cache.
+       */
+      fetchPolicy: "network-only"
     }).then(function (_ref3) {
       var data = _ref3.data;
       setLatestEntries(data.content.data);

package/admin/plugins/fieldRenderers/ref/hooks/useNewRefEntry.d.ts

@@ -1,11 +1,12 @@
+import React from "react";
 import { CmsEditorField } from "../../../../../types";
 interface UseNewRefEntryParams {
     field: CmsEditorField;
 }
 interface UseNewRefEntry {
     renderNewEntryModal: boolean;
-    renderedInPreviewTab: boolean;
     refModelId: string;
+    helpText: React.ReactElement;
 }
 export declare const useNewRefEntry: ({ field }: UseNewRefEntryParams) => UseNewRefEntry;
 export {};

package/admin/plugins/fieldRenderers/ref/hooks/useNewRefEntry.js

@@ -1,8 +1,14 @@
-import { useContext } from "react";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { useContext } from "react";
 import { Context as ContentEntriesContext } from "../../../../views/contentEntries/ContentEntriesContext";
+import MissingEntryHelpText, { ReferenceMultipleModelsHelpText } from "../components/MissingEntryHelpText";
 export var useNewRefEntry = function useNewRefEntry(_ref) {
   var field = _ref.field;
-  var refModelId = field.settings.models[0].modelId;
+
+  var _field$settings$model = _slicedToArray(field.settings.models, 1),
+      refModelId = _field$settings$model[0].modelId;
+
+  var referenceMultipleModels = field.settings.models.length > 1;
   var contentEntriesContextValue = useContext(ContentEntriesContext);
   /**
    * We don't wrap the "ContentEntryForm" with "ContentEntriesContextProvider"
@@ -13,18 +19,38 @@ export var useNewRefEntry = function useNewRefEntry(_ref) {
    */
 
   var renderedInPreviewTab = contentEntriesContextValue === null;
+  /**
+   * Set "renderNewEntryModal" value.
+   */
+
   var renderNewEntryModal;
 
   if (renderedInPreviewTab) {
     renderNewEntryModal = false;
+  } else if (referenceMultipleModels) {
+    renderNewEntryModal = false;
   } else {
     var insideDialog = contentEntriesContextValue.insideDialog;
     renderNewEntryModal = !insideDialog;
   }
+  /**
+   * Set "helpText" value.
+   */
+
+
+  var helpText = null;
+
+  if (referenceMultipleModels) {
+    helpText = /*#__PURE__*/React.createElement(ReferenceMultipleModelsHelpText, null);
+  } else {
+    helpText = /*#__PURE__*/React.createElement(MissingEntryHelpText, {
+      refModelId: refModelId
+    });
+  }
 
   return {
     renderNewEntryModal: renderNewEntryModal,
-    renderedInPreviewTab: renderedInPreviewTab,
-    refModelId: refModelId
+    refModelId: refModelId,
+    helpText: helpText
   };
 };

package/admin/plugins/fieldRenderers/ref/refInput.js

@@ -5,6 +5,7 @@ var _templateObject, _templateObject2;
 import React from "react";
 import { i18n } from "@webiny/app/i18n";
 import ContentEntriesAutocomplete from "./components/ContentEntriesAutocomplete";
+import { NewRefEntryDialogContextProvider } from "./hooks/useNewRefEntryDialog";
 var t = i18n.ns("app-headless-cms/admin/fields/ref");
 var plugin = {
   type: "cms-editor-field-renderer",
@@ -20,9 +21,9 @@ var plugin = {
     render: function render(props) {
       var Bind = props.getBind();
       return /*#__PURE__*/React.createElement(Bind, null, function (bind) {
-        return /*#__PURE__*/React.createElement(ContentEntriesAutocomplete, Object.assign({}, props, {
+        return /*#__PURE__*/React.createElement(NewRefEntryDialogContextProvider, null, /*#__PURE__*/React.createElement(ContentEntriesAutocomplete, Object.assign({}, props, {
           bind: bind
-        }));
+        })));
       });
     }
   }

package/admin/plugins/fieldRenderers/ref/refInputs.js

@@ -4,6 +4,7 @@ var _templateObject, _templateObject2;
 
 import React from "react";
 import ContentEntriesMultiAutocomplete from "./components/ContentEntriesMultiAutoComplete";
+import { NewRefEntryDialogContextProvider } from "./hooks/useNewRefEntryDialog";
 import { i18n } from "@webiny/app/i18n";
 var t = i18n.ns("app-headless-cms/admin/fields/ref");
 
@@ -25,11 +26,11 @@ var plugin = {
     render: function render(props) {
       var Bind = props.getBind();
       return /*#__PURE__*/React.createElement(Bind, null, function (bind) {
-        return /*#__PURE__*/React.createElement(ContentEntriesMultiAutocomplete, Object.assign({
+        return /*#__PURE__*/React.createElement(NewRefEntryDialogContextProvider, null, /*#__PURE__*/React.createElement(ContentEntriesMultiAutocomplete, Object.assign({
           key: getKey(props.field, bind)
         }, props, {
           bind: bind
-        }));
+        })));
       });
     }
   }

package/admin/plugins/fields/richText.js

@@ -22,7 +22,6 @@ var plugin = {
     createField: function createField() {
       return {
         type: this.type,
-        name: this.name,
         validation: [],
         renderer: {
           name: ""

package/admin/plugins/transformers/dateTransformer.js

@@ -5,7 +5,7 @@ var throwTransformError = function throwTransformError(params) {
   var type = params.type,
       value = params.value,
       error = params.ex;
-  throw new WebinyError("Could not transform value to a date.", "TRANSFORM_ERROR", {
+  return new WebinyError("Could not transform value to a date.", "TRANSFORM_ERROR", {
     error: error,
     type: type,
     value: value
@@ -14,14 +14,14 @@ var throwTransformError = function throwTransformError(params) {
 
 var dateOnly = function dateOnly(value) {
   if (!value) {
-    return null; // return new Date().toISOString().substr(0, 10);
+    return null;
   }
 
   try {
     var date = new Date(value).toISOString();
     return date.substr(0, 10);
   } catch (ex) {
-    throwTransformError({
+    throw throwTransformError({
       ex: ex,
       value: value,
       type: "date"
@@ -65,6 +65,8 @@ var extractTime = function extractTime(value) {
   } else if (result.length === 2) {
     return "".concat(value, ":00");
   }
+
+  return null;
 };
 
 var dateTimeWithTimezone = function dateTimeWithTimezone(value) {
@@ -110,7 +112,7 @@ var dateTimeWithoutTimezone = function dateTimeWithoutTimezone(value) {
   try {
     return new Date("".concat(value.replace(" ", "T"), ".000Z")).toISOString();
   } catch (ex) {
-    throwTransformError({
+    throw throwTransformError({
       ex: ex,
       value: value,
       type: "dateTimeWithoutTimezone"

package/admin/plugins/validators/dateGte.js

@@ -1,3 +1,5 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default (function () {
   return {
@@ -5,19 +7,48 @@ export default (function () {
     name: "cms-model-field-validator-date-gte",
     validator: {
       name: "dateGte",
-      validate: function validate(value, validator) {
-        var _validator$settings = validator.settings,
-            gteValue = _validator$settings.value,
-            type = _validator$settings.type;
-
-        if (typeof gteValue === "undefined") {
-          return;
-        } else if (type === "time") {
-          return validation.validate(value, "timeGte:".concat(gteValue));
+      validate: function () {
+        var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+          var _validator$settings, gteValue, type;
+
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _validator$settings = validator.settings, gteValue = _validator$settings.value, type = _validator$settings.type;
+
+                  if (!(typeof gteValue === "undefined")) {
+                    _context.next = 5;
+                    break;
+                  }
+
+                  return _context.abrupt("return", true);
+
+                case 5:
+                  if (!(type === "time")) {
+                    _context.next = 7;
+                    break;
+                  }
+
+                  return _context.abrupt("return", validation.validate(value, "timeGte:".concat(gteValue)));
+
+                case 7:
+                  return _context.abrupt("return", validation.validate(value, "dateGte:".concat(gteValue)));
+
+                case 8:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function validate(_x, _x2) {
+          return _validate.apply(this, arguments);
         }
 
-        return validation.validate(value, "dateGte:".concat(gteValue));
-      }
+        return validate;
+      }()
     }
   };
 });

package/admin/plugins/validators/dateLte.js

@@ -1,3 +1,5 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default (function () {
   return {
@@ -5,19 +7,48 @@ export default (function () {
     name: "cms-model-field-validator-date-lte",
     validator: {
       name: "dateLte",
-      validate: function validate(value, validator) {
-        var _validator$settings = validator.settings,
-            lteValue = _validator$settings.value,
-            type = _validator$settings.type;
-
-        if (typeof lteValue === "undefined") {
-          return;
-        } else if (type === "time") {
-          return validation.validate(value, "timeLte:".concat(lteValue));
+      validate: function () {
+        var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+          var _validator$settings, lteValue, type;
+
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _validator$settings = validator.settings, lteValue = _validator$settings.value, type = _validator$settings.type;
+
+                  if (!(typeof lteValue === "undefined")) {
+                    _context.next = 5;
+                    break;
+                  }
+
+                  return _context.abrupt("return", true);
+
+                case 5:
+                  if (!(type === "time")) {
+                    _context.next = 7;
+                    break;
+                  }
+
+                  return _context.abrupt("return", validation.validate(value, "timeLte:".concat(lteValue)));
+
+                case 7:
+                  return _context.abrupt("return", validation.validate(value, "dateLte:".concat(lteValue)));
+
+                case 8:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function validate(_x, _x2) {
+          return _validate.apply(this, arguments);
         }
 
-        return validation.validate(value, "dateLte:".concat(lteValue));
-      }
+        return validate;
+      }()
     }
   };
 });

package/admin/plugins/validators/gte.js

@@ -1,15 +1,43 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-gte",
   validator: {
     name: "gte",
-    validate: function validate(value, validator) {
-      var gteValue = validator.settings.value;
+    validate: function () {
+      var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+        var gteValue;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                gteValue = validator.settings.value;
 
-      if (typeof gteValue !== "undefined") {
-        return validation.validate(value, "gte:".concat(gteValue));
+                if (!(typeof gteValue === "undefined")) {
+                  _context.next = 3;
+                  break;
+                }
+
+                return _context.abrupt("return", true);
+
+              case 3:
+                return _context.abrupt("return", validation.validate(value, "gte:".concat(gteValue)));
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function validate(_x, _x2) {
+        return _validate.apply(this, arguments);
       }
-    }
+
+      return validate;
+    }()
   }
 };

package/admin/plugins/validators/in.js

@@ -1,15 +1,43 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-in",
   validator: {
     name: "in",
-    validate: function validate(value, validator) {
-      var values = validator.settings.values;
+    validate: function () {
+      var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+        var values;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                values = validator.settings.values;
 
-      if (Array.isArray(values)) {
-        return validation.validate(value, "in:".concat(values.join(":")));
+                if (!(Array.isArray(values) === false || values.length === 0)) {
+                  _context.next = 3;
+                  break;
+                }
+
+                return _context.abrupt("return", true);
+
+              case 3:
+                return _context.abrupt("return", validation.validate(value, "in:".concat(values.join(":"))));
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function validate(_x, _x2) {
+        return _validate.apply(this, arguments);
       }
-    }
+
+      return validate;
+    }()
   }
 };

package/admin/plugins/validators/lte.js

@@ -1,15 +1,43 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-lte",
   validator: {
     name: "lte",
-    validate: function validate(value, validator) {
-      var lteValue = validator.settings.value;
+    validate: function () {
+      var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+        var lteValue;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                lteValue = validator.settings.value;
 
-      if (typeof lteValue !== "undefined") {
-        return validation.validate(value, "lte:".concat(lteValue));
+                if (!(typeof lteValue === "undefined")) {
+                  _context.next = 3;
+                  break;
+                }
+
+                return _context.abrupt("return", true);
+
+              case 3:
+                return _context.abrupt("return", validation.validate(value, "lte:".concat(lteValue)));
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function validate(_x, _x2) {
+        return _validate.apply(this, arguments);
       }
-    }
+
+      return validate;
+    }()
   }
 };

package/admin/plugins/validators/maxLength.js

@@ -1,15 +1,43 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-max-length",
   validator: {
     name: "maxLength",
-    validate: function validate(value, validator) {
-      var maxLengthValue = validator.settings.value;
+    validate: function () {
+      var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+        var maxLengthValue;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                maxLengthValue = validator.settings.value;
 
-      if (typeof maxLengthValue !== "undefined") {
-        return validation.validate(value, "maxLength:".concat(maxLengthValue));
+                if (!(typeof maxLengthValue === "undefined")) {
+                  _context.next = 3;
+                  break;
+                }
+
+                return _context.abrupt("return", true);
+
+              case 3:
+                return _context.abrupt("return", validation.validate(value, "maxLength:".concat(maxLengthValue)));
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function validate(_x, _x2) {
+        return _validate.apply(this, arguments);
       }
-    }
+
+      return validate;
+    }()
   }
 };

package/admin/plugins/validators/minLength.js

@@ -1,15 +1,43 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-min-length",
   validator: {
     name: "minLength",
-    validate: function validate(value, validator) {
-      var minLengthValue = validator.settings.value;
+    validate: function () {
+      var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+        var minLengthValue;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                minLengthValue = validator.settings.value;
 
-      if (typeof minLengthValue !== "undefined") {
-        return validation.validate(value, "minLength:".concat(minLengthValue));
+                if (!(typeof minLengthValue === "undefined")) {
+                  _context.next = 3;
+                  break;
+                }
+
+                return _context.abrupt("return", true);
+
+              case 3:
+                return _context.abrupt("return", validation.validate(value, "minLength:".concat(minLengthValue)));
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function validate(_x, _x2) {
+        return _validate.apply(this, arguments);
       }
-    }
+
+      return validate;
+    }()
   }
 };

package/admin/plugins/validators/pattern.d.ts

@@ -3,7 +3,7 @@ declare const _default: {
     name: string;
     validator: {
         name: string;
-        validate: (value: any, validator: any) => boolean;
+        validate: (value: any, validator: any) => Promise<boolean>;
     };
 };
 export default _default;

package/admin/plugins/validators/pattern.js

@@ -1,34 +1,63 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { plugins } from "@webiny/plugins";
 export default {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-pattern",
   validator: {
     name: "pattern",
-    validate: function validate(value, validator) {
-      if (!value) {
-        return true;
-      }
+    validate: function () {
+      var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+        var settings, pattern, patternPlugin;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (value) {
+                  _context.next = 2;
+                  break;
+                }
 
-      var settings = validator.settings;
-      var pattern;
+                return _context.abrupt("return", true);
 
-      if (settings.preset === "custom") {
-        pattern = settings;
-      } else {
-        var patternPlugin = plugins.byType("cms-model-field-validator-pattern").find(function (item) {
-          return item.pattern.name === settings.preset;
-        });
+              case 2:
+                settings = validator.settings;
 
-        if (patternPlugin) {
-          pattern = patternPlugin.pattern;
-        }
-      }
+                if (settings.preset === "custom") {
+                  pattern = settings;
+                } else {
+                  patternPlugin = plugins.byType("cms-model-field-validator-pattern").find(function (item) {
+                    return item.pattern.name === settings.preset;
+                  });
+
+                  if (patternPlugin) {
+                    pattern = patternPlugin.pattern;
+                  }
+                }
+
+                if (pattern) {
+                  _context.next = 6;
+                  break;
+                }
+
+                return _context.abrupt("return", true);
+
+              case 6:
+                return _context.abrupt("return", new RegExp(pattern.regex, pattern.flags).test(value));
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
 
-      if (!pattern) {
-        return true;
+      function validate(_x, _x2) {
+        return _validate.apply(this, arguments);
       }
 
-      return new RegExp(pattern.regex, pattern.flags).test(value);
-    }
+      return validate;
+    }()
   }
 };

package/admin/plugins/validators/timeGte.js

@@ -1,3 +1,5 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default (function () {
   return {
@@ -5,15 +7,39 @@ export default (function () {
     name: "cms-model-field-validator-time-gte",
     validator: {
       name: "timeGte",
-      validate: function validate(value, validator) {
-        var gteValue = validator.settings.value;
+      validate: function () {
+        var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+          var gteValue;
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  gteValue = validator.settings.value;
 
-        if (typeof gteValue === "undefined") {
-          return;
+                  if (!(typeof gteValue === "undefined")) {
+                    _context.next = 3;
+                    break;
+                  }
+
+                  return _context.abrupt("return", true);
+
+                case 3:
+                  return _context.abrupt("return", validation.validate(value, "timeGte:".concat(gteValue)));
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function validate(_x, _x2) {
+          return _validate.apply(this, arguments);
         }
 
-        return validation.validate(value, "timeGte:".concat(gteValue));
-      }
+        return validate;
+      }()
     }
   };
 });

package/admin/plugins/validators/timeLte.js

@@ -1,3 +1,5 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
 export default (function () {
   return {
@@ -5,15 +7,39 @@ export default (function () {
     name: "cms-model-field-validator-time-lte",
     validator: {
       name: "timeLte",
-      validate: function validate(value, validator) {
-        var lteValue = validator.settings.value;
+      validate: function () {
+        var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value, validator) {
+          var lteValue;
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  lteValue = validator.settings.value;
 
-        if (typeof lteValue === "undefined") {
-          return;
+                  if (!(typeof lteValue === "undefined")) {
+                    _context.next = 3;
+                    break;
+                  }
+
+                  return _context.abrupt("return", true);
+
+                case 3:
+                  return _context.abrupt("return", validation.validate(value, "timeLte:".concat(lteValue)));
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function validate(_x, _x2) {
+          return _validate.apply(this, arguments);
         }
 
-        return validation.validate(value, "timeLte:".concat(lteValue));
-      }
+        return validate;
+      }()
     }
   };
 });

package/admin/views/contentEntries/ContentEntry/ContentEntryContext.d.ts

@@ -20,14 +20,14 @@ export interface ContentEntryContext extends ContentEntriesContext {
     showEmptyView: boolean;
 }
 export declare const Context: React.Context<ContentEntryContext>;
-export interface ContentEntryContextProviderProps extends GetContentEntryFormType {
+export interface ContentEntryContextProviderProps extends UseContentEntryProviderProps {
     children: React.ReactNode;
 }
-interface GetContentEntryFormType {
+interface UseContentEntryProviderProps {
     getContentId?: () => string | null;
     isNewEntry?: () => boolean;
 }
-export declare const useContentEntryProviderProps: () => GetContentEntryFormType;
+export declare const useContentEntryProviderProps: () => UseContentEntryProviderProps;
 export declare const Provider: {
     ({ children, isNewEntry, getContentId }: ContentEntryContextProviderProps): JSX.Element;
     displayName: string;

package/admin/views/contentEntries/ContentEntry.js

@@ -88,7 +88,8 @@ var ContentEntry = function ContentEntry() {
     entry: entry,
     onForm: function onForm(form) {
       return setFormRef(form);
-    }
+    },
+    addEntryToListCache: true
   })))), /*#__PURE__*/React.createElement(Tab, {
     label: "Revisions",
     disabled: loading,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-headless-cms",
-	"version": "5.22.0-beta.3",
+	"version": "5.23.0-beta.0",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -21,22 +21,22 @@
 		"@fortawesome/free-brands-svg-icons": "5.15.4",
 		"@fortawesome/free-regular-svg-icons": "5.15.4",
 		"@fortawesome/free-solid-svg-icons": "5.15.4",
-		"@fortawesome/react-fontawesome": "0.1.16",
-		"@svgr/webpack": "6.2.0",
+		"@fortawesome/react-fontawesome": "0.1.17",
+		"@svgr/webpack": "6.2.1",
 		"@types/react": "16.14.2",
-		"@webiny/app": "5.22.0-beta.3",
-		"@webiny/app-admin": "5.22.0-beta.3",
-		"@webiny/app-graphql-playground": "5.22.0-beta.3",
-		"@webiny/app-i18n": "5.22.0-beta.3",
-		"@webiny/app-plugin-admin-welcome-screen": "5.22.0-beta.3",
-		"@webiny/app-security": "5.22.0-beta.3",
-		"@webiny/error": "5.22.0-beta.3",
-		"@webiny/form": "5.22.0-beta.3",
-		"@webiny/plugins": "5.22.0-beta.3",
-		"@webiny/react-router": "5.22.0-beta.3",
-		"@webiny/ui": "5.22.0-beta.3",
-		"@webiny/utils": "5.22.0-beta.3",
-		"@webiny/validation": "5.22.0-beta.3",
+		"@webiny/app": "5.23.0-beta.0",
+		"@webiny/app-admin": "5.23.0-beta.0",
+		"@webiny/app-graphql-playground": "5.23.0-beta.0",
+		"@webiny/app-i18n": "5.23.0-beta.0",
+		"@webiny/app-plugin-admin-welcome-screen": "5.23.0-beta.0",
+		"@webiny/app-security": "5.23.0-beta.0",
+		"@webiny/error": "5.23.0-beta.0",
+		"@webiny/form": "5.23.0-beta.0",
+		"@webiny/plugins": "5.23.0-beta.0",
+		"@webiny/react-router": "5.23.0-beta.0",
+		"@webiny/ui": "5.23.0-beta.0",
+		"@webiny/utils": "5.23.0-beta.0",
+		"@webiny/validation": "5.23.0-beta.0",
 		"apollo-cache": "1.3.5",
 		"apollo-client": "2.6.10",
 		"apollo-link": "1.2.14",
@@ -68,8 +68,8 @@
 		"@babel/preset-env": "^7.16.4",
 		"@babel/preset-react": "^7.16.0",
 		"@babel/preset-typescript": "^7.16.0",
-		"@webiny/cli": "^5.22.0-beta.3",
-		"@webiny/project-utils": "^5.22.0-beta.3",
+		"@webiny/cli": "^5.23.0-beta.0",
+		"@webiny/project-utils": "^5.23.0-beta.0",
 		"babel-plugin-emotion": "^9.2.8",
 		"babel-plugin-lodash": "^3.3.4",
 		"babel-plugin-module-resolver": "^4.1.0",
@@ -101,5 +101,5 @@
 			]
 		}
 	},
-	"gitHead": "7a6b4ce3b9f31fe0702fffd28b7959c637e9a20b"
+	"gitHead": "deb16c58954f7396c848f04806a2028aa53cc97b"
 }