@webiny/webhooks 6.4.0-beta.3 → 6.4.0-beta.4

package/admin/presentation/WebhookList/components/WebhookListView.js

@@ -1,163 +1,33 @@
-import react, { useCallback, useEffect, useMemo } from "react";
+import react, { useEffect, useMemo } from "react";
 import { observer } from "mobx-react-lite";
 import { DiContainerProvider, useContainer, useFeature } from "@webiny/app";
-import { useRouter } from "@webiny/app-admin";
-import { Button, DataTable, DropdownMenu, Heading, IconButton, Separator, Tag, Text, TimeAgo } from "@webiny/admin-ui";
-import { useConfirmationDialog, useSnackbar } from "@webiny/app-admin/hooks/index.js";
-import { ReactComponent } from "@webiny/icons/more_vert.svg";
-import { ReactComponent as add_svg_ReactComponent } from "@webiny/icons/add.svg";
+import { Heading, Separator } from "@webiny/admin-ui";
 import { WebhookListPresenterFeature } from "../feature.js";
 import { ListWebhooksFeature } from "../../../features/ListWebhooks/feature.js";
 import { DeleteWebhookFeature } from "../../../features/deleteWebhook/feature.js";
 import { TriggerWebhookFeature } from "../../../features/triggerWebhook/feature.js";
 import { WebhookPermissionsFeature } from "../../../features/permissions/feature.js";
