@webiny/app-website-builder 0.0.0-unstable.e53eceafb5 → 0.0.0-unstable.eb196ccd2f

package/modules/pages/PagesList/components/Table/Cells/CellName.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Icon","Link","Text","ReactComponent","Folder","FolderShared","File","useNavigateFolder","PageListConfig","useGetEditPageUrl","FolderCellName","folder","navigateToFolder","icon","createElement","hasNonInheritedPermissions","canManagePermissions","className","onClick","id","size","color","label","title","DocumentCellRowTitle","document","as","data","properties","path","DocumentCellName","getEditPageUrl","to","variant","CellName","useTableRow","isFolderRow","Browser","Table","Column","row"],"sources":["CellName.tsx"],"sourcesContent":["import React from \"react\";\n\nimport { Icon, Link, Text } from \"@webiny/admin-ui\";\nimport { ReactComponent as Folder } from \"@webiny/icons/folder.svg\";\nimport { ReactComponent as FolderShared } from \"@webiny/icons/folder_shared.svg\";\nimport { ReactComponent as File } from \"@webiny/icons/description.svg\";\nimport { useNavigateFolder } from \"@webiny/app-aco\";\n\nimport type { FolderTableItem } from \"@webiny/app-aco/types\";\nimport { PageListConfig } from \"~/configs/index.js\";\nimport type { DocumentDto } from \"~/modules/pages/PagesList/presenters/index.js\";\nimport { useGetEditPageUrl } from \"~/modules/pages/PagesList/hooks/useGetEditPageUrl.js\";\n\ninterface FolderCellNameProps {\n    folder: FolderTableItem;\n}\n\nexport const FolderCellName = ({ folder }: FolderCellNameProps) => {\n    const { navigateToFolder } = useNavigateFolder();\n\n    let icon = <Folder />;\n    if (folder.hasNonInheritedPermissions && folder.canManagePermissions) {\n        icon = <FolderShared />;\n    }\n\n    return (\n        <div\n            className={\n                \"wby-flex wby-items-center wby-gap-sm wby-truncate wby-cursor-pointer wby-font-semibold hover:wby-underline\"\n            }\n            onClick={() => navigateToFolder(folder.id)}\n        >\n            <Icon\n                size={\"sm\"}\n                color={\"neutral-strong\"}\n                icon={icon}\n                label={`Folder - ${folder.title}`}\n            />\n            <Text className={\"wby-truncate wby-min-w-0 wby-flex-shrink\"}>{folder.title}</Text>\n        </div>\n    );\n};\n\ninterface DocumentCellRowTitleProps {\n    document: DocumentDto;\n}\n\nconst DocumentCellRowTitle = ({ document }: DocumentCellRowTitleProps) => {\n    return (\n        <div className={\"wby-flex wby-flex-col wby-gap-y-[3px]\"}>\n            <div className={\"wby-flex wby-w-full wby-items-center\"}>\n                <Icon\n                    size={\"sm\"}\n                    color={\"neutral-strong\"}\n                    className={\"wby-mr-xs\"}\n                    icon={<File />}\n                    label={`Document - ${document.title}`}\n                />\n                <Text as={\"div\"} className={\"wby-truncate wby-min-w-0 wby-flex-shrink\"}>\n                    {document.title}\n                </Text>\n            </div>\n            <Text as={\"div\"} size={\"sm\"} className={\"wby-text-neutral-dimmed\"}>\n                {document.data.properties.path}\n            </Text>\n        </div>\n    );\n};\n\ninterface EntryCellNameProps {\n    document: DocumentDto;\n}\n\nexport const DocumentCellName = ({ document }: EntryCellNameProps) => {\n    const { getEditPageUrl } = useGetEditPageUrl();\n    return (\n        <Link\n            to={getEditPageUrl(document.id)}\n            variant={\"secondary\"}\n            className={\"wby-truncate !wby-no-underline\"}\n        >\n            <DocumentCellRowTitle document={document} />\n        </Link>\n    );\n};\n\nexport const CellName = () => {\n    const { useTableRow, isFolderRow } = PageListConfig.Browser.Table.Column;\n    const { row } = useTableRow();\n\n    if (isFolderRow(row)) {\n        return <FolderCellName folder={row} />;\n    }\n\n    return <DocumentCellName document={row} />;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,SAASC,IAAI,EAAEC,IAAI,EAAEC,IAAI,QAAQ,kBAAkB;AACnD,SAASC,cAAc,IAAIC,MAAM,QAAQ,0BAA0B;AACnE,SAASD,cAAc,IAAIE,YAAY,QAAQ,iCAAiC;AAChF,SAASF,cAAc,IAAIG,IAAI,QAAQ,+BAA+B;AACtE,SAASC,iBAAiB,QAAQ,iBAAiB;AAGnD,SAASC,cAAc;AAEvB,SAASC,iBAAiB;AAM1B,OAAO,MAAMC,cAAc,GAAGA,CAAC;EAAEC;AAA4B,CAAC,KAAK;EAC/D,MAAM;IAAEC;EAAiB,CAAC,GAAGL,iBAAiB,CAAC,CAAC;EAEhD,IAAIM,IAAI,gBAAGd,KAAA,CAAAe,aAAA,CAACV,MAAM,MAAE,CAAC;EACrB,IAAIO,MAAM,CAACI,0BAA0B,IAAIJ,MAAM,CAACK,oBAAoB,EAAE;IAClEH,IAAI,gBAAGd,KAAA,CAAAe,aAAA,CAACT,YAAY,MAAE,CAAC;EAC3B;EAEA,oBACIN,KAAA,CAAAe,aAAA;IACIG,SAAS,EACL,4GACH;IACDC,OAAO,EAAEA,CAAA,KAAMN,gBAAgB,CAACD,MAAM,CAACQ,EAAE;EAAE,gBAE3CpB,KAAA,CAAAe,aAAA,CAACd,IAAI;IACDoB,IAAI,EAAE,IAAK;IACXC,KAAK,EAAE,gBAAiB;IACxBR,IAAI,EAAEA,IAAK;IACXS,KAAK,EAAE,YAAYX,MAAM,CAACY,KAAK;EAAG,CACrC,CAAC,eACFxB,KAAA,CAAAe,aAAA,CAACZ,IAAI;IAACe,SAAS,EAAE;EAA2C,GAAEN,MAAM,CAACY,KAAY,CAChF,CAAC;AAEd,CAAC;AAMD,MAAMC,oBAAoB,GAAGA,CAAC;EAAEC;AAAoC,CAAC,KAAK;EACtE,oBACI1B,KAAA,CAAAe,aAAA;IAAKG,SAAS,EAAE;EAAwC,gBACpDlB,KAAA,CAAAe,aAAA;IAAKG,SAAS,EAAE;EAAuC,gBACnDlB,KAAA,CAAAe,aAAA,CAACd,IAAI;IACDoB,IAAI,EAAE,IAAK;IACXC,KAAK,EAAE,gBAAiB;IACxBJ,SAAS,EAAE,WAAY;IACvBJ,IAAI,eAAEd,KAAA,CAAAe,aAAA,CAACR,IAAI,MAAE,CAAE;IACfgB,KAAK,EAAE,cAAcG,QAAQ,CAACF,KAAK;EAAG,CACzC,CAAC,eACFxB,KAAA,CAAAe,aAAA,CAACZ,IAAI;IAACwB,EAAE,EAAE,KAAM;IAACT,SAAS,EAAE;EAA2C,GAClEQ,QAAQ,CAACF,KACR,CACL,CAAC,eACNxB,KAAA,CAAAe,aAAA,CAACZ,IAAI;IAACwB,EAAE,EAAE,KAAM;IAACN,IAAI,EAAE,IAAK;IAACH,SAAS,EAAE;EAA0B,GAC7DQ,QAAQ,CAACE,IAAI,CAACC,UAAU,CAACC,IACxB,CACL,CAAC;AAEd,CAAC;AAMD,OAAO,MAAMC,gBAAgB,GAAGA,CAAC;EAAEL;AAA6B,CAAC,KAAK;EAClE,MAAM;IAAEM;EAAe,CAAC,GAAGtB,iBAAiB,CAAC,CAAC;EAC9C,oBACIV,KAAA,CAAAe,aAAA,CAACb,IAAI;IACD+B,EAAE,EAAED,cAAc,CAACN,QAAQ,CAACN,EAAE,CAAE;IAChCc,OAAO,EAAE,WAAY;IACrBhB,SAAS,EAAE;EAAiC,gBAE5ClB,KAAA,CAAAe,aAAA,CAACU,oBAAoB;IAACC,QAAQ,EAAEA;EAAS,CAAE,CACzC,CAAC;AAEf,CAAC;AAED,OAAO,MAAMS,QAAQ,GAAGA,CAAA,KAAM;EAC1B,MAAM;IAAEC,WAAW;IAAEC;EAAY,CAAC,GAAG5B,cAAc,CAAC6B,OAAO,CAACC,KAAK,CAACC,MAAM;EACxE,MAAM;IAAEC;EAAI,CAAC,GAAGL,WAAW,CAAC,CAAC;EAE7B,IAAIC,WAAW,CAACI,GAAG,CAAC,EAAE;IAClB,oBAAOzC,KAAA,CAAAe,aAAA,CAACJ,cAAc;MAACC,MAAM,EAAE6B;IAAI,CAAE,CAAC;EAC1C;EAEA,oBAAOzC,KAAA,CAAAe,aAAA,CAACgB,gBAAgB;IAACL,QAAQ,EAAEe;EAAI,CAAE,CAAC;AAC9C,CAAC","ignoreList":[]}
+{"version":3,"names":["React","Icon","Link","Text","ReactComponent","File","PageListConfig","useGetEditPageUrl","FolderCellName","PageCellRowTitle","page","createElement","className","size","color","icon","label","properties","title","as","path","PageCellName","getEditPageUrl","to","id","variant","CellName","useTableRow","isFolderRow","Browser","Table","Column","row","folder","data"],"sources":["CellName.tsx"],"sourcesContent":["import React from \"react\";\nimport { Icon, Link, Text } from \"@webiny/admin-ui\";\nimport { ReactComponent as File } from \"@webiny/icons/description.svg\";\nimport { PageListConfig } from \"~/modules/pages/configs\";\nimport { useGetEditPageUrl } from \"~/modules/pages/PagesList/hooks/useGetEditPageUrl.js\";\nimport { FolderCellName } from \"~/modules/shared/FolderCellName\";\nimport type { PageDto } from \"~/domain/Page\";\n\ninterface PageCellRowTitleProps {\n    page: PageDto;\n}\n\nconst PageCellRowTitle = ({ page }: PageCellRowTitleProps) => {\n    return (\n        <div className={\"wby-flex wby-flex-col wby-gap-y-[3px]\"}>\n            <div className={\"wby-flex wby-w-full wby-items-center\"}>\n                <Icon\n                    size={\"sm\"}\n                    color={\"neutral-strong\"}\n                    className={\"wby-mr-xs\"}\n                    icon={<File />}\n                    label={`Page - ${page.properties.title}`}\n                />\n                <Text as={\"div\"} className={\"wby-truncate wby-min-w-0 wby-flex-shrink\"}>\n                    {page.properties.title}\n                </Text>\n            </div>\n            <Text as={\"div\"} size={\"sm\"} className={\"wby-text-neutral-dimmed\"}>\n                {page.properties.path}\n            </Text>\n        </div>\n    );\n};\n\ninterface EntryCellNameProps {\n    page: PageDto;\n}\n\nexport const PageCellName = ({ page }: EntryCellNameProps) => {\n    const { getEditPageUrl } = useGetEditPageUrl();\n\n    return (\n        <Link\n            to={getEditPageUrl(page.id)}\n            variant={\"secondary\"}\n            className={\"wby-truncate !wby-no-underline\"}\n        >\n            <PageCellRowTitle page={page} />\n        </Link>\n    );\n};\n\nexport const CellName = () => {\n    const { useTableRow, isFolderRow } = PageListConfig.Browser.Table.Column;\n    const { row } = useTableRow();\n\n    if (isFolderRow(row)) {\n        return <FolderCellName folder={row.data} />;\n    }\n\n    return <PageCellName page={row.data} />;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,IAAI,EAAEC,IAAI,QAAQ,kBAAkB;AACnD,SAASC,cAAc,IAAIC,IAAI,QAAQ,+BAA+B;AACtE,SAASC,cAAc;AACvB,SAASC,iBAAiB;AAC1B,SAASC,cAAc;AAOvB,MAAMC,gBAAgB,GAAGA,CAAC;EAAEC;AAA4B,CAAC,KAAK;EAC1D,oBACIV,KAAA,CAAAW,aAAA;IAAKC,SAAS,EAAE;EAAwC,gBACpDZ,KAAA,CAAAW,aAAA;IAAKC,SAAS,EAAE;EAAuC,gBACnDZ,KAAA,CAAAW,aAAA,CAACV,IAAI;IACDY,IAAI,EAAE,IAAK;IACXC,KAAK,EAAE,gBAAiB;IACxBF,SAAS,EAAE,WAAY;IACvBG,IAAI,eAAEf,KAAA,CAAAW,aAAA,CAACN,IAAI,MAAE,CAAE;IACfW,KAAK,EAAE,UAAUN,IAAI,CAACO,UAAU,CAACC,KAAK;EAAG,CAC5C,CAAC,eACFlB,KAAA,CAAAW,aAAA,CAACR,IAAI;IAACgB,EAAE,EAAE,KAAM;IAACP,SAAS,EAAE;EAA2C,GAClEF,IAAI,CAACO,UAAU,CAACC,KACf,CACL,CAAC,eACNlB,KAAA,CAAAW,aAAA,CAACR,IAAI;IAACgB,EAAE,EAAE,KAAM;IAACN,IAAI,EAAE,IAAK;IAACD,SAAS,EAAE;EAA0B,GAC7DF,IAAI,CAACO,UAAU,CAACG,IACf,CACL,CAAC;AAEd,CAAC;AAMD,OAAO,MAAMC,YAAY,GAAGA,CAAC;EAAEX;AAAyB,CAAC,KAAK;EAC1D,MAAM;IAAEY;EAAe,CAAC,GAAGf,iBAAiB,CAAC,CAAC;EAE9C,oBACIP,KAAA,CAAAW,aAAA,CAACT,IAAI;IACDqB,EAAE,EAAED,cAAc,CAACZ,IAAI,CAACc,EAAE,CAAE;IAC5BC,OAAO,EAAE,WAAY;IACrBb,SAAS,EAAE;EAAiC,gBAE5CZ,KAAA,CAAAW,aAAA,CAACF,gBAAgB;IAACC,IAAI,EAAEA;EAAK,CAAE,CAC7B,CAAC;AAEf,CAAC;AAED,OAAO,MAAMgB,QAAQ,GAAGA,CAAA,KAAM;EAC1B,MAAM;IAAEC,WAAW;IAAEC;EAAY,CAAC,GAAGtB,cAAc,CAACuB,OAAO,CAACC,KAAK,CAACC,MAAM;EACxE,MAAM;IAAEC;EAAI,CAAC,GAAGL,WAAW,CAAC,CAAC;EAE7B,IAAIC,WAAW,CAACI,GAAG,CAAC,EAAE;IAClB,oBAAOhC,KAAA,CAAAW,aAAA,CAACH,cAAc;MAACyB,MAAM,EAAED,GAAG,CAACE;IAAK,CAAE,CAAC;EAC/C;EAEA,oBAAOlC,KAAA,CAAAW,aAAA,CAACU,YAAY;IAACX,IAAI,EAAEsB,GAAG,CAACE;EAAK,CAAE,CAAC;AAC3C,CAAC","ignoreList":[]}

package/modules/pages/PagesList/components/Table/Cells/CellStatus.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo } from "react";
 import { IconButton, Tag } from "@webiny/admin-ui";
 import { ReactComponent as NewTab } from "@webiny/icons/open_in_new.svg";
