@webiny/api-headless-cms-scheduler 6.0.0-rc.7 → 6.1.0-beta.0

package/context.js

@@ -1,11 +1,17 @@
 import { ContextPlugin } from "@webiny/api";
-import { ScheduleEntryActionFeature } from "./features/ScheduleEntryAction/feature.js";
-import { CancelScheduledEntryActionFeature } from "./features/CancelScheduledEntryAction/feature.js";
 import { CancelScheduledActionOnEntryChangeFeature } from "./features/CancelScheduledActionOnEntryChange/feature.js";
+import { NamespaceHandler } from "./features/NamespaceHandler/NamespaceHandler.js";
+import { PublishEntryActionHandler } from "./features/PublishActionHandler/PublishEntryActionHandler.js";
+import { UnpublishEntryActionHandler } from "./features/UnpublishActionHandler/UnpublishEntryActionHandler.js";
+import { SchedulePublishEntryUseCase } from "./features/SchedulePublishEntryUseCase/SchedulePublishEntryUseCase.js";
+import { ScheduleUnpublishEntryUseCase } from "./features/ScheduleUnpublishEntryUseCase/ScheduleUnpublishEntryUseCase.js";
 export const createHeadlessCmsScheduleContext = () => {
   return new ContextPlugin(async context => {
-    ScheduleEntryActionFeature.register(context.container);
-    CancelScheduledEntryActionFeature.register(context.container);
+    context.container.register(NamespaceHandler);
+    context.container.register(PublishEntryActionHandler);
+    context.container.register(UnpublishEntryActionHandler);
+    context.container.register(SchedulePublishEntryUseCase);
+    context.container.register(ScheduleUnpublishEntryUseCase);
     CancelScheduledActionOnEntryChangeFeature.register(context.container);
   });
 };

package/context.js.map

@@ -1 +1 @@
-{"version":3,"names":["ContextPlugin","ScheduleEntryActionFeature","CancelScheduledEntryActionFeature","CancelScheduledActionOnEntryChangeFeature","createHeadlessCmsScheduleContext","context","register","container"],"sources":["context.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { ScheduleEntryActionFeature } from \"~/features/ScheduleEntryAction/feature.js\";\nimport { CancelScheduledEntryActionFeature } from \"~/features/CancelScheduledEntryAction/feature.js\";\nimport { CancelScheduledActionOnEntryChangeFeature } from \"~/features/CancelScheduledActionOnEntryChange/feature.js\";\n\nexport const createHeadlessCmsScheduleContext = () => {\n    return new ContextPlugin(async context => {\n        ScheduleEntryActionFeature.register(context.container);\n        CancelScheduledEntryActionFeature.register(context.container);\n        CancelScheduledActionOnEntryChangeFeature.register(context.container);\n    });\n};\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,aAAa;AAC3C,SAASC,0BAA0B;AACnC,SAASC,iCAAiC;AAC1C,SAASC,yCAAyC;AAElD,OAAO,MAAMC,gCAAgC,GAAGA,CAAA,KAAM;EAClD,OAAO,IAAIJ,aAAa,CAAC,MAAMK,OAAO,IAAI;IACtCJ,0BAA0B,CAACK,QAAQ,CAACD,OAAO,CAACE,SAAS,CAAC;IACtDL,iCAAiC,CAACI,QAAQ,CAACD,OAAO,CAACE,SAAS,CAAC;IAC7DJ,yCAAyC,CAACG,QAAQ,CAACD,OAAO,CAACE,SAAS,CAAC;EACzE,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["ContextPlugin","CancelScheduledActionOnEntryChangeFeature","NamespaceHandler","PublishEntryActionHandler","UnpublishEntryActionHandler","SchedulePublishEntryUseCase","ScheduleUnpublishEntryUseCase","createHeadlessCmsScheduleContext","context","container","register"],"sources":["context.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { CancelScheduledActionOnEntryChangeFeature } from \"~/features/CancelScheduledActionOnEntryChange/feature.js\";\nimport { NamespaceHandler } from \"~/features/NamespaceHandler/NamespaceHandler.js\";\nimport { PublishEntryActionHandler } from \"~/features/PublishActionHandler/PublishEntryActionHandler.js\";\nimport { UnpublishEntryActionHandler } from \"~/features/UnpublishActionHandler/UnpublishEntryActionHandler.js\";\nimport { SchedulePublishEntryUseCase } from \"~/features/SchedulePublishEntryUseCase/SchedulePublishEntryUseCase.js\";\nimport { ScheduleUnpublishEntryUseCase } from \"~/features/ScheduleUnpublishEntryUseCase/ScheduleUnpublishEntryUseCase.js\";\n\nexport const createHeadlessCmsScheduleContext = () => {\n    return new ContextPlugin(async context => {\n        context.container.register(NamespaceHandler);\n        context.container.register(PublishEntryActionHandler);\n        context.container.register(UnpublishEntryActionHandler);\n        context.container.register(SchedulePublishEntryUseCase);\n        context.container.register(ScheduleUnpublishEntryUseCase);\n\n        CancelScheduledActionOnEntryChangeFeature.register(context.container);\n    });\n};\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,aAAa;AAC3C,SAASC,yCAAyC;AAClD,SAASC,gBAAgB;AACzB,SAASC,yBAAyB;AAClC,SAASC,2BAA2B;AACpC,SAASC,2BAA2B;AACpC,SAASC,6BAA6B;AAEtC,OAAO,MAAMC,gCAAgC,GAAGA,CAAA,KAAM;EAClD,OAAO,IAAIP,aAAa,CAAC,MAAMQ,OAAO,IAAI;IACtCA,OAAO,CAACC,SAAS,CAACC,QAAQ,CAACR,gBAAgB,CAAC;IAC5CM,OAAO,CAACC,SAAS,CAACC,QAAQ,CAACP,yBAAyB,CAAC;IACrDK,OAAO,CAACC,SAAS,CAACC,QAAQ,CAACN,2BAA2B,CAAC;IACvDI,OAAO,CAACC,SAAS,CAACC,QAAQ,CAACL,2BAA2B,CAAC;IACvDG,OAAO,CAACC,SAAS,CAACC,QAAQ,CAACJ,6BAA6B,CAAC;IAEzDL,yCAAyC,CAACS,QAAQ,CAACF,OAAO,CAACC,SAAS,CAAC;EACzE,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

package/exports/api/cms/scheduler.d.ts

@@ -0,0 +1,2 @@
+export { SchedulePublishEntryUseCase } from "../../../features/SchedulePublishEntryUseCase/abstractions.js";
+export { ScheduleUnpublishEntryUseCase } from "../../../features/ScheduleUnpublishEntryUseCase/abstractions.js";

package/exports/api/cms/scheduler.js

@@ -0,0 +1,4 @@
+export { SchedulePublishEntryUseCase } from "../../../features/SchedulePublishEntryUseCase/abstractions.js";
+export { ScheduleUnpublishEntryUseCase } from "../../../features/ScheduleUnpublishEntryUseCase/abstractions.js";
+
+//# sourceMappingURL=scheduler.js.map

package/exports/api/cms/scheduler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["SchedulePublishEntryUseCase","ScheduleUnpublishEntryUseCase"],"sources":["scheduler.ts"],"sourcesContent":["export { SchedulePublishEntryUseCase } from \"~/features/SchedulePublishEntryUseCase/abstractions.js\";\nexport { ScheduleUnpublishEntryUseCase } from \"~/features/ScheduleUnpublishEntryUseCase/abstractions.js\";\n"],"mappings":"AAAA,SAASA,2BAA2B;AACpC,SAASC,6BAA6B","ignoreList":[]}

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.d.ts

@@ -1,5 +1,5 @@
 import { EntryAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events";
-import { ListScheduledActionsUseCase, CancelScheduledActionUseCase } from "@webiny/api-scheduler";
+import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
 /**
  * Cancels scheduled actions when an entry is deleted
  *
@@ -9,8 +9,8 @@ import { ListScheduledActionsUseCase, CancelScheduledActionUseCase } from "@webi
  */
 declare class CancelScheduledActionOnEntryDeleteHandlerImpl implements EntryAfterDeleteEventHandler.Interface {
     private listScheduledActions;
-    private cancelScheduledEntryAction;
-    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledEntryAction: CancelScheduledActionUseCase.Interface);
+    private cancelScheduledAction;
+    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledAction: CancelScheduledActionUseCase.Interface);
     handle(event: EntryAfterDeleteEventHandler.Event): Promise<void>;
     private listSchedules;
 }

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.js