-import { Routes } from "../../../routes.js";
-import { ReactComponent as edit_svg_ReactComponent } from "@webiny/icons/edit.svg";
-import { ReactComponent as delete_svg_ReactComponent } from "@webiny/icons/delete.svg";
-import { ReactComponent as webhook_svg_ReactComponent } from "@webiny/icons/webhook.svg";
+import { CreateWebhookButton } from "./CreateWebhookButton.js";
+import { WebhookListContent } from "./WebhookListContent.js";
+import { WebhookDeliveriesButton } from "./WebhookDeliveriesButton.js";
 const WebhookListView_WebhookListViewInner = observer(function() {
     const { presenter } = useFeature(WebhookListPresenterFeature);
-    const { goToRoute } = useRouter();
     useEffect(()=>{
         presenter.init();
     }, [
         presenter
     ]);
-    const { vm } = presenter;
-    const { showSnackbar } = useSnackbar();
-    const { showConfirmation: showDeleteConfirmation } = useConfirmationDialog({
-        title: "Delete Webhook",
-        message: "Are you sure you want to delete this webhook?"
-    });
-    const sorting = useMemo(()=>{
-        const sort = vm.list.sort;
-        if (!sort || !sort.field) return [];
-        return [
-            {
-                id: sort.field,
-                desc: "DESC" === sort.direction
-            }
-        ];
-    }, [
-        vm.list.sort
-    ]);
-    const onSortingChange = useCallback((updater)=>{
-        const next = "function" == typeof updater ? updater(sorting) : updater;
-        if (next.length > 0) {
-            const { id, desc } = next[0];
-            presenter.actions.sort.set(id, desc ? "DESC" : "ASC");
-        }
-    }, [
-        sorting,
-        presenter.actions.sort
-    ]);
-    const columns = useMemo(()=>({
-            name: {
-                header: "Name",
-                cell: (row)=>/*#__PURE__*/ react.createElement(Text, {
-                        className: "cursor-pointer text-primary hover:underline",
-                        onClick: ()=>goToRoute(Routes.Form, {
-                                id: row.id
-                            })
-                    }, row.name),
-                enableSorting: true,
-                size: 200
-            },
-            endpointUrl: {
-                header: "Endpoint",
-                cell: (row)=>/*#__PURE__*/ react.createElement(Text, {
-                        className: "font-mono text-sm truncate"
-                    }, row.endpointUrl),
-                size: 250
-            },
-            enabled: {
-                header: "Status",
-                cell: (row)=>/*#__PURE__*/ react.createElement(Tag, {
-                        variant: row.enabled ? "success" : "neutral-muted",
-                        content: row.enabled ? "Active" : "Disabled"
-                    }),
-                enableSorting: true,
-                size: 100
-            },
-            createdOn: {
-                header: "Created",
-                cell: (row)=>row.createdOn ? /*#__PURE__*/ react.createElement(TimeAgo, {
-                        datetime: row.createdOn
-                    }) : /*#__PURE__*/ react.createElement(Text, {
-                        size: "sm"
-                    }, "—"),
-                enableSorting: true,
-                size: 120
-            },
-            actions: {
-                header: " ",
-                cell: (row)=>/*#__PURE__*/ react.createElement(DropdownMenu, {
-                        trigger: /*#__PURE__*/ react.createElement(IconButton, {
-                            icon: /*#__PURE__*/ react.createElement(ReactComponent, null),
-                            variant: "ghost",
-                            size: "sm",
-                            "aria-label": "Actions"
-                        })
-                    }, /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
-                        icon: /*#__PURE__*/ react.createElement(edit_svg_ReactComponent, null),
-                        onClick: ()=>goToRoute(Routes.Form, {
-                                id: row.id
-                            }),
-                        text: "Edit"
-                    }), vm.permissions.canEdit && /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
-                        icon: /*#__PURE__*/ react.createElement(webhook_svg_ReactComponent, null),
-                        onClick: ()=>{
-                            presenter.actions.triggerWebhook(row.id).then(()=>{
-                                showSnackbar("Test event triggered.");
-                            });
-                        },
-                        text: "Trigger Test"
-                    }), vm.permissions.canDelete && /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(DropdownMenu.Separator, null), /*#__PURE__*/ react.createElement(DropdownMenu.Item, {
-                        onClick: ()=>{
-                            showDeleteConfirmation(()=>presenter.actions.deleteWebhook(row.id));
-                        },
-                        icon: /*#__PURE__*/ react.createElement(delete_svg_ReactComponent, null),
-                        text: "Delete"
-                    }))),
-                size: 56,
-                enableSorting: false,
-                enableHiding: false,
-                enableResizing: false
-            }
-        }), [
-        vm.permissions,
-        presenter.actions,
-        goToRoute,
-        showDeleteConfirmation,
-        showSnackbar
-    ]);
-    const createButton = /*#__PURE__*/ react.createElement(Button, {
-        variant: "primary",
-        onClick: ()=>goToRoute(Routes.Form, {
-                id: "new"
-            }),
-        icon: /*#__PURE__*/ react.createElement(add_svg_ReactComponent, null)
-    }, "Create Webhook");
     return /*#__PURE__*/ react.createElement("div", {
         className: "flex flex-col h-main-content"
     }, /*#__PURE__*/ react.createElement("div", {
         className: "flex items-center justify-between py-sm px-md"
     }, /*#__PURE__*/ react.createElement(Heading, {
         level: 5
-    }, "Webhooks"), vm.permissions.canCreate && createButton), /*#__PURE__*/ react.createElement(Separator, null), /*#__PURE__*/ react.createElement("div", {
-        className: "flex-1 overflow-auto"
-    }, vm.list.pagination.loading || 0 !== vm.list.rows.length ? /*#__PURE__*/ react.createElement(DataTable, {
-        columns: columns,
-        data: vm.list.rows,
-        loading: vm.list.pagination.loading,
-        sorting: sorting,
-        onSortingChange: onSortingChange,
-        stickyHeader: true
-    }) : /*#__PURE__*/ react.createElement("div", {
-        className: "flex flex-col items-center justify-center h-full gap-md"
-    }, /*#__PURE__*/ react.createElement(Text, {
-        className: "text-neutral-strong"
-    }, "No webhooks found."), vm.permissions.canCreate && createButton)));
+    }, "Webhooks"), /*#__PURE__*/ react.createElement("div", {
+        className: "flex gap-sm"
+    }, /*#__PURE__*/ react.createElement(WebhookDeliveriesButton, null), /*#__PURE__*/ react.createElement(CreateWebhookButton, null))), /*#__PURE__*/ react.createElement(Separator, null), /*#__PURE__*/ react.createElement(WebhookListContent, {
+        presenter: presenter
+    }));
 });
 const WebhookListView = ()=>{
     const container = useContainer();

package/admin/presentation/WebhookList/components/WebhookListView.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin/presentation/WebhookList/components/WebhookListView.js","sources":["../../../../../src/admin/presentation/WebhookList/components/WebhookListView.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useMemo } from \"react\";\nimport { observer } from \"mobx-react-lite\";\nimport { DiContainerProvider, useContainer, useFeature } from \"@webiny/app\";\nimport { useRouter } from \"@webiny/app-admin\";\nimport type { DataTableSorting, OnDataTableSortingChange } from \"@webiny/admin-ui\";\nimport {\n    Button,\n    DataTable,\n    DropdownMenu,\n    Heading,\n    IconButton,\n    Separator,\n    Tag,\n    Text,\n    TimeAgo\n} from \"@webiny/admin-ui\";\nimport { useConfirmationDialog, useSnackbar } from \"@webiny/app-admin/hooks/index.js\";\nimport { ReactComponent as MoreVerticalIcon } from \"@webiny/icons/more_vert.svg\";\nimport { ReactComponent as AddIcon } from \"@webiny/icons/add.svg\";\nimport { WebhookListPresenterFeature } from \"../feature.js\";\nimport { ListWebhooksFeature } from \"~/admin/features/ListWebhooks/feature.js\";\nimport { DeleteWebhookFeature } from \"~/admin/features/deleteWebhook/feature.js\";\nimport { TriggerWebhookFeature } from \"~/admin/features/triggerWebhook/feature.js\";\nimport { WebhookPermissionsFeature } from \"~/admin/features/permissions/feature.js\";\nimport { Routes } from \"~/admin/routes.js\";\nimport type { Webhook } from \"~/admin/shared/types.js\";\nimport { ReactComponent as Edit } from \"@webiny/icons/edit.svg\";\nimport { ReactComponent as Delete } from \"@webiny/icons/delete.svg\";\nimport { ReactComponent as WebhookIcon } from \"@webiny/icons/webhook.svg\";\n\nconst WebhookListViewInner = observer(function WebhookListViewInner() {\n    const { presenter } = useFeature(WebhookListPresenterFeature);\n    const { goToRoute } = useRouter();\n\n    useEffect(() => {\n        presenter.init();\n    }, [presenter]);\n\n    const { vm } = presenter;\n\n    const { showSnackbar } = useSnackbar();\n\n    const { showConfirmation: showDeleteConfirmation } = useConfirmationDialog({\n        title: \"Delete Webhook\",\n        message: \"Are you sure you want to delete this webhook?\"\n    });\n\n    const sorting: DataTableSorting = useMemo(() => {\n        const sort = vm.list.sort;\n        if (!sort || !sort.field) {\n            return [];\n        }\n        return [{ id: sort.field, desc: sort.direction === \"DESC\" }];\n    }, [vm.list.sort]);\n\n    const onSortingChange: OnDataTableSortingChange = useCallback(\n        updater => {\n            const next = typeof updater === \"function\" ? updater(sorting) : updater;\n            if (next.length > 0) {\n                const { id, desc } = next[0];\n                presenter.actions.sort.set(id, desc ? \"DESC\" : \"ASC\");\n            }\n        },\n        [sorting, presenter.actions.sort]\n    );\n\n    const columns = useMemo(\n        () => ({\n            name: {\n                header: \"Name\",\n                cell: (row: Webhook) => (\n                    <Text\n                        className=\"cursor-pointer text-primary hover:underline\"\n                        onClick={() => goToRoute(Routes.Form, { id: row.id })}\n                    >\n                        {row.name}\n                    </Text>\n                ),\n                enableSorting: true,\n                size: 200\n            },\n            endpointUrl: {\n                header: \"Endpoint\",\n                cell: (row: Webhook) => (\n                    <Text className=\"font-mono text-sm truncate\">{row.endpointUrl}</Text>\n                ),\n                size: 250\n            },\n            enabled: {\n                header: \"Status\",\n                cell: (row: Webhook) => (\n                    <Tag\n                        variant={row.enabled ? \"success\" : \"neutral-muted\"}\n                        content={row.enabled ? \"Active\" : \"Disabled\"}\n                    />\n                ),\n                enableSorting: true,\n                size: 100\n            },\n            createdOn: {\n                header: \"Created\",\n                cell: (row: Webhook) =>\n                    row.createdOn ? <TimeAgo datetime={row.createdOn} /> : <Text size=\"sm\">—</Text>,\n                enableSorting: true,\n                size: 120\n            },\n            actions: {\n                header: \" \",\n                cell: (row: Webhook) => (\n                    <DropdownMenu\n                        trigger={\n                            <IconButton\n                                icon={<MoreVerticalIcon />}\n                                variant=\"ghost\"\n                                size=\"sm\"\n                                aria-label=\"Actions\"\n                            />\n                        }\n                    >\n                        <DropdownMenu.Item\n                            icon={<Edit />}\n                            onClick={() => goToRoute(Routes.Form, { id: row.id })}\n                            text={\"Edit\"}\n                        />\n                        {vm.permissions.canEdit && (\n                            <DropdownMenu.Item\n                                icon={<WebhookIcon />}\n                                onClick={() => {\n                                    void presenter.actions.triggerWebhook(row.id).then(() => {\n                                        showSnackbar(\"Test event triggered.\");\n                                    });\n                                }}\n                                text={\"Trigger Test\"}\n                            />\n                        )}\n                        {vm.permissions.canDelete && (\n                            <>\n                                <DropdownMenu.Separator />\n                                <DropdownMenu.Item\n                                    onClick={() => {\n                                        showDeleteConfirmation(() =>\n                                            presenter.actions.deleteWebhook(row.id)\n                                        );\n                                    }}\n                                    icon={<Delete />}\n                                    text={\"Delete\"}\n                                />\n                            </>\n                        )}\n                    </DropdownMenu>\n                ),\n                size: 56,\n                enableSorting: false,\n                enableHiding: false,\n                enableResizing: false\n            }\n        }),\n        [vm.permissions, presenter.actions, goToRoute, showDeleteConfirmation, showSnackbar]\n    );\n\n    const createButton = (\n        <Button\n            variant=\"primary\"\n            onClick={() => goToRoute(Routes.Form, { id: \"new\" })}\n            icon={<AddIcon />}\n        >\n            Create Webhook\n        </Button>\n    );\n\n    return (\n        <div className=\"flex flex-col h-main-content\">\n            <div className=\"flex items-center justify-between py-sm px-md\">\n                <Heading level={5}>Webhooks</Heading>\n                {vm.permissions.canCreate && createButton}\n            </div>\n            <Separator />\n            <div className=\"flex-1 overflow-auto\">\n                {!vm.list.pagination.loading && vm.list.rows.length === 0 ? (\n                    <div className=\"flex flex-col items-center justify-center h-full gap-md\">\n                        <Text className=\"text-neutral-strong\">No webhooks found.</Text>\n                        {vm.permissions.canCreate && createButton}\n                    </div>\n                ) : (\n                    <DataTable<Webhook>\n                        columns={columns}\n                        data={vm.list.rows}\n                        loading={vm.list.pagination.loading}\n                        sorting={sorting}\n                        onSortingChange={onSortingChange}\n                        stickyHeader\n                    />\n                )}\n            </div>\n        </div>\n    );\n});\n\nexport const WebhookListView = () => {\n    const container = useContainer();\n\n    const scopedContainer = useMemo(() => {\n        const child = container.createChildContainer();\n        ListWebhooksFeature.register(child);\n        DeleteWebhookFeature.register(child);\n        TriggerWebhookFeature.register(child);\n        WebhookPermissionsFeature.register(child);\n        WebhookListPresenterFeature.register(child);\n        return child;\n    }, []);\n\n    return (\n        <DiContainerProvider container={scopedContainer}>\n            <WebhookListViewInner />\n        </DiContainerProvider>\n    );\n};\n"],"names":["WebhookListViewInner","observer","presenter","useFeature","WebhookListPresenterFeature","goToRoute","useRouter","useEffect","vm","showSnackbar","useSnackbar","showDeleteConfirmation","useConfirmationDialog","sorting","useMemo","sort","onSortingChange","useCallback","updater","next","id","desc","columns","row","Text","Routes","Tag","TimeAgo","DropdownMenu","IconButton","MoreVerticalIcon","Edit","WebhookIcon","Delete","createButton","Button","AddIcon","Heading","Separator","DataTable","WebhookListView","container","useContainer","scopedContainer","child","ListWebhooksFeature","DeleteWebhookFeature","TriggerWebhookFeature","WebhookPermissionsFeature","DiContainerProvider"],"mappings":"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"}
+{"version":3,"file":"admin/presentation/WebhookList/components/WebhookListView.js","sources":["../../../../../src/admin/presentation/WebhookList/components/WebhookListView.tsx"],"sourcesContent":["import React, { useEffect, useMemo } from \"react\";\nimport { observer } from \"mobx-react-lite\";\nimport { DiContainerProvider, useContainer, useFeature } from \"@webiny/app\";\nimport { Heading, Separator } from \"@webiny/admin-ui\";\nimport { WebhookListPresenterFeature } from \"../feature.js\";\nimport { ListWebhooksFeature } from \"~/admin/features/ListWebhooks/feature.js\";\nimport { DeleteWebhookFeature } from \"~/admin/features/deleteWebhook/feature.js\";\nimport { TriggerWebhookFeature } from \"~/admin/features/triggerWebhook/feature.js\";\nimport { WebhookPermissionsFeature } from \"~/admin/features/permissions/feature.js\";\nimport { CreateWebhookButton } from \"./CreateWebhookButton.js\";\nimport { WebhookListContent } from \"./WebhookListContent.js\";\nimport { WebhookDeliveriesButton } from \"~/admin/presentation/WebhookList/components/WebhookDeliveriesButton.js\";\n\nconst WebhookListViewInner = observer(function WebhookListViewInner() {\n    const { presenter } = useFeature(WebhookListPresenterFeature);\n\n    useEffect(() => {\n        presenter.init();\n    }, [presenter]);\n\n    return (\n        <div className=\"flex flex-col h-main-content\">\n            <div className=\"flex items-center justify-between py-sm px-md\">\n                <Heading level={5}>Webhooks</Heading>\n                <div className={\"flex gap-sm\"}>\n                    <WebhookDeliveriesButton />\n                    <CreateWebhookButton />\n                </div>\n            </div>\n            <Separator />\n            <WebhookListContent presenter={presenter} />\n        </div>\n    );\n});\n\nexport const WebhookListView = () => {\n    const container = useContainer();\n\n    const scopedContainer = useMemo(() => {\n        const child = container.createChildContainer();\n        ListWebhooksFeature.register(child);\n        DeleteWebhookFeature.register(child);\n        TriggerWebhookFeature.register(child);\n        WebhookPermissionsFeature.register(child);\n        WebhookListPresenterFeature.register(child);\n        return child;\n    }, []);\n\n    return (\n        <DiContainerProvider container={scopedContainer}>\n            <WebhookListViewInner />\n        </DiContainerProvider>\n    );\n};\n"],"names":["WebhookListViewInner","observer","presenter","useFeature","WebhookListPresenterFeature","useEffect","Heading","WebhookDeliveriesButton","CreateWebhookButton","Separator","WebhookListContent","WebhookListView","container","useContainer","scopedContainer","useMemo","child","ListWebhooksFeature","DeleteWebhookFeature","TriggerWebhookFeature","WebhookPermissionsFeature","DiContainerProvider"],"mappings":";;;;;;;;;;;;AAaA,MAAMA,uCAAuBC,SAAS;IAClC,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAWC;IAEjCC,UAAU;QACNH,UAAU,IAAI;IAClB,GAAG;QAACA;KAAU;IAEd,OAAO,WAAP,GACI,oBAAC;QAAI,WAAU;qBACX,oBAAC;QAAI,WAAU;qBACX,oBAACI,SAAOA;QAAC,OAAO;OAAG,2BACnB,oBAAC;QAAI,WAAW;qBACZ,oBAACC,yBAAuBA,OAAAA,WAAAA,GACxB,oBAACC,qBAAmBA,SAAAA,WAAAA,GAG5B,oBAACC,WAASA,OAAAA,WAAAA,GACV,oBAACC,oBAAkBA;QAAC,WAAWR;;AAG3C;AAEO,MAAMS,kBAAkB;IAC3B,MAAMC,YAAYC;IAElB,MAAMC,kBAAkBC,QAAQ;QAC5B,MAAMC,QAAQJ,UAAU,oBAAoB;QAC5CK,oBAAoB,QAAQ,CAACD;QAC7BE,qBAAqB,QAAQ,CAACF;QAC9BG,sBAAsB,QAAQ,CAACH;QAC/BI,0BAA0B,QAAQ,CAACJ;QACnCZ,4BAA4B,QAAQ,CAACY;QACrC,OAAOA;IACX,GAAG,EAAE;IAEL,OAAO,WAAP,GACI,oBAACK,qBAAmBA;QAAC,WAAWP;qBAC5B,oBAACd,sCAAoBA;AAGjC"}

