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

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

@@ -1,13 +1,35 @@
 import { CmsEditorContentEntry } from "../../../../types";
-export declare type UseRevisionProps = {
+interface CreateRevisionHandler {
+    (id?: string): Promise<void>;
+}
+interface EditRevisionHandler {
+    (id?: string): void;
+}
+interface DeleteRevisionHandler {
+    (id?: string): Promise<void>;
+}
+interface PublishRevisionHandler {
+    (id?: string): Promise<void>;
+}
+interface UnpublishRevisionHandler {
+    (id?: string): Promise<void>;
+}
+interface RequestReviewHandler {
+    (id?: string): Promise<void>;
+}
+interface RequestChangesHandler {
+    (id?: string): Promise<void>;
+}
+export interface UseRevisionProps {
     revision: CmsEditorContentEntry;
-};
+}
 export declare const useRevision: ({ revision }: UseRevisionProps) => {
-    createRevision: (...params: any[]) => any;
-    editRevision: (...params: any[]) => any;
-    deleteRevision: (...params: any[]) => any;
-    publishRevision: (...params: any[]) => any;
-    unpublishRevision: (...params: any[]) => any;
-    requestReview: (...params: any[]) => any;
-    requestChanges: (...params: any[]) => any;
+    createRevision: CreateRevisionHandler;
+    editRevision: EditRevisionHandler;
+    deleteRevision: DeleteRevisionHandler;
+    publishRevision: PublishRevisionHandler;
+    unpublishRevision: UnpublishRevisionHandler;
+    requestReview: RequestReviewHandler;
+    requestChanges: RequestChangesHandler;
 };
+export {};

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

@@ -47,102 +47,117 @@ export var useRevision = function useRevision(_ref) {
     entry: entry
   }, {
     createRevision: function createRevision() {
-      return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _yield$client$mutate, res, _res$content, data, error;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                setLoading(true);
-                _context.next = 3;
-                return client.mutate({
-                  mutation: CREATE_REVISION,
-                  variables: {
-                    revision: revision.id
-                  },
-                  update: function update(cache, _ref3) {
-                    var data = _ref3.data;
-                    var newRevision = data.content.data;
-                    GQLCache.updateLatestRevisionInListCache(contentModel, cache, newRevision, listQueryVariables);
-                    GQLCache.addRevisionToRevisionsCache(contentModel, cache, newRevision);
-                  }
-                });
+      return /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
+          var _yield$client$mutate, res, _res$content, data, error;
 
-              case 3:
-                _yield$client$mutate = _context.sent;
-                res = _yield$client$mutate.data;
-                setLoading(false);
-                _res$content = res.content, data = _res$content.data, error = _res$content.error;
+          return _regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  setLoading(true);
+                  _context.next = 3;
+                  return client.mutate({
+                    mutation: CREATE_REVISION,
+                    variables: {
+                      revision: id || revision.id
+                    },
+                    update: function update(cache, _ref3) {
+                      var data = _ref3.data;
+                      var newRevision = data.content.data;
+                      GQLCache.updateLatestRevisionInListCache(contentModel, cache, newRevision, listQueryVariables);
+                      GQLCache.addRevisionToRevisionsCache(contentModel, cache, newRevision);
+                    }
+                  });
 
-                if (!error) {
-                  _context.next = 9;
-                  break;
-                }
+                case 3:
+                  _yield$client$mutate = _context.sent;
+                  res = _yield$client$mutate.data;
+                  setLoading(false);
+                  _res$content = res.content, data = _res$content.data, error = _res$content.error;
+
+                  if (!error) {
+                    _context.next = 9;
+                    break;
+                  }
 
-                return _context.abrupt("return", showSnackbar(error.message));
+                  return _context.abrupt("return", showSnackbar(error.message));
 
-              case 9:
-                history.push("/cms/content-entries/".concat(modelId, "?id=").concat(encodeURIComponent(data.id)));
+                case 9:
+                  history.push("/cms/content-entries/".concat(modelId, "?id=").concat(encodeURIComponent(data.id)));
 
-              case 10:
-              case "end":
-                return _context.stop();
+                case 10:
+                case "end":
+                  return _context.stop();
+              }
             }
