@webiny/app-headless-cms 0.0.0-unstable.e53eceafb5 → 0.0.0-unstable.eb196ccd2f

package/ContentEntryListConfig.d.ts

@@ -119,8 +119,13 @@ export declare const ContentEntryListConfig: {
                     displayName: string;
                 }>) => (props: unknown) => import("react").JSX.Element;
             } & {
-                useTableRow: <TUserRow = Record<string, any>>() => import("@webiny/app-aco").TableRowContextData<import("./types").TableItem & import("@webiny/admin-ui/DataTable/DataTable").DataTableDefaultData & TUserRow>;
-                isFolderRow: (row: import("@webiny/app-aco/table.types").BaseTableItem) => row is import("@webiny/app-aco/table.types").FolderTableItem;
+                useTableRow: {
+                    (): import("@webiny/app-aco").TableRowContextData<import("./types").TableItem>;
+                    <TUserRow>(): import("@webiny/app-aco").TableRowContextData<import("./types").TableItem & {
+                        data: TUserRow;
+                    }>;
+                };
+                isFolderRow: (row: import("./types").TableItem) => row is import("@webiny/app-aco").FolderTableRow;
             };
         };
         FolderAction: (({ modelIds, ...props }: import("./admin/config/contentEntries/list/Browser/FolderAction").FolderActionProps) => import("react").JSX.Element | null) & {

package/admin/components/ContentEntries/Scheduler/actions/ScheduleEntryAction.js

@@ -1,26 +1,25 @@
-import React, { useCallback, useMemo, useState } from "react";
+import React, { useCallback, useMemo } from "react";
 import { useContentEntry } from "../../../../views/contentEntries/hooks/index.js";
 import { useApolloClient, usePermission } from "../../../../hooks/index.js";
 import { ContentEntryEditorConfig } from "../../../../config/contentEntries/index.js";
 import { ReactComponent as ScheduleIcon } from "@webiny/icons/cell_tower.svg";
 import { useGetSchedulerItem } from "./hooks/useGetSchedulerItem.js";
-import { ScheduleDialog } from "@webiny/app-headless-cms-scheduler/Presentation/components/ScheduleDialog/ScheduleDialog.js";
-import { SchedulerGetGraphQLGateway } from "../adapters/SchedulerGetGraphQLGateway.js";
-import { SchedulerCancelGraphQLGateway } from "../adapters/SchedulerCancelGraphQLGateway.js";
-import { SchedulerPublishGraphQLGateway } from "../adapters/SchedulerPublishGraphQLGateway.js";
-import { SchedulerUnpublishGraphQLGateway } from "../adapters/SchedulerUnpublishGraphQLGateway.js";
+import { SchedulerCancelGraphQLGateway, SchedulerGetGraphQLGateway, SchedulerPublishGraphQLGateway, SchedulerUnpublishGraphQLGateway } from "../adapters/index.js";
+import { ScheduleDialogAction, useScheduleDialog } from "@webiny/app-headless-cms-scheduler";
 export const ScheduleEntryMenuItem = () => {
   const {
     entry,
     loading,
-    ...contentEntry
+    contentModel
   } = useContentEntry();
   const {
     canPublish,
     canUnpublish
   } = usePermission();
   const client = useApolloClient();
-  const [show, setShow] = useState(false);
+  const {
+    showDialog: showSchedulerDialog
+  } = useScheduleDialog();
   const getGateway = useMemo(() => {
     return new SchedulerGetGraphQLGateway(client);
   }, [client]);
@@ -33,40 +32,50 @@ export const ScheduleEntryMenuItem = () => {
   const unpublishGateway = useMemo(() => {
     return new SchedulerUnpublishGraphQLGateway(client);
   }, [client]);
+  const scheduleAction = useMemo(() => {
+    return new ScheduleDialogAction({
+      cancelGateway,
+      publishGateway,
+      unpublishGateway
+    });
+  }, [publishGateway, unpublishGateway]);
   const scheduled = useGetSchedulerItem({
     gateway: getGateway,
     id: entry.id,
-    modelId: contentEntry.contentModel.modelId
+    modelId: contentModel.modelId
   });
   const {
     OptionsMenuItem
   } = ContentEntryEditorConfig.Actions.MenuItemAction.useOptionsMenuItem();
-  const toggle = useCallback(() => {
-    setShow(!show);
-  }, []);
-  const scheduleEntry = useMemo(() => {
+  const schedulerEntry = useMemo(() => {
     if (scheduled.error) {
       console.error(scheduled.error);
       return null;
     }
     return scheduled.item;
   }, [scheduled]);
+  const showDialog = useCallback(() => {
+    showSchedulerDialog({
+      entry: {
+        id: entry.id,
+        title: entry.meta.title,
+        modelId: contentModel.modelId,
+        status: entry.meta.status
+      },
+      schedulerEntry,
+      action: scheduleAction
+    });
+  }, [entry, schedulerEntry, scheduleAction, showSchedulerDialog, contentModel]);
   if (!canPublish("cms.contentEntry") && !canUnpublish("cms.contentEntry")) {
     return null;
   }
+  const action = entry.meta?.status === "published" ? "unpublish" : "publish";
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OptionsMenuItem, {
     icon: /*#__PURE__*/React.createElement(ScheduleIcon, null),
-    label: "Schedule entry",
-    onAction: toggle,
-    disabled: !entry?.id || loading,
+    label: `Schedule ${action}`,
+    onAction: showDialog,
+    disabled: !entry?.meta?.status || loading,
     "data-testid": "cms.content-form.header.schedule"
-  }), /*#__PURE__*/React.createElement(ScheduleDialog, {
-    show: show,
-    schedulerEntry: scheduleEntry,
-    cancelGateway: cancelGateway,
-    publishGateway: publishGateway,
-    unpublishGateway: unpublishGateway,
-    entry: entry
   }));
 };
 

package/admin/components/ContentEntries/Scheduler/actions/ScheduleEntryAction.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useMemo","useState","useContentEntry","useApolloClient","usePermission","ContentEntryEditorConfig","ReactComponent","ScheduleIcon","useGetSchedulerItem","ScheduleDialog","SchedulerGetGraphQLGateway","SchedulerCancelGraphQLGateway","SchedulerPublishGraphQLGateway","SchedulerUnpublishGraphQLGateway","ScheduleEntryMenuItem","entry","loading","contentEntry","canPublish","canUnpublish","client","show","setShow","getGateway","cancelGateway","publishGateway","unpublishGateway","scheduled","gateway","id","modelId","contentModel","OptionsMenuItem","Actions","MenuItemAction","useOptionsMenuItem","toggle","scheduleEntry","error","console","item","createElement","Fragment","icon","label","onAction","disabled","schedulerEntry"],"sources":["ScheduleEntryAction.tsx"],"sourcesContent":["import React, { useCallback, useMemo, useState } from \"react\";\nimport { useContentEntry } from \"~/admin/views/contentEntries/hooks/index.js\";\nimport { useApolloClient, usePermission } from \"~/admin/hooks/index.js\";\nimport { ContentEntryEditorConfig } from \"~/admin/config/contentEntries/index.js\";\nimport { ReactComponent as ScheduleIcon } from \"@webiny/icons/cell_tower.svg\";\nimport { useGetSchedulerItem } from \"./hooks/useGetSchedulerItem.js\";\nimport { ScheduleDialog } from \"@webiny/app-headless-cms-scheduler/Presentation/components/ScheduleDialog/ScheduleDialog.js\";\nimport { SchedulerGetGraphQLGateway } from \"~/admin/components/ContentEntries/Scheduler/adapters/SchedulerGetGraphQLGateway.js\";\nimport { SchedulerCancelGraphQLGateway } from \"~/admin/components/ContentEntries/Scheduler/adapters/SchedulerCancelGraphQLGateway.js\";\nimport { SchedulerPublishGraphQLGateway } from \"~/admin/components/ContentEntries/Scheduler/adapters/SchedulerPublishGraphQLGateway.js\";\nimport { SchedulerUnpublishGraphQLGateway } from \"~/admin/components/ContentEntries/Scheduler/adapters/SchedulerUnpublishGraphQLGateway.js\";\n\nexport const ScheduleEntryMenuItem = () => {\n    const { entry, loading, ...contentEntry } = useContentEntry();\n    const { canPublish, canUnpublish } = usePermission();\n    const client = useApolloClient();\n\n    const [show, setShow] = useState(false);\n\n    const getGateway = useMemo(() => {\n        return new SchedulerGetGraphQLGateway(client);\n    }, [client]);\n\n    const cancelGateway = useMemo(() => {\n        return new SchedulerCancelGraphQLGateway(client);\n    }, [client]);\n\n    const publishGateway = useMemo(() => {\n        return new SchedulerPublishGraphQLGateway(client);\n    }, [client]);\n\n    const unpublishGateway = useMemo(() => {\n        return new SchedulerUnpublishGraphQLGateway(client);\n    }, [client]);\n\n    const scheduled = useGetSchedulerItem({\n        gateway: getGateway,\n        id: entry.id,\n        modelId: contentEntry.contentModel.modelId\n    });\n\n    const { OptionsMenuItem } =\n        ContentEntryEditorConfig.Actions.MenuItemAction.useOptionsMenuItem();\n\n    const toggle = useCallback(() => {\n        setShow(!show);\n    }, []);\n\n    const scheduleEntry = useMemo(() => {\n        if (scheduled.error) {\n            console.error(scheduled.error);\n            return null;\n        }\n        return scheduled.item;\n    }, [scheduled]);\n\n    if (!canPublish(\"cms.contentEntry\") && !canUnpublish(\"cms.contentEntry\")) {\n        return null;\n    }\n\n    return (\n        <>\n            <OptionsMenuItem\n                icon={<ScheduleIcon />}\n                label={\"Schedule entry\"}\n                onAction={toggle}\n                disabled={!entry?.id || loading}\n                data-testid={\"cms.content-form.header.schedule\"}\n            />\n            <ScheduleDialog\n                show={show}\n                schedulerEntry={scheduleEntry}\n                cancelGateway={cancelGateway}\n                publishGateway={publishGateway}\n                unpublishGateway={unpublishGateway}\n                entry={entry}\n            />\n        </>\n    );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useMemo","useContentEntry","useApolloClient","usePermission","ContentEntryEditorConfig","ReactComponent","ScheduleIcon","useGetSchedulerItem","SchedulerCancelGraphQLGateway","SchedulerGetGraphQLGateway","SchedulerPublishGraphQLGateway","SchedulerUnpublishGraphQLGateway","ScheduleDialogAction","useScheduleDialog","ScheduleEntryMenuItem","entry","loading","contentModel","canPublish","canUnpublish","client","showDialog","showSchedulerDialog","getGateway","cancelGateway","publishGateway","unpublishGateway","scheduleAction","scheduled","gateway","id","modelId","OptionsMenuItem","Actions","MenuItemAction","useOptionsMenuItem","schedulerEntry","error","console","item","title","meta","status","action","createElement","Fragment","icon","label","onAction","disabled"],"sources":["ScheduleEntryAction.tsx"],"sourcesContent":["import React, { useCallback, useMemo } from \"react\";\nimport { useContentEntry } from \"~/admin/views/contentEntries/hooks/index.js\";\nimport { useApolloClient, usePermission } from \"~/admin/hooks/index.js\";\nimport { ContentEntryEditorConfig } from \"~/admin/config/contentEntries/index.js\";\nimport { ReactComponent as ScheduleIcon } from \"@webiny/icons/cell_tower.svg\";\nimport { useGetSchedulerItem } from \"./hooks/useGetSchedulerItem.js\";\nimport {\n    SchedulerCancelGraphQLGateway,\n    SchedulerGetGraphQLGateway,\n    SchedulerPublishGraphQLGateway,\n    SchedulerUnpublishGraphQLGateway\n} from \"../adapters/index.js\";\nimport { ScheduleDialogAction, useScheduleDialog } from \"@webiny/app-headless-cms-scheduler\";\n\nexport const ScheduleEntryMenuItem = () => {\n    const { entry, loading, contentModel } = useContentEntry();\n    const { canPublish, canUnpublish } = usePermission();\n    const client = useApolloClient();\n\n    const { showDialog: showSchedulerDialog } = useScheduleDialog();\n\n    const getGateway = useMemo(() => {\n        return new SchedulerGetGraphQLGateway(client);\n    }, [client]);\n\n    const cancelGateway = useMemo(() => {\n        return new SchedulerCancelGraphQLGateway(client);\n    }, [client]);\n\n    const publishGateway = useMemo(() => {\n        return new SchedulerPublishGraphQLGateway(client);\n    }, [client]);\n\n    const unpublishGateway = useMemo(() => {\n        return new SchedulerUnpublishGraphQLGateway(client);\n    }, [client]);\n\n    const scheduleAction = useMemo(() => {\n        return new ScheduleDialogAction({\n            cancelGateway,\n            publishGateway,\n            unpublishGateway\n        });\n    }, [publishGateway, unpublishGateway]);\n\n    const scheduled = useGetSchedulerItem({\n        gateway: getGateway,\n        id: entry.id,\n        modelId: contentModel.modelId\n    });\n\n    const { OptionsMenuItem } =\n        ContentEntryEditorConfig.Actions.MenuItemAction.useOptionsMenuItem();\n\n    const schedulerEntry = useMemo(() => {\n        if (scheduled.error) {\n            console.error(scheduled.error);\n            return null;\n        }\n        return scheduled.item;\n    }, [scheduled]);\n\n    const showDialog = useCallback(() => {\n        showSchedulerDialog({\n            entry: {\n                id: entry.id,\n                title: entry.meta.title,\n                modelId: contentModel.modelId,\n                status: entry.meta.status\n            },\n            schedulerEntry,\n            action: scheduleAction\n        });\n    }, [entry, schedulerEntry, scheduleAction, showSchedulerDialog, contentModel]);\n\n    if (!canPublish(\"cms.contentEntry\") && !canUnpublish(\"cms.contentEntry\")) {\n        return null;\n    }\n\n    const action = entry.meta?.status === \"published\" ? \"unpublish\" : \"publish\";\n\n    return (\n        <>\n            <OptionsMenuItem\n                icon={<ScheduleIcon />}\n                label={`Schedule ${action}`}\n                onAction={showDialog}\n                disabled={!entry?.meta?.status || loading}\n                data-testid={\"cms.content-form.header.schedule\"}\n            />\n        </>\n    );\n};\n"],"mappings":"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","ignoreList":[]}