package/admin/presentation/WebhookSettings/WebhookSettingsPresenter.js

@@ -3,6 +3,7 @@ import { WebhookSettingsPresenter } from "./abstractions.js";
 import { GetWebhookSettingsUseCase } from "../../features/getWebhookSettings/abstractions.js";
 import { UpdateWebhookSettingsUseCase } from "../../features/updateWebhookSettings/abstractions.js";
 import { FormModelFactory } from "@webiny/app-admin/features/formModel/abstractions.js";
+import { WEBHOOK_DELIVERY_MAX_RETENTION_DAYS } from "../../../api/domain/constants.js";
 class WebhookSettingsPresenterImpl {
     get vm() {
         return {
@@ -25,24 +26,30 @@ class WebhookSettingsPresenterImpl {
     buildForm() {
         return this.formModelFactory.create({
             fields: (fields)=>({
-                    signingSecret: fields.text().label("Signing Secret").placeholder("Enter a signing secret for webhook payloads").description("Used to sign webhook payloads so receivers can verify authenticity.")
+                    signingSecret: fields.text().label("Signing Secret").placeholder("Enter a signing secret for webhook payloads").description("Used to sign webhook payloads so receivers can verify authenticity."),
+                    deliveryRetentionDays: fields.number().label("Delivery Retention (days)").placeholder(String(WEBHOOK_DELIVERY_MAX_RETENTION_DAYS)).description(`How long to keep delivery logs. 0 = delete immediately. Max ${WEBHOOK_DELIVERY_MAX_RETENTION_DAYS} days.`)
                 }),
             layout: (layout)=>[
-                    layout.row("signingSecret")
+                    layout.row("signingSecret"),
+                    layout.row("deliveryRetentionDays")
                 ]
         });
     }
     async save() {
         const data = await this._form.submit();
         if (false === data) return false;
-        this._saving = true;
+        runInAction(()=>{
+            this._saving = true;
+        });
         try {
             const settings = await this.updateWebhookSettingsUseCase.execute({
-                signingSecret: data.signingSecret || void 0
+                signingSecret: data.signingSecret || void 0,
+                deliveryRetentionDays: null != data.deliveryRetentionDays ? Number(data.deliveryRetentionDays) : void 0
             });
             runInAction(()=>{
                 this._form.setData({
-                    signingSecret: settings.signingSecret ?? ""
+                    signingSecret: settings.signingSecret ?? "",
+                    deliveryRetentionDays: settings.deliveryRetentionDays ?? ""
                 });
             });
         } finally{
@@ -59,7 +66,8 @@ class WebhookSettingsPresenterImpl {
             runInAction(()=>{
                 this._form = this.buildForm();
                 this._form.setData({
-                    signingSecret: settings.signingSecret ?? ""
+                    signingSecret: settings.signingSecret ?? "",
+                    deliveryRetentionDays: settings.deliveryRetentionDays ?? ""
                 });
                 this._loading = false;
             });

package/admin/presentation/WebhookSettings/WebhookSettingsPresenter.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin/presentation/WebhookSettings/WebhookSettingsPresenter.js","sources":["../../../../src/admin/presentation/WebhookSettings/WebhookSettingsPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable, runInAction } from \"mobx\";\nimport {\n    WebhookSettingsPresenter as Abstraction,\n    type IWebhookSettingsPresenter,\n    type IWebhookSettingsViewModel\n} from \"./abstractions.js\";\nimport { GetWebhookSettingsUseCase } from \"~/admin/features/getWebhookSettings/abstractions.js\";\nimport { UpdateWebhookSettingsUseCase } from \"~/admin/features/updateWebhookSettings/abstractions.js\";\nimport {\n    FormModelFactory,\n    type IFormModel\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\n\nclass WebhookSettingsPresenterImpl implements IWebhookSettingsPresenter {\n    private _loading = false;\n    private _saving = false;\n    private _form: IFormModel;\n\n    public get vm(): IWebhookSettingsViewModel {\n        return {\n            loading: this._loading,\n            saving: this._saving,\n            form: this._form.vm\n        };\n    }\n\n    public constructor(\n        private readonly formModelFactory: FormModelFactory.Interface,\n        private readonly getWebhookSettingsUseCase: GetWebhookSettingsUseCase.Interface,\n        private readonly updateWebhookSettingsUseCase: UpdateWebhookSettingsUseCase.Interface\n    ) {\n        this._form = this.buildForm();\n\n        makeAutoObservable(this, { vm: computed });\n    }\n\n    private buildForm(): IFormModel {\n        return this.formModelFactory.create({\n            fields: fields => ({\n                signingSecret: fields\n                    .text()\n                    .label(\"Signing Secret\")\n                    .placeholder(\"Enter a signing secret for webhook payloads\")\n                    .description(\n                        \"Used to sign webhook payloads so receivers can verify authenticity.\"\n                    )\n            }),\n            layout: layout => [layout.row(\"signingSecret\")]\n        });\n    }\n\n    public async save() {\n        const data = await this._form.submit<Record<string, unknown>>();\n        if (data === false) {\n            return false;\n        }\n\n        this._saving = true;\n\n        try {\n            const settings = await this.updateWebhookSettingsUseCase.execute({\n                signingSecret: (data.signingSecret as string) || undefined\n            });\n\n            runInAction(() => {\n                this._form.setData({\n                    signingSecret: settings.signingSecret ?? \"\"\n                });\n            });\n        } finally {\n            runInAction(() => {\n                this._saving = false;\n            });\n        }\n\n        return true;\n    }\n\n    public async init(): Promise<void> {\n        this._loading = true;\n\n        try {\n            const settings = await this.getWebhookSettingsUseCase.execute();\n\n            runInAction(() => {\n                this._form = this.buildForm();\n                this._form.setData({\n                    signingSecret: settings.signingSecret ?? \"\"\n                });\n                this._loading = false;\n            });\n        } catch {\n            runInAction(() => {\n                this._loading = false;\n            });\n        }\n    }\n}\n\nexport const WebhookSettingsPresenter = Abstraction.createImplementation({\n    implementation: WebhookSettingsPresenterImpl,\n    dependencies: [FormModelFactory, GetWebhookSettingsUseCase, UpdateWebhookSettingsUseCase]\n});\n"],"names":["WebhookSettingsPresenterImpl","formModelFactory","getWebhookSettingsUseCase","updateWebhookSettingsUseCase","makeAutoObservable","computed","fields","layout","data","settings","undefined","runInAction","WebhookSettingsPresenter","Abstraction","FormModelFactory","GetWebhookSettingsUseCase","UpdateWebhookSettingsUseCase"],"mappings":";;;;;AAaA,MAAMA;IAKF,IAAW,KAAgC;QACvC,OAAO;YACH,SAAS,IAAI,CAAC,QAAQ;YACtB,QAAQ,IAAI,CAAC,OAAO;YACpB,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB;IACJ;IAEA,YACqBC,gBAA4C,EAC5CC,yBAA8D,EAC9DC,4BAAoE,CACvF;aAHmBF,gBAAgB,GAAhBA;aACAC,yBAAyB,GAAzBA;aACAC,4BAA4B,GAA5BA;aAfb,QAAQ,GAAG;aACX,OAAO,GAAG;QAgBd,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS;QAE3BC,mBAAmB,IAAI,EAAE;YAAE,IAAIC;QAAS;IAC5C;IAEQ,YAAwB;QAC5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAChC,QAAQC,CAAAA,SAAW;oBACf,eAAeA,OACV,IAAI,GACJ,KAAK,CAAC,kBACN,WAAW,CAAC,+CACZ,WAAW,CACR;gBAEZ;YACA,QAAQC,CAAAA,SAAU;oBAACA,OAAO,GAAG,CAAC;iBAAiB;QACnD;IACJ;IAEA,MAAa,OAAO;QAChB,MAAMC,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM;QACpC,IAAIA,AAAS,UAATA,MACA,OAAO;QAGX,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMC,WAAW,MAAM,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC;gBAC7D,eAAgBD,KAAK,aAAa,IAAeE;YACrD;YAEAC,YAAY;gBACR,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;oBACf,eAAeF,SAAS,aAAa,IAAI;gBAC7C;YACJ;QACJ,SAAU;YACNE,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;QAEA,OAAO;IACX;IAEA,MAAa,OAAsB;QAC/B,IAAI,CAAC,QAAQ,GAAG;QAEhB,IAAI;YACA,MAAMF,WAAW,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO;YAE7DE,YAAY;gBACR,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS;gBAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;oBACf,eAAeF,SAAS,aAAa,IAAI;gBAC7C;gBACA,IAAI,CAAC,QAAQ,GAAG;YACpB;QACJ,EAAE,OAAM;YACJE,YAAY;gBACR,IAAI,CAAC,QAAQ,GAAG;YACpB;QACJ;IACJ;AACJ;AAEO,MAAMC,oDAA2BC,yBAAAA,oBAAgC,CAAC;IACrE,gBAAgBb;IAChB,cAAc;QAACc;QAAkBC;QAA2BC;KAA6B;AAC7F"}
+{"version":3,"file":"admin/presentation/WebhookSettings/WebhookSettingsPresenter.js","sources":["../../../../src/admin/presentation/WebhookSettings/WebhookSettingsPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable, runInAction } from \"mobx\";\nimport {\n    WebhookSettingsPresenter as Abstraction,\n    type IWebhookSettingsPresenter,\n    type IWebhookSettingsViewModel\n} from \"./abstractions.js\";\nimport { GetWebhookSettingsUseCase } from \"~/admin/features/getWebhookSettings/abstractions.js\";\nimport { UpdateWebhookSettingsUseCase } from \"~/admin/features/updateWebhookSettings/abstractions.js\";\nimport {\n    FormModelFactory,\n    type IFormModel\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { WEBHOOK_DELIVERY_MAX_RETENTION_DAYS } from \"~/api/domain/constants.js\";\n\nclass WebhookSettingsPresenterImpl implements IWebhookSettingsPresenter {\n    private _loading = false;\n    private _saving = false;\n    private _form: IFormModel;\n\n    public get vm(): IWebhookSettingsViewModel {\n        return {\n            loading: this._loading,\n            saving: this._saving,\n            form: this._form.vm\n        };\n    }\n\n    public constructor(\n        private readonly formModelFactory: FormModelFactory.Interface,\n        private readonly getWebhookSettingsUseCase: GetWebhookSettingsUseCase.Interface,\n        private readonly updateWebhookSettingsUseCase: UpdateWebhookSettingsUseCase.Interface\n    ) {\n        this._form = this.buildForm();\n\n        makeAutoObservable(this, { vm: computed });\n    }\n\n    private buildForm(): IFormModel {\n        return this.formModelFactory.create({\n            fields: fields => ({\n                signingSecret: fields\n                    .text()\n                    .label(\"Signing Secret\")\n                    .placeholder(\"Enter a signing secret for webhook payloads\")\n                    .description(\n                        \"Used to sign webhook payloads so receivers can verify authenticity.\"\n                    ),\n                deliveryRetentionDays: fields\n                    .number()\n                    .label(\"Delivery Retention (days)\")\n                    .placeholder(String(WEBHOOK_DELIVERY_MAX_RETENTION_DAYS))\n                    .description(\n                        `How long to keep delivery logs. 0 = delete immediately. Max ${WEBHOOK_DELIVERY_MAX_RETENTION_DAYS} days.`\n                    )\n            }),\n            layout: layout => [layout.row(\"signingSecret\"), layout.row(\"deliveryRetentionDays\")]\n        });\n    }\n\n    public async save(): Promise<boolean> {\n        const data = await this._form.submit<Record<string, string>>();\n        if (data === false) {\n            return false;\n        }\n\n        runInAction(() => {\n            this._saving = true;\n        });\n\n        try {\n            const settings = await this.updateWebhookSettingsUseCase.execute({\n                signingSecret: data.signingSecret || undefined,\n                deliveryRetentionDays:\n                    data.deliveryRetentionDays != null\n                        ? Number(data.deliveryRetentionDays)\n                        : undefined\n            });\n\n            runInAction(() => {\n                this._form.setData({\n                    signingSecret: settings.signingSecret ?? \"\",\n                    deliveryRetentionDays: settings.deliveryRetentionDays ?? \"\"\n                });\n            });\n        } finally {\n            runInAction(() => {\n                this._saving = false;\n            });\n        }\n        return true;\n    }\n\n    public async init(): Promise<void> {\n        this._loading = true;\n\n        try {\n            const settings = await this.getWebhookSettingsUseCase.execute();\n\n            runInAction(() => {\n                this._form = this.buildForm();\n                this._form.setData({\n                    signingSecret: settings.signingSecret ?? \"\",\n                    deliveryRetentionDays: settings.deliveryRetentionDays ?? \"\"\n                });\n                this._loading = false;\n            });\n        } catch {\n            runInAction(() => {\n                this._loading = false;\n            });\n        }\n    }\n}\n\nexport const WebhookSettingsPresenter = Abstraction.createImplementation({\n    implementation: WebhookSettingsPresenterImpl,\n    dependencies: [FormModelFactory, GetWebhookSettingsUseCase, UpdateWebhookSettingsUseCase]\n});\n"],"names":["WebhookSettingsPresenterImpl","formModelFactory","getWebhookSettingsUseCase","updateWebhookSettingsUseCase","makeAutoObservable","computed","fields","String","WEBHOOK_DELIVERY_MAX_RETENTION_DAYS","layout","data","runInAction","settings","undefined","Number","WebhookSettingsPresenter","Abstraction","FormModelFactory","GetWebhookSettingsUseCase","UpdateWebhookSettingsUseCase"],"mappings":";;;;;;AAcA,MAAMA;IAKF,IAAW,KAAgC;QACvC,OAAO;YACH,SAAS,IAAI,CAAC,QAAQ;YACtB,QAAQ,IAAI,CAAC,OAAO;YACpB,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE;QACvB;IACJ;IAEA,YACqBC,gBAA4C,EAC5CC,yBAA8D,EAC9DC,4BAAoE,CACvF;aAHmBF,gBAAgB,GAAhBA;aACAC,yBAAyB,GAAzBA;aACAC,4BAA4B,GAA5BA;aAfb,QAAQ,GAAG;aACX,OAAO,GAAG;QAgBd,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS;QAE3BC,mBAAmB,IAAI,EAAE;YAAE,IAAIC;QAAS;IAC5C;IAEQ,YAAwB;QAC5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAChC,QAAQC,CAAAA,SAAW;oBACf,eAAeA,OACV,IAAI,GACJ,KAAK,CAAC,kBACN,WAAW,CAAC,+CACZ,WAAW,CACR;oBAER,uBAAuBA,OAClB,MAAM,GACN,KAAK,CAAC,6BACN,WAAW,CAACC,OAAOC,sCACnB,WAAW,CACR,CAAC,4DAA4D,EAAEA,oCAAoC,MAAM,CAAC;gBAEtH;YACA,QAAQC,CAAAA,SAAU;oBAACA,OAAO,GAAG,CAAC;oBAAkBA,OAAO,GAAG,CAAC;iBAAyB;QACxF;IACJ;IAEA,MAAa,OAAyB;QAClC,MAAMC,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM;QACpC,IAAIA,AAAS,UAATA,MACA,OAAO;QAGXC,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;QAEA,IAAI;YACA,MAAMC,WAAW,MAAM,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC;gBAC7D,eAAeF,KAAK,aAAa,IAAIG;gBACrC,uBACIH,AAA8B,QAA9BA,KAAK,qBAAqB,GACpBI,OAAOJ,KAAK,qBAAqB,IACjCG;YACd;YAEAF,YAAY;gBACR,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;oBACf,eAAeC,SAAS,aAAa,IAAI;oBACzC,uBAAuBA,SAAS,qBAAqB,IAAI;gBAC7D;YACJ;QACJ,SAAU;YACND,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;QACA,OAAO;IACX;IAEA,MAAa,OAAsB;QAC/B,IAAI,CAAC,QAAQ,GAAG;QAEhB,IAAI;YACA,MAAMC,WAAW,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO;YAE7DD,YAAY;gBACR,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS;gBAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;oBACf,eAAeC,SAAS,aAAa,IAAI;oBACzC,uBAAuBA,SAAS,qBAAqB,IAAI;gBAC7D;gBACA,IAAI,CAAC,QAAQ,GAAG;YACpB;QACJ,EAAE,OAAM;YACJD,YAAY;gBACR,IAAI,CAAC,QAAQ,GAAG;YACpB;QACJ;IACJ;AACJ;AAEO,MAAMI,oDAA2BC,yBAAAA,oBAAgC,CAAC;IACrE,gBAAgBhB;IAChB,cAAc;QAACiB;QAAkBC;QAA2BC;KAA6B;AAC7F"}

package/admin/routes.d.ts

@@ -1,8 +1,11 @@
 import { Route } from "@webiny/app-admin";
 export declare const Routes: {
     List: Route<undefined>;
+    Deliveries: Route<{
+        webhookId: import("zod").ZodOptional<import("zod").ZodString>;
+    }>;
+    Settings: Route<undefined>;
     Form: Route<{
         id: import("zod").ZodString;
     }>;
-    Settings: Route<undefined>;
 };

package/admin/routes.js

@@ -4,16 +4,23 @@ const Routes = {
         name: "Webhooks/List",
         path: "/webhooks"
     }),
-    Form: new Route({
-        name: "Webhooks/Form",
-        path: "/webhooks/:id",
+    Deliveries: new Route({
+        name: "Webhooks/Deliveries",
+        path: "/webhooks/deliveries",
         params: (zod)=>({
-                id: zod.string()
+                webhookId: zod.string().optional()
             })
     }),
     Settings: new Route({
         name: "Webhooks/Settings",
         path: "/webhooks/settings"
+    }),
+    Form: new Route({
+        name: "Webhooks/Form",
+        path: "/webhooks/:id",
+        params: (zod)=>({
+                id: zod.string()
+            })
     })
 };
 export { Routes };

package/admin/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin/routes.js","sources":["../../src/admin/routes.ts"],"sourcesContent":["import { Route } from \"@webiny/app-admin\";\n\nexport const Routes = {\n    List: new Route({\n        name: \"Webhooks/List\",\n        path: \"/webhooks\"\n    }),\n    Form: new Route({\n        name: \"Webhooks/Form\",\n        path: \"/webhooks/:id\",\n        params: zod => ({\n            id: zod.string()\n        })\n    }),\n    Settings: new Route({\n        name: \"Webhooks/Settings\",\n        path: \"/webhooks/settings\"\n    })\n};\n"],"names":["Routes","Route","zod"],"mappings":";AAEO,MAAMA,SAAS;IAClB,MAAM,IAAIC,MAAM;QACZ,MAAM;QACN,MAAM;IACV;IACA,MAAM,IAAIA,MAAM;QACZ,MAAM;QACN,MAAM;QACN,QAAQC,CAAAA,MAAQ;gBACZ,IAAIA,IAAI,MAAM;YAClB;IACJ;IACA,UAAU,IAAID,MAAM;QAChB,MAAM;QACN,MAAM;IACV;AACJ"}
+{"version":3,"file":"admin/routes.js","sources":["../../src/admin/routes.ts"],"sourcesContent":["import { Route } from \"@webiny/app-admin\";\n\nexport const Routes = {\n    List: new Route({\n        name: \"Webhooks/List\",\n        path: \"/webhooks\"\n    }),\n    Deliveries: new Route({\n        name: \"Webhooks/Deliveries\",\n        path: \"/webhooks/deliveries\",\n        params: zod => ({\n            webhookId: zod.string().optional()\n        })\n    }),\n    Settings: new Route({\n        name: \"Webhooks/Settings\",\n        path: \"/webhooks/settings\"\n    }),\n    Form: new Route({\n        name: \"Webhooks/Form\",\n        path: \"/webhooks/:id\",\n        params: zod => ({\n            id: zod.string()\n        })\n    })\n};\n"],"names":["Routes","Route","zod"],"mappings":";AAEO,MAAMA,SAAS;IAClB,MAAM,IAAIC,MAAM;QACZ,MAAM;QACN,MAAM;IACV;IACA,YAAY,IAAIA,MAAM;QAClB,MAAM;QACN,MAAM;QACN,QAAQC,CAAAA,MAAQ;gBACZ,WAAWA,IAAI,MAAM,GAAG,QAAQ;YACpC;IACJ;IACA,UAAU,IAAID,MAAM;QAChB,MAAM;QACN,MAAM;IACV;IACA,MAAM,IAAIA,MAAM;QACZ,MAAM;QACN,MAAM;QACN,QAAQC,CAAAA,MAAQ;gBACZ,IAAIA,IAAI,MAAM;YAClB;IACJ;AACJ"}

package/admin/shared/types.d.ts

@@ -5,4 +5,5 @@ export type { CreateWebhookParams } from "@webiny/sdk";
 export type { UpdateWebhookParams } from "@webiny/sdk";
 export interface WebhookSettings {
     signingSecret: string | undefined;
+    deliveryRetentionDays: number | undefined;
 }

package/api/domain/WebhookDelivery.d.ts

@@ -16,7 +16,6 @@ export interface WebhookDeliveryCmsEntry {
     id: string;
     createdOn: string;
     savedOn: string;
-    expiresAt: string;
     values: WebhookDeliveryCmsEntryValues;
 }
 export interface WebhookDelivery {

package/api/domain/WebhookSettings.d.ts

@@ -1,3 +1,4 @@
 export interface IWebhookSettings {
     signingSecret: string | undefined;
+    deliveryRetentionDays: number | undefined;
 }

package/api/domain/constants.d.ts

@@ -2,4 +2,4 @@ export declare const WEBHOOK_MODEL_ID = "webhook";
 export declare const WEBHOOK_DELIVERY_MODEL_ID = "webhookDelivery";
 export declare const WEBHOOK_SETTINGS_MODEL_ID = "webhookSettings";
 export declare const SEND_WEBHOOK_TASK = "sendWebhook";
-export declare const WEBHOOK_DELIVERY_RETENTION_DAYS = 90;
+export declare const WEBHOOK_DELIVERY_MAX_RETENTION_DAYS = 3650;

package/api/domain/constants.js

@@ -2,7 +2,7 @@ const WEBHOOK_MODEL_ID = "webhook";
 const WEBHOOK_DELIVERY_MODEL_ID = "webhookDelivery";
 const WEBHOOK_SETTINGS_MODEL_ID = "webhookSettings";
 const SEND_WEBHOOK_TASK = "sendWebhook";
-const WEBHOOK_DELIVERY_RETENTION_DAYS = 90;
-export { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_MODEL_ID, WEBHOOK_DELIVERY_RETENTION_DAYS, WEBHOOK_MODEL_ID, WEBHOOK_SETTINGS_MODEL_ID };
+const WEBHOOK_DELIVERY_MAX_RETENTION_DAYS = 3650;
+export { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_MAX_RETENTION_DAYS, WEBHOOK_DELIVERY_MODEL_ID, WEBHOOK_MODEL_ID, WEBHOOK_SETTINGS_MODEL_ID };
 
 //# sourceMappingURL=constants.js.map

package/api/domain/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/domain/constants.js","sources":["../../../src/api/domain/constants.ts"],"sourcesContent":["export const WEBHOOK_MODEL_ID = \"webhook\";\nexport const WEBHOOK_DELIVERY_MODEL_ID = \"webhookDelivery\";\nexport const WEBHOOK_SETTINGS_MODEL_ID = \"webhookSettings\";\nexport const SEND_WEBHOOK_TASK = \"sendWebhook\";\nexport const WEBHOOK_DELIVERY_RETENTION_DAYS = 90;\n"],"names":["WEBHOOK_MODEL_ID","WEBHOOK_DELIVERY_MODEL_ID","WEBHOOK_SETTINGS_MODEL_ID","SEND_WEBHOOK_TASK","WEBHOOK_DELIVERY_RETENTION_DAYS"],"mappings":"AAAO,MAAMA,mBAAmB;AACzB,MAAMC,4BAA4B;AAClC,MAAMC,4BAA4B;AAClC,MAAMC,oBAAoB;AAC1B,MAAMC,kCAAkC"}
+{"version":3,"file":"api/domain/constants.js","sources":["../../../src/api/domain/constants.ts"],"sourcesContent":["export const WEBHOOK_MODEL_ID = \"webhook\";\nexport const WEBHOOK_DELIVERY_MODEL_ID = \"webhookDelivery\";\nexport const WEBHOOK_SETTINGS_MODEL_ID = \"webhookSettings\";\nexport const SEND_WEBHOOK_TASK = \"sendWebhook\";\nexport const WEBHOOK_DELIVERY_MAX_RETENTION_DAYS = 3650;\n"],"names":["WEBHOOK_MODEL_ID","WEBHOOK_DELIVERY_MODEL_ID","WEBHOOK_SETTINGS_MODEL_ID","SEND_WEBHOOK_TASK","WEBHOOK_DELIVERY_MAX_RETENTION_DAYS"],"mappings":"AAAO,MAAMA,mBAAmB;AACzB,MAAMC,4BAA4B;AAClC,MAAMC,4BAA4B;AAClC,MAAMC,oBAAoB;AAC1B,MAAMC,sCAAsC"}

package/api/features/CreateWebhookDelivery/CreateWebhookDeliveryRepository.d.ts

@@ -3,8 +3,8 @@ import { GetModelRepository } from "@webiny/api-headless-cms/features/contentMod
 import { CreateEntryDataFactory } from "@webiny/api-headless-cms/exports/api/cms/entry.js";
 import { CreateEntryRepository } from "@webiny/api-headless-cms/features/contentEntry/CreateEntry/index.js";
 import { WebhookDeliveryTransformer } from "../../../api/features/Transformers/abstractions/WebhookDeliveryTransformer.js";
-import { CreateWebhookDeliveryRepository as RepositoryAbstraction } from "./abstractions.js";
 import type { ICreateDeliveryInput } from "./abstractions.js";
+import { CreateWebhookDeliveryRepository as RepositoryAbstraction } from "./abstractions.js";
 import type { WebhookDelivery } from "../../../api/domain/WebhookDelivery.js";
 declare class CreateWebhookDeliveryRepositoryImpl implements RepositoryAbstraction.Interface {
     private readonly getModelRepository;

package/api/features/CreateWebhookDelivery/CreateWebhookDeliveryRepository.js

@@ -32,8 +32,10 @@ class CreateWebhookDeliveryRepositoryImpl {
                 responseHeaders: null,
                 responseBody: null
             });
+            const expiresAt = new Date(input.expiresAt);
             const { entry } = await this.createEntryDataFactory.create(modelResult.value, {
-                values: storageValues
+                values: storageValues,
+                expiresAt
             });
             const createResult = await this.createEntryRepository.execute(modelResult.value, entry);
             if (createResult.isFail()) return Result.fail(WebhookPersistenceError.from(createResult.error));

package/api/features/CreateWebhookDelivery/CreateWebhookDeliveryRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/CreateWebhookDelivery/CreateWebhookDeliveryRepository.js","sources":["../../../../src/api/features/CreateWebhookDelivery/CreateWebhookDeliveryRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { GetModelRepository } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { CreateEntryDataFactory } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\nimport { CreateEntryRepository } from \"@webiny/api-headless-cms/features/contentEntry/CreateEntry/index.js\";\nimport { WebhookDeliveryTransformer } from \"~/api/features/Transformers/abstractions/WebhookDeliveryTransformer.js\";\nimport { CreateWebhookDeliveryRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { WebhookModelNotFoundError, WebhookPersistenceError } from \"~/api/domain/errors.js\";\nimport { WEBHOOK_DELIVERY_MODEL_ID } from \"~/api/domain/constants.js\";\nimport type { ICreateDeliveryInput } from \"./abstractions.js\";\nimport type {\n    WebhookDelivery,\n    WebhookDeliveryCmsEntryValues\n} from \"~/api/domain/WebhookDelivery.js\";\n\nclass CreateWebhookDeliveryRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private readonly getModelRepository: GetModelRepository.Interface,\n        private readonly createEntryDataFactory: CreateEntryDataFactory.Interface,\n        private readonly createEntryRepository: CreateEntryRepository.Interface,\n        private readonly transformer: WebhookDeliveryTransformer.Interface\n    ) {}\n\n    async execute(\n        input: ICreateDeliveryInput\n    ): Promise<Result<WebhookDelivery, RepositoryAbstraction.Error>> {\n        try {\n            const modelResult = await this.getModelRepository.execute(WEBHOOK_DELIVERY_MODEL_ID);\n            if (modelResult.isFail()) {\n                return Result.fail(new WebhookModelNotFoundError(WEBHOOK_DELIVERY_MODEL_ID));\n            }\n\n            const storageValues = this.transformer.toStorage({\n                id: \"\",\n                createdOn: \"\",\n                savedOn: \"\",\n                webhookId: input.webhookId,\n                backgroundTaskId: null,\n                eventType: input.eventType,\n                status: input.status,\n                payload: input.payload,\n                requestHeaders: null,\n                responseTime: null,\n                responseStatus: null,\n                responseHeaders: null,\n                responseBody: null\n            });\n\n            const { entry } =\n                await this.createEntryDataFactory.create<WebhookDeliveryCmsEntryValues>(\n                    modelResult.value,\n                    { values: storageValues }\n                );\n\n            const createResult = await this.createEntryRepository.execute(modelResult.value, entry);\n\n            if (createResult.isFail()) {\n                return Result.fail(WebhookPersistenceError.from(createResult.error));\n            }\n\n            const delivery = this.transformer.fromStorage(entry);\n\n            return Result.ok(delivery);\n        } catch (error) {\n            return Result.fail(WebhookPersistenceError.from(error));\n        }\n    }\n}\n\nexport const CreateWebhookDeliveryRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateWebhookDeliveryRepositoryImpl,\n    dependencies: [\n        GetModelRepository,\n        CreateEntryDataFactory,\n        CreateEntryRepository,\n        WebhookDeliveryTransformer\n    ]\n});\n"],"names":["CreateWebhookDeliveryRepositoryImpl","getModelRepository","createEntryDataFactory","createEntryRepository","transformer","input","modelResult","WEBHOOK_DELIVERY_MODEL_ID","Result","WebhookModelNotFoundError","storageValues","entry","createResult","WebhookPersistenceError","delivery","error","CreateWebhookDeliveryRepository","RepositoryAbstraction","GetModelRepository","CreateEntryDataFactory","CreateEntryRepository","WebhookDeliveryTransformer"],"mappings":";;;;;;;;AAcA,MAAMA;IACF,YACqBC,kBAAgD,EAChDC,sBAAwD,EACxDC,qBAAsD,EACtDC,WAAiD,CACpE;aAJmBH,kBAAkB,GAAlBA;aACAC,sBAAsB,GAAtBA;aACAC,qBAAqB,GAArBA;aACAC,WAAW,GAAXA;IAClB;IAEH,MAAM,QACFC,KAA2B,EACkC;QAC7D,IAAI;YACA,MAAMC,cAAc,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAACC;YAC1D,IAAID,YAAY,MAAM,IAClB,OAAOE,OAAO,IAAI,CAAC,IAAIC,0BAA0BF;YAGrD,MAAMG,gBAAgB,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;gBAC7C,IAAI;gBACJ,WAAW;gBACX,SAAS;gBACT,WAAWL,MAAM,SAAS;gBAC1B,kBAAkB;gBAClB,WAAWA,MAAM,SAAS;gBAC1B,QAAQA,MAAM,MAAM;gBACpB,SAASA,MAAM,OAAO;gBACtB,gBAAgB;gBAChB,cAAc;gBACd,gBAAgB;gBAChB,iBAAiB;gBACjB,cAAc;YAClB;YAEA,MAAM,EAAEM,KAAK,EAAE,GACX,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CACpCL,YAAY,KAAK,EACjB;gBAAE,QAAQI;YAAc;YAGhC,MAAME,eAAe,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACN,YAAY,KAAK,EAAEK;YAEjF,IAAIC,aAAa,MAAM,IACnB,OAAOJ,OAAO,IAAI,CAACK,wBAAwB,IAAI,CAACD,aAAa,KAAK;YAGtE,MAAME,WAAW,IAAI,CAAC,WAAW,CAAC,WAAW,CAACH;YAE9C,OAAOH,OAAO,EAAE,CAACM;QACrB,EAAE,OAAOC,OAAO;YACZ,OAAOP,OAAO,IAAI,CAACK,wBAAwB,IAAI,CAACE;QACpD;IACJ;AACJ;AAEO,MAAMC,kEAAkCC,gCAAAA,oBAA0C,CAAC;IACtF,gBAAgBjB;IAChB,cAAc;QACVkB;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"api/features/CreateWebhookDelivery/CreateWebhookDeliveryRepository.js","sources":["../../../../src/api/features/CreateWebhookDelivery/CreateWebhookDeliveryRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { GetModelRepository } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { CreateEntryDataFactory } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\nimport { CreateEntryRepository } from \"@webiny/api-headless-cms/features/contentEntry/CreateEntry/index.js\";\nimport { WebhookDeliveryTransformer } from \"~/api/features/Transformers/abstractions/WebhookDeliveryTransformer.js\";\nimport type { ICreateDeliveryInput } from \"./abstractions.js\";\nimport { CreateWebhookDeliveryRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { WebhookModelNotFoundError, WebhookPersistenceError } from \"~/api/domain/errors.js\";\nimport { WEBHOOK_DELIVERY_MODEL_ID } from \"~/api/domain/constants.js\";\nimport type {\n    WebhookDelivery,\n    WebhookDeliveryCmsEntryValues\n} from \"~/api/domain/WebhookDelivery.js\";\n\nclass CreateWebhookDeliveryRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private readonly getModelRepository: GetModelRepository.Interface,\n        private readonly createEntryDataFactory: CreateEntryDataFactory.Interface,\n        private readonly createEntryRepository: CreateEntryRepository.Interface,\n        private readonly transformer: WebhookDeliveryTransformer.Interface\n    ) {}\n\n    async execute(\n        input: ICreateDeliveryInput\n    ): Promise<Result<WebhookDelivery, RepositoryAbstraction.Error>> {\n        try {\n            const modelResult = await this.getModelRepository.execute(WEBHOOK_DELIVERY_MODEL_ID);\n            if (modelResult.isFail()) {\n                return Result.fail(new WebhookModelNotFoundError(WEBHOOK_DELIVERY_MODEL_ID));\n            }\n\n            const storageValues = this.transformer.toStorage({\n                id: \"\",\n                createdOn: \"\",\n                savedOn: \"\",\n                webhookId: input.webhookId,\n                backgroundTaskId: null,\n                eventType: input.eventType,\n                status: input.status,\n                payload: input.payload,\n                requestHeaders: null,\n                responseTime: null,\n                responseStatus: null,\n                responseHeaders: null,\n                responseBody: null\n            });\n\n            const expiresAt = new Date(input.expiresAt);\n\n            const { entry } =\n                await this.createEntryDataFactory.create<WebhookDeliveryCmsEntryValues>(\n                    modelResult.value,\n                    {\n                        values: storageValues,\n                        expiresAt\n                    }\n                );\n\n            const createResult = await this.createEntryRepository.execute(modelResult.value, entry);\n\n            if (createResult.isFail()) {\n                return Result.fail(WebhookPersistenceError.from(createResult.error));\n            }\n\n            const delivery = this.transformer.fromStorage(entry);\n\n            return Result.ok(delivery);\n        } catch (error) {\n            return Result.fail(WebhookPersistenceError.from(error));\n        }\n    }\n}\n\nexport const CreateWebhookDeliveryRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateWebhookDeliveryRepositoryImpl,\n    dependencies: [\n        GetModelRepository,\n        CreateEntryDataFactory,\n        CreateEntryRepository,\n        WebhookDeliveryTransformer\n    ]\n});\n"],"names":["CreateWebhookDeliveryRepositoryImpl","getModelRepository","createEntryDataFactory","createEntryRepository","transformer","input","modelResult","WEBHOOK_DELIVERY_MODEL_ID","Result","WebhookModelNotFoundError","storageValues","expiresAt","Date","entry","createResult","WebhookPersistenceError","delivery","error","CreateWebhookDeliveryRepository","RepositoryAbstraction","GetModelRepository","CreateEntryDataFactory","CreateEntryRepository","WebhookDeliveryTransformer"],"mappings":";;;;;;;;AAcA,MAAMA;IACF,YACqBC,kBAAgD,EAChDC,sBAAwD,EACxDC,qBAAsD,EACtDC,WAAiD,CACpE;aAJmBH,kBAAkB,GAAlBA;aACAC,sBAAsB,GAAtBA;aACAC,qBAAqB,GAArBA;aACAC,WAAW,GAAXA;IAClB;IAEH,MAAM,QACFC,KAA2B,EACkC;QAC7D,IAAI;YACA,MAAMC,cAAc,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAACC;YAC1D,IAAID,YAAY,MAAM,IAClB,OAAOE,OAAO,IAAI,CAAC,IAAIC,0BAA0BF;YAGrD,MAAMG,gBAAgB,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;gBAC7C,IAAI;gBACJ,WAAW;gBACX,SAAS;gBACT,WAAWL,MAAM,SAAS;gBAC1B,kBAAkB;gBAClB,WAAWA,MAAM,SAAS;gBAC1B,QAAQA,MAAM,MAAM;gBACpB,SAASA,MAAM,OAAO;gBACtB,gBAAgB;gBAChB,cAAc;gBACd,gBAAgB;gBAChB,iBAAiB;gBACjB,cAAc;YAClB;YAEA,MAAMM,YAAY,IAAIC,KAAKP,MAAM,SAAS;YAE1C,MAAM,EAAEQ,KAAK,EAAE,GACX,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CACpCP,YAAY,KAAK,EACjB;gBACI,QAAQI;gBACRC;YACJ;YAGR,MAAMG,eAAe,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACR,YAAY,KAAK,EAAEO;YAEjF,IAAIC,aAAa,MAAM,IACnB,OAAON,OAAO,IAAI,CAACO,wBAAwB,IAAI,CAACD,aAAa,KAAK;YAGtE,MAAME,WAAW,IAAI,CAAC,WAAW,CAAC,WAAW,CAACH;YAE9C,OAAOL,OAAO,EAAE,CAACQ;QACrB,EAAE,OAAOC,OAAO;YACZ,OAAOT,OAAO,IAAI,CAACO,wBAAwB,IAAI,CAACE;QACpD;IACJ;AACJ;AAEO,MAAMC,kEAAkCC,gCAAAA,oBAA0C,CAAC;IACtF,gBAAgBnB;IAChB,cAAc;QACVoB;QACAC;QACAC;QACAC;KACH;AACL"}

