npm - @webiny/app-website-builder - Versions diffs - 6.5.0-beta.1 → 6.5.0-beta.10 - Mend

@webiny/app-website-builder 6.5.0-beta.1 → 6.5.0-beta.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (153) hide show

package/presentation/pages/PageEditor/Revisions/RevisionListItem.js CHANGED Viewed

@@ -11,7 +11,6 @@ import { ReactComponent as visibility_off_svg_ReactComponent } from "@webiny/ico
 import { ReactComponent as delete_svg_ReactComponent } from "@webiny/icons/delete.svg";
 import { useRevision } from "./useRevision.js";
 import { i18n } from "@webiny/app/i18n/index.js";
-import { HasPermission } from "../../../security/HasPermission.js";
 const DateDisplay = ({ date })=>{
     const formatted = react.useMemo(()=>{
         const d = new globalThis.Date(date);
@@ -59,7 +58,8 @@ const getIcon = (revision)=>{
             };
     }
 };
-const RevisionListItem = ({ revision })=>{
+const RevisionListItem = ({ item })=>{
+    const { revision } = item;
     const { createRevision, editRevision, deleteRevision, unpublishRevision, publishRevision } = useRevision({
         revision
     });
@@ -93,44 +93,33 @@ const RevisionListItem = ({ revision })=>{
                 icon: /*#__PURE__*/ react.createElement(ReactComponent, null)
             }),
             "data-testid": "page.revisions.more-options"
-        }, /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(HasPermission, {
-            entity: "page",
-            action: "edit"
-        }, /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
+        }, /*#__PURE__*/ react.createElement(react.Fragment, null, item.canCreateFrom ? /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
             onClick: ()=>createRevision(),
             "data-testid": "page.revisioncreate-revision",
             icon: /*#__PURE__*/ react.createElement(add_svg_ReactComponent, null),
             text: t`New revision from current`
-        }), revision.locked ? null : /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
+        }) : null, item.canEdit ? /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
             onClick: ()=>{
                 editRevision();
             },
             icon: /*#__PURE__*/ react.createElement(edit_svg_ReactComponent, null),
             text: t`Edit revision`
-        })), /*#__PURE__*/ react.createElement(HasPermission, {
-            entity: "page",
-            action: "publish"
-        }, "published" !== revision.status ? /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
+        }) : null, item.canPublish ? /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
             onClick: ()=>publishRevision(),
+            "data-testid": "page.revisionpublish",
             icon: /*#__PURE__*/ react.createElement(visibility_svg_ReactComponent, null),
             text: t`Publish revision`
-        }) : null), /*#__PURE__*/ react.createElement(HasPermission, {
-            entity: "page",
-            action: "unpublish"
-        }, "published" === revision.status ? /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
+        }) : null, item.canUnpublish ? /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
             onClick: ()=>unpublishRevision(),
             "data-testid": "page.revisionunpublish",
             icon: /*#__PURE__*/ react.createElement(visibility_off_svg_ReactComponent, null),
             text: t`Unpublish revision`
-        }) : null), /*#__PURE__*/ react.createElement(HasPermission, {
-            entity: "page",
-            action: "delete"
-        }, revision.locked ? null : /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(DropdownMenu.Separator, null), /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
+        }) : null, item.canDelete ? /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(DropdownMenu.Separator, null), /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
             onClick: ()=>deleteRevision(),
             icon: /*#__PURE__*/ react.createElement(delete_svg_ReactComponent, null),
             text: t`Delete revision`,
             variant: "destructive"
-        })))))
+        })) : null))
     });
 };
 const Revisions_RevisionListItem = RevisionListItem;