-import { PageListConfig } from "../../../../../../configs/index.js";
+import { PageListConfig } from "../../../../configs";
 import { toTitleCaseLabel } from "../../../../../../shared/toTitleCaseLabel";
 import { usePagePreviewLink } from "../../../hooks/usePagePreviewLink";
 const {

package/modules/pages/PagesList/components/Table/Cells/CellStatus.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useMemo","IconButton","Tag","ReactComponent","NewTab","PageListConfig","toTitleCaseLabel","usePagePreviewLink","useTableRow","isFolderRow","Browser","Table","Column","CellStatus","row","createElement","Fragment","variant","data","status","statusLabel","className","content","version","PreviewLink","page","previewLink","openInNewTab","window","open","onClick","icon","title","size"],"sources":["CellStatus.tsx"],"sourcesContent":["import React, { useCallback, useMemo } from \"react\";\nimport { IconButton, Tag } from \"@webiny/admin-ui\";\nimport { ReactComponent as NewTab } from \"@webiny/icons/open_in_new.svg\";\nimport { PageListConfig } from \"~/configs/index.js\";\nimport { toTitleCaseLabel } from \"~/shared/toTitleCaseLabel\";\nimport { usePagePreviewLink } from \"~/modules/pages/PagesList/hooks/usePagePreviewLink\";\nimport type { PageDto } from \"~/domain/Page\";\n\nconst { useTableRow, isFolderRow } = PageListConfig.Browser.Table.Column;\n\nexport const CellStatus = () => {\n    const { row } = useTableRow<{ data: PageDto }>();\n\n    if (isFolderRow(row)) {\n        return <>{\"-\"}</>;\n    }\n\n    const variant = useMemo(() => {\n        switch (row.data.status) {\n            case \"published\":\n                return \"success\";\n            case \"unpublished\":\n                return \"warning\";\n            default:\n                return \"neutral-light\";\n        }\n    }, [row.data.status]);\n\n    const statusLabel = useMemo(() => {\n        return toTitleCaseLabel(row.data.status);\n    }, [row.data.status]);\n\n    return (\n        <div className={\"wby-flex wby-items-center\"}>\n            <Tag\n                variant={variant}\n                content={`${statusLabel}${row.data.version ? ` (v${row.data.version})` : \"\"}`}\n            />\n            <PreviewLink page={row.data} />\n        </div>\n    );\n};\n\nconst PreviewLink = ({ page }: { page: PageDto }) => {\n    const previewLink = usePagePreviewLink(page);\n\n    const openInNewTab = useCallback(() => {\n        if (previewLink) {\n            window.open(previewLink, \"_blank\");\n        }\n    }, [previewLink]);\n\n    return previewLink ? (\n        <IconButton\n            onClick={openInNewTab}\n            icon={<NewTab />}\n            title={\"Preview in new tab\"}\n            size={\"sm\"}\n            variant={\"ghost\"}\n        />\n    ) : null;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,OAAO,QAAQ,OAAO;AACnD,SAASC,UAAU,EAAEC,GAAG,QAAQ,kBAAkB;AAClD,SAASC,cAAc,IAAIC,MAAM,QAAQ,+BAA+B;AACxE,SAASC,cAAc;AACvB,SAASC,gBAAgB;AACzB,SAASC,kBAAkB;AAG3B,MAAM;EAAEC,WAAW;EAAEC;AAAY,CAAC,GAAGJ,cAAc,CAACK,OAAO,CAACC,KAAK,CAACC,MAAM;AAExE,OAAO,MAAMC,UAAU,GAAGA,CAAA,KAAM;EAC5B,MAAM;IAAEC;EAAI,CAAC,GAAGN,WAAW,CAAoB,CAAC;EAEhD,IAAIC,WAAW,CAACK,GAAG,CAAC,EAAE;IAClB,oBAAOhB,KAAA,CAAAiB,aAAA,CAAAjB,KAAA,CAAAkB,QAAA,QAAG,GAAM,CAAC;EACrB;EAEA,MAAMC,OAAO,GAAGjB,OAAO,CAAC,MAAM;IAC1B,QAAQc,GAAG,CAACI,IAAI,CAACC,MAAM;MACnB,KAAK,WAAW;QACZ,OAAO,SAAS;MACpB,KAAK,aAAa;QACd,OAAO,SAAS;MACpB;QACI,OAAO,eAAe;IAC9B;EACJ,CAAC,EAAE,CAACL,GAAG,CAACI,IAAI,CAACC,MAAM,CAAC,CAAC;EAErB,MAAMC,WAAW,GAAGpB,OAAO,CAAC,MAAM;IAC9B,OAAOM,gBAAgB,CAACQ,GAAG,CAACI,IAAI,CAACC,MAAM,CAAC;EAC5C,CAAC,EAAE,CAACL,GAAG,CAACI,IAAI,CAACC,MAAM,CAAC,CAAC;EAErB,oBACIrB,KAAA,CAAAiB,aAAA;IAAKM,SAAS,EAAE;EAA4B,gBACxCvB,KAAA,CAAAiB,aAAA,CAACb,GAAG;IACAe,OAAO,EAAEA,OAAQ;IACjBK,OAAO,EAAE,GAAGF,WAAW,GAAGN,GAAG,CAACI,IAAI,CAACK,OAAO,GAAG,MAAMT,GAAG,CAACI,IAAI,CAACK,OAAO,GAAG,GAAG,EAAE;EAAG,CACjF,CAAC,eACFzB,KAAA,CAAAiB,aAAA,CAACS,WAAW;IAACC,IAAI,EAAEX,GAAG,CAACI;EAAK,CAAE,CAC7B,CAAC;AAEd,CAAC;AAED,MAAMM,WAAW,GAAGA,CAAC;EAAEC;AAAwB,CAAC,KAAK;EACjD,MAAMC,WAAW,GAAGnB,kBAAkB,CAACkB,IAAI,CAAC;EAE5C,MAAME,YAAY,GAAG5B,WAAW,CAAC,MAAM;IACnC,IAAI2B,WAAW,EAAE;MACbE,MAAM,CAACC,IAAI,CAACH,WAAW,EAAE,QAAQ,CAAC;IACtC;EACJ,CAAC,EAAE,CAACA,WAAW,CAAC,CAAC;EAEjB,OAAOA,WAAW,gBACd5B,KAAA,CAAAiB,aAAA,CAACd,UAAU;IACP6B,OAAO,EAAEH,YAAa;IACtBI,IAAI,eAAEjC,KAAA,CAAAiB,aAAA,CAACX,MAAM,MAAE,CAAE;IACjB4B,KAAK,EAAE,oBAAqB;IAC5BC,IAAI,EAAE,IAAK;IACXhB,OAAO,EAAE;EAAQ,CACpB,CAAC,GACF,IAAI;AACZ,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useMemo","IconButton","Tag","ReactComponent","NewTab","PageListConfig","toTitleCaseLabel","usePagePreviewLink","useTableRow","isFolderRow","Browser","Table","Column","CellStatus","row","createElement","Fragment","variant","data","status","statusLabel","className","content","version","PreviewLink","page","previewLink","openInNewTab","window","open","onClick","icon","title","size"],"sources":["CellStatus.tsx"],"sourcesContent":["import React, { useCallback, useMemo } from \"react\";\nimport { IconButton, Tag } from \"@webiny/admin-ui\";\nimport { ReactComponent as NewTab } from \"@webiny/icons/open_in_new.svg\";\nimport { PageListConfig } from \"~/modules/pages/configs\";\nimport { toTitleCaseLabel } from \"~/shared/toTitleCaseLabel\";\nimport { usePagePreviewLink } from \"~/modules/pages/PagesList/hooks/usePagePreviewLink\";\nimport type { PageDto } from \"~/domain/Page\";\n\nconst { useTableRow, isFolderRow } = PageListConfig.Browser.Table.Column;\n\nexport const CellStatus = () => {\n    const { row } = useTableRow();\n\n    if (isFolderRow(row)) {\n        return <>{\"-\"}</>;\n    }\n\n    const variant = useMemo(() => {\n        switch (row.data.status) {\n            case \"published\":\n                return \"success\";\n            case \"unpublished\":\n                return \"warning\";\n            default:\n                return \"neutral-light\";\n        }\n    }, [row.data.status]);\n\n    const statusLabel = useMemo(() => {\n        return toTitleCaseLabel(row.data.status);\n    }, [row.data.status]);\n\n    return (\n        <div className={\"wby-flex wby-items-center\"}>\n            <Tag\n                variant={variant}\n                content={`${statusLabel}${row.data.version ? ` (v${row.data.version})` : \"\"}`}\n            />\n            <PreviewLink page={row.data} />\n        </div>\n    );\n};\n\nconst PreviewLink = ({ page }: { page: PageDto }) => {\n    const previewLink = usePagePreviewLink(page);\n\n    const openInNewTab = useCallback(() => {\n        if (previewLink) {\n            window.open(previewLink, \"_blank\");\n        }\n    }, [previewLink]);\n\n    return previewLink ? (\n        <IconButton\n            onClick={openInNewTab}\n            icon={<NewTab />}\n            title={\"Preview in new tab\"}\n            size={\"sm\"}\n            variant={\"ghost\"}\n        />\n    ) : null;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,OAAO,QAAQ,OAAO;AACnD,SAASC,UAAU,EAAEC,GAAG,QAAQ,kBAAkB;AAClD,SAASC,cAAc,IAAIC,MAAM,QAAQ,+BAA+B;AACxE,SAASC,cAAc;AACvB,SAASC,gBAAgB;AACzB,SAASC,kBAAkB;AAG3B,MAAM;EAAEC,WAAW;EAAEC;AAAY,CAAC,GAAGJ,cAAc,CAACK,OAAO,CAACC,KAAK,CAACC,MAAM;AAExE,OAAO,MAAMC,UAAU,GAAGA,CAAA,KAAM;EAC5B,MAAM;IAAEC;EAAI,CAAC,GAAGN,WAAW,CAAC,CAAC;EAE7B,IAAIC,WAAW,CAACK,GAAG,CAAC,EAAE;IAClB,oBAAOhB,KAAA,CAAAiB,aAAA,CAAAjB,KAAA,CAAAkB,QAAA,QAAG,GAAM,CAAC;EACrB;EAEA,MAAMC,OAAO,GAAGjB,OAAO,CAAC,MAAM;IAC1B,QAAQc,GAAG,CAACI,IAAI,CAACC,MAAM;MACnB,KAAK,WAAW;QACZ,OAAO,SAAS;MACpB,KAAK,aAAa;QACd,OAAO,SAAS;MACpB;QACI,OAAO,eAAe;IAC9B;EACJ,CAAC,EAAE,CAACL,GAAG,CAACI,IAAI,CAACC,MAAM,CAAC,CAAC;EAErB,MAAMC,WAAW,GAAGpB,OAAO,CAAC,MAAM;IAC9B,OAAOM,gBAAgB,CAACQ,GAAG,CAACI,IAAI,CAACC,MAAM,CAAC;EAC5C,CAAC,EAAE,CAACL,GAAG,CAACI,IAAI,CAACC,MAAM,CAAC,CAAC;EAErB,oBACIrB,KAAA,CAAAiB,aAAA;IAAKM,SAAS,EAAE;EAA4B,gBACxCvB,KAAA,CAAAiB,aAAA,CAACb,GAAG;IACAe,OAAO,EAAEA,OAAQ;IACjBK,OAAO,EAAE,GAAGF,WAAW,GAAGN,GAAG,CAACI,IAAI,CAACK,OAAO,GAAG,MAAMT,GAAG,CAACI,IAAI,CAACK,OAAO,GAAG,GAAG,EAAE;EAAG,CACjF,CAAC,eACFzB,KAAA,CAAAiB,aAAA,CAACS,WAAW;IAACC,IAAI,EAAEX,GAAG,CAACI;EAAK,CAAE,CAC7B,CAAC;AAEd,CAAC;AAED,MAAMM,WAAW,GAAGA,CAAC;EAAEC;AAAwB,CAAC,KAAK;EACjD,MAAMC,WAAW,GAAGnB,kBAAkB,CAACkB,IAAI,CAAC;EAE5C,MAAME,YAAY,GAAG5B,WAAW,CAAC,MAAM;IACnC,IAAI2B,WAAW,EAAE;MACbE,MAAM,CAACC,IAAI,CAACH,WAAW,EAAE,QAAQ,CAAC;IACtC;EACJ,CAAC,EAAE,CAACA,WAAW,CAAC,CAAC;EAEjB,OAAOA,WAAW,gBACd5B,KAAA,CAAAiB,aAAA,CAACd,UAAU;IACP6B,OAAO,EAAEH,YAAa;IACtBI,IAAI,eAAEjC,KAAA,CAAAiB,aAAA,CAACX,MAAM,MAAE,CAAE;IACjB4B,KAAK,EAAE,oBAAqB;IAC5BC,IAAI,EAAE,IAAK;IACXhB,OAAO,EAAE;EAAQ,CACpB,CAAC,GACF,IAAI;AACZ,CAAC","ignoreList":[]}

