@webiny/app-website-builder 6.4.12-beta.1 → 6.4.12-beta.3

package/modules/pages/PageEditor/Revisions/RevisionsList.js

@@ -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 "../../../../presentation/pages/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/modules/pages/PageEditor/Revisions/RevisionsList.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules/pages/PageEditor/Revisions/RevisionsList.js","sources":["../../../../../src/modules/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"}
+{"version":3,"file":"modules/pages/PageEditor/Revisions/RevisionsList.js","sources":["../../../../../src/modules/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/modules/pages/PageEditor/Revisions/useRevision.d.ts

@@ -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/modules/pages/PageEditor/Revisions/useRevision.js

@@ -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/modules/pages/PageEditor/Revisions/useRevision.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules/pages/PageEditor/Revisions/useRevision.js","sources":["../../../../../src/modules/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"}
+{"version":3,"file":"modules/pages/PageEditor/Revisions/useRevision.js","sources":["../../../../../src/modules/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":";;;;;;;;;;AAsBO,MAAMA,cAAc,CAACC;IACxB,MAAM,EAAEC,QAAQ,EAAE,GAAGD;IAErB,MAAM,EAAEE,SAAS,EAAE,GAAGC;IACtB,MAAM,EAAEC,gBAAgB,EAAE,GAAGC;IAC7B,MAAM,EAAEC,UAAU,EAAE,GAAGC;IACvB,MAAM,EAAEC,gBAAgB,EAAEC,gBAAgB,EAAE,GAAGC;IAE/C,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/B,MAAMT,uBAAuB;YACzB,IAAIV,SAAS,EAAE;QACnB;IACJ,GAAG;QAACA,SAAS,EAAE;KAAC;IAEhB,MAAMoB,iBAAiBD,YAAY;QAC/Bd,WAAW;YACP,OAAO;YACP,MAAM,WAAN,GAAM,oBAACgB,2BAAUA;YACjB,SAAS,WAAT,GACI,oBAACC,MAAIA,MACA,CAAC,kCAAkC,EAAEtB,SAAS,OAAO,CAAC,2DAA2D,CAAC;YAG3H,aAAa;YACb,aAAa;YACb,UAAU;gBACN,IAAI;oBACA,MAAMY,mBAAmB;wBACrB,IAAIZ,SAAS,EAAE;oBACnB;oBAEAO,iBAAiB;wBACb,OAAO,CAAC,UAAU,EAAEP,SAAS,OAAO,CAAC,0BAA0B,CAAC;oBACpE;gBACJ,EAAE,OAAOuB,IAAI;oBACTf,iBAAiB;wBACb,OAAO;wBACP,aAAae,GAAG,OAAO;oBAC3B;gBACJ;YACJ;QACJ;IACJ,GAAG;QAACvB,SAAS,EAAE;QAAEA,SAAS,OAAO;KAAC;IAElC,MAAMwB,kBAAkBL,YAAY;QAChCd,WAAW;YACP,OAAO;YACP,MAAM,WAAN,GAAM,oBAACoB,gBAAWA;YAClB,SAAS,WAAT,GACI,oBAACH,MAAIA,MACA,CAAC,mCAAmC,EAAEtB,SAAS,OAAO,CAAC,oCAAoC,CAAC;YAGrG,aAAa;YACb,aAAa;YACb,UAAU;gBACN,IAAI;oBACA,MAAMc,YAAY;wBACd,IAAId,SAAS,EAAE;oBACnB;oBAEAO,iBAAiB;wBACb,OAAO,CAAC,UAAU,EAAEP,SAAS,OAAO,CAAC,4BAA4B,CAAC;oBACtE;gBACJ,EAAE,OAAOuB,IAAI;oBACTf,iBAAiB;wBACb,OAAO;wBACP,aAAae,GAAG,OAAO;oBAC3B;gBACJ;YACJ;QACJ;IACJ,GAAG;QAACvB,SAAS,EAAE;QAAEA,SAAS,OAAO;KAAC;IAElC,MAAM0B,oBAAoBP,YAAY;QAClCd,WAAW;YACP,OAAO;YACP,MAAM,WAAN,GAAM,oBAACsB,mCAAaA;YACpB,SAAS,WAAT,GACI,oBAACL,MAAIA,MACA,CAAC,qCAAqC,EAAEtB,SAAS,OAAO,CAAC,mFAAmF,CAAC;YAGtJ,aAAa;YACb,aAAa;YACb,UAAU;gBACN,IAAI;oBACA,MAAMgB,cAAc;wBAChB,IAAIhB,SAAS,EAAE;oBACnB;oBAEAO,iBAAiB;wBACb,OAAO,CAAC,UAAU,EAAEP,SAAS,OAAO,CAAC,8BAA8B,CAAC;oBACxE;gBACJ,EAAE,OAAOuB,IAAI;oBACTf,iBAAiB;wBACb,OAAO;wBACP,aAAae,GAAG,OAAO;oBAC3B;gBACJ;YACJ;QACJ;IACJ,GAAG;QAACvB,SAAS,EAAE;QAAEA,SAAS,OAAO;KAAC;IAElC,MAAM4B,eAAeT,YAAY;QAE7BhB,iBAAiB;QAEjBF,UAAU4B,OAAO,KAAK,CAAC,MAAM,EAAE;YAC3B,IAAI7B,SAAS,EAAE;QACnB;IACJ,GAAG;QAACA,SAAS,EAAE;QAAEG;KAAiB;IAElC,OAAO;QACHe;QACAU;QACAR;QACAI;QACAE;IACJ;AACJ"}

package/modules/pages/PageEditor/Revisions/useRevisionList.d.ts

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

package/modules/pages/PageEditor/Revisions/useRevisionList.js

@@ -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 "../../../../presentation/pages/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/modules/pages/PageEditor/Revisions/useRevisionList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modules/pages/PageEditor/Revisions/useRevisionList.js","sources":["../../../../../src/modules/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/modules/pages/PageEditor/TopBar/RevisionsMenu.js

@@ -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),
@@ -61,13 +49,13 @@ const RevisionsMenu = ()=>{
             text: /*#__PURE__*/ react.createElement(Text, {
                 size: "sm"
             }, revision.getLabel())
-        })), revisions.length > 5 ? /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(DropdownMenu.Separator, null), /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
+        })), /*#__PURE__*/ react.createElement(DropdownMenu.Separator, null), /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
         key: "revisions-all",
         onClick: onOpenRevisionList,
         text: /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(Text, {
             size: "sm"
         }, "Show All Revisions"))
