@webiny/app-headless-cms 5.18.3 → 5.19.0-beta.3

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.3",
+	"version": "5.19.0-beta.3",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -24,21 +24,23 @@
 		"@fortawesome/react-fontawesome": "0.1.16",
 		"@svgr/webpack": "4.3.3",
 		"@types/react": "16.14.2",
-		"@webiny/app": "5.18.3",
-		"@webiny/app-admin": "5.18.3",
-		"@webiny/app-graphql-playground": "5.18.3",
-		"@webiny/app-i18n": "5.18.3",
-		"@webiny/app-plugin-admin-welcome-screen": "5.18.3",
-		"@webiny/app-security": "5.18.3",
-		"@webiny/error": "5.18.3",
-		"@webiny/form": "5.18.3",
-		"@webiny/plugins": "5.18.3",
-		"@webiny/react-router": "5.18.3",
-		"@webiny/ui": "5.18.3",
-		"@webiny/validation": "5.18.3",
+		"@webiny/app": "5.19.0-beta.3",
+		"@webiny/app-admin": "5.19.0-beta.3",
+		"@webiny/app-graphql-playground": "5.19.0-beta.3",
+		"@webiny/app-i18n": "5.19.0-beta.3",
+		"@webiny/app-plugin-admin-welcome-screen": "5.19.0-beta.3",
+		"@webiny/app-security": "5.19.0-beta.3",
+		"@webiny/error": "5.19.0-beta.3",
+		"@webiny/form": "5.19.0-beta.3",
+		"@webiny/plugins": "5.19.0-beta.3",
+		"@webiny/react-router": "5.19.0-beta.3",
+		"@webiny/ui": "5.19.0-beta.3",
+		"@webiny/utils": "5.19.0-beta.3",
+		"@webiny/validation": "5.19.0-beta.3",
 		"apollo-cache": "1.3.5",
 		"apollo-client": "2.6.10",
 		"apollo-link": "1.2.14",
+		"apollo-link-batch-http": "1.2.14",
 		"apollo-utilities": "1.3.4",
 		"classnames": "2.3.1",
 		"dot-prop-immutable": "2.1.1",
@@ -66,8 +68,8 @@
 		"@babel/preset-env": "^7.5.5",
 		"@babel/preset-react": "^7.0.0",
 		"@babel/preset-typescript": "^7.8.3",
-		"@webiny/cli": "^5.18.3",
-		"@webiny/project-utils": "^5.18.3",
+		"@webiny/cli": "^5.19.0-beta.3",
+		"@webiny/project-utils": "^5.19.0-beta.3",
 		"babel-plugin-emotion": "^9.2.8",
 		"babel-plugin-lodash": "^3.3.4",
 		"babel-plugin-module-resolver": "^4.1.0",
@@ -105,5 +107,5 @@
 			]
 		}
 	},
-	"gitHead": "3ccdb07d10c57086a63eb42ba7484e17bc388297"
+	"gitHead": "a1cca819f83172183b907de16fd5746d07d13ad0"
 }

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>;
     };
 }
 /**