package/modules/pages/PagesList/components/Table/Table.js

@@ -1,5 +1,5 @@
-import React from "react";
-import { Table as AcoTable } from "@webiny/app-aco";
+import React, { useMemo } from "react";
+import { createFoldersData, createRecordsData, Table as AcoTable } from "@webiny/app-aco";
 import { useDocumentList } from "../../useDocumentList.js";
 import { useSortPages } from "../../../../../features/pages/index.js";
 import { useSelectPages } from "../../../../../features/pages/selectPages/useSelectPages.js";
@@ -13,15 +13,21 @@ export const Table = () => {
   const {
     selectPages
   } = useSelectPages();
+  const data = useMemo(() => {
+    return [...createFoldersData(vm.folders), ...createRecordsData(vm.data)];
+  }, [vm.folders, vm.data]);
+  const selected = useMemo(() => {
+    return createRecordsData(vm.selected);
+  }, [vm.selected]);
   return /*#__PURE__*/React.createElement(AcoTable, {
-    data: vm.data,
+    data: data,
     loading: vm.isLoading,
     sorting: vm.sorting,
     onSortingChange: sort => sortPages(sort),
     onSelectRow: documents => selectPages(documents),
-    selected: vm.selected,
+    selected: selected,
     nameColumnId: "name",
-    namespace: "wb-document"
+    namespace: "wbPage"
   });
 };
 

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

