npm - @webiny/webhooks - Versions diffs - 6.4.0-beta.3 → 6.4.0-beta.4 - Mend

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

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

Files changed (142) hide show

package/admin/presentation/WebhookDeliveriesPage/feature.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export declare const WebhookDeliveriesPagePresenterFeature: import("@webiny/feature/admin").FeatureDefinition<{
+    presenter: import("./abstractions.js").IWebhookDeliveriesPagePresenter;
+}, []>;

package/admin/presentation/WebhookDeliveriesPage/feature.js ADDED Viewed

@@ -0,0 +1,17 @@
+import { createFeature } from "@webiny/feature/admin";
+import { WebhookDeliveriesPagePresenter } from "./abstractions.js";
+import { WebhookDeliveriesPagePresenter as external_WebhookDeliveriesPagePresenter_js_WebhookDeliveriesPagePresenter } from "./WebhookDeliveriesPagePresenter.js";
+const WebhookDeliveriesPagePresenterFeature = createFeature({
+    name: "Webhooks/WebhookDeliveriesPagePresenter",
+    register (container) {
+        container.register(external_WebhookDeliveriesPagePresenter_js_WebhookDeliveriesPagePresenter).inSingletonScope();
+    },
+    resolve (container) {
+        return {
+            presenter: container.resolve(WebhookDeliveriesPagePresenter)
+        };
+    }
+});
+export { WebhookDeliveriesPagePresenterFeature };
+//# sourceMappingURL=feature.js.map

package/admin/presentation/WebhookDeliveriesPage/feature.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"admin/presentation/WebhookDeliveriesPage/feature.js","sources":["../../../../src/admin/presentation/WebhookDeliveriesPage/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/admin\";\nimport { WebhookDeliveriesPagePresenter as PresenterAbstraction } from \"./abstractions.js\";\nimport { WebhookDeliveriesPagePresenter } from \"./WebhookDeliveriesPagePresenter.js\";\n\nexport const WebhookDeliveriesPagePresenterFeature = createFeature({\n name: \"Webhooks/WebhookDeliveriesPagePresenter\",\n register(container) {\n container.register(WebhookDeliveriesPagePresenter).inSingletonScope();\n },\n resolve(container) {\n return { presenter: container.resolve(PresenterAbstraction) };\n }\n});\n"],"names":["WebhookDeliveriesPagePresenterFeature","createFeature","container","WebhookDeliveriesPagePresenter","PresenterAbstraction"],"mappings":";;;AAIO,MAAMA,wCAAwCC,cAAc;IAC/D,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,2EAAgC,gBAAgB;IACvE;IACA,SAAQD,SAAS;QACb,OAAO;YAAE,WAAWA,UAAU,OAAO,CAACE;QAAsB;IAChE;AACJ"}

package/admin/presentation/WebhookDeliveriesPage/index.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+export { WebhookDeliveriesPagePresenterFeature } from "./feature.js";
+export type { IWebhookDeliveriesPagePresenter } from "./abstractions.js";
+export type { IWebhookDeliveriesPageViewModel } from "./abstractions.js";
+export type { IDeliveryPageFilters } from "./abstractions.js";
+export type { IDeliveryFilterOption } from "./abstractions.js";

package/admin/presentation/WebhookDeliveriesPage/index.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export { WebhookDeliveriesPagePresenterFeature } from "./feature.js";

package/admin/presentation/WebhookForm/WebhookFormPresenter.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { type IWebhookFormPresenter, type IWebhookFormViewModel, type IWebhookFormActions } from "./abstractions.js";
+import { type IWebhookFormPresenter, type IWebhookFormViewModel } from "./abstractions.js";
 import { GetWebhookUseCase } from "../../../admin/features/getWebhook/abstractions.js";
 import { CreateWebhookUseCase } from "../../../admin/features/createWebhook/abstractions.js";
 import { UpdateWebhookUseCase } from "../../../admin/features/updateWebhook/abstractions.js";
