@webiny/app-headless-cms 5.23.1 → 5.24.0-beta.0

package/admin/plugins/validators/lte.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
-export default {
+var plugin = {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-lte",
   validator: {
@@ -40,4 +40,5 @@ export default {
       return validate;
     }()
   }
-};
+};
+export default plugin;

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

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

package/admin/plugins/validators/maxLength.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
-export default {
+var plugin = {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-max-length",
   validator: {
@@ -40,4 +40,5 @@ export default {
       return validate;
     }()
   }
-};
+};
+export default plugin;

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

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

package/admin/plugins/validators/minLength.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { validation } from "@webiny/validation";
-export default {
+var plugin = {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-min-length",
   validator: {
@@ -40,4 +40,5 @@ export default {
       return validate;
     }()
   }
-};
+};
+export default plugin;

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

@@ -1,9 +1,3 @@
-declare const _default: {
-    type: string;
-    name: string;
-    validator: {
-        name: string;
-        validate: (value: any, validator: any) => Promise<boolean>;
-    };
-};
-export default _default;
+import { CmsModelFieldValidatorPlugin } from "../../../types";
+declare const plugin: CmsModelFieldValidatorPlugin;
+export default plugin;

package/admin/plugins/validators/pattern.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { plugins } from "@webiny/plugins";
-export default {
+var plugin = {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-pattern",
   validator: {
@@ -60,4 +60,5 @@ export default {
       return validate;
     }()
   }
-};
+};
+export default plugin;

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

@@ -1,10 +1,3 @@
-declare const _default: {
-    type: string;
-    name: string;
-    pattern: {
-        name: string;
-        regex: string;
-        flags: string;
-    };
-};
-export default _default;
+import { CmsModelFieldValidatorPatternPlugin } from "../../../../types";
+declare const plugin: CmsModelFieldValidatorPatternPlugin;
+export default plugin;

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