@@ -1 +1 @@
-{"version":3,"names":["React","Table","AcoTable","useDocumentList","useSortPages","useSelectPages","vm","sortPages","selectPages","createElement","data","loading","isLoading","sorting","onSortingChange","sort","onSelectRow","documents","selected","nameColumnId","namespace"],"sources":["Table.tsx"],"sourcesContent":["import React from \"react\";\nimport { Table as AcoTable } from \"@webiny/app-aco\";\nimport type { DocumentDto } from \"~/modules/pages/PagesList/presenters/index.js\";\nimport { useDocumentList } from \"~/modules/pages/PagesList/useDocumentList.js\";\nimport { useSortPages } from \"~/features/pages/index.js\";\nimport { useSelectPages } from \"~/features/pages/selectPages/useSelectPages.js\";\n\nexport const Table = () => {\n    const { vm } = useDocumentList();\n    const { sortPages } = useSortPages();\n    const { selectPages } = useSelectPages();\n\n    return (\n        <AcoTable<DocumentDto>\n            data={vm.data}\n            loading={vm.isLoading}\n            sorting={vm.sorting}\n            onSortingChange={sort => sortPages(sort)}\n            onSelectRow={documents => selectPages(documents)}\n            selected={vm.selected}\n            nameColumnId={\"name\"}\n            namespace={\"wb-document\"}\n        />\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,KAAK,IAAIC,QAAQ,QAAQ,iBAAiB;AAEnD,SAASC,eAAe;AACxB,SAASC,YAAY;AACrB,SAASC,cAAc;AAEvB,OAAO,MAAMJ,KAAK,GAAGA,CAAA,KAAM;EACvB,MAAM;IAAEK;EAAG,CAAC,GAAGH,eAAe,CAAC,CAAC;EAChC,MAAM;IAAEI;EAAU,CAAC,GAAGH,YAAY,CAAC,CAAC;EACpC,MAAM;IAAEI;EAAY,CAAC,GAAGH,cAAc,CAAC,CAAC;EAExC,oBACIL,KAAA,CAAAS,aAAA,CAACP,QAAQ;IACLQ,IAAI,EAAEJ,EAAE,CAACI,IAAK;IACdC,OAAO,EAAEL,EAAE,CAACM,SAAU;IACtBC,OAAO,EAAEP,EAAE,CAACO,OAAQ;IACpBC,eAAe,EAAEC,IAAI,IAAIR,SAAS,CAACQ,IAAI,CAAE;IACzCC,WAAW,EAAEC,SAAS,IAAIT,WAAW,CAACS,SAAS,CAAE;IACjDC,QAAQ,EAAEZ,EAAE,CAACY,QAAS;IACtBC,YAAY,EAAE,MAAO;IACrBC,SAAS,EAAE;EAAc,CAC5B,CAAC;AAEV,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useMemo","createFoldersData","createRecordsData","Table","AcoTable","useDocumentList","useSortPages","useSelectPages","vm","sortPages","selectPages","data","folders","selected","createElement","loading","isLoading","sorting","onSortingChange","sort","onSelectRow","documents","nameColumnId","namespace"],"sources":["Table.tsx"],"sourcesContent":["import React, { useMemo } from \"react\";\nimport { createFoldersData, createRecordsData, Table as AcoTable } from \"@webiny/app-aco\";\nimport { useDocumentList } from \"~/modules/pages/PagesList/useDocumentList.js\";\nimport { useSortPages } from \"~/features/pages/index.js\";\nimport { useSelectPages } from \"~/features/pages/selectPages/useSelectPages.js\";\nimport type { TableRow } from \"~/modules/pages/types\";\n\nexport const Table = () => {\n    const { vm } = useDocumentList();\n    const { sortPages } = useSortPages();\n    const { selectPages } = useSelectPages();\n\n    const data = useMemo<TableRow[]>(() => {\n        return [...createFoldersData(vm.folders), ...createRecordsData(vm.data)];\n    }, [vm.folders, vm.data]);\n\n    const selected = useMemo<TableRow[]>(() => {\n        return createRecordsData(vm.selected);\n    }, [vm.selected]);\n\n    return (\n        <AcoTable<TableRow>\n            data={data}\n            loading={vm.isLoading}\n            sorting={vm.sorting}\n            onSortingChange={sort => sortPages(sort)}\n            onSelectRow={documents => selectPages(documents)}\n            selected={selected}\n            nameColumnId={\"name\"}\n            namespace={\"wbPage\"}\n        />\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,SAASC,iBAAiB,EAAEC,iBAAiB,EAAEC,KAAK,IAAIC,QAAQ,QAAQ,iBAAiB;AACzF,SAASC,eAAe;AACxB,SAASC,YAAY;AACrB,SAASC,cAAc;AAGvB,OAAO,MAAMJ,KAAK,GAAGA,CAAA,KAAM;EACvB,MAAM;IAAEK;EAAG,CAAC,GAAGH,eAAe,CAAC,CAAC;EAChC,MAAM;IAAEI;EAAU,CAAC,GAAGH,YAAY,CAAC,CAAC;EACpC,MAAM;IAAEI;EAAY,CAAC,GAAGH,cAAc,CAAC,CAAC;EAExC,MAAMI,IAAI,GAAGX,OAAO,CAAa,MAAM;IACnC,OAAO,CAAC,GAAGC,iBAAiB,CAACO,EAAE,CAACI,OAAO,CAAC,EAAE,GAAGV,iBAAiB,CAACM,EAAE,CAACG,IAAI,CAAC,CAAC;EAC5E,CAAC,EAAE,CAACH,EAAE,CAACI,OAAO,EAAEJ,EAAE,CAACG,IAAI,CAAC,CAAC;EAEzB,MAAME,QAAQ,GAAGb,OAAO,CAAa,MAAM;IACvC,OAAOE,iBAAiB,CAACM,EAAE,CAACK,QAAQ,CAAC;EACzC,CAAC,EAAE,CAACL,EAAE,CAACK,QAAQ,CAAC,CAAC;EAEjB,oBACId,KAAA,CAAAe,aAAA,CAACV,QAAQ;IACLO,IAAI,EAAEA,IAAK;IACXI,OAAO,EAAEP,EAAE,CAACQ,SAAU;IACtBC,OAAO,EAAET,EAAE,CAACS,OAAQ;IACpBC,eAAe,EAAEC,IAAI,IAAIV,SAAS,CAACU,IAAI,CAAE;IACzCC,WAAW,EAAEC,SAAS,IAAIX,WAAW,CAACW,SAAS,CAAE;IACjDR,QAAQ,EAAEA,QAAS;IACnBS,YAAY,EAAE,MAAO;IACrBC,SAAS,EAAE;EAAS,CACvB,CAAC;AAEV,CAAC","ignoreList":[]}

package/modules/pages/PagesList/hooks/useDeletePageConfirmationDialog.d.ts

@@ -1,8 +1,8 @@
-import type { DocumentDto } from "../presenters/index.js";
+import type { PageDto } from "../../../../domain/Page";
 interface UseDeletePageConfirmationDialogProps {
-    page: DocumentDto;
+    page: PageDto;
 }
 export declare const useDeletePageConfirmationDialog: ({ page }: UseDeletePageConfirmationDialogProps) => {
-    openUnpublishPageConfirmationDialog: () => void;
+    openDeletePageConfirmationDialog: () => void;
 };
 export {};

package/modules/pages/PagesList/hooks/useDeletePageConfirmationDialog.js

@@ -14,20 +14,20 @@ export const useDeletePageConfirmationDialog = ({
     showConfirmation
   } = useConfirmationDialog({
     title: "Delete page",
-    message: /*#__PURE__*/React.createElement("p", null, "You are about to permanently delete ", /*#__PURE__*/React.createElement("strong", null, page.title), " and all of its revisions. Are you sure you want to continue?")
+    message: /*#__PURE__*/React.createElement("p", null, "You are about to permanently delete ", /*#__PURE__*/React.createElement("strong", null, page.properties.title), " and all of its revisions. Are you sure you want to continue?")
   });
-  const openUnpublishPageConfirmationDialog = useCallback(() => showConfirmation(async () => {
+  const openDeletePageConfirmationDialog = useCallback(() => showConfirmation(async () => {
     try {
       await deletePage({
         id: page.id
       });
-      showSnackbar(`${page.title} was deleted successfully!`);
+      showSnackbar(`${page.properties.title} was deleted successfully!`);
     } catch (ex) {
-      showSnackbar(ex.message || `Error while deleting ${page.title}`);
+      showSnackbar(ex.message || `Error while deleting ${page.properties.title}`);
     }
   }), [page]);
   return {
-    openUnpublishPageConfirmationDialog
+    openDeletePageConfirmationDialog
   };
 };
 

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

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useDeletePage","useConfirmationDialog","useSnackbar","useDeletePageConfirmationDialog","page","deletePage","showSnackbar","showConfirmation","title","message","createElement","openUnpublishPageConfirmationDialog","id","ex"],"sources":["useDeletePageConfirmationDialog.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { useDeletePage } from \"~/features/pages/index.js\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin\";\nimport type { DocumentDto } from \"~/modules/pages/PagesList/presenters/index.js\";\n\ninterface UseDeletePageConfirmationDialogProps {\n    page: DocumentDto;\n}\n\nexport const useDeletePageConfirmationDialog = ({ page }: UseDeletePageConfirmationDialogProps) => {\n    const { deletePage } = useDeletePage();\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation } = useConfirmationDialog({\n        title: \"Delete page\",\n        message: (\n            <p>\n                You are about to permanently delete <strong>{page.title}</strong> and all of its\n                revisions. Are you sure you want to continue?\n            </p>\n        )\n    });\n\n    const openUnpublishPageConfirmationDialog = useCallback(\n        () =>\n            showConfirmation(async () => {\n                try {\n                    await deletePage({ id: page.id });\n                    showSnackbar(`${page.title} was deleted successfully!`);\n                } catch (ex) {\n                    showSnackbar(ex.message || `Error while deleting ${page.title}`);\n                }\n            }),\n        [page]\n    );\n\n    return { openUnpublishPageConfirmationDialog };\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,SAASC,aAAa;AACtB,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,mBAAmB;AAOtE,OAAO,MAAMC,+BAA+B,GAAGA,CAAC;EAAEC;AAA2C,CAAC,KAAK;EAC/F,MAAM;IAAEC;EAAW,CAAC,GAAGL,aAAa,CAAC,CAAC;EACtC,MAAM;IAAEM;EAAa,CAAC,GAAGJ,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEK;EAAiB,CAAC,GAAGN,qBAAqB,CAAC;IAC/CO,KAAK,EAAE,aAAa;IACpBC,OAAO,eACHX,KAAA,CAAAY,aAAA,YAAG,sCACqC,eAAAZ,KAAA,CAAAY,aAAA,iBAASN,IAAI,CAACI,KAAc,CAAC,iEAElE;EAEX,CAAC,CAAC;EAEF,MAAMG,mCAAmC,GAAGZ,WAAW,CACnD,MACIQ,gBAAgB,CAAC,YAAY;IACzB,IAAI;MACA,MAAMF,UAAU,CAAC;QAAEO,EAAE,EAAER,IAAI,CAACQ;MAAG,CAAC,CAAC;MACjCN,YAAY,CAAC,GAAGF,IAAI,CAACI,KAAK,4BAA4B,CAAC;IAC3D,CAAC,CAAC,OAAOK,EAAE,EAAE;MACTP,YAAY,CAACO,EAAE,CAACJ,OAAO,IAAI,wBAAwBL,IAAI,CAACI,KAAK,EAAE,CAAC;IACpE;EACJ,CAAC,CAAC,EACN,CAACJ,IAAI,CACT,CAAC;EAED,OAAO;IAAEO;EAAoC,CAAC;AAClD,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useDeletePage","useConfirmationDialog","useSnackbar","useDeletePageConfirmationDialog","page","deletePage","showSnackbar","showConfirmation","title","message","createElement","properties","openDeletePageConfirmationDialog","id","ex"],"sources":["useDeletePageConfirmationDialog.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { useDeletePage } from \"~/features/pages/index.js\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin\";\nimport type { PageDto } from \"~/domain/Page\";\n\ninterface UseDeletePageConfirmationDialogProps {\n    page: PageDto;\n}\n\nexport const useDeletePageConfirmationDialog = ({ page }: UseDeletePageConfirmationDialogProps) => {\n    const { deletePage } = useDeletePage();\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation } = useConfirmationDialog({\n        title: \"Delete page\",\n        message: (\n            <p>\n                You are about to permanently delete <strong>{page.properties.title}</strong> and all\n                of its revisions. Are you sure you want to continue?\n            </p>\n        )\n    });\n\n    const openDeletePageConfirmationDialog = useCallback(\n        () =>\n            showConfirmation(async () => {\n                try {\n                    await deletePage({ id: page.id });\n                    showSnackbar(`${page.properties.title} was deleted successfully!`);\n                } catch (ex) {\n                    showSnackbar(ex.message || `Error while deleting ${page.properties.title}`);\n                }\n            }),\n        [page]\n    );\n\n    return { openDeletePageConfirmationDialog };\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,SAASC,aAAa;AACtB,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,mBAAmB;AAOtE,OAAO,MAAMC,+BAA+B,GAAGA,CAAC;EAAEC;AAA2C,CAAC,KAAK;EAC/F,MAAM;IAAEC;EAAW,CAAC,GAAGL,aAAa,CAAC,CAAC;EACtC,MAAM;IAAEM;EAAa,CAAC,GAAGJ,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEK;EAAiB,CAAC,GAAGN,qBAAqB,CAAC;IAC/CO,KAAK,EAAE,aAAa;IACpBC,OAAO,eACHX,KAAA,CAAAY,aAAA,YAAG,sCACqC,eAAAZ,KAAA,CAAAY,aAAA,iBAASN,IAAI,CAACO,UAAU,CAACH,KAAc,CAAC,iEAE7E;EAEX,CAAC,CAAC;EAEF,MAAMI,gCAAgC,GAAGb,WAAW,CAChD,MACIQ,gBAAgB,CAAC,YAAY;IACzB,IAAI;MACA,MAAMF,UAAU,CAAC;QAAEQ,EAAE,EAAET,IAAI,CAACS;MAAG,CAAC,CAAC;MACjCP,YAAY,CAAC,GAAGF,IAAI,CAACO,UAAU,CAACH,KAAK,4BAA4B,CAAC;IACtE,CAAC,CAAC,OAAOM,EAAE,EAAE;MACTR,YAAY,CAACQ,EAAE,CAACL,OAAO,IAAI,wBAAwBL,IAAI,CAACO,UAAU,CAACH,KAAK,EAAE,CAAC;IAC/E;EACJ,CAAC,CAAC,EACN,CAACJ,IAAI,CACT,CAAC;EAED,OAAO;IAAEQ;EAAiC,CAAC;AAC/C,CAAC","ignoreList":[]}

package/modules/pages/PagesList/hooks/useDuplicatePageConfirmationDialog.d.ts

@@ -1,6 +1,6 @@
-import type { DocumentDto } from "../presenters/index.js";
+import type { PageDto } from "../../../../domain/Page";
 interface UseDuplicatePageConfirmationDialogProps {
-    page: DocumentDto;
+    page: PageDto;
 }
 export declare const useDuplicatePageConfirmationDialog: ({ page }: UseDuplicatePageConfirmationDialogProps) => {
     openDuplicatePageConfirmationDialog: () => void;

package/modules/pages/PagesList/hooks/useDuplicatePageConfirmationDialog.js

@@ -14,16 +14,16 @@ export const useDuplicatePageConfirmationDialog = ({
     showConfirmation
   } = useConfirmationDialog({
     title: "Duplicate page",
-    message: /*#__PURE__*/React.createElement("p", null, "You are about to duplicate ", /*#__PURE__*/React.createElement("strong", null, page.title), ". Are you sure you want to continue?")
+    message: /*#__PURE__*/React.createElement("p", null, "You are about to duplicate ", /*#__PURE__*/React.createElement("strong", null, page.properties.title), ". Are you sure you want to continue?")
   });
   const openDuplicatePageConfirmationDialog = useCallback(() => showConfirmation(async () => {
     try {
       await duplicatePage({
         id: page.id
       });
-      showSnackbar(`${page.title} was duplicated successfully!`);
+      showSnackbar(`${page.properties.title} was duplicated successfully!`);
     } catch (ex) {
-      showSnackbar(ex.message || `Error while duplicating ${page.title}`);
+      showSnackbar(ex.message || `Error while duplicating ${page.properties.title}`);
     }
   }), [page]);
   return {

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

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useDuplicatePage","useConfirmationDialog","useSnackbar","useDuplicatePageConfirmationDialog","page","duplicatePage","showSnackbar","showConfirmation","title","message","createElement","openDuplicatePageConfirmationDialog","id","ex"],"sources":["useDuplicatePageConfirmationDialog.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { useDuplicatePage } from \"~/features/pages/index.js\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin\";\nimport type { DocumentDto } from \"~/modules/pages/PagesList/presenters/index.js\";\n\ninterface UseDuplicatePageConfirmationDialogProps {\n    page: DocumentDto;\n}\n\nexport const useDuplicatePageConfirmationDialog = ({\n    page\n}: UseDuplicatePageConfirmationDialogProps) => {\n    const { duplicatePage } = useDuplicatePage();\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation } = useConfirmationDialog({\n        title: \"Duplicate page\",\n        message: (\n            <p>\n                You are about to duplicate <strong>{page.title}</strong>. Are you sure you want to\n                continue?\n            </p>\n        )\n    });\n\n    const openDuplicatePageConfirmationDialog = useCallback(\n        () =>\n            showConfirmation(async () => {\n                try {\n                    await duplicatePage({ id: page.id });\n                    showSnackbar(`${page.title} was duplicated successfully!`);\n                } catch (ex) {\n                    showSnackbar(ex.message || `Error while duplicating ${page.title}`);\n                }\n            }),\n        [page]\n    );\n\n    return { openDuplicatePageConfirmationDialog };\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,SAASC,gBAAgB;AACzB,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,mBAAmB;AAOtE,OAAO,MAAMC,kCAAkC,GAAGA,CAAC;EAC/CC;AACqC,CAAC,KAAK;EAC3C,MAAM;IAAEC;EAAc,CAAC,GAAGL,gBAAgB,CAAC,CAAC;EAC5C,MAAM;IAAEM;EAAa,CAAC,GAAGJ,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEK;EAAiB,CAAC,GAAGN,qBAAqB,CAAC;IAC/CO,KAAK,EAAE,gBAAgB;IACvBC,OAAO,eACHX,KAAA,CAAAY,aAAA,YAAG,6BAC4B,eAAAZ,KAAA,CAAAY,aAAA,iBAASN,IAAI,CAACI,KAAc,CAAC,wCAEzD;EAEX,CAAC,CAAC;EAEF,MAAMG,mCAAmC,GAAGZ,WAAW,CACnD,MACIQ,gBAAgB,CAAC,YAAY;IACzB,IAAI;MACA,MAAMF,aAAa,CAAC;QAAEO,EAAE,EAAER,IAAI,CAACQ;MAAG,CAAC,CAAC;MACpCN,YAAY,CAAC,GAAGF,IAAI,CAACI,KAAK,+BAA+B,CAAC;IAC9D,CAAC,CAAC,OAAOK,EAAE,EAAE;MACTP,YAAY,CAACO,EAAE,CAACJ,OAAO,IAAI,2BAA2BL,IAAI,CAACI,KAAK,EAAE,CAAC;IACvE;EACJ,CAAC,CAAC,EACN,CAACJ,IAAI,CACT,CAAC;EAED,OAAO;IAAEO;EAAoC,CAAC;AAClD,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useDuplicatePage","useConfirmationDialog","useSnackbar","useDuplicatePageConfirmationDialog","page","duplicatePage","showSnackbar","showConfirmation","title","message","createElement","properties","openDuplicatePageConfirmationDialog","id","ex"],"sources":["useDuplicatePageConfirmationDialog.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { useDuplicatePage } from \"~/features/pages/index.js\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin\";\nimport type { PageDto } from \"~/domain/Page\";\n\ninterface UseDuplicatePageConfirmationDialogProps {\n    page: PageDto;\n}\n\nexport const useDuplicatePageConfirmationDialog = ({\n    page\n}: UseDuplicatePageConfirmationDialogProps) => {\n    const { duplicatePage } = useDuplicatePage();\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation } = useConfirmationDialog({\n        title: \"Duplicate page\",\n        message: (\n            <p>\n                You are about to duplicate <strong>{page.properties.title}</strong>. Are you sure\n                you want to continue?\n            </p>\n        )\n    });\n\n    const openDuplicatePageConfirmationDialog = useCallback(\n        () =>\n            showConfirmation(async () => {\n                try {\n                    await duplicatePage({ id: page.id });\n                    showSnackbar(`${page.properties.title} was duplicated successfully!`);\n                } catch (ex) {\n                    showSnackbar(ex.message || `Error while duplicating ${page.properties.title}`);\n                }\n            }),\n        [page]\n    );\n\n    return { openDuplicatePageConfirmationDialog };\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,SAASC,gBAAgB;AACzB,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,mBAAmB;AAOtE,OAAO,MAAMC,kCAAkC,GAAGA,CAAC;EAC/CC;AACqC,CAAC,KAAK;EAC3C,MAAM;IAAEC;EAAc,CAAC,GAAGL,gBAAgB,CAAC,CAAC;EAC5C,MAAM;IAAEM;EAAa,CAAC,GAAGJ,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEK;EAAiB,CAAC,GAAGN,qBAAqB,CAAC;IAC/CO,KAAK,EAAE,gBAAgB;IACvBC,OAAO,eACHX,KAAA,CAAAY,aAAA,YAAG,6BAC4B,eAAAZ,KAAA,CAAAY,aAAA,iBAASN,IAAI,CAACO,UAAU,CAACH,KAAc,CAAC,wCAEpE;EAEX,CAAC,CAAC;EAEF,MAAMI,mCAAmC,GAAGb,WAAW,CACnD,MACIQ,gBAAgB,CAAC,YAAY;IACzB,IAAI;MACA,MAAMF,aAAa,CAAC;QAAEQ,EAAE,EAAET,IAAI,CAACS;MAAG,CAAC,CAAC;MACpCP,YAAY,CAAC,GAAGF,IAAI,CAACO,UAAU,CAACH,KAAK,+BAA+B,CAAC;IACzE,CAAC,CAAC,OAAOM,EAAE,EAAE;MACTR,YAAY,CAACQ,EAAE,CAACL,OAAO,IAAI,2BAA2BL,IAAI,CAACO,UAAU,CAACH,KAAK,EAAE,CAAC;IAClF;EACJ,CAAC,CAAC,EACN,CAACJ,IAAI,CACT,CAAC;EAED,OAAO;IAAEQ;EAAoC,CAAC;AAClD,CAAC","ignoreList":[]}

package/modules/pages/PagesList/hooks/useGetEditPageUrl.js

@@ -1,6 +1,6 @@
 import { useCallback } from "react";
 import { useNavigateFolder } from "@webiny/app-aco";
-import { PAGE_EDITOR_ROUTE } from "../../../../constants.js";
+import { WB_PAGE_EDITOR_ROUTE } from "../../../../constants.js";
 export const useGetEditPageUrl = () => {
   const {
     currentFolderId
@@ -13,7 +13,7 @@ export const useGetEditPageUrl = () => {
       }
     }
     const idPath = encodeURIComponent(id);
-    return `${PAGE_EDITOR_ROUTE}/${idPath}?${queryParams.join("&")}`;
+    return `${WB_PAGE_EDITOR_ROUTE}/${idPath}?${queryParams.join("&")}`;
   }, [currentFolderId]);
   return {
     getEditPageUrl

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useNavigateFolder","PAGE_EDITOR_ROUTE","useGetEditPageUrl","currentFolderId","getEditPageUrl","id","queryParams","push","encodeURIComponent","idPath","join"],"sources":["useGetEditPageUrl.tsx"],"sourcesContent":["import { useCallback } from \"react\";\nimport { useNavigateFolder } from \"@webiny/app-aco\";\nimport { PAGE_EDITOR_ROUTE } from \"~/constants.js\";\n\nexport const useGetEditPageUrl = () => {\n    const { currentFolderId } = useNavigateFolder();\n\n    const getEditPageUrl = useCallback(\n        (id: string) => {\n            const queryParams = [];\n            if (currentFolderId) {\n                {\n                    queryParams.push(`folderId=${encodeURIComponent(currentFolderId)}`);\n                }\n            }\n\n            const idPath = encodeURIComponent(id);\n\n            return `${PAGE_EDITOR_ROUTE}/${idPath}?${queryParams.join(\"&\")}`;\n        },\n        [currentFolderId]\n    );\n\n    return {\n        getEditPageUrl\n    };\n};\n"],"mappings":"AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,iBAAiB,QAAQ,iBAAiB;AACnD,SAASC,iBAAiB;AAE1B,OAAO,MAAMC,iBAAiB,GAAGA,CAAA,KAAM;EACnC,MAAM;IAAEC;EAAgB,CAAC,GAAGH,iBAAiB,CAAC,CAAC;EAE/C,MAAMI,cAAc,GAAGL,WAAW,CAC7BM,EAAU,IAAK;IACZ,MAAMC,WAAW,GAAG,EAAE;IACtB,IAAIH,eAAe,EAAE;MACjB;QACIG,WAAW,CAACC,IAAI,CAAC,YAAYC,kBAAkB,CAACL,eAAe,CAAC,EAAE,CAAC;MACvE;IACJ;IAEA,MAAMM,MAAM,GAAGD,kBAAkB,CAACH,EAAE,CAAC;IAErC,OAAO,GAAGJ,iBAAiB,IAAIQ,MAAM,IAAIH,WAAW,CAACI,IAAI,CAAC,GAAG,CAAC,EAAE;EACpE,CAAC,EACD,CAACP,eAAe,CACpB,CAAC;EAED,OAAO;IACHC;EACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useNavigateFolder","WB_PAGE_EDITOR_ROUTE","useGetEditPageUrl","currentFolderId","getEditPageUrl","id","queryParams","push","encodeURIComponent","idPath","join"],"sources":["useGetEditPageUrl.tsx"],"sourcesContent":["import { useCallback } from \"react\";\nimport { useNavigateFolder } from \"@webiny/app-aco\";\nimport { WB_PAGE_EDITOR_ROUTE } from \"~/constants.js\";\n\nexport const useGetEditPageUrl = () => {\n    const { currentFolderId } = useNavigateFolder();\n\n    const getEditPageUrl = useCallback(\n        (id: string) => {\n            const queryParams = [];\n            if (currentFolderId) {\n                {\n                    queryParams.push(`folderId=${encodeURIComponent(currentFolderId)}`);\n                }\n            }\n\n            const idPath = encodeURIComponent(id);\n\n            return `${WB_PAGE_EDITOR_ROUTE}/${idPath}?${queryParams.join(\"&\")}`;\n        },\n        [currentFolderId]\n    );\n\n    return {\n        getEditPageUrl\n    };\n};\n"],"mappings":"AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,iBAAiB,QAAQ,iBAAiB;AACnD,SAASC,oBAAoB;AAE7B,OAAO,MAAMC,iBAAiB,GAAGA,CAAA,KAAM;EACnC,MAAM;IAAEC;EAAgB,CAAC,GAAGH,iBAAiB,CAAC,CAAC;EAE/C,MAAMI,cAAc,GAAGL,WAAW,CAC7BM,EAAU,IAAK;IACZ,MAAMC,WAAW,GAAG,EAAE;IACtB,IAAIH,eAAe,EAAE;MACjB;QACIG,WAAW,CAACC,IAAI,CAAC,YAAYC,kBAAkB,CAACL,eAAe,CAAC,EAAE,CAAC;MACvE;IACJ;IAEA,MAAMM,MAAM,GAAGD,kBAAkB,CAACH,EAAE,CAAC;IAErC,OAAO,GAAGJ,oBAAoB,IAAIQ,MAAM,IAAIH,WAAW,CAACI,IAAI,CAAC,GAAG,CAAC,EAAE;EACvE,CAAC,EACD,CAACP,eAAe,CACpB,CAAC;EAED,OAAO;IACHC;EACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/modules/pages/PagesList/hooks/useMovePageToFolderDialog.d.ts

@@ -1,6 +1,6 @@
-import type { DocumentDto } from "../presenters/index.js";
+import type { PageDto } from "../../../../domain/Page";
 interface UseMovePageToFolderDialog {
-    page: DocumentDto;
+    page: PageDto;
 }
 export declare function useMovePageToFolderDialog({ page }: UseMovePageToFolderDialog): {
     openMovePageToFolderDialog: () => void;

package/modules/pages/PagesList/hooks/useMovePageToFolderDialog.js

@@ -20,7 +20,7 @@ export function useMovePageToFolderDialog({
       message: "Select a new location for this page:",
       loadingLabel: "Moving page...",
       acceptLabel: "Move page",
-      focusedFolderId: page.data.location.folderId,
+      focusedFolderId: page.location.folderId,
       async onAccept({
         folder
       }) {
@@ -28,7 +28,7 @@ export function useMovePageToFolderDialog({
           id: page.id,
           folderId: folder.id
         });
-        showSnackbar(`Page "${page.title}" was successfully moved to folder "${folder.label}"!`);
+        showSnackbar(`Page "${page.properties.title}" was successfully moved to folder "${folder.label}"!`);
       }
     });
   }, [page.id]);

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useSnackbar","useMoveToFolderDialog","useMovePage","useMovePageToFolderDialog","page","showSnackbar","showDialog","movePage","openMovePageToFolderDialog","title","message","loadingLabel","acceptLabel","focusedFolderId","data","location","folderId","onAccept","folder","id","label"],"sources":["useMovePageToFolderDialog.tsx"],"sourcesContent":["import { useCallback } from \"react\";\nimport { useSnackbar } from \"@webiny/app-admin\";\nimport { useMoveToFolderDialog } from \"@webiny/app-aco\";\nimport type { DocumentDto } from \"~/modules/pages/PagesList/presenters/index.js\";\nimport { useMovePage } from \"~/features/pages/index.js\";\n\ninterface UseMovePageToFolderDialog {\n    page: DocumentDto;\n}\n\nexport function useMovePageToFolderDialog({ page }: UseMovePageToFolderDialog) {\n    const { showSnackbar } = useSnackbar();\n    const { showDialog } = useMoveToFolderDialog();\n    const { movePage } = useMovePage();\n\n    const openMovePageToFolderDialog = useCallback(() => {\n        showDialog({\n            title: \"Move page to a new location\",\n            message: \"Select a new location for this page:\",\n            loadingLabel: \"Moving page...\",\n            acceptLabel: \"Move page\",\n            focusedFolderId: page.data.location.folderId,\n            async onAccept({ folder }) {\n                await movePage({\n                    id: page.id,\n                    folderId: folder.id\n                });\n                showSnackbar(\n                    `Page \"${page.title}\" was successfully moved to folder \"${folder.label}\"!`\n                );\n            }\n        });\n    }, [page.id]);\n\n    return {\n        openMovePageToFolderDialog\n    };\n}\n"],"mappings":"AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,WAAW,QAAQ,mBAAmB;AAC/C,SAASC,qBAAqB,QAAQ,iBAAiB;AAEvD,SAASC,WAAW;AAMpB,OAAO,SAASC,yBAAyBA,CAAC;EAAEC;AAAgC,CAAC,EAAE;EAC3E,MAAM;IAAEC;EAAa,CAAC,GAAGL,WAAW,CAAC,CAAC;EACtC,MAAM;IAAEM;EAAW,CAAC,GAAGL,qBAAqB,CAAC,CAAC;EAC9C,MAAM;IAAEM;EAAS,CAAC,GAAGL,WAAW,CAAC,CAAC;EAElC,MAAMM,0BAA0B,GAAGT,WAAW,CAAC,MAAM;IACjDO,UAAU,CAAC;MACPG,KAAK,EAAE,6BAA6B;MACpCC,OAAO,EAAE,sCAAsC;MAC/CC,YAAY,EAAE,gBAAgB;MAC9BC,WAAW,EAAE,WAAW;MACxBC,eAAe,EAAET,IAAI,CAACU,IAAI,CAACC,QAAQ,CAACC,QAAQ;MAC5C,MAAMC,QAAQA,CAAC;QAAEC;MAAO,CAAC,EAAE;QACvB,MAAMX,QAAQ,CAAC;UACXY,EAAE,EAAEf,IAAI,CAACe,EAAE;UACXH,QAAQ,EAAEE,MAAM,CAACC;QACrB,CAAC,CAAC;QACFd,YAAY,CACR,SAASD,IAAI,CAACK,KAAK,uCAAuCS,MAAM,CAACE,KAAK,IAC1E,CAAC;MACL;IACJ,CAAC,CAAC;EACN,CAAC,EAAE,CAAChB,IAAI,CAACe,EAAE,CAAC,CAAC;EAEb,OAAO;IACHX;EACJ,CAAC;AACL","ignoreList":[]}
+{"version":3,"names":["useCallback","useSnackbar","useMoveToFolderDialog","useMovePage","useMovePageToFolderDialog","page","showSnackbar","showDialog","movePage","openMovePageToFolderDialog","title","message","loadingLabel","acceptLabel","focusedFolderId","location","folderId","onAccept","folder","id","properties","label"],"sources":["useMovePageToFolderDialog.tsx"],"sourcesContent":["import { useCallback } from \"react\";\nimport { useSnackbar } from \"@webiny/app-admin\";\nimport { useMoveToFolderDialog } from \"@webiny/app-aco\";\nimport { useMovePage } from \"~/features/pages/index.js\";\nimport type { PageDto } from \"~/domain/Page\";\n\ninterface UseMovePageToFolderDialog {\n    page: PageDto;\n}\n\nexport function useMovePageToFolderDialog({ page }: UseMovePageToFolderDialog) {\n    const { showSnackbar } = useSnackbar();\n    const { showDialog } = useMoveToFolderDialog();\n    const { movePage } = useMovePage();\n\n    const openMovePageToFolderDialog = useCallback(() => {\n        showDialog({\n            title: \"Move page to a new location\",\n            message: \"Select a new location for this page:\",\n            loadingLabel: \"Moving page...\",\n            acceptLabel: \"Move page\",\n            focusedFolderId: page.location.folderId,\n            async onAccept({ folder }) {\n                await movePage({\n                    id: page.id,\n                    folderId: folder.id\n                });\n                showSnackbar(\n                    `Page \"${page.properties.title}\" was successfully moved to folder \"${folder.label}\"!`\n                );\n            }\n        });\n    }, [page.id]);\n\n    return {\n        openMovePageToFolderDialog\n    };\n}\n"],"mappings":"AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,WAAW,QAAQ,mBAAmB;AAC/C,SAASC,qBAAqB,QAAQ,iBAAiB;AACvD,SAASC,WAAW;AAOpB,OAAO,SAASC,yBAAyBA,CAAC;EAAEC;AAAgC,CAAC,EAAE;EAC3E,MAAM;IAAEC;EAAa,CAAC,GAAGL,WAAW,CAAC,CAAC;EACtC,MAAM;IAAEM;EAAW,CAAC,GAAGL,qBAAqB,CAAC,CAAC;EAC9C,MAAM;IAAEM;EAAS,CAAC,GAAGL,WAAW,CAAC,CAAC;EAElC,MAAMM,0BAA0B,GAAGT,WAAW,CAAC,MAAM;IACjDO,UAAU,CAAC;MACPG,KAAK,EAAE,6BAA6B;MACpCC,OAAO,EAAE,sCAAsC;MAC/CC,YAAY,EAAE,gBAAgB;MAC9BC,WAAW,EAAE,WAAW;MACxBC,eAAe,EAAET,IAAI,CAACU,QAAQ,CAACC,QAAQ;MACvC,MAAMC,QAAQA,CAAC;QAAEC;MAAO,CAAC,EAAE;QACvB,MAAMV,QAAQ,CAAC;UACXW,EAAE,EAAEd,IAAI,CAACc,EAAE;UACXH,QAAQ,EAAEE,MAAM,CAACC;QACrB,CAAC,CAAC;QACFb,YAAY,CACR,SAASD,IAAI,CAACe,UAAU,CAACV,KAAK,uCAAuCQ,MAAM,CAACG,KAAK,IACrF,CAAC;MACL;IACJ,CAAC,CAAC;EACN,CAAC,EAAE,CAAChB,IAAI,CAACc,EAAE,CAAC,CAAC;EAEb,OAAO;IACHV;EACJ,CAAC;AACL","ignoreList":[]}

