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

package/admin/plugins/fields/ref.js

@@ -13,7 +13,7 @@ import { Cell, Grid } from "@webiny/ui/Grid";
 import { MultiAutoComplete } from "@webiny/ui/AutoComplete";
 import { CircularProgress } from "@webiny/ui/Progress";
 import { useSnackbar } from "@webiny/app-admin/hooks/useSnackbar";
-import { ReactComponent as RefIcon } from "@svgr/webpack!./icons/round-link-24px.svg";
+import { ReactComponent as RefIcon } from "./icons/round-link-24px.svg";
 import { i18n } from "@webiny/app/i18n";
 var t = i18n.ns("app-headless-cms/admin/fields");
 var plugin = {

package/admin/plugins/fields/richText.js

@@ -5,7 +5,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 import React from "react";
 import { i18n } from "@webiny/app/i18n";
 import { Grid, Cell } from "@webiny/ui/Grid";
-import { ReactComponent as NotesIcon } from "@svgr/webpack!./icons/round-text_fields-24px.svg";
+import { ReactComponent as NotesIcon } from "./icons/round-text_fields-24px.svg";
 import { Input } from "@webiny/ui/Input";
 var t = i18n.ns("app-headless-cms/admin/fields");
 var plugin = {

package/admin/plugins/fields/text.js

@@ -3,7 +3,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 
 import React from "react";
-import { ReactComponent as TextIcon } from "@svgr/webpack!./icons/round-text_fields-24px.svg";
+import { ReactComponent as TextIcon } from "./icons/round-text_fields-24px.svg";
 import { Grid, Cell } from "@webiny/ui/Grid";
 import { i18n } from "@webiny/app/i18n";
 import { Input } from "@webiny/ui/Input";
@@ -14,7 +14,7 @@ var plugin = {
   name: "cms-editor-field-type-text",
   field: {
     type: "text",
-    validators: ["required", "minLength", "maxLength", "pattern"],
+    validators: ["required", "minLength", "maxLength", "pattern", "unique"],
     label: t(_templateObject || (_templateObject = _taggedTemplateLiteral(["Text"]))),
     description: t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Titles, names, single line values."]))),
     icon: /*#__PURE__*/React.createElement(TextIcon, null),

package/admin/plugins/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare const _default: () => (import("@webiny/app-admin/types").AdminInstallationPlugin | import("@webiny/app-admin/types").AdminAppPermissionRendererPlugin | import("@webiny/app/types").CacheGetObjectIdPlugin | import("../../types").CmsEditorFormSettingsPlugin | import("../../types").CmsIconsPlugin | import("../../types").CmsFieldValueTransformer[] | import("@webiny/app/types").RoutePlugin[] | import("../../types").CmsContentDetailsPlugin[] | {
+declare const _default: () => (import("../../types").CmsEditorFormSettingsPlugin | import("../../types").CmsIconsPlugin | import("../../types").CmsFieldValueTransformer[] | import("@webiny/app/types").CacheGetObjectIdPlugin | import("@webiny/app/types").RoutePlugin[] | import("@webiny/app-admin/types").AdminInstallationPlugin | import("@webiny/app-admin/types").AdminAppPermissionRendererPlugin | import("../../types").CmsContentDetailsPlugin[] | {
     name: string;
     type: string;
     render(): JSX.Element;

package/admin/plugins/permissionRenderer/components/StyledComponents.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="react" />
-export declare const Note: import("@emotion/styled-base").StyledComponent<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "hidden" | "dir" | "slot" | "style" | "title" | "color" | "translate" | "children" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture">, object>;
+export declare const Note: import("@emotion/styled-base").StyledComponent<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "children" | "style" | "slot" | "title" | "onError" | "color" | "translate" | "hidden" | "className" | "id" | "lang" | "role" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is">, object>;

package/admin/plugins/permissionRenderer/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { AccordionItem } from "@webiny/ui/Accordion";
-import { ReactComponent as HeadlessCMSIcon } from "@svgr/webpack!../../icons/devices_other-black-24px.svg";
+import { ReactComponent as HeadlessCMSIcon } from "../../icons/devices_other-black-24px.svg";
 import { CMSPermissions } from "./CmsPermissions";
 export default {
   type: "admin-app-permissions-renderer",

package/admin/plugins/transformers/dateTransformer.js

@@ -14,7 +14,7 @@ var throwTransformError = function throwTransformError(params) {
 
 var dateOnly = function dateOnly(value) {
   if (!value) {
-    return new Date().toISOString().substr(0, 10);
+    return null; // return new Date().toISOString().substr(0, 10);
   }
 
   try {
@@ -51,7 +51,7 @@ var extractTimeZone = function extractTimeZone(value) {
 
 var extractTime = function extractTime(value) {
   if (!value) {
-    return "00:00:00";
+    return null;
   } else if (value.includes(":") === false) {
     throw new WebinyError("Time value is missing : separators.", "TIME_ERROR", {
       value: value
@@ -69,9 +69,7 @@ var extractTime = function extractTime(value) {
 
 var dateTimeWithTimezone = function dateTimeWithTimezone(value) {
   if (!value) {
-    var _date = new Date().toISOString();
-
-    return _date.replace(/\.([0-9]+)Z/, "+00:00");
+    return null;
   } else if (value.includes("T") === false) {
     return value;
   }
@@ -104,7 +102,7 @@ var dateTimeWithTimezone = function dateTimeWithTimezone(value) {
 
 var dateTimeWithoutTimezone = function dateTimeWithoutTimezone(value) {
   if (!value) {
-    return new Date().toISOString();
+    return null;
   } else if (value.includes(" ") === false) {
     return value;
   }
@@ -122,7 +120,7 @@ var dateTimeWithoutTimezone = function dateTimeWithoutTimezone(value) {
 
 var time = function time(value) {
   if (!value) {
-    return "00:00:00";
+    return null;
   }
 
   return extractTime(value);

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

@@ -0,0 +1,7 @@
+import { CmsModelFieldValidatorPlugin } from "../../../types";
+declare const _default: () => CmsModelFieldValidatorPlugin;
+/**
+ * In the UI we will pretend that field is unique.
+ * When saving the entry, API call will check for the uniqueness.
+ */
+export default _default;

package/admin/plugins/validators/unique.js

@@ -0,0 +1,38 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+/**
+ * In the UI we will pretend that field is unique.
+ * When saving the entry, API call will check for the uniqueness.
+ */
+export default (function () {
+  return {
+    type: "cms-model-field-validator",
+    name: "cms-model-field-validator-unique",
+    validator: {
+      name: "unique",
+      validate: function () {
+        var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  return _context.abrupt("return", true);
+
+                case 1:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function validate() {
+          return _validate.apply(this, arguments);
+        }
+
+        return validate;
+      }()
+    }
+  };
+});

package/admin/views/contentEntries/ContentEntriesContext.d.ts

@@ -13,12 +13,12 @@ export interface ContentEntriesContext {
     canCreate: boolean;
     listQueryVariables: ListQueryVariables;
     setListQueryVariables: Dispatch<SetStateAction<ListQueryVariables>>;
+    insideDialog?: boolean;
 }
 export declare const Context: React.Context<ContentEntriesContext>;
-export declare const Provider: {
-    ({ contentModel, children }: {
-        contentModel: any;
-        children: any;
-    }): JSX.Element;
-    displayName: string;
-};
+export interface ContentEntriesContextProviderProps {
+    contentModel: CmsEditorContentModel;
+    children: React.ReactNode;
+    insideDialog?: boolean;
+}
+export declare const Provider: React.FC<ContentEntriesContextProviderProps>;

package/admin/views/contentEntries/ContentEntriesContext.js

@@ -17,7 +17,8 @@ var SORTERS = [{
 export var Context = /*#__PURE__*/React.createContext(null);
 export var Provider = function Provider(_ref) {
   var contentModel = _ref.contentModel,
-      children = _ref.children;
+      children = _ref.children,
+      insideDialog = _ref.insideDialog;
 
   var _useSecurity = useSecurity(),
       identity = _useSecurity.identity;
@@ -65,6 +66,7 @@ export var Provider = function Provider(_ref) {
     }]);
   }, [contentModel.modelId]);
   var value = {
+    insideDialog: insideDialog,
     contentModel: contentModel,
     sorters: sorters,
     canCreate: canCreate,

package/admin/views/contentEntries/ContentEntriesList.js

@@ -17,8 +17,8 @@ import { ButtonIcon, ButtonSecondary } from "@webiny/ui/Button";
 import { Cell, Grid } from "@webiny/ui/Grid";
 import { Select } from "@webiny/ui/Select";
 import { Scrollbar } from "@webiny/ui/Scrollbar";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
-import { ReactComponent as FilterIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/filter-24px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as FilterIcon } from "@webiny/app-admin/assets/icons/filter-24px.svg";
 import SearchUI from "@webiny/app-admin/components/SearchUI";
 import statusLabels from "../../constants/statusLabels";
 import { useCallback } from "react";

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

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

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

@@ -9,8 +9,29 @@ import { useQuery } from "../../../hooks";
 import { useContentEntries } from "../hooks/useContentEntries";
 import { parseIdentifier } from "@webiny/utils";
 export var Context = /*#__PURE__*/React.createContext(null);
+export var useContentEntryProviderProps = function useContentEntryProviderProps() {
+  var _useRouter = useRouter(),
+      location = _useRouter.location;
+
+  var query = new URLSearchParams(location.search);
+
+  var isNewEntry = function isNewEntry() {
+    return query.get("new") === "true";
+  };
+
+  var getContentId = function getContentId() {
+    return query.get("id");
+  };
+
+  return {
+    getContentId: getContentId,
+    isNewEntry: isNewEntry
+  };
+};
 export var Provider = function Provider(_ref) {
-  var children = _ref.children;
+  var children = _ref.children,
+      isNewEntry = _ref.isNewEntry,
+      getContentId = _ref.getContentId;
 
   var _useContentEntries = useContentEntries(),
       contentModel = _useContentEntries.contentModel,
@@ -22,9 +43,8 @@ export var Provider = function Provider(_ref) {
   var formRef = useRef(null);
   var tabsRef = useRef(null);
 
-  var _useRouter = useRouter(),
-      history = _useRouter.history,
-      location = _useRouter.location;
+  var _useRouter2 = useRouter(),
+      history = _useRouter2.history;
 
   var _useSnackbar = useSnackbar(),
       showSnackbar = _useSnackbar.showSnackbar;
@@ -34,9 +54,9 @@ export var Provider = function Provider(_ref) {
       isLoading = _useState2[0],
       setLoading = _useState2[1];
 
-  var newEntry = new URLSearchParams(location.search).get("new") === "true";
-  var query = new URLSearchParams(location.search);
-  var contentId = query.get("id");
+  var contentEntryProviderProps = useContentEntryProviderProps();
+  var newEntry = typeof isNewEntry === "function" ? isNewEntry() : contentEntryProviderProps.isNewEntry();
+  var contentId = typeof getContentId === "function" ? getContentId() : contentEntryProviderProps.getContentId();
   var revisionId = contentId ? decodeURIComponent(contentId) : null;
   var entryId = null;
 

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

@@ -11,15 +11,15 @@ import { Icon } from "@webiny/ui/Icon";
 import { MenuItem, Menu, MenuDivider } from "@webiny/ui/Menu";
 import { ConfirmationDialog } from "@webiny/ui/ConfirmationDialog";
 import { Tooltip } from "@webiny/ui/Tooltip";
-import { ReactComponent as MoreVerticalIcon } from "@svgr/webpack!../../../icons/more_vert.svg";
-import { ReactComponent as LockIcon } from "@svgr/webpack!../../../icons/lock.svg";
-import { ReactComponent as BeenHereIcon } from "@svgr/webpack!../../../icons/beenhere.svg";
-import { ReactComponent as GestureIcon } from "@svgr/webpack!../../../icons/gesture.svg";
-import { ReactComponent as AddIcon } from "@svgr/webpack!../../../icons/add.svg";
-import { ReactComponent as EditIcon } from "@svgr/webpack!../../../icons/edit.svg";
-import { ReactComponent as PublishIcon } from "@svgr/webpack!../../../icons/publish.svg";
-import { ReactComponent as UnpublishIcon } from "@svgr/webpack!../../../icons/unpublish.svg";
-import { ReactComponent as DeleteIcon } from "@svgr/webpack!../../../icons/delete.svg";
+import { ReactComponent as MoreVerticalIcon } from "../../../icons/more_vert.svg";
+import { ReactComponent as LockIcon } from "../../../icons/lock.svg";
+import { ReactComponent as BeenHereIcon } from "../../../icons/beenhere.svg";
+import { ReactComponent as GestureIcon } from "../../../icons/gesture.svg";
+import { ReactComponent as AddIcon } from "../../../icons/add.svg";
+import { ReactComponent as EditIcon } from "../../../icons/edit.svg";
+import { ReactComponent as PublishIcon } from "../../../icons/publish.svg";
+import { ReactComponent as UnpublishIcon } from "../../../icons/unpublish.svg";
+import { ReactComponent as DeleteIcon } from "../../../icons/delete.svg";
 import { i18n } from "@webiny/app/i18n";
 import { useRevision } from "./useRevision";
 import usePermission from "../../../hooks/usePermission";

package/admin/views/contentEntries/ContentEntry/header/contentFormOptionsMenu/ContentFormOptionsMenu.js

@@ -19,8 +19,8 @@ import { useConfirmationDialog } from "@webiny/app-admin/hooks/useConfirmationDi
 import { i18n } from "@webiny/app/i18n";
 import { createDeleteMutation } from "../../../../../graphql/contentEntries";
 import usePermission from "../../../../../hooks/usePermission";
-import { ReactComponent as MoreVerticalIcon } from "@svgr/webpack!../../../../../icons/more_vert.svg";
-import { ReactComponent as DeleteIcon } from "@svgr/webpack!../../../../../icons/delete.svg";
+import { ReactComponent as MoreVerticalIcon } from "../../../../../icons/more_vert.svg";
+import { ReactComponent as DeleteIcon } from "../../../../../icons/delete.svg";
 import { removeEntryFromListCache } from "../../cache";
 import { useMutation } from "../../../../../hooks";
 import { useContentEntry } from "../../../hooks/useContentEntry";

package/admin/views/contentEntries/ContentEntry/header/requestChanges/RequestChanges.js

@@ -9,7 +9,7 @@ import { IconButton } from "@webiny/ui/Button";
 import { Tooltip } from "@webiny/ui/Tooltip";
 import { useConfirmationDialog } from "@webiny/app-admin/hooks/useConfirmationDialog";
 import { i18n } from "@webiny/app/i18n";
-import { ReactComponent as RequestChangesIcon } from "@svgr/webpack!./rule-24px.svg";
+import { ReactComponent as RequestChangesIcon } from "./rule-24px.svg";
 import usePermission from "../../../../../hooks/usePermission";
 import { useRevision } from "../../useRevision";
 import { useContentEntry } from "../../../hooks/useContentEntry";

package/admin/views/contentEntries/ContentEntry/header/requestReview/RequestReview.js

@@ -9,7 +9,7 @@ import { IconButton } from "@webiny/ui/Button";
 import { Tooltip } from "@webiny/ui/Tooltip";
 import { useConfirmationDialog } from "@webiny/app-admin/hooks/useConfirmationDialog";
 import { i18n } from "@webiny/app/i18n";
-import { ReactComponent as RequestReviewIcon } from "@svgr/webpack!./emoji_people-24px.svg";
+import { ReactComponent as RequestReviewIcon } from "./emoji_people-24px.svg";
 import { useRevision } from "../../useRevision";
 import usePermission from "../../../../../hooks/usePermission";
 import { useContentEntry } from "../../../hooks/useContentEntry";

package/admin/views/contentEntries/ContentEntry/header/revisionSelector/RevisionSelector.js

@@ -6,7 +6,7 @@ import { ButtonDefault } from "@webiny/ui/Button";
 import { Icon } from "@webiny/ui/Icon";
 import { Typography } from "@webiny/ui/Typography";
 import { Menu, MenuItem } from "@webiny/ui/Menu";
-import { ReactComponent as DownButton } from "@svgr/webpack!../../../../../icons/round-arrow_drop_down-24px.svg";
+import { ReactComponent as DownButton } from "../../../../../icons/round-arrow_drop_down-24px.svg";
 import { useContentEntry } from "../../../hooks/useContentEntry";
 import statusLabels from "../../../../../constants/statusLabels";
 var buttonStyle = /*#__PURE__*/css({

package/admin/views/contentEntries/ContentEntry.js

@@ -7,7 +7,7 @@ import { css } from "emotion";
 import styled from "@emotion/styled";
 import EmptyView from "@webiny/app-admin/components/EmptyView";
 import { ButtonDefault, ButtonIcon } from "@webiny/ui/Button";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
 import { i18n } from "@webiny/app/i18n";
 import { Tab, Tabs } from "@webiny/ui/Tabs";
 import { Elevation } from "@webiny/ui/Elevation";

package/admin/views/contentModelGroups/ContentModelGroupsDataList.js

@@ -22,8 +22,8 @@ import { ButtonIcon, ButtonSecondary } from "@webiny/ui/Button";
 import { Cell, Grid } from "@webiny/ui/Grid";
 import { Select } from "@webiny/ui/Select";
 import SearchUI from "@webiny/app-admin/components/SearchUI";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
-import { ReactComponent as FilterIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/filter-24px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as FilterIcon } from "@webiny/app-admin/assets/icons/filter-24px.svg";
 import { serializeSorters, deserializeSorters } from "../utils";
 import usePermission from "../../hooks/usePermission";
 import { Tooltip } from "@webiny/ui/Tooltip";

package/admin/views/contentModelGroups/ContentModelGroupsForm.js

@@ -26,7 +26,7 @@ import IconPicker from "./IconPicker";
 import { useRouter } from "@webiny/react-router";
 import { useSnackbar } from "@webiny/app-admin/hooks/useSnackbar";
 import EmptyView from "@webiny/app-admin/components/EmptyView";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
 import { useMutation, useQuery } from "../../hooks";
 import * as GQL from "./graphql";
 import usePermission from "../../hooks/usePermission";

package/admin/views/contentModels/ContentModelEditor.js

@@ -1,5 +1,5 @@
 import React from "react";
-import HTML5Backend from "react-dnd-html5-backend";
+import { HTML5Backend } from "react-dnd-html5-backend";
 import { DndProvider } from "react-dnd";
 import { Editor } from "../../components/ContentModelEditor/Editor";
 import { useRouter } from "@webiny/react-router";

package/admin/views/contentModels/ContentModelsDataList.js

@@ -11,8 +11,8 @@ import { css } from "emotion";
 import get from "lodash/get";
 import { useRouter } from "@webiny/react-router";
 import { DeleteIcon, EditIcon } from "@webiny/ui/List/DataList/icons";
-import { ReactComponent as ViewListIcon } from "@svgr/webpack!../../icons/view_list.svg";
-import { ReactComponent as CloneIcon } from "@svgr/webpack!../../icons/clone.svg";
+import { ReactComponent as ViewListIcon } from "../../icons/view_list.svg";
+import { ReactComponent as CloneIcon } from "../../icons/clone.svg";
 import { useApolloClient, useQuery } from "../../hooks";
 import { useSnackbar } from "@webiny/app-admin/hooks/useSnackbar";
 import * as UIL from "@webiny/ui/List";
@@ -22,13 +22,13 @@ import { i18n } from "@webiny/app/i18n";
 import { useConfirmationDialog } from "@webiny/app-admin/hooks/useConfirmationDialog";
 import { removeModelFromGroupCache, removeModelFromListCache } from "./cache";
 import * as GQL from "../../viewsGraphql";
-import { ReactComponent as AddIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/add-18px.svg";
+import { ReactComponent as AddIcon } from "@webiny/app-admin/assets/icons/add-18px.svg";
 import SearchUI from "@webiny/app-admin/components/SearchUI";
 import { deserializeSorters, serializeSorters } from "../utils";
 import orderBy from "lodash/orderBy";
 import { Cell, Grid } from "@webiny/ui/Grid";
 import { Select } from "@webiny/ui/Select";
-import { ReactComponent as FilterIcon } from "@svgr/webpack!@webiny/app-admin/assets/icons/filter-24px.svg";
+import { ReactComponent as FilterIcon } from "@webiny/app-admin/assets/icons/filter-24px.svg";
 import usePermission from "../../hooks/usePermission";
 var t = i18n.namespace("FormsApp.ContentModelsDataList");
 var SORTERS = [{

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-headless-cms",
-	"version": "5.21.0",
+	"version": "5.22.0-beta.3",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -14,29 +14,29 @@
 	"license": "MIT",
 	"dependencies": {
 		"@apollo/react-hooks": "3.1.5",
-		"@babel/runtime": "7.16.3",
-		"@emotion/core": "10.1.1",
-		"@emotion/styled": "10.0.27",
+		"@babel/runtime": "7.16.7",
+		"@emotion/core": "10.3.1",
+		"@emotion/styled": "10.3.0",
 		"@fortawesome/fontawesome-svg-core": "1.2.36",
 		"@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": "4.3.3",
+		"@svgr/webpack": "6.2.0",
 		"@types/react": "16.14.2",
-		"@webiny/app": "5.21.0",
-		"@webiny/app-admin": "5.21.0",
-		"@webiny/app-graphql-playground": "5.21.0",
-		"@webiny/app-i18n": "5.21.0",
-		"@webiny/app-plugin-admin-welcome-screen": "5.21.0",
-		"@webiny/app-security": "5.21.0",
-		"@webiny/error": "5.21.0",
-		"@webiny/form": "5.21.0",
-		"@webiny/plugins": "5.21.0",
-		"@webiny/react-router": "5.21.0",
-		"@webiny/ui": "5.21.0",
-		"@webiny/utils": "5.21.0",
-		"@webiny/validation": "5.21.0",
+		"@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",
 		"apollo-cache": "1.3.5",
 		"apollo-client": "2.6.10",
 		"apollo-link": "1.2.14",
@@ -45,17 +45,17 @@
 		"classnames": "2.3.1",
 		"dot-prop-immutable": "2.1.1",
 		"emotion": "10.0.27",
-		"graphql": "14.7.0",
+		"graphql": "15.8.0",
 		"graphql-tag": "2.12.6",
 		"lodash": "4.17.21",
 		"pluralize": "8.0.0",
-		"prop-types": "15.7.2",
+		"prop-types": "15.8.1",
 		"raw.macro": "0.4.2",
 		"react": "16.14.0",
-		"react-dnd": "9.5.1",
-		"react-dnd-html5-backend": "9.5.1",
+		"react-dnd": "11.1.3",
+		"react-dnd-html5-backend": "11.1.3",
 		"react-dom": "16.14.0",
-		"react-helmet": "5.2.1",
+		"react-helmet": "6.1.0",
 		"react-hotkeyz": "1.0.4",
 		"react-virtualized": "9.22.3",
 		"shortid": "2.2.16",
@@ -63,17 +63,16 @@
 		"use-deep-compare-effect": "1.8.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.5.5",
-		"@babel/core": "^7.5.5",
-		"@babel/preset-env": "^7.5.5",
-		"@babel/preset-react": "^7.0.0",
-		"@babel/preset-typescript": "^7.8.3",
-		"@webiny/cli": "^5.21.0",
-		"@webiny/project-utils": "^5.21.0",
+		"@babel/cli": "^7.16.0",
+		"@babel/core": "^7.16.0",
+		"@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",
 		"babel-plugin-emotion": "^9.2.8",
 		"babel-plugin-lodash": "^3.3.4",
 		"babel-plugin-module-resolver": "^4.1.0",
-		"babel-plugin-named-asset-import": "^1.0.0-next.3e165448",
 		"execa": "^5.0.0",
 		"rimraf": "^3.0.2",
 		"ttypescript": "^1.5.12",
@@ -87,11 +86,6 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"svgo": {
-		"plugins": {
-			"removeViewBox": false
-		}
-	},
 	"adio": {
 		"ignore": {
 			"src": [
@@ -107,5 +101,5 @@
 			]
 		}
 	},
-	"gitHead": "c3d4955bf74e7ffdb9628867e3b23cdfe64ea8dc"
+	"gitHead": "7a6b4ce3b9f31fe0702fffd28b7959c637e9a20b"
 }

package/types.d.ts

@@ -134,8 +134,9 @@ export interface CmsEditorFieldTypePlugin extends Plugin {
          */
         renderPredefinedValues?: (params: {
             form: FormRenderPropParams;
+            field: CmsEditorField;
             getBind: (index?: number) => any;
-        }) => React.ReactNode;
+        }) => React.ReactElement;
         /**
          * Object wrapper for GraphQL stuff
          */
@@ -237,6 +238,7 @@ export interface CmsEditorFieldRendererPlugin extends Plugin {
 export interface CmsEditorFieldPredefinedValuesEntry {
     label: string;
     value: string;
+    selected?: boolean;
 }
 export interface CmsEditorFieldPredefinedValues {
     enabled: boolean;
@@ -254,6 +256,7 @@ export declare type CmsEditorField<T = unknown> = T & {
     multipleValues?: boolean;
     predefinedValues?: CmsEditorFieldPredefinedValues;
     settings?: {
+        defaultValue?: string | null | undefined;
         [key: string]: any;
     };
     renderer: {