-          }
-        }, _callee);
-      }));
+          }, _callee);
+        }));
+
+        return function (_x) {
+          return _ref2.apply(this, arguments);
+        };
+      }();
     },
     editRevision: function editRevision() {
-      return function () {
-        history.push("/cms/content-entries/".concat(modelId, "/?id=").concat(encodeURIComponent(revision.id)));
+      return function (id) {
+        history.push("/cms/content-entries/".concat(modelId, "/?id=").concat(encodeURIComponent(id || revision.id)));
       };
     },
     deleteRevision: function deleteRevision(_ref4) {
       var entry = _ref4.entry;
-      return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                setLoading(true);
-                _context2.next = 3;
-                return client.mutate({
-                  mutation: DELETE_REVISION,
-                  variables: {
-                    revision: revision.id
-                  },
-                  update: function update(cache, _ref6) {
-                    var data = _ref6.data;
-                    var error = data.content.error;
-
-                    if (error) {
-                      return showSnackbar(error.message);
-                    } // We have other revisions, update entry's cache
-
-
-                    // We have other revisions, update entry's cache
-                    var revisions = GQLCache.removeRevisionFromEntryCache(contentModel, cache, revision);
-
-                    if (revision.id === entry.id) {
+      return /*#__PURE__*/function () {
+        var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
+          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  setLoading(true);
+                  _context2.next = 3;
+                  return client.mutate({
+                    mutation: DELETE_REVISION,
+                    variables: {
+                      revision: id || revision.id
+                    },
+                    update: function update(cache, _ref6) {
+                      var data = _ref6.data;
+                      var error = data.content.error;
+
+                      if (error) {
+                        showSnackbar(error.message);
+                        return;
+                      } // We have other revisions, update entry's cache
+
+
+                      // We have other revisions, update entry's cache
+                      var revisions = GQLCache.removeRevisionFromEntryCache(contentModel, cache, revision);
+
+                      if (revision.id !== entry.id) {
+                        return;
+                      }
+
                       GQLCache.updateLatestRevisionInListCache(contentModel, cache, revisions[0], listQueryVariables); // Redirect to the first revision in the list of all entry revisions.
 
                       // Redirect to the first revision in the list of all entry revisions.
-                      return history.push("/cms/content-entries/".concat(modelId, "?id=") + encodeURIComponent(revisions[0].id));
+                      history.push("/cms/content-entries/".concat(modelId, "?id=") + encodeURIComponent(revisions[0].id));
                     }
-                  }
-                });
+                  });
 
-              case 3:
-                setLoading(false);
+                case 3:
+                  setLoading(false);
 
-              case 4:
-              case "end":
-                return _context2.stop();
+                case 4:
+                case "end":
+                  return _context2.stop();
+              }
             }
-          }
-        }, _callee2);
-      }));
+          }, _callee2);
+        }));
+
+        return function (_x2) {
+          return _ref5.apply(this, arguments);
+        };
+      }();
     },
     publishRevision: function publishRevision() {
       return /*#__PURE__*/function () {
@@ -184,51 +199,58 @@ export var useRevision = function useRevision(_ref) {
           }, _callee3);
         }));
 