package/admin/components/ContentEntries/Scheduler/actions/hooks/useGetSchedulerItem.js

@@ -13,9 +13,12 @@ export const useGetSchedulerItem = params => {
     }
     (async () => {
       try {
-        const result = await gateway.execute(params);
+        const result = await gateway.execute({
+          id: params.id,
+          modelId: params.modelId
+        });
         setState({
-          item: result.item,
+          item: result,
           error: null
         });
       } catch (ex) {

package/admin/components/ContentEntries/Scheduler/actions/hooks/useGetSchedulerItem.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useState","useGetSchedulerItem","params","gateway","state","setState","item","error","id","modelId","result","execute","ex"],"sources":["useGetSchedulerItem.ts"],"sourcesContent":["import { useEffect, useState } from \"react\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport type {\n    ISchedulerGetExecuteParams,\n    ISchedulerGetGateway\n} from \"@webiny/app-headless-cms-scheduler\";\n\nexport interface IUseGetItemParams extends ISchedulerGetExecuteParams {\n    gateway: ISchedulerGetGateway;\n}\n\ninterface IState {\n    item: SchedulerEntry | null;\n    error: Error | null;\n}\n\nexport const useGetSchedulerItem = (params: IUseGetItemParams) => {\n    const { gateway } = params;\n    const [state, setState] = useState<IState>({\n        item: null,\n        error: null\n    });\n\n    useEffect(() => {\n        if (!params.id || !params.modelId) {\n            return;\n        }\n        (async () => {\n            try {\n                const result = await gateway.execute(params);\n                setState({\n                    item: result.item,\n                    error: null\n                });\n            } catch (ex) {\n                setState({\n                    error: ex,\n                    item: null\n                });\n            }\n        })();\n    }, [params.id, params.modelId, gateway]);\n\n    return state;\n};\n"],"mappings":"AAAA,SAASA,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAgB3C,OAAO,MAAMC,mBAAmB,GAAIC,MAAyB,IAAK;EAC9D,MAAM;IAAEC;EAAQ,CAAC,GAAGD,MAAM;EAC1B,MAAM,CAACE,KAAK,EAAEC,QAAQ,CAAC,GAAGL,QAAQ,CAAS;IACvCM,IAAI,EAAE,IAAI;IACVC,KAAK,EAAE;EACX,CAAC,CAAC;EAEFR,SAAS,CAAC,MAAM;IACZ,IAAI,CAACG,MAAM,CAACM,EAAE,IAAI,CAACN,MAAM,CAACO,OAAO,EAAE;MAC/B;IACJ;IACA,CAAC,YAAY;MACT,IAAI;QACA,MAAMC,MAAM,GAAG,MAAMP,OAAO,CAACQ,OAAO,CAACT,MAAM,CAAC;QAC5CG,QAAQ,CAAC;UACLC,IAAI,EAAEI,MAAM,CAACJ,IAAI;UACjBC,KAAK,EAAE;QACX,CAAC,CAAC;MACN,CAAC,CAAC,OAAOK,EAAE,EAAE;QACTP,QAAQ,CAAC;UACLE,KAAK,EAAEK,EAAE;UACTN,IAAI,EAAE;QACV,CAAC,CAAC;MACN;IACJ,CAAC,EAAE,CAAC;EACR,CAAC,EAAE,CAACJ,MAAM,CAACM,EAAE,EAAEN,MAAM,CAACO,OAAO,EAAEN,OAAO,CAAC,CAAC;EAExC,OAAOC,KAAK;AAChB,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useState","useGetSchedulerItem","params","gateway","state","setState","item","error","id","modelId","result","execute","ex"],"sources":["useGetSchedulerItem.ts"],"sourcesContent":["import { useEffect, useState } from \"react\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport type {\n    ISchedulerGetExecuteParams,\n    ISchedulerGetGateway\n} from \"@webiny/app-headless-cms-scheduler\";\n\nexport interface IUseGetItemParams extends ISchedulerGetExecuteParams {\n    gateway: ISchedulerGetGateway;\n}\n\ninterface IState {\n    item: SchedulerEntry | null;\n    error: Error | null;\n}\n\nexport const useGetSchedulerItem = (params: IUseGetItemParams) => {\n    const { gateway } = params;\n    const [state, setState] = useState<IState>({\n        item: null,\n        error: null\n    });\n\n    useEffect(() => {\n        if (!params.id || !params.modelId) {\n            return;\n        }\n        (async () => {\n            try {\n                const result = await gateway.execute({\n                    id: params.id,\n                    modelId: params.modelId\n                });\n                setState({\n                    item: result,\n                    error: null\n                });\n            } catch (ex) {\n                setState({\n                    error: ex,\n                    item: null\n                });\n            }\n        })();\n    }, [params.id, params.modelId, gateway]);\n\n    return state;\n};\n"],"mappings":"AAAA,SAASA,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAgB3C,OAAO,MAAMC,mBAAmB,GAAIC,MAAyB,IAAK;EAC9D,MAAM;IAAEC;EAAQ,CAAC,GAAGD,MAAM;EAC1B,MAAM,CAACE,KAAK,EAAEC,QAAQ,CAAC,GAAGL,QAAQ,CAAS;IACvCM,IAAI,EAAE,IAAI;IACVC,KAAK,EAAE;EACX,CAAC,CAAC;EAEFR,SAAS,CAAC,MAAM;IACZ,IAAI,CAACG,MAAM,CAACM,EAAE,IAAI,CAACN,MAAM,CAACO,OAAO,EAAE;MAC/B;IACJ;IACA,CAAC,YAAY;MACT,IAAI;QACA,MAAMC,MAAM,GAAG,MAAMP,OAAO,CAACQ,OAAO,CAAC;UACjCH,EAAE,EAAEN,MAAM,CAACM,EAAE;UACbC,OAAO,EAAEP,MAAM,CAACO;QACpB,CAAC,CAAC;QACFJ,QAAQ,CAAC;UACLC,IAAI,EAAEI,MAAM;UACZH,KAAK,EAAE;QACX,CAAC,CAAC;MACN,CAAC,CAAC,OAAOK,EAAE,EAAE;QACTP,QAAQ,CAAC;UACLE,KAAK,EAAEK,EAAE;UACTN,IAAI,EAAE;QACV,CAAC,CAAC;MACN;IACJ,CAAC,EAAE,CAAC;EACR,CAAC,EAAE,CAACJ,MAAM,CAACM,EAAE,EAAEN,MAAM,CAACO,OAAO,EAAEN,OAAO,CAAC,CAAC;EAExC,OAAOC,KAAK;AAChB,CAAC","ignoreList":[]}

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerGetGraphQLGateway.d.ts

@@ -4,19 +4,17 @@ export declare class SchedulerGetGraphQLGateway implements ISchedulerGetGateway
     private readonly client;
     constructor(client: ApolloClient<any>);
     execute(params: ISchedulerGetExecuteParams): Promise<{
-        item: {
-            type: import("@webiny/app-headless-cms-scheduler/types.js").ScheduleType;
+        model: Pick<import("@webiny/app-headless-cms-common/types").CmsModel, "modelId">;
+        id: string;
+        title: string;
+        type: import("@webiny/app-headless-cms-scheduler/types.js").ScheduleType;
+        targetId: string;
+        scheduledBy: {
             id: string;
-            title: string;
-            model: Pick<import("@webiny/app-headless-cms-common/types").CmsModel, "modelId">;
-            targetId: string;
-            scheduledBy: {
-                type: string;
-                id: string;
-                displayName: string;
-            };
-            publishOn?: Date | undefined;
-            unpublishOn?: Date | undefined;
+            displayName: string;
+            type: string;
         };
-    }>;
+        publishOn?: Date | undefined;
+        unpublishOn?: Date | undefined;
+    } | null>;
 }

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerGetGraphQLGateway.js

@@ -44,17 +44,25 @@ export class SchedulerGetGraphQLGateway {
         errors
       });
       throw new Error("Network error while getting schedule entry.");
-    }
-    if (!result.data) {
-      throw new Error(result.error?.message || "Could not fetch scheduled entry.");
+    } else if (result.error) {
+      console.error({
+        error: result.error
+      });
+      throw new Error(result.error.message || "Could not fetch scheduled entry.");
+    } else if (!result.data) {
+      return null;
     }
     const validated = await schema.safeParseAsync(result);
     if (!validated.success) {
-      throw createZodError(validated.error);
+      const err = createZodError(validated.error);
+      console.error(err);
+      console.log(JSON.stringify({
+        err,
+        ex: validated.error
+      }));
+      throw err;
     }
-    return {
-      item: validated.data.data
-    };
+    return validated.data.data;
   }
 }
 

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerGetGraphQLGateway.js.map