package/presentation/pages/PageEditor/Revisions/RevisionListItem.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"presentation/pages/PageEditor/Revisions/RevisionListItem.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/RevisionListItem.tsx"],"sourcesContent":["import React from \"react\";\nconst DateDisplay = ({ date }: { date: string }) => {\n const formatted = React.useMemo(() => {\n const d = new globalThis.Date(date);\n if (isNaN(d.getTime())) {\n return \"\";\n }\n return new Intl.DateTimeFormat(navigator.language, {\n day: \"numeric\",\n month: \"long\",\n year: \"numeric\"\n }).format(d);\n }, [date]);\n return <>{formatted}</>;\n};\nimport { DropdownMenu, Icon, IconButton, List, Text, Tooltip } from \"@webiny/admin-ui\";\nimport { ReactComponent as MoreVerticalIcon } from \"@webiny/icons/more_vert.svg\";\nimport { ReactComponent as LockIcon } from \"@webiny/icons/lock.svg\";\nimport { ReactComponent as BeenHereIcon } from \"@webiny/icons/beenhere.svg\";\nimport { ReactComponent as GestureIcon } from \"@webiny/icons/gesture.svg\";\nimport { ReactComponent as AddIcon } from \"@webiny/icons/add.svg\";\nimport { ReactComponent as EditIcon } from \"@webiny/icons/edit.svg\";\nimport { ReactComponent as PublishIcon } from \"@webiny/icons/visibility.svg\";\nimport { ReactComponent as UnpublishIcon } from \"@webiny/icons/visibility_off.svg\";\nimport { ReactComponent as DeleteIcon } from \"@webiny/icons/delete.svg\";\nimport { useRevision } from \"./useRevision.js\";\nimport type { PageRevision } from \"~/domain/PageRevision/index.js\";\nimport { i18n } from \"@webiny/app/i18n/index.js\";\nimport { HasPermission } from \"~/presentation/security/HasPermission.js\";\n\nconst t = i18n.ns(\"app-website-builder/modules/Pages/PageEditor/Revisions\");\n\nconst getIcon = (revision: PageRevision) => {\n switch (true) {\n case revision.locked && revision.status !== \"published\":\n return {\n icon: (\n <Icon\n label={\"Locked revision\"}\n icon={<LockIcon />}\n data-testid={\"page.revision.status.locked\"}\n />\n ),\n text: \"This revision is locked (it has already been published)\"\n };\n case revision.status === \"published\":\n return {\n icon: (\n <Icon\n label=\"Published revision\"\n icon={<BeenHereIcon />}\n color={\"accent\"}\n data-testid={\"page.revision.status.published\"}\n />\n ),\n text: \"This revision is currently published!\"\n };\n default:\n return {\n icon: (\n <Icon\n label={\"Draft revision\"}\n icon={<GestureIcon />}\n data-testid={\"page.revision.status.draft\"}\n />\n ),\n text: \"This is a draft\"\n };\n }\n};\n\ninterface RevisionListItemProps {\n revision: PageRevision;\n}\n\nconst RevisionListItem = ({ revision }: RevisionListItemProps) => {\n const { createRevision, editRevision, deleteRevision, unpublishRevision, publishRevision } =\n useRevision({\n revision\n });\n\n const { icon, text: tooltipText } = getIcon(revision);\n\n return (\n <List.Item\n icon={<Tooltip content={tooltipText} trigger={icon} />}\n title={revision.title \|\| t`N/A`}\n description={\n <>\n {revision.revisionDescription ? (\n <Text as={\"div\"} size={\"md\"} className={\"mb-2\"}>\n {revision.revisionDescription}\n </Text>\n ) : null}\n <Text as={\"div\"} size={\"sm\"}>\n {t`Last modified by {author} on {time} (#{version})`({\n // Added this because revisionCreatedBy can be returned as null from GraphQL.\n author: revision.createdBy?.displayName,\n time: <DateDisplay date={revision.savedOn} />,\n version: revision.version\n })}\n </Text>\n </>\n }\n about={revision.revisionDescription}\n actions={\n <DropdownMenu\n trigger={\n <IconButton\n variant={\"ghost\"}\n size={\"sm\"}\n iconSize={\"lg\"}\n icon={<MoreVerticalIcon />}\n />\n }\n data-testid={\"page.revisions.more-options\"}\n >\n <>\n <HasPermission entity={\"page\"} action={\"edit\"}>\n <DropdownMenu.Item\n onClick={() => createRevision()}\n data-testid={\"page.revisioncreate-revision\"}\n icon={<AddIcon />}\n text={t`New revision from current`}\n />\n {!revision.locked ? (\n <DropdownMenu.Item\n onClick={() => {\n editRevision();\n }}\n icon={<EditIcon />}\n text={t`Edit revision`}\n />\n ) : null}\n </HasPermission>\n\n <HasPermission entity={\"page\"} action={\"publish\"}>\n {revision.status !== \"published\" ? (\n <DropdownMenu.Item\n onClick={() => publishRevision()}\n icon={<PublishIcon />}\n text={t`Publish revision`}\n />\n ) : null}\n </HasPermission>\n\n <HasPermission entity={\"page\"} action={\"unpublish\"}>\n {revision.status === \"published\" ? (\n <DropdownMenu.Item\n onClick={() => unpublishRevision()}\n data-testid={\"page.revisionunpublish\"}\n icon={<UnpublishIcon />}\n text={t`Unpublish revision`}\n />\n ) : null}\n </HasPermission>\n\n <HasPermission entity={\"page\"} action={\"delete\"}>\n {!revision.locked ? (\n <>\n <DropdownMenu.Separator />\n <DropdownMenu.Item\n onClick={() => deleteRevision()}\n icon={<DeleteIcon />}\n text={t`Delete revision`}\n variant={\"destructive\"}\n />\n </>\n ) : null}\n </HasPermission>\n </>\n </DropdownMenu>\n }\n />\n );\n};\n\nexport default RevisionListItem;\n"],"names":["DateDisplay","date","formatted","React","d","globalThis","isNaN","Intl","navigator","t","i18n","getIcon","revision","Icon","LockIcon","BeenHereIcon","GestureIcon","RevisionListItem","createRevision","editRevision","deleteRevision","unpublishRevision","publishRevision","useRevision","icon","tooltipText","List","Tooltip","Text","DropdownMenu","IconButton","MoreVerticalIcon","HasPermission","AddIcon","EditIcon","PublishIcon","UnpublishIcon","DeleteIcon"],"mappings":"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"}
1	+ {"version":3,"file":"presentation/pages/PageEditor/Revisions/RevisionListItem.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/RevisionListItem.tsx"],"sourcesContent":["import React from \"react\";\nconst DateDisplay = ({ date }: { date: string }) => {\n const formatted = React.useMemo(() => {\n const d = new globalThis.Date(date);\n if (isNaN(d.getTime())) {\n return \"\";\n }\n return new Intl.DateTimeFormat(navigator.language, {\n day: \"numeric\",\n month: \"long\",\n year: \"numeric\"\n }).format(d);\n }, [date]);\n return <>{formatted}</>;\n};\nimport { DropdownMenu, Icon, IconButton, List, Text, Tooltip } from \"@webiny/admin-ui\";\nimport { ReactComponent as MoreVerticalIcon } from \"@webiny/icons/more_vert.svg\";\nimport { ReactComponent as LockIcon } from \"@webiny/icons/lock.svg\";\nimport { ReactComponent as BeenHereIcon } from \"@webiny/icons/beenhere.svg\";\nimport { ReactComponent as GestureIcon } from \"@webiny/icons/gesture.svg\";\nimport { ReactComponent as AddIcon } from \"@webiny/icons/add.svg\";\nimport { ReactComponent as EditIcon } from \"@webiny/icons/edit.svg\";\nimport { ReactComponent as PublishIcon } from \"@webiny/icons/visibility.svg\";\nimport { ReactComponent as UnpublishIcon } from \"@webiny/icons/visibility_off.svg\";\nimport { ReactComponent as DeleteIcon } from \"@webiny/icons/delete.svg\";\nimport { useRevision } from \"./useRevision.js\";\nimport type { PageRevision } from \"~/domain/PageRevision/index.js\";\nimport { i18n } from \"@webiny/app/i18n/index.js\";\nimport type { RevisionListPresenter } from \"~/presentation/pages/RevisionList/abstractions.js\";\n\nconst t = i18n.ns(\"app-website-builder/modules/Pages/PageEditor/Revisions\");\n\nconst getIcon = (revision: PageRevision) => {\n switch (true) {\n case revision.locked && revision.status !== \"published\":\n return {\n icon: (\n <Icon\n label={\"Locked revision\"}\n icon={<LockIcon />}\n data-testid={\"page.revision.status.locked\"}\n />\n ),\n text: \"This revision is locked (it has already been published)\"\n };\n case revision.status === \"published\":\n return {\n icon: (\n <Icon\n label=\"Published revision\"\n icon={<BeenHereIcon />}\n color={\"accent\"}\n data-testid={\"page.revision.status.published\"}\n />\n ),\n text: \"This revision is currently published!\"\n };\n default:\n return {\n icon: (\n <Icon\n label={\"Draft revision\"}\n icon={<GestureIcon />}\n data-testid={\"page.revision.status.draft\"}\n />\n ),\n text: \"This is a draft\"\n };\n }\n};\n\ninterface RevisionListItemProps {\n item: RevisionListPresenter.ItemViewModel;\n}\n\nconst RevisionListItem = ({ item }: RevisionListItemProps) => {\n const { revision } = item;\n const { createRevision, editRevision, deleteRevision, unpublishRevision, publishRevision } =\n useRevision({\n revision\n });\n\n const { icon, text: tooltipText } = getIcon(revision);\n\n return (\n <List.Item\n icon={<Tooltip content={tooltipText} trigger={icon} />}\n title={revision.title \|\| t`N/A`}\n description={\n <>\n {revision.revisionDescription ? (\n <Text as={\"div\"} size={\"md\"} className={\"mb-2\"}>\n {revision.revisionDescription}\n </Text>\n ) : null}\n <Text as={\"div\"} size={\"sm\"}>\n {t`Last modified by {author} on {time} (#{version})`({\n // Added this because revisionCreatedBy can be returned as null from GraphQL.\n author: revision.createdBy?.displayName,\n time: <DateDisplay date={revision.savedOn} />,\n version: revision.version\n })}\n </Text>\n </>\n }\n about={revision.revisionDescription}\n actions={\n <DropdownMenu\n trigger={\n <IconButton\n variant={\"ghost\"}\n size={\"sm\"}\n iconSize={\"lg\"}\n icon={<MoreVerticalIcon />}\n />\n }\n data-testid={\"page.revisions.more-options\"}\n >\n <>\n {item.canCreateFrom ? (\n <DropdownMenu.Item\n onClick={() => createRevision()}\n data-testid={\"page.revisioncreate-revision\"}\n icon={<AddIcon />}\n text={t`New revision from current`}\n />\n ) : null}\n\n {item.canEdit ? (\n <DropdownMenu.Item\n onClick={() => {\n editRevision();\n }}\n icon={<EditIcon />}\n text={t`Edit revision`}\n />\n ) : null}\n\n {item.canPublish ? (\n <DropdownMenu.Item\n onClick={() => publishRevision()}\n data-testid={\"page.revisionpublish\"}\n icon={<PublishIcon />}\n text={t`Publish revision`}\n />\n ) : null}\n\n {item.canUnpublish ? (\n <DropdownMenu.Item\n onClick={() => unpublishRevision()}\n data-testid={\"page.revisionunpublish\"}\n icon={<UnpublishIcon />}\n text={t`Unpublish revision`}\n />\n ) : null}\n\n {item.canDelete ? (\n <>\n <DropdownMenu.Separator />\n <DropdownMenu.Item\n onClick={() => deleteRevision()}\n icon={<DeleteIcon />}\n text={t`Delete revision`}\n variant={\"destructive\"}\n />\n </>\n ) : null}\n </>\n </DropdownMenu>\n }\n />\n );\n};\n\nexport default RevisionListItem;\n"],"names":["DateDisplay","date","formatted","React","d","globalThis","isNaN","Intl","navigator","t","i18n","getIcon","revision","Icon","LockIcon","BeenHereIcon","GestureIcon","RevisionListItem","item","createRevision","editRevision","deleteRevision","unpublishRevision","publishRevision","useRevision","icon","tooltipText","List","Tooltip","Text","DropdownMenu","IconButton","MoreVerticalIcon","AddIcon","EditIcon","PublishIcon","UnpublishIcon","DeleteIcon"],"mappings":"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"}