-        return function (_x) {
+        return function (_x3) {
           return _ref7.apply(this, arguments);
         };
       }();
     },
     unpublishRevision: function unpublishRevision() {
-      return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var _yield$client$mutate2, data, error;
-
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                setLoading(true);
-                _context4.next = 3;
-                return client.mutate({
-                  mutation: UNPUBLISH_REVISION,
-                  variables: {
-                    revision: revision.id
-                  }
-                });
+      return /*#__PURE__*/function () {
+        var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id) {
+          var _yield$client$mutate2, data, error;
 
-              case 3:
-                _yield$client$mutate2 = _context4.sent;
-                data = _yield$client$mutate2.data;
-                setLoading(false);
-                error = data.content.error;
+          return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+            while (1) {
+              switch (_context4.prev = _context4.next) {
+                case 0:
+                  setLoading(true);
+                  _context4.next = 3;
+                  return client.mutate({
+                    mutation: UNPUBLISH_REVISION,
+                    variables: {
+                      revision: id || revision.id
+                    }
+                  });
+
+                case 3:
+                  _yield$client$mutate2 = _context4.sent;
+                  data = _yield$client$mutate2.data;
+                  setLoading(false);
+                  error = data.content.error;
 
-                if (!error) {
-                  _context4.next = 9;
-                  break;
-                }
+                  if (!error) {
+                    _context4.next = 10;
+                    break;
+                  }
 
-                return _context4.abrupt("return", showSnackbar(error.message));
+                  showSnackbar(error.message);
+                  return _context4.abrupt("return");
 
-              case 9:
-                showSnackbar( /*#__PURE__*/React.createElement("span", null, "Successfully unpublished revision ", /*#__PURE__*/React.createElement("strong", null, "#", revision.meta.version), "!"));
+                case 10:
+                  showSnackbar( /*#__PURE__*/React.createElement("span", null, "Successfully unpublished revision", " ", /*#__PURE__*/React.createElement("strong", null, "#", revision.meta.version), "!"));
 
-              case 10:
-              case "end":
-                return _context4.stop();
+                case 11:
+                case "end":
+                  return _context4.stop();
+              }
             }
-          }
-        }, _callee4);
-      }));
+          }, _callee4);
+        }));
+
+        return function (_x4) {
+          return _ref9.apply(this, arguments);
+        };
+      }();
     },
     requestReview: function requestReview() {
       return /*#__PURE__*/function () {
@@ -267,7 +289,7 @@ export var useRevision = function useRevision(_ref) {
           }, _callee5);
         }));
 
-        return function (_x2) {
+        return function (_x5) {
           return _ref10.apply(this, arguments);
         };
       }();
@@ -309,7 +331,7 @@ export var useRevision = function useRevision(_ref) {
           }, _callee6);
         }));
 
-        return function (_x3) {
+        return function (_x6) {
           return _ref12.apply(this, arguments);
         };
       }();

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

@@ -8,5 +8,4 @@ declare global {
         }
     }
 }
-declare const ContentEntry: () => JSX.Element;
-export default ContentEntry;
+export declare const ContentEntry: React.FC;

package/admin/views/contentEntries/ContentEntry.js

@@ -43,8 +43,7 @@ var RenderBlock = /*#__PURE__*/styled("div", {
 var elevationStyles = /*#__PURE__*/css({
   position: "relative"
 }, "label:elevationStyles;");
-
-var ContentEntry = function ContentEntry() {
+export var ContentEntry = function ContentEntry() {
   var _useContentEntry = useContentEntry(),
       contentModel = _useContentEntry.contentModel,
       loading = _useContentEntry.loading,
@@ -95,6 +94,4 @@ var ContentEntry = function ContentEntry() {
     disabled: loading,
     "data-testid": "cms.content-form.tabs.revisions"
   }, /*#__PURE__*/React.createElement(RevisionsList, null)))));
-};
-
-export default ContentEntry;
+};

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

@@ -4,13 +4,10 @@ export declare function useContentEntriesList(): {
     contentModel: import("../../../../types").CmsEditorContentModel;
     listQueryVariables: import("../ContentEntriesContext").ListQueryVariables;
     setListQueryVariables: import("react").Dispatch<import("react").SetStateAction<import("../ContentEntriesContext").ListQueryVariables>>;
-    sorters: {
-        label: string;
-        value: string;
-    }[];
+    sorters: import("../ContentEntriesContext").CmsEntriesSorter[];
     id: string;
     loading: boolean;
-    data: any;
+    data: CmsEditorContentEntry[];
     loadMore: () => void;
     loadMoreLoading: boolean;
     canCreate: boolean;

package/admin/views/contentModelGroups/ContentModelGroups.d.ts

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

package/admin/views/contentModelGroups/ContentModelGroups.js

@@ -4,7 +4,7 @@ import { SplitView, LeftPanel, RightPanel } from "@webiny/app-admin/components/S
 import ContentModelGroupsDataList from "./ContentModelGroupsDataList";
 import ContentModelGroupsForm from "./ContentModelGroupsForm";
 
-function ContentModelGroups() {
+var ContentModelGroups = function ContentModelGroups() {
   var _useSecurity = useSecurity(),
       identity = _useSecurity.identity;
 
@@ -30,6 +30,6 @@ function ContentModelGroups() {
   }, /*#__PURE__*/React.createElement(ContentModelGroupsForm, {
     canCreate: canCreate
   })));
-}
+};
 
 export default ContentModelGroups;