@@ -1 +1 @@
-{"version":3,"names":["gql","zod","createZodError","schedulerEntrySchema","createSchedulerEntryFields","createSchedulerGetQuery","schema","object","data","SchedulerGetGraphQLGateway","constructor","client","execute","params","response","errors","query","variables","fetchPolicy","result","getCmsSchedule","length","console","error","Error","message","validated","safeParseAsync","success","item"],"sources":["SchedulerGetGraphQLGateway.ts"],"sourcesContent":["import type { ApolloClient } from \"apollo-client\";\nimport type { CmsErrorResponse } from \"@webiny/app-headless-cms-common/types\";\nimport gql from \"graphql-tag\";\nimport zod from \"zod\";\nimport { createZodError } from \"@webiny/utils/createZodError.js\";\nimport { schedulerEntrySchema } from \"./schema/schedulerEntry.js\";\nimport type {\n    ISchedulerGetExecuteParams,\n    ISchedulerGetGateway\n} from \"@webiny/app-headless-cms-scheduler/index.js\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { createSchedulerEntryFields } from \"./graphql/fields.js\";\n\nconst createSchedulerGetQuery = () => {\n    return gql`\n        query SchedulerGetQuery($modelId: String!, $id: ID!) {\n            getCmsSchedule(modelId: $modelId, id: $id) {\n                data {\n                    ${createSchedulerEntryFields()}\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    `;\n};\n\ninterface SchedulerGetGraphQLQueryVariables extends ISchedulerGetExecuteParams {}\n\ninterface SchedulerGetGraphQLQueryResponse {\n    getCmsSchedule: {\n        data: SchedulerEntry | null;\n        error: CmsErrorResponse | null;\n    };\n}\n\nconst schema = zod.object({\n    data: schedulerEntrySchema\n});\n\nexport class SchedulerGetGraphQLGateway implements ISchedulerGetGateway {\n    private readonly client: ApolloClient<any>;\n\n    public constructor(client: ApolloClient<any>) {\n        this.client = client;\n    }\n\n    public async execute(params: ISchedulerGetExecuteParams) {\n        const { data: response, errors } = await this.client.query<\n            SchedulerGetGraphQLQueryResponse,\n            SchedulerGetGraphQLQueryVariables\n        >({\n            query: createSchedulerGetQuery(),\n            variables: {\n                ...params\n            },\n            fetchPolicy: \"network-only\"\n        });\n\n        const result = response.getCmsSchedule;\n        if (!result || errors?.length) {\n            console.error({\n                errors\n            });\n            throw new Error(\"Network error while getting schedule entry.\");\n        }\n\n        if (!result.data) {\n            throw new Error(result.error?.message || \"Could not fetch scheduled entry.\");\n        }\n\n        const validated = await schema.safeParseAsync(result);\n        if (!validated.success) {\n            throw createZodError(validated.error);\n        }\n\n        return {\n            item: validated.data.data\n        };\n    }\n}\n"],"mappings":"AAEA,OAAOA,GAAG,MAAM,aAAa;AAC7B,OAAOC,GAAG,MAAM,KAAK;AACrB,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,oBAAoB;AAM7B,SAASC,0BAA0B;AAEnC,MAAMC,uBAAuB,GAAGA,CAAA,KAAM;EAClC,OAAOL,GAAG;AACd;AACA;AACA;AACA,sBAAsBI,0BAA0B,CAAC,CAAC;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL,CAAC;AAWD,MAAME,MAAM,GAAGL,GAAG,CAACM,MAAM,CAAC;EACtBC,IAAI,EAAEL;AACV,CAAC,CAAC;AAEF,OAAO,MAAMM,0BAA0B,CAAiC;EAG7DC,WAAWA,CAACC,MAAyB,EAAE;IAC1C,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAaC,OAAOA,CAACC,MAAkC,EAAE;IACrD,MAAM;MAAEL,IAAI,EAAEM,QAAQ;MAAEC;IAAO,CAAC,GAAG,MAAM,IAAI,CAACJ,MAAM,CAACK,KAAK,CAGxD;MACEA,KAAK,EAAEX,uBAAuB,CAAC,CAAC;MAChCY,SAAS,EAAE;QACP,GAAGJ;MACP,CAAC;MACDK,WAAW,EAAE;IACjB,CAAC,CAAC;IAEF,MAAMC,MAAM,GAAGL,QAAQ,CAACM,cAAc;IACtC,IAAI,CAACD,MAAM,IAAIJ,MAAM,EAAEM,MAAM,EAAE;MAC3BC,OAAO,CAACC,KAAK,CAAC;QACVR;MACJ,CAAC,CAAC;MACF,MAAM,IAAIS,KAAK,CAAC,6CAA6C,CAAC;IAClE;IAEA,IAAI,CAACL,MAAM,CAACX,IAAI,EAAE;MACd,MAAM,IAAIgB,KAAK,CAACL,MAAM,CAACI,KAAK,EAAEE,OAAO,IAAI,kCAAkC,CAAC;IAChF;IAEA,MAAMC,SAAS,GAAG,MAAMpB,MAAM,CAACqB,cAAc,CAACR,MAAM,CAAC;IACrD,IAAI,CAACO,SAAS,CAACE,OAAO,EAAE;MACpB,MAAM1B,cAAc,CAACwB,SAAS,CAACH,KAAK,CAAC;IACzC;IAEA,OAAO;MACHM,IAAI,EAAEH,SAAS,CAAClB,IAAI,CAACA;IACzB,CAAC;EACL;AACJ","ignoreList":[]}
+{"version":3,"names":["gql","zod","createZodError","schedulerEntrySchema","createSchedulerEntryFields","createSchedulerGetQuery","schema","object","data","SchedulerGetGraphQLGateway","constructor","client","execute","params","response","errors","query","variables","fetchPolicy","result","getCmsSchedule","length","console","error","Error","message","validated","safeParseAsync","success","err","log","JSON","stringify","ex"],"sources":["SchedulerGetGraphQLGateway.ts"],"sourcesContent":["import type { ApolloClient } from \"apollo-client\";\nimport type { CmsErrorResponse } from \"@webiny/app-headless-cms-common/types\";\nimport gql from \"graphql-tag\";\nimport zod from \"zod\";\nimport { createZodError } from \"@webiny/utils/createZodError.js\";\nimport { schedulerEntrySchema } from \"./schema/schedulerEntry.js\";\nimport type {\n    ISchedulerGetExecuteParams,\n    ISchedulerGetGateway\n} from \"@webiny/app-headless-cms-scheduler/index.js\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { createSchedulerEntryFields } from \"./graphql/fields.js\";\n\nconst createSchedulerGetQuery = () => {\n    return gql`\n        query SchedulerGetQuery($modelId: String!, $id: ID!) {\n            getCmsSchedule(modelId: $modelId, id: $id) {\n                data {\n                    ${createSchedulerEntryFields()}\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    `;\n};\n\ninterface SchedulerGetGraphQLQueryVariables extends ISchedulerGetExecuteParams {}\n\ninterface SchedulerGetGraphQLQueryResponse {\n    getCmsSchedule: {\n        data: SchedulerEntry | null;\n        error: CmsErrorResponse | null;\n    };\n}\n\nconst schema = zod.object({\n    data: schedulerEntrySchema\n});\n\nexport class SchedulerGetGraphQLGateway implements ISchedulerGetGateway {\n    private readonly client: ApolloClient<any>;\n\n    public constructor(client: ApolloClient<any>) {\n        this.client = client;\n    }\n\n    public async execute(params: ISchedulerGetExecuteParams) {\n        const { data: response, errors } = await this.client.query<\n            SchedulerGetGraphQLQueryResponse,\n            SchedulerGetGraphQLQueryVariables\n        >({\n            query: createSchedulerGetQuery(),\n            variables: {\n                ...params\n            },\n            fetchPolicy: \"network-only\"\n        });\n\n        const result = response.getCmsSchedule;\n        if (!result || errors?.length) {\n            console.error({\n                errors\n            });\n            throw new Error(\"Network error while getting schedule entry.\");\n        } else if (result.error) {\n            console.error({\n                error: result.error\n            });\n            throw new Error(result.error.message || \"Could not fetch scheduled entry.\");\n        } else if (!result.data) {\n            return null;\n        }\n\n        const validated = await schema.safeParseAsync(result);\n        if (!validated.success) {\n            const err = createZodError(validated.error);\n            console.error(err);\n            console.log(\n                JSON.stringify({\n                    err,\n                    ex: validated.error\n                })\n            );\n            throw err;\n        }\n\n        return validated.data.data;\n    }\n}\n"],"mappings":"AAEA,OAAOA,GAAG,MAAM,aAAa;AAC7B,OAAOC,GAAG,MAAM,KAAK;AACrB,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,oBAAoB;AAM7B,SAASC,0BAA0B;AAEnC,MAAMC,uBAAuB,GAAGA,CAAA,KAAM;EAClC,OAAOL,GAAG;AACd;AACA;AACA;AACA,sBAAsBI,0BAA0B,CAAC,CAAC;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL,CAAC;AAWD,MAAME,MAAM,GAAGL,GAAG,CAACM,MAAM,CAAC;EACtBC,IAAI,EAAEL;AACV,CAAC,CAAC;AAEF,OAAO,MAAMM,0BAA0B,CAAiC;EAG7DC,WAAWA,CAACC,MAAyB,EAAE;IAC1C,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAaC,OAAOA,CAACC,MAAkC,EAAE;IACrD,MAAM;MAAEL,IAAI,EAAEM,QAAQ;MAAEC;IAAO,CAAC,GAAG,MAAM,IAAI,CAACJ,MAAM,CAACK,KAAK,CAGxD;MACEA,KAAK,EAAEX,uBAAuB,CAAC,CAAC;MAChCY,SAAS,EAAE;QACP,GAAGJ;MACP,CAAC;MACDK,WAAW,EAAE;IACjB,CAAC,CAAC;IAEF,MAAMC,MAAM,GAAGL,QAAQ,CAACM,cAAc;IACtC,IAAI,CAACD,MAAM,IAAIJ,MAAM,EAAEM,MAAM,EAAE;MAC3BC,OAAO,CAACC,KAAK,CAAC;QACVR;MACJ,CAAC,CAAC;MACF,MAAM,IAAIS,KAAK,CAAC,6CAA6C,CAAC;IAClE,CAAC,MAAM,IAAIL,MAAM,CAACI,KAAK,EAAE;MACrBD,OAAO,CAACC,KAAK,CAAC;QACVA,KAAK,EAAEJ,MAAM,CAACI;MAClB,CAAC,CAAC;MACF,MAAM,IAAIC,KAAK,CAACL,MAAM,CAACI,KAAK,CAACE,OAAO,IAAI,kCAAkC,CAAC;IAC/E,CAAC,MAAM,IAAI,CAACN,MAAM,CAACX,IAAI,EAAE;MACrB,OAAO,IAAI;IACf;IAEA,MAAMkB,SAAS,GAAG,MAAMpB,MAAM,CAACqB,cAAc,CAACR,MAAM,CAAC;IACrD,IAAI,CAACO,SAAS,CAACE,OAAO,EAAE;MACpB,MAAMC,GAAG,GAAG3B,cAAc,CAACwB,SAAS,CAACH,KAAK,CAAC;MAC3CD,OAAO,CAACC,KAAK,CAACM,GAAG,CAAC;MAClBP,OAAO,CAACQ,GAAG,CACPC,IAAI,CAACC,SAAS,CAAC;QACXH,GAAG;QACHI,EAAE,EAAEP,SAAS,CAACH;MAClB,CAAC,CACL,CAAC;MACD,MAAMM,GAAG;IACb;IAEA,OAAOH,SAAS,CAAClB,IAAI,CAACA,IAAI;EAC9B;AACJ","ignoreList":[]}

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerListGraphQLGateway.js