@@ -1,4 +1,4 @@
-export default {
+var plugin = {
   type: "cms-model-field-validator-pattern",
   name: "cms-model-field-validator-pattern-email",
   pattern: {
@@ -6,4 +6,5 @@ export default {
     regex: "^\\w[\\w.-]*@([\\w-]+\\.)+[\\w-]+$",
     flags: "i"
   }
-};
+};
+export default plugin;

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

@@ -1,10 +1,3 @@
-declare const _default: {
-    type: string;
-    name: string;
-    pattern: {
-        name: string;
-        regex: string;
-        flags: string;
-    };
-};
-export default _default;
+import { CmsModelFieldValidatorPatternPlugin } from "../../../../types";
+declare const plugin: CmsModelFieldValidatorPatternPlugin;
+export default plugin;

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

@@ -1,4 +1,4 @@
-export default {
+var plugin = {
   type: "cms-model-field-validator-pattern",
   name: "cms-model-field-validator-pattern-lower-case",
   pattern: {
@@ -6,4 +6,5 @@ export default {
     regex: "^([a-z]*)$",
     flags: ""
   }
-};
+};
+export default plugin;

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

@@ -1,10 +1,3 @@
-declare const _default: {
-    type: string;
-    name: string;
-    pattern: {
-        name: string;
-        regex: string;
-        flags: string;
-    };
-};
-export default _default;
+import { CmsModelFieldValidatorPatternPlugin } from "../../../../types";
+declare const plugin: CmsModelFieldValidatorPatternPlugin;
+export default plugin;

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

@@ -1,4 +1,4 @@
-export default {
+var plugin = {
   type: "cms-model-field-validator-pattern",
   name: "cms-model-field-validator-pattern-lower-case-space",
   pattern: {
@@ -6,4 +6,5 @@ export default {
     regex: "^([a-z\\s]+)$",
     flags: ""
   }
-};
+};
+export default plugin;

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

@@ -1,10 +1,3 @@
-declare const _default: {
-    type: string;
-    name: string;
-    pattern: {
-        name: string;
-        regex: string;
-        flags: string;
-    };
-};
-export default _default;
+import { CmsModelFieldValidatorPatternPlugin } from "../../../../types";
+declare const plugin: CmsModelFieldValidatorPatternPlugin;
+export default plugin;

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

@@ -1,4 +1,4 @@
-export default {
+var plugin = {
   type: "cms-model-field-validator-pattern",
   name: "cms-model-field-validator-pattern-upper-case",
   pattern: {
@@ -6,4 +6,5 @@ export default {
     regex: "^([A-Z]*)$",
     flags: ""
   }
-};
+};
+export default plugin;

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

@@ -1,10 +1,3 @@
-declare const _default: {
-    type: string;
-    name: string;
-    pattern: {
-        name: string;
-        regex: string;
-        flags: string;
-    };
-};
-export default _default;
+import { CmsModelFieldValidatorPatternPlugin } from "../../../../types";
+declare const plugin: CmsModelFieldValidatorPatternPlugin;
+export default plugin;

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

@@ -1,4 +1,4 @@
-export default {
+var plugin = {
   type: "cms-model-field-validator-pattern",
   name: "cms-model-field-validator-pattern-upper-case-space",
   pattern: {
@@ -6,4 +6,5 @@ export default {
     regex: "^([A-Z\\s]+)$",
     flags: ""
   }
-};
+};
+export default plugin;

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

@@ -1,10 +1,3 @@
-declare const _default: {
-    type: string;
-    name: string;
-    pattern: {
-        name: string;
-        regex: string;
-        flags: string;
-    };
-};
-export default _default;
+import { CmsModelFieldValidatorPatternPlugin } from "../../../../types";
+declare const plugin: CmsModelFieldValidatorPatternPlugin;
+export default plugin;

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

@@ -1,4 +1,4 @@
-export default {
+var plugin = {
   type: "cms-model-field-validator-pattern",
   name: "cms-model-field-validator-pattern-url",
   pattern: {
@@ -6,4 +6,5 @@ export default {
     regex: "^(ftp|http|https):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?$",
     flags: "i"
   }
-};
+};
+export default plugin;

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

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

package/admin/plugins/validators/required.js

@@ -1,5 +1,5 @@
 import { validation } from "@webiny/validation";
-export default {
+var plugin = {
   type: "cms-model-field-validator",
   name: "cms-model-field-validator-required",
   validator: {
@@ -8,4 +8,5 @@ export default {
       return validation.validate(value, "required");
     }
   }
-};
+};
+export default plugin;

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

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const ContentEntries: () => JSX.Element;
+import React from "react";
+declare const ContentEntries: React.FC;
 export default ContentEntries;

package/admin/views/contentEntries/ContentEntries.js

@@ -14,7 +14,7 @@ import { Provider as ContentEntriesProvider } from "./ContentEntriesContext";
 import { GET_CONTENT_MODEL } from "../../graphql/contentModels";
 import { useQuery } from "../../hooks";
 import ContentEntriesList from "./ContentEntriesList";
-import ContentEntry from "./ContentEntry";
+import { ContentEntry } from "./ContentEntry";
 import { Provider as ContentEntryProvider } from "./ContentEntry/ContentEntryContext";
 var t = i18n.ns("app-headless-cms/admin/content-entries");
 
@@ -41,7 +41,7 @@ var ContentEntries = function ContentEntries() {
       modelId: modelId
     },
     onCompleted: function onCompleted(data) {
-      var contentModel = get(data, "getContentModel.data");
+      var contentModel = get(data, "getContentModel.data", null);
 
       if (contentModel) {
         return setContentModel(contentModel);

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

@@ -1,15 +1,19 @@
 import React, { Dispatch, SetStateAction } from "react";
 import { CmsEditorContentModel } from "../../../types";
+export interface CmsEntriesSorter {
+    label: string;
+    value: string;
+}
 export interface ListQueryVariables {
-    sort?: string;
+    sort?: string[];
     status?: string;
+    where?: {
+        [key: string]: any;
+    };
 }
 export interface ContentEntriesContext {
     contentModel: CmsEditorContentModel;
-    sorters: Array<{
-        label: string;
-        value: string;
-    }>;
+    sorters: CmsEntriesSorter[];
     canCreate: boolean;
     listQueryVariables: ListQueryVariables;
     setListQueryVariables: Dispatch<SetStateAction<ListQueryVariables>>;

package/admin/views/contentEntries/ContentEntriesContext.js

@@ -24,7 +24,7 @@ export var Provider = function Provider(_ref) {
       identity = _useSecurity.identity;
 
   var _useState = useState({
-    sort: SORTERS[0].value
+    sort: [SORTERS[0].value]
   }),
       _useState2 = _slicedToArray(_useState, 2),
       listQueryVariables = _useState2[0],

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

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const ContentEntriesList: () => JSX.Element;
+import React from "react";
+declare const ContentEntriesList: React.FC;
 export default ContentEntriesList;

package/admin/views/contentEntries/ContentEntriesList.js

@@ -6,6 +6,11 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 import React, { useMemo } from "react";
 import debounce from "lodash/debounce";
 import { css } from "emotion";
+/**
+ * Package timeago-react does not have types.
+ */
+// @ts-ignore
+
 import TimeAgo from "timeago-react";
 import pluralize from "pluralize";
 import styled from "@emotion/styled";
@@ -74,9 +79,14 @@ var ContentEntriesList = function ContentEntriesList() {
       loadMore();
     }
   }, 500), [data]);
+
+  var formInitialData = _objectSpread(_objectSpread({}, listQueryVariables), {}, {
+    sort: listQueryVariables.sort ? listQueryVariables.sort[0] : ""
+  });
+
   var entriesDataListModalOverlay = useMemo(function () {
     return /*#__PURE__*/React.createElement(UIList.DataListModalOverlay, null, /*#__PURE__*/React.createElement(Form, {
-      data: listQueryVariables,
+      data: formInitialData,
       onChange: function onChange(_ref) {
         var status = _ref.status,
             sort = _ref.sort;

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

@@ -28,8 +28,5 @@ interface UseContentEntryProviderProps {
     isNewEntry?: () => boolean;
 }
 export declare const useContentEntryProviderProps: () => UseContentEntryProviderProps;
-export declare const Provider: {
-    ({ children, isNewEntry, getContentId }: ContentEntryContextProviderProps): JSX.Element;
-    displayName: string;
-};
+export declare const Provider: React.FC<ContentEntryContextProviderProps>;
 export {};

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

@@ -4,10 +4,10 @@ import isEmpty from "lodash/isEmpty";
 import get from "lodash/get";
 import { useRouter } from "@webiny/react-router";
 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";
+import { createReadQuery, createRevisionsQuery } from "../../../graphql/contentEntries";
 export var Context = /*#__PURE__*/React.createContext(null);
 export var useContentEntryProviderProps = function useContentEntryProviderProps() {
   var _useRouter = useRouter(),
@@ -67,14 +67,14 @@ export var Provider = function Provider(_ref) {
 
   var _useMemo = useMemo(function () {
     return {
-      READ_CONTENT: GQL.createReadQuery(contentModel)
+      READ_CONTENT: createReadQuery(contentModel)
     };
   }, [contentModel.modelId]),
       READ_CONTENT = _useMemo.READ_CONTENT;
 
   var _useMemo2 = useMemo(function () {
     return {
-      GET_REVISIONS: GQL.createRevisionsQuery(contentModel)
+      GET_REVISIONS: createRevisionsQuery(contentModel)
     };
   }, [contentModel.modelId]),
       GET_REVISIONS = _useMemo2.GET_REVISIONS;
@@ -100,10 +100,12 @@ export var Provider = function Provider(_ref) {
 
       var error = data.content.error;
 
-      if (error) {
-        history.push("/cms/content-entries/".concat(contentModel.modelId));
-        showSnackbar(error.message);
+      if (!error) {
+        return;
       }
+
+      history.push("/cms/content-entries/".concat(contentModel.modelId));
+      showSnackbar(error.message);
     }
   });
   var getRevisions = useQuery(GET_REVISIONS, {

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

@@ -1,7 +1,7 @@
-/// <reference types="react" />
+import React from "react";
 import { CmsEditorContentEntry } from "../../../../types";
-declare type Props = {
+interface RevisionListItemProps {
     revision: CmsEditorContentEntry;
-};
-declare const RevisionListItem: ({ revision }: Props) => JSX.Element;
+}
+declare const RevisionListItem: React.FC<RevisionListItemProps>;
 export default RevisionListItem;

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

@@ -4,6 +4,11 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 
 import React from "react";
 import { css } from "emotion";
+/**
+ * Package timeago-react does not have types.
+ */
+// @ts-ignore
+
 import TimeAgo from "timeago-react";
 import { ListItem, ListItemText, ListItemTextPrimary, ListItemTextSecondary, ListItemGraphic, ListItemMeta } from "@webiny/ui/List";
 import { IconButton } from "@webiny/ui/Button";
@@ -114,7 +119,9 @@ var RevisionListItem = function RevisionListItem(_ref) {
       className: revisionsMenu,
       "data-testid": "cms.content-form.revisions.more-options"
     }, canEdit(entry, "cms.contentEntry") && /*#__PURE__*/React.createElement(MenuItem, {
-      onClick: createRevision,
+      onClick: function onClick() {
+        return createRevision(revision.id);
+      },
       "data-testid": "cms.revision.create-revision"
     }, /*#__PURE__*/React.createElement(ListItemGraphic, null, /*#__PURE__*/React.createElement(Icon, {
       icon: /*#__PURE__*/React.createElement(AddIcon, null)
@@ -135,7 +142,9 @@ var RevisionListItem = function RevisionListItem(_ref) {
     }, /*#__PURE__*/React.createElement(ListItemGraphic, null, /*#__PURE__*/React.createElement(Icon, {
       icon: /*#__PURE__*/React.createElement(PublishIcon, null)
     })), t(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["Publish"])))), revision.meta.status === "published" && canUnpublish("cms.contentEntry") && /*#__PURE__*/React.createElement(MenuItem, {
-      onClick: unpublishRevision,
+      onClick: function onClick() {
+        return unpublishRevision(revision.id);
+      },
       "data-testid": "cms.revision.unpublish"
     }, /*#__PURE__*/React.createElement(ListItemGraphic, null, /*#__PURE__*/React.createElement(Icon, {
       icon: /*#__PURE__*/React.createElement(UnpublishIcon, null)

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

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const RevisionsList: () => JSX.Element;
+import React from "react";
+declare const RevisionsList: React.FC;
 export default RevisionsList;

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

@@ -1,7 +1,9 @@
-import { CmsEditorContentEntry } from "../../../../types";
-export declare const addEntryToListCache: (model: any, cache: any, entry: CmsEditorContentEntry, variables: any) => void;
-export declare const updateLatestRevisionInListCache: (model: any, cache: any, revision: any, variables: any) => void;
-export declare const removeEntryFromListCache: (model: any, cache: any, revision: any, variables: any) => void;
-export declare const removeRevisionFromEntryCache: (model: any, cache: any, revision: any) => any;
-export declare const addRevisionToRevisionsCache: (model: any, cache: any, revision: any) => void;
-export declare const unpublishPreviouslyPublishedRevision: (model: any, cache: any, publishedId: any) => void;
+import { CmsContentEntryRevision, CmsEditorContentEntry, CmsModel } from "../../../../types";
+import { DataProxy } from "apollo-cache";
+import { CmsEntriesListQueryVariables } from "../../../graphql/contentEntries";
+export declare const addEntryToListCache: (model: CmsModel, cache: DataProxy, entry: CmsEditorContentEntry, variables: CmsEntriesListQueryVariables) => void;
+export declare const updateLatestRevisionInListCache: (model: CmsModel, cache: DataProxy, revision: CmsContentEntryRevision, variables: CmsEntriesListQueryVariables) => void;
+export declare const removeEntryFromListCache: (model: CmsModel, cache: DataProxy, revision: CmsContentEntryRevision, variables: CmsEntriesListQueryVariables) => void;
+export declare const removeRevisionFromEntryCache: (model: CmsModel, cache: DataProxy, revision: CmsContentEntryRevision) => CmsContentEntryRevision[];
+export declare const addRevisionToRevisionsCache: (model: CmsModel, cache: DataProxy, revision: CmsContentEntryRevision) => void;
+export declare const unpublishPreviouslyPublishedRevision: (model: CmsModel, cache: DataProxy, publishedId: string) => void;

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

@@ -5,20 +5,28 @@ 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.
  * */
-
 var sortEntries = function sortEntries(list, sort) {
-  if (!sort || typeof sort !== "string") {
+  if (!sort) {
+    return list;
+  } else if (Array.isArray(sort) === false) {
+    console.log("Sort is not an Array of string.");
+    return list;
+  } else if (sort.length === 0) {
     return list;
   }
 
-  var _sort$split = sort.split("_"),
-      _sort$split2 = _slicedToArray(_sort$split, 2),
-      key = _sort$split2[0],
-      value = _sort$split2[1];
+  var _sort = _slicedToArray(sort, 1),
+      sortBy = _sort[0];
+
+  var _sortBy$split = sortBy.split("_"),
+      _sortBy$split2 = _slicedToArray(_sortBy$split, 2),
+      key = _sortBy$split2[0],
+      value = _sortBy$split2[1];
 
   var order = value.toLowerCase();
   return orderBy(list, [key], [order]);
@@ -116,23 +124,21 @@ export var removeRevisionFromEntryCache = function removeRevisionFromEntryCache(
   };
 
   var _cache$readQuery4 = cache.readQuery(gqlParams),
-      revisions = _cache$readQuery4.revisions;
+      revisionsData = _cache$readQuery4.revisions;
 
-  if (!revisions || !revisions.data) {
-    return;
+  if (!revisionsData || !revisionsData.data || revisionsData.data.length === 0) {
+    return [];
   }
 
-  var index = revisions.data.findIndex(function (item) {
-    return item.id === revision.id;
+  var revisions = revisionsData.data.filter(function (item) {
+    return item.id !== revision.id;
   });
-  var newRevisions = dotProp.delete(revisions, "data.".concat(index));
   cache.writeQuery(_objectSpread(_objectSpread({}, gqlParams), {}, {
     data: {
-      revisions: newRevisions
+      revisions: revisions
     }
-  })); // Return new revisions
-
-  return newRevisions.data;
+  }));
+  return revisions;
 };
 export var addRevisionToRevisionsCache = function addRevisionToRevisionsCache(model, cache, revision) {
   var gqlParams = {

package/admin/views/contentEntries/ContentEntry/header/Header.d.ts

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

package/admin/views/contentEntries/ContentEntry/header/contentFormOptionsMenu/ContentFormOptionsMenu.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const ContentFormOptionsMenu: () => JSX.Element;
+import React from "react";
+declare const ContentFormOptionsMenu: React.FC;
 export default ContentFormOptionsMenu;

package/admin/views/contentEntries/ContentEntry/header/requestReview/RequestReview.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const RequestReview: () => JSX.Element;
+import React from "react";
+declare const RequestReview: React.FC;
 export default RequestReview;

package/admin/views/contentEntries/ContentEntry/header/revisionSelector/RevisionSelector.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const RevisionSelector: () => JSX.Element;
+import React from "react";
+declare const RevisionSelector: React.FC;
 export default RevisionSelector;

package/admin/views/contentEntries/ContentEntry/header/saveAndPublishContent/SaveAndPublishContent.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const SaveAndPublishButton: () => JSX.Element;
+import React from "react";
+declare const SaveAndPublishButton: React.FC;
 export default SaveAndPublishButton;

package/admin/views/contentEntries/ContentEntry/header/saveContent/SaveContent.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const SaveContentButton: () => JSX.Element;
+import React from "react";
+declare const SaveContentButton: React.FC;
 export default SaveContentButton;