package/api/features/CreateWebhookDelivery/abstractions.d.ts

@@ -7,7 +7,7 @@ export interface ICreateDeliveryInput {
     eventType: string;
     status: WebhookDeliveryStatus;
     payload: GenericRecord;
-    expiresAt: string;
+    expiresAt: Date;
 }
 type IError = WebhookPersistenceError | WebhookModelNotFoundError;
 export interface ICreateWebhookDeliveryRepository {

package/api/features/CreateWebhookDelivery/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/CreateWebhookDelivery/abstractions.js","sources":["../../../../src/api/features/CreateWebhookDelivery/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\nimport type { WebhookDelivery, WebhookDeliveryStatus } from \"~/api/domain/WebhookDelivery.js\";\nimport type { WebhookPersistenceError, WebhookModelNotFoundError } from \"~/api/domain/errors.js\";\n\nexport interface ICreateDeliveryInput {\n    webhookId: string;\n    eventType: string;\n    status: WebhookDeliveryStatus;\n    payload: GenericRecord;\n    expiresAt: string;\n}\n\ntype IError = WebhookPersistenceError | WebhookModelNotFoundError;\n\nexport interface ICreateWebhookDeliveryRepository {\n    execute(input: ICreateDeliveryInput): Promise<Result<WebhookDelivery, IError>>;\n}\n\nexport const CreateWebhookDeliveryRepository = createAbstraction<ICreateWebhookDeliveryRepository>(\n    \"Webhooks/CreateWebhookDeliveryRepository\"\n);\n\nexport namespace CreateWebhookDeliveryRepository {\n    export type Interface = ICreateWebhookDeliveryRepository;\n    export type Error = IError;\n}\n"],"names":["CreateWebhookDeliveryRepository","createAbstraction"],"mappings":";AAmBO,MAAMA,kCAAkCC,kBAC3C"}
+{"version":3,"file":"api/features/CreateWebhookDelivery/abstractions.js","sources":["../../../../src/api/features/CreateWebhookDelivery/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\nimport type { WebhookDelivery, WebhookDeliveryStatus } from \"~/api/domain/WebhookDelivery.js\";\nimport type { WebhookPersistenceError, WebhookModelNotFoundError } from \"~/api/domain/errors.js\";\n\nexport interface ICreateDeliveryInput {\n    webhookId: string;\n    eventType: string;\n    status: WebhookDeliveryStatus;\n    payload: GenericRecord;\n    expiresAt: Date;\n}\n\ntype IError = WebhookPersistenceError | WebhookModelNotFoundError;\n\nexport interface ICreateWebhookDeliveryRepository {\n    execute(input: ICreateDeliveryInput): Promise<Result<WebhookDelivery, IError>>;\n}\n\nexport const CreateWebhookDeliveryRepository = createAbstraction<ICreateWebhookDeliveryRepository>(\n    \"Webhooks/CreateWebhookDeliveryRepository\"\n);\n\nexport namespace CreateWebhookDeliveryRepository {\n    export type Interface = ICreateWebhookDeliveryRepository;\n    export type Error = IError;\n}\n"],"names":["CreateWebhookDeliveryRepository","createAbstraction"],"mappings":";AAmBO,MAAMA,kCAAkCC,kBAC3C"}