@@ -18,19 +18,19 @@ declare class WebhookFormPresenterImpl implements IWebhookFormPresenter {
     private _saving;
     private _isNew;
     private _webhook;
-    private _showDeliveries;
     private _webhookId;
     private _form;
-    private _eventFieldNames;
-    private _eventGroups;
+    private _entityFieldNames;
+    private _entityGroups;
     get vm(): IWebhookFormViewModel;
     constructor(formModelFactory: FormModelFactory.Interface, getWebhookUseCase: GetWebhookUseCase.Interface, createWebhookUseCase: CreateWebhookUseCase.Interface, updateWebhookUseCase: UpdateWebhookUseCase.Interface, deleteWebhookUseCase: DeleteWebhookUseCase.Interface, listAvailableEventsUseCase: ListAvailableEventsUseCase.Interface, permissions: WebhookPermissions.Interface);
     private buildForm;
-    private eventFieldName;
+    private entityFieldName;
     private addEventFields;
     private collectEvents;
     private distributeEvents;
-    actions: IWebhookFormActions;
+    save(): Promise<boolean>;
+    deleteWebhook(): Promise<void>;
     init(id: string): Promise<void>;
 }
 export declare const WebhookFormPresenter: typeof WebhookFormPresenterImpl & {

package/admin/presentation/WebhookForm/WebhookFormPresenter.js CHANGED Viewed

@@ -14,7 +14,6 @@ class WebhookFormPresenterImpl {
             saving: this._saving,
             isNew: this._isNew,
             webhook: this._webhook,
-            showDeliveries: this._showDeliveries,
             permissions: {
                 canEdit: this.permissions.canEdit("webhook"),
                 canDelete: this.permissions.canDelete("webhook")
@@ -34,55 +33,9 @@ class WebhookFormPresenterImpl {
         this._saving = false;
         this._isNew = false;
         this._webhook = null;
-        this._showDeliveries = false;
         this._webhookId = null;
-        this._eventFieldNames = [];
-        this._eventGroups = new Map();
-        this.actions = {
-            save: async ()=>{
-                const data = await this._form.submit();
-                if (false === data) return;
-                this._saving = true;
-                try {
-                    const merged = {
-                        name: data.name,
-                        slug: data.slug,
-                        endpointUrl: data.endpointUrl,
-                        description: data.description || void 0,
-                        enabled: data.enabled,
-                        events: this.collectEvents()
-                    };
-                    if (this._isNew) {
-                        const created = await this.createWebhookUseCase.execute(merged);
-                        runInAction(()=>{
-                            this._webhook = created;
-                            this._webhookId = created.id;
-                            this._isNew = false;
-                            this._form.field("slug").setDisabled(true);
-                        });
-                    } else {
-                        const updated = await this.updateWebhookUseCase.execute(this._webhookId, merged);
-                        runInAction(()=>{
-                            this._webhook = updated;
-                        });
-                    }
-                } finally{
-                    runInAction(()=>{
-                        this._saving = false;
-                    });
-                }
-            },
-            deleteWebhook: async ()=>{
-                if (!this._webhookId || this._isNew) return;
-                await this.deleteWebhookUseCase.execute(this._webhookId);
-            },
-            openDeliveries: ()=>{
-                this._showDeliveries = true;
-            },
-            closeDeliveries: ()=>{
-                this._showDeliveries = false;
-            }
-        };
+        this._entityFieldNames = [];
+        this._entityGroups = new Map();
         this._form = this.buildForm();
         makeAutoObservable(this, {
             vm: computed
@@ -108,26 +61,33 @@ class WebhookFormPresenterImpl {
                 ]
         });
     }
-    eventFieldName(app) {
-        const slug = app.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_|_$/g, "");
+    entityFieldName(appLabel, entityLabel) {
+        const slug = `${appLabel}_${entityLabel}`.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_|_$/g, "");
         return `events_${slug}`;
     }
     addEventFields(events) {
         const grouped = new Map();
         for (const event of events){
-            const existing = grouped.get(event.appLabel) ?? [];
+            let appMap = grouped.get(event.appLabel);
+            if (!appMap) {
+                appMap = new Map();
+                grouped.set(event.appLabel, appMap);
+            }
+            const existing = appMap.get(event.entityLabel) ?? [];
             existing.push(event);
-            grouped.set(event.appLabel, existing);
+            appMap.set(event.entityLabel, existing);
         }
-        this._eventGroups = grouped;
-        this._eventFieldNames = [];
+        this._entityGroups = grouped;
+        this._entityFieldNames = [];
         this._form.fields((fields)=>{
             const result = {};
-            for (const [app, appEvents] of grouped){
-                const fieldName = this.eventFieldName(app);
-                this._eventFieldNames.push(fieldName);
-                result[fieldName] = fields.object().label(app).renderer("objectAccordionSingle").fields((f)=>({
-                        selected: f.text().list().options(appEvents.map((e)=>({
+            for (const [appLabel, entities] of grouped)for (const [entityLabel, entityEvents] of entities){
+                const fieldName = this.entityFieldName(appLabel, entityLabel);
+                this._entityFieldNames.push(fieldName);
+                result[fieldName] = fields.object().label(entityLabel).renderer("objectAccordionSingle", {
+                    open: false
+                }).fields((f)=>({
+                        selected: f.text().list().options(entityEvents.map((e)=>({
                                 label: e.label,
                                 value: e.eventName
                             }))).renderer("checkboxes")
@@ -135,19 +95,30 @@ class WebhookFormPresenterImpl {
             }
             return result;
         });
-        this._form.setLayout((layout)=>[
+        this._form.setLayout((layout)=>{
+            const rows = [
                 layout.row("name", "slug"),
                 layout.row("endpointUrl"),
                 layout.row("description"),
-                layout.row("enabled"),
-                layout.separator(),
-                ...this._eventFieldNames.map((name)=>layout.object(name, (inner)=>[
+                layout.row("enabled")
+            ];
+            for (const [appLabel, entities] of grouped){
+                rows.push(layout.separator());
+                rows.push(layout.element("sectionHeading", {
+                    label: appLabel
+                }));
+                for (const [entityLabel] of entities){
+                    const fieldName = this.entityFieldName(appLabel, entityLabel);
+                    rows.push(layout.object(fieldName, (inner)=>[
                             inner.row("selected")
-                        ]))
-            ]);
+                        ]));
+                }
+            }
+            return rows;
+        });
         this._form.addRule((form)=>{
-            if (0 === this._eventFieldNames.length) return [];
-            for (const fieldName of this._eventFieldNames){
+            if (0 === this._entityFieldNames.length) return [];
+            for (const fieldName of this._entityFieldNames){
                 const objectField = form.field(fieldName).as("object");
                 const selectedField = objectField.children.get("selected");
                 if (!selectedField) continue;
@@ -164,7 +135,7 @@ class WebhookFormPresenterImpl {
     }
     collectEvents() {
         const allEvents = [];
-        for (const fieldName of this._eventFieldNames){
+        for (const fieldName of this._entityFieldNames){
             const objectField = this._form.field(fieldName).as("object");
             const selectedField = objectField.children.get("selected");
             if (!selectedField) continue;
@@ -175,15 +146,55 @@ class WebhookFormPresenterImpl {
     }
     distributeEvents(webhookEvents) {
         const eventSet = new Set(webhookEvents);
-        for (const [app, appEvents] of this._eventGroups){
-            const fieldName = this.eventFieldName(app);
+        for (const [appLabel, entities] of this._entityGroups)for (const [entityLabel, entityEvents] of entities){
+            const fieldName = this.entityFieldName(appLabel, entityLabel);
             const objectField = this._form.field(fieldName).as("object");
             const selectedField = objectField.children.get("selected");
             if (!selectedField) continue;
-            const selected = appEvents.filter((e)=>eventSet.has(e.eventName)).map((e)=>e.eventName);
+            const selected = entityEvents.filter((e)=>eventSet.has(e.eventName)).map((e)=>e.eventName);
             selectedField.setValue(selected);
         }
     }
+    async save() {
+        const data = await this._form.submit();
+        if (false === data) return false;
+        runInAction(()=>{
+            this._saving = true;
+        });
+        try {
+            const merged = {
+                name: data.name,
+                slug: data.slug,
+                endpointUrl: data.endpointUrl,
+                description: data.description || void 0,
+                enabled: data.enabled,
+                events: this.collectEvents()
+            };
+            if (this._isNew) {
+                const created = await this.createWebhookUseCase.execute(merged);
+                runInAction(()=>{
+                    this._webhook = created;
+                    this._webhookId = created.id;
+                    this._isNew = false;
+                    this._form.field("slug").setDisabled(true);
+                });
+            } else {
+                const updated = await this.updateWebhookUseCase.execute(this._webhookId, merged);
+                runInAction(()=>{
+                    this._webhook = updated;
+                });
+            }
+        } finally{
+            runInAction(()=>{
+                this._saving = false;
+            });
+        }
+        return true;
+    }
+    async deleteWebhook() {
+        if (!this._webhookId || this._isNew) return;
+        await this.deleteWebhookUseCase.execute(this._webhookId);
+    }
     async init(id) {
         this._loading = true;
         this._isNew = "new" === id;

package/admin/presentation/WebhookForm/WebhookFormPresenter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"admin/presentation/WebhookForm/WebhookFormPresenter.js","sources":["../../../../src/admin/presentation/WebhookForm/WebhookFormPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable, runInAction } from \"mobx\";\nimport type { Webhook } from \"~/admin/shared/types.js\";\nimport type { WebhookEvent } from \"~/admin/shared/types.js\";\nimport {\n WebhookFormPresenter as Abstraction,\n type IWebhookFormPresenter,\n type IWebhookFormViewModel,\n type IWebhookFormActions\n} from \"./abstractions.js\";\nimport { GetWebhookUseCase } from \"~/admin/features/getWebhook/abstractions.js\";\nimport { CreateWebhookUseCase } from \"~/admin/features/createWebhook/abstractions.js\";\nimport { UpdateWebhookUseCase } from \"~/admin/features/updateWebhook/abstractions.js\";\nimport { DeleteWebhookUseCase } from \"~/admin/features/deleteWebhook/abstractions.js\";\nimport { ListAvailableEventsUseCase } from \"~/admin/features/listAvailableEvents/abstractions.js\";\nimport { WebhookPermissions } from \"~/admin/features/permissions/abstractions.js\";\nimport {\n FormModelFactory,\n type IFormModel\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\n\nclass WebhookFormPresenterImpl implements IWebhookFormPresenter {\n private _loading = false;\n private _saving = false;\n private _isNew = false;\n private _webhook: Webhook \| null = null;\n private _showDeliveries = false;\n private _webhookId: string \| null = null;\n private _form: IFormModel;\n private _eventFieldNames: string[] = [];\n private _eventGroups: Map<string, WebhookEvent[]> = new Map();\n\n public get vm(): IWebhookFormViewModel {\n return {\n loading: this._loading,\n saving: this._saving,\n isNew: this._isNew,\n webhook: this._webhook,\n showDeliveries: this._showDeliveries,\n permissions: {\n canEdit: this.permissions.canEdit(\"webhook\"),\n canDelete: this.permissions.canDelete(\"webhook\")\n },\n form: this._form.vm\n };\n }\n\n public constructor(\n private readonly formModelFactory: FormModelFactory.Interface,\n private readonly getWebhookUseCase: GetWebhookUseCase.Interface,\n private readonly createWebhookUseCase: CreateWebhookUseCase.Interface,\n private readonly updateWebhookUseCase: UpdateWebhookUseCase.Interface,\n private readonly deleteWebhookUseCase: DeleteWebhookUseCase.Interface,\n private readonly listAvailableEventsUseCase: ListAvailableEventsUseCase.Interface,\n private readonly permissions: WebhookPermissions.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 name: fields.text().label(\"Name\").required(\"Name is required\"),\n slug: fields\n .text()\n .label(\"Slug\")\n .required(\"Slug is required\")\n .computedUntilDirty(form => {\n const name = String(form.field(\"name\").getValue() ?? \"\");\n return name\n .trim()\n .toLowerCase()\n .replace(/[^a-z0-9\\s-]/g, \"\")\n .replace(/\\s+/g, \"-\");\n }),\n endpointUrl: fields\n .text()\n .label(\"Endpoint URL\")\n .required(\"Endpoint URL is required\")\n .placeholder(\"https://\"),\n description: fields.text().label(\"Description\").renderer(\"textarea\"),\n enabled: fields.boolean().label(\"Enabled\").defaultValue(false)\n }),\n layout: layout => [\n layout.row(\"name\", \"slug\"),\n layout.row(\"endpointUrl\"),\n layout.row(\"description\"),\n layout.row(\"enabled\")\n ]\n });\n }\n\n private eventFieldName(app: string): string {\n const slug = app\n .toLowerCase()\n .replace(/[^a-z0-9]+/g, \"_\")\n .replace(/^_\|_$/g, \"\");\n return `events_${slug}`;\n }\n\n private addEventFields(events: WebhookEvent[]): void {\n const grouped = new Map<string, WebhookEvent[]>();\n for (const event of events) {\n const existing = grouped.get(event.appLabel) ?? [];\n existing.push(event);\n grouped.set(event.appLabel, existing);\n }\n\n this._eventGroups = grouped;\n this._eventFieldNames = [];\n\n this._form.fields(fields => {\n const result: Record<string, ReturnType<typeof fields.object>> = {};\n\n for (const [app, appEvents] of grouped) {\n const fieldName = this.eventFieldName(app);\n this._eventFieldNames.push(fieldName);\n\n result[fieldName] = fields\n .object()\n .label(app)\n .renderer(\"objectAccordionSingle\")\n .fields(f => {\n return {\n selected: f\n .text()\n .list()\n .options(\n appEvents.map(e => ({\n label: e.label,\n value: e.eventName\n }))\n )\n .renderer(\"checkboxes\")\n };\n });\n }\n\n return result;\n });\n\n this._form.setLayout(layout => [\n layout.row(\"name\", \"slug\"),\n layout.row(\"endpointUrl\"),\n layout.row(\"description\"),\n layout.row(\"enabled\"),\n layout.separator(),\n ...this._eventFieldNames.map(name =>\n layout.object(name, inner => [inner.row(\"selected\")])\n )\n ]);\n\n this._form.addRule(form => {\n if (this._eventFieldNames.length === 0) {\n return [];\n }\n for (const fieldName of this._eventFieldNames) {\n const objectField = form.field(fieldName).as(\"object\");\n const selectedField = objectField.children.get(\"selected\");\n if (!selectedField) {\n continue;\n }\n const values = selectedField.getValue<string[]>();\n if (values && values.length > 0) {\n return [];\n }\n }\n\n return [{ path: \"Events\", message: \"At least one event must be selected.\" }];\n });\n }\n\n private collectEvents(): string[] {\n const allEvents: string[] = [];\n\n for (const fieldName of this._eventFieldNames) {\n const objectField = this._form.field(fieldName).as(\"object\");\n const selectedField = objectField.children.get(\"selected\");\n if (!selectedField) {\n continue;\n }\n const values = selectedField.getValue<string[]>();\n if (values && values.length > 0) {\n allEvents.push(...values);\n }\n }\n\n return allEvents;\n }\n\n private distributeEvents(webhookEvents: string[]): void {\n const eventSet = new Set(webhookEvents);\n\n for (const [app, appEvents] of this._eventGroups) {\n const fieldName = this.eventFieldName(app);\n const objectField = this._form.field(fieldName).as(\"object\");\n const selectedField = objectField.children.get(\"selected\");\n if (!selectedField) {\n continue;\n }\n\n const selected = appEvents.filter(e => eventSet.has(e.eventName)).map(e => e.eventName);\n selectedField.setValue(selected);\n }\n }\n\n public actions: IWebhookFormActions = {\n save: async () => {\n const data = await this._form.submit<Record<string, unknown>>();\n if (data === false) {\n return;\n }\n\n this._saving = true;\n\n try {\n const merged = {\n name: data.name as string,\n slug: data.slug as string,\n endpointUrl: data.endpointUrl as string,\n description: (data.description as string) \|\| undefined,\n enabled: data.enabled as boolean,\n events: this.collectEvents()\n };\n\n if (this._isNew) {\n const created = await this.createWebhookUseCase.execute(merged);\n\n runInAction(() => {\n this._webhook = created;\n this._webhookId = created.id;\n this._isNew = false;\n this._form.field(\"slug\").setDisabled(true);\n });\n } else {\n const updated = await this.updateWebhookUseCase.execute(\n this._webhookId!,\n merged\n );\n\n runInAction(() => {\n this._webhook = updated;\n });\n }\n } finally {\n runInAction(() => {\n this._saving = false;\n });\n }\n },\n deleteWebhook: async () => {\n if (!this._webhookId \|\| this._isNew) {\n return;\n }\n await this.deleteWebhookUseCase.execute(this._webhookId);\n },\n openDeliveries: () => {\n this._showDeliveries = true;\n },\n closeDeliveries: () => {\n this._showDeliveries = false;\n }\n };\n\n public async init(id: string): Promise<void> {\n this._loading = true;\n this._isNew = id === \"new\";\n this._webhookId = id === \"new\" ? null : id;\n\n const eventsPromise = this.listAvailableEventsUseCase.execute();\n\n if (!this._isNew) {\n const [webhook, events] = await Promise.all([\n this.getWebhookUseCase.execute(id),\n eventsPromise\n ]);\n\n runInAction(() => {\n this._webhook = webhook;\n this._form = this.buildForm();\n this.addEventFields(events);\n this._form.setData({\n name: webhook.name,\n slug: webhook.slug,\n endpointUrl: webhook.endpointUrl,\n description: webhook.description ?? \"\",\n enabled: webhook.enabled\n });\n this._form.field(\"slug\").setDisabled(true);\n this.distributeEvents(webhook.events);\n this._loading = false;\n });\n } else {\n const events = await eventsPromise;\n\n runInAction(() => {\n this._form = this.buildForm();\n this.addEventFields(events);\n this._loading = false;\n });\n }\n }\n}\n\nexport const WebhookFormPresenter = Abstraction.createImplementation({\n implementation: WebhookFormPresenterImpl,\n dependencies: [\n FormModelFactory,\n GetWebhookUseCase,\n CreateWebhookUseCase,\n UpdateWebhookUseCase,\n DeleteWebhookUseCase,\n ListAvailableEventsUseCase,\n WebhookPermissions\n ]\n});\n"],"names":["WebhookFormPresenterImpl","formModelFactory","getWebhookUseCase","createWebhookUseCase","updateWebhookUseCase","deleteWebhookUseCase","listAvailableEventsUseCase","permissions","Map","data","merged","undefined","created","runInAction","updated","makeAutoObservable","computed","fields","form","name","String","layout","app","slug","events","grouped","event","existing","result","appEvents","fieldName","f","e","inner","objectField","selectedField","values","allEvents","webhookEvents","eventSet","Set","selected","id","eventsPromise","webhook","Promise","WebhookFormPresenter","Abstraction","FormModelFactory","GetWebhookUseCase","CreateWebhookUseCase","UpdateWebhookUseCase","DeleteWebhookUseCase","ListAvailableEventsUseCase","WebhookPermissions"],"mappings":"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"}
1	+ {"version":3,"file":"admin/presentation/WebhookForm/WebhookFormPresenter.js","sources":["../../../../src/admin/presentation/WebhookForm/WebhookFormPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable, runInAction } from \"mobx\";\nimport type { Webhook } from \"~/admin/shared/types.js\";\nimport type { WebhookEvent } from \"~/admin/shared/types.js\";\nimport {\n WebhookFormPresenter as Abstraction,\n type IWebhookFormPresenter,\n type IWebhookFormViewModel\n} from \"./abstractions.js\";\nimport { GetWebhookUseCase } from \"~/admin/features/getWebhook/abstractions.js\";\nimport { CreateWebhookUseCase } from \"~/admin/features/createWebhook/abstractions.js\";\nimport { UpdateWebhookUseCase } from \"~/admin/features/updateWebhook/abstractions.js\";\nimport { DeleteWebhookUseCase } from \"~/admin/features/deleteWebhook/abstractions.js\";\nimport { ListAvailableEventsUseCase } from \"~/admin/features/listAvailableEvents/abstractions.js\";\nimport { WebhookPermissions } from \"~/admin/features/permissions/abstractions.js\";\nimport {\n FormModelFactory,\n type IFormModel,\n type ILayoutNodeBuilder\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\n\nclass WebhookFormPresenterImpl implements IWebhookFormPresenter {\n private _loading = false;\n private _saving = false;\n private _isNew = false;\n private _webhook: Webhook \| null = null;\n private _webhookId: string \| null = null;\n private _form: IFormModel;\n private _entityFieldNames: string[] = [];\n private _entityGroups: Map<string, Map<string, WebhookEvent[]>> = new Map();\n\n public get vm(): IWebhookFormViewModel {\n return {\n loading: this._loading,\n saving: this._saving,\n isNew: this._isNew,\n webhook: this._webhook,\n permissions: {\n canEdit: this.permissions.canEdit(\"webhook\"),\n canDelete: this.permissions.canDelete(\"webhook\")\n },\n form: this._form.vm\n };\n }\n\n public constructor(\n private readonly formModelFactory: FormModelFactory.Interface,\n private readonly getWebhookUseCase: GetWebhookUseCase.Interface,\n private readonly createWebhookUseCase: CreateWebhookUseCase.Interface,\n private readonly updateWebhookUseCase: UpdateWebhookUseCase.Interface,\n private readonly deleteWebhookUseCase: DeleteWebhookUseCase.Interface,\n private readonly listAvailableEventsUseCase: ListAvailableEventsUseCase.Interface,\n private readonly permissions: WebhookPermissions.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 name: fields.text().label(\"Name\").required(\"Name is required\"),\n slug: fields\n .text()\n .label(\"Slug\")\n .required(\"Slug is required\")\n .computedUntilDirty(form => {\n const name = String(form.field(\"name\").getValue() ?? \"\");\n return name\n .trim()\n .toLowerCase()\n .replace(/[^a-z0-9\\s-]/g, \"\")\n .replace(/\\s+/g, \"-\");\n }),\n endpointUrl: fields\n .text()\n .label(\"Endpoint URL\")\n .required(\"Endpoint URL is required\")\n .placeholder(\"https://\"),\n description: fields.text().label(\"Description\").renderer(\"textarea\"),\n enabled: fields.boolean().label(\"Enabled\").defaultValue(false)\n }),\n layout: layout => [\n layout.row(\"name\", \"slug\"),\n layout.row(\"endpointUrl\"),\n layout.row(\"description\"),\n layout.row(\"enabled\")\n ]\n });\n }\n\n private entityFieldName(appLabel: string, entityLabel: string): string {\n const slug = `${appLabel}_${entityLabel}`\n .toLowerCase()\n .replace(/[^a-z0-9]+/g, \"_\")\n .replace(/^_\|_$/g, \"\");\n return `events_${slug}`;\n }\n\n private addEventFields(events: WebhookEvent[]): void {\n const grouped = new Map<string, Map<string, WebhookEvent[]>>();\n for (const event of events) {\n let appMap = grouped.get(event.appLabel);\n if (!appMap) {\n appMap = new Map();\n grouped.set(event.appLabel, appMap);\n }\n const existing = appMap.get(event.entityLabel) ?? [];\n existing.push(event);\n appMap.set(event.entityLabel, existing);\n }\n\n this._entityGroups = grouped;\n this._entityFieldNames = [];\n\n this._form.fields(fields => {\n const result: Record<string, ReturnType<typeof fields.object>> = {};\n\n for (const [appLabel, entities] of grouped) {\n for (const [entityLabel, entityEvents] of entities) {\n const fieldName = this.entityFieldName(appLabel, entityLabel);\n this._entityFieldNames.push(fieldName);\n\n result[fieldName] = fields\n .object()\n .label(entityLabel)\n .renderer(\"objectAccordionSingle\", { open: false })\n .fields(f => {\n return {\n selected: f\n .text()\n .list()\n .options(\n entityEvents.map(e => ({\n label: e.label,\n value: e.eventName\n }))\n )\n .renderer(\"checkboxes\")\n };\n });\n }\n }\n\n return result;\n });\n\n this._form.setLayout(layout => {\n const rows: ILayoutNodeBuilder[] = [\n layout.row(\"name\", \"slug\"),\n layout.row(\"endpointUrl\"),\n layout.row(\"description\"),\n layout.row(\"enabled\")\n ];\n\n for (const [appLabel, entities] of grouped) {\n rows.push(layout.separator());\n rows.push(layout.element(\"sectionHeading\", { label: appLabel }));\n\n for (const [entityLabel] of entities) {\n const fieldName = this.entityFieldName(appLabel, entityLabel);\n rows.push(layout.object(fieldName, inner => [inner.row(\"selected\")]));\n }\n }\n\n return rows;\n });\n\n this._form.addRule(form => {\n if (this._entityFieldNames.length === 0) {\n return [];\n }\n for (const fieldName of this._entityFieldNames) {\n const objectField = form.field(fieldName).as(\"object\");\n const selectedField = objectField.children.get(\"selected\");\n if (!selectedField) {\n continue;\n }\n const values = selectedField.getValue<string[]>();\n if (values && values.length > 0) {\n return [];\n }\n }\n\n return [{ path: \"Events\", message: \"At least one event must be selected.\" }];\n });\n }\n\n private collectEvents(): string[] {\n const allEvents: string[] = [];\n\n for (const fieldName of this._entityFieldNames) {\n const objectField = this._form.field(fieldName).as(\"object\");\n const selectedField = objectField.children.get(\"selected\");\n if (!selectedField) {\n continue;\n }\n const values = selectedField.getValue<string[]>();\n if (values && values.length > 0) {\n allEvents.push(...values);\n }\n }\n\n return allEvents;\n }\n\n private distributeEvents(webhookEvents: string[]): void {\n const eventSet = new Set(webhookEvents);\n\n for (const [appLabel, entities] of this._entityGroups) {\n for (const [entityLabel, entityEvents] of entities) {\n const fieldName = this.entityFieldName(appLabel, entityLabel);\n const objectField = this._form.field(fieldName).as(\"object\");\n const selectedField = objectField.children.get(\"selected\");\n if (!selectedField) {\n continue;\n }\n\n const selected = entityEvents\n .filter(e => eventSet.has(e.eventName))\n .map(e => e.eventName);\n selectedField.setValue(selected);\n }\n }\n }\n\n public async save(): Promise<boolean> {\n const data = await this._form.submit<Record<string, unknown>>();\n if (data === false) {\n return false;\n }\n\n runInAction(() => {\n this._saving = true;\n });\n\n try {\n const merged = {\n name: data.name as string,\n slug: data.slug as string,\n endpointUrl: data.endpointUrl as string,\n description: (data.description as string) \|\| undefined,\n enabled: data.enabled as boolean,\n events: this.collectEvents()\n };\n\n if (this._isNew) {\n const created = await this.createWebhookUseCase.execute(merged);\n\n runInAction(() => {\n this._webhook = created;\n this._webhookId = created.id;\n this._isNew = false;\n this._form.field(\"slug\").setDisabled(true);\n });\n } else {\n const updated = await this.updateWebhookUseCase.execute(this._webhookId!, merged);\n\n runInAction(() => {\n this._webhook = updated;\n });\n }\n } finally {\n runInAction(() => {\n this._saving = false;\n });\n }\n\n return true;\n }\n\n public async deleteWebhook(): Promise<void> {\n if (!this._webhookId \|\| this._isNew) {\n return;\n }\n await this.deleteWebhookUseCase.execute(this._webhookId);\n }\n\n public async init(id: string): Promise<void> {\n this._loading = true;\n this._isNew = id === \"new\";\n this._webhookId = id === \"new\" ? null : id;\n\n const eventsPromise = this.listAvailableEventsUseCase.execute();\n\n if (!this._isNew) {\n const [webhook, events] = await Promise.all([\n this.getWebhookUseCase.execute(id),\n eventsPromise\n ]);\n\n runInAction(() => {\n this._webhook = webhook;\n this._form = this.buildForm();\n this.addEventFields(events);\n this._form.setData({\n name: webhook.name,\n slug: webhook.slug,\n endpointUrl: webhook.endpointUrl,\n description: webhook.description ?? \"\",\n enabled: webhook.enabled\n });\n this._form.field(\"slug\").setDisabled(true);\n this.distributeEvents(webhook.events);\n this._loading = false;\n });\n } else {\n const events = await eventsPromise;\n\n runInAction(() => {\n this._form = this.buildForm();\n this.addEventFields(events);\n this._loading = false;\n });\n }\n }\n}\n\nexport const WebhookFormPresenter = Abstraction.createImplementation({\n implementation: WebhookFormPresenterImpl,\n dependencies: [\n FormModelFactory,\n GetWebhookUseCase,\n CreateWebhookUseCase,\n UpdateWebhookUseCase,\n DeleteWebhookUseCase,\n ListAvailableEventsUseCase,\n WebhookPermissions\n ]\n});\n"],"names":["WebhookFormPresenterImpl","formModelFactory","getWebhookUseCase","createWebhookUseCase","updateWebhookUseCase","deleteWebhookUseCase","listAvailableEventsUseCase","permissions","Map","makeAutoObservable","computed","fields","form","name","String","layout","appLabel","entityLabel","slug","events","grouped","event","appMap","existing","result","entities","entityEvents","fieldName","f","e","rows","inner","objectField","selectedField","values","allEvents","webhookEvents","eventSet","Set","selected","data","runInAction","merged","undefined","created","updated","id","eventsPromise","webhook","Promise","WebhookFormPresenter","Abstraction","FormModelFactory","GetWebhookUseCase","CreateWebhookUseCase","UpdateWebhookUseCase","DeleteWebhookUseCase","ListAvailableEventsUseCase","WebhookPermissions"],"mappings":"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"}

package/admin/presentation/WebhookForm/abstractions.d.ts CHANGED Viewed

@@ -5,27 +5,20 @@ export interface IWebhookFormViewModel {
     saving: boolean;
     isNew: boolean;
     webhook: Webhook | null;
-    showDeliveries: boolean;
     permissions: {
         canEdit: boolean;
         canDelete: boolean;
     };
     form: IFormVM;
 }
-export interface IWebhookFormActions {
-    save(): Promise<void>;
-    deleteWebhook(): Promise<void>;
-    openDeliveries(): void;
-    closeDeliveries(): void;
-}
 export interface IWebhookFormPresenter {
     vm: IWebhookFormViewModel;
-    actions: IWebhookFormActions;
     init(id: string): void;
+    save(): Promise<boolean>;
+    deleteWebhook(): Promise<void>;
 }
 export declare const WebhookFormPresenter: import("@webiny/di").Abstraction<IWebhookFormPresenter>;
 export declare namespace WebhookFormPresenter {
     type Interface = IWebhookFormPresenter;
     type ViewModel = IWebhookFormViewModel;
-    type Actions = IWebhookFormActions;
 }

package/admin/presentation/WebhookForm/abstractions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"admin/presentation/WebhookForm/abstractions.js","sources":["../../../../src/admin/presentation/WebhookForm/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { Webhook } from \"~/admin/shared/types.js\";\nimport type { IFormVM } from \"@webiny/app-admin/features/formModel/abstractions.js\";\n\nexport interface IWebhookFormViewModel {\n loading: boolean;\n saving: boolean;\n isNew: boolean;\n webhook: Webhook \| null;\n ~~showDeliveries: boolean;\n~~ permissions: {\n canEdit: boolean;\n canDelete: boolean;\n };\n form: IFormVM;\n}\n\nexport interface ~~IWebhookFormActions~~ {\n ~~save()~~: ~~Promise<void>;\~~n ~~deleteWebhook~~(): ~~Promise<void>;\n openDeliveries(~~): void;\n ~~closeDeliveries~~(): ~~void;\~~n~~}\n\nexport interface IWebhookFormPresenter {\n~~ ~~vm: IWebhookFormViewModel;\n actions: IWebhookFormActions;\n init~~(~~id: string~~): void;\n}\n\nexport const WebhookFormPresenter =\n createAbstraction<IWebhookFormPresenter>(\"WebhookFormPresenter\");\n\nexport namespace WebhookFormPresenter {\n export type Interface = IWebhookFormPresenter;\n export type ViewModel = IWebhookFormViewModel;\n ~~export type Actions = IWebhookFormActions;\n~~}\n"],"names":["WebhookFormPresenter","createAbstraction"],"mappings":";~~AA8BO~~,MAAMA,uBACTC,kBAAyC"}
1	+ {"version":3,"file":"admin/presentation/WebhookForm/abstractions.js","sources":["../../../../src/admin/presentation/WebhookForm/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { Webhook } from \"~/admin/shared/types.js\";\nimport type { IFormVM } from \"@webiny/app-admin/features/formModel/abstractions.js\";\n\nexport interface IWebhookFormViewModel {\n loading: boolean;\n saving: boolean;\n isNew: boolean;\n webhook: Webhook \| null;\n permissions: {\n canEdit: boolean;\n canDelete: boolean;\n };\n form: IFormVM;\n}\n\nexport interface IWebhookFormPresenter {\n vm: IWebhookFormViewModel;\n init(id: string): void;\n save(): Promise<boolean>;\n deleteWebhook(): Promise<void>;\n}\n\nexport const WebhookFormPresenter =\n createAbstraction<IWebhookFormPresenter>(\"WebhookFormPresenter\");\n\nexport namespace WebhookFormPresenter {\n export type Interface = IWebhookFormPresenter;\n export type ViewModel = IWebhookFormViewModel;\n}\n"],"names":["WebhookFormPresenter","createAbstraction"],"mappings":";AAuBO,MAAMA,uBACTC,kBAAyC"}

package/admin/presentation/WebhookForm/components/SigningSecret.d.ts CHANGED Viewed

@@ -1,6 +1,9 @@
 import React from "react";
+import type { IWebhookFormPresenter } from "../abstractions.js";
 interface SigningSecretProps {
-    secret: string;
+    presenter: IWebhookFormPresenter;
 }
-export declare const SigningSecret: ({ secret }: SigningSecretProps) => React.JSX.Element;
+export declare const SigningSecret: (({ presenter }: SigningSecretProps) => React.JSX.Element | null) & {
+    displayName: string;
+};
 export {};

package/admin/presentation/WebhookForm/components/SigningSecret.js CHANGED Viewed

@@ -1,12 +1,16 @@
 import react, { useCallback, useState } from "react";
+import { observer } from "mobx-react-lite";
 import { IconButton, Text } from "@webiny/admin-ui";
 import { useSnackbar } from "@webiny/app-admin/hooks/index.js";
 import { ReactComponent } from "@webiny/icons/visibility.svg";
 import { ReactComponent as visibility_off_svg_ReactComponent } from "@webiny/icons/visibility_off.svg";
 import { ReactComponent as content_copy_svg_ReactComponent } from "@webiny/icons/content_copy.svg";
-const SigningSecret = ({ secret })=>{
+const SigningSecret_SigningSecret = observer(function({ presenter }) {
+    const { vm } = presenter;
     const [revealed, setRevealed] = useState(false);
     const { showSnackbar } = useSnackbar();
+    if (vm.isNew || !vm.webhook?.signingSecret) return null;
+    const secret = vm.webhook.signingSecret;
     const handleCopy = useCallback(async ()=>{
         await navigator.clipboard.writeText(secret);
         showSnackbar("Signing secret copied to clipboard.");
@@ -37,7 +41,7 @@ const SigningSecret = ({ secret })=>{
         onClick: ()=>void handleCopy(),
         "aria-label": "Copy secret"
     })));
-};
-export { SigningSecret };
+});
+export { SigningSecret_SigningSecret as SigningSecret };
 //# sourceMappingURL=SigningSecret.js.map

package/admin/presentation/WebhookForm/components/SigningSecret.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"admin/presentation/WebhookForm/components/SigningSecret.js","sources":["../../../../../src/admin/presentation/WebhookForm/components/SigningSecret.tsx"],"sourcesContent":["import React, { useState, useCallback } from \"react\";\nimport { IconButton, Text } from \"@webiny/admin-ui\";\nimport { useSnackbar } from \"@webiny/app-admin/hooks/index.js\";\nimport { ReactComponent as VisibilityIcon } from \"@webiny/icons/visibility.svg\";\nimport { ReactComponent as VisibilityOffIcon } from \"@webiny/icons/visibility_off.svg\";\nimport { ReactComponent as CopyIcon } from \"@webiny/icons/content_copy.svg\";\n\ninterface SigningSecretProps {\n ~~secret~~: ~~string~~;\n}\n\nexport const SigningSecret = ({ ~~secret~~ }: SigningSecretProps) => {\n const [revealed, setRevealed] = useState(false);\n const { showSnackbar } = useSnackbar();\n\n const handleCopy = useCallback(async () => {\n await navigator.clipboard.writeText(secret);\n showSnackbar(\"Signing secret copied to clipboard.\");\n }, [secret, showSnackbar]);\n\n return (\n <div className=\"flex flex-col gap-xs\">\n <Text size=\"sm\" className=\"text-neutral-strong\">\n Signing Secret\n </Text>\n <div className=\"flex items-center gap-sm rounded-sm border-sm border-neutral-muted px-sm py-xs\">\n <Text size=\"sm\" className=\"flex-1 font-mono select-all\">\n {revealed ? secret : \"•\".repeat(24)}\n </Text>\n <IconButton\n icon={revealed ? <VisibilityOffIcon /> : <VisibilityIcon />}\n variant=\"secondary\"\n size=\"sm\"\n onClick={() => setRevealed(prev => !prev)}\n aria-label={revealed ? \"Hide secret\" : \"Reveal secret\"}\n />\n <IconButton\n icon={<CopyIcon />}\n variant=\"secondary\"\n size=\"sm\"\n onClick={() => void handleCopy()}\n aria-label=\"Copy secret\"\n />\n </div>\n </div>\n );\n};\n"],"names":["SigningSecret","~~secret~~","revealed","setRevealed","useState","showSnackbar","useSnackbar","handleCopy","useCallback","navigator","Text","IconButton","VisibilityOffIcon","VisibilityIcon","prev","CopyIcon"],"mappings":"~~;;;;;;AAWO~~,MAAMA,~~gBAAgB~~,~~CAAC~~,EAAEC,~~MAAM~~,EAAsB;~~IACxD~~,MAAM,~~CAACC~~,UAAUC,YAAY,GAAGC,SAAS;IACzC,MAAM,EAAEC,YAAY,EAAE,GAAGC;IAEzB,~~MAAMC~~,aAAaC,YAAY;QAC3B,MAAMC,UAAU,SAAS,CAAC,SAAS,~~CAACR~~;~~QACpCI~~,aAAa;IACjB,GAAG;~~QAACJ~~;~~QAAQI~~;KAAa;IAEzB,OAAO,WAAP,GACI,oBAAC;QAAI,WAAU;qBACX,~~oBAACK~~,MAAIA;QAAC,MAAK;QAAK,WAAU;OAAsB,iCAGhD,oBAAC;QAAI,WAAU;qBACX,oBAACA,MAAIA;QAAC,MAAK;QAAK,WAAU;~~OACrBR~~,~~WAAWD~~,SAAS,IAAI,MAAM,CAAC,oBAEpC,~~oBAACU~~,YAAUA;QACP,~~MAAMT~~,WAAW,WAAXA,GAAW,~~oBAACU~~,mCAAiBA,QAAAA,WAAAA,GAAM,oBAACC,gBAAcA;QACxD,SAAQ;QACR,MAAK;QACL,SAAS,~~IAAMV~~,~~YAAYW~~,CAAAA,OAAQ,CAACA;QACpC,~~cAAYZ~~,WAAW,gBAAgB;sBAE3C,~~oBAACS~~,YAAUA;QACP,oBAAM,oBAACI,iCAAQA;QACf,SAAQ;QACR,MAAK;QACL,SAAS,IAAM,KAAKR;QACpB,cAAW;;AAK/B"}
1	+ {"version":3,"file":"admin/presentation/WebhookForm/components/SigningSecret.js","sources":["../../../../../src/admin/presentation/WebhookForm/components/SigningSecret.tsx"],"sourcesContent":["import React, { useState, useCallback } from \"react\";\nimport { observer } from \"mobx-react-lite\";\nimport { IconButton, Text } from \"@webiny/admin-ui\";\nimport { useSnackbar } from \"@webiny/app-admin/hooks/index.js\";\nimport { ReactComponent as VisibilityIcon } from \"@webiny/icons/visibility.svg\";\nimport { ReactComponent as VisibilityOffIcon } from \"@webiny/icons/visibility_off.svg\";\nimport { ReactComponent as CopyIcon } from \"@webiny/icons/content_copy.svg\";\nimport type { IWebhookFormPresenter } from \"../abstractions.js\";\n\ninterface SigningSecretProps {\n presenter: IWebhookFormPresenter;\n}\n\nexport const SigningSecret = observer(function SigningSecret({ presenter }: SigningSecretProps) {\n const { vm } = presenter;\n const [revealed, setRevealed] = useState(false);\n const { showSnackbar } = useSnackbar();\n\n if (vm.isNew \|\| !vm.webhook?.signingSecret) {\n return null;\n }\n\n const secret = vm.webhook.signingSecret;\n\n const handleCopy = useCallback(async () => {\n await navigator.clipboard.writeText(secret);\n showSnackbar(\"Signing secret copied to clipboard.\");\n }, [secret, showSnackbar]);\n\n return (\n <div className=\"flex flex-col gap-xs\">\n <Text size=\"sm\" className=\"text-neutral-strong\">\n Signing Secret\n </Text>\n <div className=\"flex items-center gap-sm rounded-sm border-sm border-neutral-muted px-sm py-xs\">\n <Text size=\"sm\" className=\"flex-1 font-mono select-all\">\n {revealed ? secret : \"•\".repeat(24)}\n </Text>\n <IconButton\n icon={revealed ? <VisibilityOffIcon /> : <VisibilityIcon />}\n variant=\"secondary\"\n size=\"sm\"\n onClick={() => setRevealed(prev => !prev)}\n aria-label={revealed ? \"Hide secret\" : \"Reveal secret\"}\n />\n <IconButton\n icon={<CopyIcon />}\n variant=\"secondary\"\n size=\"sm\"\n onClick={() => void handleCopy()}\n aria-label=\"Copy secret\"\n />\n </div>\n </div>\n );\n});\n"],"names":["SigningSecret","observer","presenter","vm","revealed","setRevealed","useState","showSnackbar","useSnackbar","secret","handleCopy","useCallback","navigator","Text","IconButton","VisibilityOffIcon","VisibilityIcon","prev","CopyIcon"],"mappings":";;;;;;;AAaO,MAAMA,8BAAgBC,SAAS,SAAuB,EAAEC,SAAS,EAAsB;IAC1F,MAAM,EAAEC,EAAE,EAAE,GAAGD;IACf,MAAM,CAACE,UAAUC,YAAY,GAAGC,SAAS;IACzC,MAAM,EAAEC,YAAY,EAAE,GAAGC;IAEzB,IAAIL,GAAG,KAAK,IAAI,CAACA,GAAG,OAAO,EAAE,eACzB,OAAO;IAGX,MAAMM,SAASN,GAAG,OAAO,CAAC,aAAa;IAEvC,MAAMO,aAAaC,YAAY;QAC3B,MAAMC,UAAU,SAAS,CAAC,SAAS,CAACH;QACpCF,aAAa;IACjB,GAAG;QAACE;QAAQF;KAAa;IAEzB,OAAO,WAAP,GACI,oBAAC;QAAI,WAAU;qBACX,oBAACM,MAAIA;QAAC,MAAK;QAAK,WAAU;OAAsB,iCAGhD,oBAAC;QAAI,WAAU;qBACX,oBAACA,MAAIA;QAAC,MAAK;QAAK,WAAU;OACrBT,WAAWK,SAAS,IAAI,MAAM,CAAC,oBAEpC,oBAACK,YAAUA;QACP,MAAMV,WAAW,WAAXA,GAAW,oBAACW,mCAAiBA,QAAAA,WAAAA,GAAM,oBAACC,gBAAcA;QACxD,SAAQ;QACR,MAAK;QACL,SAAS,IAAMX,YAAYY,CAAAA,OAAQ,CAACA;QACpC,cAAYb,WAAW,gBAAgB;sBAE3C,oBAACU,YAAUA;QACP,oBAAM,oBAACI,iCAAQA;QACf,SAAQ;QACR,MAAK;QACL,SAAS,IAAM,KAAKR;QACpB,cAAW;;AAK/B"}

package/admin/presentation/WebhookForm/components/WebhookFormView.js CHANGED Viewed

@@ -1,9 +1,8 @@
-import react, { useEffect, useMemo } from "react";
+import react, { useCallback, useEffect, useMemo } from "react";
 import { observer } from "mobx-react-lite";
 import { DiContainerProvider, useContainer, useFeature, useRoute } from "@webiny/app";
-import { FormErrors, useRouter } from "@webiny/app-admin";
-import { Button, Heading, OverlayLoader, Separator } from "@webiny/admin-ui";
-import { FormView } from "@webiny/app-admin/features/formModel/FormView.js";
+import { FormErrors, FormView, SimpleForm, SimpleFormContent, SimpleFormFooter, SimpleFormHeader, useFieldRenderers, useRouter } from "@webiny/app-admin";
+import { Button, OverlayLoader, useToast } from "@webiny/admin-ui";
 import { WebhookFormPresenterFeature } from "../feature.js";
 import { GetWebhookFeature } from "../../../features/getWebhook/feature.js";
 import { CreateWebhookFeature } from "../../../features/createWebhook/feature.js";
@@ -13,52 +12,67 @@ import { ListAvailableEventsFeature } from "../../../features/listAvailableEvent
 import { WebhookPermissionsFeature } from "../../../features/permissions/feature.js";
 import { Routes } from "../../../routes.js";
 import { SigningSecret } from "./SigningSecret.js";
-import { WebhookDeliveriesDrawer } from "../../WebhookDeliveries/components/WebhookDeliveriesDrawer.js";
+import { HasPermission } from "../../security/HasPermission.js";
+const SectionHeading = ({ field })=>/*#__PURE__*/ react.createElement("span", {
+        className: "text-md font-semibold"
+    }, String(field.label ?? ""));
 const WebhookFormView_WebhookFormViewInner = observer(function() {
     const { presenter } = useFeature(WebhookFormPresenterFeature);
     const { goToRoute } = useRouter();
     const { route } = useRoute(Routes.Form);
+    const toast = useToast();
     const id = route.params.id;
+    const defaultRenderers = useFieldRenderers();
+    const renderers = useMemo(()=>({
+            ...defaultRenderers,
+            "element:sectionHeading": SectionHeading
+        }), [
+        defaultRenderers
+    ]);
     useEffect(()=>{
         presenter.init(id);
     }, [
         presenter,
         id
     ]);
-    const { vm, actions } = presenter;
-    if (vm.loading) return /*#__PURE__*/ react.createElement(OverlayLoader, null);
-    return /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__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
-    }, vm.isNew ? "Create Webhook" : vm.webhook?.name ?? "Edit Webhook"), /*#__PURE__*/ react.createElement("div", {
-        className: "flex gap-sm"
-    }, !vm.isNew && /*#__PURE__*/ react.createElement(Button, {
-        variant: "secondary",
-        onClick: ()=>actions.openDeliveries()
-    }, "Deliveries"), /*#__PURE__*/ react.createElement(Button, {
+    const saveForm = useCallback(async ()=>{
+        const res = await presenter.save();
+        if (res) toast.showSuccessToast({
+            title: "Webhook saved successfully!"
+        });
+    }, [
+        presenter
+    ]);
+    const { vm } = presenter;
+    return /*#__PURE__*/ react.createElement(SimpleForm, null, vm.loading ? /*#__PURE__*/ react.createElement(OverlayLoader, {
+        text: "Loading..."
+    }) : null, vm.saving ? /*#__PURE__*/ react.createElement(OverlayLoader, {
+        text: "Saving..."
+    }) : null, vm.form.errors.length > 0 ? /*#__PURE__*/ react.createElement("div", {
+        className: "mb-lg"
+    }, /*#__PURE__*/ react.createElement(FormErrors, {
+        form: vm.form
+    })) : null, /*#__PURE__*/ react.createElement(SimpleFormHeader, {
+        title: vm.isNew ? "Create Webhook" : vm.webhook?.name ?? "Edit Webhook"
+    }), /*#__PURE__*/ react.createElement(SimpleFormContent, null, /*#__PURE__*/ react.createElement(FormView, {
+        name: "Webhook",
+        form: vm.form,
+        renderers: renderers
+    }), /*#__PURE__*/ react.createElement(SigningSecret, {
+        presenter: presenter
+    })), /*#__PURE__*/ react.createElement(SimpleFormFooter, {
+        className: "border-t-sm border-t-neutral-dimmed pt-lg"
+    }, /*#__PURE__*/ react.createElement(Button, {
         variant: "secondary",
         onClick: ()=>goToRoute(Routes.List)
-    }, "Cancel"), vm.permissions.canEdit && /*#__PURE__*/ react.createElement(Button, {
+    }, "Cancel"), /*#__PURE__*/ react.createElement(HasPermission, {
+        entity: "webhook",
+        action: "edit"
+    }, /*#__PURE__*/ react.createElement(Button, {
         variant: "primary",
-        onClick: ()=>void actions.save(),
+        onClick: saveForm,
         disabled: vm.saving
-    }, vm.saving ? "Saving..." : "Save"))), /*#__PURE__*/ react.createElement(Separator, null), /*#__PURE__*/ react.createElement("div", {
-        className: "p-lg"
-    }, /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(FormErrors, {
-        form: vm.form
-    }), /*#__PURE__*/ react.createElement(FormView, {
-        name: "Webhook",
-        form: vm.form
-    }), !vm.isNew && vm.webhook?.signingSecret && /*#__PURE__*/ react.createElement(SigningSecret, {
-        secret: vm.webhook.signingSecret
-    })))), vm.showDeliveries && vm.webhook && /*#__PURE__*/ react.createElement(WebhookDeliveriesDrawer, {
-        webhookId: vm.webhook.id,
-        open: vm.showDeliveries,
-        onClose: ()=>actions.closeDeliveries()
-    }));
+    }, vm.saving ? "Saving..." : "Save"))));
 });
 const WebhookFormView = ()=>{
     const container = useContainer();