-    })) : null);
+    }));
 };
 export { RevisionsMenu };
 

package/modules/pages/PageEditor/TopBar/RevisionsMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules/pages/PageEditor/TopBar/RevisionsMenu.js","sources":["../../../../../src/modules/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 \"~/modules/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            {revisions.length > 5 ? (\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                </>\n            ) : null}\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;aAGjD1B,UAAU,MAAM,GAAG,IAAI,WAAJ,GAChB,wDACI,oBAACR,aAAa,SAAS,uBACvB,oBAACA,aAAa,IAAI;QACd,KAAK;QACL,SAAS+B;QACT,oBACI,wDACI,oBAACI,MAAIA;YAAC,MAAM;WAAM;UAKlC;AAGhB"}
+{"version":3,"file":"modules/pages/PageEditor/TopBar/RevisionsMenu.js","sources":["../../../../../src/modules/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 \"~/modules/pages/PageEditor/Revisions/useRevisionList.js\";\nimport { useRouter } from \"@webiny/app-admin\";\nimport { Routes } from \"~/routes.js\";\nimport { usePageEditorDrawer } from \"~/modules/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/modules/pages/PagesList/PagesList.js

@@ -2,10 +2,14 @@ import react from "react";
 import { Layout } from "./components/Layout/index.js";
 import { Main } from "./components/Main/index.js";
 import { Sidebar } from "./components/Sidebar/index.js";
-const PagesList = ()=>/*#__PURE__*/ react.createElement(Layout, {
+import { useDocumentListController } from "./useDocumentList.js";
+const PagesList = ()=>{
+    useDocumentListController();
+    return /*#__PURE__*/ react.createElement(Layout, {
         main: /*#__PURE__*/ react.createElement(Main, null),
         sidebar: /*#__PURE__*/ react.createElement(Sidebar, null)
     });
+};
 export { PagesList };
 
 //# sourceMappingURL=PagesList.js.map

package/modules/pages/PagesList/PagesList.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules/pages/PagesList/PagesList.js","sources":["../../../../src/modules/pages/PagesList/PagesList.tsx"],"sourcesContent":["import React from \"react\";\nimport { Layout } from \"~/modules/pages/PagesList/components/Layout/index.js\";\nimport { Main } from \"~/modules/pages/PagesList/components/Main/index.js\";\nimport { Sidebar } from \"~/modules/pages/PagesList/components/Sidebar/index.js\";\n\nexport const PagesList = () => {\n    return <Layout main={<Main />} sidebar={<Sidebar />} />;\n};\n"],"names":["PagesList","Layout","Main","Sidebar"],"mappings":";;;;AAKO,MAAMA,YAAY,IACd,WAAP,GAAO,oBAACC,QAAMA;QAAC,oBAAM,oBAACC,MAAIA;QAAK,uBAAS,oBAACC,SAAOA"}
+{"version":3,"file":"modules/pages/PagesList/PagesList.js","sources":["../../../../src/modules/pages/PagesList/PagesList.tsx"],"sourcesContent":["import React from \"react\";\nimport { Layout } from \"~/modules/pages/PagesList/components/Layout/index.js\";\nimport { Main } from \"~/modules/pages/PagesList/components/Main/index.js\";\nimport { Sidebar } from \"~/modules/pages/PagesList/components/Sidebar/index.js\";\nimport { useDocumentListController } from \"~/modules/pages/PagesList/useDocumentList.js\";\n\nexport const PagesList = () => {\n    useDocumentListController();\n\n    return <Layout main={<Main />} sidebar={<Sidebar />} />;\n};\n"],"names":["PagesList","useDocumentListController","Layout","Main","Sidebar"],"mappings":";;;;;AAMO,MAAMA,YAAY;IACrBC;IAEA,OAAO,WAAP,GAAO,oBAACC,QAAMA;QAAC,oBAAM,oBAACC,MAAIA;QAAK,uBAAS,oBAACC,SAAOA;;AACpD"}

package/modules/pages/PagesList/useDocumentList.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Reads the list view model. Safe to call from any number of components: it performs no data
+ * loading, so an extra consumer costs nothing.
+ *
+ * Loading belongs to `useDocumentListController`, which the list root calls exactly once. Keeping it
+ * here would mean every consumer issued its own `listPages` request on mount.
+ */
 export declare const useDocumentList: import("@webiny/react-composition").GenericHook<unknown, {
     vm: import("../../../presentation/pages/PageList").IDocumentListVm;
     showFilters: (show: boolean) => void;
@@ -13,3 +20,8 @@ export declare const useDocumentList: import("@webiny/react-composition").Generi
         showFilters: (show: boolean) => void;
     }>) => () => React.JSX.Element;
 };
