@webiny/app-headless-cms 5.18.2-beta.0 → 5.19.0-beta.0

package/admin/contexts/Cms/index.js

@@ -1,9 +1,12 @@
 import React from "react";
 import { useI18N } from "@webiny/app-i18n/hooks/useI18N";
 import { CircularProgress } from "@webiny/ui/Progress";
+import { config as appConfig } from "@webiny/app/config";
 export var CmsContext = /*#__PURE__*/React.createContext(null);
 var apolloClientsCache = {};
 export function CmsProvider(props) {
+  var apiUrl = appConfig.getKey("API_URL", process.env.REACT_APP_API_URL);
+
   var _useI18N = useI18N(),
       getCurrentLocale = _useI18N.getCurrentLocale;
 
@@ -15,7 +18,7 @@ export function CmsProvider(props) {
 
   if (currentLocale && !apolloClientsCache[currentLocale]) {
     apolloClientsCache[currentLocale] = props.createApolloClient({
-      uri: "".concat(process.env.REACT_APP_API_URL, "/cms/manage/").concat(currentLocale)
+      uri: "".concat(apiUrl, "/cms/manage/").concat(currentLocale)
     });
   }
 
@@ -23,7 +26,7 @@ export function CmsProvider(props) {
     getApolloClient: function getApolloClient(locale) {
       if (!apolloClientsCache[locale]) {
         apolloClientsCache[locale] = props.createApolloClient({
-          uri: "".concat(process.env.REACT_APP_API_URL, "/cms/manage/").concat(locale)
+          uri: "".concat(apiUrl, "/cms/manage/").concat(locale)
         });
       }
 

package/admin/plugins/apiInformation/index.js

@@ -1,12 +1,14 @@
 var manageQuery = "#  Webiny Headless CMS Manage API\n#\n#  This API controls all the operations within the Headless CMS module.\n#  Use it to manage content, create and modify content models and more.\n#  Explore the schema for details.\n#\n#  Note: to use the API outside of the playground, you will need to provide an API key via the Authorization header.\n#\n#  Example query - list content model groups:\n{\n  listContentModelGroups {\n    data {\n      name\n      icon\n      slug\n    }\n  }\n}\n";
 var readQuery = "#  Webiny Headless CMS Read API\n#\n#  This is the API to use in your 3rd party apps to read your content.\n#  It returns only content that has been published.\n#\n#  Note: to use the API outside of the playground, you will need to provide an API key via the Authorization header.\n#\n#  Example query - list content models:\n{\n  listContentModels {\n    data {\n      name\n      modelId\n    }\n  }\n}\n";
 var previewQuery = "#  Webiny Headless CMS Preview API\n#\n#  This is the API to use in your 3rd party apps to preview content.\n#  It returns the latest content revision, regardless of whether it was published or not.\n#\n#  Note: to use the API outside of the playground, you will need to provide an API key via the Authorization header.\n#\n#  Example query - list content models:\n{\n  listContentModels {\n    data {\n      name\n    }\n  }\n}\n";
+import { config as appConfig } from "@webiny/app/config";
 var plugins = [{
   type: "graphql-playground-tab",
   name: "graphql-playground-tab-manage",
   tab: function tab(_ref) {
     var locale = _ref.locale,
         identity = _ref.identity;
+    var apiUrl = appConfig.getKey("API_URL", process.env.REACT_APP_API_URL);
 
     if (!identity.getPermission("cms.endpoint.manage")) {
       return null;
@@ -14,7 +16,7 @@ var plugins = [{
 
     return {
       name: "Headless CMS - Manage API",
-      endpoint: process.env.REACT_APP_API_URL + "/cms/manage/" + locale,
+      endpoint: apiUrl + "/cms/manage/" + locale,
       headers: {},
       query: manageQuery
     };
@@ -25,6 +27,7 @@ var plugins = [{
   tab: function tab(_ref2) {
     var locale = _ref2.locale,
         identity = _ref2.identity;
+    var apiUrl = appConfig.getKey("API_URL", process.env.REACT_APP_API_URL);
 
     if (!identity.getPermission("cms.endpoint.read")) {
       return null;
@@ -32,7 +35,7 @@ var plugins = [{
 
     return {
       name: "Headless CMS - Read API",
-      endpoint: process.env.REACT_APP_API_URL + "/cms/read/" + locale,
+      endpoint: apiUrl + "/cms/read/" + locale,
       headers: {},
       query: readQuery
     };
@@ -43,6 +46,7 @@ var plugins = [{
   tab: function tab(_ref3) {
     var locale = _ref3.locale,
         identity = _ref3.identity;
+    var apiUrl = appConfig.getKey("API_URL", process.env.REACT_APP_API_URL);
 
     if (!identity.getPermission("cms.endpoint.preview")) {
       return null;
@@ -50,7 +54,7 @@ var plugins = [{
 
     return {
       name: "Headless CMS - Preview API",
-      endpoint: process.env.REACT_APP_API_URL + "/cms/preview/" + locale,
+      endpoint: apiUrl + "/cms/preview/" + locale,
       headers: {},
       query: previewQuery
     };

package/admin/plugins/definitions/CmsEditorFieldValidatorFileTypePlugin.d.ts

@@ -0,0 +1,21 @@
+import { Plugin } from "@webiny/plugins/Plugin";
+export interface Config {
+    name: string;
+    message: string;
+    label: string;
+}
+export interface Settings {
+    fileType: "all" | "image" | "document" | string;
+}
+export declare class CmsEditorFieldValidatorFileTypePlugin extends Plugin {
+    static readonly type: string;
+    private readonly config;
+    private _settings;
+    set settings(settings: Settings);
+    get settings(): Settings;
+    constructor(config: Config);
+    getName(): string;
+    getLabel(): string;
+    getMessage(): string;
+    private setSettings;
+}

package/admin/plugins/definitions/CmsEditorFieldValidatorFileTypePlugin.js

@@ -0,0 +1,61 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _createSuper from "@babel/runtime/helpers/createSuper";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { Plugin } from "@webiny/plugins/Plugin";
+export var CmsEditorFieldValidatorFileTypePlugin = /*#__PURE__*/function (_Plugin) {
+  _inherits(CmsEditorFieldValidatorFileTypePlugin, _Plugin);
+
+  var _super = _createSuper(CmsEditorFieldValidatorFileTypePlugin);
+
+  function CmsEditorFieldValidatorFileTypePlugin(config) {
+    var _this;
+
+    _classCallCheck(this, CmsEditorFieldValidatorFileTypePlugin);
+
+    _this = _super.call(this);
+
+    _defineProperty(_assertThisInitialized(_this), "config", void 0);
+
+    _defineProperty(_assertThisInitialized(_this), "_settings", void 0);
+
+    _this.config = config;
+    return _this;
+  }
+
+  _createClass(CmsEditorFieldValidatorFileTypePlugin, [{
+    key: "settings",
+    get: function get() {
+      return this._settings;
+    },
+    set: function set(settings) {
+      this.setSettings(settings);
+    }
+  }, {
+    key: "getName",
+    value: function getName() {
+      return this.config.name;
+    }
+  }, {
+    key: "getLabel",
+    value: function getLabel() {
+      return this.config.label;
+    }
+  }, {
+    key: "getMessage",
+    value: function getMessage() {
+      return this.config.message;
+    }
+  }, {
+    key: "setSettings",
+    value: function setSettings(settings) {
+      this._settings = settings;
+    }
+  }]);
+
+  return CmsEditorFieldValidatorFileTypePlugin;
+}(Plugin);
+
+_defineProperty(CmsEditorFieldValidatorFileTypePlugin, "type", "cms-editor-field-validator-fileType");

package/admin/plugins/definitions/CmsFieldValidatorFileTypePlugin.d.ts

@@ -0,0 +1,10 @@
+import { Plugin } from "@webiny/plugins/Plugin";
+export interface Config {
+    name: string;
+}
+export declare class CmsFieldValidatorFileTypePlugin extends Plugin {
+    static readonly type: string;
+    private readonly config;
+    constructor(config: Config);
+    getName(): string;
+}

package/admin/plugins/definitions/CmsFieldValidatorFileTypePlugin.js

@@ -0,0 +1,36 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _createSuper from "@babel/runtime/helpers/createSuper";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { Plugin } from "@webiny/plugins/Plugin";
+export var CmsFieldValidatorFileTypePlugin = /*#__PURE__*/function (_Plugin) {
+  _inherits(CmsFieldValidatorFileTypePlugin, _Plugin);
+
+  var _super = _createSuper(CmsFieldValidatorFileTypePlugin);
+
+  function CmsFieldValidatorFileTypePlugin(config) {
+    var _this;
+
+    _classCallCheck(this, CmsFieldValidatorFileTypePlugin);
+
+    _this = _super.call(this);
+
+    _defineProperty(_assertThisInitialized(_this), "config", void 0);
+
+    _this.config = config;
+    return _this;
+  }
+
+  _createClass(CmsFieldValidatorFileTypePlugin, [{
+    key: "getName",
+    value: function getName() {
+      return this.config.name;
+    }
+  }]);
+
+  return CmsFieldValidatorFileTypePlugin;
+}(Plugin);
+
+_defineProperty(CmsFieldValidatorFileTypePlugin, "type", "cms-model-field-validator-fileType");

package/admin/plugins/fieldRenderers/file/File.d.ts

@@ -1,14 +1,15 @@
-/// <reference types="react" />
-declare function File(props: any): JSX.Element;
-declare namespace File {
-    var defaultProps: {
-        validation: {
-            isValid: any;
-        };
-        styles: {
-            width: string;
-            height: string;
-        };
+import React from "react";
+export interface Props {
+    url: string;
+    onRemove: Function;
+    placeholder: string;
+    styles?: Record<string, any>;
+    showFileManager?: Function;
+    validation?: {
+        isValid?: boolean;
+        message?: string;
     };
+    description?: string;
 }
+declare const File: React.FunctionComponent<Props>;
 export default File;

package/admin/plugins/fieldRenderers/file/File.js

@@ -3,6 +3,7 @@ import { Image } from "@webiny/app/components";
 import * as Ui from "@webiny/ui/ImageUpload";
 import { createRenderImagePreview, imageExtensions } from "./utils";
 import fileIcon from "../../fields/icons/round_insert_drive_file-24px.svg";
+import { FormElementMessage } from "@webiny/ui/FormElementMessage";
 var imagePreviewProps = {
   transform: {
     width: 300
@@ -13,13 +14,23 @@ var imagePreviewProps = {
     objectFit: "cover"
   }
 };
+var defaultStyles = {
+  width: "100%",
+  height: "auto"
+};
+var defaultValidation = {
+  isValid: null,
+  message: null
+};
 
-function File(props) {
+var File = function File(props) {
   var url = props.url,
       onRemove = props.onRemove,
       placeholder = props.placeholder,
-      styles = props.styles,
-      showFileManager = props.showFileManager;
+      showFileManager = props.showFileManager,
+      description = props.description;
+  var styles = props.styles || defaultStyles;
+  var validation = props.validation || defaultValidation;
   var isImage = useCallback(function (url) {
     return imageExtensions.some(function (extension) {
       return url.includes(extension);
@@ -48,7 +59,7 @@ function File(props) {
     return defaultRenderImagePreview;
   };
 
-  return /*#__PURE__*/React.createElement(Ui.Image, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Ui.Image, {
     renderImagePreview: renderImagePreview(url),
     style: styles,
     value: url ? {
@@ -60,16 +71,9 @@ function File(props) {
     containerStyle: {
       height: "auto"
     }
-  });
-}
-
-File.defaultProps = {
-  validation: {
-    isValid: null
-  },
-  styles: {
-    width: "100%",
-    height: "auto"
-  }
+  }), validation.isValid === false && /*#__PURE__*/React.createElement(FormElementMessage, {
+    error: true
+  }, validation.message || "Invalid value."), validation.isValid !== false && description && /*#__PURE__*/React.createElement(FormElementMessage, null, description));
 };
+
 export default File;

package/admin/plugins/fieldRenderers/file/fileField.js

@@ -1,6 +1,6 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2, _templateObject3;
+var _templateObject, _templateObject2;
 
 import React from "react";
 import { i18n } from "@webiny/app/i18n";
@@ -25,32 +25,37 @@ var plugin = {
           getBind = _ref2.getBind,
           Label = _ref2.Label;
       var Bind = getBind();
+      var imagesOnly = field.settings && field.settings.imagesOnly;
       return /*#__PURE__*/React.createElement(Grid, null, /*#__PURE__*/React.createElement(Cell, {
         span: 12
-      }, /*#__PURE__*/React.createElement(Label, null, field.label), /*#__PURE__*/React.createElement(Bind, null, function (_ref3) {
-        var value = _ref3.value,
-            onChange = _ref3.onChange;
+      }, /*#__PURE__*/React.createElement(Label, null, field.label), /*#__PURE__*/React.createElement(Bind, null, function (bind) {
+        var value = bind.value,
+            onChange = bind.onChange;
         return /*#__PURE__*/React.createElement(FileManager, {
-          multiple: false
-        }, function (_ref4) {
-          var showFileManager = _ref4.showFileManager;
+          multiple: false,
+          images: imagesOnly
+        }, function (_ref3) {
+          var showFileManager = _ref3.showFileManager;
 
           var selectFile = function selectFile() {
             showFileManager(function (newFile) {
-              if (newFile !== null) {
-                onChange(newFile.src);
+              if (newFile === null) {
+                return;
               }
+
+              onChange(newFile.src);
             });
           };
 
-          return /*#__PURE__*/React.createElement(File, {
+          return /*#__PURE__*/React.createElement(File, Object.assign({}, bind, {
             url: value,
             onRemove: function onRemove() {
               return onChange(null);
             },
             showFileManager: selectFile,
-            placeholder: t(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["Select a file\""])))
-          });
+            placeholder: field.placeholderText,
+            description: field.helpText
+          }));
         });
       }), field.helpText && /*#__PURE__*/React.createElement(FormElementMessage, null, field.helpText)));
     }

package/admin/plugins/fieldRenderers/file/fileFields.js

@@ -11,7 +11,6 @@ import { imageWrapperStyles } from "./utils";
 import { FileManager } from "@webiny/app-admin/components";
 import styled from "@emotion/styled";
 import File from "./File";
-import { FormElementMessage } from "@webiny/ui/FormElementMessage";
 var t = i18n.ns("app-headless-cms/admin/fields/file");
 var FileUploadWrapper = /*#__PURE__*/styled("div", {
   target: "eq80mh0",
@@ -32,16 +31,17 @@ function FieldRenderer(_ref) {
       Label = _ref.Label,
       field = _ref.field;
   var Bind = getBind();
-  return /*#__PURE__*/React.createElement(Bind, null, function (_ref2) {
-    var value = _ref2.value,
-        onChange = _ref2.onChange,
-        validation = _ref2.validation;
+  var imagesOnly = field.settings && field.settings.imagesOnly;
+  return /*#__PURE__*/React.createElement(Bind, null, function (bind) {
+    var value = bind.value,
+        onChange = bind.onChange;
     return /*#__PURE__*/React.createElement(FileUploadWrapper, {
       className: imageWrapperStyles
     }, /*#__PURE__*/React.createElement(FileManager, {
-      multiple: true
-    }, function (_ref3) {
-      var showFileManager = _ref3.showFileManager;
+      multiple: true,
+      images: imagesOnly
+    }, function (_ref2) {
+      var showFileManager = _ref2.showFileManager;
 
       var selectFiles = function selectFiles() {
         var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
@@ -80,16 +80,12 @@ function FieldRenderer(_ref) {
         }));
       }), /*#__PURE__*/React.createElement(Cell, {
         span: 3
-      }, /*#__PURE__*/React.createElement(File, {
+      }, /*#__PURE__*/React.createElement(File, Object.assign({}, bind, {
         showFileManager: function showFileManager() {
           return selectFiles();
         },
         placeholder: t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Select a file\""])))
-      })), validation.isValid === false && /*#__PURE__*/React.createElement(Cell, {
-        span: 12
-      }, /*#__PURE__*/React.createElement(FormElementMessage, {
-        error: true
-      }, validation.message)));
+      }))));
     }));
   });
 }
@@ -110,14 +106,14 @@ var plugin = {
     rendererName: "file-inputs",
     name: t(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["File Inputs"]))),
     description: t(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["Enables selecting multiple files via File Manager."]))),
-    canUse: function canUse(_ref4) {
-      var field = _ref4.field;
+    canUse: function canUse(_ref3) {
+      var field = _ref3.field;
       return field.type === "file" && field.multipleValues;
     },
-    render: function render(_ref5) {
-      var field = _ref5.field,
-          getBind = _ref5.getBind,
-          Label = _ref5.Label;
+    render: function render(_ref4) {
+      var field = _ref4.field,
+          getBind = _ref4.getBind,
+          Label = _ref4.Label;
       return /*#__PURE__*/React.createElement(FieldRenderer, {
         field: field,
         getBind: getBind,

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

@@ -1,6 +1,6 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 import React from "react";
 import debounce from "lodash/debounce";
@@ -9,8 +9,10 @@ import { i18n } from "@webiny/app/i18n";
 import { Link } from "@webiny/react-router";
 import { useReference } from "./useReference";
 import { renderItem } from "./renderItem";
+import { createEntryUrl } from "./createEntryUrl";
 var t = i18n.ns("app-headless-cms/admin/fields/ref");
-var label = t(_templateObject || (_templateObject = _taggedTemplateLiteral(["Selected content entry is not published. Make sure to {publishItLink} before publishing the main content entry."])));
+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}."])));
 
 function ContentEntriesAutocomplete(_ref) {
   var bind = _ref.bind,
@@ -26,14 +28,22 @@ function ContentEntriesAutocomplete(_ref) {
       loading = _useReference.loading,
       onChange = _useReference.onChange;
 
-  var unpublishedEntryInfo = null;
+  var entryInfo = null;
 
   if (value && !value.published) {
-    var link = "/cms/content-entries/".concat(value.modelId, "?id=").concat(encodeURIComponent(value.id));
-    unpublishedEntryInfo = label({
+    var link = createEntryUrl(value);
+    entryInfo = unpublishedLabel({
       publishItLink: /*#__PURE__*/React.createElement(Link, {
         to: link
-      }, t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["publish it"]))))
+      }, t(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["publish it"]))))
+    });
+  } else if (value) {
+    var _link = createEntryUrl(value);
+
+    entryInfo = publishedLabel({
+      here: /*#__PURE__*/React.createElement(Link, {
+        to: _link
+      }, t(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["here"]))))
     });
   }
 
@@ -44,7 +54,7 @@ function ContentEntriesAutocomplete(_ref) {
     value: value ? value.id : null,
     options: options,
     label: field.label,
-    description: /*#__PURE__*/React.createElement(React.Fragment, null, field.helpText, unpublishedEntryInfo),
+    description: /*#__PURE__*/React.createElement(React.Fragment, null, field.helpText, entryInfo),
     onInput: debounce(function (search) {
       return setSearch(search);
     }, 250)

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

@@ -0,0 +1,5 @@
+export interface Params {
+    id: string;
+    modelId: string;
+}
+export declare const createEntryUrl: ({ modelId, id }: Params) => string;

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

@@ -0,0 +1,5 @@
+export var createEntryUrl = function createEntryUrl(_ref) {
+  var modelId = _ref.modelId,
+      id = _ref.id;
+  return "/cms/content-entries/".concat(modelId, "?id=").concat(encodeURIComponent(id));
+};

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

@@ -1,2 +1,8 @@
 /// <reference types="react" />
-export declare const renderItem: (item: any) => JSX.Element;
+export interface Props {
+    name: string;
+    modelName: string;
+    modelId: string;
+    id: string;
+}
+export declare const renderItem: (props: Props) => JSX.Element;

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

@@ -1,14 +1,18 @@
 import React from "react";
 import styled from "@emotion/styled";
 import { Typography } from "@webiny/ui/Typography";
+import { createEntryUrl } from "./createEntryUrl";
+import { Link } from "@webiny/react-router";
 var ModelId = /*#__PURE__*/styled("span", {
   target: "ejkg0kv0",
   label: "ModelId"
 })({
   color: "var(--mdc-theme-text-secondary-on-background) !important"
 });
-export var renderItem = function renderItem(item) {
+export var renderItem = function renderItem(props) {
   return /*#__PURE__*/React.createElement(Typography, {
     use: "body2"
-  }, item.name, /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(ModelId, null, "Model: ", item.modelName));
+  }, /*#__PURE__*/React.createElement(Link, {
+    to: createEntryUrl(props)
+  }, props.name), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(ModelId, null, "Model: ", props.modelName));
 };

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

@@ -176,7 +176,7 @@ export var useReference = function useReference(_ref) {
       variables: {
         entry: {
           modelId: value.modelId,
-          entryId: value.entryId
+          id: value.id
         }
       }
     }).then(function (res) {
@@ -205,7 +205,7 @@ export var useReference = function useReference(_ref) {
       });
       return bind.onChange({
         modelId: entry.modelId,
-        entryId: entry.id
+        id: entry.id
       });
     }
 

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

@@ -156,7 +156,7 @@ export var useReferences = function useReferences(_ref) {
     bind.onChange(values.map(function (item) {
       return {
         modelId: item.modelId,
-        entryId: item.id
+        id: item.id
       };
     }));
   }, []); // Format options for the Autocomplete component.

package/admin/plugins/fieldValidators/patternPlugins/lowerCaseSpace.d.ts

@@ -0,0 +1,3 @@
+import { CmsEditorFieldValidatorPatternPlugin } from "../../../../types";
+declare const _default: CmsEditorFieldValidatorPatternPlugin;
+export default _default;

package/admin/plugins/fieldValidators/patternPlugins/lowerCaseSpace.js

@@ -0,0 +1,9 @@
+export default {
+  type: "cms-editor-field-validator-pattern",
+  name: "cms-editor-field-validator-pattern-lower-case-space",
+  pattern: {
+    message: "Only lower case characters and space are allowed.",
+    name: "lowerCaseSpace",
+    label: "Lower case + space"
+  }
+};

package/admin/plugins/fieldValidators/patternPlugins/upperCaseSpace.d.ts

@@ -0,0 +1,3 @@
+import { CmsEditorFieldValidatorPatternPlugin } from "../../../../types";
+declare const _default: CmsEditorFieldValidatorPatternPlugin;
+export default _default;

package/admin/plugins/fieldValidators/patternPlugins/upperCaseSpace.js

@@ -0,0 +1,9 @@
+export default {
+  type: "cms-editor-field-validator-pattern",
+  name: "cms-editor-field-validator-pattern-upper-case-space",
+  pattern: {
+    message: "Only upper case characters and space are allowed.",
+    name: "upperCaseSpace",
+    label: "Upper case + space"
+  }
+};

package/admin/plugins/fields/file.js

@@ -1,10 +1,12 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2, _templateObject3;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 import React from "react";
 import { ReactComponent as FileIcon } from "@svgr/webpack!./icons/round_insert_drive_file-24px.svg";
 import { i18n } from "@webiny/app/i18n";
+import { Cell, Grid } from "@webiny/ui/Grid";
+import { Radio } from "@webiny/ui/Radio";
 var t = i18n.ns("app-headless-cms/admin/fields");
 var plugin = {
   type: "cms-editor-field-type",
@@ -15,6 +17,7 @@ var plugin = {
     description: t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Images, videos and other files."]))),
     icon: /*#__PURE__*/React.createElement(FileIcon, null),
     validators: ["required"],
+    listValidators: ["minLength", "maxLength"],
     allowMultipleValues: true,
     allowPredefinedValues: false,
     multipleValuesLabel: t(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["Use as a list of files or an image gallery"]))),
@@ -26,6 +29,17 @@ var plugin = {
           name: ""
         }
       };
+    },
+    renderSettings: function renderSettings(_ref) {
+      var Bind = _ref.form.Bind;
+      return /*#__PURE__*/React.createElement(Grid, null, /*#__PURE__*/React.createElement(Cell, {
+        span: 12
+      }, /*#__PURE__*/React.createElement(Bind, {
+        name: "settings.imagesOnly"
+      }, /*#__PURE__*/React.createElement(Radio, {
+        label: t(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["Images only"]))),
+        description: t(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["Allow only images to be selected"])))
+      }))));
     }
   }
 };

package/admin/plugins/fields/ref.js

@@ -21,7 +21,8 @@ var plugin = {
   name: "cms-editor-field-type-ref",
   field: {
     type: "ref",
-    validators: [],
+    validators: ["required"],
+    listValidators: ["minLength", "maxLength"],
     label: t(_templateObject || (_templateObject = _taggedTemplateLiteral(["Reference"]))),
     description: t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Reference existing content entries. For example, a book can reference one or more authors."]))),
     icon: /*#__PURE__*/React.createElement(RefIcon, null),
@@ -136,7 +137,7 @@ var plugin = {
     graphql: {
       queryField:
       /* GraphQL */
-      "\n                {\n                    modelId\n                    entryId\n                }\n            "
+      "\n                {\n                    modelId\n                    id\n                }\n            "
     }
   }
 };

package/admin/plugins/transformers/dateTransformer.js

@@ -1,14 +1,117 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import WebinyError from "@webiny/error";
 
-var transformDate = function transformDate(value, type) {
-  if (type === "date") {
-    return value.substr(0, 10);
+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", {
+    error: error,
+    type: type,
+    value: value
+  });
+};
+
+var dateOnly = function dateOnly(value) {
+  try {
+    var date = new Date(value).toISOString();
+    return date.substr(0, 10);
+  } catch (ex) {
+    throwTransformError({
+      ex: ex,
+      value: value,
+      type: "date"
+    });
   }
+};
 
-  return value;
+var extractTimeZone = function extractTimeZone(value) {
+  var result;
+
+  if (value.includes("+")) {
+    result = value.split("+");
+  } else {
+    result = value.split("-");
+  }
+
+  if (!result || result.length !== 2) {
+    throw new WebinyError("Could not determine time and timezone out of given value.", "TIME_ZONE_ERROR", {
+      value: value
+    });
+  }
+
+  return result;
 };
 
-var excludeTypesTransformation = ["time", "dateTimeWithTimezone"];
+var extractTime = function extractTime(value) {
+  if (value.includes(":") === false) {
+    throw new WebinyError("Time value is missing : separators.", "TIME_ERROR", {
+      value: value
+    });
+  }
+
+  var result = value.split(":");
+
+  if (result.length === 3) {
+    return value;
+  } else if (result.length === 2) {
+    return "".concat(value, ":00");
+  }
+};
+
+var dateTimeWithTimezone = function dateTimeWithTimezone(value) {
+  if (value.includes("T") === false) {
+    return value;
+  }
+
+  var _value$split = value.split("T"),
+      _value$split2 = _slicedToArray(_value$split, 2),
+      initialDate = _value$split2[0],
+      initialTimeZone = _value$split2[1];
+
+  var date;
+
+  try {
+    var dateObj = new Date(initialDate);
+    date = dateObj.toISOString().substr(0, 10);
+  } catch (ex) {
+    throw new WebinyError("Could not transform received date into Date object.", "DATE_TRANSFORM_ERROR", {
+      value: value,
+      date: initialDate,
+      time: initialTimeZone
+    });
+  }
+
+  var _extractTimeZone = extractTimeZone(initialTimeZone),
+      _extractTimeZone2 = _slicedToArray(_extractTimeZone, 1),
+      initialTime = _extractTimeZone2[0];
+
+  var time = extractTime(initialTime);
+  return value.replace(initialDate, date).replace(initialTime, time);
+};
+
+var dateTimeWithoutTimezone = function dateTimeWithoutTimezone(value) {
+  if (value.includes(" ") === false) {
+    return value;
+  }
+
+  try {
+    return new Date("".concat(value.replace(" ", "T"), ".000Z")).toISOString();
+  } catch (ex) {
+    throwTransformError({
+      ex: ex,
+      value: value,
+      type: "dateTimeWithoutTimezone"
+    });
+  }
+};
+
+var transformers = {
+  time: null,
+  date: dateOnly,
+  dateTimeWithoutTimezone: dateTimeWithoutTimezone,
+  dateTimeWithTimezone: dateTimeWithTimezone
+};
 export default (function () {
   return {
     type: "cms-field-value-transformer",
@@ -21,24 +124,15 @@ export default (function () {
       if (!value) {
         console.log("Field \"".concat(field.fieldId, "\" has no value."));
         return null;
-      } else if (excludeTypesTransformation.includes(type) === true) {
-        return value;
-      } else if (type === "dateTimeWithoutTimezone" && value.includes(" ")) {
-        /**
-         * Need to replace space and add .000Z to datetime value because it can look like: 2021-02-02 16:34:56
-         */
-        value = "".concat(value.replace(" ", "T"), ".000Z");
       }
 
-      try {
-        var result = new Date(value).toISOString();
-        return transformDate(result, type);
-      } catch (ex) {
-        throw new WebinyError("Could not transform \"".concat(value, "\" to a date."), "TRANSFORM_ERROR", {
-          message: ex.message,
-          code: ex.code
-        });
+      var transform = transformers[type];
+
+      if (!transform) {
+        return value;
       }
+
+      return transform(value);
     }
   };
 });

package/admin/plugins/validators/patternPlugins/lowerCaseSpace.d.ts

@@ -0,0 +1,10 @@
+declare const _default: {
+    type: string;
+    name: string;
+    pattern: {
+        name: string;
+        regex: string;
+        flags: string;
+    };
+};
+export default _default;

package/admin/plugins/validators/patternPlugins/lowerCaseSpace.js

@@ -0,0 +1,9 @@
+export default {
+  type: "cms-model-field-validator-pattern",
+  name: "cms-model-field-validator-pattern-lower-case-space",
+  pattern: {
+    name: "lowerCaseSpace",
+    regex: "^([a-z\\s]+)$",
+    flags: ""
+  }
+};

package/admin/plugins/validators/patternPlugins/upperCaseSpace.d.ts

@@ -0,0 +1,10 @@
+declare const _default: {
+    type: string;
+    name: string;
+    pattern: {
+        name: string;
+        regex: string;
+        flags: string;
+    };
+};
+export default _default;

package/admin/plugins/validators/patternPlugins/upperCaseSpace.js

@@ -0,0 +1,9 @@
+export default {
+  type: "cms-model-field-validator-pattern",
+  name: "cms-model-field-validator-pattern-upper-case-space",
+  pattern: {
+    name: "upperCaseSpace",
+    regex: "^([A-Z\\s]+)$",
+    flags: ""
+  }
+};

package/admin/views/contentEntries/ContentEntriesList.js

@@ -55,7 +55,7 @@ var listItemMinHeight = /*#__PURE__*/css({
 var ContentEntriesList = function ContentEntriesList() {
   var _useContentEntriesLis = useContentEntriesList(),
       contentModel = _useContentEntriesLis.contentModel,
-      entryId = _useContentEntriesLis.entryId,
+      id = _useContentEntriesLis.id,
       loading = _useContentEntriesLis.loading,
       canCreate = _useContentEntriesLis.canCreate,
       onCreate = _useContentEntriesLis.onCreate,
@@ -159,7 +159,7 @@ var ContentEntriesList = function ContentEntriesList() {
       return /*#__PURE__*/React.createElement(UIList.ListItem, {
         key: item.id,
         className: listItemMinHeight,
-        selected: item.id === entryId
+        selected: item.id === id
       }, /*#__PURE__*/React.createElement(UIList.ListItemText, {
         onClick: editEntry(item)
       }, item.meta.title || "Untitled", /*#__PURE__*/React.createElement(UIList.ListItemTextSecondary, null, t(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["Last modified: {time}."])))({

package/admin/views/contentEntries/ContentEntry/ContentEntryContext.js

@@ -7,6 +7,7 @@ import { useSnackbar } from "@webiny/app-admin/hooks/useSnackbar";
 import * as GQL from "../../../graphql/contentEntries";
 import { useQuery } from "../../../hooks";
 import { useContentEntries } from "../hooks/useContentEntries";
+import { parseIdentifier } from "@webiny/utils";
 export var Context = /*#__PURE__*/React.createContext(null);
 export var Provider = function Provider(_ref) {
   var children = _ref.children;
@@ -37,7 +38,12 @@ export var Provider = function Provider(_ref) {
   var query = new URLSearchParams(location.search);
   var contentId = query.get("id");
   var revisionId = contentId ? decodeURIComponent(contentId) : null;
-  var entryId = revisionId ? revisionId.split("#")[0] : null;
+  var entryId = null;
+
+  if (revisionId) {
+    var result = parseIdentifier(revisionId);
+    entryId = result ? result.id : null;
+  }
 
   var _useMemo = useMemo(function () {
     return {

package/admin/views/contentEntries/ContentEntry/cache.js

@@ -4,6 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import dotProp from "dot-prop-immutable";
 import orderBy from "lodash/orderBy";
 import * as GQL from "../../../graphql/contentEntries";
+import { parseIdentifier } from "@webiny/utils";
 /*
  * We need to preserve the order of entries with new entry addition
  * because we're not re-fetching the list but updating it directly inside cache.
@@ -89,7 +90,9 @@ export var removeEntryFromListCache = function removeEntryFromListCache(model, c
     return;
   }
 
-  var entryId = revision.id.split("#")[0];
+  var _parseIdentifier = parseIdentifier(revision.id),
+      entryId = _parseIdentifier.id;
+
   var index = content.data.findIndex(function (item) {
     return item.id.startsWith(entryId);
   });

package/admin/views/contentEntries/hooks/useContentEntriesList.d.ts

@@ -8,7 +8,7 @@ export declare function useContentEntriesList(): {
         label: string;
         value: string;
     }[];
-    entryId: string;
+    id: string;
     loading: boolean;
     data: any;
     loadMore: () => void;

package/admin/views/contentEntries/hooks/useContentEntriesList.js

@@ -35,7 +35,7 @@ export function useContentEntriesList() {
   var baseUrl = "/cms/content-entries/".concat(contentModel.modelId); // Get entry ID and search query (if any)
 
   var query = new URLSearchParams(location.search);
-  var entryId = query.get("id");
+  var id = query.get("id");
   var searchQuery = query.get("search");
   var updateSearch = useCallback(debounce(function (_ref) {
     var filter = _ref.filter,
@@ -138,7 +138,7 @@ export function useContentEntriesList() {
     listQueryVariables: listQueryVariables,
     setListQueryVariables: setListQueryVariables,
     sorters: sorters,
-    entryId: entryId,
+    id: id,
     loading: loading,
     data: filterByStatus(get(data, "content.data", []), listQueryVariables.status),
     loadMore: loadMore,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-headless-cms",
-	"version": "5.18.2-beta.0",
+	"version": "5.19.0-beta.0",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -24,18 +24,19 @@
 		"@fortawesome/react-fontawesome": "0.1.16",
 		"@svgr/webpack": "4.3.3",
 		"@types/react": "16.14.2",
-		"@webiny/app": "5.18.2-beta.0",
-		"@webiny/app-admin": "5.18.2-beta.0",
-		"@webiny/app-graphql-playground": "5.18.2-beta.0",
-		"@webiny/app-i18n": "5.18.2-beta.0",
-		"@webiny/app-plugin-admin-welcome-screen": "5.18.2-beta.0",
-		"@webiny/app-security": "5.18.2-beta.0",
-		"@webiny/error": "5.18.2-beta.0",
-		"@webiny/form": "5.18.2-beta.0",
-		"@webiny/plugins": "5.18.2-beta.0",
-		"@webiny/react-router": "5.18.2-beta.0",
-		"@webiny/ui": "5.18.2-beta.0",
-		"@webiny/validation": "5.18.2-beta.0",
+		"@webiny/app": "5.19.0-beta.0",
+		"@webiny/app-admin": "5.19.0-beta.0",
+		"@webiny/app-graphql-playground": "5.19.0-beta.0",
+		"@webiny/app-i18n": "5.19.0-beta.0",
+		"@webiny/app-plugin-admin-welcome-screen": "5.19.0-beta.0",
+		"@webiny/app-security": "5.19.0-beta.0",
+		"@webiny/error": "5.19.0-beta.0",
+		"@webiny/form": "5.19.0-beta.0",
+		"@webiny/plugins": "5.19.0-beta.0",
+		"@webiny/react-router": "5.19.0-beta.0",
+		"@webiny/ui": "5.19.0-beta.0",
+		"@webiny/utils": "5.19.0-beta.0",
+		"@webiny/validation": "5.19.0-beta.0",
 		"apollo-cache": "1.3.5",
 		"apollo-client": "2.6.10",
 		"apollo-link": "1.2.14",
@@ -66,8 +67,8 @@
 		"@babel/preset-env": "^7.5.5",
 		"@babel/preset-react": "^7.0.0",
 		"@babel/preset-typescript": "^7.8.3",
-		"@webiny/cli": "^5.18.2-beta.0",
-		"@webiny/project-utils": "^5.18.2-beta.0",
+		"@webiny/cli": "^5.19.0-beta.0",
+		"@webiny/project-utils": "^5.19.0-beta.0",
 		"babel-plugin-emotion": "^9.2.8",
 		"babel-plugin-lodash": "^3.3.4",
 		"babel-plugin-module-resolver": "^4.1.0",
@@ -105,5 +106,5 @@
 			]
 		}
 	},
-	"gitHead": "11c2c5bdeb0cdc0262e75bd4cfe156a468abcd6c"
+	"gitHead": "6c834e0b356e9099800f4094f2023b05b951d8ea"
 }

package/types.d.ts

@@ -316,6 +316,7 @@ export interface CmsEditorFieldValidatorPlugin extends Plugin {
         label: string;
         description: string;
         defaultMessage: string;
+        defaultSettings?: Record<string, any>;
         renderSettings?: (props: {
             field: CmsEditorField;
             Bind: BindComponent;
@@ -356,7 +357,7 @@ export interface CmsModelFieldValidatorPlugin extends Plugin {
     type: "cms-model-field-validator";
     validator: {
         name: string;
-        validate: (value: any, validator: CmsFieldValidator) => Promise<any>;
+        validate: (value: any, validator: CmsFieldValidator | any) => Promise<any>;
     };
 }
 /**