package/admin/views/contentModelGroups/ContentModelGroupsDataList.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
-declare type ContentModelGroupsDataListProps = {
+import React from "react";
+interface ContentModelGroupsDataListProps {
     canCreate: boolean;
-};
-declare const ContentModelGroupsDataList: ({ canCreate }: ContentModelGroupsDataListProps) => JSX.Element;
+}
+declare const ContentModelGroupsDataList: React.FC<ContentModelGroupsDataListProps>;
 export default ContentModelGroupsDataList;

package/admin/views/contentModelGroups/ContentModelGroupsDataList.js

@@ -24,30 +24,22 @@ import { Select } from "@webiny/ui/Select";
 import SearchUI from "@webiny/app-admin/components/SearchUI";
 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 { deserializeSorters } from "../utils";
 import usePermission from "../../hooks/usePermission";
 import { Tooltip } from "@webiny/ui/Tooltip";
 var t = i18n.ns("app-headless-cms/admin/content-model-groups/data-list");
 var SORTERS = [{
   label: t(_templateObject || (_templateObject = _taggedTemplateLiteral(["Newest to oldest"]))),
-  sorters: {
-    createdOn: "desc"
-  }
+  sorters: "createdOn_DESC"
 }, {
   label: t(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["Oldest to newest"]))),
-  sorters: {
-    createdOn: "asc"
-  }
+  sorters: "createdOn_ASC"
 }, {
   label: t(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["Name A-Z"]))),
-  sorters: {
-    name: "asc"
-  }
+  sorters: "name_ASC"
 }, {
   label: t(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["Name Z-A"]))),
-  sorters: {
-    name: "desc"
-  }
+  sorters: "name_DESC"
 }];
 
 var ContentModelGroupsDataList = function ContentModelGroupsDataList(_ref) {
@@ -58,7 +50,7 @@ var ContentModelGroupsDataList = function ContentModelGroupsDataList(_ref) {
       filter = _useState2[0],
       setFilter = _useState2[1];
 
-  var _useState3 = useState(serializeSorters(SORTERS[0].sorters)),
+  var _useState3 = useState(SORTERS[0].sorters),
       _useState4 = _slicedToArray(_useState3, 2),
       sort = _useState4[0],
       setSort = _useState4[1];
@@ -89,13 +81,12 @@ var ContentModelGroupsDataList = function ContentModelGroupsDataList(_ref) {
       return list;
     }
 
-    var _Object$entries = Object.entries(deserializeSorters(sort)),
-        _Object$entries2 = _slicedToArray(_Object$entries, 1),
-        _Object$entries2$ = _slicedToArray(_Object$entries2[0], 2),
-        key = _Object$entries2$[0],
-        value = _Object$entries2$[1];
+    var _deserializeSorters = deserializeSorters(sort),
+        _deserializeSorters2 = _slicedToArray(_deserializeSorters, 2),
+        sortField = _deserializeSorters2[0],
+        sortOrderBy = _deserializeSorters2[1];
 
-    return orderBy(list, [key], [value]);
+    return orderBy(list, [sortField], [sortOrderBy]);
   }, [sort]);
   var data = listQuery.loading ? [] : get(listQuery, "data.listContentModelGroups.data", []);
   var groupId = new URLSearchParams(location.search).get("id");
@@ -117,6 +108,7 @@ var ContentModelGroupsDataList = function ContentModelGroupsDataList(_ref) {
                   var error = data.deleteContentModelGroup.error;
 
                   if (error) {
+                    showSnackbar(error.message);
                     return;
                   } // Delete the item from list cache
 
@@ -181,7 +173,7 @@ var ContentModelGroupsDataList = function ContentModelGroupsDataList(_ref) {
           sorters = _ref5.sorters;
       return /*#__PURE__*/React.createElement("option", {
         key: label,
-        value: serializeSorters(sorters)
+        value: sorters
       }, label);
     })))));
   }, [sort]);

package/admin/views/contentModelGroups/ContentModelGroupsForm.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
-declare type ContentModelGroupsFormProps = {
+import React from "react";
+interface ContentModelGroupsFormProps {
     canCreate: boolean;
-};
-declare function ContentModelGroupsForm({ canCreate }: ContentModelGroupsFormProps): JSX.Element;
+}
+declare const ContentModelGroupsForm: React.FC<ContentModelGroupsFormProps>;
 export default ContentModelGroupsForm;