package/api/features/GetWebhookSettings/GetWebhookSettingsRepository.js

@@ -25,7 +25,8 @@ class GetWebhookSettingsRepositoryImpl {
                 id: entryId
             });
             if (entryResult.isOk()) return Result.ok({
-                signingSecret: entryResult.value.values.signingSecret
+                signingSecret: entryResult.value.values.signingSecret,
+                deliveryRetentionDays: entryResult.value.values.deliveryRetentionDays
             });
             const { entry } = await this.createEntryDataFactory.create(model, {
                 id: singletonId,
@@ -34,7 +35,8 @@ class GetWebhookSettingsRepositoryImpl {
             const createResult = await this.createEntryRepository.execute(model, entry);
             if (createResult.isFail()) return Result.fail(WebhookPersistenceError.from(createResult.error));
             return Result.ok({
-                signingSecret: void 0
+                signingSecret: void 0,
+                deliveryRetentionDays: void 0
             });
         } catch (error) {
             return Result.fail(WebhookPersistenceError.from(error));

package/api/features/GetWebhookSettings/GetWebhookSettingsRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/GetWebhookSettings/GetWebhookSettingsRepository.js","sources":["../../../../src/api/features/GetWebhookSettings/GetWebhookSettingsRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createCacheKey } from \"@webiny/utils\";\nimport { GetModelRepository } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { GetLatestRevisionByEntryIdRepository } from \"@webiny/api-headless-cms/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\nimport { CreateEntryRepository } from \"@webiny/api-headless-cms/features/contentEntry/CreateEntry/index.js\";\nimport { CreateEntryDataFactory } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\nimport { GetWebhookSettingsRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { WebhookModelNotFoundError, WebhookPersistenceError } from \"~/api/domain/errors.js\";\nimport { WEBHOOK_SETTINGS_MODEL_ID } from \"~/api/domain/constants.js\";\nimport type { IWebhookSettings } from \"~/api/domain/WebhookSettings.js\";\n\ninterface WebhookSettingsValues {\n    signingSecret?: string;\n}\n\nclass GetWebhookSettingsRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private readonly getModelRepository: GetModelRepository.Interface,\n        private readonly getLatestRevisionRepository: GetLatestRevisionByEntryIdRepository.Interface,\n        private readonly createEntryRepository: CreateEntryRepository.Interface,\n        private readonly createEntryDataFactory: CreateEntryDataFactory.Interface\n    ) {}\n\n    async execute(): Promise<Result<IWebhookSettings, RepositoryAbstraction.Error>> {\n        try {\n            const modelResult = await this.getModelRepository.execute(WEBHOOK_SETTINGS_MODEL_ID);\n            if (modelResult.isFail()) {\n                return Result.fail(new WebhookModelNotFoundError(WEBHOOK_SETTINGS_MODEL_ID));\n            }\n\n            const model = modelResult.value;\n            const singletonId = createCacheKey(model.modelId);\n            const entryId = `${singletonId}#0001`;\n\n            const entryResult =\n                await this.getLatestRevisionRepository.execute<WebhookSettingsValues>(model, {\n                    id: entryId\n                });\n\n            if (entryResult.isOk()) {\n                return Result.ok({\n                    signingSecret: entryResult.value.values.signingSecret\n                });\n            }\n\n            /* Entry doesn't exist yet — create it with empty values. */\n            const { entry } = await this.createEntryDataFactory.create<WebhookSettingsValues>(\n                model,\n                { id: singletonId, values: {} as WebhookSettingsValues }\n            );\n\n            const createResult = await this.createEntryRepository.execute(model, entry);\n            if (createResult.isFail()) {\n                return Result.fail(WebhookPersistenceError.from(createResult.error));\n            }\n\n            return Result.ok({ signingSecret: undefined });\n        } catch (error) {\n            return Result.fail(WebhookPersistenceError.from(error));\n        }\n    }\n}\n\nexport const GetWebhookSettingsRepository = RepositoryAbstraction.createImplementation({\n    implementation: GetWebhookSettingsRepositoryImpl,\n    dependencies: [\n        GetModelRepository,\n        GetLatestRevisionByEntryIdRepository,\n        CreateEntryRepository,\n        CreateEntryDataFactory\n    ]\n});\n"],"names":["GetWebhookSettingsRepositoryImpl","getModelRepository","getLatestRevisionRepository","createEntryRepository","createEntryDataFactory","modelResult","WEBHOOK_SETTINGS_MODEL_ID","Result","WebhookModelNotFoundError","model","singletonId","createCacheKey","entryId","entryResult","entry","createResult","WebhookPersistenceError","undefined","error","GetWebhookSettingsRepository","RepositoryAbstraction","GetModelRepository","GetLatestRevisionByEntryIdRepository","CreateEntryRepository","CreateEntryDataFactory"],"mappings":";;;;;;;;;AAeA,MAAMA;IACF,YACqBC,kBAAgD,EAChDC,2BAA2E,EAC3EC,qBAAsD,EACtDC,sBAAwD,CAC3E;aAJmBH,kBAAkB,GAAlBA;aACAC,2BAA2B,GAA3BA;aACAC,qBAAqB,GAArBA;aACAC,sBAAsB,GAAtBA;IAClB;IAEH,MAAM,UAA0E;QAC5E,IAAI;YACA,MAAMC,cAAc,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAACC;YAC1D,IAAID,YAAY,MAAM,IAClB,OAAOE,OAAO,IAAI,CAAC,IAAIC,0BAA0BF;YAGrD,MAAMG,QAAQJ,YAAY,KAAK;YAC/B,MAAMK,cAAcC,eAAeF,MAAM,OAAO;YAChD,MAAMG,UAAU,GAAGF,YAAY,KAAK,CAAC;YAErC,MAAMG,cACF,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAwBJ,OAAO;gBACzE,IAAIG;YACR;YAEJ,IAAIC,YAAY,IAAI,IAChB,OAAON,OAAO,EAAE,CAAC;gBACb,eAAeM,YAAY,KAAK,CAAC,MAAM,CAAC,aAAa;YACzD;YAIJ,MAAM,EAAEC,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CACtDL,OACA;gBAAE,IAAIC;gBAAa,QAAQ,CAAC;YAA2B;YAG3D,MAAMK,eAAe,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACN,OAAOK;YACrE,IAAIC,aAAa,MAAM,IACnB,OAAOR,OAAO,IAAI,CAACS,wBAAwB,IAAI,CAACD,aAAa,KAAK;YAGtE,OAAOR,OAAO,EAAE,CAAC;gBAAE,eAAeU;YAAU;QAChD,EAAE,OAAOC,OAAO;YACZ,OAAOX,OAAO,IAAI,CAACS,wBAAwB,IAAI,CAACE;QACpD;IACJ;AACJ;AAEO,MAAMC,4DAA+BC,6BAAAA,oBAA0C,CAAC;IACnF,gBAAgBpB;IAChB,cAAc;QACVqB;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"api/features/GetWebhookSettings/GetWebhookSettingsRepository.js","sources":["../../../../src/api/features/GetWebhookSettings/GetWebhookSettingsRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { createCacheKey } from \"@webiny/utils\";\nimport { GetModelRepository } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { GetLatestRevisionByEntryIdRepository } from \"@webiny/api-headless-cms/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\nimport { CreateEntryRepository } from \"@webiny/api-headless-cms/features/contentEntry/CreateEntry/index.js\";\nimport { CreateEntryDataFactory } from \"@webiny/api-headless-cms/exports/api/cms/entry.js\";\nimport { GetWebhookSettingsRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { WebhookModelNotFoundError, WebhookPersistenceError } from \"~/api/domain/errors.js\";\nimport { WEBHOOK_SETTINGS_MODEL_ID } from \"~/api/domain/constants.js\";\nimport type { IWebhookSettings } from \"~/api/domain/WebhookSettings.js\";\n\ninterface WebhookSettingsValues {\n    signingSecret?: string;\n    deliveryRetentionDays?: number;\n}\n\nclass GetWebhookSettingsRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private readonly getModelRepository: GetModelRepository.Interface,\n        private readonly getLatestRevisionRepository: GetLatestRevisionByEntryIdRepository.Interface,\n        private readonly createEntryRepository: CreateEntryRepository.Interface,\n        private readonly createEntryDataFactory: CreateEntryDataFactory.Interface\n    ) {}\n\n    async execute(): Promise<Result<IWebhookSettings, RepositoryAbstraction.Error>> {\n        try {\n            const modelResult = await this.getModelRepository.execute(WEBHOOK_SETTINGS_MODEL_ID);\n            if (modelResult.isFail()) {\n                return Result.fail(new WebhookModelNotFoundError(WEBHOOK_SETTINGS_MODEL_ID));\n            }\n\n            const model = modelResult.value;\n            const singletonId = createCacheKey(model.modelId);\n            const entryId = `${singletonId}#0001`;\n\n            const entryResult =\n                await this.getLatestRevisionRepository.execute<WebhookSettingsValues>(model, {\n                    id: entryId\n                });\n\n            if (entryResult.isOk()) {\n                return Result.ok({\n                    signingSecret: entryResult.value.values.signingSecret,\n                    deliveryRetentionDays: entryResult.value.values.deliveryRetentionDays\n                });\n            }\n\n            /* Entry doesn't exist yet — create it with empty values. */\n            const { entry } = await this.createEntryDataFactory.create<WebhookSettingsValues>(\n                model,\n                { id: singletonId, values: {} as WebhookSettingsValues }\n            );\n\n            const createResult = await this.createEntryRepository.execute(model, entry);\n            if (createResult.isFail()) {\n                return Result.fail(WebhookPersistenceError.from(createResult.error));\n            }\n\n            return Result.ok({ signingSecret: undefined, deliveryRetentionDays: undefined });\n        } catch (error) {\n            return Result.fail(WebhookPersistenceError.from(error));\n        }\n    }\n}\n\nexport const GetWebhookSettingsRepository = RepositoryAbstraction.createImplementation({\n    implementation: GetWebhookSettingsRepositoryImpl,\n    dependencies: [\n        GetModelRepository,\n        GetLatestRevisionByEntryIdRepository,\n        CreateEntryRepository,\n        CreateEntryDataFactory\n    ]\n});\n"],"names":["GetWebhookSettingsRepositoryImpl","getModelRepository","getLatestRevisionRepository","createEntryRepository","createEntryDataFactory","modelResult","WEBHOOK_SETTINGS_MODEL_ID","Result","WebhookModelNotFoundError","model","singletonId","createCacheKey","entryId","entryResult","entry","createResult","WebhookPersistenceError","undefined","error","GetWebhookSettingsRepository","RepositoryAbstraction","GetModelRepository","GetLatestRevisionByEntryIdRepository","CreateEntryRepository","CreateEntryDataFactory"],"mappings":";;;;;;;;;AAgBA,MAAMA;IACF,YACqBC,kBAAgD,EAChDC,2BAA2E,EAC3EC,qBAAsD,EACtDC,sBAAwD,CAC3E;aAJmBH,kBAAkB,GAAlBA;aACAC,2BAA2B,GAA3BA;aACAC,qBAAqB,GAArBA;aACAC,sBAAsB,GAAtBA;IAClB;IAEH,MAAM,UAA0E;QAC5E,IAAI;YACA,MAAMC,cAAc,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAACC;YAC1D,IAAID,YAAY,MAAM,IAClB,OAAOE,OAAO,IAAI,CAAC,IAAIC,0BAA0BF;YAGrD,MAAMG,QAAQJ,YAAY,KAAK;YAC/B,MAAMK,cAAcC,eAAeF,MAAM,OAAO;YAChD,MAAMG,UAAU,GAAGF,YAAY,KAAK,CAAC;YAErC,MAAMG,cACF,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAwBJ,OAAO;gBACzE,IAAIG;YACR;YAEJ,IAAIC,YAAY,IAAI,IAChB,OAAON,OAAO,EAAE,CAAC;gBACb,eAAeM,YAAY,KAAK,CAAC,MAAM,CAAC,aAAa;gBACrD,uBAAuBA,YAAY,KAAK,CAAC,MAAM,CAAC,qBAAqB;YACzE;YAIJ,MAAM,EAAEC,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CACtDL,OACA;gBAAE,IAAIC;gBAAa,QAAQ,CAAC;YAA2B;YAG3D,MAAMK,eAAe,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACN,OAAOK;YACrE,IAAIC,aAAa,MAAM,IACnB,OAAOR,OAAO,IAAI,CAACS,wBAAwB,IAAI,CAACD,aAAa,KAAK;YAGtE,OAAOR,OAAO,EAAE,CAAC;gBAAE,eAAeU;gBAAW,uBAAuBA;YAAU;QAClF,EAAE,OAAOC,OAAO;YACZ,OAAOX,OAAO,IAAI,CAACS,wBAAwB,IAAI,CAACE;QACpD;IACJ;AACJ;AAEO,MAAMC,4DAA+BC,6BAAAA,oBAA0C,CAAC;IACnF,gBAAgBpB;IAChB,cAAc;QACVqB;QACAC;QACAC;QACAC;KACH;AACL"}