package/presentation/pages/PageEditor/Revisions/RevisionsList.js CHANGED Viewed

@@ -1,29 +1,17 @@
-import react, { useEffect, useState } from "react";
+import react from "react";
 import { List, OverlayLoader } from "@webiny/admin-ui";
 import RevisionListItem from "./RevisionListItem.js";
-import { useGetPageRevisions } from "../../hooks/useGetPageRevisions.js";
-import { parseIdentifier } from "@webiny/utils/parseIdentifier.js";
+import { useRevisionList } from "./useRevisionList.js";
 const RevisionsList = (props)=>{
     const { page } = props;
-    const [revisions, setRevisions] = useState([]);
-    const { loading, getPageRevisions } = useGetPageRevisions();
-    useEffect(()=>{
-        const { id: entryId } = parseIdentifier(page.id);
-        getPageRevisions({
-            entryId
-        }).then((revisions)=>{
-            setRevisions(revisions.sort((a, b)=>new Date(a.savedOn).getTime() - new Date(b.savedOn).getTime()).reverse());
-        });
-    }, [
-        page.id
-    ]);
+    const { vm } = useRevisionList(page.id);
     return /*#__PURE__*/ react.createElement("div", {
         className: "relative"
-    }, loading && /*#__PURE__*/ react.createElement(OverlayLoader, null), revisions?.length ? /*#__PURE__*/ react.createElement(List, {
+    }, (vm.isLoading || vm.isMutating) && /*#__PURE__*/ react.createElement(OverlayLoader, null), vm.revisions.length ? /*#__PURE__*/ react.createElement(List, {
         "data-testid": "cms.content-form.revisions"
-    }, revisions.map((revision)=>/*#__PURE__*/ react.createElement(RevisionListItem, {
-            revision: revision,
-            key: revision.id
+    }, vm.revisions.map((item)=>/*#__PURE__*/ react.createElement(RevisionListItem, {
+            item: item,
+            key: item.revision.id
         }))) : /*#__PURE__*/ react.createElement("div", {
         className: "p-lg"
     }, "No revisions to show."));

package/presentation/pages/PageEditor/Revisions/RevisionsList.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"presentation/pages/PageEditor/Revisions/RevisionsList.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/RevisionsList.tsx"],"sourcesContent":["import React, ~~{ useEffect, useState }~~ from \"react\";\nimport { List, OverlayLoader } from \"@webiny/admin-ui\";\nimport RevisionListItem from \"./RevisionListItem.js\";\nimport type { Page } from \"~/domain/Page/index.js\";\nimport ~~type~~ { ~~PageRevision~~ } from \"~~~/domain/PageRevision/index~~.js\";\~~nimport { useGetPageRevisions } from \"~/presentation/pages/hooks/useGetPageRevisions.js\";\nimport { parseIdentifier } from \"@webiny/utils/parseIdentifier.js\";\~~n\ninterface IRevisionsListProps {\n page: Pick<Page, \"id\">;\n}\n\nexport const RevisionsList = (props: IRevisionsListProps) => {\n const { page } = props;\n\n const ~~[revisions, setRevisions] = useState<PageRevision[]>([]);\n const~~ { ~~loading,~~ ~~getPageRevisions~~ } = ~~useGetPageRevisions~~(~~);\n\n useEffect(() => {\n const { id: entryId } = parseIdentifier(~~page.id);\n ~~getPageRevisions({~~\n entryId\n }).then(revisions => {\n setRevisions(\n revisions\n .sort((a, b) => {\n return new Date(a.savedOn).getTime() - new Date(b.savedOn).getTime();\n })\n .reverse()\n );\n });\n ~~}, [page.id]);\n\n~~ return (\n <div className={\"relative\"}>\n {~~loading~~ && <OverlayLoader />}\n {revisions?.length ? (\n <List data-testid={\"cms.content-form.revisions\"}>\n {revisions.map(~~revision~~ => (\n <RevisionListItem ~~revision~~={~~revision~~} key={revision.id} />\n ))}\n </List>\n ) : (\n <div className={\"p-lg\"}>No revisions to show.</div>\n )}\n </div>\n );\n};\n"],"names":["RevisionsList","props","page","~~revisions~~","~~setRevisions~~","~~useState","loading","getPageRevisions","useGetPageRevisions","useEffect","entryId","parseIdentifier","a","b","Date","~~OverlayLoader","List","~~revision~~","RevisionListItem"],"mappings":"~~;;;;;AAYO~~,MAAMA,gBAAgB,CAACC;IAC1B,MAAM,EAAEC,IAAI,EAAE,GAAGD;~~IAEjB~~,MAAM,~~CAACE~~,~~WAAWC,aAAa,GAAGC,SAAyB,~~EAAE~~;IAC7D~~,~~MAAM,EAAEC,OAAO,EAAEC,gBAAgB,~~EAAE,GAAGC~~;IAEtCC~~,~~UAAU;QACN~~,~~MAAM~~,EAAE,~~IAAIC,~~OAAO,~~EAAE~~,~~GAAGC~~,~~gBAAgBT,KAAK,EAAE~~;~~QAC/CK~~,~~iBAAiB~~;~~YACbG;QACJ~~,~~GAAG~~,~~IAAI,CAACP,~~CAAAA~~;YACJC~~,~~aACID~~,~~UACK~~,~~IAAI~~,~~CAAC~~,~~CAACS~~,~~GAAGC~~,~~IACC~~,~~IAAIC~~,~~KAAKF~~,~~EAAE~~,~~OAAO~~,~~EAAE~~,~~OAAO~~,~~KAAK,IAAIE,KAAKD,EAAE,OAAO,EAAE,OAAO,IAErE,OAAO;QAEpB;IACJ,~~GAAG~~;QAACX~~,~~KAAK~~,~~EAAE;KAAC;IAEZ~~,~~OAAO~~,~~WAAP,GACI,oBAAC~~;~~QAAI~~,~~WAAW~~;~~OACXI~~,~~WAAW~~,~~WAAXA,GAAW,oBAACS,eAAaA,OACzBZ,WAAW,~~SAAS,~~WAAT~~,~~GACR,oBAACa,MAAIA;QAAC,eAAa;OACdb,UAAU,~~GAAG,~~CAACc~~,CAAAA,~~WAAAA~~,WAAAA,~~GACX~~,oBAACC,kBAAgBA;YAAC,~~UAAUD~~;~~YAAU~~,KAAKA,~~SAAS~~,EAAE;~~6BAI9D~~,oBAAC;QAAI,WAAW;OAAQ;AAIxC"}
1	+ {"version":3,"file":"presentation/pages/PageEditor/Revisions/RevisionsList.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/RevisionsList.tsx"],"sourcesContent":["import React from \"react\";\nimport { List, OverlayLoader } from \"@webiny/admin-ui\";\nimport RevisionListItem from \"./RevisionListItem.js\";\nimport type { Page } from \"~/domain/Page/index.js\";\nimport { useRevisionList } from \"./useRevisionList.js\";\n\ninterface IRevisionsListProps {\n page: Pick<Page, \"id\">;\n}\n\nexport const RevisionsList = (props: IRevisionsListProps) => {\n const { page } = props;\n const { vm } = useRevisionList(page.id);\n\n return (\n <div className={\"relative\"}>\n {(vm.isLoading \|\| vm.isMutating) && <OverlayLoader />}\n {vm.revisions.length ? (\n <List data-testid={\"cms.content-form.revisions\"}>\n {vm.revisions.map(item => (\n <RevisionListItem item={item} key={item.revision.id} />\n ))}\n </List>\n ) : (\n <div className={\"p-lg\"}>No revisions to show.</div>\n )}\n </div>\n );\n};\n"],"names":["RevisionsList","props","page","vm","useRevisionList","OverlayLoader","List","item","RevisionListItem"],"mappings":";;;;AAUO,MAAMA,gBAAgB,CAACC;IAC1B,MAAM,EAAEC,IAAI,EAAE,GAAGD;IACjB,MAAM,EAAEE,EAAE,EAAE,GAAGC,gBAAgBF,KAAK,EAAE;IAEtC,OAAO,WAAP,GACI,oBAAC;QAAI,WAAW;OACVC,AAAAA,CAAAA,GAAG,SAAS,IAAIA,GAAG,UAAS,mBAAM,oBAACE,eAAaA,OACjDF,GAAG,SAAS,CAAC,MAAM,GAAG,WAAH,GAChB,oBAACG,MAAIA;QAAC,eAAa;OACdH,GAAG,SAAS,CAAC,GAAG,CAACI,CAAAA,OAAAA,WAAAA,GACd,oBAACC,kBAAgBA;YAAC,MAAMD;YAAM,KAAKA,KAAK,QAAQ,CAAC,EAAE;6BAI3D,oBAAC;QAAI,WAAW;OAAQ;AAIxC"}

package/presentation/pages/PageEditor/Revisions/useRevision.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ export interface UseRevisionProps {
     revision: PageRevision;
 }
 export declare const useRevision: (props: UseRevisionProps) => {
-    createRevision: () => void;
+    createRevision: () => Promise<void>;
     editRevision: () => void;
     deleteRevision: () => void;
     publishRevision: () => void;

package/presentation/pages/PageEditor/Revisions/useRevision.js CHANGED Viewed

@@ -1,49 +1,119 @@
+import react, { useCallback } from "react";
 import { useCreatePageRevisionFrom, useDeletePageRevision, usePublishPage, useUnpublishPage } from "../../../../features/pages/index.js";
-import { useCallback } from "react";
+import { Text, useToast } from "@webiny/admin-ui";
+import { useDialogs } from "@webiny/app-admin";
+import { ReactComponent } from "@webiny/icons/visibility.svg";
+import { ReactComponent as visibility_off_svg_ReactComponent } from "@webiny/icons/visibility_off.svg";
+import { ReactComponent as delete_svg_ReactComponent } from "@webiny/icons/delete.svg";
 import { Routes } from "../../../../routes.js";
 import { useRouter } from "@webiny/app";
+import { usePageEditorDrawer } from "./usePageEditorDrawer.js";
 const useRevision = (props)=>{
     const { revision } = props;
     const { goToRoute } = useRouter();
+    const { openRevisionList } = usePageEditorDrawer();
+    const { showDialog } = useDialogs();
+    const { showSuccessToast, showWarningToast } = useToast();
     const { createPageRevisionFrom } = useCreatePageRevisionFrom();
     const { deletePageRevision } = useDeletePageRevision();
     const { publishPage } = usePublishPage();
     const { unpublishPage } = useUnpublishPage();
-    const createRevision = useCallback(()=>{
-        createPageRevisionFrom({
+    const createRevision = useCallback(async ()=>{
+        await createPageRevisionFrom({
             id: revision.id
         });
     }, [
         revision.id
     ]);
     const deleteRevision = useCallback(()=>{
-        deletePageRevision({
-            id: revision.id,
-            permanently: true
+        showDialog({
+            title: "Delete revision",
+            icon: /*#__PURE__*/ react.createElement(delete_svg_ReactComponent, null),
+            content: /*#__PURE__*/ react.createElement(Text, null, `You are about to delete revision #${revision.version}. This cannot be undone. Are you sure you want to continue?`),
+            acceptLabel: "Yes, delete this revision!",
+            cancelLabel: "Cancel",
+            onAccept: async ()=>{
+                try {
+                    await deletePageRevision({
+                        id: revision.id
+                    });
+                    showSuccessToast({
+                        title: `Revision #${revision.version} was deleted successfully!`
+                    });
+                } catch (ex) {
+                    showWarningToast({
+                        title: "Could not delete the revision.",
+                        description: ex.message
+                    });
+                }
+            }
         });
     }, [
-        revision.id
+        revision.id,
+        revision.version
     ]);
     const publishRevision = useCallback(()=>{
-        publishPage({
-            id: revision.id
+        showDialog({
+            title: "Publish revision",
+            icon: /*#__PURE__*/ react.createElement(ReactComponent, null),
+            content: /*#__PURE__*/ react.createElement(Text, null, `You are about to publish revision #${revision.version}. Are you sure you want to continue?`),
+            acceptLabel: "Yes, publish this revision!",
+            cancelLabel: "Cancel",
+            onAccept: async ()=>{
+                try {
+                    await publishPage({
+                        id: revision.id
+                    });
+                    showSuccessToast({
+                        title: `Revision #${revision.version} was published successfully!`
+                    });
+                } catch (ex) {
+                    showWarningToast({
+                        title: "Could not publish the revision.",
+                        description: ex.message
+                    });
+                }
+            }
         });
     }, [
-        revision.id
+        revision.id,
+        revision.version
     ]);
     const unpublishRevision = useCallback(()=>{
-        unpublishPage({
-            id: revision.id
+        showDialog({
+            title: "Unpublish revision",
+            icon: /*#__PURE__*/ react.createElement(visibility_off_svg_ReactComponent, null),
+            content: /*#__PURE__*/ react.createElement(Text, null, `You are about to unpublish revision #${revision.version}, which will take the page off the live website. Are you sure you want to continue?`),
+            acceptLabel: "Yes, unpublish this revision!",
+            cancelLabel: "Cancel",
+            onAccept: async ()=>{
+                try {
+                    await unpublishPage({
+                        id: revision.id
+                    });
+                    showSuccessToast({
+                        title: `Revision #${revision.version} was unpublished successfully!`
+                    });
+                } catch (ex) {
+                    showWarningToast({
+                        title: "Could not unpublish the revision.",
+                        description: ex.message
+                    });
+                }
+            }
         });
     }, [
-        revision.id
+        revision.id,
+        revision.version
     ]);
     const editRevision = useCallback(()=>{
+        openRevisionList(false);
         goToRoute(Routes.Pages.Editor, {
             id: revision.id
         });
     }, [
-        revision.id
+        revision.id,
+        openRevisionList
     ]);
     return {
         createRevision,

package/presentation/pages/PageEditor/Revisions/useRevision.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"presentation/pages/PageEditor/Revisions/useRevision.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/useRevision.tsx"],"sourcesContent":["import type { PageRevision } from \"~/domain/PageRevision/index.js\";\nimport {\n usePublishPage,\n useUnpublishPage,\n useCreatePageRevisionFrom,\n useDeletePageRevision\n} from \"~/features/pages/index.js\";\nimport { useCallback } from \"react\";\nimport { Routes } from \"~/routes.js\";\nimport { useRouter } from \"@webiny/app\";\n\nexport interface UseRevisionProps {\n revision: PageRevision;\n}\n\nexport const useRevision = (props: UseRevisionProps) => {\n const { revision } = props;\n\n const { goToRoute } = useRouter();\n\n const { createPageRevisionFrom } = useCreatePageRevisionFrom();\n const { deletePageRevision } = useDeletePageRevision();\n const { publishPage } = usePublishPage();\n const { unpublishPage } = useUnpublishPage();\n\n const createRevision = useCallback(() => {\n createPageRevisionFrom({\n id: revision.id\n });\n }, [revision.id]);\n\n const deleteRevision = useCallback(() => {\n deletePageRevision({\n id: revision.id,\n ~~permanently~~: ~~true~~\n });\n }, [revision.id]);\n\n const publishRevision = useCallback(() => {\n publishPage({\n id: revision.id\n });\n }, [revision.id]);\n\n const unpublishRevision = useCallback(() => {\n unpublishPage({\n id: revision.id\n });\n }, [revision.id]);\n\n const editRevision = useCallback(() => {\n goToRoute(Routes.Pages.Editor, {\n id: revision.id\n });\n }, [revision.id]);\n\n return {\n createRevision,\n editRevision,\n deleteRevision,\n publishRevision,\n unpublishRevision\n };\n};\n"],"names":["useRevision","props","revision","goToRoute","useRouter","createPageRevisionFrom","useCreatePageRevisionFrom","deletePageRevision","useDeletePageRevision","publishPage","usePublishPage","unpublishPage","useUnpublishPage","createRevision","useCallback","deleteRevision","publishRevision","unpublishRevision","editRevision","Routes"],"mappings":"~~;;;;AAeO~~,MAAMA,cAAc,CAACC;IACxB,MAAM,EAAEC,QAAQ,EAAE,GAAGD;IAErB,MAAM,EAAEE,SAAS,EAAE,GAAGC;~~IAEtB~~,MAAM,EAAEC,sBAAsB,EAAE,GAAGC;IACnC,MAAM,EAAEC,kBAAkB,EAAE,GAAGC;IAC/B,MAAM,EAAEC,WAAW,EAAE,GAAGC;IACxB,MAAM,EAAEC,aAAa,EAAE,GAAGC;IAE1B,MAAMC,iBAAiBC,YAAY;QAC/BT,uBAAuB;~~YACnB~~,~~IAAIH~~,SAAS,EAAE;QACnB;IACJ,GAAG;QAACA,SAAS,EAAE;KAAC;IAEhB,~~MAAMa~~,iBAAiBD,YAAY;QAC/BP,mBAAmB;~~YACf~~,~~IAAIL~~,SAAS,EAAE;~~YACf~~,~~aAAa~~;~~QACjB~~;IACJ,GAAG;~~QAACA~~,SAAS,EAAE;KAAC;~~IAEhB~~,~~MAAMc~~,~~kBAAkBF~~,YAAY;~~QAChCL~~,YAAY;~~YACR~~,~~IAAIP~~,SAAS,EAAE;~~QACnB~~;IACJ,GAAG;~~QAACA~~,SAAS,EAAE;KAAC;~~IAEhB~~,~~MAAMe~~,~~oBAAoBH~~,YAAY;~~QAClCH~~,cAAc;~~YACV~~,~~IAAIT~~,SAAS,EAAE;~~QACnB~~;IACJ,GAAG;~~QAACA~~,SAAS,EAAE;KAAC;~~IAEhB~~,~~MAAMgB~~,~~eAAeJ~~,YAAY;~~QAC7BX~~,~~UAAUgB~~,OAAO,KAAK,CAAC,MAAM,EAAE;YAC3B,~~IAAIjB~~,SAAS,EAAE;QACnB;IACJ,GAAG;QAACA,SAAS,EAAE;~~KAAC~~;~~IAEhB~~,OAAO;~~QACHW~~;~~QACAK~~;~~QACAH~~;~~QACAC~~;~~QACAC~~;IACJ;AACJ"}
1	+ {"version":3,"file":"presentation/pages/PageEditor/Revisions/useRevision.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/useRevision.tsx"],"sourcesContent":["import React from \"react\";\nimport type { PageRevision } from \"~/domain/PageRevision/index.js\";\nimport {\n usePublishPage,\n useUnpublishPage,\n useCreatePageRevisionFrom,\n useDeletePageRevision\n} from \"~/features/pages/index.js\";\nimport { useCallback } from \"react\";\nimport { Text, useToast } from \"@webiny/admin-ui\";\nimport { useDialogs } from \"@webiny/app-admin\";\nimport { ReactComponent as PublishIcon } from \"@webiny/icons/visibility.svg\";\nimport { ReactComponent as UnpublishIcon } from \"@webiny/icons/visibility_off.svg\";\nimport { ReactComponent as DeleteIcon } from \"@webiny/icons/delete.svg\";\nimport { Routes } from \"~/routes.js\";\nimport { useRouter } from \"@webiny/app\";\nimport { usePageEditorDrawer } from \"./usePageEditorDrawer.js\";\n\nexport interface UseRevisionProps {\n revision: PageRevision;\n}\n\nexport const useRevision = (props: UseRevisionProps) => {\n const { revision } = props;\n\n const { goToRoute } = useRouter();\n const { openRevisionList } = usePageEditorDrawer();\n const { showDialog } = useDialogs();\n const { showSuccessToast, showWarningToast } = useToast();\n\n const { createPageRevisionFrom } = useCreatePageRevisionFrom();\n const { deletePageRevision } = useDeletePageRevision();\n const { publishPage } = usePublishPage();\n const { unpublishPage } = useUnpublishPage();\n\n const createRevision = useCallback(async () => {\n await createPageRevisionFrom({\n id: revision.id\n });\n }, [revision.id]);\n\n const deleteRevision = useCallback(() => {\n showDialog({\n title: \"Delete revision\",\n icon: <DeleteIcon />,\n content: (\n <Text>\n {`You are about to delete revision #${revision.version}. This cannot be undone. Are you sure you want to continue?`}\n </Text>\n ),\n acceptLabel: \"Yes, delete this revision!\",\n cancelLabel: \"Cancel\",\n onAccept: async () => {\n try {\n await deletePageRevision({\n id: revision.id\n });\n\n showSuccessToast({\n title: `Revision #${revision.version} was deleted successfully!`\n });\n } catch (ex) {\n showWarningToast({\n title: \"Could not delete the revision.\",\n description: ex.message\n });\n }\n }\n });\n }, [revision.id, revision.version]);\n\n const publishRevision = useCallback(() => {\n showDialog({\n title: \"Publish revision\",\n icon: <PublishIcon />,\n content: (\n <Text>\n {`You are about to publish revision #${revision.version}. Are you sure you want to continue?`}\n </Text>\n ),\n acceptLabel: \"Yes, publish this revision!\",\n cancelLabel: \"Cancel\",\n onAccept: async () => {\n try {\n await publishPage({\n id: revision.id\n });\n\n showSuccessToast({\n title: `Revision #${revision.version} was published successfully!`\n });\n } catch (ex) {\n showWarningToast({\n title: \"Could not publish the revision.\",\n description: ex.message\n });\n }\n }\n });\n }, [revision.id, revision.version]);\n\n const unpublishRevision = useCallback(() => {\n showDialog({\n title: \"Unpublish revision\",\n icon: <UnpublishIcon />,\n content: (\n <Text>\n {`You are about to unpublish revision #${revision.version}, which will take the page off the live website. Are you sure you want to continue?`}\n </Text>\n ),\n acceptLabel: \"Yes, unpublish this revision!\",\n cancelLabel: \"Cancel\",\n onAccept: async () => {\n try {\n await unpublishPage({\n id: revision.id\n });\n\n showSuccessToast({\n title: `Revision #${revision.version} was unpublished successfully!`\n });\n } catch (ex) {\n showWarningToast({\n title: \"Could not unpublish the revision.\",\n description: ex.message\n });\n }\n }\n });\n }, [revision.id, revision.version]);\n\n const editRevision = useCallback(() => {\n // The drawer lives outside the editor, so it would stay open across the navigation.\n openRevisionList(false);\n\n goToRoute(Routes.Pages.Editor, {\n id: revision.id\n });\n }, [revision.id, openRevisionList]);\n\n return {\n createRevision,\n editRevision,\n deleteRevision,\n publishRevision,\n unpublishRevision\n };\n};\n"],"names":["useRevision","props","revision","goToRoute","useRouter","openRevisionList","usePageEditorDrawer","showDialog","useDialogs","showSuccessToast","showWarningToast","useToast","createPageRevisionFrom","useCreatePageRevisionFrom","deletePageRevision","useDeletePageRevision","publishPage","usePublishPage","unpublishPage","useUnpublishPage","createRevision","useCallback","deleteRevision","DeleteIcon","Text","ex","publishRevision","PublishIcon","unpublishRevision","UnpublishIcon","editRevision","Routes"],"mappings":"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"}

package/presentation/pages/PageEditor/Revisions/useRevisionList.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export declare const useRevisionList: (pageId: string) => {
+    vm: import("../../RevisionList").IRevisionListVm;
+};

package/presentation/pages/PageEditor/Revisions/useRevisionList.js ADDED Viewed

@@ -0,0 +1,31 @@
+import { useEffect, useMemo, useState } from "react";
+import { autorun } from "mobx";
+import { useFeature } from "@webiny/app";
+import { parseIdentifier } from "@webiny/utils/parseIdentifier.js";
+import { RevisionListFeature } from "../../RevisionList/feature.js";
+const useRevisionList = (pageId)=>{
+    const { presenter } = useFeature(RevisionListFeature);
+    const { id: entryId } = useMemo(()=>parseIdentifier(pageId), [
+        pageId
+    ]);
+    useEffect(()=>{
+        presenter.init({
+            entryId
+        });
+    }, [
+        entryId,
+        presenter
+    ]);
+    const [vm, setVm] = useState(presenter.vm);
+    useEffect(()=>autorun(()=>{
+            setVm(presenter.vm);
+        }), [
+        presenter
+    ]);
+    return {
+        vm
+    };
+};
+export { useRevisionList };
+//# sourceMappingURL=useRevisionList.js.map

package/presentation/pages/PageEditor/Revisions/useRevisionList.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"presentation/pages/PageEditor/Revisions/useRevisionList.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/useRevisionList.ts"],"sourcesContent":["import { useEffect, useMemo, useState } from \"react\";\nimport { autorun } from \"mobx\";\nimport { useFeature } from \"@webiny/app\";\nimport { parseIdentifier } from \"@webiny/utils/parseIdentifier.js\";\nimport { RevisionListFeature } from \"~/presentation/pages/RevisionList/feature.js\";\n\nexport const useRevisionList = (pageId: string) => {\n const { presenter } = useFeature(RevisionListFeature);\n\n const { id: entryId } = useMemo(() => parseIdentifier(pageId), [pageId]);\n\n useEffect(() => {\n presenter.init({ entryId });\n }, [entryId, presenter]);\n\n const [vm, setVm] = useState(presenter.vm);\n\n useEffect(() => {\n return autorun(() => {\n setVm(presenter.vm);\n });\n }, [presenter]);\n\n return { vm };\n};\n"],"names":["useRevisionList","pageId","presenter","useFeature","RevisionListFeature","entryId","useMemo","parseIdentifier","useEffect","vm","setVm","useState","autorun"],"mappings":";;;;;AAMO,MAAMA,kBAAkB,CAACC;IAC5B,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAWC;IAEjC,MAAM,EAAE,IAAIC,OAAO,EAAE,GAAGC,QAAQ,IAAMC,gBAAgBN,SAAS;QAACA;KAAO;IAEvEO,UAAU;QACNN,UAAU,IAAI,CAAC;YAAEG;QAAQ;IAC7B,GAAG;QAACA;QAASH;KAAU;IAEvB,MAAM,CAACO,IAAIC,MAAM,GAAGC,SAAST,UAAU,EAAE;IAEzCM,UAAU,IACCI,QAAQ;YACXF,MAAMR,UAAU,EAAE;QACtB,IACD;QAACA;KAAU;IAEd,OAAO;QAAEO;IAAG;AAChB"}

package/presentation/pages/PageEditor/TopBar/PageSettingsDrawer.d.ts CHANGED Viewed

@@ -6,6 +6,6 @@ export interface PageSettingsDrawerProps {
     onClose: () => void;
     onSave: () => void;
 }
-export declare const PageSettingsDrawer: (({ presenter, open, onClose, onSave }: PageSettingsDrawerProps) => React.JSX.Element) & {
-    displayName: string;
+export declare const PageSettingsDrawer: (({ presenter, open, onClose, onSave }: PageSettingsDrawerProps) => React.JSX.Element) & React.NamedExoticComponent<PageSettingsDrawerProps> & {
+    readonly type: ({ presenter, open, onClose, onSave }: PageSettingsDrawerProps) => React.JSX.Element;
 };

package/presentation/pages/PageEditor/TopBar/RevisionsMenu.js CHANGED Viewed

@@ -1,11 +1,11 @@
-import react, { useCallback, useEffect, useState } from "react";
+import react, { useCallback } from "react";
 import { Button, DropdownMenu, Text } from "@webiny/admin-ui";
 import { ReactComponent } from "@webiny/icons/keyboard_arrow_down.svg";
 import { ReactComponent as draw_svg_ReactComponent } from "@webiny/icons/draw.svg";
 import { ReactComponent as lock_svg_ReactComponent } from "@webiny/icons/lock.svg";
 import { ReactComponent as remove_red_eye_svg_ReactComponent } from "@webiny/icons/remove_red_eye.svg";
-import { useGetPageRevisions } from "../../../../features/pages/index.js";
 import { useSelectFromDocument } from "../../../../BaseEditor/hooks/useSelectFromDocument.js";
+import { useRevisionList } from "../Revisions/useRevisionList.js";
 import { useRouter } from "@webiny/app-admin";
 import { Routes } from "../../../../routes.js";
 import { usePageEditorDrawer } from "../Revisions/usePageEditorDrawer.js";
@@ -17,23 +17,11 @@ const statusIcon = {
 };
 const RevisionsMenu = ()=>{
     const { getLink } = useRouter();
-    const [revisions, setRevisions] = useState([]);
-    const { loading, getPageRevisions } = useGetPageRevisions();
     const id = useSelectFromDocument((document)=>document.id);
-    const status = useSelectFromDocument((document)=>document.status);
     const { openRevisionList } = usePageEditorDrawer();
-    useEffect(()=>{
-        const [entryId] = id.split("#");
-        getPageRevisions({
-            entryId
-        }).then((revisions)=>{
-            setRevisions(revisions.sort((a, b)=>new Date(a.savedOn).getTime() - new Date(b.savedOn).getTime()).reverse());
-        });
-    }, [
-        id,
-        status
-    ]);
-    const currentRevision = revisions.find((r)=>r.id === id);
+    const { vm } = useRevisionList(id);
+    const { revisions, isLoading } = vm;
+    const currentRevision = revisions.find((item)=>item.revision.id === id)?.revision;
     const goToRevision = useCallback((id)=>{
         window.location.pathname = getLink(Routes.Pages.Editor, {
             id
@@ -44,13 +32,13 @@ const RevisionsMenu = ()=>{
     }, []);
     return /*#__PURE__*/ react.createElement(DropdownMenu, {
         trigger: /*#__PURE__*/ react.createElement(Button, {
-            disabled: loading,
+            disabled: isLoading,
             variant: "ghost",
             text: currentRevision ? currentRevision.getLabel() : "Loading...",
             icon: /*#__PURE__*/ react.createElement(ReactComponent, null),
             iconPosition: "end"
         })
-    }, revisions.slice(0, 5).map((revision)=>/*#__PURE__*/ react.createElement(Item, {
+    }, revisions.slice(0, 5).map(({ revision })=>/*#__PURE__*/ react.createElement(Item, {
             key: revision.id,
             className: "cursor-pointer",
             onClick: ()=>goToRevision(revision.id),

package/presentation/pages/PageEditor/TopBar/RevisionsMenu.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"presentation/pages/PageEditor/TopBar/RevisionsMenu.js","sources":["../../../../../src/presentation/pages/PageEditor/TopBar/RevisionsMenu.tsx"],"sourcesContent":["import React, { ~~useState, useEffect,~~ useCallback } from \"react\";\nimport { Button, DropdownMenu, Text } from \"@webiny/admin-ui\";\nimport { ReactComponent as ArrowDown } from \"@webiny/icons/keyboard_arrow_down.svg\";\nimport { ReactComponent as Draft } from \"@webiny/icons/draw.svg\";\nimport { ReactComponent as Unpublished } from \"@webiny/icons/lock.svg\";\nimport { ReactComponent as Published } from \"@webiny/icons/remove_red_eye.svg\";\nimport { ~~useGetPageRevisions } from \"~/features/pages/index.js\";\nimport {~~ useSelectFromDocument } from \"~/BaseEditor/hooks/useSelectFromDocument.js\";\nimport ~~type~~ { ~~PageRevision~~ } from \"~/~~domain~~/~~PageRevision~~/~~index~~.js\";\nimport ~~type~~ { ~~EditorPage } from \"@webiny/website-builder-sdk\";\nimport {~~ useRouter } from \"@webiny/app-admin\";\nimport { Routes } from \"~/routes.js\";\nimport { usePageEditorDrawer } from \"~/presentation/pages/PageEditor/Revisions/usePageEditorDrawer.js\";\n\nconst { Item } = DropdownMenu;\n\nconst statusIcon: Record<string, React.JSX.Element> = {\n draft: <Draft />,\n published: <Published />,\n unpublished: <Unpublished />\n};\n\nexport const RevisionsMenu = () => {\n const { getLink } = useRouter();\n const ~~[revisions, setRevisions] = useState<PageRevision[]>([]);\n const { loading, getPageRevisions } = useGetPageRevisions();\n const~~ id = useSelectFromDocument(document => document.id);\n ~~const status = useSelectFromDocument<string, EditorPage>(document => document.status);\n~~\n const { openRevisionList } = usePageEditorDrawer();\n\n ~~useEffect(()~~ => ~~{\n const~~ ~~[entryId]~~ = ~~id.split(\"#\");\n getPageRevisions({~~ ~~entryId }).then(~~revisions ~~=> {\n setRevisions(\n revisions\n .sort((a~~, b) => {\n ~~return~~ ~~new~~ ~~Date(a.savedOn).getTime()~~ - ~~new~~ ~~Date~~(~~b.savedOn~~)~~.getTime()~~;\n ~~})\n .reverse()\n );\n });\n~~ }, ~~[id~~, ~~status])~~;\n\n const currentRevision = revisions.find(r => r.id === id);\n\n const goToRevision = useCallback((id: string) => {\n // TODO: make this work without a full app reload\n window.location.pathname = getLink(Routes.Pages.Editor, { id });\n }, []);\n\n const onOpenRevisionList = useCallback(() => {\n openRevisionList(true);\n }, []);\n\n return (\n <DropdownMenu\n trigger={\n <Button\n disabled={~~loading~~}\n variant=\"ghost\"\n text={currentRevision ? currentRevision.getLabel() : \"Loading...\"}\n icon={<ArrowDown />}\n iconPosition={\"end\"}\n />\n }\n >\n {revisions.slice(0, 5).map(revision => (\n <Item\n key={revision.id}\n className={\"cursor-pointer\"}\n onClick={() => goToRevision(revision.id)}\n icon={\n <Item.Icon\n label={revision.getLabel()}\n element={statusIcon[revision.status]}\n />\n }\n text={<Text size={\"sm\"}>{revision.getLabel()}</Text>}\n />\n ))}\n\n <DropdownMenu.Separator />\n <DropdownMenu.Item\n key={\"revisions-all\"}\n onClick={onOpenRevisionList}\n text={\n <>\n <Text size={\"sm\"}>Show All Revisions</Text>\n </>\n }\n />\n </DropdownMenu>\n );\n};\n"],"names":["Item","DropdownMenu","statusIcon","Draft","Published","Unpublished","RevisionsMenu","getLink","useRouter","~~revisions","setRevisions","useState","loading","getPageRevisions","useGetPageRevisions","~~id","useSelectFromDocument","document","~~status","~~openRevisionList","usePageEditorDrawer","~~useEffect~~","~~entryId~~","a","b","~~Date","~~currentRevision","r","goToRevision","useCallback","window","Routes","onOpenRevisionList","Button","ArrowDown","revision","Text"],"mappings":";;;;;;;;;;;~~AAcA~~,MAAM,EAAEA,MAAAA,IAAI,EAAE,GAAGC;AAEjB,MAAMC,aAAgD;IAClD,OAAO,WAAP,GAAO,oBAACC,yBAAKA;IACb,WAAW,WAAX,GAAW,oBAACC,mCAASA;IACrB,aAAa,WAAb,GAAa,oBAACC,yBAAWA;AAC7B;AAEO,MAAMC,gBAAgB;IACzB,MAAM,EAAEC,OAAO,EAAE,GAAGC;IACpB,~~MAAM,CAACC,WAAWC,aAAa,GAAGC,SAAyB,EAAE;IAC7D,MAAM,EAAEC,OAAO,EAAEC,gBAAgB,EAAE,GAAGC;IACtC,~~MAAMC,KAAKC,sBAAsBC,CAAAA,WAAYA,SAAS,EAAE;~~IACxD~~,~~MAAMC~~,~~SAASF~~,~~sBAA0CC~~,~~CAAAA~~,~~WAAYA,SAAS,MAAM~~;~~IAEpF~~,MAAM,~~EAAEE~~,~~gBAAgB~~,EAAE,GAAGC~~;IAE7BC~~,~~UAAU~~;~~QACN~~,MAAM,~~CAACC~~,~~QAAQ~~,~~GAAGP~~,~~GAAG~~,~~KAAK~~,~~CAAC~~;~~QAC3BF~~,~~iBAAiB;YAAES;QAAQ~~,~~GAAG~~,IAAI,~~CAACb~~,CAAAA~~;YAC/BC~~,~~aACID~~,~~UACK~~,~~IAAI~~,CAAC,~~CAACc,GAAGC,IACC,IAAIC,KAAKF,~~EAAE,~~OAAO~~,~~EAAE,OAAO,~~KAAK~~,IAAIE,KAAKD,EAAE,OAAO,EAAE,OAAO,IAErE,OAAO~~;~~QAEpB;IACJ~~,~~GAAG;QAACT;QAAIG;KAAO;IAEf~~,~~MAAMQ,kBAAkBjB,UAAU,IAAI,CAACkB,CAAAA,IAAKA,EAAE,EAAE,KAAKZ;IAErD,MAAMa,~~eAAeC,YAAY,~~CAACd~~;~~QAE9Be~~,OAAO,QAAQ,CAAC,QAAQ,~~GAAGvB~~,~~QAAQwB~~,OAAO,KAAK,CAAC,MAAM,EAAE;~~YAAEhB~~;QAAG;IACjE,GAAG,EAAE;IAEL,~~MAAMiB~~,qBAAqBH,YAAY;~~QACnCV~~,iBAAiB;IACrB,GAAG,EAAE;IAEL,OAAO,WAAP,GACI,~~oBAAClB~~,cAAYA;QACT,uBACI,~~oBAACgC~~,QAAMA;YACH,~~UAAUrB~~;YACV,SAAQ;YACR,~~MAAMc~~,kBAAkBA,gBAAgB,QAAQ,KAAK;YACrD,oBAAM,oBAACQ,gBAASA;YAChB,cAAc;;~~OAIrBzB~~,UAAU,KAAK,CAAC,GAAG,GAAG,GAAG,~~CAAC0B~~,~~CAAAA~~,~~WAAAA~~,~~WAAAA~~,~~GACvB~~,~~oBAACnC~~,MAAIA;YACD,~~KAAKmC~~,SAAS,EAAE;YAChB,WAAW;YACX,SAAS,IAAMP,aAAaO,SAAS,EAAE;YACvC,oBACI,~~oBAACnC~~,KAAK,IAAI;gBACN,~~OAAOmC~~,SAAS,QAAQ;gBACxB,~~SAASjC~~,UAAU,~~CAACiC~~,SAAS,MAAM,CAAC;;YAG5C,oBAAM,oBAACC,MAAIA;gBAAC,MAAM;eAAOD,SAAS,QAAQ;~~2BAIlD~~,~~oBAAClC~~,aAAa,SAAS,uBACvB,oBAACA,aAAa,IAAI;QACd,KAAK;QACL,~~SAAS+B~~;QACT,oBACI,wDACI,oBAACI,MAAIA;YAAC,MAAM;WAAM;;AAM1C"}
1	+ {"version":3,"file":"presentation/pages/PageEditor/TopBar/RevisionsMenu.js","sources":["../../../../../src/presentation/pages/PageEditor/TopBar/RevisionsMenu.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { Button, DropdownMenu, Text } from \"@webiny/admin-ui\";\nimport { ReactComponent as ArrowDown } from \"@webiny/icons/keyboard_arrow_down.svg\";\nimport { ReactComponent as Draft } from \"@webiny/icons/draw.svg\";\nimport { ReactComponent as Unpublished } from \"@webiny/icons/lock.svg\";\nimport { ReactComponent as Published } from \"@webiny/icons/remove_red_eye.svg\";\nimport { useSelectFromDocument } from \"~/BaseEditor/hooks/useSelectFromDocument.js\";\nimport { useRevisionList } from \"~/presentation/pages/PageEditor/Revisions/useRevisionList.js\";\nimport { useRouter } from \"@webiny/app-admin\";\nimport { Routes } from \"~/routes.js\";\nimport { usePageEditorDrawer } from \"~/presentation/pages/PageEditor/Revisions/usePageEditorDrawer.js\";\n\nconst { Item } = DropdownMenu;\n\nconst statusIcon: Record<string, React.JSX.Element> = {\n draft: <Draft />,\n published: <Published />,\n unpublished: <Unpublished />\n};\n\nexport const RevisionsMenu = () => {\n const { getLink } = useRouter();\n const id = useSelectFromDocument(document => document.id);\n\n const { openRevisionList } = usePageEditorDrawer();\n\n // Shares the presenter with the revisions drawer, so mutations made there are reflected here.\n const { vm } = useRevisionList(id);\n const { revisions, isLoading } = vm;\n\n const currentRevision = revisions.find(item => item.revision.id === id)?.revision;\n\n const goToRevision = useCallback((id: string) => {\n // TODO: make this work without a full app reload\n window.location.pathname = getLink(Routes.Pages.Editor, { id });\n }, []);\n\n const onOpenRevisionList = useCallback(() => {\n openRevisionList(true);\n }, []);\n\n return (\n <DropdownMenu\n trigger={\n <Button\n disabled={isLoading}\n variant=\"ghost\"\n text={currentRevision ? currentRevision.getLabel() : \"Loading...\"}\n icon={<ArrowDown />}\n iconPosition={\"end\"}\n />\n }\n >\n {revisions.slice(0, 5).map(({ revision }) => (\n <Item\n key={revision.id}\n className={\"cursor-pointer\"}\n onClick={() => goToRevision(revision.id)}\n icon={\n <Item.Icon\n label={revision.getLabel()}\n element={statusIcon[revision.status]}\n />\n }\n text={<Text size={\"sm\"}>{revision.getLabel()}</Text>}\n />\n ))}\n <DropdownMenu.Separator />\n <DropdownMenu.Item\n key={\"revisions-all\"}\n onClick={onOpenRevisionList}\n text={\n <>\n <Text size={\"sm\"}>Show All Revisions</Text>\n </>\n }\n />\n </DropdownMenu>\n );\n};\n"],"names":["Item","DropdownMenu","statusIcon","Draft","Published","Unpublished","RevisionsMenu","getLink","useRouter","id","useSelectFromDocument","document","openRevisionList","usePageEditorDrawer","vm","useRevisionList","revisions","isLoading","currentRevision","item","goToRevision","useCallback","window","Routes","onOpenRevisionList","Button","ArrowDown","revision","Text"],"mappings":";;;;;;;;;;;AAYA,MAAM,EAAEA,MAAAA,IAAI,EAAE,GAAGC;AAEjB,MAAMC,aAAgD;IAClD,OAAO,WAAP,GAAO,oBAACC,yBAAKA;IACb,WAAW,WAAX,GAAW,oBAACC,mCAASA;IACrB,aAAa,WAAb,GAAa,oBAACC,yBAAWA;AAC7B;AAEO,MAAMC,gBAAgB;IACzB,MAAM,EAAEC,OAAO,EAAE,GAAGC;IACpB,MAAMC,KAAKC,sBAAsBC,CAAAA,WAAYA,SAAS,EAAE;IAExD,MAAM,EAAEC,gBAAgB,EAAE,GAAGC;IAG7B,MAAM,EAAEC,EAAE,EAAE,GAAGC,gBAAgBN;IAC/B,MAAM,EAAEO,SAAS,EAAEC,SAAS,EAAE,GAAGH;IAEjC,MAAMI,kBAAkBF,UAAU,IAAI,CAACG,CAAAA,OAAQA,KAAK,QAAQ,CAAC,EAAE,KAAKV,KAAK;IAEzE,MAAMW,eAAeC,YAAY,CAACZ;QAE9Ba,OAAO,QAAQ,CAAC,QAAQ,GAAGf,QAAQgB,OAAO,KAAK,CAAC,MAAM,EAAE;YAAEd;QAAG;IACjE,GAAG,EAAE;IAEL,MAAMe,qBAAqBH,YAAY;QACnCT,iBAAiB;IACrB,GAAG,EAAE;IAEL,OAAO,WAAP,GACI,oBAACX,cAAYA;QACT,uBACI,oBAACwB,QAAMA;YACH,UAAUR;YACV,SAAQ;YACR,MAAMC,kBAAkBA,gBAAgB,QAAQ,KAAK;YACrD,oBAAM,oBAACQ,gBAASA;YAChB,cAAc;;OAIrBV,UAAU,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,EAAEW,QAAQ,EAAE,iBACpC,oBAAC3B,MAAIA;YACD,KAAK2B,SAAS,EAAE;YAChB,WAAW;YACX,SAAS,IAAMP,aAAaO,SAAS,EAAE;YACvC,oBACI,oBAAC3B,KAAK,IAAI;gBACN,OAAO2B,SAAS,QAAQ;gBACxB,SAASzB,UAAU,CAACyB,SAAS,MAAM,CAAC;;YAG5C,oBAAM,oBAACC,MAAIA;gBAAC,MAAM;eAAOD,SAAS,QAAQ;2BAGlD,oBAAC1B,aAAa,SAAS,uBACvB,oBAACA,aAAa,IAAI;QACd,KAAK;QACL,SAASuB;QACT,oBACI,wDACI,oBAACI,MAAIA;YAAC,MAAM;WAAM;;AAM1C"}

package/presentation/pages/PageList/PageListPresenter.test.js CHANGED Viewed

@@ -7,10 +7,11 @@ import { FolderTreePresenter } from "@webiny/app-aco/presentation/folderTree/abs
 import { GetDescendantFoldersUseCase } from "@webiny/app-aco/features/folders/getDescendantFolders/abstractions.js";
 import { Confirmation } from "@webiny/app-admin/features/confirmation/abstractions.js";
 import { Page } from "../../../domain/Page/Page.js";
+import { pageRevisionsCacheFactory } from "../../../domain/PageRevision/index.js";
 import { ListPagesGateway } from "../../../features/pages/listPages/abstractions.js";
 import { ListPagesUseCase } from "../../../features/pages/listPages/ListPagesUseCase.js";
 import { ListPagesRepository } from "../../../features/pages/listPages/ListPagesRepository.js";
-import { FullPageCache, PageListCache } from "../../../features/pages/shared/abstractions.js";
+import { FullPageCache, PageListCache, PageRevisionsCache } from "../../../features/pages/shared/abstractions.js";
 import { PublishPageGateway } from "../../../features/pages/publishPage/abstractions.js";
 import { PublishPageUseCase } from "../../../features/pages/publishPage/PublishPageUseCase.js";
 import { PublishPageRepository } from "../../../features/pages/publishPage/PublishPageRepository.js";
@@ -153,6 +154,7 @@ describe("PageListPresenter", ()=>{
         });
         container.registerInstance(DeletePageUseCase, noopUseCase);
         container.registerInstance(FullPageCache, new ListCache("id"));
+        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());
         container.registerInstance(PublishPageGateway, publishGateway);
         container.register(PublishPageRepository).inSingletonScope();
         container.register(PublishPageUseCase);