@@ -1,5 +1,6 @@
 import { EntryAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events";
-import { ListScheduledActionsUseCase, CancelScheduledActionUseCase } from "@webiny/api-scheduler";
+import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { createNamespace } from "../../utils/namespace.js";
 
 /**
  * Cancels scheduled actions when an entry is deleted
@@ -9,9 +10,9 @@ import { ListScheduledActionsUseCase, CancelScheduledActionUseCase } from "@webi
  * no longer exists.
  */
 class CancelScheduledActionOnEntryDeleteHandlerImpl {
-  constructor(listScheduledActions, cancelScheduledEntryAction) {
+  constructor(listScheduledActions, cancelScheduledAction) {
     this.listScheduledActions = listScheduledActions;
-    this.cancelScheduledEntryAction = cancelScheduledEntryAction;
+    this.cancelScheduledAction = cancelScheduledAction;
   }
   async handle(event) {
     const {
@@ -25,7 +26,7 @@ class CancelScheduledActionOnEntryDeleteHandlerImpl {
     }
     const schedules = await this.listSchedules(model.modelId, entry.entryId);
     for (const action of schedules) {
-      const cancelRes = await this.cancelScheduledEntryAction.execute(action.id);
+      const cancelRes = await this.cancelScheduledAction.execute(action);
       if (cancelRes.isFail()) {
         // Silently ignore errors - this is non-critical cleanup.
         // The entry was deleted successfully, cancelling scheduled actions is best-effort.
@@ -36,7 +37,9 @@ class CancelScheduledActionOnEntryDeleteHandlerImpl {
     const actionsResult = await this.listScheduledActions.execute({
       limit: 10000,
       where: {
-        namespace: `Cms/Entry/${modelId}`,
+        namespace: createNamespace({
+          modelId
+        }),
         targetId_startsWith: `${entryId}#`
       }
     });

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["EntryAfterDeleteEventHandler","ListScheduledActionsUseCase","CancelScheduledActionUseCase","CancelScheduledActionOnEntryDeleteHandlerImpl","constructor","listScheduledActions","cancelScheduledEntryAction","handle","event","entry","model","payload","isPrivate","schedules","listSchedules","modelId","entryId","action","cancelRes","execute","id","isFail","actionsResult","limit","where","namespace","targetId_startsWith","value","items","CancelScheduledActionOnEntryDeleteEventHandler","createImplementation","implementation","dependencies"],"sources":["CancelScheduledActionOnEntryDeleteEventHandler.ts"],"sourcesContent":["import { EntryAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events\";\nimport { ListScheduledActionsUseCase, CancelScheduledActionUseCase } from \"@webiny/api-scheduler\";\n\n/**\n * Cancels scheduled actions when an entry is deleted\n *\n * When a user deletes an entry, any scheduled publish/unpublish\n * actions for all of its revisions should be canceled since the entry\n * no longer exists.\n */\nclass CancelScheduledActionOnEntryDeleteHandlerImpl\n    implements EntryAfterDeleteEventHandler.Interface\n{\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledEntryAction: CancelScheduledActionUseCase.Interface\n    ) {}\n\n    async handle(event: EntryAfterDeleteEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const schedules = await this.listSchedules(model.modelId, entry.entryId);\n        for (const action of schedules) {\n            const cancelRes = await this.cancelScheduledEntryAction.execute(action.id);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // The entry was deleted successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n\n    private async listSchedules(modelId: string, entryId: string) {\n        const actionsResult = await this.listScheduledActions.execute({\n            limit: 10000,\n            where: {\n                namespace: `Cms/Entry/${modelId}`,\n                targetId_startsWith: `${entryId}#`\n            }\n        });\n\n        return actionsResult.value.items;\n    }\n}\n\nexport const CancelScheduledActionOnEntryDeleteEventHandler =\n    EntryAfterDeleteEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnEntryDeleteHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase]\n    });\n"],"mappings":"AAAA,SAASA,4BAA4B,QAAQ,mEAAmE;AAChH,SAASC,2BAA2B,EAAEC,4BAA4B,QAAQ,uBAAuB;;AAEjG;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,6CAA6C,CAEnD;EACIC,WAAWA,CACCC,oBAA2D,EAC3DC,0BAAkE,EAC5E;IAAA,KAFUD,oBAA2D,GAA3DA,oBAA2D;IAAA,KAC3DC,0BAAkE,GAAlEA,0BAAkE;EAC3E;EAEH,MAAMC,MAAMA,CAACC,KAAyC,EAAiB;IACnE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,OAAO;;IAEtC;IACA,IAAID,KAAK,CAACE,SAAS,EAAE;MACjB;IACJ;IAEA,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACC,aAAa,CAACJ,KAAK,CAACK,OAAO,EAAEN,KAAK,CAACO,OAAO,CAAC;IACxE,KAAK,MAAMC,MAAM,IAAIJ,SAAS,EAAE;MAC5B,MAAMK,SAAS,GAAG,MAAM,IAAI,CAACZ,0BAA0B,CAACa,OAAO,CAACF,MAAM,CAACG,EAAE,CAAC;MAC1E,IAAIF,SAAS,CAACG,MAAM,CAAC,CAAC,EAAE;QACpB;QACA;MAAA;IAER;EACJ;EAEA,MAAcP,aAAaA,CAACC,OAAe,EAAEC,OAAe,EAAE;IAC1D,MAAMM,aAAa,GAAG,MAAM,IAAI,CAACjB,oBAAoB,CAACc,OAAO,CAAC;MAC1DI,KAAK,EAAE,KAAK;MACZC,KAAK,EAAE;QACHC,SAAS,EAAE,aAAaV,OAAO,EAAE;QACjCW,mBAAmB,EAAE,GAAGV,OAAO;MACnC;IACJ,CAAC,CAAC;IAEF,OAAOM,aAAa,CAACK,KAAK,CAACC,KAAK;EACpC;AACJ;AAEA,OAAO,MAAMC,8CAA8C,GACvD7B,4BAA4B,CAAC8B,oBAAoB,CAAC;EAC9CC,cAAc,EAAE5B,6CAA6C;EAC7D6B,YAAY,EAAE,CAAC/B,2BAA2B,EAAEC,4BAA4B;AAC5E,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["EntryAfterDeleteEventHandler","CancelScheduledActionUseCase","ListScheduledActionsUseCase","createNamespace","CancelScheduledActionOnEntryDeleteHandlerImpl","constructor","listScheduledActions","cancelScheduledAction","handle","event","entry","model","payload","isPrivate","schedules","listSchedules","modelId","entryId","action","cancelRes","execute","isFail","actionsResult","limit","where","namespace","targetId_startsWith","value","items","CancelScheduledActionOnEntryDeleteEventHandler","createImplementation","implementation","dependencies"],"sources":["CancelScheduledActionOnEntryDeleteEventHandler.ts"],"sourcesContent":["import { EntryAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events\";\nimport {\n    CancelScheduledActionUseCase,\n    ListScheduledActionsUseCase\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { createNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Cancels scheduled actions when an entry is deleted\n *\n * When a user deletes an entry, any scheduled publish/unpublish\n * actions for all of its revisions should be canceled since the entry\n * no longer exists.\n */\nclass CancelScheduledActionOnEntryDeleteHandlerImpl\n    implements EntryAfterDeleteEventHandler.Interface\n{\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledAction: CancelScheduledActionUseCase.Interface\n    ) {}\n\n    async handle(event: EntryAfterDeleteEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const schedules = await this.listSchedules(model.modelId, entry.entryId);\n        for (const action of schedules) {\n            const cancelRes = await this.cancelScheduledAction.execute(action);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // The entry was deleted successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n\n    private async listSchedules(modelId: string, entryId: string) {\n        const actionsResult = await this.listScheduledActions.execute({\n            limit: 10000,\n            where: {\n                namespace: createNamespace({ modelId }),\n                targetId_startsWith: `${entryId}#`\n            }\n        });\n\n        return actionsResult.value.items;\n    }\n}\n\nexport const CancelScheduledActionOnEntryDeleteEventHandler =\n    EntryAfterDeleteEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnEntryDeleteHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase]\n    });\n"],"mappings":"AAAA,SAASA,4BAA4B,QAAQ,mEAAmE;AAChH,SACIC,4BAA4B,EAC5BC,2BAA2B,QACxB,gDAAgD;AACvD,SAASC,eAAe;;AAExB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,6CAA6C,CAEnD;EACIC,WAAWA,CACCC,oBAA2D,EAC3DC,qBAA6D,EACvE;IAAA,KAFUD,oBAA2D,GAA3DA,oBAA2D;IAAA,KAC3DC,qBAA6D,GAA7DA,qBAA6D;EACtE;EAEH,MAAMC,MAAMA,CAACC,KAAyC,EAAiB;IACnE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,OAAO;;IAEtC;IACA,IAAID,KAAK,CAACE,SAAS,EAAE;MACjB;IACJ;IAEA,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACC,aAAa,CAACJ,KAAK,CAACK,OAAO,EAAEN,KAAK,CAACO,OAAO,CAAC;IACxE,KAAK,MAAMC,MAAM,IAAIJ,SAAS,EAAE;MAC5B,MAAMK,SAAS,GAAG,MAAM,IAAI,CAACZ,qBAAqB,CAACa,OAAO,CAACF,MAAM,CAAC;MAClE,IAAIC,SAAS,CAACE,MAAM,CAAC,CAAC,EAAE;QACpB;QACA;MAAA;IAER;EACJ;EAEA,MAAcN,aAAaA,CAACC,OAAe,EAAEC,OAAe,EAAE;IAC1D,MAAMK,aAAa,GAAG,MAAM,IAAI,CAAChB,oBAAoB,CAACc,OAAO,CAAC;MAC1DG,KAAK,EAAE,KAAK;MACZC,KAAK,EAAE;QACHC,SAAS,EAAEtB,eAAe,CAAC;UAAEa;QAAQ,CAAC,CAAC;QACvCU,mBAAmB,EAAE,GAAGT,OAAO;MACnC;IACJ,CAAC,CAAC;IAEF,OAAOK,aAAa,CAACK,KAAK,CAACC,KAAK;EACpC;AACJ;AAEA,OAAO,MAAMC,8CAA8C,GACvD7B,4BAA4B,CAAC8B,oBAAoB,CAAC;EAC9CC,cAAc,EAAE3B,6CAA6C;EAC7D4B,YAAY,EAAE,CAAC9B,2BAA2B,EAAED,4BAA4B;AAC5E,CAAC,CAAC","ignoreList":[]}

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnPublishEventHandler.d.ts

@@ -1,5 +1,5 @@
 import { EntryAfterPublishEventHandler } from "@webiny/api-headless-cms/features/contentEntry/PublishEntry/events";
-import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler";
+import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
 /**
  * Cancels scheduled "publish" when an entry is manually published
  *
@@ -9,8 +9,8 @@ import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webi
  */
 declare class CancelScheduledActionOnPublishEventHandlerImpl implements EntryAfterPublishEventHandler.Interface {
     private listScheduledActions;
-    private cancelScheduledEntryAction;
-    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledEntryAction: CancelScheduledActionUseCase.Interface);
+    private cancelScheduledAction;
+    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledAction: CancelScheduledActionUseCase.Interface);
     handle(event: EntryAfterPublishEventHandler.Event): Promise<void>;
 }
 export declare const CancelScheduledActionOnPublishEventHandler: typeof CancelScheduledActionOnPublishEventHandlerImpl & {

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnPublishEventHandler.js

@@ -1,5 +1,6 @@
 import { EntryAfterPublishEventHandler } from "@webiny/api-headless-cms/features/contentEntry/PublishEntry/events";
-import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler";
+import { CancelScheduledActionUseCase, ListScheduledActionsUseCase, ScheduledActionTypePublish } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { createNamespace } from "../../utils/namespace.js";
 
 /**
  * Cancels scheduled "publish" when an entry is manually published
@@ -9,9 +10,9 @@ import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webi
  * takes precedence.
  */
 class CancelScheduledActionOnPublishEventHandlerImpl {
-  constructor(listScheduledActions, cancelScheduledEntryAction) {
+  constructor(listScheduledActions, cancelScheduledAction) {
     this.listScheduledActions = listScheduledActions;
-    this.cancelScheduledEntryAction = cancelScheduledEntryAction;
+    this.cancelScheduledAction = cancelScheduledAction;
   }
   async handle(event) {
     const {
@@ -25,14 +26,14 @@ class CancelScheduledActionOnPublishEventHandlerImpl {
     }
     const actionsResult = await this.listScheduledActions.execute({
       where: {
-        namespace: `Cms/Entry/${model.modelId}`,
-        actionType: "Publish",
+        namespace: createNamespace(model),
+        actionType: ScheduledActionTypePublish,
         targetId: entry.id
       }
     });
     const actions = actionsResult.value.items;
     for (const action of actions) {
-      const cancelRes = await this.cancelScheduledEntryAction.execute(action.id);
+      const cancelRes = await this.cancelScheduledAction.execute(action);
       if (cancelRes.isFail()) {
         // Silently ignore errors - this is non-critical cleanup.
         // Even if a schedule runs on an already published action, nothing bad will happen.

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnPublishEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["EntryAfterPublishEventHandler","CancelScheduledActionUseCase","ListScheduledActionsUseCase","CancelScheduledActionOnPublishEventHandlerImpl","constructor","listScheduledActions","cancelScheduledEntryAction","handle","event","entry","model","payload","isPrivate","actionsResult","execute","where","namespace","modelId","actionType","targetId","id","actions","value","items","action","cancelRes","isFail","CancelScheduledActionOnPublishEventHandler","createImplementation","implementation","dependencies"],"sources":["CancelScheduledActionOnPublishEventHandler.ts"],"sourcesContent":["import { EntryAfterPublishEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/PublishEntry/events\";\nimport { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from \"@webiny/api-scheduler\";\n\n/**\n * Cancels scheduled \"publish\" when an entry is manually published\n *\n * When a user manually publishes an entry, any scheduled publish\n * action for that entry should be canceled since the manual action\n * takes precedence.\n */\nclass CancelScheduledActionOnPublishEventHandlerImpl\n    implements EntryAfterPublishEventHandler.Interface\n{\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledEntryAction: CancelScheduledActionUseCase.Interface\n    ) {}\n\n    async handle(event: EntryAfterPublishEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const actionsResult = await this.listScheduledActions.execute({\n            where: {\n                namespace: `Cms/Entry/${model.modelId}`,\n                actionType: \"Publish\",\n                targetId: entry.id\n            }\n        });\n\n        const actions = actionsResult.value.items;\n\n        for (const action of actions) {\n            const cancelRes = await this.cancelScheduledEntryAction.execute(action.id);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // Even if a schedule runs on an already published action, nothing bad will happen.\n            }\n        }\n    }\n}\n\nexport const CancelScheduledActionOnPublishEventHandler =\n    EntryAfterPublishEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnPublishEventHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase]\n    });\n"],"mappings":"AAAA,SAASA,6BAA6B,QAAQ,oEAAoE;AAClH,SAASC,4BAA4B,EAAEC,2BAA2B,QAAQ,uBAAuB;;AAEjG;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,8CAA8C,CAEpD;EACIC,WAAWA,CACCC,oBAA2D,EAC3DC,0BAAkE,EAC5E;IAAA,KAFUD,oBAA2D,GAA3DA,oBAA2D;IAAA,KAC3DC,0BAAkE,GAAlEA,0BAAkE;EAC3E;EAEH,MAAMC,MAAMA,CAACC,KAA0C,EAAiB;IACpE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,OAAO;;IAEtC;IACA,IAAID,KAAK,CAACE,SAAS,EAAE;MACjB;IACJ;IAEA,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACR,oBAAoB,CAACS,OAAO,CAAC;MAC1DC,KAAK,EAAE;QACHC,SAAS,EAAE,aAAaN,KAAK,CAACO,OAAO,EAAE;QACvCC,UAAU,EAAE,SAAS;QACrBC,QAAQ,EAAEV,KAAK,CAACW;MACpB;IACJ,CAAC,CAAC;IAEF,MAAMC,OAAO,GAAGR,aAAa,CAACS,KAAK,CAACC,KAAK;IAEzC,KAAK,MAAMC,MAAM,IAAIH,OAAO,EAAE;MAC1B,MAAMI,SAAS,GAAG,MAAM,IAAI,CAACnB,0BAA0B,CAACQ,OAAO,CAACU,MAAM,CAACJ,EAAE,CAAC;MAC1E,IAAIK,SAAS,CAACC,MAAM,CAAC,CAAC,EAAE;QACpB;QACA;MAAA;IAER;EACJ;AACJ;AAEA,OAAO,MAAMC,0CAA0C,GACnD3B,6BAA6B,CAAC4B,oBAAoB,CAAC;EAC/CC,cAAc,EAAE1B,8CAA8C;EAC9D2B,YAAY,EAAE,CAAC5B,2BAA2B,EAAED,4BAA4B;AAC5E,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["EntryAfterPublishEventHandler","CancelScheduledActionUseCase","ListScheduledActionsUseCase","ScheduledActionTypePublish","createNamespace","CancelScheduledActionOnPublishEventHandlerImpl","constructor","listScheduledActions","cancelScheduledAction","handle","event","entry","model","payload","isPrivate","actionsResult","execute","where","namespace","actionType","targetId","id","actions","value","items","action","cancelRes","isFail","CancelScheduledActionOnPublishEventHandler","createImplementation","implementation","dependencies"],"sources":["CancelScheduledActionOnPublishEventHandler.ts"],"sourcesContent":["import { EntryAfterPublishEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/PublishEntry/events\";\nimport {\n    CancelScheduledActionUseCase,\n    ListScheduledActionsUseCase,\n    ScheduledActionTypePublish\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { createNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Cancels scheduled \"publish\" when an entry is manually published\n *\n * When a user manually publishes an entry, any scheduled publish\n * action for that entry should be canceled since the manual action\n * takes precedence.\n */\nclass CancelScheduledActionOnPublishEventHandlerImpl\n    implements EntryAfterPublishEventHandler.Interface\n{\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledAction: CancelScheduledActionUseCase.Interface\n    ) {}\n\n    async handle(event: EntryAfterPublishEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const actionsResult = await this.listScheduledActions.execute({\n            where: {\n                namespace: createNamespace(model),\n                actionType: ScheduledActionTypePublish,\n                targetId: entry.id\n            }\n        });\n\n        const actions = actionsResult.value.items;\n\n        for (const action of actions) {\n            const cancelRes = await this.cancelScheduledAction.execute(action);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // Even if a schedule runs on an already published action, nothing bad will happen.\n            }\n        }\n    }\n}\n\nexport const CancelScheduledActionOnPublishEventHandler =\n    EntryAfterPublishEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnPublishEventHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase]\n    });\n"],"mappings":"AAAA,SAASA,6BAA6B,QAAQ,oEAAoE;AAClH,SACIC,4BAA4B,EAC5BC,2BAA2B,EAC3BC,0BAA0B,QACvB,gDAAgD;AACvD,SAASC,eAAe;;AAExB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,8CAA8C,CAEpD;EACIC,WAAWA,CACCC,oBAA2D,EAC3DC,qBAA6D,EACvE;IAAA,KAFUD,oBAA2D,GAA3DA,oBAA2D;IAAA,KAC3DC,qBAA6D,GAA7DA,qBAA6D;EACtE;EAEH,MAAMC,MAAMA,CAACC,KAA0C,EAAiB;IACpE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,OAAO;;IAEtC;IACA,IAAID,KAAK,CAACE,SAAS,EAAE;MACjB;IACJ;IAEA,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACR,oBAAoB,CAACS,OAAO,CAAC;MAC1DC,KAAK,EAAE;QACHC,SAAS,EAAEd,eAAe,CAACQ,KAAK,CAAC;QACjCO,UAAU,EAAEhB,0BAA0B;QACtCiB,QAAQ,EAAET,KAAK,CAACU;MACpB;IACJ,CAAC,CAAC;IAEF,MAAMC,OAAO,GAAGP,aAAa,CAACQ,KAAK,CAACC,KAAK;IAEzC,KAAK,MAAMC,MAAM,IAAIH,OAAO,EAAE;MAC1B,MAAMI,SAAS,GAAG,MAAM,IAAI,CAAClB,qBAAqB,CAACQ,OAAO,CAACS,MAAM,CAAC;MAClE,IAAIC,SAAS,CAACC,MAAM,CAAC,CAAC,EAAE;QACpB;QACA;MAAA;IAER;EACJ;AACJ;AAEA,OAAO,MAAMC,0CAA0C,GACnD5B,6BAA6B,CAAC6B,oBAAoB,CAAC;EAC/CC,cAAc,EAAEzB,8CAA8C;EAC9D0B,YAAY,EAAE,CAAC7B,2BAA2B,EAAED,4BAA4B;AAC5E,CAAC,CAAC","ignoreList":[]}

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.d.ts

@@ -1,5 +1,5 @@
 import { EntryAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events";
-import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler";
+import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
 /**
  * Cancels scheduled actions when an entry revision is deleted
  *
@@ -9,8 +9,8 @@ import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webi
  */
 declare class CancelScheduledActionOnDeleteHandlerImpl implements EntryAfterDeleteEventHandler.Interface {
     private listScheduledActions;
-    private cancelScheduledEntryAction;
-    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledEntryAction: CancelScheduledActionUseCase.Interface);
+    private cancelScheduledAction;
+    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledAction: CancelScheduledActionUseCase.Interface);
     handle(event: EntryAfterDeleteEventHandler.Event): Promise<void>;
 }
 export declare const CancelScheduledActionOnRevisionDeleteEventHandler: typeof CancelScheduledActionOnDeleteHandlerImpl & {

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.js

@@ -1,5 +1,6 @@
 import { EntryAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events";
-import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler";
+import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { createNamespace } from "../../utils/namespace.js";
 
 /**
  * Cancels scheduled actions when an entry revision is deleted
@@ -9,9 +10,9 @@ import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webi
  * no longer exists.
  */
 class CancelScheduledActionOnDeleteHandlerImpl {
-  constructor(listScheduledActions, cancelScheduledEntryAction) {
+  constructor(listScheduledActions, cancelScheduledAction) {
     this.listScheduledActions = listScheduledActions;
-    this.cancelScheduledEntryAction = cancelScheduledEntryAction;
+    this.cancelScheduledAction = cancelScheduledAction;
   }
   async handle(event) {
     const {
@@ -25,13 +26,13 @@ class CancelScheduledActionOnDeleteHandlerImpl {
     }
     const actionsResult = await this.listScheduledActions.execute({
       where: {
-        namespace: `Cms/Entry/${model.modelId}`,
+        namespace: createNamespace(model),
         targetId: entry.id
       }
     });
     const actions = actionsResult.value.items;
     for (const action of actions) {
-      const cancelRes = await this.cancelScheduledEntryAction.execute(action.id);
+      const cancelRes = await this.cancelScheduledAction.execute(action);
       if (cancelRes.isFail()) {
         // Silently ignore errors - this is non-critical cleanup.
         // Entry was deleted successfully, cancelling scheduled actions is best-effort.

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["EntryAfterDeleteEventHandler","CancelScheduledActionUseCase","ListScheduledActionsUseCase","CancelScheduledActionOnDeleteHandlerImpl","constructor","listScheduledActions","cancelScheduledEntryAction","handle","event","entry","model","payload","isPrivate","actionsResult","execute","where","namespace","modelId","targetId","id","actions","value","items","action","cancelRes","isFail","CancelScheduledActionOnRevisionDeleteEventHandler","createImplementation","implementation","dependencies"],"sources":["CancelScheduledActionOnRevisionDeleteEventHandler.ts"],"sourcesContent":["import { EntryAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events\";\nimport { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from \"@webiny/api-scheduler\";\n\n/**\n * Cancels scheduled actions when an entry revision is deleted\n *\n * When a user deletes an entry revision, any scheduled publish/unpublish\n * action for that revision should be canceled since the revision\n * no longer exists.\n */\nclass CancelScheduledActionOnDeleteHandlerImpl implements EntryAfterDeleteEventHandler.Interface {\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledEntryAction: CancelScheduledActionUseCase.Interface\n    ) {}\n\n    async handle(event: EntryAfterDeleteEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const actionsResult = await this.listScheduledActions.execute({\n            where: {\n                namespace: `Cms/Entry/${model.modelId}`,\n                targetId: entry.id\n            }\n        });\n\n        const actions = actionsResult.value.items;\n\n        for (const action of actions) {\n            const cancelRes = await this.cancelScheduledEntryAction.execute(action.id);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // Entry was deleted successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n}\n\nexport const CancelScheduledActionOnRevisionDeleteEventHandler =\n    EntryAfterDeleteEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnDeleteHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase]\n    });\n"],"mappings":"AAAA,SAASA,4BAA4B,QAAQ,mEAAmE;AAChH,SAASC,4BAA4B,EAAEC,2BAA2B,QAAQ,uBAAuB;;AAEjG;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,wCAAwC,CAAmD;EAC7FC,WAAWA,CACCC,oBAA2D,EAC3DC,0BAAkE,EAC5E;IAAA,KAFUD,oBAA2D,GAA3DA,oBAA2D;IAAA,KAC3DC,0BAAkE,GAAlEA,0BAAkE;EAC3E;EAEH,MAAMC,MAAMA,CAACC,KAAyC,EAAiB;IACnE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,OAAO;;IAEtC;IACA,IAAID,KAAK,CAACE,SAAS,EAAE;MACjB;IACJ;IAEA,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACR,oBAAoB,CAACS,OAAO,CAAC;MAC1DC,KAAK,EAAE;QACHC,SAAS,EAAE,aAAaN,KAAK,CAACO,OAAO,EAAE;QACvCC,QAAQ,EAAET,KAAK,CAACU;MACpB;IACJ,CAAC,CAAC;IAEF,MAAMC,OAAO,GAAGP,aAAa,CAACQ,KAAK,CAACC,KAAK;IAEzC,KAAK,MAAMC,MAAM,IAAIH,OAAO,EAAE;MAC1B,MAAMI,SAAS,GAAG,MAAM,IAAI,CAAClB,0BAA0B,CAACQ,OAAO,CAACS,MAAM,CAACJ,EAAE,CAAC;MAC1E,IAAIK,SAAS,CAACC,MAAM,CAAC,CAAC,EAAE;QACpB;QACA;MAAA;IAER;EACJ;AACJ;AAEA,OAAO,MAAMC,iDAAiD,GAC1D1B,4BAA4B,CAAC2B,oBAAoB,CAAC;EAC9CC,cAAc,EAAEzB,wCAAwC;EACxD0B,YAAY,EAAE,CAAC3B,2BAA2B,EAAED,4BAA4B;AAC5E,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["EntryAfterDeleteEventHandler","CancelScheduledActionUseCase","ListScheduledActionsUseCase","createNamespace","CancelScheduledActionOnDeleteHandlerImpl","constructor","listScheduledActions","cancelScheduledAction","handle","event","entry","model","payload","isPrivate","actionsResult","execute","where","namespace","targetId","id","actions","value","items","action","cancelRes","isFail","CancelScheduledActionOnRevisionDeleteEventHandler","createImplementation","implementation","dependencies"],"sources":["CancelScheduledActionOnRevisionDeleteEventHandler.ts"],"sourcesContent":["import { EntryAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events\";\nimport {\n    CancelScheduledActionUseCase,\n    ListScheduledActionsUseCase\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { createNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Cancels scheduled actions when an entry revision is deleted\n *\n * When a user deletes an entry revision, any scheduled publish/unpublish\n * action for that revision should be canceled since the revision\n * no longer exists.\n */\nclass CancelScheduledActionOnDeleteHandlerImpl implements EntryAfterDeleteEventHandler.Interface {\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledAction: CancelScheduledActionUseCase.Interface\n    ) {}\n\n    async handle(event: EntryAfterDeleteEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const actionsResult = await this.listScheduledActions.execute({\n            where: {\n                namespace: createNamespace(model),\n                targetId: entry.id\n            }\n        });\n\n        const actions = actionsResult.value.items;\n\n        for (const action of actions) {\n            const cancelRes = await this.cancelScheduledAction.execute(action);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // Entry was deleted successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n}\n\nexport const CancelScheduledActionOnRevisionDeleteEventHandler =\n    EntryAfterDeleteEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnDeleteHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase]\n    });\n"],"mappings":"AAAA,SAASA,4BAA4B,QAAQ,mEAAmE;AAChH,SACIC,4BAA4B,EAC5BC,2BAA2B,QACxB,gDAAgD;AACvD,SAASC,eAAe;;AAExB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,wCAAwC,CAAmD;EAC7FC,WAAWA,CACCC,oBAA2D,EAC3DC,qBAA6D,EACvE;IAAA,KAFUD,oBAA2D,GAA3DA,oBAA2D;IAAA,KAC3DC,qBAA6D,GAA7DA,qBAA6D;EACtE;EAEH,MAAMC,MAAMA,CAACC,KAAyC,EAAiB;IACnE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,OAAO;;IAEtC;IACA,IAAID,KAAK,CAACE,SAAS,EAAE;MACjB;IACJ;IAEA,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACR,oBAAoB,CAACS,OAAO,CAAC;MAC1DC,KAAK,EAAE;QACHC,SAAS,EAAEd,eAAe,CAACQ,KAAK,CAAC;QACjCO,QAAQ,EAAER,KAAK,CAACS;MACpB;IACJ,CAAC,CAAC;IAEF,MAAMC,OAAO,GAAGN,aAAa,CAACO,KAAK,CAACC,KAAK;IAEzC,KAAK,MAAMC,MAAM,IAAIH,OAAO,EAAE;MAC1B,MAAMI,SAAS,GAAG,MAAM,IAAI,CAACjB,qBAAqB,CAACQ,OAAO,CAACQ,MAAM,CAAC;MAClE,IAAIC,SAAS,CAACC,MAAM,CAAC,CAAC,EAAE;QACpB;QACA;MAAA;IAER;EACJ;AACJ;AAEA,OAAO,MAAMC,iDAAiD,GAC1D1B,4BAA4B,CAAC2B,oBAAoB,CAAC;EAC9CC,cAAc,EAAExB,wCAAwC;EACxDyB,YAAY,EAAE,CAAC3B,2BAA2B,EAAED,4BAA4B;AAC5E,CAAC,CAAC","ignoreList":[]}

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnUnpublishEventHandler.d.ts

@@ -1,5 +1,5 @@
 import { EntryAfterUnpublishEventHandler } from "@webiny/api-headless-cms/features/contentEntry/UnpublishEntry/events";
-import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler";
+import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
 /**
  * Cancels scheduled action when an entry is manually unpublished
  *
@@ -9,8 +9,8 @@ import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webi
  */
 declare class CancelScheduledActionOnUnpublishHandlerImpl implements EntryAfterUnpublishEventHandler.Interface {
     private listScheduledActions;
-    private cancelScheduledEntryAction;
-    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledEntryAction: CancelScheduledActionUseCase.Interface);
+    private cancelScheduledAction;
+    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledAction: CancelScheduledActionUseCase.Interface);
     handle(event: EntryAfterUnpublishEventHandler.Event): Promise<void>;
 }
 export declare const CancelScheduledActionOnUnpublishEventHandler: typeof CancelScheduledActionOnUnpublishHandlerImpl & {

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnUnpublishEventHandler.js

@@ -1,5 +1,6 @@
 import { EntryAfterUnpublishEventHandler } from "@webiny/api-headless-cms/features/contentEntry/UnpublishEntry/events";
-import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler";
+import { CancelScheduledActionUseCase, ListScheduledActionsUseCase, ScheduledActionTypeUnpublish } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { createNamespace } from "../../utils/namespace.js";
 
 /**
  * Cancels scheduled action when an entry is manually unpublished
@@ -9,9 +10,9 @@ import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webi
  * takes precedence.
  */
 class CancelScheduledActionOnUnpublishHandlerImpl {
-  constructor(listScheduledActions, cancelScheduledEntryAction) {
+  constructor(listScheduledActions, cancelScheduledAction) {
     this.listScheduledActions = listScheduledActions;
-    this.cancelScheduledEntryAction = cancelScheduledEntryAction;
+    this.cancelScheduledAction = cancelScheduledAction;
   }
   async handle(event) {
     const {
@@ -25,14 +26,14 @@ class CancelScheduledActionOnUnpublishHandlerImpl {
     }
     const actionsResult = await this.listScheduledActions.execute({
       where: {
-        namespace: `Cms/Entry/${model.modelId}`,
-        actionType: "Unpublish",
+        namespace: createNamespace(model),
+        actionType: ScheduledActionTypeUnpublish,
         targetId: entry.id
       }
     });
     const actions = actionsResult.value.items;
     for (const action of actions) {
-      const cancelRes = await this.cancelScheduledEntryAction.execute(action.id);
+      const cancelRes = await this.cancelScheduledAction.execute(action);
       if (cancelRes.isFail()) {
         // Silently ignore errors - this is non-critical cleanup.
         // Entry was unpublished successfully, cancelling scheduled actions is best-effort.

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnUnpublishEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["EntryAfterUnpublishEventHandler","CancelScheduledActionUseCase","ListScheduledActionsUseCase","CancelScheduledActionOnUnpublishHandlerImpl","constructor","listScheduledActions","cancelScheduledEntryAction","handle","event","entry","model","payload","isPrivate","actionsResult","execute","where","namespace","modelId","actionType","targetId","id","actions","value","items","action","cancelRes","isFail","CancelScheduledActionOnUnpublishEventHandler","createImplementation","implementation","dependencies"],"sources":["CancelScheduledActionOnUnpublishEventHandler.ts"],"sourcesContent":["import { EntryAfterUnpublishEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/UnpublishEntry/events\";\nimport { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from \"@webiny/api-scheduler\";\n\n/**\n * Cancels scheduled action when an entry is manually unpublished\n *\n * When a user manually unpublishes an entry revision, any scheduled unpublish\n * action for that revision should be canceled since the manual action\n * takes precedence.\n */\nclass CancelScheduledActionOnUnpublishHandlerImpl\n    implements EntryAfterUnpublishEventHandler.Interface\n{\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledEntryAction: CancelScheduledActionUseCase.Interface\n    ) {}\n\n    async handle(event: EntryAfterUnpublishEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const actionsResult = await this.listScheduledActions.execute({\n            where: {\n                namespace: `Cms/Entry/${model.modelId}`,\n                actionType: \"Unpublish\",\n                targetId: entry.id\n            }\n        });\n\n        const actions = actionsResult.value.items;\n\n        for (const action of actions) {\n            const cancelRes = await this.cancelScheduledEntryAction.execute(action.id);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // Entry was unpublished successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n}\n\nexport const CancelScheduledActionOnUnpublishEventHandler =\n    EntryAfterUnpublishEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnUnpublishHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase]\n    });\n"],"mappings":"AAAA,SAASA,+BAA+B,QAAQ,sEAAsE;AACtH,SAASC,4BAA4B,EAAEC,2BAA2B,QAAQ,uBAAuB;;AAEjG;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,2CAA2C,CAEjD;EACIC,WAAWA,CACCC,oBAA2D,EAC3DC,0BAAkE,EAC5E;IAAA,KAFUD,oBAA2D,GAA3DA,oBAA2D;IAAA,KAC3DC,0BAAkE,GAAlEA,0BAAkE;EAC3E;EAEH,MAAMC,MAAMA,CAACC,KAA4C,EAAiB;IACtE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,OAAO;;IAEtC;IACA,IAAID,KAAK,CAACE,SAAS,EAAE;MACjB;IACJ;IAEA,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACR,oBAAoB,CAACS,OAAO,CAAC;MAC1DC,KAAK,EAAE;QACHC,SAAS,EAAE,aAAaN,KAAK,CAACO,OAAO,EAAE;QACvCC,UAAU,EAAE,WAAW;QACvBC,QAAQ,EAAEV,KAAK,CAACW;MACpB;IACJ,CAAC,CAAC;IAEF,MAAMC,OAAO,GAAGR,aAAa,CAACS,KAAK,CAACC,KAAK;IAEzC,KAAK,MAAMC,MAAM,IAAIH,OAAO,EAAE;MAC1B,MAAMI,SAAS,GAAG,MAAM,IAAI,CAACnB,0BAA0B,CAACQ,OAAO,CAACU,MAAM,CAACJ,EAAE,CAAC;MAC1E,IAAIK,SAAS,CAACC,MAAM,CAAC,CAAC,EAAE;QACpB;QACA;MAAA;IAER;EACJ;AACJ;AAEA,OAAO,MAAMC,4CAA4C,GACrD3B,+BAA+B,CAAC4B,oBAAoB,CAAC;EACjDC,cAAc,EAAE1B,2CAA2C;EAC3D2B,YAAY,EAAE,CAAC5B,2BAA2B,EAAED,4BAA4B;AAC5E,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["EntryAfterUnpublishEventHandler","CancelScheduledActionUseCase","ListScheduledActionsUseCase","ScheduledActionTypeUnpublish","createNamespace","CancelScheduledActionOnUnpublishHandlerImpl","constructor","listScheduledActions","cancelScheduledAction","handle","event","entry","model","payload","isPrivate","actionsResult","execute","where","namespace","actionType","targetId","id","actions","value","items","action","cancelRes","isFail","CancelScheduledActionOnUnpublishEventHandler","createImplementation","implementation","dependencies"],"sources":["CancelScheduledActionOnUnpublishEventHandler.ts"],"sourcesContent":["import { EntryAfterUnpublishEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/UnpublishEntry/events\";\nimport {\n    CancelScheduledActionUseCase,\n    ListScheduledActionsUseCase,\n    ScheduledActionTypeUnpublish\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { createNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Cancels scheduled action when an entry is manually unpublished\n *\n * When a user manually unpublishes an entry revision, any scheduled unpublish\n * action for that revision should be canceled since the manual action\n * takes precedence.\n */\nclass CancelScheduledActionOnUnpublishHandlerImpl\n    implements EntryAfterUnpublishEventHandler.Interface\n{\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledAction: CancelScheduledActionUseCase.Interface\n    ) {}\n\n    async handle(event: EntryAfterUnpublishEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const actionsResult = await this.listScheduledActions.execute({\n            where: {\n                namespace: createNamespace(model),\n                actionType: ScheduledActionTypeUnpublish,\n                targetId: entry.id\n            }\n        });\n\n        const actions = actionsResult.value.items;\n\n        for (const action of actions) {\n            const cancelRes = await this.cancelScheduledAction.execute(action);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // Entry was unpublished successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n}\n\nexport const CancelScheduledActionOnUnpublishEventHandler =\n    EntryAfterUnpublishEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnUnpublishHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase]\n    });\n"],"mappings":"AAAA,SAASA,+BAA+B,QAAQ,sEAAsE;AACtH,SACIC,4BAA4B,EAC5BC,2BAA2B,EAC3BC,4BAA4B,QACzB,gDAAgD;AACvD,SAASC,eAAe;;AAExB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,2CAA2C,CAEjD;EACIC,WAAWA,CACCC,oBAA2D,EAC3DC,qBAA6D,EACvE;IAAA,KAFUD,oBAA2D,GAA3DA,oBAA2D;IAAA,KAC3DC,qBAA6D,GAA7DA,qBAA6D;EACtE;EAEH,MAAMC,MAAMA,CAACC,KAA4C,EAAiB;IACtE,MAAM;MAAEC,KAAK;MAAEC;IAAM,CAAC,GAAGF,KAAK,CAACG,OAAO;;IAEtC;IACA,IAAID,KAAK,CAACE,SAAS,EAAE;MACjB;IACJ;IAEA,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACR,oBAAoB,CAACS,OAAO,CAAC;MAC1DC,KAAK,EAAE;QACHC,SAAS,EAAEd,eAAe,CAACQ,KAAK,CAAC;QACjCO,UAAU,EAAEhB,4BAA4B;QACxCiB,QAAQ,EAAET,KAAK,CAACU;MACpB;IACJ,CAAC,CAAC;IAEF,MAAMC,OAAO,GAAGP,aAAa,CAACQ,KAAK,CAACC,KAAK;IAEzC,KAAK,MAAMC,MAAM,IAAIH,OAAO,EAAE;MAC1B,MAAMI,SAAS,GAAG,MAAM,IAAI,CAAClB,qBAAqB,CAACQ,OAAO,CAACS,MAAM,CAAC;MAClE,IAAIC,SAAS,CAACC,MAAM,CAAC,CAAC,EAAE;QACpB;QACA;MAAA;IAER;EACJ;AACJ;AAEA,OAAO,MAAMC,4CAA4C,GACrD5B,+BAA+B,CAAC6B,oBAAoB,CAAC;EACjDC,cAAc,EAAEzB,2CAA2C;EAC3D0B,YAAY,EAAE,CAAC7B,2BAA2B,EAAED,4BAA4B;AAC5E,CAAC,CAAC","ignoreList":[]}

package/features/NamespaceHandler/NamespaceHandler.d.ts

@@ -0,0 +1,15 @@
+import { NamespaceHandler as NamespaceHandlerAbstraction } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById/index.js";
+import type { GenericRecord } from "@webiny/api/types.js";
+declare class NamespaceHandlerImpl implements NamespaceHandlerAbstraction.Interface<GenericRecord> {
+    private getModelUseCase;
+    private getEntryByIdUseCase;
+    constructor(getModelUseCase: GetModelUseCase.Interface, getEntryByIdUseCase: GetEntryByIdUseCase.Interface);
+    canHandle(namespace: string): boolean;
+    execute(params: NamespaceHandlerAbstraction.Params): NamespaceHandlerAbstraction.Response<GenericRecord>;
+}
+export declare const NamespaceHandler: typeof NamespaceHandlerImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-scheduler/features/NamespaceHandler/abstractions").INamespaceHandler<GenericRecord>>;
+};
+export {};

package/features/NamespaceHandler/NamespaceHandler.js

@@ -0,0 +1,50 @@
+import { NamespaceHandler as NamespaceHandlerAbstraction } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { extractModelIdFromNamespace } from "../../utils/namespace.js";
+import { Result } from "@webiny/feature/exports/api.js";
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById/index.js";
+class NamespaceHandlerImpl {
+  constructor(getModelUseCase, getEntryByIdUseCase) {
+    this.getModelUseCase = getModelUseCase;
+    this.getEntryByIdUseCase = getEntryByIdUseCase;
+  }
+  canHandle(namespace) {
+    const modelId = extractModelIdFromNamespace(namespace);
+    return !!modelId;
+  }
+  async execute(params) {
+    /**
+     * We know that modelId is ok because of the canHandle() method, which is always called before execute() and must return true for this handler to be executed.
+     */
+    const modelId = extractModelIdFromNamespace(params.namespace);
+    // Fetch the target model
+    const modelResult = await this.getModelUseCase.execute(modelId);
+    if (modelResult.isFail()) {
+      return Result.fail(modelResult.error);
+    }
+    const model = modelResult.value;
+
+    // Fetch entry to get title
+    const entryResult = await this.getEntryByIdUseCase.execute(model, params.targetId);
+    if (entryResult.isFail()) {
+      return Result.fail(entryResult.error);
+    }
+    const entry = entryResult.value;
+    const title = entry.values[model.titleFieldId] || "Unknown entry title";
+    return Result.ok({
+      namespace: params.namespace,
+      title,
+      modelId,
+      actionType: params.actionType,
+      targetId: params.targetId,
+      scheduleId: params.scheduleId,
+      immediately: params.immediately || false
+    });
+  }
+}
+export const NamespaceHandler = NamespaceHandlerAbstraction.createImplementation({
+  implementation: NamespaceHandlerImpl,
+  dependencies: [GetModelUseCase, GetEntryByIdUseCase]
+});
+
+//# sourceMappingURL=NamespaceHandler.js.map

package/features/NamespaceHandler/NamespaceHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["NamespaceHandler","NamespaceHandlerAbstraction","extractModelIdFromNamespace","Result","GetModelUseCase","GetEntryByIdUseCase","NamespaceHandlerImpl","constructor","getModelUseCase","getEntryByIdUseCase","canHandle","namespace","modelId","execute","params","modelResult","isFail","fail","error","model","value","entryResult","targetId","entry","title","values","titleFieldId","ok","actionType","scheduleId","immediately","createImplementation","implementation","dependencies"],"sources":["NamespaceHandler.ts"],"sourcesContent":["import { NamespaceHandler as NamespaceHandlerAbstraction } from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { extractModelIdFromNamespace } from \"~/utils/namespace.js\";\nimport { Result } from \"@webiny/feature/exports/api.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById/index.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nclass NamespaceHandlerImpl implements NamespaceHandlerAbstraction.Interface<GenericRecord> {\n    public constructor(\n        private getModelUseCase: GetModelUseCase.Interface,\n        private getEntryByIdUseCase: GetEntryByIdUseCase.Interface\n    ) {}\n\n    public canHandle(namespace: string): boolean {\n        const modelId = extractModelIdFromNamespace(namespace);\n\n        return !!modelId;\n    }\n\n    public async execute(\n        params: NamespaceHandlerAbstraction.Params\n    ): NamespaceHandlerAbstraction.Response<GenericRecord> {\n        /**\n         * We know that modelId is ok because of the canHandle() method, which is always called before execute() and must return true for this handler to be executed.\n         */\n        const modelId = extractModelIdFromNamespace(params.namespace)!;\n        // Fetch the target model\n        const modelResult = await this.getModelUseCase.execute(modelId);\n        if (modelResult.isFail()) {\n            return Result.fail(modelResult.error as any);\n        }\n\n        const model = modelResult.value;\n\n        // Fetch entry to get title\n        const entryResult = await this.getEntryByIdUseCase.execute(model, params.targetId);\n        if (entryResult.isFail()) {\n            return Result.fail(entryResult.error as any);\n        }\n\n        const entry = entryResult.value;\n        const title = entry.values[model.titleFieldId] || \"Unknown entry title\";\n\n        return Result.ok({\n            namespace: params.namespace,\n            title,\n            modelId,\n            actionType: params.actionType,\n            targetId: params.targetId,\n            scheduleId: params.scheduleId,\n            immediately: params.immediately || false\n        });\n    }\n}\n\nexport const NamespaceHandler = NamespaceHandlerAbstraction.createImplementation({\n    implementation: NamespaceHandlerImpl,\n    dependencies: [GetModelUseCase, GetEntryByIdUseCase]\n});\n"],"mappings":"AAAA,SAASA,gBAAgB,IAAIC,2BAA2B,QAAQ,gDAAgD;AAChH,SAASC,2BAA2B;AACpC,SAASC,MAAM,QAAQ,gCAAgC;AACvD,SAASC,eAAe,QAAQ,kEAAkE;AAClG,SAASC,mBAAmB,QAAQ,sEAAsE;AAG1G,MAAMC,oBAAoB,CAAiE;EAChFC,WAAWA,CACNC,eAA0C,EAC1CC,mBAAkD,EAC5D;IAAA,KAFUD,eAA0C,GAA1CA,eAA0C;IAAA,KAC1CC,mBAAkD,GAAlDA,mBAAkD;EAC3D;EAEIC,SAASA,CAACC,SAAiB,EAAW;IACzC,MAAMC,OAAO,GAAGV,2BAA2B,CAACS,SAAS,CAAC;IAEtD,OAAO,CAAC,CAACC,OAAO;EACpB;EAEA,MAAaC,OAAOA,CAChBC,MAA0C,EACS;IACnD;AACR;AACA;IACQ,MAAMF,OAAO,GAAGV,2BAA2B,CAACY,MAAM,CAACH,SAAS,CAAE;IAC9D;IACA,MAAMI,WAAW,GAAG,MAAM,IAAI,CAACP,eAAe,CAACK,OAAO,CAACD,OAAO,CAAC;IAC/D,IAAIG,WAAW,CAACC,MAAM,CAAC,CAAC,EAAE;MACtB,OAAOb,MAAM,CAACc,IAAI,CAACF,WAAW,CAACG,KAAY,CAAC;IAChD;IAEA,MAAMC,KAAK,GAAGJ,WAAW,CAACK,KAAK;;IAE/B;IACA,MAAMC,WAAW,GAAG,MAAM,IAAI,CAACZ,mBAAmB,CAACI,OAAO,CAACM,KAAK,EAAEL,MAAM,CAACQ,QAAQ,CAAC;IAClF,IAAID,WAAW,CAACL,MAAM,CAAC,CAAC,EAAE;MACtB,OAAOb,MAAM,CAACc,IAAI,CAACI,WAAW,CAACH,KAAY,CAAC;IAChD;IAEA,MAAMK,KAAK,GAAGF,WAAW,CAACD,KAAK;IAC/B,MAAMI,KAAK,GAAGD,KAAK,CAACE,MAAM,CAACN,KAAK,CAACO,YAAY,CAAC,IAAI,qBAAqB;IAEvE,OAAOvB,MAAM,CAACwB,EAAE,CAAC;MACbhB,SAAS,EAAEG,MAAM,CAACH,SAAS;MAC3Ba,KAAK;MACLZ,OAAO;MACPgB,UAAU,EAAEd,MAAM,CAACc,UAAU;MAC7BN,QAAQ,EAAER,MAAM,CAACQ,QAAQ;MACzBO,UAAU,EAAEf,MAAM,CAACe,UAAU;MAC7BC,WAAW,EAAEhB,MAAM,CAACgB,WAAW,IAAI;IACvC,CAAC,CAAC;EACN;AACJ;AAEA,OAAO,MAAM9B,gBAAgB,GAAGC,2BAA2B,CAAC8B,oBAAoB,CAAC;EAC7EC,cAAc,EAAE1B,oBAAoB;EACpC2B,YAAY,EAAE,CAAC7B,eAAe,EAAEC,mBAAmB;AACvD,CAAC,CAAC","ignoreList":[]}

package/features/{ScheduleEntryAction/actionHandlers → PublishActionHandler}/PublishEntryActionHandler.d.ts

@@ -1,12 +1,12 @@
-import { ScheduledActionHandler } from "@webiny/api-scheduler";
+import { ScheduledActionHandler, ScheduledActionType, type IScheduledAction } from "@webiny/api-scheduler/exports/api/scheduler.js";
 import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel";
 import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById";
 import { GetPublishedEntriesByIdsUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetPublishedEntriesByIds";
 import { PublishEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/PublishEntry";
 import { UnpublishEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/UnpublishEntry";
 import { RepublishEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/RepublishEntry";
-import type { IScheduleActionWithPayload } from "../../../features/ScheduleEntryAction/index.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import type { IScheduledActionPayload } from "../../types.js";
 /**
  * Handler for publishing CMS entries
  *
@@ -26,8 +26,8 @@ declare class PublishEntryActionHandlerImpl implements ScheduledActionHandler.In
     private republishEntryUseCase;
     private identityContext;
     constructor(getModelUseCase: GetModelUseCase.Interface, getEntryByIdUseCase: GetEntryByIdUseCase.Interface, getPublishedEntriesByIdsUseCase: GetPublishedEntriesByIdsUseCase.Interface, publishEntryUseCase: PublishEntryUseCase.Interface, unpublishEntryUseCase: UnpublishEntryUseCase.Interface, republishEntryUseCase: RepublishEntryUseCase.Interface, identityContext: IdentityContext.Interface);
-    canHandle(namespace: string, actionType: string): boolean;
-    handle(action: IScheduleActionWithPayload): Promise<void>;
+    canHandle(namespace: string, actionType: ScheduledActionType): boolean;
+    handle(action: IScheduledAction<IScheduledActionPayload>): Promise<void>;
 }
 export declare const PublishEntryActionHandler: typeof PublishEntryActionHandlerImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-scheduler/shared/abstractions").IScheduledActionHandler>;

package/features/{ScheduleEntryAction/actionHandlers → PublishActionHandler}/PublishEntryActionHandler.js

@@ -1,4 +1,4 @@
-import { ScheduledActionHandler } from "@webiny/api-scheduler";
+import { ScheduledActionHandler, ScheduledActionTypePublish } from "@webiny/api-scheduler/exports/api/scheduler.js";
 import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel";
 import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById";
 import { GetPublishedEntriesByIdsUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetPublishedEntriesByIds";
@@ -6,6 +6,7 @@ import { PublishEntryUseCase } from "@webiny/api-headless-cms/features/contentEn
 import { UnpublishEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/UnpublishEntry";
 import { RepublishEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/RepublishEntry";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { extractModelIdFromNamespace } from "../../utils/namespace.js";
 
 /**
  * Handler for publishing CMS entries
@@ -28,7 +29,11 @@ class PublishEntryActionHandlerImpl {
     this.identityContext = identityContext;
   }
   canHandle(namespace, actionType) {
-    return namespace.startsWith("Cms/Entry/") && actionType === "Publish";
+    const modelId = extractModelIdFromNamespace(namespace);
+    if (!modelId) {
+      return false;
+    }
+    return actionType === ScheduledActionTypePublish;
   }
   async handle(action) {
     const {

package/features/PublishActionHandler/PublishEntryActionHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ScheduledActionHandler","ScheduledActionTypePublish","GetModelUseCase","GetEntryByIdUseCase","GetPublishedEntriesByIdsUseCase","PublishEntryUseCase","UnpublishEntryUseCase","RepublishEntryUseCase","IdentityContext","extractModelIdFromNamespace","PublishEntryActionHandlerImpl","constructor","getModelUseCase","getEntryByIdUseCase","getPublishedEntriesByIdsUseCase","publishEntryUseCase","unpublishEntryUseCase","republishEntryUseCase","identityContext","canHandle","namespace","actionType","modelId","handle","action","payload","modelResult","execute","isFail","console","error","identity","getIdentity","Error","model","value","targetEntryResult","targetId","targetEntry","publishedEntriesResult","id","publishedTargetEntry","publishResult","republishResult","unpublishResult","PublishEntryActionHandler","createImplementation","implementation","dependencies"],"sources":["PublishEntryActionHandler.ts"],"sourcesContent":["import {\n    ScheduledActionHandler,\n    ScheduledActionType,\n    type IScheduledAction,\n    ScheduledActionTypePublish\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById\";\nimport { GetPublishedEntriesByIdsUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetPublishedEntriesByIds\";\nimport { PublishEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/PublishEntry\";\nimport { UnpublishEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/UnpublishEntry\";\nimport { RepublishEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/RepublishEntry\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { IScheduledActionPayload } from \"~/types.js\";\nimport { extractModelIdFromNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Handler for publishing CMS entries\n *\n * Handles the \"Publish\" action for CMS entries with namespace pattern: Cms/Entry/{modelId}\n *\n * Publishing logic:\n * 1. If entry is not published -> publish it\n * 2. If the same revision is already published -> republish it\n * 3. If a different revision is published -> unpublish old, publish new\n */\nclass PublishEntryActionHandlerImpl implements ScheduledActionHandler.Interface {\n    constructor(\n        private getModelUseCase: GetModelUseCase.Interface,\n        private getEntryByIdUseCase: GetEntryByIdUseCase.Interface,\n        private getPublishedEntriesByIdsUseCase: GetPublishedEntriesByIdsUseCase.Interface,\n        private publishEntryUseCase: PublishEntryUseCase.Interface,\n        private unpublishEntryUseCase: UnpublishEntryUseCase.Interface,\n        private republishEntryUseCase: RepublishEntryUseCase.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    public canHandle(namespace: string, actionType: ScheduledActionType): boolean {\n        const modelId = extractModelIdFromNamespace(namespace);\n        if (!modelId) {\n            return false;\n        }\n        return actionType === ScheduledActionTypePublish;\n    }\n\n    public async handle(action: IScheduledAction<IScheduledActionPayload>): Promise<void> {\n        const { payload } = action;\n\n        const modelId = payload.modelId;\n\n        // Fetch the model\n        const modelResult = await this.getModelUseCase.execute(modelId);\n        if (modelResult.isFail()) {\n            console.error(\n                `Failed to get model \"${modelId}\" for scheduled publish action:`,\n                modelResult.error,\n                {\n                    identity: this.identityContext.getIdentity()\n                }\n            );\n            throw new Error(`Model not found: ${modelId}`);\n        }\n\n        const model = modelResult.value;\n\n        // Fetch the target entry\n        const targetEntryResult = await this.getEntryByIdUseCase.execute<\n            IScheduledAction<IScheduledActionPayload>\n        >(model, action.targetId);\n        if (targetEntryResult.isFail()) {\n            console.error(\n                `Failed to get entry \"${action.targetId}\" for scheduled publish action:`,\n                targetEntryResult.error\n            );\n            throw new Error(`Entry not found: ${action.targetId}`);\n        }\n\n        const targetEntry = targetEntryResult.value;\n\n        // Get published entries\n        const publishedEntriesResult = await this.getPublishedEntriesByIdsUseCase.execute<\n            IScheduledAction<IScheduledActionPayload>\n        >(model, [targetEntry.id]);\n\n        if (publishedEntriesResult.isFail()) {\n            console.error(\n                `Failed to get published entries for \"${targetEntry.id}\":`,\n                publishedEntriesResult.error\n            );\n            throw new Error(`Failed to check published entries`);\n        }\n\n        const [publishedTargetEntry] = publishedEntriesResult.value;\n\n        /**\n         * Scenario 1: Entry has no published revision -> publish it\n         */\n        if (!publishedTargetEntry) {\n            const publishResult = await this.publishEntryUseCase.execute<\n                IScheduledAction<IScheduledActionPayload>\n            >(model, targetEntry.id);\n            if (publishResult.isFail()) {\n                console.error(`Failed to publish entry \"${action.targetId}\":`, publishResult.error);\n                throw new Error(`Failed to publish entry: ${action.targetId}`);\n            }\n            return;\n        }\n\n        /**\n         * Scenario 2: Target entry is already published (same revision) -> republish it\n         */\n        if (publishedTargetEntry.id === targetEntry.id) {\n            const republishResult = await this.republishEntryUseCase.execute(model, targetEntry.id);\n            if (republishResult.isFail()) {\n                console.error(\n                    `Failed to republish entry \"${action.targetId}\":`,\n                    republishResult.error\n                );\n                throw new Error(`Failed to republish entry: ${action.targetId}`);\n            }\n            return;\n        }\n\n        /**\n         * Scenario 3: A different revision is published -> unpublish old, publish new\n         */\n        const unpublishResult = await this.unpublishEntryUseCase.execute<\n            IScheduledAction<IScheduledActionPayload>\n        >(model, publishedTargetEntry.id);\n        if (unpublishResult.isFail()) {\n            console.error(\n                `Failed to unpublish old revision \"${publishedTargetEntry.id}\":`,\n                unpublishResult.error\n            );\n            throw new Error(`Failed to unpublish old revision: ${publishedTargetEntry.id}`);\n        }\n\n        const publishResult = await this.publishEntryUseCase.execute<\n            IScheduledAction<IScheduledActionPayload>\n        >(model, targetEntry.id);\n        if (publishResult.isFail()) {\n            console.error(`Failed to publish entry \"${action.targetId}\":`, publishResult.error);\n            throw new Error(`Failed to publish entry: ${action.targetId}`);\n        }\n    }\n}\n\nexport const PublishEntryActionHandler = ScheduledActionHandler.createImplementation({\n    implementation: PublishEntryActionHandlerImpl,\n    dependencies: [\n        GetModelUseCase,\n        GetEntryByIdUseCase,\n        GetPublishedEntriesByIdsUseCase,\n        PublishEntryUseCase,\n        UnpublishEntryUseCase,\n        RepublishEntryUseCase,\n        IdentityContext\n    ]\n});\n"],"mappings":"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","ignoreList":[]}

package/features/SchedulePublishEntryUseCase/SchedulePublishEntryUseCase.d.ts

@@ -0,0 +1,15 @@
+import { SchedulePublishEntryUseCase as UseCaseAbstraction } from "./abstractions.js";
+import { ScheduleActionUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+declare class SchedulePublishEntryUseCaseImpl implements UseCaseAbstraction.Interface {
+    private scheduleAction;
+    private accessControl;
+    private getModelUseCase;
+    constructor(scheduleAction: ScheduleActionUseCase.Interface, accessControl: AccessControl.Interface, getModelUseCase: GetModelUseCase.Interface);
+    execute(params: UseCaseAbstraction.Params): UseCaseAbstraction.Result;
+}
+export declare const SchedulePublishEntryUseCase: typeof SchedulePublishEntryUseCaseImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ISchedulePublishEntryUseCase>;
+};
+export {};

package/features/SchedulePublishEntryUseCase/SchedulePublishEntryUseCase.js

@@ -0,0 +1,51 @@
+import { SchedulePublishEntryUseCase as UseCaseAbstraction } from "./abstractions.js";
+import { ScheduleActionUseCase, ScheduledActionTypePublish } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { createNamespace } from "../../utils/namespace.js";
+import { Result } from "@webiny/feature/exports/api.js";
+import { EntryNotAuthorizedError } from "@webiny/api-headless-cms/domain/contentEntry/errors.js";
+import { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+class SchedulePublishEntryUseCaseImpl {
+  constructor(scheduleAction, accessControl, getModelUseCase) {
+    this.scheduleAction = scheduleAction;
+    this.accessControl = accessControl;
+    this.getModelUseCase = getModelUseCase;
+  }
+  async execute(params) {
+    const {
+      model: initialModel,
+      scheduleFor,
+      id
+    } = params;
+    const modelResult = await this.getModelUseCase.execute(initialModel.modelId);
+    if (modelResult.isFail()) {
+      return Result.fail(modelResult.error);
+    }
+    const model = modelResult.value;
+    const canAccess = await this.accessControl.canAccessEntry({
+      model,
+      pw: "p"
+    });
+    if (!canAccess) {
+      return Result.fail(EntryNotAuthorizedError.fromModel(model));
+    }
+    const scheduleResult = await this.scheduleAction.execute({
+      namespace: createNamespace(model),
+      actionType: ScheduledActionTypePublish,
+      scheduleFor,
+      targetId: id
+    });
+    if (scheduleResult.isFail()) {
+      return Result.fail(scheduleResult.error);
+    }
+    return Result.ok({
+      scheduledAction: scheduleResult.value
+    });
+  }
+}
+export const SchedulePublishEntryUseCase = UseCaseAbstraction.createImplementation({
+  implementation: SchedulePublishEntryUseCaseImpl,
+  dependencies: [ScheduleActionUseCase, AccessControl, GetModelUseCase]
+});
+
+//# sourceMappingURL=SchedulePublishEntryUseCase.js.map