@@ -73,9 +73,7 @@ export class SchedulerListGraphQLGateway {
     const validated = await schema.safeParseAsync(result);
     if (!validated.success) {
       const err = createZodError(validated.error);
-      console.log({
-        err
-      });
+      console.error(err);
       throw err;
     }
     return {

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerListGraphQLGateway.js.map

@@ -1 +1 @@
-{"version":3,"names":["gql","zod","createZodError","schedulerEntrySchema","createSchedulerEntryFields","createSchedulerListQuery","schema","object","data","array","meta","totalCount","number","cursor","string","nullable","hasMoreItems","boolean","SchedulerListGraphQLGateway","constructor","client","execute","params","response","errors","query","variables","fetchPolicy","result","listCmsSchedules","length","console","error","Error","message","validated","safeParseAsync","success","err","log","items"],"sources":["SchedulerListGraphQLGateway.ts"],"sourcesContent":["import type { ApolloClient } from \"apollo-client\";\nimport type { CmsErrorResponse, CmsMetaResponse } from \"@webiny/app-headless-cms-common/types\";\nimport gql from \"graphql-tag\";\nimport zod from \"zod\";\nimport { createZodError } from \"@webiny/utils/createZodError.js\";\nimport { schedulerEntrySchema } from \"./schema/schedulerEntry.js\";\nimport type {\n    ISchedulerListExecuteParams,\n    ISchedulerListGateway,\n    ISchedulerListGatewayResponse\n} from \"@webiny/app-headless-cms-scheduler/index.js\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { createSchedulerEntryFields } from \"./graphql/fields.js\";\n\nconst createSchedulerListQuery = () => {\n    return gql`\n        query SchedulerListQuery(\n            $modelId: String!\n            $where: CmsListSchedulesWhereInput\n            $sort: [CmsListSchedulesSorter!]\n            $limit: Int\n            $after: String\n        ) {\n            listCmsSchedules(\n                modelId: $modelId\n                where: $where\n                sort: $sort\n                limit: $limit\n                after: $after\n            ) {\n                data {\n                    ${createSchedulerEntryFields()}\n                }\n                meta {\n                    totalCount\n                    cursor\n                    hasMoreItems\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    `;\n};\n\ninterface SchedulerListGraphQLQueryVariables extends ISchedulerListExecuteParams {}\n\ninterface SchedulerListGraphQLQueryResponse {\n    listCmsSchedules: {\n        data: SchedulerEntry[] | null;\n        meta: CmsMetaResponse | null;\n        error: CmsErrorResponse | null;\n    };\n}\n\nconst schema = zod.object({\n    data: zod.array(schedulerEntrySchema),\n    meta: zod.object({\n        totalCount: zod.number(),\n        cursor: zod.string().nullable(),\n        hasMoreItems: zod.boolean()\n    })\n});\n\nexport class SchedulerListGraphQLGateway implements ISchedulerListGateway {\n    private readonly client: ApolloClient<any>;\n\n    public constructor(client: ApolloClient<any>) {\n        this.client = client;\n    }\n\n    public async execute(\n        params: ISchedulerListExecuteParams\n    ): Promise<ISchedulerListGatewayResponse> {\n        const { data: response, errors } = await this.client.query<\n            SchedulerListGraphQLQueryResponse,\n            SchedulerListGraphQLQueryVariables\n        >({\n            query: createSchedulerListQuery(),\n            variables: {\n                ...params\n            },\n            fetchPolicy: \"network-only\"\n        });\n\n        const result = response.listCmsSchedules;\n        if (!result || errors?.length) {\n            console.error({\n                errors\n            });\n            throw new Error(\"Network error while listing scheduled entries.\");\n        }\n\n        if (!result.data || !result.meta) {\n            throw new Error(result.error?.message || \"Could not fetch scheduled entries.\");\n        }\n\n        const validated = await schema.safeParseAsync(result);\n        if (!validated.success) {\n            const err = createZodError(validated.error);\n            console.log({\n                err\n            });\n            throw err;\n        }\n\n        return {\n            items: validated.data.data,\n            meta: validated.data.meta\n        };\n    }\n}\n"],"mappings":"AAEA,OAAOA,GAAG,MAAM,aAAa;AAC7B,OAAOC,GAAG,MAAM,KAAK;AACrB,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,oBAAoB;AAO7B,SAASC,0BAA0B;AAEnC,MAAMC,wBAAwB,GAAGA,CAAA,KAAM;EACnC,OAAOL,GAAG;AACd;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,sBAAsBI,0BAA0B,CAAC,CAAC;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL,CAAC;AAYD,MAAME,MAAM,GAAGL,GAAG,CAACM,MAAM,CAAC;EACtBC,IAAI,EAAEP,GAAG,CAACQ,KAAK,CAACN,oBAAoB,CAAC;EACrCO,IAAI,EAAET,GAAG,CAACM,MAAM,CAAC;IACbI,UAAU,EAAEV,GAAG,CAACW,MAAM,CAAC,CAAC;IACxBC,MAAM,EAAEZ,GAAG,CAACa,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC;IAC/BC,YAAY,EAAEf,GAAG,CAACgB,OAAO,CAAC;EAC9B,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,MAAMC,2BAA2B,CAAkC;EAG/DC,WAAWA,CAACC,MAAyB,EAAE;IAC1C,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAaC,OAAOA,CAChBC,MAAmC,EACG;IACtC,MAAM;MAAEd,IAAI,EAAEe,QAAQ;MAAEC;IAAO,CAAC,GAAG,MAAM,IAAI,CAACJ,MAAM,CAACK,KAAK,CAGxD;MACEA,KAAK,EAAEpB,wBAAwB,CAAC,CAAC;MACjCqB,SAAS,EAAE;QACP,GAAGJ;MACP,CAAC;MACDK,WAAW,EAAE;IACjB,CAAC,CAAC;IAEF,MAAMC,MAAM,GAAGL,QAAQ,CAACM,gBAAgB;IACxC,IAAI,CAACD,MAAM,IAAIJ,MAAM,EAAEM,MAAM,EAAE;MAC3BC,OAAO,CAACC,KAAK,CAAC;QACVR;MACJ,CAAC,CAAC;MACF,MAAM,IAAIS,KAAK,CAAC,gDAAgD,CAAC;IACrE;IAEA,IAAI,CAACL,MAAM,CAACpB,IAAI,IAAI,CAACoB,MAAM,CAAClB,IAAI,EAAE;MAC9B,MAAM,IAAIuB,KAAK,CAACL,MAAM,CAACI,KAAK,EAAEE,OAAO,IAAI,oCAAoC,CAAC;IAClF;IAEA,MAAMC,SAAS,GAAG,MAAM7B,MAAM,CAAC8B,cAAc,CAACR,MAAM,CAAC;IACrD,IAAI,CAACO,SAAS,CAACE,OAAO,EAAE;MACpB,MAAMC,GAAG,GAAGpC,cAAc,CAACiC,SAAS,CAACH,KAAK,CAAC;MAC3CD,OAAO,CAACQ,GAAG,CAAC;QACRD;MACJ,CAAC,CAAC;MACF,MAAMA,GAAG;IACb;IAEA,OAAO;MACHE,KAAK,EAAEL,SAAS,CAAC3B,IAAI,CAACA,IAAI;MAC1BE,IAAI,EAAEyB,SAAS,CAAC3B,IAAI,CAACE;IACzB,CAAC;EACL;AACJ","ignoreList":[]}
+{"version":3,"names":["gql","zod","createZodError","schedulerEntrySchema","createSchedulerEntryFields","createSchedulerListQuery","schema","object","data","array","meta","totalCount","number","cursor","string","nullable","hasMoreItems","boolean","SchedulerListGraphQLGateway","constructor","client","execute","params","response","errors","query","variables","fetchPolicy","result","listCmsSchedules","length","console","error","Error","message","validated","safeParseAsync","success","err","items"],"sources":["SchedulerListGraphQLGateway.ts"],"sourcesContent":["import type { ApolloClient } from \"apollo-client\";\nimport type { CmsErrorResponse, CmsMetaResponse } from \"@webiny/app-headless-cms-common/types\";\nimport gql from \"graphql-tag\";\nimport zod from \"zod\";\nimport { createZodError } from \"@webiny/utils/createZodError.js\";\nimport { schedulerEntrySchema } from \"./schema/schedulerEntry.js\";\nimport type {\n    ISchedulerListExecuteParams,\n    ISchedulerListGateway,\n    ISchedulerListGatewayResponse\n} from \"@webiny/app-headless-cms-scheduler/index.js\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { createSchedulerEntryFields } from \"./graphql/fields.js\";\n\nconst createSchedulerListQuery = () => {\n    return gql`\n        query SchedulerListQuery(\n            $modelId: String!\n            $where: CmsListSchedulesWhereInput\n            $sort: [CmsListSchedulesSorter!]\n            $limit: Int\n            $after: String\n        ) {\n            listCmsSchedules(\n                modelId: $modelId\n                where: $where\n                sort: $sort\n                limit: $limit\n                after: $after\n            ) {\n                data {\n                    ${createSchedulerEntryFields()}\n                }\n                meta {\n                    totalCount\n                    cursor\n                    hasMoreItems\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    `;\n};\n\ninterface SchedulerListGraphQLQueryVariables extends ISchedulerListExecuteParams {}\n\ninterface SchedulerListGraphQLQueryResponse {\n    listCmsSchedules: {\n        data: SchedulerEntry[] | null;\n        meta: CmsMetaResponse | null;\n        error: CmsErrorResponse | null;\n    };\n}\n\nconst schema = zod.object({\n    data: zod.array(schedulerEntrySchema),\n    meta: zod.object({\n        totalCount: zod.number(),\n        cursor: zod.string().nullable(),\n        hasMoreItems: zod.boolean()\n    })\n});\n\nexport class SchedulerListGraphQLGateway implements ISchedulerListGateway {\n    private readonly client: ApolloClient<any>;\n\n    public constructor(client: ApolloClient<any>) {\n        this.client = client;\n    }\n\n    public async execute(\n        params: ISchedulerListExecuteParams\n    ): Promise<ISchedulerListGatewayResponse> {\n        const { data: response, errors } = await this.client.query<\n            SchedulerListGraphQLQueryResponse,\n            SchedulerListGraphQLQueryVariables\n        >({\n            query: createSchedulerListQuery(),\n            variables: {\n                ...params\n            },\n            fetchPolicy: \"network-only\"\n        });\n\n        const result = response.listCmsSchedules;\n        if (!result || errors?.length) {\n            console.error({\n                errors\n            });\n            throw new Error(\"Network error while listing scheduled entries.\");\n        }\n\n        if (!result.data || !result.meta) {\n            throw new Error(result.error?.message || \"Could not fetch scheduled entries.\");\n        }\n\n        const validated = await schema.safeParseAsync(result);\n        if (!validated.success) {\n            const err = createZodError(validated.error);\n            console.error(err);\n            throw err;\n        }\n\n        return {\n            items: validated.data.data,\n            meta: validated.data.meta\n        };\n    }\n}\n"],"mappings":"AAEA,OAAOA,GAAG,MAAM,aAAa;AAC7B,OAAOC,GAAG,MAAM,KAAK;AACrB,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,oBAAoB;AAO7B,SAASC,0BAA0B;AAEnC,MAAMC,wBAAwB,GAAGA,CAAA,KAAM;EACnC,OAAOL,GAAG;AACd;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,sBAAsBI,0BAA0B,CAAC,CAAC;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL,CAAC;AAYD,MAAME,MAAM,GAAGL,GAAG,CAACM,MAAM,CAAC;EACtBC,IAAI,EAAEP,GAAG,CAACQ,KAAK,CAACN,oBAAoB,CAAC;EACrCO,IAAI,EAAET,GAAG,CAACM,MAAM,CAAC;IACbI,UAAU,EAAEV,GAAG,CAACW,MAAM,CAAC,CAAC;IACxBC,MAAM,EAAEZ,GAAG,CAACa,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC;IAC/BC,YAAY,EAAEf,GAAG,CAACgB,OAAO,CAAC;EAC9B,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,MAAMC,2BAA2B,CAAkC;EAG/DC,WAAWA,CAACC,MAAyB,EAAE;IAC1C,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAaC,OAAOA,CAChBC,MAAmC,EACG;IACtC,MAAM;MAAEd,IAAI,EAAEe,QAAQ;MAAEC;IAAO,CAAC,GAAG,MAAM,IAAI,CAACJ,MAAM,CAACK,KAAK,CAGxD;MACEA,KAAK,EAAEpB,wBAAwB,CAAC,CAAC;MACjCqB,SAAS,EAAE;QACP,GAAGJ;MACP,CAAC;MACDK,WAAW,EAAE;IACjB,CAAC,CAAC;IAEF,MAAMC,MAAM,GAAGL,QAAQ,CAACM,gBAAgB;IACxC,IAAI,CAACD,MAAM,IAAIJ,MAAM,EAAEM,MAAM,EAAE;MAC3BC,OAAO,CAACC,KAAK,CAAC;QACVR;MACJ,CAAC,CAAC;MACF,MAAM,IAAIS,KAAK,CAAC,gDAAgD,CAAC;IACrE;IAEA,IAAI,CAACL,MAAM,CAACpB,IAAI,IAAI,CAACoB,MAAM,CAAClB,IAAI,EAAE;MAC9B,MAAM,IAAIuB,KAAK,CAACL,MAAM,CAACI,KAAK,EAAEE,OAAO,IAAI,oCAAoC,CAAC;IAClF;IAEA,MAAMC,SAAS,GAAG,MAAM7B,MAAM,CAAC8B,cAAc,CAACR,MAAM,CAAC;IACrD,IAAI,CAACO,SAAS,CAACE,OAAO,EAAE;MACpB,MAAMC,GAAG,GAAGpC,cAAc,CAACiC,SAAS,CAACH,KAAK,CAAC;MAC3CD,OAAO,CAACC,KAAK,CAACM,GAAG,CAAC;MAClB,MAAMA,GAAG;IACb;IAEA,OAAO;MACHC,KAAK,EAAEJ,SAAS,CAAC3B,IAAI,CAACA,IAAI;MAC1BE,IAAI,EAAEyB,SAAS,CAAC3B,IAAI,CAACE;IACzB,CAAC;EACL;AACJ","ignoreList":[]}

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerPublishGraphQLGateway.js

@@ -54,9 +54,15 @@ export class SchedulerPublishGraphQLGateway {
     if (!result.data) {
       throw new Error(result.error?.message || "Could not schedule entry to be published.");
     }
-    const validated = await schema.safeParseAsync(result.data);
+    const validated = await schema.safeParseAsync(result);
     if (!validated.success) {
-      throw createZodError(validated.error);
+      const err = createZodError(validated.error);
+      console.error({
+        err,
+        errS: JSON.stringify(err),
+        error: JSON.stringify(validated.error)
+      });
+      throw err;
     }
     return {
       item: validated.data.data

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerPublishGraphQLGateway.js.map

@@ -1 +1 @@
-{"version":3,"names":["zod","schedulerEntrySchema","createZodError","gql","ScheduleType","createSchedulerEntryFields","createSchedulerPublishMutation","schema","object","data","SchedulerPublishGraphQLGateway","constructor","client","execute","params","response","errors","mutate","mutation","variables","modelId","id","input","scheduleOn","type","publish","fetchPolicy","result","createCmsSchedule","length","console","error","Error","message","validated","safeParseAsync","success","item"],"sources":["SchedulerPublishGraphQLGateway.ts"],"sourcesContent":["import type { ApolloClient } from \"apollo-client\";\nimport type { CmsErrorResponse } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport zod from \"zod\";\nimport { schedulerEntrySchema } from \"./schema/schedulerEntry.js\";\nimport { createZodError } from \"@webiny/utils/createZodError\";\nimport gql from \"graphql-tag\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { ScheduleType } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport type {\n    ISchedulerPublishExecuteParams,\n    ISchedulerPublishGateway,\n    ISchedulerPublishGatewayResponse\n} from \"@webiny/app-headless-cms-scheduler/index.js\";\nimport { createSchedulerEntryFields } from \"./graphql/fields.js\";\n\nconst createSchedulerPublishMutation = () => {\n    return gql`\n        mutation SchedulerPublish($modelId: String!, $id: ID!, $input: CmsCreateScheduleInput!) {\n            createCmsSchedule(modelId: $modelId, id: $id, input: $input) {\n                data {\n                    ${createSchedulerEntryFields()}\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    `;\n};\n\ninterface SchedulerPublishGraphQLMutationVariables {\n    modelId: string;\n    id: string;\n    input: {\n        scheduleOn: Date;\n        type: ScheduleType.publish;\n    };\n}\n\ninterface SchedulerPublishGraphQLMutationResponse {\n    createCmsSchedule: {\n        data: SchedulerEntry | null;\n        error: CmsErrorResponse | null;\n    };\n}\n\nconst schema = zod.object({\n    data: schedulerEntrySchema\n});\n\nexport class SchedulerPublishGraphQLGateway implements ISchedulerPublishGateway {\n    private readonly client: ApolloClient<any>;\n\n    public constructor(client: ApolloClient<any>) {\n        this.client = client;\n    }\n\n    public async execute(\n        params: ISchedulerPublishExecuteParams\n    ): Promise<ISchedulerPublishGatewayResponse> {\n        const { data: response, errors } = await this.client.mutate<\n            SchedulerPublishGraphQLMutationResponse,\n            SchedulerPublishGraphQLMutationVariables\n        >({\n            mutation: createSchedulerPublishMutation(),\n            variables: {\n                modelId: params.modelId,\n                id: params.id,\n                input: {\n                    scheduleOn: params.scheduleOn,\n                    type: ScheduleType.publish\n                }\n            },\n            fetchPolicy: \"no-cache\"\n        });\n\n        const result = response?.createCmsSchedule;\n        if (!result || errors?.length) {\n            console.error({\n                errors\n            });\n            throw new Error(\"Network error while creating a schedule.\");\n        }\n\n        if (!result.data) {\n            throw new Error(result.error?.message || \"Could not schedule entry to be published.\");\n        }\n\n        const validated = await schema.safeParseAsync(result.data);\n        if (!validated.success) {\n            throw createZodError(validated.error);\n        }\n        return {\n            item: validated.data.data\n        };\n    }\n}\n"],"mappings":"AAEA,OAAOA,GAAG,MAAM,KAAK;AACrB,SAASC,oBAAoB;AAC7B,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,OAAOC,GAAG,MAAM,aAAa;AAE7B,SAASC,YAAY,QAAQ,6CAA6C;AAM1E,SAASC,0BAA0B;AAEnC,MAAMC,8BAA8B,GAAGA,CAAA,KAAM;EACzC,OAAOH,GAAG;AACd;AACA;AACA;AACA,sBAAsBE,0BAA0B,CAAC,CAAC;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL,CAAC;AAkBD,MAAME,MAAM,GAAGP,GAAG,CAACQ,MAAM,CAAC;EACtBC,IAAI,EAAER;AACV,CAAC,CAAC;AAEF,OAAO,MAAMS,8BAA8B,CAAqC;EAGrEC,WAAWA,CAACC,MAAyB,EAAE;IAC1C,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAaC,OAAOA,CAChBC,MAAsC,EACG;IACzC,MAAM;MAAEL,IAAI,EAAEM,QAAQ;MAAEC;IAAO,CAAC,GAAG,MAAM,IAAI,CAACJ,MAAM,CAACK,MAAM,CAGzD;MACEC,QAAQ,EAAEZ,8BAA8B,CAAC,CAAC;MAC1Ca,SAAS,EAAE;QACPC,OAAO,EAAEN,MAAM,CAACM,OAAO;QACvBC,EAAE,EAAEP,MAAM,CAACO,EAAE;QACbC,KAAK,EAAE;UACHC,UAAU,EAAET,MAAM,CAACS,UAAU;UAC7BC,IAAI,EAAEpB,YAAY,CAACqB;QACvB;MACJ,CAAC;MACDC,WAAW,EAAE;IACjB,CAAC,CAAC;IAEF,MAAMC,MAAM,GAAGZ,QAAQ,EAAEa,iBAAiB;IAC1C,IAAI,CAACD,MAAM,IAAIX,MAAM,EAAEa,MAAM,EAAE;MAC3BC,OAAO,CAACC,KAAK,CAAC;QACVf;MACJ,CAAC,CAAC;MACF,MAAM,IAAIgB,KAAK,CAAC,0CAA0C,CAAC;IAC/D;IAEA,IAAI,CAACL,MAAM,CAAClB,IAAI,EAAE;MACd,MAAM,IAAIuB,KAAK,CAACL,MAAM,CAACI,KAAK,EAAEE,OAAO,IAAI,2CAA2C,CAAC;IACzF;IAEA,MAAMC,SAAS,GAAG,MAAM3B,MAAM,CAAC4B,cAAc,CAACR,MAAM,CAAClB,IAAI,CAAC;IAC1D,IAAI,CAACyB,SAAS,CAACE,OAAO,EAAE;MACpB,MAAMlC,cAAc,CAACgC,SAAS,CAACH,KAAK,CAAC;IACzC;IACA,OAAO;MACHM,IAAI,EAAEH,SAAS,CAACzB,IAAI,CAACA;IACzB,CAAC;EACL;AACJ","ignoreList":[]}
+{"version":3,"names":["zod","schedulerEntrySchema","createZodError","gql","ScheduleType","createSchedulerEntryFields","createSchedulerPublishMutation","schema","object","data","SchedulerPublishGraphQLGateway","constructor","client","execute","params","response","errors","mutate","mutation","variables","modelId","id","input","scheduleOn","type","publish","fetchPolicy","result","createCmsSchedule","length","console","error","Error","message","validated","safeParseAsync","success","err","errS","JSON","stringify","item"],"sources":["SchedulerPublishGraphQLGateway.ts"],"sourcesContent":["import type { ApolloClient } from \"apollo-client\";\nimport type { CmsErrorResponse } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport zod from \"zod\";\nimport { schedulerEntrySchema } from \"./schema/schedulerEntry.js\";\nimport { createZodError } from \"@webiny/utils/createZodError\";\nimport gql from \"graphql-tag\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { ScheduleType } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport type {\n    ISchedulerPublishExecuteParams,\n    ISchedulerPublishGateway,\n    ISchedulerPublishGatewayResponse\n} from \"@webiny/app-headless-cms-scheduler/index.js\";\nimport { createSchedulerEntryFields } from \"./graphql/fields.js\";\n\nconst createSchedulerPublishMutation = () => {\n    return gql`\n        mutation SchedulerPublish($modelId: String!, $id: ID!, $input: CmsCreateScheduleInput!) {\n            createCmsSchedule(modelId: $modelId, id: $id, input: $input) {\n                data {\n                    ${createSchedulerEntryFields()}\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    `;\n};\n\ninterface SchedulerPublishGraphQLMutationVariables {\n    modelId: string;\n    id: string;\n    input: {\n        scheduleOn: Date;\n        type: ScheduleType.publish;\n    };\n}\n\ninterface SchedulerPublishGraphQLMutationResponse {\n    createCmsSchedule: {\n        data: SchedulerEntry | null;\n        error: CmsErrorResponse | null;\n    };\n}\n\nconst schema = zod.object({\n    data: schedulerEntrySchema\n});\n\nexport class SchedulerPublishGraphQLGateway implements ISchedulerPublishGateway {\n    private readonly client: ApolloClient<any>;\n\n    public constructor(client: ApolloClient<any>) {\n        this.client = client;\n    }\n\n    public async execute(\n        params: ISchedulerPublishExecuteParams\n    ): Promise<ISchedulerPublishGatewayResponse> {\n        const { data: response, errors } = await this.client.mutate<\n            SchedulerPublishGraphQLMutationResponse,\n            SchedulerPublishGraphQLMutationVariables\n        >({\n            mutation: createSchedulerPublishMutation(),\n            variables: {\n                modelId: params.modelId,\n                id: params.id,\n                input: {\n                    scheduleOn: params.scheduleOn,\n                    type: ScheduleType.publish\n                }\n            },\n            fetchPolicy: \"no-cache\"\n        });\n\n        const result = response?.createCmsSchedule;\n        if (!result || errors?.length) {\n            console.error({\n                errors\n            });\n            throw new Error(\"Network error while creating a schedule.\");\n        }\n\n        if (!result.data) {\n            throw new Error(result.error?.message || \"Could not schedule entry to be published.\");\n        }\n\n        const validated = await schema.safeParseAsync(result);\n        if (!validated.success) {\n            const err = createZodError(validated.error);\n            console.error({\n                err,\n                errS: JSON.stringify(err),\n                error: JSON.stringify(validated.error)\n            });\n            throw err;\n        }\n        return {\n            item: validated.data.data\n        };\n    }\n}\n"],"mappings":"AAEA,OAAOA,GAAG,MAAM,KAAK;AACrB,SAASC,oBAAoB;AAC7B,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,OAAOC,GAAG,MAAM,aAAa;AAE7B,SAASC,YAAY,QAAQ,6CAA6C;AAM1E,SAASC,0BAA0B;AAEnC,MAAMC,8BAA8B,GAAGA,CAAA,KAAM;EACzC,OAAOH,GAAG;AACd;AACA;AACA;AACA,sBAAsBE,0BAA0B,CAAC,CAAC;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL,CAAC;AAkBD,MAAME,MAAM,GAAGP,GAAG,CAACQ,MAAM,CAAC;EACtBC,IAAI,EAAER;AACV,CAAC,CAAC;AAEF,OAAO,MAAMS,8BAA8B,CAAqC;EAGrEC,WAAWA,CAACC,MAAyB,EAAE;IAC1C,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAaC,OAAOA,CAChBC,MAAsC,EACG;IACzC,MAAM;MAAEL,IAAI,EAAEM,QAAQ;MAAEC;IAAO,CAAC,GAAG,MAAM,IAAI,CAACJ,MAAM,CAACK,MAAM,CAGzD;MACEC,QAAQ,EAAEZ,8BAA8B,CAAC,CAAC;MAC1Ca,SAAS,EAAE;QACPC,OAAO,EAAEN,MAAM,CAACM,OAAO;QACvBC,EAAE,EAAEP,MAAM,CAACO,EAAE;QACbC,KAAK,EAAE;UACHC,UAAU,EAAET,MAAM,CAACS,UAAU;UAC7BC,IAAI,EAAEpB,YAAY,CAACqB;QACvB;MACJ,CAAC;MACDC,WAAW,EAAE;IACjB,CAAC,CAAC;IAEF,MAAMC,MAAM,GAAGZ,QAAQ,EAAEa,iBAAiB;IAC1C,IAAI,CAACD,MAAM,IAAIX,MAAM,EAAEa,MAAM,EAAE;MAC3BC,OAAO,CAACC,KAAK,CAAC;QACVf;MACJ,CAAC,CAAC;MACF,MAAM,IAAIgB,KAAK,CAAC,0CAA0C,CAAC;IAC/D;IAEA,IAAI,CAACL,MAAM,CAAClB,IAAI,EAAE;MACd,MAAM,IAAIuB,KAAK,CAACL,MAAM,CAACI,KAAK,EAAEE,OAAO,IAAI,2CAA2C,CAAC;IACzF;IAEA,MAAMC,SAAS,GAAG,MAAM3B,MAAM,CAAC4B,cAAc,CAACR,MAAM,CAAC;IACrD,IAAI,CAACO,SAAS,CAACE,OAAO,EAAE;MACpB,MAAMC,GAAG,GAAGnC,cAAc,CAACgC,SAAS,CAACH,KAAK,CAAC;MAC3CD,OAAO,CAACC,KAAK,CAAC;QACVM,GAAG;QACHC,IAAI,EAAEC,IAAI,CAACC,SAAS,CAACH,GAAG,CAAC;QACzBN,KAAK,EAAEQ,IAAI,CAACC,SAAS,CAACN,SAAS,CAACH,KAAK;MACzC,CAAC,CAAC;MACF,MAAMM,GAAG;IACb;IACA,OAAO;MACHI,IAAI,EAAEP,SAAS,CAACzB,IAAI,CAACA;IACzB,CAAC;EACL;AACJ","ignoreList":[]}

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerUnpublishGraphQLGateway.d.ts

@@ -6,15 +6,15 @@ export declare class SchedulerUnpublishGraphQLGateway implements ISchedulerUnpub
     constructor(client: ApolloClient<any>);
     execute(params: ISchedulerUnpublishExecuteParams): Promise<{
         item: {
-            type: ScheduleType;
+            model: Pick<import("@webiny/app-headless-cms-scheduler/types.js").CmsModel, "modelId">;
             id: string;
             title: string;
-            model: Pick<import("@webiny/app-headless-cms-scheduler/types.js").CmsModel, "modelId">;
+            type: ScheduleType;
             targetId: string;
             scheduledBy: {
-                type: string;
                 id: string;
                 displayName: string;
+                type: string;
             };
             publishOn?: Date | undefined;
             unpublishOn?: Date | undefined;

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerUnpublishGraphQLGateway.js

@@ -54,9 +54,11 @@ export class SchedulerUnpublishGraphQLGateway {
     if (!result.data) {
       throw new Error(result.error?.message || "Could not schedule entry to be unpublished.");
     }
-    const validated = await schema.safeParseAsync(result.data);
+    const validated = await schema.safeParseAsync(result);
     if (!validated.success) {
-      throw createZodError(validated.error);
+      const err = createZodError(validated.error);
+      console.error(err);
+      throw err;
     }
     return {
       item: validated.data.data

package/admin/components/ContentEntries/Scheduler/adapters/SchedulerUnpublishGraphQLGateway.js.map

@@ -1 +1 @@
-{"version":3,"names":["zod","schedulerEntrySchema","createZodError","gql","ScheduleType","createSchedulerEntryFields","createSchedulerUnpublishMutation","schema","object","data","SchedulerUnpublishGraphQLGateway","constructor","client","execute","params","response","errors","mutate","mutation","variables","modelId","id","input","scheduleOn","type","unpublish","fetchPolicy","result","createCmsSchedule","length","console","error","Error","message","validated","safeParseAsync","success","item"],"sources":["SchedulerUnpublishGraphQLGateway.ts"],"sourcesContent":["import type { ApolloClient } from \"apollo-client\";\nimport type { CmsErrorResponse } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport zod from \"zod\";\nimport { schedulerEntrySchema } from \"./schema/schedulerEntry.js\";\nimport { createZodError } from \"@webiny/utils/createZodError\";\nimport gql from \"graphql-tag\";\nimport type {\n    ISchedulerUnpublishExecuteParams,\n    ISchedulerUnpublishGateway\n} from \"@webiny/app-headless-cms-scheduler/index.js\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { ScheduleType } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { createSchedulerEntryFields } from \"./graphql/fields.js\";\n\nconst createSchedulerUnpublishMutation = () => {\n    return gql`\n        mutation SchedulerUnpublish($modelId: String!, $id: ID!, $input: CmsCreateScheduleInput!) {\n            createCmsSchedule(modelId: $modelId, id: $id, input: $input) {\n                data {\n                    ${createSchedulerEntryFields()}\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    `;\n};\n\ninterface SchedulerUnpublishGraphQLMutationVariables {\n    modelId: string;\n    id: string;\n    input: {\n        scheduleOn: Date;\n        type: ScheduleType.unpublish;\n    };\n}\n\ninterface SchedulerUnpublishGraphQLMutationResponse {\n    createCmsSchedule: {\n        data: SchedulerEntry | null;\n        error: CmsErrorResponse | null;\n    };\n}\n\nconst schema = zod.object({\n    data: schedulerEntrySchema\n});\n\nexport class SchedulerUnpublishGraphQLGateway implements ISchedulerUnpublishGateway {\n    private readonly client: ApolloClient<any>;\n\n    public constructor(client: ApolloClient<any>) {\n        this.client = client;\n    }\n\n    public async execute(params: ISchedulerUnpublishExecuteParams) {\n        const { data: response, errors } = await this.client.mutate<\n            SchedulerUnpublishGraphQLMutationResponse,\n            SchedulerUnpublishGraphQLMutationVariables\n        >({\n            mutation: createSchedulerUnpublishMutation(),\n            variables: {\n                modelId: params.modelId,\n                id: params.id,\n                input: {\n                    scheduleOn: params.scheduleOn,\n                    type: ScheduleType.unpublish\n                }\n            },\n            fetchPolicy: \"no-cache\"\n        });\n\n        const result = response?.createCmsSchedule;\n        if (!result || errors?.length) {\n            console.error({\n                errors\n            });\n            throw new Error(\"Network error while creating a schedule.\");\n        }\n\n        if (!result.data) {\n            throw new Error(result.error?.message || \"Could not schedule entry to be unpublished.\");\n        }\n\n        const validated = await schema.safeParseAsync(result.data);\n        if (!validated.success) {\n            throw createZodError(validated.error);\n        }\n        return {\n            item: validated.data.data\n        };\n    }\n}\n"],"mappings":"AAEA,OAAOA,GAAG,MAAM,KAAK;AACrB,SAASC,oBAAoB;AAC7B,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,OAAOC,GAAG,MAAM,aAAa;AAM7B,SAASC,YAAY,QAAQ,6CAA6C;AAC1E,SAASC,0BAA0B;AAEnC,MAAMC,gCAAgC,GAAGA,CAAA,KAAM;EAC3C,OAAOH,GAAG;AACd;AACA;AACA;AACA,sBAAsBE,0BAA0B,CAAC,CAAC;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL,CAAC;AAkBD,MAAME,MAAM,GAAGP,GAAG,CAACQ,MAAM,CAAC;EACtBC,IAAI,EAAER;AACV,CAAC,CAAC;AAEF,OAAO,MAAMS,gCAAgC,CAAuC;EAGzEC,WAAWA,CAACC,MAAyB,EAAE;IAC1C,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAaC,OAAOA,CAACC,MAAwC,EAAE;IAC3D,MAAM;MAAEL,IAAI,EAAEM,QAAQ;MAAEC;IAAO,CAAC,GAAG,MAAM,IAAI,CAACJ,MAAM,CAACK,MAAM,CAGzD;MACEC,QAAQ,EAAEZ,gCAAgC,CAAC,CAAC;MAC5Ca,SAAS,EAAE;QACPC,OAAO,EAAEN,MAAM,CAACM,OAAO;QACvBC,EAAE,EAAEP,MAAM,CAACO,EAAE;QACbC,KAAK,EAAE;UACHC,UAAU,EAAET,MAAM,CAACS,UAAU;UAC7BC,IAAI,EAAEpB,YAAY,CAACqB;QACvB;MACJ,CAAC;MACDC,WAAW,EAAE;IACjB,CAAC,CAAC;IAEF,MAAMC,MAAM,GAAGZ,QAAQ,EAAEa,iBAAiB;IAC1C,IAAI,CAACD,MAAM,IAAIX,MAAM,EAAEa,MAAM,EAAE;MAC3BC,OAAO,CAACC,KAAK,CAAC;QACVf;MACJ,CAAC,CAAC;MACF,MAAM,IAAIgB,KAAK,CAAC,0CAA0C,CAAC;IAC/D;IAEA,IAAI,CAACL,MAAM,CAAClB,IAAI,EAAE;MACd,MAAM,IAAIuB,KAAK,CAACL,MAAM,CAACI,KAAK,EAAEE,OAAO,IAAI,6CAA6C,CAAC;IAC3F;IAEA,MAAMC,SAAS,GAAG,MAAM3B,MAAM,CAAC4B,cAAc,CAACR,MAAM,CAAClB,IAAI,CAAC;IAC1D,IAAI,CAACyB,SAAS,CAACE,OAAO,EAAE;MACpB,MAAMlC,cAAc,CAACgC,SAAS,CAACH,KAAK,CAAC;IACzC;IACA,OAAO;MACHM,IAAI,EAAEH,SAAS,CAACzB,IAAI,CAACA;IACzB,CAAC;EACL;AACJ","ignoreList":[]}
+{"version":3,"names":["zod","schedulerEntrySchema","createZodError","gql","ScheduleType","createSchedulerEntryFields","createSchedulerUnpublishMutation","schema","object","data","SchedulerUnpublishGraphQLGateway","constructor","client","execute","params","response","errors","mutate","mutation","variables","modelId","id","input","scheduleOn","type","unpublish","fetchPolicy","result","createCmsSchedule","length","console","error","Error","message","validated","safeParseAsync","success","err","item"],"sources":["SchedulerUnpublishGraphQLGateway.ts"],"sourcesContent":["import type { ApolloClient } from \"apollo-client\";\nimport type { CmsErrorResponse } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport zod from \"zod\";\nimport { schedulerEntrySchema } from \"./schema/schedulerEntry.js\";\nimport { createZodError } from \"@webiny/utils/createZodError\";\nimport gql from \"graphql-tag\";\nimport type {\n    ISchedulerUnpublishExecuteParams,\n    ISchedulerUnpublishGateway\n} from \"@webiny/app-headless-cms-scheduler/index.js\";\nimport type { SchedulerEntry } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { ScheduleType } from \"@webiny/app-headless-cms-scheduler/types.js\";\nimport { createSchedulerEntryFields } from \"./graphql/fields.js\";\n\nconst createSchedulerUnpublishMutation = () => {\n    return gql`\n        mutation SchedulerUnpublish($modelId: String!, $id: ID!, $input: CmsCreateScheduleInput!) {\n            createCmsSchedule(modelId: $modelId, id: $id, input: $input) {\n                data {\n                    ${createSchedulerEntryFields()}\n                }\n                error {\n                    message\n                    code\n                    data\n                    stack\n                }\n            }\n        }\n    `;\n};\n\ninterface SchedulerUnpublishGraphQLMutationVariables {\n    modelId: string;\n    id: string;\n    input: {\n        scheduleOn: Date;\n        type: ScheduleType.unpublish;\n    };\n}\n\ninterface SchedulerUnpublishGraphQLMutationResponse {\n    createCmsSchedule: {\n        data: SchedulerEntry | null;\n        error: CmsErrorResponse | null;\n    };\n}\n\nconst schema = zod.object({\n    data: schedulerEntrySchema\n});\n\nexport class SchedulerUnpublishGraphQLGateway implements ISchedulerUnpublishGateway {\n    private readonly client: ApolloClient<any>;\n\n    public constructor(client: ApolloClient<any>) {\n        this.client = client;\n    }\n\n    public async execute(params: ISchedulerUnpublishExecuteParams) {\n        const { data: response, errors } = await this.client.mutate<\n            SchedulerUnpublishGraphQLMutationResponse,\n            SchedulerUnpublishGraphQLMutationVariables\n        >({\n            mutation: createSchedulerUnpublishMutation(),\n            variables: {\n                modelId: params.modelId,\n                id: params.id,\n                input: {\n                    scheduleOn: params.scheduleOn,\n                    type: ScheduleType.unpublish\n                }\n            },\n            fetchPolicy: \"no-cache\"\n        });\n\n        const result = response?.createCmsSchedule;\n        if (!result || errors?.length) {\n            console.error({\n                errors\n            });\n            throw new Error(\"Network error while creating a schedule.\");\n        }\n\n        if (!result.data) {\n            throw new Error(result.error?.message || \"Could not schedule entry to be unpublished.\");\n        }\n\n        const validated = await schema.safeParseAsync(result);\n        if (!validated.success) {\n            const err = createZodError(validated.error);\n            console.error(err);\n            throw err;\n        }\n        return {\n            item: validated.data.data\n        };\n    }\n}\n"],"mappings":"AAEA,OAAOA,GAAG,MAAM,KAAK;AACrB,SAASC,oBAAoB;AAC7B,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,OAAOC,GAAG,MAAM,aAAa;AAM7B,SAASC,YAAY,QAAQ,6CAA6C;AAC1E,SAASC,0BAA0B;AAEnC,MAAMC,gCAAgC,GAAGA,CAAA,KAAM;EAC3C,OAAOH,GAAG;AACd;AACA;AACA;AACA,sBAAsBE,0BAA0B,CAAC,CAAC;AAClD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;AACL,CAAC;AAkBD,MAAME,MAAM,GAAGP,GAAG,CAACQ,MAAM,CAAC;EACtBC,IAAI,EAAER;AACV,CAAC,CAAC;AAEF,OAAO,MAAMS,gCAAgC,CAAuC;EAGzEC,WAAWA,CAACC,MAAyB,EAAE;IAC1C,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAaC,OAAOA,CAACC,MAAwC,EAAE;IAC3D,MAAM;MAAEL,IAAI,EAAEM,QAAQ;MAAEC;IAAO,CAAC,GAAG,MAAM,IAAI,CAACJ,MAAM,CAACK,MAAM,CAGzD;MACEC,QAAQ,EAAEZ,gCAAgC,CAAC,CAAC;MAC5Ca,SAAS,EAAE;QACPC,OAAO,EAAEN,MAAM,CAACM,OAAO;QACvBC,EAAE,EAAEP,MAAM,CAACO,EAAE;QACbC,KAAK,EAAE;UACHC,UAAU,EAAET,MAAM,CAACS,UAAU;UAC7BC,IAAI,EAAEpB,YAAY,CAACqB;QACvB;MACJ,CAAC;MACDC,WAAW,EAAE;IACjB,CAAC,CAAC;IAEF,MAAMC,MAAM,GAAGZ,QAAQ,EAAEa,iBAAiB;IAC1C,IAAI,CAACD,MAAM,IAAIX,MAAM,EAAEa,MAAM,EAAE;MAC3BC,OAAO,CAACC,KAAK,CAAC;QACVf;MACJ,CAAC,CAAC;MACF,MAAM,IAAIgB,KAAK,CAAC,0CAA0C,CAAC;IAC/D;IAEA,IAAI,CAACL,MAAM,CAAClB,IAAI,EAAE;MACd,MAAM,IAAIuB,KAAK,CAACL,MAAM,CAACI,KAAK,EAAEE,OAAO,IAAI,6CAA6C,CAAC;IAC3F;IAEA,MAAMC,SAAS,GAAG,MAAM3B,MAAM,CAAC4B,cAAc,CAACR,MAAM,CAAC;IACrD,IAAI,CAACO,SAAS,CAACE,OAAO,EAAE;MACpB,MAAMC,GAAG,GAAGnC,cAAc,CAACgC,SAAS,CAACH,KAAK,CAAC;MAC3CD,OAAO,CAACC,KAAK,CAACM,GAAG,CAAC;MAClB,MAAMA,GAAG;IACb;IACA,OAAO;MACHC,IAAI,EAAEJ,SAAS,CAACzB,IAAI,CAACA;IACzB,CAAC;EACL;AACJ","ignoreList":[]}

package/admin/components/ContentEntries/Scheduler/adapters/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./SchedulerCancelGraphQLGateway";
+export * from "./SchedulerGetGraphQLGateway";
+export * from "./SchedulerListGraphQLGateway";
+export * from "./SchedulerPublishGraphQLGateway";
+export * from "./SchedulerUnpublishGraphQLGateway";

package/admin/components/ContentEntries/Scheduler/adapters/index.js

@@ -0,0 +1,7 @@
+export * from "./SchedulerCancelGraphQLGateway";
+export * from "./SchedulerGetGraphQLGateway";
+export * from "./SchedulerListGraphQLGateway";
+export * from "./SchedulerPublishGraphQLGateway";
+export * from "./SchedulerUnpublishGraphQLGateway";
+
+//# sourceMappingURL=index.js.map

package/admin/components/ContentEntries/Scheduler/adapters/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./SchedulerCancelGraphQLGateway\";\nexport * from \"./SchedulerGetGraphQLGateway\";\nexport * from \"./SchedulerListGraphQLGateway\";\nexport * from \"./SchedulerPublishGraphQLGateway\";\nexport * from \"./SchedulerUnpublishGraphQLGateway\";\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA","ignoreList":[]}

package/admin/components/ContentEntries/Scheduler/adapters/schema/schedulerEntry.d.ts

@@ -18,44 +18,44 @@ export declare const schedulerEntrySchema: zod.ZodObject<{
         displayName: zod.ZodString;
         type: zod.ZodString;
     }, "strip", zod.ZodTypeAny, {
-        type: string;
         id: string;
         displayName: string;
-    }, {
         type: string;
+    }, {
         id: string;
         displayName: string;
+        type: string;
     }>;
-    publishOn: zod.ZodOptional<zod.ZodDate>;
-    unpublishOn: zod.ZodOptional<zod.ZodDate>;
+    publishOn: zod.ZodEffects<zod.ZodOptional<zod.ZodNullable<zod.ZodString>>, Date | undefined, string | null | undefined>;
+    unpublishOn: zod.ZodEffects<zod.ZodOptional<zod.ZodNullable<zod.ZodString>>, Date | undefined, string | null | undefined>;
     type: zod.ZodNativeEnum<typeof ScheduleType>;
     title: zod.ZodString;
 }, "strip", zod.ZodTypeAny, {
-    type: ScheduleType;
+    model: Pick<CmsModel, "modelId">;
     id: string;
     title: string;
-    model: Pick<CmsModel, "modelId">;
+    type: ScheduleType;
     targetId: string;
     scheduledBy: {
-        type: string;
         id: string;
         displayName: string;
+        type: string;
     };
     publishOn?: Date | undefined;
     unpublishOn?: Date | undefined;
 }, {
-    type: ScheduleType;
-    id: string;
-    title: string;
     model: {
         modelId: string;
     };
+    id: string;
+    title: string;
+    type: ScheduleType;
     targetId: string;
     scheduledBy: {
-        type: string;
         id: string;
         displayName: string;
+        type: string;
     };
-    publishOn?: Date | undefined;
-    unpublishOn?: Date | undefined;
+    publishOn?: string | null | undefined;
+    unpublishOn?: string | null | undefined;
 }>;

package/admin/components/ContentEntries/Scheduler/adapters/schema/schedulerEntry.js

@@ -13,8 +13,12 @@ export const schedulerEntrySchema = zod.object({
     displayName: zod.string(),
     type: zod.string()
   }),
-  publishOn: zod.coerce.date().optional(),
-  unpublishOn: zod.coerce.date().optional(),
+  publishOn: zod.string().nullable().optional().transform(value => {
+    return !!value ? new Date(value) : undefined;
+  }),
+  unpublishOn: zod.string().nullable().optional().transform(value => {
+    return !!value ? new Date(value) : undefined;
+  }),
   type: zod.nativeEnum(ScheduleType),
   title: zod.string()
 });

package/admin/components/ContentEntries/Scheduler/adapters/schema/schedulerEntry.js.map

@@ -1 +1 @@
-{"version":3,"names":["zod","ScheduleType","schedulerEntrySchema","object","id","string","targetId","model","modelId","transform","value","scheduledBy","displayName","type","publishOn","coerce","date","optional","unpublishOn","nativeEnum","title"],"sources":["schedulerEntry.ts"],"sourcesContent":["import type { CmsModel } from \"@webiny/app-headless-cms-common/types/model.js\";\nimport zod from \"zod\";\nimport { ScheduleType } from \"@webiny/app-headless-cms-scheduler/types.js\";\n\nexport const schedulerEntrySchema = zod.object({\n    id: zod.string(),\n    targetId: zod.string(),\n    model: zod\n        .object({\n            modelId: zod.string()\n        })\n        .transform(value => {\n            return value as unknown as Pick<CmsModel, \"modelId\">;\n        }),\n    scheduledBy: zod.object({\n        id: zod.string(),\n        displayName: zod.string(),\n        type: zod.string()\n    }),\n    publishOn: zod.coerce.date().optional(),\n    unpublishOn: zod.coerce.date().optional(),\n    type: zod.nativeEnum(ScheduleType),\n    title: zod.string()\n});\n"],"mappings":"AACA,OAAOA,GAAG,MAAM,KAAK;AACrB,SAASC,YAAY,QAAQ,6CAA6C;AAE1E,OAAO,MAAMC,oBAAoB,GAAGF,GAAG,CAACG,MAAM,CAAC;EAC3CC,EAAE,EAAEJ,GAAG,CAACK,MAAM,CAAC,CAAC;EAChBC,QAAQ,EAAEN,GAAG,CAACK,MAAM,CAAC,CAAC;EACtBE,KAAK,EAAEP,GAAG,CACLG,MAAM,CAAC;IACJK,OAAO,EAAER,GAAG,CAACK,MAAM,CAAC;EACxB,CAAC,CAAC,CACDI,SAAS,CAACC,KAAK,IAAI;IAChB,OAAOA,KAAK;EAChB,CAAC,CAAC;EACNC,WAAW,EAAEX,GAAG,CAACG,MAAM,CAAC;IACpBC,EAAE,EAAEJ,GAAG,CAACK,MAAM,CAAC,CAAC;IAChBO,WAAW,EAAEZ,GAAG,CAACK,MAAM,CAAC,CAAC;IACzBQ,IAAI,EAAEb,GAAG,CAACK,MAAM,CAAC;EACrB,CAAC,CAAC;EACFS,SAAS,EAAEd,GAAG,CAACe,MAAM,CAACC,IAAI,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC;EACvCC,WAAW,EAAElB,GAAG,CAACe,MAAM,CAACC,IAAI,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC;EACzCJ,IAAI,EAAEb,GAAG,CAACmB,UAAU,CAAClB,YAAY,CAAC;EAClCmB,KAAK,EAAEpB,GAAG,CAACK,MAAM,CAAC;AACtB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["zod","ScheduleType","schedulerEntrySchema","object","id","string","targetId","model","modelId","transform","value","scheduledBy","displayName","type","publishOn","nullable","optional","Date","undefined","unpublishOn","nativeEnum","title"],"sources":["schedulerEntry.ts"],"sourcesContent":["import type { CmsModel } from \"@webiny/app-headless-cms-common/types/model.js\";\nimport zod from \"zod\";\nimport { ScheduleType } from \"@webiny/app-headless-cms-scheduler/types.js\";\n\nexport const schedulerEntrySchema = zod.object({\n    id: zod.string(),\n    targetId: zod.string(),\n    model: zod\n        .object({\n            modelId: zod.string()\n        })\n        .transform(value => {\n            return value as unknown as Pick<CmsModel, \"modelId\">;\n        }),\n    scheduledBy: zod.object({\n        id: zod.string(),\n        displayName: zod.string(),\n        type: zod.string()\n    }),\n    publishOn: zod\n        .string()\n        .nullable()\n        .optional()\n        .transform(value => {\n            return !!value ? new Date(value) : undefined;\n        }),\n    unpublishOn: zod\n        .string()\n        .nullable()\n        .optional()\n        .transform(value => {\n            return !!value ? new Date(value) : undefined;\n        }),\n    type: zod.nativeEnum(ScheduleType),\n    title: zod.string()\n});\n"],"mappings":"AACA,OAAOA,GAAG,MAAM,KAAK;AACrB,SAASC,YAAY,QAAQ,6CAA6C;AAE1E,OAAO,MAAMC,oBAAoB,GAAGF,GAAG,CAACG,MAAM,CAAC;EAC3CC,EAAE,EAAEJ,GAAG,CAACK,MAAM,CAAC,CAAC;EAChBC,QAAQ,EAAEN,GAAG,CAACK,MAAM,CAAC,CAAC;EACtBE,KAAK,EAAEP,GAAG,CACLG,MAAM,CAAC;IACJK,OAAO,EAAER,GAAG,CAACK,MAAM,CAAC;EACxB,CAAC,CAAC,CACDI,SAAS,CAACC,KAAK,IAAI;IAChB,OAAOA,KAAK;EAChB,CAAC,CAAC;EACNC,WAAW,EAAEX,GAAG,CAACG,MAAM,CAAC;IACpBC,EAAE,EAAEJ,GAAG,CAACK,MAAM,CAAC,CAAC;IAChBO,WAAW,EAAEZ,GAAG,CAACK,MAAM,CAAC,CAAC;IACzBQ,IAAI,EAAEb,GAAG,CAACK,MAAM,CAAC;EACrB,CAAC,CAAC;EACFS,SAAS,EAAEd,GAAG,CACTK,MAAM,CAAC,CAAC,CACRU,QAAQ,CAAC,CAAC,CACVC,QAAQ,CAAC,CAAC,CACVP,SAAS,CAACC,KAAK,IAAI;IAChB,OAAO,CAAC,CAACA,KAAK,GAAG,IAAIO,IAAI,CAACP,KAAK,CAAC,GAAGQ,SAAS;EAChD,CAAC,CAAC;EACNC,WAAW,EAAEnB,GAAG,CACXK,MAAM,CAAC,CAAC,CACRU,QAAQ,CAAC,CAAC,CACVC,QAAQ,CAAC,CAAC,CACVP,SAAS,CAACC,KAAK,IAAI;IAChB,OAAO,CAAC,CAACA,KAAK,GAAG,IAAIO,IAAI,CAACP,KAAK,CAAC,GAAGQ,SAAS;EAChD,CAAC,CAAC;EACNL,IAAI,EAAEb,GAAG,CAACoB,UAAU,CAACnB,YAAY,CAAC;EAClCoB,KAAK,EAAErB,GAAG,CAACK,MAAM,CAAC;AACtB,CAAC,CAAC","ignoreList":[]}

package/admin/components/ContentEntries/Table/Cells/CellActions.js

@@ -17,18 +17,18 @@ const DefaultCellActions = () => {
   } = useAcoConfig();
   if (isFolderRow(row)) {
     // If the user cannot manage folder structure, no need to show the menu.
-    if (!row.canManageStructure) {
+    if (!row.data.canManageStructure) {
       return null;
     }
     return /*#__PURE__*/React.createElement(FolderProvider, {
-      folder: row
+      folder: row.data
     }, /*#__PURE__*/React.createElement(OptionsMenu, {
       actions: folderConfig.actions,
       "data-testid": "table.row.folder.menu-action"
     }));
   }
   return /*#__PURE__*/React.createElement(EntryProvider, {
-    entry: row
+    entry: row.data
   }, /*#__PURE__*/React.createElement(OptionsMenu, {
     actions: recordConfig.actions,
     "data-testid": "table.row.pb.entry.menu-action"

package/admin/components/ContentEntries/Table/Cells/CellActions.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","FolderProvider","useAcoConfig","makeDecoratable","OptionsMenu","ContentEntryListConfig","EntryProvider","DefaultCellActions","useTableRow","isFolderRow","Browser","Table","Column","row","folder","folderConfig","record","recordConfig","canManageStructure","createElement","actions","entry","CellActions"],"sources":["CellActions.tsx"],"sourcesContent":["import React from \"react\";\nimport { FolderProvider, useAcoConfig } from \"@webiny/app-aco\";\nimport { makeDecoratable, OptionsMenu } from \"@webiny/app-admin\";\nimport { ContentEntryListConfig } from \"~/admin/config/contentEntries\";\nimport { EntryProvider } from \"~/admin/hooks/useEntry\";\n\nconst DefaultCellActions = () => {\n    const { useTableRow, isFolderRow } = ContentEntryListConfig.Browser.Table.Column;\n    const { row } = useTableRow();\n    const { folder: folderConfig, record: recordConfig } = useAcoConfig();\n\n    if (isFolderRow(row)) {\n        // If the user cannot manage folder structure, no need to show the menu.\n        if (!row.canManageStructure) {\n            return null;\n        }\n\n        return (\n            <FolderProvider folder={row}>\n                <OptionsMenu\n                    actions={folderConfig.actions}\n                    data-testid={\"table.row.folder.menu-action\"}\n                />\n            </FolderProvider>\n        );\n    }\n\n    return (\n        <EntryProvider entry={row}>\n            <OptionsMenu\n                actions={recordConfig.actions}\n                data-testid={\"table.row.pb.entry.menu-action\"}\n            />\n        </EntryProvider>\n    );\n};\n\nexport const CellActions = makeDecoratable(\"CellActions\", DefaultCellActions);\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,cAAc,EAAEC,YAAY,QAAQ,iBAAiB;AAC9D,SAASC,eAAe,EAAEC,WAAW,QAAQ,mBAAmB;AAChE,SAASC,sBAAsB;AAC/B,SAASC,aAAa;AAEtB,MAAMC,kBAAkB,GAAGA,CAAA,KAAM;EAC7B,MAAM;IAAEC,WAAW;IAAEC;EAAY,CAAC,GAAGJ,sBAAsB,CAACK,OAAO,CAACC,KAAK,CAACC,MAAM;EAChF,MAAM;IAAEC;EAAI,CAAC,GAAGL,WAAW,CAAC,CAAC;EAC7B,MAAM;IAAEM,MAAM,EAAEC,YAAY;IAAEC,MAAM,EAAEC;EAAa,CAAC,GAAGf,YAAY,CAAC,CAAC;EAErE,IAAIO,WAAW,CAACI,GAAG,CAAC,EAAE;IAClB;IACA,IAAI,CAACA,GAAG,CAACK,kBAAkB,EAAE;MACzB,OAAO,IAAI;IACf;IAEA,oBACIlB,KAAA,CAAAmB,aAAA,CAAClB,cAAc;MAACa,MAAM,EAAED;IAAI,gBACxBb,KAAA,CAAAmB,aAAA,CAACf,WAAW;MACRgB,OAAO,EAAEL,YAAY,CAACK,OAAQ;MAC9B,eAAa;IAA+B,CAC/C,CACW,CAAC;EAEzB;EAEA,oBACIpB,KAAA,CAAAmB,aAAA,CAACb,aAAa;IAACe,KAAK,EAAER;EAAI,gBACtBb,KAAA,CAAAmB,aAAA,CAACf,WAAW;IACRgB,OAAO,EAAEH,YAAY,CAACG,OAAQ;IAC9B,eAAa;EAAiC,CACjD,CACU,CAAC;AAExB,CAAC;AAED,OAAO,MAAME,WAAW,GAAGnB,eAAe,CAAC,aAAa,EAAEI,kBAAkB,CAAC","ignoreList":[]}
+{"version":3,"names":["React","FolderProvider","useAcoConfig","makeDecoratable","OptionsMenu","ContentEntryListConfig","EntryProvider","DefaultCellActions","useTableRow","isFolderRow","Browser","Table","Column","row","folder","folderConfig","record","recordConfig","data","canManageStructure","createElement","actions","entry","CellActions"],"sources":["CellActions.tsx"],"sourcesContent":["import React from \"react\";\nimport { FolderProvider, useAcoConfig } from \"@webiny/app-aco\";\nimport { makeDecoratable, OptionsMenu } from \"@webiny/app-admin\";\nimport { ContentEntryListConfig } from \"~/admin/config/contentEntries\";\nimport { EntryProvider } from \"~/admin/hooks/useEntry\";\n\nconst DefaultCellActions = () => {\n    const { useTableRow, isFolderRow } = ContentEntryListConfig.Browser.Table.Column;\n    const { row } = useTableRow();\n    const { folder: folderConfig, record: recordConfig } = useAcoConfig();\n\n    if (isFolderRow(row)) {\n        // If the user cannot manage folder structure, no need to show the menu.\n        if (!row.data.canManageStructure) {\n            return null;\n        }\n\n        return (\n            <FolderProvider folder={row.data}>\n                <OptionsMenu\n                    actions={folderConfig.actions}\n                    data-testid={\"table.row.folder.menu-action\"}\n                />\n            </FolderProvider>\n        );\n    }\n\n    return (\n        <EntryProvider entry={row.data}>\n            <OptionsMenu\n                actions={recordConfig.actions}\n                data-testid={\"table.row.pb.entry.menu-action\"}\n            />\n        </EntryProvider>\n    );\n};\n\nexport const CellActions = makeDecoratable(\"CellActions\", DefaultCellActions);\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,cAAc,EAAEC,YAAY,QAAQ,iBAAiB;AAC9D,SAASC,eAAe,EAAEC,WAAW,QAAQ,mBAAmB;AAChE,SAASC,sBAAsB;AAC/B,SAASC,aAAa;AAEtB,MAAMC,kBAAkB,GAAGA,CAAA,KAAM;EAC7B,MAAM;IAAEC,WAAW;IAAEC;EAAY,CAAC,GAAGJ,sBAAsB,CAACK,OAAO,CAACC,KAAK,CAACC,MAAM;EAChF,MAAM;IAAEC;EAAI,CAAC,GAAGL,WAAW,CAAC,CAAC;EAC7B,MAAM;IAAEM,MAAM,EAAEC,YAAY;IAAEC,MAAM,EAAEC;EAAa,CAAC,GAAGf,YAAY,CAAC,CAAC;EAErE,IAAIO,WAAW,CAACI,GAAG,CAAC,EAAE;IAClB;IACA,IAAI,CAACA,GAAG,CAACK,IAAI,CAACC,kBAAkB,EAAE;MAC9B,OAAO,IAAI;IACf;IAEA,oBACInB,KAAA,CAAAoB,aAAA,CAACnB,cAAc;MAACa,MAAM,EAAED,GAAG,CAACK;IAAK,gBAC7BlB,KAAA,CAAAoB,aAAA,CAAChB,WAAW;MACRiB,OAAO,EAAEN,YAAY,CAACM,OAAQ;MAC9B,eAAa;IAA+B,CAC/C,CACW,CAAC;EAEzB;EAEA,oBACIrB,KAAA,CAAAoB,aAAA,CAACd,aAAa;IAACgB,KAAK,EAAET,GAAG,CAACK;EAAK,gBAC3BlB,KAAA,CAAAoB,aAAA,CAAChB,WAAW;IACRiB,OAAO,EAAEJ,YAAY,CAACI,OAAQ;IAC9B,eAAa;EAAiC,CACjD,CACU,CAAC;AAExB,CAAC;AAED,OAAO,MAAME,WAAW,GAAGpB,eAAe,CAAC,aAAa,EAAEI,kBAAkB,CAAC","ignoreList":[]}

package/admin/components/ContentEntries/Table/Cells/CellAuthor.js

@@ -7,7 +7,7 @@ export const CellAuthor = () => {
   const {
     row
   } = useTableRow();
-  return /*#__PURE__*/React.createElement(React.Fragment, null, row.createdBy.displayName);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, row.data.createdBy.displayName);
 };
 
 //# sourceMappingURL=CellAuthor.js.map