+/**
+ * Owns the loading of the current folder. Must be called exactly once, by the list root - every call
+ * site runs its own copy of the effect below, and each copy issues a `listPages` request.
+ */
+export declare const useDocumentListController: () => void;

package/modules/pages/PagesList/useDocumentList.js

@@ -7,13 +7,8 @@ import { makeDecoratableHook } from "@webiny/react-composition";
 import { useFeature } from "@webiny/app";
 import { PageListFeature } from "../../../presentation/pages/PageList/feature.js";
 const useDocumentList = makeDecoratableHook(()=>{
-    const isFirstLoad = useRef(true);
-    const { folders, loadFolderHierarchy } = useLoadFolderHierarchy();
-    const { listFoldersByParentIds } = useListFoldersByParentIds();
     const { currentFolderId } = useNavigateFolder();
-    const { loadPages: listDocuments } = useLoadPages();
     const { filterPages: filterDocuments } = useFilterPages();
-    const { selectPages: selectDocuments } = useSelectPages();
     const { presenter } = useFeature(PageListFeature);
     const params = useMemo(()=>({
             folderId: currentFolderId
@@ -38,6 +33,19 @@ const useDocumentList = makeDecoratableHook(()=>{
     }, [
         presenter
     ]);
+    return {
+        vm,
+        showFilters
+    };
+});
+const useDocumentListController = ()=>{
+    const isFirstLoad = useRef(true);
+    const { folders, loadFolderHierarchy } = useLoadFolderHierarchy();
+    const { listFoldersByParentIds } = useListFoldersByParentIds();
+    const { loadPages: listDocuments } = useLoadPages();
+    const { selectPages: selectDocuments } = useSelectPages();
+    const { presenter } = useFeature(PageListFeature);
+    const { vm } = useDocumentList();
     useEffect(()=>{
         if (0 === folders.length) loadFolderHierarchy(vm.folderId);
         else listFoldersByParentIds([
@@ -53,11 +61,7 @@ const useDocumentList = makeDecoratableHook(()=>{
     }, [
         vm.folderId
     ]);
-    return {
-        vm,
-        showFilters
-    };
-});
-export { useDocumentList };
+};
+export { useDocumentList, useDocumentListController };
 
 //# sourceMappingURL=useDocumentList.js.map

package/modules/pages/PagesList/useDocumentList.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules/pages/PagesList/useDocumentList.js","sources":["../../../../src/modules/pages/PagesList/useDocumentList.ts"],"sourcesContent":["import { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { autorun } from \"mobx\";\nimport {\n    useListFoldersByParentIds,\n    useLoadFolderHierarchy,\n    useNavigateFolder\n} from \"@webiny/app-aco\";\nimport { useFilterPages, useLoadPages } from \"~/features/pages/index.js\";\nimport { useSelectPages } from \"~/features/pages/selectPages/useSelectPages.js\";\nimport { makeDecoratableHook } from \"@webiny/react-composition\";\nimport { useFeature } from \"@webiny/app\";\nimport { PageListFeature } from \"~/presentation/pages/PageList/feature.js\";\n\nexport const useDocumentList = makeDecoratableHook(() => {\n    const isFirstLoad = useRef(true);\n    const { folders, loadFolderHierarchy } = useLoadFolderHierarchy();\n    const { listFoldersByParentIds } = useListFoldersByParentIds();\n    const { currentFolderId } = useNavigateFolder();\n    const { loadPages: listDocuments } = useLoadPages();\n    const { filterPages: filterDocuments } = useFilterPages();\n    const { selectPages: selectDocuments } = useSelectPages();\n    const { presenter } = useFeature(PageListFeature);\n\n    const params = useMemo(\n        () => ({\n            folderId: currentFolderId\n        }),\n        [currentFolderId]\n    );\n\n    useEffect(() => {\n        presenter.init(params);\n    }, [params, presenter]);\n\n    const [vm, setVm] = useState(presenter.vm);\n\n    useEffect(() => {\n        return autorun(() => {\n            setVm(presenter.vm);\n        });\n    }, [presenter]);\n\n    const showFilters = useCallback(\n        (show: boolean) => {\n            presenter.showFilters(show);\n\n            // When set to false, it will also clear any applied document filters for the current folder.\n            if (!show) {\n                filterDocuments({}, currentFolderId);\n            }\n        },\n        [presenter]\n    );\n\n    useEffect(() => {\n        // The folders collection is empty, it must be the first render, let's load the full hierarchy.\n        if (folders.length === 0) {\n            loadFolderHierarchy(vm.folderId);\n        } else {\n            // Otherwise let's load only the current folder sub-tree\n            listFoldersByParentIds([vm.folderId]);\n        }\n\n        // Close the filter list\n        presenter.showFilters(false);\n\n        // Unselect any selected items\n        selectDocuments([]);\n\n        // List all documents when the current folder changes.\n        listDocuments({\n            folderId: vm.folderId,\n            resetSearch: !isFirstLoad.current\n        });\n        isFirstLoad.current = false;\n    }, [vm.folderId]);\n\n    return {\n        vm,\n        showFilters\n    };\n});\n"],"names":["useDocumentList","makeDecoratableHook","isFirstLoad","useRef","folders","loadFolderHierarchy","useLoadFolderHierarchy","listFoldersByParentIds","useListFoldersByParentIds","currentFolderId","useNavigateFolder","listDocuments","useLoadPages","filterDocuments","useFilterPages","selectDocuments","useSelectPages","presenter","useFeature","PageListFeature","params","useMemo","useEffect","vm","setVm","useState","autorun","showFilters","useCallback","show"],"mappings":";;;;;;;;AAaO,MAAMA,kBAAkBC,oBAAoB;IAC/C,MAAMC,cAAcC,OAAO;IAC3B,MAAM,EAAEC,OAAO,EAAEC,mBAAmB,EAAE,GAAGC;IACzC,MAAM,EAAEC,sBAAsB,EAAE,GAAGC;IACnC,MAAM,EAAEC,eAAe,EAAE,GAAGC;IAC5B,MAAM,EAAE,WAAWC,aAAa,EAAE,GAAGC;IACrC,MAAM,EAAE,aAAaC,eAAe,EAAE,GAAGC;IACzC,MAAM,EAAE,aAAaC,eAAe,EAAE,GAAGC;IACzC,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAWC;IAEjC,MAAMC,SAASC,QACX,IAAO;YACH,UAAUZ;QACd,IACA;QAACA;KAAgB;IAGrBa,UAAU;QACNL,UAAU,IAAI,CAACG;IACnB,GAAG;QAACA;QAAQH;KAAU;IAEtB,MAAM,CAACM,IAAIC,MAAM,GAAGC,SAASR,UAAU,EAAE;IAEzCK,UAAU,IACCI,QAAQ;YACXF,MAAMP,UAAU,EAAE;QACtB,IACD;QAACA;KAAU;IAEd,MAAMU,cAAcC,YAChB,CAACC;QACGZ,UAAU,WAAW,CAACY;QAGtB,IAAI,CAACA,MACDhB,gBAAgB,CAAC,GAAGJ;IAE5B,GACA;QAACQ;KAAU;IAGfK,UAAU;QAEN,IAAIlB,AAAmB,MAAnBA,QAAQ,MAAM,EACdC,oBAAoBkB,GAAG,QAAQ;aAG/BhB,uBAAuB;YAACgB,GAAG,QAAQ;SAAC;QAIxCN,UAAU,WAAW,CAAC;QAGtBF,gBAAgB,EAAE;QAGlBJ,cAAc;YACV,UAAUY,GAAG,QAAQ;YACrB,aAAa,CAACrB,YAAY,OAAO;QACrC;QACAA,YAAY,OAAO,GAAG;IAC1B,GAAG;QAACqB,GAAG,QAAQ;KAAC;IAEhB,OAAO;QACHA;QACAI;IACJ;AACJ"}
+{"version":3,"file":"modules/pages/PagesList/useDocumentList.js","sources":["../../../../src/modules/pages/PagesList/useDocumentList.ts"],"sourcesContent":["import { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport { autorun } from \"mobx\";\nimport {\n    useListFoldersByParentIds,\n    useLoadFolderHierarchy,\n    useNavigateFolder\n} from \"@webiny/app-aco\";\nimport { useFilterPages, useLoadPages } from \"~/features/pages/index.js\";\nimport { useSelectPages } from \"~/features/pages/selectPages/useSelectPages.js\";\nimport { makeDecoratableHook } from \"@webiny/react-composition\";\nimport { useFeature } from \"@webiny/app\";\nimport { PageListFeature } from \"~/presentation/pages/PageList/feature.js\";\n\n/**\n * Reads the list view model. Safe to call from any number of components: it performs no data\n * loading, so an extra consumer costs nothing.\n *\n * Loading belongs to `useDocumentListController`, which the list root calls exactly once. Keeping it\n * here would mean every consumer issued its own `listPages` request on mount.\n */\nexport const useDocumentList = makeDecoratableHook(() => {\n    const { currentFolderId } = useNavigateFolder();\n    const { filterPages: filterDocuments } = useFilterPages();\n    const { presenter } = useFeature(PageListFeature);\n\n    const params = useMemo(\n        () => ({\n            folderId: currentFolderId\n        }),\n        [currentFolderId]\n    );\n\n    /**\n     * Stays here rather than in the controller: it is idempotent and makes no request, and child\n     * effects run before the parent's - so a consumer would otherwise render one frame against an\n     * uninitialized view model.\n     */\n    useEffect(() => {\n        presenter.init(params);\n    }, [params, presenter]);\n\n    const [vm, setVm] = useState(presenter.vm);\n\n    useEffect(() => {\n        return autorun(() => {\n            setVm(presenter.vm);\n        });\n    }, [presenter]);\n\n    const showFilters = useCallback(\n        (show: boolean) => {\n            presenter.showFilters(show);\n\n            // When set to false, it will also clear any applied document filters for the current folder.\n            if (!show) {\n                filterDocuments({}, currentFolderId);\n            }\n        },\n        [presenter]\n    );\n\n    return {\n        vm,\n        showFilters\n    };\n});\n\n/**\n * Owns the loading of the current folder. Must be called exactly once, by the list root - every call\n * site runs its own copy of the effect below, and each copy issues a `listPages` request.\n */\nexport const useDocumentListController = () => {\n    const isFirstLoad = useRef(true);\n    const { folders, loadFolderHierarchy } = useLoadFolderHierarchy();\n    const { listFoldersByParentIds } = useListFoldersByParentIds();\n    const { loadPages: listDocuments } = useLoadPages();\n    const { selectPages: selectDocuments } = useSelectPages();\n    const { presenter } = useFeature(PageListFeature);\n    const { vm } = useDocumentList();\n\n    useEffect(() => {\n        // The folders collection is empty, it must be the first render, let's load the full hierarchy.\n        if (folders.length === 0) {\n            loadFolderHierarchy(vm.folderId);\n        } else {\n            // Otherwise let's load only the current folder sub-tree\n            listFoldersByParentIds([vm.folderId]);\n        }\n\n        // Close the filter list\n        presenter.showFilters(false);\n\n        // Unselect any selected items\n        selectDocuments([]);\n\n        // List all documents when the current folder changes.\n        listDocuments({\n            folderId: vm.folderId,\n            resetSearch: !isFirstLoad.current\n        });\n        isFirstLoad.current = false;\n    }, [vm.folderId]);\n};\n"],"names":["useDocumentList","makeDecoratableHook","currentFolderId","useNavigateFolder","filterDocuments","useFilterPages","presenter","useFeature","PageListFeature","params","useMemo","useEffect","vm","setVm","useState","autorun","showFilters","useCallback","show","useDocumentListController","isFirstLoad","useRef","folders","loadFolderHierarchy","useLoadFolderHierarchy","listFoldersByParentIds","useListFoldersByParentIds","listDocuments","useLoadPages","selectDocuments","useSelectPages"],"mappings":";;;;;;;;AAoBO,MAAMA,kBAAkBC,oBAAoB;IAC/C,MAAM,EAAEC,eAAe,EAAE,GAAGC;IAC5B,MAAM,EAAE,aAAaC,eAAe,EAAE,GAAGC;IACzC,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAWC;IAEjC,MAAMC,SAASC,QACX,IAAO;YACH,UAAUR;QACd,IACA;QAACA;KAAgB;IAQrBS,UAAU;QACNL,UAAU,IAAI,CAACG;IACnB,GAAG;QAACA;QAAQH;KAAU;IAEtB,MAAM,CAACM,IAAIC,MAAM,GAAGC,SAASR,UAAU,EAAE;IAEzCK,UAAU,IACCI,QAAQ;YACXF,MAAMP,UAAU,EAAE;QACtB,IACD;QAACA;KAAU;IAEd,MAAMU,cAAcC,YAChB,CAACC;QACGZ,UAAU,WAAW,CAACY;QAGtB,IAAI,CAACA,MACDd,gBAAgB,CAAC,GAAGF;IAE5B,GACA;QAACI;KAAU;IAGf,OAAO;QACHM;QACAI;IACJ;AACJ;AAMO,MAAMG,4BAA4B;IACrC,MAAMC,cAAcC,OAAO;IAC3B,MAAM,EAAEC,OAAO,EAAEC,mBAAmB,EAAE,GAAGC;IACzC,MAAM,EAAEC,sBAAsB,EAAE,GAAGC;IACnC,MAAM,EAAE,WAAWC,aAAa,EAAE,GAAGC;IACrC,MAAM,EAAE,aAAaC,eAAe,EAAE,GAAGC;IACzC,MAAM,EAAExB,SAAS,EAAE,GAAGC,WAAWC;IACjC,MAAM,EAAEI,EAAE,EAAE,GAAGZ;IAEfW,UAAU;QAEN,IAAIW,AAAmB,MAAnBA,QAAQ,MAAM,EACdC,oBAAoBX,GAAG,QAAQ;aAG/Ba,uBAAuB;YAACb,GAAG,QAAQ;SAAC;QAIxCN,UAAU,WAAW,CAAC;QAGtBuB,gBAAgB,EAAE;QAGlBF,cAAc;YACV,UAAUf,GAAG,QAAQ;YACrB,aAAa,CAACQ,YAAY,OAAO;QACrC;QACAA,YAAY,OAAO,GAAG;IAC1B,GAAG;QAACR,GAAG,QAAQ;KAAC;AACpB"}

package/modules/redirects/RedirectsList/DocumentList.js

@@ -3,10 +3,15 @@ import { Layout } from "./components/Layout/index.js";
 import { Main } from "./components/Main/index.js";
 import { Sidebar } from "./components/Sidebar/index.js";
 import { DocumentListPresenterProvider } from "./presenters/DocumentListPresenterContext.js";
-const DocumentList = ()=>/*#__PURE__*/ react.createElement(DocumentListPresenterProvider, null, /*#__PURE__*/ react.createElement(Layout, {
+import { useDocumentListController } from "./useDocumentList.js";
+const DocumentListContent = ()=>{
+    useDocumentListController();
+    return /*#__PURE__*/ react.createElement(Layout, {
         main: /*#__PURE__*/ react.createElement(Main, null),
         sidebar: /*#__PURE__*/ react.createElement(Sidebar, null)
-    }));
+    });
+};
+const DocumentList = ()=>/*#__PURE__*/ react.createElement(DocumentListPresenterProvider, null, /*#__PURE__*/ react.createElement(DocumentListContent, null));
 export { DocumentList };
 
 //# sourceMappingURL=DocumentList.js.map

package/modules/redirects/RedirectsList/DocumentList.js.map

@@ -1 +1 @@
-{"version":3,"file":"modules/redirects/RedirectsList/DocumentList.js","sources":["../../../../src/modules/redirects/RedirectsList/DocumentList.tsx"],"sourcesContent":["import React from \"react\";\nimport { Layout } from \"~/modules/redirects/RedirectsList/components/Layout/index.js\";\nimport { Main } from \"~/modules/redirects/RedirectsList/components/Main/index.js\";\nimport { Sidebar } from \"~/modules/redirects/RedirectsList/components/Sidebar/index.js\";\nimport { DocumentListPresenterProvider } from \"~/modules/redirects/RedirectsList/presenters/DocumentListPresenterContext.js\";\n\nexport const DocumentList = () => {\n    return (\n        <DocumentListPresenterProvider>\n            <Layout main={<Main />} sidebar={<Sidebar />} />\n        </DocumentListPresenterProvider>\n    );\n};\n"],"names":["DocumentList","DocumentListPresenterProvider","Layout","Main","Sidebar"],"mappings":";;;;;AAMO,MAAMA,eAAe,IACjB,WAAP,GACI,oBAACC,+BAA6BA,MAAAA,WAAAA,GAC1B,oBAACC,QAAMA;QAAC,oBAAM,oBAACC,MAAIA;QAAK,uBAAS,oBAACC,SAAOA"}
+{"version":3,"file":"modules/redirects/RedirectsList/DocumentList.js","sources":["../../../../src/modules/redirects/RedirectsList/DocumentList.tsx"],"sourcesContent":["import React from \"react\";\nimport { Layout } from \"~/modules/redirects/RedirectsList/components/Layout/index.js\";\nimport { Main } from \"~/modules/redirects/RedirectsList/components/Main/index.js\";\nimport { Sidebar } from \"~/modules/redirects/RedirectsList/components/Sidebar/index.js\";\nimport { DocumentListPresenterProvider } from \"~/modules/redirects/RedirectsList/presenters/DocumentListPresenterContext.js\";\nimport { useDocumentListController } from \"~/modules/redirects/RedirectsList/useDocumentList.js\";\n\n/**\n * Separate component because the controller reads the presenter from context, so it has to run\n * below the provider.\n */\nconst DocumentListContent = () => {\n    useDocumentListController();\n\n    return <Layout main={<Main />} sidebar={<Sidebar />} />;\n};\n\nexport const DocumentList = () => {\n    return (\n        <DocumentListPresenterProvider>\n            <DocumentListContent />\n        </DocumentListPresenterProvider>\n    );\n};\n"],"names":["DocumentListContent","useDocumentListController","Layout","Main","Sidebar","DocumentList","DocumentListPresenterProvider"],"mappings":";;;;;;AAWA,MAAMA,sBAAsB;IACxBC;IAEA,OAAO,WAAP,GAAO,oBAACC,QAAMA;QAAC,oBAAM,oBAACC,MAAIA;QAAK,uBAAS,oBAACC,SAAOA;;AACpD;AAEO,MAAMC,eAAe,IACjB,WAAP,GACI,oBAACC,+BAA6BA,MAAAA,WAAAA,GAC1B,oBAACN,qBAAmBA"}

package/modules/redirects/RedirectsList/useDocumentList.d.ts

@@ -1,3 +1,12 @@
+/**
+ * Reads the list view model. Safe to call from any number of components: it performs no data
+ * loading, so an extra consumer costs nothing.
+ *
+ * Loading belongs to `useDocumentListController`, which the list root calls exactly once. Keeping it
+ * here would mean every consumer issued its own `listRedirects` request on mount - Apollo's query
+ * deduplication collapses those into a single network request, so the cost is invisible rather than
+ * absent.
+ */
 export declare const useDocumentList: () => {
     vm: {
         folderId: string;
@@ -20,3 +29,8 @@ export declare const useDocumentList: () => {
     };
     showFilters: (show: boolean) => void;
 };
+/**
+ * Owns the loading of the current folder. Must be called exactly once, by the list root - every call
+ * site runs its own copy of the effect below, and each copy issues a `listRedirects` request.
+ */
+export declare const useDocumentListController: () => void;

package/modules/redirects/RedirectsList/useDocumentList.js

@@ -5,13 +5,8 @@ import { useDocumentListPresenter } from "./presenters/DocumentListPresenterCont
 import { useFilterRedirects, useLoadRedirects } from "../../../features/redirects/index.js";
 import { useSelectRedirects } from "../../../features/redirects/selectRedirects/useSelectRedirects.js";
 const useDocumentList = ()=>{
-    const isFirstLoad = useRef(true);
-    const { folders, loadFolderHierarchy } = useLoadFolderHierarchy();
-    const { listFoldersByParentIds } = useListFoldersByParentIds();
     const { currentFolderId } = useNavigateFolder();
-    const { loadRedirects: listDocuments } = useLoadRedirects();
     const { filterRedirects: filterDocuments } = useFilterRedirects();
-    const { selectRedirects: selectDocuments } = useSelectRedirects();
     const presenter = useDocumentListPresenter();
     const params = useMemo(()=>({
             folderId: currentFolderId
@@ -36,6 +31,19 @@ const useDocumentList = ()=>{
     }, [
         presenter
     ]);
+    return {
+        vm,
+        showFilters
+    };
+};
+const useDocumentListController = ()=>{
+    const isFirstLoad = useRef(true);
+    const { folders, loadFolderHierarchy } = useLoadFolderHierarchy();
+    const { listFoldersByParentIds } = useListFoldersByParentIds();
+    const { loadRedirects: listDocuments } = useLoadRedirects();
+    const { selectRedirects: selectDocuments } = useSelectRedirects();
+    const presenter = useDocumentListPresenter();
+    const { vm } = useDocumentList();
     useEffect(()=>{
         if (0 === folders.length) loadFolderHierarchy(vm.folderId);
         else listFoldersByParentIds([
@@ -51,11 +59,7 @@ const useDocumentList = ()=>{
     }, [
         vm.folderId
     ]);
-    return {
-        vm,
-        showFilters
-    };
 };
-export { useDocumentList };
+export { useDocumentList, useDocumentListController };
 
 //# sourceMappingURL=useDocumentList.js.map