package/modules/pages/PagesList/hooks/usePage.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+import type { PageDto } from "../../../../domain/Page";
+export interface PageContext {
+    page: PageDto;
+}
+export declare const usePage: () => PageContext;
+export declare const PageProvider: {
+    ({ children, ...props }: PageContext & {
+        children: import("react").ReactNode;
+    }): import("react").JSX.Element;
+    displayName: string;
+};

package/modules/pages/PagesList/hooks/usePage.js

@@ -0,0 +1,9 @@
+import { createGenericContext } from "@webiny/app";
+const {
+  Provider,
+  useHook
+} = createGenericContext("PageContext");
+export const usePage = useHook;
+export const PageProvider = Provider;
+
+//# sourceMappingURL=usePage.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["createGenericContext","Provider","useHook","usePage","PageProvider"],"sources":["usePage.tsx"],"sourcesContent":["import { createGenericContext } from \"@webiny/app\";\nimport type { PageDto } from \"~/domain/Page\";\n\nexport interface PageContext {\n    page: PageDto;\n}\n\nconst { Provider, useHook } = createGenericContext<PageContext>(\"PageContext\");\n\nexport const usePage = useHook;\nexport const PageProvider = Provider;\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,aAAa;AAOlD,MAAM;EAAEC,QAAQ;EAAEC;AAAQ,CAAC,GAAGF,oBAAoB,CAAc,aAAa,CAAC;AAE9E,OAAO,MAAMG,OAAO,GAAGD,OAAO;AAC9B,OAAO,MAAME,YAAY,GAAGH,QAAQ","ignoreList":[]}