package/api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.d.ts

@@ -3,6 +3,7 @@ import { ResendWebhookDeliveryUseCase as UseCaseAbstraction } from "./abstractio
 import { GetWebhookDeliveryRepository } from "../../../api/features/GetWebhookDelivery/abstractions.js";
 import { GetWebhookRepository } from "../../../api/features/GetWebhook/abstractions.js";
 import { CreateWebhookDeliveryRepository } from "../../../api/features/CreateWebhookDelivery/abstractions.js";
+import { GetWebhookSettingsRepository } from "../../../api/features/GetWebhookSettings/abstractions.js";
 import { WebhookPermissions } from "../../../api/features/WebhookPermissions/abstractions.js";
 import { TaskService } from "@webiny/api-core/exports/api/tasks.js";
 declare class ResendWebhookDeliveryUseCaseImpl implements UseCaseAbstraction.Interface {
@@ -11,7 +12,8 @@ declare class ResendWebhookDeliveryUseCaseImpl implements UseCaseAbstraction.Int
     private readonly getWebhookRepository;
     private readonly createDeliveryRepository;
     private readonly taskService;
-    constructor(permissions: WebhookPermissions.Interface, getDeliveryRepository: GetWebhookDeliveryRepository.Interface, getWebhookRepository: GetWebhookRepository.Interface, createDeliveryRepository: CreateWebhookDeliveryRepository.Interface, taskService: TaskService.Interface);
+    private readonly getSettingsRepository;
+    constructor(permissions: WebhookPermissions.Interface, getDeliveryRepository: GetWebhookDeliveryRepository.Interface, getWebhookRepository: GetWebhookRepository.Interface, createDeliveryRepository: CreateWebhookDeliveryRepository.Interface, taskService: TaskService.Interface, getSettingsRepository: GetWebhookSettingsRepository.Interface);
     execute(deliveryId: string): Promise<Result<boolean, UseCaseAbstraction.Error>>;
 }
 export declare const ResendWebhookDeliveryUseCase: typeof ResendWebhookDeliveryUseCaseImpl & {

package/api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.js

@@ -4,17 +4,19 @@ import { ResendWebhookDeliveryInputSchema } from "./schema.js";
 import { GetWebhookDeliveryRepository } from "../GetWebhookDelivery/abstractions.js";
 import { GetWebhookRepository } from "../GetWebhook/abstractions.js";
 import { CreateWebhookDeliveryRepository } from "../CreateWebhookDelivery/abstractions.js";
+import { GetWebhookSettingsRepository } from "../GetWebhookSettings/abstractions.js";
 import { WebhookPermissions } from "../WebhookPermissions/abstractions.js";
 import { WebhookNotAuthorizedError, WebhookValidationError } from "../../domain/errors.js";
 import { TaskService } from "@webiny/api-core/exports/api/tasks.js";
-import { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_RETENTION_DAYS } from "../../domain/constants.js";
+import { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_MAX_RETENTION_DAYS } from "../../domain/constants.js";
 class ResendWebhookDeliveryUseCaseImpl {
-    constructor(permissions, getDeliveryRepository, getWebhookRepository, createDeliveryRepository, taskService){
+    constructor(permissions, getDeliveryRepository, getWebhookRepository, createDeliveryRepository, taskService, getSettingsRepository){
         this.permissions = permissions;
         this.getDeliveryRepository = getDeliveryRepository;
         this.getWebhookRepository = getWebhookRepository;
         this.createDeliveryRepository = createDeliveryRepository;
         this.taskService = taskService;
+        this.getSettingsRepository = getSettingsRepository;
     }
     async execute(deliveryId) {
         if (!await this.permissions.canEdit("webhook")) return Result.fail(new WebhookNotAuthorizedError());
@@ -29,7 +31,9 @@ class ResendWebhookDeliveryUseCaseImpl {
         if (webhookResult.isFail()) return Result.fail(webhookResult.error);
         const originalPayload = delivery.payload;
         const data = originalPayload?.data ?? {};
-        const expiresAt = new Date(Date.now() + 24 * WEBHOOK_DELIVERY_RETENTION_DAYS * 3600000).toISOString();
+        const settingsResult = await this.getSettingsRepository.execute();
+        const retentionDays = settingsResult.isOk() ? settingsResult.value.deliveryRetentionDays ?? WEBHOOK_DELIVERY_MAX_RETENTION_DAYS : WEBHOOK_DELIVERY_MAX_RETENTION_DAYS;
+        const expiresAt = new Date(Date.now() + 24 * retentionDays * 3600000);
         const newDeliveryResult = await this.createDeliveryRepository.execute({
             webhookId: delivery.webhookId,
             eventType: delivery.eventType,
@@ -57,7 +61,8 @@ const ResendWebhookDeliveryUseCase_ResendWebhookDeliveryUseCase = ResendWebhookD
         GetWebhookDeliveryRepository,
         GetWebhookRepository,
         CreateWebhookDeliveryRepository,
-        TaskService
+        TaskService,
+        GetWebhookSettingsRepository
     ]
 });
 export { ResendWebhookDeliveryUseCase_ResendWebhookDeliveryUseCase as ResendWebhookDeliveryUseCase };