package/modules/pages/PagesList/hooks/usePagePreviewLink.js

@@ -1,6 +1,10 @@
 import { useMemo } from "react";
+import { useTenancy } from "@webiny/app-tenancy";
 import { usePreviewDomain } from "../../../../BaseEditor/defaultConfig/Content/Preview/usePreviewDomain";
 export const usePagePreviewLink = pageDto => {
+  const {
+    tenant
+  } = useTenancy();
   const {
     previewDomain
   } = usePreviewDomain();
@@ -12,6 +16,7 @@ export const usePagePreviewLink = pageDto => {
     url.searchParams.set("wb.preview", "true");
     url.searchParams.set("wb.type", pageDto.metadata.documentType);
     url.searchParams.set("wb.id", pageDto.id);
+    url.searchParams.set("wb.tenant", tenant);
     url.searchParams.set("wb.path", pageDto.properties.path);
     return url.toString();
   }, [previewDomain]);

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

@@ -1 +1 @@
-{"version":3,"names":["useMemo","usePreviewDomain","usePagePreviewLink","pageDto","previewDomain","properties","path","url","URL","searchParams","set","metadata","documentType","id","toString"],"sources":["usePagePreviewLink.ts"],"sourcesContent":["import { useMemo } from \"react\";\nimport type { PageDto } from \"~/domain/Page\";\nimport { usePreviewDomain } from \"~/BaseEditor/defaultConfig/Content/Preview/usePreviewDomain\";\n\nexport const usePagePreviewLink = (pageDto: PageDto) => {\n    const { previewDomain } = usePreviewDomain();\n\n    return useMemo(() => {\n        if (!previewDomain || !pageDto.properties.path) {\n            return null;\n        }\n\n        const url = new URL(`${previewDomain}${pageDto.properties.path}`);\n        url.searchParams.set(\"wb.preview\", \"true\");\n        url.searchParams.set(\"wb.type\", pageDto.metadata.documentType);\n        url.searchParams.set(\"wb.id\", pageDto.id);\n        url.searchParams.set(\"wb.path\", pageDto.properties.path);\n        return url.toString();\n    }, [previewDomain]);\n};\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,OAAO;AAE/B,SAASC,gBAAgB;AAEzB,OAAO,MAAMC,kBAAkB,GAAIC,OAAgB,IAAK;EACpD,MAAM;IAAEC;EAAc,CAAC,GAAGH,gBAAgB,CAAC,CAAC;EAE5C,OAAOD,OAAO,CAAC,MAAM;IACjB,IAAI,CAACI,aAAa,IAAI,CAACD,OAAO,CAACE,UAAU,CAACC,IAAI,EAAE;MAC5C,OAAO,IAAI;IACf;IAEA,MAAMC,GAAG,GAAG,IAAIC,GAAG,CAAC,GAAGJ,aAAa,GAAGD,OAAO,CAACE,UAAU,CAACC,IAAI,EAAE,CAAC;IACjEC,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC;IAC1CH,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,SAAS,EAAEP,OAAO,CAACQ,QAAQ,CAACC,YAAY,CAAC;IAC9DL,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,OAAO,EAAEP,OAAO,CAACU,EAAE,CAAC;IACzCN,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,SAAS,EAAEP,OAAO,CAACE,UAAU,CAACC,IAAI,CAAC;IACxD,OAAOC,GAAG,CAACO,QAAQ,CAAC,CAAC;EACzB,CAAC,EAAE,CAACV,aAAa,CAAC,CAAC;AACvB,CAAC","ignoreList":[]}
+{"version":3,"names":["useMemo","useTenancy","usePreviewDomain","usePagePreviewLink","pageDto","tenant","previewDomain","properties","path","url","URL","searchParams","set","metadata","documentType","id","toString"],"sources":["usePagePreviewLink.ts"],"sourcesContent":["import { useMemo } from \"react\";\nimport { useTenancy } from \"@webiny/app-tenancy\";\nimport type { PageDto } from \"~/domain/Page\";\nimport { usePreviewDomain } from \"~/BaseEditor/defaultConfig/Content/Preview/usePreviewDomain\";\n\nexport const usePagePreviewLink = (pageDto: PageDto) => {\n    const { tenant } = useTenancy();\n    const { previewDomain } = usePreviewDomain();\n\n    return useMemo(() => {\n        if (!previewDomain || !pageDto.properties.path) {\n            return null;\n        }\n\n        const url = new URL(`${previewDomain}${pageDto.properties.path}`);\n        url.searchParams.set(\"wb.preview\", \"true\");\n        url.searchParams.set(\"wb.type\", pageDto.metadata.documentType);\n        url.searchParams.set(\"wb.id\", pageDto.id);\n        url.searchParams.set(\"wb.tenant\", tenant!);\n        url.searchParams.set(\"wb.path\", pageDto.properties.path);\n        return url.toString();\n    }, [previewDomain]);\n};\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,UAAU,QAAQ,qBAAqB;AAEhD,SAASC,gBAAgB;AAEzB,OAAO,MAAMC,kBAAkB,GAAIC,OAAgB,IAAK;EACpD,MAAM;IAAEC;EAAO,CAAC,GAAGJ,UAAU,CAAC,CAAC;EAC/B,MAAM;IAAEK;EAAc,CAAC,GAAGJ,gBAAgB,CAAC,CAAC;EAE5C,OAAOF,OAAO,CAAC,MAAM;IACjB,IAAI,CAACM,aAAa,IAAI,CAACF,OAAO,CAACG,UAAU,CAACC,IAAI,EAAE;MAC5C,OAAO,IAAI;IACf;IAEA,MAAMC,GAAG,GAAG,IAAIC,GAAG,CAAC,GAAGJ,aAAa,GAAGF,OAAO,CAACG,UAAU,CAACC,IAAI,EAAE,CAAC;IACjEC,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC;IAC1CH,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,SAAS,EAAER,OAAO,CAACS,QAAQ,CAACC,YAAY,CAAC;IAC9DL,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,OAAO,EAAER,OAAO,CAACW,EAAE,CAAC;IACzCN,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,WAAW,EAAEP,MAAO,CAAC;IAC1CI,GAAG,CAACE,YAAY,CAACC,GAAG,CAAC,SAAS,EAAER,OAAO,CAACG,UAAU,CAACC,IAAI,CAAC;IACxD,OAAOC,GAAG,CAACO,QAAQ,CAAC,CAAC;EACzB,CAAC,EAAE,CAACV,aAAa,CAAC,CAAC;AACvB,CAAC","ignoreList":[]}

package/modules/pages/PagesList/hooks/usePublishPageConfirmationDialog.d.ts

@@ -1,6 +1,6 @@
-import type { DocumentDto } from "../presenters/index.js";
+import type { PageDto } from "../../../../domain/Page";
 interface UsePublishPageConfirmationDialogProps {
-    page: DocumentDto;
+    page: PageDto;
 }
 export declare const usePublishPageConfirmationDialog: ({ page }: UsePublishPageConfirmationDialogProps) => {
     openPublishPageConfirmationDialog: () => void;

package/modules/pages/PagesList/hooks/usePublishPageConfirmationDialog.js

@@ -14,16 +14,16 @@ export const usePublishPageConfirmationDialog = ({
     showConfirmation
   } = useConfirmationDialog({
     title: "Publish page",
-    message: /*#__PURE__*/React.createElement("p", null, "You are about to publish ", /*#__PURE__*/React.createElement("strong", null, page.title), ". Are you sure you want to continue?")
+    message: /*#__PURE__*/React.createElement("p", null, "You are about to publish ", /*#__PURE__*/React.createElement("strong", null, page.properties.title), ". Are you sure you want to continue?")
   });
   const openPublishPageConfirmationDialog = useCallback(() => showConfirmation(async () => {
     try {
       await publishPage({
         id: page.id
       });
-      showSnackbar(`${page.title} was published successfully!`);
+      showSnackbar(`${page.properties.title} was published successfully!`);
     } catch (ex) {
-      showSnackbar(ex.message || `Error while publishing ${page.title}`);
+      showSnackbar(ex.message || `Error while publishing ${page.properties.title}`);
     }
   }), [page]);
   return {

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

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","usePublishPage","useConfirmationDialog","useSnackbar","usePublishPageConfirmationDialog","page","publishPage","showSnackbar","showConfirmation","title","message","createElement","openPublishPageConfirmationDialog","id","ex"],"sources":["usePublishPageConfirmationDialog.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { usePublishPage } from \"~/features/pages/index.js\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin\";\nimport type { DocumentDto } from \"~/modules/pages/PagesList/presenters/index.js\";\n\ninterface UsePublishPageConfirmationDialogProps {\n    page: DocumentDto;\n}\n\nexport const usePublishPageConfirmationDialog = ({\n    page\n}: UsePublishPageConfirmationDialogProps) => {\n    const { publishPage } = usePublishPage();\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation } = useConfirmationDialog({\n        title: \"Publish page\",\n        message: (\n            <p>\n                You are about to publish <strong>{page.title}</strong>. Are you sure you want to\n                continue?\n            </p>\n        )\n    });\n\n    const openPublishPageConfirmationDialog = useCallback(\n        () =>\n            showConfirmation(async () => {\n                try {\n                    await publishPage({ id: page.id });\n                    showSnackbar(`${page.title} was published successfully!`);\n                } catch (ex) {\n                    showSnackbar(ex.message || `Error while publishing ${page.title}`);\n                }\n            }),\n        [page]\n    );\n\n    return { openPublishPageConfirmationDialog };\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,SAASC,cAAc;AACvB,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,mBAAmB;AAOtE,OAAO,MAAMC,gCAAgC,GAAGA,CAAC;EAC7CC;AACmC,CAAC,KAAK;EACzC,MAAM;IAAEC;EAAY,CAAC,GAAGL,cAAc,CAAC,CAAC;EACxC,MAAM;IAAEM;EAAa,CAAC,GAAGJ,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEK;EAAiB,CAAC,GAAGN,qBAAqB,CAAC;IAC/CO,KAAK,EAAE,cAAc;IACrBC,OAAO,eACHX,KAAA,CAAAY,aAAA,YAAG,2BAC0B,eAAAZ,KAAA,CAAAY,aAAA,iBAASN,IAAI,CAACI,KAAc,CAAC,wCAEvD;EAEX,CAAC,CAAC;EAEF,MAAMG,iCAAiC,GAAGZ,WAAW,CACjD,MACIQ,gBAAgB,CAAC,YAAY;IACzB,IAAI;MACA,MAAMF,WAAW,CAAC;QAAEO,EAAE,EAAER,IAAI,CAACQ;MAAG,CAAC,CAAC;MAClCN,YAAY,CAAC,GAAGF,IAAI,CAACI,KAAK,8BAA8B,CAAC;IAC7D,CAAC,CAAC,OAAOK,EAAE,EAAE;MACTP,YAAY,CAACO,EAAE,CAACJ,OAAO,IAAI,0BAA0BL,IAAI,CAACI,KAAK,EAAE,CAAC;IACtE;EACJ,CAAC,CAAC,EACN,CAACJ,IAAI,CACT,CAAC;EAED,OAAO;IAAEO;EAAkC,CAAC;AAChD,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useCallback","usePublishPage","useConfirmationDialog","useSnackbar","usePublishPageConfirmationDialog","page","publishPage","showSnackbar","showConfirmation","title","message","createElement","properties","openPublishPageConfirmationDialog","id","ex"],"sources":["usePublishPageConfirmationDialog.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { usePublishPage } from \"~/features/pages/index.js\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin\";\nimport type { PageDto } from \"~/domain/Page\";\n\ninterface UsePublishPageConfirmationDialogProps {\n    page: PageDto;\n}\n\nexport const usePublishPageConfirmationDialog = ({\n    page\n}: UsePublishPageConfirmationDialogProps) => {\n    const { publishPage } = usePublishPage();\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation } = useConfirmationDialog({\n        title: \"Publish page\",\n        message: (\n            <p>\n                You are about to publish <strong>{page.properties.title}</strong>. Are you sure you\n                want to continue?\n            </p>\n        )\n    });\n\n    const openPublishPageConfirmationDialog = useCallback(\n        () =>\n            showConfirmation(async () => {\n                try {\n                    await publishPage({ id: page.id });\n                    showSnackbar(`${page.properties.title} was published successfully!`);\n                } catch (ex) {\n                    showSnackbar(ex.message || `Error while publishing ${page.properties.title}`);\n                }\n            }),\n        [page]\n    );\n\n    return { openPublishPageConfirmationDialog };\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,SAASC,cAAc;AACvB,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,mBAAmB;AAOtE,OAAO,MAAMC,gCAAgC,GAAGA,CAAC;EAC7CC;AACmC,CAAC,KAAK;EACzC,MAAM;IAAEC;EAAY,CAAC,GAAGL,cAAc,CAAC,CAAC;EACxC,MAAM;IAAEM;EAAa,CAAC,GAAGJ,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEK;EAAiB,CAAC,GAAGN,qBAAqB,CAAC;IAC/CO,KAAK,EAAE,cAAc;IACrBC,OAAO,eACHX,KAAA,CAAAY,aAAA,YAAG,2BAC0B,eAAAZ,KAAA,CAAAY,aAAA,iBAASN,IAAI,CAACO,UAAU,CAACH,KAAc,CAAC,wCAElE;EAEX,CAAC,CAAC;EAEF,MAAMI,iCAAiC,GAAGb,WAAW,CACjD,MACIQ,gBAAgB,CAAC,YAAY;IACzB,IAAI;MACA,MAAMF,WAAW,CAAC;QAAEQ,EAAE,EAAET,IAAI,CAACS;MAAG,CAAC,CAAC;MAClCP,YAAY,CAAC,GAAGF,IAAI,CAACO,UAAU,CAACH,KAAK,8BAA8B,CAAC;IACxE,CAAC,CAAC,OAAOM,EAAE,EAAE;MACTR,YAAY,CAACQ,EAAE,CAACL,OAAO,IAAI,0BAA0BL,IAAI,CAACO,UAAU,CAACH,KAAK,EAAE,CAAC;IACjF;EACJ,CAAC,CAAC,EACN,CAACJ,IAAI,CACT,CAAC;EAED,OAAO;IAAEQ;EAAkC,CAAC;AAChD,CAAC","ignoreList":[]}

package/modules/pages/PagesList/hooks/useUnpublishPageConfirmationDialog.d.ts

@@ -1,6 +1,6 @@
-import type { DocumentDto } from "../presenters/index.js";
+import type { PageDto } from "../../../../domain/Page";
 interface UseUnpublishPageConfirmationDialogProps {
-    page: DocumentDto;
+    page: PageDto;
 }
 export declare const useUnpublishPageConfirmationDialog: ({ page }: UseUnpublishPageConfirmationDialogProps) => {
     openUnpublishPageConfirmationDialog: () => void;

package/modules/pages/PagesList/hooks/useUnpublishPageConfirmationDialog.js

@@ -14,16 +14,16 @@ export const useUnpublishPageConfirmationDialog = ({
     showConfirmation
   } = useConfirmationDialog({
     title: "Unpublish page",
-    message: /*#__PURE__*/React.createElement("p", null, "You are about to unpublish ", /*#__PURE__*/React.createElement("strong", null, page.title), ". Are you sure you want to continue?")
+    message: /*#__PURE__*/React.createElement("p", null, "You are about to unpublish ", /*#__PURE__*/React.createElement("strong", null, page.properties.title), ". Are you sure you want to continue?")
   });
   const openUnpublishPageConfirmationDialog = useCallback(() => showConfirmation(async () => {
     try {
       await unpublishPage({
         id: page.id
       });
-      showSnackbar(`${page.title} was unpublished successfully!`);
+      showSnackbar(`${page.properties.title} was unpublished successfully!`);
     } catch (ex) {
-      showSnackbar(ex.message || `Error while unpublishing ${page.title}`);
+      showSnackbar(ex.message || `Error while unpublishing ${page.properties.title}`);
     }
   }), [page]);
   return {

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

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useUnpublishPage","useConfirmationDialog","useSnackbar","useUnpublishPageConfirmationDialog","page","unpublishPage","showSnackbar","showConfirmation","title","message","createElement","openUnpublishPageConfirmationDialog","id","ex"],"sources":["useUnpublishPageConfirmationDialog.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { useUnpublishPage } from \"~/features/pages/index.js\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin\";\nimport type { DocumentDto } from \"~/modules/pages/PagesList/presenters/index.js\";\n\ninterface UseUnpublishPageConfirmationDialogProps {\n    page: DocumentDto;\n}\n\nexport const useUnpublishPageConfirmationDialog = ({\n    page\n}: UseUnpublishPageConfirmationDialogProps) => {\n    const { unpublishPage } = useUnpublishPage();\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation } = useConfirmationDialog({\n        title: \"Unpublish page\",\n        message: (\n            <p>\n                You are about to unpublish <strong>{page.title}</strong>. Are you sure you want to\n                continue?\n            </p>\n        )\n    });\n\n    const openUnpublishPageConfirmationDialog = useCallback(\n        () =>\n            showConfirmation(async () => {\n                try {\n                    await unpublishPage({ id: page.id });\n                    showSnackbar(`${page.title} was unpublished successfully!`);\n                } catch (ex) {\n                    showSnackbar(ex.message || `Error while unpublishing ${page.title}`);\n                }\n            }),\n        [page]\n    );\n\n    return { openUnpublishPageConfirmationDialog };\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,SAASC,gBAAgB;AACzB,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,mBAAmB;AAOtE,OAAO,MAAMC,kCAAkC,GAAGA,CAAC;EAC/CC;AACqC,CAAC,KAAK;EAC3C,MAAM;IAAEC;EAAc,CAAC,GAAGL,gBAAgB,CAAC,CAAC;EAC5C,MAAM;IAAEM;EAAa,CAAC,GAAGJ,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEK;EAAiB,CAAC,GAAGN,qBAAqB,CAAC;IAC/CO,KAAK,EAAE,gBAAgB;IACvBC,OAAO,eACHX,KAAA,CAAAY,aAAA,YAAG,6BAC4B,eAAAZ,KAAA,CAAAY,aAAA,iBAASN,IAAI,CAACI,KAAc,CAAC,wCAEzD;EAEX,CAAC,CAAC;EAEF,MAAMG,mCAAmC,GAAGZ,WAAW,CACnD,MACIQ,gBAAgB,CAAC,YAAY;IACzB,IAAI;MACA,MAAMF,aAAa,CAAC;QAAEO,EAAE,EAAER,IAAI,CAACQ;MAAG,CAAC,CAAC;MACpCN,YAAY,CAAC,GAAGF,IAAI,CAACI,KAAK,gCAAgC,CAAC;IAC/D,CAAC,CAAC,OAAOK,EAAE,EAAE;MACTP,YAAY,CAACO,EAAE,CAACJ,OAAO,IAAI,4BAA4BL,IAAI,CAACI,KAAK,EAAE,CAAC;IACxE;EACJ,CAAC,CAAC,EACN,CAACJ,IAAI,CACT,CAAC;EAED,OAAO;IAAEO;EAAoC,CAAC;AAClD,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useUnpublishPage","useConfirmationDialog","useSnackbar","useUnpublishPageConfirmationDialog","page","unpublishPage","showSnackbar","showConfirmation","title","message","createElement","properties","openUnpublishPageConfirmationDialog","id","ex"],"sources":["useUnpublishPageConfirmationDialog.tsx"],"sourcesContent":["import React, { useCallback } from \"react\";\nimport { useUnpublishPage } from \"~/features/pages/index.js\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin\";\nimport type { PageDto } from \"~/domain/Page\";\n\ninterface UseUnpublishPageConfirmationDialogProps {\n    page: PageDto;\n}\n\nexport const useUnpublishPageConfirmationDialog = ({\n    page\n}: UseUnpublishPageConfirmationDialogProps) => {\n    const { unpublishPage } = useUnpublishPage();\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation } = useConfirmationDialog({\n        title: \"Unpublish page\",\n        message: (\n            <p>\n                You are about to unpublish <strong>{page.properties.title}</strong>. Are you sure\n                you want to continue?\n            </p>\n        )\n    });\n\n    const openUnpublishPageConfirmationDialog = useCallback(\n        () =>\n            showConfirmation(async () => {\n                try {\n                    await unpublishPage({ id: page.id });\n                    showSnackbar(`${page.properties.title} was unpublished successfully!`);\n                } catch (ex) {\n                    showSnackbar(ex.message || `Error while unpublishing ${page.properties.title}`);\n                }\n            }),\n        [page]\n    );\n\n    return { openUnpublishPageConfirmationDialog };\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,QAAQ,OAAO;AAC1C,SAASC,gBAAgB;AACzB,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,mBAAmB;AAOtE,OAAO,MAAMC,kCAAkC,GAAGA,CAAC;EAC/CC;AACqC,CAAC,KAAK;EAC3C,MAAM;IAAEC;EAAc,CAAC,GAAGL,gBAAgB,CAAC,CAAC;EAC5C,MAAM;IAAEM;EAAa,CAAC,GAAGJ,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEK;EAAiB,CAAC,GAAGN,qBAAqB,CAAC;IAC/CO,KAAK,EAAE,gBAAgB;IACvBC,OAAO,eACHX,KAAA,CAAAY,aAAA,YAAG,6BAC4B,eAAAZ,KAAA,CAAAY,aAAA,iBAASN,IAAI,CAACO,UAAU,CAACH,KAAc,CAAC,wCAEpE;EAEX,CAAC,CAAC;EAEF,MAAMI,mCAAmC,GAAGb,WAAW,CACnD,MACIQ,gBAAgB,CAAC,YAAY;IACzB,IAAI;MACA,MAAMF,aAAa,CAAC;QAAEQ,EAAE,EAAET,IAAI,CAACS;MAAG,CAAC,CAAC;MACpCP,YAAY,CAAC,GAAGF,IAAI,CAACO,UAAU,CAACH,KAAK,gCAAgC,CAAC;IAC1E,CAAC,CAAC,OAAOM,EAAE,EAAE;MACTR,YAAY,CAACQ,EAAE,CAACL,OAAO,IAAI,4BAA4BL,IAAI,CAACO,UAAU,CAACH,KAAK,EAAE,CAAC;IACnF;EACJ,CAAC,CAAC,EACN,CAACJ,IAAI,CACT,CAAC;EAED,OAAO;IAAEQ;EAAoC,CAAC;AAClD,CAAC","ignoreList":[]}

package/modules/pages/PagesList/presenters/DocumentListPresenter.d.ts

@@ -4,8 +4,8 @@ interface DocumentListPresenterParams {
 declare class DocumentListPresenter {
     private folderId;
     private foldersCache;
-    private foldersLoadingRepository;
     private documentsCache;
+    private foldersLoadingRepository;
     private documentsLoadingRepository;
     private searchRepository;
     private metaRepository;
@@ -18,7 +18,8 @@ declare class DocumentListPresenter {
     get vm(): {
         folderId: string;
         title: string | undefined;
-        data: import("./DocumentListMapper.js").DocumentDto[];
+        data: import("../../../../domain/Page/index.js").PageDto[];
+        folders: import("@webiny/app-aco").FolderDto[];
         selected: any[];
         meta: {
             totalCount: number;
@@ -39,14 +40,12 @@ declare class DocumentListPresenter {
     private getVmTitle;
     private getVmDocuments;
     private getVmFolders;
-    private getData;
     private getSelected;
     private sortItems;
     private getIsSearch;
     private getSearchLabel;
     private getIsLoading;
     private getIsLoadingMore;
-    private getIsEmpty;
     private getSorting;
 }
 export { DocumentListPresenter, type DocumentListPresenterParams };

package/modules/pages/PagesList/presenters/DocumentListPresenter.js

@@ -2,9 +2,9 @@ import { makeAutoObservable } from "mobx";
 import orderBy from "lodash/orderBy";
 import { loadingActions, ROOT_FOLDER, WB_PAGE_APP } from "../../../../constants.js";
 import { loadingRepositoryFactory, metaRepositoryFactory, SortingMapper, sortRepositoryFactory } from "@webiny/app-utils";
-import { pageListCache } from "../../../../domain/Page/index.js";
+import { PageDtoMapper, pageListCache } from "../../../../domain/Page/index.js";
+import { FolderDtoMapper } from "@webiny/app-aco";
 import { folderCacheFactory } from "@webiny/app-aco";
-import { DocumentListMapper } from "./DocumentListMapper.js";
 import { searchRepositoryFactory } from "../../../../domain/Search/index.js";
 import { selectedItemsRepositoryFactory } from "../../../../domain/SelectedItem/index.js";
 import { filterRepositoryFactory } from "../../../../domain/Filter/index.js";
@@ -13,8 +13,8 @@ class DocumentListPresenter {
   filtersVisible = false;
   constructor() {
     this.foldersCache = folderCacheFactory.getCache(WB_PAGE_APP);
-    this.foldersLoadingRepository = loadingRepositoryFactory.getRepository(WB_PAGE_APP);
     this.documentsCache = pageListCache;
+    this.foldersLoadingRepository = loadingRepositoryFactory.getRepository(WB_PAGE_APP);
     this.documentsLoadingRepository = loadingRepositoryFactory.getRepository("WbPage");
     this.searchRepository = searchRepositoryFactory.getRepository("WbPage");
     this.metaRepository = metaRepositoryFactory.getRepository("WbPage");
@@ -27,10 +27,14 @@ class DocumentListPresenter {
     this.folderId = params.folderId;
   }
   get vm() {
+    const data = this.getVmDocuments();
+    const folders = this.getVmFolders();
+    const isEmpty = !this.getIsLoading() && data.length === 0 && folders.length === 0;
     return {
       folderId: this.folderId,
       title: this.getVmTitle(),
-      data: this.getData(),
+      data,
+      folders,
       selected: this.getSelected(),
       meta: {
         totalCount: this.metaRepository.get().totalCount ?? 0,
@@ -40,7 +44,7 @@ class DocumentListPresenter {
       searchQuery: this.searchRepository.get() || "",
       searchLabel: this.getSearchLabel(),
       isSearch: this.getIsSearch(),
-      isEmpty: this.getIsEmpty(),
+      isEmpty,
       isRoot: this.getIsRoot(),
       isLoading: this.getIsLoading(),
       isLoadingMore: this.getIsLoadingMore(),
@@ -57,9 +61,13 @@ class DocumentListPresenter {
     return !this.getIsLoading() ? this.foldersCache.getItem(f => f.id === this.folderId)?.title : undefined;
   };
   getVmDocuments = () => {
-    return this.documentsCache.getItems().map(d => DocumentListMapper.fromPage(d));
+    const documents = this.documentsCache.getItems().map(d => PageDtoMapper.toDTO(d));
+    return this.sortItems(documents);
   };
   getVmFolders = () => {
+    if (this.getIsSearch()) {
+      return [];
+    }
     const folders = this.foldersCache.getItems().filter(f => {
       if (this.folderId === ROOT_FOLDER) {
         return f.parentId === null;
@@ -67,18 +75,7 @@ class DocumentListPresenter {
         return f.parentId === this.folderId;
       }
     });
-    return folders.map(f => DocumentListMapper.fromFolder(f));
-  };
-  getData = () => {
-    if (this.getIsSearch()) {
-      // Only documents, sorted if needed
-      return this.sortItems(this.getVmDocuments());
-    }
-
-    // Not in search: folders first, then documents, both sorted if needed
-    const folders = this.sortItems(this.getVmFolders());
-    const documents = this.sortItems(this.getVmDocuments());
-    return [...folders, ...documents];
+    return this.sortItems(folders).map(folder => FolderDtoMapper.toDTO(folder));
   };
   getSelected = () => {
     return this.selectedRepository.getSelectedItems();
@@ -108,9 +105,6 @@ class DocumentListPresenter {
   getIsLoadingMore = () => {
     return Boolean(this.documentsLoadingRepository.isLoading(loadingActions.listMore));
   };
-  getIsEmpty() {
-    return !this.getIsLoading() && !this.getData().length;
-  }
   getSorting = () => {
     return this.sortingRepository.get().map(sort => {
       return SortingMapper.fromDTOtoColumn(sort);