@webiny/api-headless-cms-tasks 6.6.0-alpha.0 → 6.6.0-alpha.1

package/HcmsTasksFeature.js

@@ -1,9 +1,9 @@
 import { createFeature } from "@webiny/feature/api";
-import { RequestContextInitializer } from "@webiny/event-handler-core";
 import { HcmsBulkActionsFeature } from "@webiny/api-headless-cms-bulk-actions";
 import { DeleteModelTaskFeature } from "./features/DeleteModelTask/feature.js";
-import { createDeleteModelCrud } from "./graphql/deleteModel/crud.js";
-import { createDeleteModelGraphQl } from "./graphql/deleteModel/index.js";
+import { DisableModelFeature } from "./features/DisableModel/feature.js";
+import { DeleteModelOperationsImplementation } from "./graphql/deleteModel/DeleteModelOperationsImpl.js";
+import { DeleteModelGraphQLSchemaFactoryImpl } from "./graphql/deleteModel/index.js";
 const HcmsTasksFeature = createFeature({
     name: "HcmsTasks",
     register (container) {
@@ -11,8 +11,9 @@ const HcmsTasksFeature = createFeature({
             batchSize: 100
         });
         DeleteModelTaskFeature.register(container);
-        container.registerInstance(RequestContextInitializer, createDeleteModelCrud());
-        container.registerInstance(RequestContextInitializer, createDeleteModelGraphQl());
+        container.register(DeleteModelOperationsImplementation);
+        DisableModelFeature.register(container);
+        container.register(DeleteModelGraphQLSchemaFactoryImpl);
     }
 });
 export { HcmsTasksFeature };

package/HcmsTasksFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"HcmsTasksFeature.js","sources":["../src/HcmsTasksFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { RequestContextInitializer } from \"@webiny/event-handler-core\";\nimport { HcmsBulkActionsFeature } from \"@webiny/api-headless-cms-bulk-actions\";\nimport { DeleteModelTaskFeature } from \"./features/DeleteModelTask/feature.js\";\nimport { createDeleteModelCrud } from \"./graphql/deleteModel/crud.js\";\nimport { createDeleteModelGraphQl } from \"./graphql/deleteModel/index.js\";\n\nexport const HcmsTasksFeature = createFeature({\n    name: \"HcmsTasks\",\n    register(container) {\n        // Bulk actions (entries) + the empty-trash-bin task.\n        HcmsBulkActionsFeature.register(container, { batchSize: 100 });\n\n        // Delete-model task + its per-request operations/schema. The crud initializer registers\n        // DeleteModelOperations (+ DisableModelFeature) and MUST run before the GraphQL initializer,\n        // whose resolvers resolve DeleteModelOperations — RequestContextInitializers run in\n        // registration order.\n        DeleteModelTaskFeature.register(container);\n        container.registerInstance(RequestContextInitializer, createDeleteModelCrud());\n        container.registerInstance(RequestContextInitializer, createDeleteModelGraphQl());\n    }\n});\n"],"names":["HcmsTasksFeature","createFeature","container","HcmsBulkActionsFeature","DeleteModelTaskFeature","RequestContextInitializer","createDeleteModelCrud","createDeleteModelGraphQl"],"mappings":";;;;;;AAOO,MAAMA,mBAAmBC,cAAc;IAC1C,MAAM;IACN,UAASC,SAAS;QAEdC,uBAAuB,QAAQ,CAACD,WAAW;YAAE,WAAW;QAAI;QAM5DE,uBAAuB,QAAQ,CAACF;QAChCA,UAAU,gBAAgB,CAACG,2BAA2BC;QACtDJ,UAAU,gBAAgB,CAACG,2BAA2BE;IAC1D;AACJ"}
+{"version":3,"file":"HcmsTasksFeature.js","sources":["../src/HcmsTasksFeature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { HcmsBulkActionsFeature } from \"@webiny/api-headless-cms-bulk-actions\";\nimport { DeleteModelTaskFeature } from \"./features/DeleteModelTask/feature.js\";\nimport { DisableModelFeature } from \"./features/DisableModel/feature.js\";\nimport { DeleteModelOperationsImplementation } from \"./graphql/deleteModel/DeleteModelOperationsImpl.js\";\nimport { DeleteModelGraphQLSchemaFactoryImpl } from \"./graphql/deleteModel/index.js\";\n\nexport const HcmsTasksFeature = createFeature({\n    name: \"HcmsTasks\",\n    register(container) {\n        // Bulk actions (entries) + the empty-trash-bin task.\n        HcmsBulkActionsFeature.register(container, { batchSize: 100 });\n\n        DeleteModelTaskFeature.register(container);\n\n        container.register(DeleteModelOperationsImplementation);\n        DisableModelFeature.register(container);\n\n        container.register(DeleteModelGraphQLSchemaFactoryImpl);\n    }\n});\n"],"names":["HcmsTasksFeature","createFeature","container","HcmsBulkActionsFeature","DeleteModelTaskFeature","DeleteModelOperationsImplementation","DisableModelFeature","DeleteModelGraphQLSchemaFactoryImpl"],"mappings":";;;;;;AAOO,MAAMA,mBAAmBC,cAAc;IAC1C,MAAM;IACN,UAASC,SAAS;QAEdC,uBAAuB,QAAQ,CAACD,WAAW;YAAE,WAAW;QAAI;QAE5DE,uBAAuB,QAAQ,CAACF;QAEhCA,UAAU,QAAQ,CAACG;QACnBC,oBAAoB,QAAQ,CAACJ;QAE7BA,UAAU,QAAQ,CAACK;IACvB;AACJ"}

package/features/DisableModel/BlockActionIfModelDisabled.d.ts

@@ -1,8 +1,21 @@
 import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 import { BlockActionIfModelDisabled as Abstraction } from "./abstractions.js";
-import type { DeleteModelOperations } from "../../graphql/deleteModel/abstractions.js";
-export declare class BlockActionIfModelDisabled implements Abstraction.Interface {
-    private isModelBeingDeleted;
-    constructor(isModelBeingDeleted: DeleteModelOperations.Interface["isModelBeingDeleted"]);
+import { DeleteModelOperations } from "../../graphql/deleteModel/abstractions.js";
+declare class BlockActionIfModelDisabledImpl implements Abstraction.Interface {
+    private readonly deleteModelOperations;
+    constructor(deleteModelOperations: DeleteModelOperations.Interface);
     execute(model: CmsModel): Promise<void>;
 }
+/**
+ * Takes `DeleteModelOperations` itself, not a pre-bound `isModelBeingDeleted`.
+ *
+ * Binding the method meant the feature had to `container.resolve(DeleteModelOperations)` while
+ * registering, which constructs it — and therefore everything it depends on — at register time.
+ * `HcmsTasksFeature` registers before `BackgroundTasksFeature`, so the moment the operations class
+ * declared its own task use cases that resolve threw "No registration found for
+ * Tasks/TriggerTaskUseCase". Depending on the abstraction defers construction to first use.
+ */
+export declare const BlockActionIfModelDisabledImplementation: typeof BlockActionIfModelDisabledImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IBlockActionIfModelDisabled>;
+};
+export {};

package/features/DisableModel/BlockActionIfModelDisabled.js

@@ -1,14 +1,22 @@
 import { WebinyError } from "@webiny/error";
-class BlockActionIfModelDisabled {
-    constructor(isModelBeingDeleted){
-        this.isModelBeingDeleted = isModelBeingDeleted;
+import { BlockActionIfModelDisabled } from "./abstractions.js";
+import { DeleteModelOperations } from "../../graphql/deleteModel/abstractions.js";
+class BlockActionIfModelDisabledImpl {
+    constructor(deleteModelOperations){
+        this.deleteModelOperations = deleteModelOperations;
     }
     async execute(model) {
-        const isBeingDeleted = await this.isModelBeingDeleted(model.modelId);
+        const isBeingDeleted = await this.deleteModelOperations.isModelBeingDeleted(model.modelId);
         if (!isBeingDeleted) return;
         throw new WebinyError(`Model "${model.name}" is being deleted and you cannot create, update or delete any entries of this model.`);
     }
 }
-export { BlockActionIfModelDisabled };
+const BlockActionIfModelDisabledImplementation = BlockActionIfModelDisabled.createImplementation({
+    implementation: BlockActionIfModelDisabledImpl,
+    dependencies: [
+        DeleteModelOperations
+    ]
+});
+export { BlockActionIfModelDisabledImplementation };
 
 //# sourceMappingURL=BlockActionIfModelDisabled.js.map

package/features/DisableModel/BlockActionIfModelDisabled.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/DisableModel/BlockActionIfModelDisabled.js","sources":["../../../src/features/DisableModel/BlockActionIfModelDisabled.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { BlockActionIfModelDisabled as Abstraction } from \"./abstractions.js\";\nimport type { DeleteModelOperations } from \"~/graphql/deleteModel/abstractions.js\";\n\nexport class BlockActionIfModelDisabled implements Abstraction.Interface {\n    constructor(\n        private isModelBeingDeleted: DeleteModelOperations.Interface[\"isModelBeingDeleted\"]\n    ) {}\n\n    async execute(model: CmsModel): Promise<void> {\n        const isBeingDeleted = await this.isModelBeingDeleted(model.modelId);\n        if (!isBeingDeleted) {\n            return;\n        }\n\n        throw new WebinyError(\n            `Model \"${model.name}\" is being deleted and you cannot create, update or delete any entries of this model.`\n        );\n    }\n}\n"],"names":["BlockActionIfModelDisabled","isModelBeingDeleted","model","isBeingDeleted","WebinyError"],"mappings":";AAKO,MAAMA;IACT,YACYC,mBAA2E,CACrF;aADUA,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,KAAe,EAAiB;QAC1C,MAAMC,iBAAiB,MAAM,IAAI,CAAC,mBAAmB,CAACD,MAAM,OAAO;QACnE,IAAI,CAACC,gBACD;QAGJ,MAAM,IAAIC,YACN,CAAC,OAAO,EAAEF,MAAM,IAAI,CAAC,qFAAqF,CAAC;IAEnH;AACJ"}
+{"version":3,"file":"features/DisableModel/BlockActionIfModelDisabled.js","sources":["../../../src/features/DisableModel/BlockActionIfModelDisabled.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { BlockActionIfModelDisabled as Abstraction } from \"./abstractions.js\";\nimport { DeleteModelOperations } from \"~/graphql/deleteModel/abstractions.js\";\n\nclass BlockActionIfModelDisabledImpl implements Abstraction.Interface {\n    constructor(private readonly deleteModelOperations: DeleteModelOperations.Interface) {}\n\n    async execute(model: CmsModel): Promise<void> {\n        const isBeingDeleted = await this.deleteModelOperations.isModelBeingDeleted(model.modelId);\n        if (!isBeingDeleted) {\n            return;\n        }\n\n        throw new WebinyError(\n            `Model \"${model.name}\" is being deleted and you cannot create, update or delete any entries of this model.`\n        );\n    }\n}\n\n/**\n * Takes `DeleteModelOperations` itself, not a pre-bound `isModelBeingDeleted`.\n *\n * Binding the method meant the feature had to `container.resolve(DeleteModelOperations)` while\n * registering, which constructs it — and therefore everything it depends on — at register time.\n * `HcmsTasksFeature` registers before `BackgroundTasksFeature`, so the moment the operations class\n * declared its own task use cases that resolve threw \"No registration found for\n * Tasks/TriggerTaskUseCase\". Depending on the abstraction defers construction to first use.\n */\nexport const BlockActionIfModelDisabledImplementation = Abstraction.createImplementation({\n    implementation: BlockActionIfModelDisabledImpl,\n    dependencies: [DeleteModelOperations]\n});\n"],"names":["BlockActionIfModelDisabledImpl","deleteModelOperations","model","isBeingDeleted","WebinyError","BlockActionIfModelDisabledImplementation","Abstraction","DeleteModelOperations"],"mappings":";;;AAKA,MAAMA;IACF,YAA6BC,qBAAsD,CAAE;aAAxDA,qBAAqB,GAArBA;IAAyD;IAEtF,MAAM,QAAQC,KAAe,EAAiB;QAC1C,MAAMC,iBAAiB,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CAACD,MAAM,OAAO;QACzF,IAAI,CAACC,gBACD;QAGJ,MAAM,IAAIC,YACN,CAAC,OAAO,EAAEF,MAAM,IAAI,CAAC,qFAAqF,CAAC;IAEnH;AACJ;AAWO,MAAMG,2CAA2CC,2BAAAA,oBAAgC,CAAC;IACrF,gBAAgBN;IAChB,cAAc;QAACO;KAAsB;AACzC"}

package/features/DisableModel/feature.js

@@ -1,7 +1,5 @@
 import { createFeature } from "@webiny/feature/api";
-import { BlockActionIfModelDisabled } from "./abstractions.js";
-import { BlockActionIfModelDisabled as external_BlockActionIfModelDisabled_js_BlockActionIfModelDisabled } from "./BlockActionIfModelDisabled.js";
-import { DeleteModelOperations } from "../../graphql/deleteModel/abstractions.js";
+import { BlockActionIfModelDisabledImplementation } from "./BlockActionIfModelDisabled.js";
 import { BlockModelActionOnEntryBeforeCreate } from "./handlers/BlockModelActionOnEntryBeforeCreate.js";
 import { BlockModelActionOnEntryRevisionBeforeCreate } from "./handlers/BlockModelActionOnEntryRevisionBeforeCreate.js";
 import { BlockModelActionOnEntryBeforeUpdate } from "./handlers/BlockModelActionOnEntryBeforeUpdate.js";
@@ -15,8 +13,7 @@ import { BlockModelActionOnModelBeforeCreateFrom } from "./handlers/BlockModelAc
 const DisableModelFeature = createFeature({
     name: "DisableModel",
     register (container) {
-        const ops = container.resolve(DeleteModelOperations);
-        container.registerInstance(BlockActionIfModelDisabled, new external_BlockActionIfModelDisabled_js_BlockActionIfModelDisabled(ops.isModelBeingDeleted.bind(ops)));
+        container.register(BlockActionIfModelDisabledImplementation);
         container.register(BlockModelActionOnEntryBeforeCreate);
         container.register(BlockModelActionOnEntryRevisionBeforeCreate);
         container.register(BlockModelActionOnEntryBeforeUpdate);

package/features/DisableModel/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/DisableModel/feature.js","sources":["../../../src/features/DisableModel/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { BlockActionIfModelDisabled as Abstraction } from \"./abstractions.js\";\nimport { BlockActionIfModelDisabled } from \"./BlockActionIfModelDisabled.js\";\nimport { DeleteModelOperations } from \"~/graphql/deleteModel/abstractions.js\";\nimport { BlockModelActionOnEntryBeforeCreate } from \"./handlers/BlockModelActionOnEntryBeforeCreate.js\";\nimport { BlockModelActionOnEntryRevisionBeforeCreate } from \"./handlers/BlockModelActionOnEntryRevisionBeforeCreate.js\";\nimport { BlockModelActionOnEntryBeforeUpdate } from \"./handlers/BlockModelActionOnEntryBeforeUpdate.js\";\nimport { BlockModelActionOnEntryBeforeUnpublish } from \"./handlers/BlockModelActionOnEntryBeforeUnpublish.js\";\nimport { BlockModelActionOnEntryBeforePublish } from \"./handlers/BlockModelActionOnEntryBeforePublish.js\";\nimport { BlockModelActionOnEntryBeforeRepublish } from \"./handlers/BlockModelActionOnEntryBeforeRepublish.js\";\nimport { BlockModelActionOnEntryBeforeRestoreFromBin } from \"./handlers/BlockModelActionOnEntryBeforeRestoreFromBin.js\";\nimport { BlockModelActionOnEntryBeforeMove } from \"./handlers/BlockModelActionOnEntryBeforeMove.js\";\nimport { BlockModelActionOnModelBeforeUpdate } from \"./handlers/BlockModelActionOnModelBeforeUpdate.js\";\nimport { BlockModelActionOnModelBeforeCreateFrom } from \"./handlers/BlockModelActionOnModelBeforeCreateFrom.js\";\n\nexport const DisableModelFeature = createFeature({\n    name: \"DisableModel\",\n    register(container) {\n        const ops = container.resolve(DeleteModelOperations);\n\n        container.registerInstance(\n            Abstraction,\n            new BlockActionIfModelDisabled(ops.isModelBeingDeleted.bind(ops))\n        );\n\n        container.register(BlockModelActionOnEntryBeforeCreate);\n        container.register(BlockModelActionOnEntryRevisionBeforeCreate);\n        container.register(BlockModelActionOnEntryBeforeUpdate);\n        container.register(BlockModelActionOnEntryBeforeUnpublish);\n        container.register(BlockModelActionOnEntryBeforePublish);\n        container.register(BlockModelActionOnEntryBeforeRepublish);\n        container.register(BlockModelActionOnEntryBeforeRestoreFromBin);\n        container.register(BlockModelActionOnEntryBeforeMove);\n\n        container.register(BlockModelActionOnModelBeforeUpdate);\n        container.register(BlockModelActionOnModelBeforeCreateFrom);\n    }\n});\n"],"names":["DisableModelFeature","createFeature","container","ops","DeleteModelOperations","Abstraction","BlockActionIfModelDisabled","BlockModelActionOnEntryBeforeCreate","BlockModelActionOnEntryRevisionBeforeCreate","BlockModelActionOnEntryBeforeUpdate","BlockModelActionOnEntryBeforeUnpublish","BlockModelActionOnEntryBeforePublish","BlockModelActionOnEntryBeforeRepublish","BlockModelActionOnEntryBeforeRestoreFromBin","BlockModelActionOnEntryBeforeMove","BlockModelActionOnModelBeforeUpdate","BlockModelActionOnModelBeforeCreateFrom"],"mappings":";;;;;;;;;;;;;;AAeO,MAAMA,sBAAsBC,cAAc;IAC7C,MAAM;IACN,UAASC,SAAS;QACd,MAAMC,MAAMD,UAAU,OAAO,CAACE;QAE9BF,UAAU,gBAAgB,CACtBG,4BACA,IAAIC,kEAA2BH,IAAI,mBAAmB,CAAC,IAAI,CAACA;QAGhED,UAAU,QAAQ,CAACK;QACnBL,UAAU,QAAQ,CAACM;QACnBN,UAAU,QAAQ,CAACO;QACnBP,UAAU,QAAQ,CAACQ;QACnBR,UAAU,QAAQ,CAACS;QACnBT,UAAU,QAAQ,CAACU;QACnBV,UAAU,QAAQ,CAACW;QACnBX,UAAU,QAAQ,CAACY;QAEnBZ,UAAU,QAAQ,CAACa;QACnBb,UAAU,QAAQ,CAACc;IACvB;AACJ"}
+{"version":3,"file":"features/DisableModel/feature.js","sources":["../../../src/features/DisableModel/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { BlockActionIfModelDisabledImplementation } from \"./BlockActionIfModelDisabled.js\";\nimport { BlockModelActionOnEntryBeforeCreate } from \"./handlers/BlockModelActionOnEntryBeforeCreate.js\";\nimport { BlockModelActionOnEntryRevisionBeforeCreate } from \"./handlers/BlockModelActionOnEntryRevisionBeforeCreate.js\";\nimport { BlockModelActionOnEntryBeforeUpdate } from \"./handlers/BlockModelActionOnEntryBeforeUpdate.js\";\nimport { BlockModelActionOnEntryBeforeUnpublish } from \"./handlers/BlockModelActionOnEntryBeforeUnpublish.js\";\nimport { BlockModelActionOnEntryBeforePublish } from \"./handlers/BlockModelActionOnEntryBeforePublish.js\";\nimport { BlockModelActionOnEntryBeforeRepublish } from \"./handlers/BlockModelActionOnEntryBeforeRepublish.js\";\nimport { BlockModelActionOnEntryBeforeRestoreFromBin } from \"./handlers/BlockModelActionOnEntryBeforeRestoreFromBin.js\";\nimport { BlockModelActionOnEntryBeforeMove } from \"./handlers/BlockModelActionOnEntryBeforeMove.js\";\nimport { BlockModelActionOnModelBeforeUpdate } from \"./handlers/BlockModelActionOnModelBeforeUpdate.js\";\nimport { BlockModelActionOnModelBeforeCreateFrom } from \"./handlers/BlockModelActionOnModelBeforeCreateFrom.js\";\n\nexport const DisableModelFeature = createFeature({\n    name: \"DisableModel\",\n    register(container) {\n        container.register(BlockActionIfModelDisabledImplementation);\n\n        container.register(BlockModelActionOnEntryBeforeCreate);\n        container.register(BlockModelActionOnEntryRevisionBeforeCreate);\n        container.register(BlockModelActionOnEntryBeforeUpdate);\n        container.register(BlockModelActionOnEntryBeforeUnpublish);\n        container.register(BlockModelActionOnEntryBeforePublish);\n        container.register(BlockModelActionOnEntryBeforeRepublish);\n        container.register(BlockModelActionOnEntryBeforeRestoreFromBin);\n        container.register(BlockModelActionOnEntryBeforeMove);\n\n        container.register(BlockModelActionOnModelBeforeUpdate);\n        container.register(BlockModelActionOnModelBeforeCreateFrom);\n    }\n});\n"],"names":["DisableModelFeature","createFeature","container","BlockActionIfModelDisabledImplementation","BlockModelActionOnEntryBeforeCreate","BlockModelActionOnEntryRevisionBeforeCreate","BlockModelActionOnEntryBeforeUpdate","BlockModelActionOnEntryBeforeUnpublish","BlockModelActionOnEntryBeforePublish","BlockModelActionOnEntryBeforeRepublish","BlockModelActionOnEntryBeforeRestoreFromBin","BlockModelActionOnEntryBeforeMove","BlockModelActionOnModelBeforeUpdate","BlockModelActionOnModelBeforeCreateFrom"],"mappings":";;;;;;;;;;;;AAaO,MAAMA,sBAAsBC,cAAc;IAC7C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QAEnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QACnBH,UAAU,QAAQ,CAACI;QACnBJ,UAAU,QAAQ,CAACK;QACnBL,UAAU,QAAQ,CAACM;QACnBN,UAAU,QAAQ,CAACO;QACnBP,UAAU,QAAQ,CAACQ;QACnBR,UAAU,QAAQ,CAACS;QAEnBT,UAAU,QAAQ,CAACU;QACnBV,UAAU,QAAQ,CAACW;IACvB;AACJ"}

package/graphql/deleteModel/DeleteModelOperationsImpl.d.ts

@@ -0,0 +1,43 @@
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/abstractions.js";
+import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
+import { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import { AbortTaskUseCase, GetTaskUseCase, TriggerTaskUseCase } from "@webiny/background-tasks/api";
+import type { IStoreValue } from "../../features/DeleteModelTask/types.js";
+import { DeleteModelOperations } from "../../graphql/deleteModel/abstractions.js";
+/**
+ * Delete-model operations, previously assembled inside a `RequestContextInitializer`
+ * (`createDeleteModelCrud`) from closures over the request context.
+ *
+ * Nothing here needed a per-request hook: every member is already async, and the tenant is read
+ * lazily at call time rather than at construction. As an ordinary DI implementation it is
+ * sync-constructible, which also lets `DisableModelFeature` keep resolving it at register time.
+ *
+ * The in-memory cache is KEPT. Unlike the CMS model providers — where `ModelsFetcher`/`ModelCache`
+ * already cached a layer down — nothing caches these key-value reads, so without it every
+ * `isModelBeingDeleted()` check would hit the store. It is cleared on mutation, as before.
+ */
+declare class DeleteModelOperationsImpl implements DeleteModelOperations.Interface {
+    private readonly tenantContext;
+    private readonly keyValueStore;
+    private readonly identityContext;
+    private readonly getModel;
+    private readonly accessControl;
+    private readonly triggerTask;
+    private readonly getTask;
+    private readonly abortTask;
+    private readonly cache;
+    constructor(tenantContext: TenantContext.Interface, keyValueStore: GlobalKeyValueStore.Interface, identityContext: IdentityContext.Interface, getModel: GetModelUseCase.Interface, accessControl: AccessControl.Interface, triggerTask: TriggerTaskUseCase.Interface, getTask: GetTaskUseCase.Interface, abortTask: AbortTaskUseCase.Interface);
+    listModelsBeingDeleted(): Promise<IStoreValue[]>;
+    isModelBeingDeleted(modelId: string): Promise<boolean>;
+    fullyDeleteModel(modelId: string): Promise<import("~/features/DeleteModelTask/types.js").IDeleteCmsModelTask>;
+    cancelFullyDeleteModel(modelId: string): Promise<import("~/features/DeleteModelTask/types.js").IDeleteCmsModelTask>;
+    getDeleteModelProgress(modelId: string): Promise<import("~/features/DeleteModelTask/types.js").IDeleteCmsModelTask>;
+    private getTenant;
+    private getStore;
+}
+export declare const DeleteModelOperationsImplementation: typeof DeleteModelOperationsImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("~/graphql/deleteModel/abstractions.js").IDeleteModelOperations>;
+};
+export {};

package/graphql/deleteModel/DeleteModelOperationsImpl.js

@@ -0,0 +1,91 @@
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/abstractions.js";
+import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
+import { createCacheKey, createMemoryCache } from "@webiny/api-headless-cms/utils/index.js";
+import { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import { AbortTaskUseCase, GetTaskUseCase, TriggerTaskUseCase } from "@webiny/background-tasks/api";
+import { createDeleteModelStore } from "../../helpers/store.js";
+import { fullyDeleteModel } from "./fullyDeleteModel.js";
+import { cancelDeleteModel } from "./cancelDeleteModel.js";
+import { getDeleteModelProgress } from "./getDeleteModelProgress.js";
+import { DeleteModelOperations } from "./abstractions.js";
+class DeleteModelOperationsImpl {
+    constructor(tenantContext, keyValueStore, identityContext, getModel, accessControl, triggerTask, getTask, abortTask){
+        this.tenantContext = tenantContext;
+        this.keyValueStore = keyValueStore;
+        this.identityContext = identityContext;
+        this.getModel = getModel;
+        this.accessControl = accessControl;
+        this.triggerTask = triggerTask;
+        this.getTask = getTask;
+        this.abortTask = abortTask;
+        this.cache = createMemoryCache();
+    }
+    async listModelsBeingDeleted() {
+        const cacheKey = createCacheKey({
+            tenant: this.getTenant(),
+            type: "deleteModel"
+        });
+        return this.cache.getOrSet(cacheKey, ()=>this.getStore().list());
+    }
+    async isModelBeingDeleted(modelId) {
+        const items = await this.listModelsBeingDeleted();
+        return items.some((item)=>item.modelId === modelId);
+    }
+    async fullyDeleteModel(modelId) {
+        const result = await fullyDeleteModel({
+            getModel: this.getModel,
+            accessControl: this.accessControl,
+            keyValueStore: this.keyValueStore,
+            triggerTask: this.triggerTask,
+            identityContext: this.identityContext,
+            modelId
+        });
+        this.cache.clear();
+        return result;
+    }
+    async cancelFullyDeleteModel(modelId) {
+        const result = await cancelDeleteModel({
+            getModel: this.getModel,
+            accessControl: this.accessControl,
+            keyValueStore: this.keyValueStore,
+            getTask: this.getTask,
+            abortTask: this.abortTask,
+            modelId
+        });
+        this.cache.clear();
+        return result;
+    }
+    async getDeleteModelProgress(modelId) {
+        return getDeleteModelProgress({
+            getModel: this.getModel,
+            accessControl: this.accessControl,
+            keyValueStore: this.keyValueStore,
+            getTask: this.getTask,
+            modelId
+        });
+    }
+    getTenant() {
+        return this.tenantContext.getTenant().id;
+    }
+    getStore() {
+        return createDeleteModelStore(this.keyValueStore, this.getTenant());
+    }
+}
+const DeleteModelOperationsImplementation = DeleteModelOperations.createImplementation({
+    implementation: DeleteModelOperationsImpl,
+    dependencies: [
+        TenantContext,
+        GlobalKeyValueStore,
+        IdentityContext,
+        GetModelUseCase,
+        AccessControl,
+        TriggerTaskUseCase,
+        GetTaskUseCase,
+        AbortTaskUseCase
+    ]
+});
+export { DeleteModelOperationsImplementation };
+
+//# sourceMappingURL=DeleteModelOperationsImpl.js.map

package/graphql/deleteModel/DeleteModelOperationsImpl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql/deleteModel/DeleteModelOperationsImpl.js","sources":["../../../src/graphql/deleteModel/DeleteModelOperationsImpl.ts"],"sourcesContent":["import { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/abstractions.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\nimport { createCacheKey, createMemoryCache } from \"@webiny/api-headless-cms/utils/index.js\";\nimport { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { AbortTaskUseCase, GetTaskUseCase, TriggerTaskUseCase } from \"@webiny/background-tasks/api\";\nimport type { IStoreValue } from \"~/features/DeleteModelTask/types.js\";\nimport { createDeleteModelStore } from \"~/helpers/store.js\";\nimport { fullyDeleteModel } from \"~/graphql/deleteModel/fullyDeleteModel.js\";\nimport { cancelDeleteModel } from \"~/graphql/deleteModel/cancelDeleteModel.js\";\nimport { getDeleteModelProgress } from \"~/graphql/deleteModel/getDeleteModelProgress.js\";\nimport { DeleteModelOperations } from \"~/graphql/deleteModel/abstractions.js\";\n\n/**\n * Delete-model operations, previously assembled inside a `RequestContextInitializer`\n * (`createDeleteModelCrud`) from closures over the request context.\n *\n * Nothing here needed a per-request hook: every member is already async, and the tenant is read\n * lazily at call time rather than at construction. As an ordinary DI implementation it is\n * sync-constructible, which also lets `DisableModelFeature` keep resolving it at register time.\n *\n * The in-memory cache is KEPT. Unlike the CMS model providers — where `ModelsFetcher`/`ModelCache`\n * already cached a layer down — nothing caches these key-value reads, so without it every\n * `isModelBeingDeleted()` check would hit the store. It is cleared on mutation, as before.\n */\nclass DeleteModelOperationsImpl implements DeleteModelOperations.Interface {\n    private readonly cache = createMemoryCache<Promise<IStoreValue[]>>();\n\n    constructor(\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly keyValueStore: GlobalKeyValueStore.Interface,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly getModel: GetModelUseCase.Interface,\n        private readonly accessControl: AccessControl.Interface,\n        private readonly triggerTask: TriggerTaskUseCase.Interface,\n        private readonly getTask: GetTaskUseCase.Interface,\n        private readonly abortTask: AbortTaskUseCase.Interface\n    ) {}\n\n    async listModelsBeingDeleted(): Promise<IStoreValue[]> {\n        const cacheKey = createCacheKey({ tenant: this.getTenant(), type: \"deleteModel\" });\n        return this.cache.getOrSet(cacheKey, () => this.getStore().list());\n    }\n\n    async isModelBeingDeleted(modelId: string): Promise<boolean> {\n        const items = await this.listModelsBeingDeleted();\n        return items.some(item => item.modelId === modelId);\n    }\n\n    async fullyDeleteModel(modelId: string) {\n        const result = await fullyDeleteModel({\n            getModel: this.getModel,\n            accessControl: this.accessControl,\n            keyValueStore: this.keyValueStore,\n            triggerTask: this.triggerTask,\n            identityContext: this.identityContext,\n            modelId\n        });\n        this.cache.clear();\n        return result;\n    }\n\n    async cancelFullyDeleteModel(modelId: string) {\n        const result = await cancelDeleteModel({\n            getModel: this.getModel,\n            accessControl: this.accessControl,\n            keyValueStore: this.keyValueStore,\n            getTask: this.getTask,\n            abortTask: this.abortTask,\n            modelId\n        });\n        this.cache.clear();\n        return result;\n    }\n\n    async getDeleteModelProgress(modelId: string) {\n        return getDeleteModelProgress({\n            getModel: this.getModel,\n            accessControl: this.accessControl,\n            keyValueStore: this.keyValueStore,\n            getTask: this.getTask,\n            modelId\n        });\n    }\n\n    private getTenant(): string {\n        return this.tenantContext.getTenant().id;\n    }\n\n    private getStore() {\n        return createDeleteModelStore(this.keyValueStore, this.getTenant());\n    }\n}\n\nexport const DeleteModelOperationsImplementation = DeleteModelOperations.createImplementation({\n    implementation: DeleteModelOperationsImpl,\n    dependencies: [\n        TenantContext,\n        GlobalKeyValueStore,\n        IdentityContext,\n        GetModelUseCase,\n        AccessControl,\n        TriggerTaskUseCase,\n        GetTaskUseCase,\n        AbortTaskUseCase\n    ]\n});\n"],"names":["DeleteModelOperationsImpl","tenantContext","keyValueStore","identityContext","getModel","accessControl","triggerTask","getTask","abortTask","createMemoryCache","cacheKey","createCacheKey","modelId","items","item","result","fullyDeleteModel","cancelDeleteModel","getDeleteModelProgress","createDeleteModelStore","DeleteModelOperationsImplementation","DeleteModelOperations","TenantContext","GlobalKeyValueStore","IdentityContext","GetModelUseCase","AccessControl","TriggerTaskUseCase","GetTaskUseCase","AbortTaskUseCase"],"mappings":";;;;;;;;;;;;AA0BA,MAAMA;IAGF,YACqBC,aAAsC,EACtCC,aAA4C,EAC5CC,eAA0C,EAC1CC,QAAmC,EACnCC,aAAsC,EACtCC,WAAyC,EACzCC,OAAiC,EACjCC,SAAqC,CACxD;aARmBP,aAAa,GAAbA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;aACAC,QAAQ,GAARA;aACAC,aAAa,GAAbA;aACAC,WAAW,GAAXA;aACAC,OAAO,GAAPA;aACAC,SAAS,GAATA;aAVJ,KAAK,GAAGC;IAWtB;IAEH,MAAM,yBAAiD;QACnD,MAAMC,WAAWC,eAAe;YAAE,QAAQ,IAAI,CAAC,SAAS;YAAI,MAAM;QAAc;QAChF,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAACD,UAAU,IAAM,IAAI,CAAC,QAAQ,GAAG,IAAI;IACnE;IAEA,MAAM,oBAAoBE,OAAe,EAAoB;QACzD,MAAMC,QAAQ,MAAM,IAAI,CAAC,sBAAsB;QAC/C,OAAOA,MAAM,IAAI,CAACC,CAAAA,OAAQA,KAAK,OAAO,KAAKF;IAC/C;IAEA,MAAM,iBAAiBA,OAAe,EAAE;QACpC,MAAMG,SAAS,MAAMC,iBAAiB;YAClC,UAAU,IAAI,CAAC,QAAQ;YACvB,eAAe,IAAI,CAAC,aAAa;YACjC,eAAe,IAAI,CAAC,aAAa;YACjC,aAAa,IAAI,CAAC,WAAW;YAC7B,iBAAiB,IAAI,CAAC,eAAe;YACrCJ;QACJ;QACA,IAAI,CAAC,KAAK,CAAC,KAAK;QAChB,OAAOG;IACX;IAEA,MAAM,uBAAuBH,OAAe,EAAE;QAC1C,MAAMG,SAAS,MAAME,kBAAkB;YACnC,UAAU,IAAI,CAAC,QAAQ;YACvB,eAAe,IAAI,CAAC,aAAa;YACjC,eAAe,IAAI,CAAC,aAAa;YACjC,SAAS,IAAI,CAAC,OAAO;YACrB,WAAW,IAAI,CAAC,SAAS;YACzBL;QACJ;QACA,IAAI,CAAC,KAAK,CAAC,KAAK;QAChB,OAAOG;IACX;IAEA,MAAM,uBAAuBH,OAAe,EAAE;QAC1C,OAAOM,uBAAuB;YAC1B,UAAU,IAAI,CAAC,QAAQ;YACvB,eAAe,IAAI,CAAC,aAAa;YACjC,eAAe,IAAI,CAAC,aAAa;YACjC,SAAS,IAAI,CAAC,OAAO;YACrBN;QACJ;IACJ;IAEQ,YAAoB;QACxB,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,EAAE;IAC5C;IAEQ,WAAW;QACf,OAAOO,uBAAuB,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS;IACpE;AACJ;AAEO,MAAMC,sCAAsCC,sBAAsB,oBAAoB,CAAC;IAC1F,gBAAgBrB;IAChB,cAAc;QACVsB;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/graphql/deleteModel/assertModelDeletable.d.ts

@@ -0,0 +1,11 @@
+import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+export interface IAssertModelDeletableParams {
+    readonly accessControl: AccessControl.Interface;
+    readonly model: CmsModel;
+}
+/**
+ * The access checks every delete-model operation makes: delete on the model, write on its entries.
+ * All three operations ran this same pair inline.
+ */
+export declare const assertModelDeletable: (params: IAssertModelDeletableParams) => Promise<void>;

package/graphql/deleteModel/assertModelDeletable.js

@@ -0,0 +1,17 @@
+import { NotAuthorizedError } from "@webiny/api-headless-cms/utils/errors.js";
+const assertModelDeletable = async (params)=>{
+    const { accessControl, model } = params;
+    const canAccessModel = await accessControl.canAccessModel({
+        model,
+        rwd: "d"
+    });
+    if (!canAccessModel) throw new NotAuthorizedError(`Not allowed to access content model "${model.name}".`);
+    const canAccessEntry = await accessControl.canAccessEntry({
+        model,
+        rwd: "w"
+    });
+    if (!canAccessEntry) throw new NotAuthorizedError(`Not allowed to access "${model.modelId}" entries.`);
+};
+export { assertModelDeletable };
+
+//# sourceMappingURL=assertModelDeletable.js.map

package/graphql/deleteModel/assertModelDeletable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql/deleteModel/assertModelDeletable.js","sources":["../../../src/graphql/deleteModel/assertModelDeletable.ts"],"sourcesContent":["import type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { NotAuthorizedError } from \"@webiny/api-headless-cms/utils/errors.js\";\nimport type { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\n\nexport interface IAssertModelDeletableParams {\n    readonly accessControl: AccessControl.Interface;\n    readonly model: CmsModel;\n}\n\n/**\n * The access checks every delete-model operation makes: delete on the model, write on its entries.\n * All three operations ran this same pair inline.\n */\nexport const assertModelDeletable = async (params: IAssertModelDeletableParams): Promise<void> => {\n    const { accessControl, model } = params;\n\n    const canAccessModel = await accessControl.canAccessModel({ model, rwd: \"d\" });\n    if (!canAccessModel) {\n        throw new NotAuthorizedError(`Not allowed to access content model \"${model.name}\".`);\n    }\n\n    const canAccessEntry = await accessControl.canAccessEntry({ model, rwd: \"w\" });\n    if (!canAccessEntry) {\n        throw new NotAuthorizedError(`Not allowed to access \"${model.modelId}\" entries.`);\n    }\n};\n"],"names":["assertModelDeletable","params","accessControl","model","canAccessModel","NotAuthorizedError","canAccessEntry"],"mappings":";AAaO,MAAMA,uBAAuB,OAAOC;IACvC,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IAEjC,MAAMG,iBAAiB,MAAMF,cAAc,cAAc,CAAC;QAAEC;QAAO,KAAK;IAAI;IAC5E,IAAI,CAACC,gBACD,MAAM,IAAIC,mBAAmB,CAAC,qCAAqC,EAAEF,MAAM,IAAI,CAAC,EAAE,CAAC;IAGvF,MAAMG,iBAAiB,MAAMJ,cAAc,cAAc,CAAC;QAAEC;QAAO,KAAK;IAAI;IAC5E,IAAI,CAACG,gBACD,MAAM,IAAID,mBAAmB,CAAC,uBAAuB,EAAEF,MAAM,OAAO,CAAC,UAAU,CAAC;AAExF"}

package/graphql/deleteModel/cancelDeleteModel.d.ts

@@ -1,7 +1,14 @@
-import type { HcmsTasksContext } from "../../types.js";
 import type { IDeleteCmsModelTask } from "../../features/DeleteModelTask/types.js";
+import type { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import type { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import type { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
+import type { GetTaskUseCase, AbortTaskUseCase } from "@webiny/background-tasks/api";
 export interface ICancelDeleteModelParams {
-    readonly context: Pick<HcmsTasksContext, "container">;
+    readonly getModel: GetModelUseCase.Interface;
+    readonly accessControl: AccessControl.Interface;
+    readonly keyValueStore: GlobalKeyValueStore.Interface;
+    readonly getTask: GetTaskUseCase.Interface;
+    readonly abortTask: AbortTaskUseCase.Interface;
     readonly modelId: string;
 }
 export declare const cancelDeleteModel: (params: ICancelDeleteModelParams) => Promise<IDeleteCmsModelTask>;

package/graphql/deleteModel/cancelDeleteModel.js

@@ -2,28 +2,17 @@ import { WebinyError } from "@webiny/error";
 import { createDeleteModelStore } from "../../helpers/store.js";
 import { DELETE_MODEL_TASK } from "../../constants.js";
 import { getStatus } from "./status.js";
-import { NotAuthorizedError } from "@webiny/api-headless-cms/utils/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";
-import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
-import { AbortTaskUseCase, GetTaskUseCase } from "@webiny/background-tasks/api";
+import { assertModelDeletable } from "./assertModelDeletable.js";
 const cancelDeleteModel = async (params)=>{
-    const { context, modelId } = params;
-    const modelResult = await context.container.resolve(GetModelUseCase).execute(modelId);
+    const { getModel, accessControl, keyValueStore, getTask, abortTask, modelId } = params;
+    const modelResult = await getModel.execute(modelId);
     if (modelResult.isFail()) throw modelResult.error;
     const model = modelResult.value;
-    const accessControl = context.container.resolve(AccessControl);
-    const canAccessModel = await accessControl.canAccessModel({
-        model,
-        rwd: "d"
+    await assertModelDeletable({
+        accessControl,
+        model
     });
-    if (!canAccessModel) throw new NotAuthorizedError(`Not allowed to access content model "${model.name}".`);
-    const canAccessEntry = await accessControl.canAccessEntry({
-        model,
-        rwd: "w"
-    });
-    if (!canAccessEntry) throw new NotAuthorizedError(`Not allowed to access "${model.modelId}" entries.`);
-    const store = createDeleteModelStore(context.container.resolve(GlobalKeyValueStore), model.tenant);
+    const store = createDeleteModelStore(keyValueStore, model.tenant);
     const existing = await store.get(model.modelId);
     const taskId = existing?.task;
     await store.remove(model.modelId);
@@ -31,7 +20,7 @@ const cancelDeleteModel = async (params)=>{
         message: `Model "${modelId}" is not being deleted.`,
         code: "MODEL_NOT_BEING_DELETED"
     });
-    const task = await context.container.resolve(GetTaskUseCase).execute(taskId);
+    const task = await getTask.execute(taskId);
     if (task?.definitionId !== DELETE_MODEL_TASK) throw new WebinyError({
         message: `The task which is deleting a model cannot be found. Please check Step Functions for more info. Task id: ${taskId}`,
         code: "DELETE_MODEL_TASK_NOT_FOUND",
@@ -40,7 +29,7 @@ const cancelDeleteModel = async (params)=>{
             task: taskId
         }
     });
-    const abortResult = await context.container.resolve(AbortTaskUseCase).execute({
+    const abortResult = await abortTask.execute({
         id: task.id,
         message: "User canceled the task."
     });

package/graphql/deleteModel/cancelDeleteModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/deleteModel/cancelDeleteModel.js","sources":["../../../src/graphql/deleteModel/cancelDeleteModel.ts"],"sourcesContent":["import type { HcmsTasksContext } from \"~/types.js\";\nimport { WebinyError } from \"@webiny/error\";\nimport type {\n    IDeleteCmsModelTask,\n    IDeleteModelTaskInput,\n    IDeleteModelTaskOutput\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createDeleteModelStore } from \"~/helpers/store.js\";\nimport { DELETE_MODEL_TASK } from \"~/constants.js\";\nimport { getStatus } from \"~/graphql/deleteModel/status.js\";\nimport { NotAuthorizedError } from \"@webiny/api-headless-cms/utils/errors.js\";\nimport { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport { GetTaskUseCase, AbortTaskUseCase } from \"@webiny/background-tasks/api\";\n\nexport interface ICancelDeleteModelParams {\n    readonly context: Pick<HcmsTasksContext, \"container\">;\n    readonly modelId: string;\n}\n\nexport const cancelDeleteModel = async (\n    params: ICancelDeleteModelParams\n): Promise<IDeleteCmsModelTask> => {\n    const { context, modelId } = params;\n\n    const modelResult = await context.container.resolve(GetModelUseCase).execute(modelId);\n    if (modelResult.isFail()) {\n        throw modelResult.error;\n    }\n    const model = modelResult.value;\n    const accessControl = context.container.resolve(AccessControl);\n\n    const canAccessModel = await accessControl.canAccessModel({ model, rwd: \"d\" });\n    if (!canAccessModel) {\n        throw new NotAuthorizedError(`Not allowed to access content model \"${model.name}\".`);\n    }\n\n    const canAccessEntry = await accessControl.canAccessEntry({ model, rwd: \"w\" });\n    if (!canAccessEntry) {\n        throw new NotAuthorizedError(`Not allowed to access \"${model.modelId}\" entries.`);\n    }\n\n    const store = createDeleteModelStore(\n        context.container.resolve(GlobalKeyValueStore),\n        model.tenant\n    );\n    const existing = await store.get(model.modelId);\n    const taskId = existing?.task;\n\n    await store.remove(model.modelId);\n    if (!taskId) {\n        throw new WebinyError({\n            message: `Model \"${modelId}\" is not being deleted.`,\n            code: \"MODEL_NOT_BEING_DELETED\"\n        });\n    }\n\n    const task = await context.container\n        .resolve(GetTaskUseCase)\n        .execute<IDeleteModelTaskInput, IDeleteModelTaskOutput>(taskId);\n    if (task?.definitionId !== DELETE_MODEL_TASK) {\n        throw new WebinyError({\n            message: `The task which is deleting a model cannot be found. Please check Step Functions for more info. Task id: ${taskId}`,\n            code: \"DELETE_MODEL_TASK_NOT_FOUND\",\n            data: {\n                model: model.modelId,\n                task: taskId\n            }\n        });\n    }\n\n    const abortResult = await context.container\n        .resolve(AbortTaskUseCase)\n        .execute<IDeleteModelTaskInput, IDeleteModelTaskOutput>({\n            id: task.id,\n            message: \"User canceled the task.\"\n        });\n\n    const canceledTask = abortResult.value;\n\n    return {\n        id: canceledTask.id,\n        status: getStatus(canceledTask.taskStatus),\n        total: canceledTask.output?.total || 0,\n        deleted: canceledTask.output?.deleted || 0\n    };\n};\n"],"names":["cancelDeleteModel","params","context","modelId","modelResult","GetModelUseCase","model","accessControl","AccessControl","canAccessModel","NotAuthorizedError","canAccessEntry","store","createDeleteModelStore","GlobalKeyValueStore","existing","taskId","WebinyError","task","GetTaskUseCase","DELETE_MODEL_TASK","abortResult","AbortTaskUseCase","canceledTask","getStatus"],"mappings":";;;;;;;;;AAqBO,MAAMA,oBAAoB,OAC7BC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE,GAAGF;IAE7B,MAAMG,cAAc,MAAMF,QAAQ,SAAS,CAAC,OAAO,CAACG,iBAAiB,OAAO,CAACF;IAC7E,IAAIC,YAAY,MAAM,IAClB,MAAMA,YAAY,KAAK;IAE3B,MAAME,QAAQF,YAAY,KAAK;IAC/B,MAAMG,gBAAgBL,QAAQ,SAAS,CAAC,OAAO,CAACM;IAEhD,MAAMC,iBAAiB,MAAMF,cAAc,cAAc,CAAC;QAAED;QAAO,KAAK;IAAI;IAC5E,IAAI,CAACG,gBACD,MAAM,IAAIC,mBAAmB,CAAC,qCAAqC,EAAEJ,MAAM,IAAI,CAAC,EAAE,CAAC;IAGvF,MAAMK,iBAAiB,MAAMJ,cAAc,cAAc,CAAC;QAAED;QAAO,KAAK;IAAI;IAC5E,IAAI,CAACK,gBACD,MAAM,IAAID,mBAAmB,CAAC,uBAAuB,EAAEJ,MAAM,OAAO,CAAC,UAAU,CAAC;IAGpF,MAAMM,QAAQC,uBACVX,QAAQ,SAAS,CAAC,OAAO,CAACY,sBAC1BR,MAAM,MAAM;IAEhB,MAAMS,WAAW,MAAMH,MAAM,GAAG,CAACN,MAAM,OAAO;IAC9C,MAAMU,SAASD,UAAU;IAEzB,MAAMH,MAAM,MAAM,CAACN,MAAM,OAAO;IAChC,IAAI,CAACU,QACD,MAAM,IAAIC,YAAY;QAClB,SAAS,CAAC,OAAO,EAAEd,QAAQ,uBAAuB,CAAC;QACnD,MAAM;IACV;IAGJ,MAAMe,OAAO,MAAMhB,QAAQ,SAAS,CAC/B,OAAO,CAACiB,gBACR,OAAO,CAAgDH;IAC5D,IAAIE,MAAM,iBAAiBE,mBACvB,MAAM,IAAIH,YAAY;QAClB,SAAS,CAAC,wGAAwG,EAAED,QAAQ;QAC5H,MAAM;QACN,MAAM;YACF,OAAOV,MAAM,OAAO;YACpB,MAAMU;QACV;IACJ;IAGJ,MAAMK,cAAc,MAAMnB,QAAQ,SAAS,CACtC,OAAO,CAACoB,kBACR,OAAO,CAAgD;QACpD,IAAIJ,KAAK,EAAE;QACX,SAAS;IACb;IAEJ,MAAMK,eAAeF,YAAY,KAAK;IAEtC,OAAO;QACH,IAAIE,aAAa,EAAE;QACnB,QAAQC,UAAUD,aAAa,UAAU;QACzC,OAAOA,aAAa,MAAM,EAAE,SAAS;QACrC,SAASA,aAAa,MAAM,EAAE,WAAW;IAC7C;AACJ"}
+{"version":3,"file":"graphql/deleteModel/cancelDeleteModel.js","sources":["../../../src/graphql/deleteModel/cancelDeleteModel.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport type {\n    IDeleteCmsModelTask,\n    IDeleteModelTaskInput,\n    IDeleteModelTaskOutput\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createDeleteModelStore } from \"~/helpers/store.js\";\nimport { DELETE_MODEL_TASK } from \"~/constants.js\";\nimport { getStatus } from \"~/graphql/deleteModel/status.js\";\nimport { assertModelDeletable } from \"~/graphql/deleteModel/assertModelDeletable.js\";\nimport type { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport type { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport type { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport type { GetTaskUseCase, AbortTaskUseCase } from \"@webiny/background-tasks/api\";\n\nexport interface ICancelDeleteModelParams {\n    readonly getModel: GetModelUseCase.Interface;\n    readonly accessControl: AccessControl.Interface;\n    readonly keyValueStore: GlobalKeyValueStore.Interface;\n    readonly getTask: GetTaskUseCase.Interface;\n    readonly abortTask: AbortTaskUseCase.Interface;\n    readonly modelId: string;\n}\n\nexport const cancelDeleteModel = async (\n    params: ICancelDeleteModelParams\n): Promise<IDeleteCmsModelTask> => {\n    const { getModel, accessControl, keyValueStore, getTask, abortTask, modelId } = params;\n\n    const modelResult = await getModel.execute(modelId);\n    if (modelResult.isFail()) {\n        throw modelResult.error;\n    }\n    const model = modelResult.value;\n\n    await assertModelDeletable({ accessControl, model });\n\n    const store = createDeleteModelStore(keyValueStore, model.tenant);\n    const existing = await store.get(model.modelId);\n    const taskId = existing?.task;\n\n    await store.remove(model.modelId);\n    if (!taskId) {\n        throw new WebinyError({\n            message: `Model \"${modelId}\" is not being deleted.`,\n            code: \"MODEL_NOT_BEING_DELETED\"\n        });\n    }\n\n    const task = await getTask.execute<IDeleteModelTaskInput, IDeleteModelTaskOutput>(taskId);\n    if (task?.definitionId !== DELETE_MODEL_TASK) {\n        throw new WebinyError({\n            message: `The task which is deleting a model cannot be found. Please check Step Functions for more info. Task id: ${taskId}`,\n            code: \"DELETE_MODEL_TASK_NOT_FOUND\",\n            data: {\n                model: model.modelId,\n                task: taskId\n            }\n        });\n    }\n\n    const abortResult = await abortTask.execute<IDeleteModelTaskInput, IDeleteModelTaskOutput>({\n        id: task.id,\n        message: \"User canceled the task.\"\n    });\n\n    const canceledTask = abortResult.value;\n\n    return {\n        id: canceledTask.id,\n        status: getStatus(canceledTask.taskStatus),\n        total: canceledTask.output?.total || 0,\n        deleted: canceledTask.output?.deleted || 0\n    };\n};\n"],"names":["cancelDeleteModel","params","getModel","accessControl","keyValueStore","getTask","abortTask","modelId","modelResult","model","assertModelDeletable","store","createDeleteModelStore","existing","taskId","WebinyError","task","DELETE_MODEL_TASK","abortResult","canceledTask","getStatus"],"mappings":";;;;;AAwBO,MAAMA,oBAAoB,OAC7BC;IAEA,MAAM,EAAEC,QAAQ,EAAEC,aAAa,EAAEC,aAAa,EAAEC,OAAO,EAAEC,SAAS,EAAEC,OAAO,EAAE,GAAGN;IAEhF,MAAMO,cAAc,MAAMN,SAAS,OAAO,CAACK;IAC3C,IAAIC,YAAY,MAAM,IAClB,MAAMA,YAAY,KAAK;IAE3B,MAAMC,QAAQD,YAAY,KAAK;IAE/B,MAAME,qBAAqB;QAAEP;QAAeM;IAAM;IAElD,MAAME,QAAQC,uBAAuBR,eAAeK,MAAM,MAAM;IAChE,MAAMI,WAAW,MAAMF,MAAM,GAAG,CAACF,MAAM,OAAO;IAC9C,MAAMK,SAASD,UAAU;IAEzB,MAAMF,MAAM,MAAM,CAACF,MAAM,OAAO;IAChC,IAAI,CAACK,QACD,MAAM,IAAIC,YAAY;QAClB,SAAS,CAAC,OAAO,EAAER,QAAQ,uBAAuB,CAAC;QACnD,MAAM;IACV;IAGJ,MAAMS,OAAO,MAAMX,QAAQ,OAAO,CAAgDS;IAClF,IAAIE,MAAM,iBAAiBC,mBACvB,MAAM,IAAIF,YAAY;QAClB,SAAS,CAAC,wGAAwG,EAAED,QAAQ;QAC5H,MAAM;QACN,MAAM;YACF,OAAOL,MAAM,OAAO;YACpB,MAAMK;QACV;IACJ;IAGJ,MAAMI,cAAc,MAAMZ,UAAU,OAAO,CAAgD;QACvF,IAAIU,KAAK,EAAE;QACX,SAAS;IACb;IAEA,MAAMG,eAAeD,YAAY,KAAK;IAEtC,OAAO;QACH,IAAIC,aAAa,EAAE;QACnB,QAAQC,UAAUD,aAAa,UAAU;QACzC,OAAOA,aAAa,MAAM,EAAE,SAAS;QACrC,SAASA,aAAa,MAAM,EAAE,WAAW;IAC7C;AACJ"}

package/graphql/deleteModel/fullyDeleteModel.d.ts

@@ -1,7 +1,15 @@
-import type { HcmsTasksContext } from "../../types.js";
+import type { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
 import type { IDeleteCmsModelTask } from "../../features/DeleteModelTask/types.js";
+import type { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import type { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import type { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
+import type { TriggerTaskUseCase } from "@webiny/background-tasks/api";
 export interface IFullyDeleteModelParams {
-    readonly context: Pick<HcmsTasksContext, "container">;
+    readonly getModel: GetModelUseCase.Interface;
+    readonly accessControl: AccessControl.Interface;
+    readonly keyValueStore: GlobalKeyValueStore.Interface;
+    readonly triggerTask: TriggerTaskUseCase.Interface;
+    readonly identityContext: IdentityContext.Interface;
     readonly modelId: string;
 }
 export declare const fullyDeleteModel: (params: IFullyDeleteModelParams) => Promise<IDeleteCmsModelTask>;

package/graphql/deleteModel/fullyDeleteModel.js

@@ -1,34 +1,21 @@
-import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
 import { createDeleteModelStore, createStoreValue } from "../../helpers/store.js";
 import { DELETE_MODEL_TASK } from "../../constants.js";
 import { getStatus } from "./status.js";
-import { NotAuthorizedError } from "@webiny/api-headless-cms/utils/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";
-import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
-import { TriggerTaskUseCase } from "@webiny/background-tasks/api";
+import { assertModelDeletable } from "./assertModelDeletable.js";
 const fullyDeleteModel = async (params)=>{
-    const { context, modelId } = params;
-    const modelResult = await context.container.resolve(GetModelUseCase).execute(modelId);
+    const { getModel, accessControl, keyValueStore, triggerTask, identityContext, modelId } = params;
+    const modelResult = await getModel.execute(modelId);
     if (modelResult.isFail()) throw modelResult.error;
     const model = modelResult.value;
     if (model.isPrivate) throw new Error("Cannot delete private model.");
-    const accessControl = context.container.resolve(AccessControl);
-    const canAccessModel = await accessControl.canAccessModel({
-        model,
-        rwd: "d"
+    await assertModelDeletable({
+        accessControl,
+        model
     });
-    if (!canAccessModel) throw new NotAuthorizedError(`Not allowed to access content model "${model.name}".`);
-    const canAccessEntry = await accessControl.canAccessEntry({
-        model,
-        rwd: "w"
-    });
-    if (!canAccessEntry) throw new NotAuthorizedError(`Not allowed to access "${model.modelId}" entries.`);
-    if (!model) throw new Error(`Model "${modelId}" not found.`);
-    const store = createDeleteModelStore(context.container.resolve(GlobalKeyValueStore), model.tenant);
+    const store = createDeleteModelStore(keyValueStore, model.tenant);
     const existing = await store.get(model.modelId);
     if (existing?.task) throw new Error(`Model "${modelId}" is already getting deleted. Task id: ${existing.task}.`);
-    const triggerResult = await context.container.resolve(TriggerTaskUseCase).execute({
+    const triggerResult = await triggerTask.execute({
         input: {
             modelId
         },
@@ -36,7 +23,7 @@ const fullyDeleteModel = async (params)=>{
         name: `Fully delete model: ${modelId}`
     });
     const task = triggerResult.value;
-    const identity = context.container.resolve(IdentityContext).getIdentity();
+    const identity = identityContext.getIdentity();
     await store.set(createStoreValue({
         ...model,
         identity: {

package/graphql/deleteModel/fullyDeleteModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/deleteModel/fullyDeleteModel.js","sources":["../../../src/graphql/deleteModel/fullyDeleteModel.ts"],"sourcesContent":["import type { HcmsTasksContext } from \"~/types.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\nimport type {\n    IDeleteCmsModelTask,\n    IDeleteModelTaskInput\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createDeleteModelStore, createStoreValue } from \"~/helpers/store.js\";\nimport { DELETE_MODEL_TASK } from \"~/constants.js\";\nimport { getStatus } from \"~/graphql/deleteModel/status.js\";\nimport { NotAuthorizedError } from \"@webiny/api-headless-cms/utils/errors.js\";\nimport { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport { TriggerTaskUseCase } from \"@webiny/background-tasks/api\";\n\nexport interface IFullyDeleteModelParams {\n    readonly context: Pick<HcmsTasksContext, \"container\">;\n    readonly modelId: string;\n}\n\nexport const fullyDeleteModel = async (\n    params: IFullyDeleteModelParams\n): Promise<IDeleteCmsModelTask> => {\n    const { context, modelId } = params;\n\n    const modelResult = await context.container.resolve(GetModelUseCase).execute(modelId);\n    if (modelResult.isFail()) {\n        throw modelResult.error;\n    }\n    const model = modelResult.value;\n\n    if (model.isPrivate) {\n        throw new Error(`Cannot delete private model.`);\n    }\n\n    const accessControl = context.container.resolve(AccessControl);\n    const canAccessModel = await accessControl.canAccessModel({ model, rwd: \"d\" });\n    if (!canAccessModel) {\n        throw new NotAuthorizedError(`Not allowed to access content model \"${model.name}\".`);\n    }\n\n    const canAccessEntry = await accessControl.canAccessEntry({ model, rwd: \"w\" });\n    if (!canAccessEntry) {\n        throw new NotAuthorizedError(`Not allowed to access \"${model.modelId}\" entries.`);\n    }\n\n    if (!model) {\n        throw new Error(`Model \"${modelId}\" not found.`);\n    }\n    const store = createDeleteModelStore(\n        context.container.resolve(GlobalKeyValueStore),\n        model.tenant\n    );\n    const existing = await store.get(model.modelId);\n    if (existing?.task) {\n        throw new Error(\n            `Model \"${modelId}\" is already getting deleted. Task id: ${existing.task}.`\n        );\n    }\n\n    const triggerResult = await context.container\n        .resolve(TriggerTaskUseCase)\n        .execute<IDeleteModelTaskInput>({\n            input: {\n                modelId\n            },\n            definition: DELETE_MODEL_TASK,\n            name: `Fully delete model: ${modelId}`\n        });\n\n    const task = triggerResult.value;\n\n    const identity = context.container.resolve(IdentityContext).getIdentity();\n\n    await store.set(\n        createStoreValue({\n            ...model,\n            identity: {\n                id: identity.id,\n                type: identity.type,\n                displayName: identity.displayName\n            },\n            task: task.id\n        })\n    );\n\n    return {\n        id: task.id,\n        status: getStatus(task.taskStatus),\n        total: 0,\n        deleted: 0\n    };\n};\n"],"names":["fullyDeleteModel","params","context","modelId","modelResult","GetModelUseCase","model","Error","accessControl","AccessControl","canAccessModel","NotAuthorizedError","canAccessEntry","store","createDeleteModelStore","GlobalKeyValueStore","existing","triggerResult","TriggerTaskUseCase","DELETE_MODEL_TASK","task","identity","IdentityContext","createStoreValue","getStatus"],"mappings":";;;;;;;;;AAoBO,MAAMA,mBAAmB,OAC5BC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE,GAAGF;IAE7B,MAAMG,cAAc,MAAMF,QAAQ,SAAS,CAAC,OAAO,CAACG,iBAAiB,OAAO,CAACF;IAC7E,IAAIC,YAAY,MAAM,IAClB,MAAMA,YAAY,KAAK;IAE3B,MAAME,QAAQF,YAAY,KAAK;IAE/B,IAAIE,MAAM,SAAS,EACf,MAAM,IAAIC,MAAM;IAGpB,MAAMC,gBAAgBN,QAAQ,SAAS,CAAC,OAAO,CAACO;IAChD,MAAMC,iBAAiB,MAAMF,cAAc,cAAc,CAAC;QAAEF;QAAO,KAAK;IAAI;IAC5E,IAAI,CAACI,gBACD,MAAM,IAAIC,mBAAmB,CAAC,qCAAqC,EAAEL,MAAM,IAAI,CAAC,EAAE,CAAC;IAGvF,MAAMM,iBAAiB,MAAMJ,cAAc,cAAc,CAAC;QAAEF;QAAO,KAAK;IAAI;IAC5E,IAAI,CAACM,gBACD,MAAM,IAAID,mBAAmB,CAAC,uBAAuB,EAAEL,MAAM,OAAO,CAAC,UAAU,CAAC;IAGpF,IAAI,CAACA,OACD,MAAM,IAAIC,MAAM,CAAC,OAAO,EAAEJ,QAAQ,YAAY,CAAC;IAEnD,MAAMU,QAAQC,uBACVZ,QAAQ,SAAS,CAAC,OAAO,CAACa,sBAC1BT,MAAM,MAAM;IAEhB,MAAMU,WAAW,MAAMH,MAAM,GAAG,CAACP,MAAM,OAAO;IAC9C,IAAIU,UAAU,MACV,MAAM,IAAIT,MACN,CAAC,OAAO,EAAEJ,QAAQ,uCAAuC,EAAEa,SAAS,IAAI,CAAC,CAAC,CAAC;IAInF,MAAMC,gBAAgB,MAAMf,QAAQ,SAAS,CACxC,OAAO,CAACgB,oBACR,OAAO,CAAwB;QAC5B,OAAO;YACHf;QACJ;QACA,YAAYgB;QACZ,MAAM,CAAC,oBAAoB,EAAEhB,SAAS;IAC1C;IAEJ,MAAMiB,OAAOH,cAAc,KAAK;IAEhC,MAAMI,WAAWnB,QAAQ,SAAS,CAAC,OAAO,CAACoB,iBAAiB,WAAW;IAEvE,MAAMT,MAAM,GAAG,CACXU,iBAAiB;QACb,GAAGjB,KAAK;QACR,UAAU;YACN,IAAIe,SAAS,EAAE;YACf,MAAMA,SAAS,IAAI;YACnB,aAAaA,SAAS,WAAW;QACrC;QACA,MAAMD,KAAK,EAAE;IACjB;IAGJ,OAAO;QACH,IAAIA,KAAK,EAAE;QACX,QAAQI,UAAUJ,KAAK,UAAU;QACjC,OAAO;QACP,SAAS;IACb;AACJ"}
+{"version":3,"file":"graphql/deleteModel/fullyDeleteModel.js","sources":["../../../src/graphql/deleteModel/fullyDeleteModel.ts"],"sourcesContent":["import type { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\nimport type {\n    IDeleteCmsModelTask,\n    IDeleteModelTaskInput\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createDeleteModelStore, createStoreValue } from \"~/helpers/store.js\";\nimport { DELETE_MODEL_TASK } from \"~/constants.js\";\nimport { getStatus } from \"~/graphql/deleteModel/status.js\";\nimport { assertModelDeletable } from \"~/graphql/deleteModel/assertModelDeletable.js\";\nimport type { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport type { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport type { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport type { TriggerTaskUseCase } from \"@webiny/background-tasks/api\";\n\nexport interface IFullyDeleteModelParams {\n    readonly getModel: GetModelUseCase.Interface;\n    readonly accessControl: AccessControl.Interface;\n    readonly keyValueStore: GlobalKeyValueStore.Interface;\n    readonly triggerTask: TriggerTaskUseCase.Interface;\n    readonly identityContext: IdentityContext.Interface;\n    readonly modelId: string;\n}\n\nexport const fullyDeleteModel = async (\n    params: IFullyDeleteModelParams\n): Promise<IDeleteCmsModelTask> => {\n    const { getModel, accessControl, keyValueStore, triggerTask, identityContext, modelId } =\n        params;\n\n    const modelResult = await getModel.execute(modelId);\n    if (modelResult.isFail()) {\n        throw modelResult.error;\n    }\n    const model = modelResult.value;\n\n    if (model.isPrivate) {\n        throw new Error(`Cannot delete private model.`);\n    }\n\n    await assertModelDeletable({ accessControl, model });\n\n    const store = createDeleteModelStore(keyValueStore, model.tenant);\n    const existing = await store.get(model.modelId);\n    if (existing?.task) {\n        throw new Error(\n            `Model \"${modelId}\" is already getting deleted. Task id: ${existing.task}.`\n        );\n    }\n\n    const triggerResult = await triggerTask.execute<IDeleteModelTaskInput>({\n        input: {\n            modelId\n        },\n        definition: DELETE_MODEL_TASK,\n        name: `Fully delete model: ${modelId}`\n    });\n\n    const task = triggerResult.value;\n\n    const identity = identityContext.getIdentity();\n\n    await store.set(\n        createStoreValue({\n            ...model,\n            identity: {\n                id: identity.id,\n                type: identity.type,\n                displayName: identity.displayName\n            },\n            task: task.id\n        })\n    );\n\n    return {\n        id: task.id,\n        status: getStatus(task.taskStatus),\n        total: 0,\n        deleted: 0\n    };\n};\n"],"names":["fullyDeleteModel","params","getModel","accessControl","keyValueStore","triggerTask","identityContext","modelId","modelResult","model","Error","assertModelDeletable","store","createDeleteModelStore","existing","triggerResult","DELETE_MODEL_TASK","task","identity","createStoreValue","getStatus"],"mappings":";;;;AAuBO,MAAMA,mBAAmB,OAC5BC;IAEA,MAAM,EAAEC,QAAQ,EAAEC,aAAa,EAAEC,aAAa,EAAEC,WAAW,EAAEC,eAAe,EAAEC,OAAO,EAAE,GACnFN;IAEJ,MAAMO,cAAc,MAAMN,SAAS,OAAO,CAACK;IAC3C,IAAIC,YAAY,MAAM,IAClB,MAAMA,YAAY,KAAK;IAE3B,MAAMC,QAAQD,YAAY,KAAK;IAE/B,IAAIC,MAAM,SAAS,EACf,MAAM,IAAIC,MAAM;IAGpB,MAAMC,qBAAqB;QAAER;QAAeM;IAAM;IAElD,MAAMG,QAAQC,uBAAuBT,eAAeK,MAAM,MAAM;IAChE,MAAMK,WAAW,MAAMF,MAAM,GAAG,CAACH,MAAM,OAAO;IAC9C,IAAIK,UAAU,MACV,MAAM,IAAIJ,MACN,CAAC,OAAO,EAAEH,QAAQ,uCAAuC,EAAEO,SAAS,IAAI,CAAC,CAAC,CAAC;IAInF,MAAMC,gBAAgB,MAAMV,YAAY,OAAO,CAAwB;QACnE,OAAO;YACHE;QACJ;QACA,YAAYS;QACZ,MAAM,CAAC,oBAAoB,EAAET,SAAS;IAC1C;IAEA,MAAMU,OAAOF,cAAc,KAAK;IAEhC,MAAMG,WAAWZ,gBAAgB,WAAW;IAE5C,MAAMM,MAAM,GAAG,CACXO,iBAAiB;QACb,GAAGV,KAAK;QACR,UAAU;YACN,IAAIS,SAAS,EAAE;YACf,MAAMA,SAAS,IAAI;YACnB,aAAaA,SAAS,WAAW;QACrC;QACA,MAAMD,KAAK,EAAE;IACjB;IAGJ,OAAO;QACH,IAAIA,KAAK,EAAE;QACX,QAAQG,UAAUH,KAAK,UAAU;QACjC,OAAO;QACP,SAAS;IACb;AACJ"}

package/graphql/deleteModel/getDeleteModelProgress.d.ts

@@ -1,7 +1,13 @@
-import type { HcmsTasksContext } from "../../types.js";
 import type { IDeleteCmsModelTask } from "../../features/DeleteModelTask/types.js";
+import type { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import type { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
+import type { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
+import type { GetTaskUseCase } from "@webiny/background-tasks/api";
 export interface IGetDeleteModelProgress {
-    readonly context: Pick<HcmsTasksContext, "container">;
+    readonly getModel: GetModelUseCase.Interface;
+    readonly accessControl: AccessControl.Interface;
+    readonly keyValueStore: GlobalKeyValueStore.Interface;
+    readonly getTask: GetTaskUseCase.Interface;
     readonly modelId: string;
 }
 export declare const getDeleteModelProgress: (params: IGetDeleteModelProgress) => Promise<IDeleteCmsModelTask>;

package/graphql/deleteModel/getDeleteModelProgress.js

@@ -3,16 +3,12 @@ import { NotFoundError } from "@webiny/api-graphql";
 import { createDeleteModelStore } from "../../helpers/store.js";
 import { DELETE_MODEL_TASK } from "../../constants.js";
 import { getStatus } from "./status.js";
-import { NotAuthorizedError } from "@webiny/api-headless-cms/utils/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";
-import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
-import { GetTaskUseCase } from "@webiny/background-tasks/api";
+import { assertModelDeletable } from "./assertModelDeletable.js";
 const getDeleteModelProgress = async (params)=>{
-    const { context, modelId } = params;
+    const { getModel, accessControl, keyValueStore, getTask, modelId } = params;
     let model;
     try {
-        const modelResult = await context.container.resolve(GetModelUseCase).execute(modelId);
+        const modelResult = await getModel.execute(modelId);
         if (modelResult.isFail()) throw modelResult.error;
         model = modelResult.value;
     } catch (ex) {
@@ -25,22 +21,15 @@ const getDeleteModelProgress = async (params)=>{
             }
         });
     }
-    const accessControl = context.container.resolve(AccessControl);
-    const canAccessModel = await accessControl.canAccessModel({
-        model,
-        rwd: "d"
+    await assertModelDeletable({
+        accessControl,
+        model
     });
-    if (!canAccessModel) throw new NotAuthorizedError(`Not allowed to access content model "${model.name}".`);
-    const canAccessEntry = await accessControl.canAccessEntry({
-        model,
-        rwd: "w"
-    });
-    if (!canAccessEntry) throw new NotAuthorizedError(`Not allowed to access "${model.modelId}" entries.`);
-    const store = createDeleteModelStore(context.container.resolve(GlobalKeyValueStore), model.tenant);
+    const store = createDeleteModelStore(keyValueStore, model.tenant);
     const existing = await store.get(model.modelId);
     const taskId = existing?.task;
     if (!taskId) throw new Error(`Model "${modelId}" is not being deleted.`);
-    const task = await context.container.resolve(GetTaskUseCase).execute(taskId);
+    const task = await getTask.execute(taskId);
     if (task?.definitionId !== DELETE_MODEL_TASK) throw new WebinyError({
         message: "The task which is deleting a model cannot be found.",
         code: "DELETE_MODEL_TASK_NOT_FOUND",

package/graphql/deleteModel/getDeleteModelProgress.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/deleteModel/getDeleteModelProgress.js","sources":["../../../src/graphql/deleteModel/getDeleteModelProgress.ts"],"sourcesContent":["import type { HcmsTasksContext } from \"~/types.js\";\nimport { WebinyError } from \"@webiny/error\";\nimport { NotFoundError } from \"@webiny/api-graphql\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type {\n    IDeleteCmsModelTask,\n    IDeleteModelTaskInput,\n    IDeleteModelTaskOutput\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createDeleteModelStore } from \"~/helpers/store.js\";\nimport { DELETE_MODEL_TASK } from \"~/constants.js\";\nimport { getStatus } from \"~/graphql/deleteModel/status.js\";\nimport { NotAuthorizedError } from \"@webiny/api-headless-cms/utils/errors.js\";\nimport { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport { GetTaskUseCase } from \"@webiny/background-tasks/api\";\n\nexport interface IGetDeleteModelProgress {\n    readonly context: Pick<HcmsTasksContext, \"container\">;\n    readonly modelId: string;\n}\n\nexport const getDeleteModelProgress = async (\n    params: IGetDeleteModelProgress\n): Promise<IDeleteCmsModelTask> => {\n    const { context, modelId } = params;\n\n    let model: CmsModel;\n    try {\n        const modelResult = await context.container.resolve(GetModelUseCase).execute(modelId);\n        if (modelResult.isFail()) {\n            throw modelResult.error;\n        }\n        model = modelResult.value;\n    } catch (ex) {\n        if (ex instanceof NotFoundError === false) {\n            throw ex;\n        }\n        throw new WebinyError({\n            message: \"Model not found. It must have been deleted already.\",\n            code: \"MODEL_ALREADY_DELETED_FOUND\",\n            data: {\n                model: modelId\n            }\n        });\n    }\n\n    const accessControl = context.container.resolve(AccessControl);\n    const canAccessModel = await accessControl.canAccessModel({ model, rwd: \"d\" });\n    if (!canAccessModel) {\n        throw new NotAuthorizedError(`Not allowed to access content model \"${model.name}\".`);\n    }\n\n    const canAccessEntry = await accessControl.canAccessEntry({ model, rwd: \"w\" });\n    if (!canAccessEntry) {\n        throw new NotAuthorizedError(`Not allowed to access \"${model.modelId}\" entries.`);\n    }\n\n    const store = createDeleteModelStore(\n        context.container.resolve(GlobalKeyValueStore),\n        model.tenant\n    );\n    const existing = await store.get(model.modelId);\n\n    const taskId = existing?.task;\n    if (!taskId) {\n        throw new Error(`Model \"${modelId}\" is not being deleted.`);\n    }\n\n    const task = await context.container\n        .resolve(GetTaskUseCase)\n        .execute<IDeleteModelTaskInput, IDeleteModelTaskOutput>(taskId);\n    if (task?.definitionId !== DELETE_MODEL_TASK) {\n        throw new WebinyError({\n            message: `The task which is deleting a model cannot be found.`,\n            code: \"DELETE_MODEL_TASK_NOT_FOUND\",\n            data: {\n                model: model.modelId,\n                task: taskId\n            }\n        });\n    }\n    return {\n        id: task.id,\n        status: getStatus(task.taskStatus),\n        total: task.output?.total || 0,\n        deleted: task.output?.deleted || 0\n    };\n};\n"],"names":["getDeleteModelProgress","params","context","modelId","model","modelResult","GetModelUseCase","ex","NotFoundError","WebinyError","accessControl","AccessControl","canAccessModel","NotAuthorizedError","canAccessEntry","store","createDeleteModelStore","GlobalKeyValueStore","existing","taskId","Error","task","GetTaskUseCase","DELETE_MODEL_TASK","getStatus"],"mappings":";;;;;;;;;;AAuBO,MAAMA,yBAAyB,OAClCC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE,GAAGF;IAE7B,IAAIG;IACJ,IAAI;QACA,MAAMC,cAAc,MAAMH,QAAQ,SAAS,CAAC,OAAO,CAACI,iBAAiB,OAAO,CAACH;QAC7E,IAAIE,YAAY,MAAM,IAClB,MAAMA,YAAY,KAAK;QAE3BD,QAAQC,YAAY,KAAK;IAC7B,EAAE,OAAOE,IAAI;QACT,IAAIA,cAAcC,kBAAkB,OAChC,MAAMD;QAEV,MAAM,IAAIE,YAAY;YAClB,SAAS;YACT,MAAM;YACN,MAAM;gBACF,OAAON;YACX;QACJ;IACJ;IAEA,MAAMO,gBAAgBR,QAAQ,SAAS,CAAC,OAAO,CAACS;IAChD,MAAMC,iBAAiB,MAAMF,cAAc,cAAc,CAAC;QAAEN;QAAO,KAAK;IAAI;IAC5E,IAAI,CAACQ,gBACD,MAAM,IAAIC,mBAAmB,CAAC,qCAAqC,EAAET,MAAM,IAAI,CAAC,EAAE,CAAC;IAGvF,MAAMU,iBAAiB,MAAMJ,cAAc,cAAc,CAAC;QAAEN;QAAO,KAAK;IAAI;IAC5E,IAAI,CAACU,gBACD,MAAM,IAAID,mBAAmB,CAAC,uBAAuB,EAAET,MAAM,OAAO,CAAC,UAAU,CAAC;IAGpF,MAAMW,QAAQC,uBACVd,QAAQ,SAAS,CAAC,OAAO,CAACe,sBAC1Bb,MAAM,MAAM;IAEhB,MAAMc,WAAW,MAAMH,MAAM,GAAG,CAACX,MAAM,OAAO;IAE9C,MAAMe,SAASD,UAAU;IACzB,IAAI,CAACC,QACD,MAAM,IAAIC,MAAM,CAAC,OAAO,EAAEjB,QAAQ,uBAAuB,CAAC;IAG9D,MAAMkB,OAAO,MAAMnB,QAAQ,SAAS,CAC/B,OAAO,CAACoB,gBACR,OAAO,CAAgDH;IAC5D,IAAIE,MAAM,iBAAiBE,mBACvB,MAAM,IAAId,YAAY;QAClB,SAAS;QACT,MAAM;QACN,MAAM;YACF,OAAOL,MAAM,OAAO;YACpB,MAAMe;QACV;IACJ;IAEJ,OAAO;QACH,IAAIE,KAAK,EAAE;QACX,QAAQG,UAAUH,KAAK,UAAU;QACjC,OAAOA,KAAK,MAAM,EAAE,SAAS;QAC7B,SAASA,KAAK,MAAM,EAAE,WAAW;IACrC;AACJ"}
+{"version":3,"file":"graphql/deleteModel/getDeleteModelProgress.js","sources":["../../../src/graphql/deleteModel/getDeleteModelProgress.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport { NotFoundError } from \"@webiny/api-graphql\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type {\n    IDeleteCmsModelTask,\n    IDeleteModelTaskInput,\n    IDeleteModelTaskOutput\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createDeleteModelStore } from \"~/helpers/store.js\";\nimport { DELETE_MODEL_TASK } from \"~/constants.js\";\nimport { getStatus } from \"~/graphql/deleteModel/status.js\";\nimport { assertModelDeletable } from \"~/graphql/deleteModel/assertModelDeletable.js\";\nimport type { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport type { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport type { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport type { GetTaskUseCase } from \"@webiny/background-tasks/api\";\n\nexport interface IGetDeleteModelProgress {\n    readonly getModel: GetModelUseCase.Interface;\n    readonly accessControl: AccessControl.Interface;\n    readonly keyValueStore: GlobalKeyValueStore.Interface;\n    readonly getTask: GetTaskUseCase.Interface;\n    readonly modelId: string;\n}\n\nexport const getDeleteModelProgress = async (\n    params: IGetDeleteModelProgress\n): Promise<IDeleteCmsModelTask> => {\n    const { getModel, accessControl, keyValueStore, getTask, modelId } = params;\n\n    let model: CmsModel;\n    try {\n        const modelResult = await getModel.execute(modelId);\n        if (modelResult.isFail()) {\n            throw modelResult.error;\n        }\n        model = modelResult.value;\n    } catch (ex) {\n        if (ex instanceof NotFoundError === false) {\n            throw ex;\n        }\n        throw new WebinyError({\n            message: \"Model not found. It must have been deleted already.\",\n            code: \"MODEL_ALREADY_DELETED_FOUND\",\n            data: {\n                model: modelId\n            }\n        });\n    }\n\n    await assertModelDeletable({ accessControl, model });\n\n    const store = createDeleteModelStore(keyValueStore, model.tenant);\n    const existing = await store.get(model.modelId);\n\n    const taskId = existing?.task;\n    if (!taskId) {\n        throw new Error(`Model \"${modelId}\" is not being deleted.`);\n    }\n\n    const task = await getTask.execute<IDeleteModelTaskInput, IDeleteModelTaskOutput>(taskId);\n    if (task?.definitionId !== DELETE_MODEL_TASK) {\n        throw new WebinyError({\n            message: `The task which is deleting a model cannot be found.`,\n            code: \"DELETE_MODEL_TASK_NOT_FOUND\",\n            data: {\n                model: model.modelId,\n                task: taskId\n            }\n        });\n    }\n    return {\n        id: task.id,\n        status: getStatus(task.taskStatus),\n        total: task.output?.total || 0,\n        deleted: task.output?.deleted || 0\n    };\n};\n"],"names":["getDeleteModelProgress","params","getModel","accessControl","keyValueStore","getTask","modelId","model","modelResult","ex","NotFoundError","WebinyError","assertModelDeletable","store","createDeleteModelStore","existing","taskId","Error","task","DELETE_MODEL_TASK","getStatus"],"mappings":";;;;;;AAyBO,MAAMA,yBAAyB,OAClCC;IAEA,MAAM,EAAEC,QAAQ,EAAEC,aAAa,EAAEC,aAAa,EAAEC,OAAO,EAAEC,OAAO,EAAE,GAAGL;IAErE,IAAIM;IACJ,IAAI;QACA,MAAMC,cAAc,MAAMN,SAAS,OAAO,CAACI;QAC3C,IAAIE,YAAY,MAAM,IAClB,MAAMA,YAAY,KAAK;QAE3BD,QAAQC,YAAY,KAAK;IAC7B,EAAE,OAAOC,IAAI;QACT,IAAIA,cAAcC,kBAAkB,OAChC,MAAMD;QAEV,MAAM,IAAIE,YAAY;YAClB,SAAS;YACT,MAAM;YACN,MAAM;gBACF,OAAOL;YACX;QACJ;IACJ;IAEA,MAAMM,qBAAqB;QAAET;QAAeI;IAAM;IAElD,MAAMM,QAAQC,uBAAuBV,eAAeG,MAAM,MAAM;IAChE,MAAMQ,WAAW,MAAMF,MAAM,GAAG,CAACN,MAAM,OAAO;IAE9C,MAAMS,SAASD,UAAU;IACzB,IAAI,CAACC,QACD,MAAM,IAAIC,MAAM,CAAC,OAAO,EAAEX,QAAQ,uBAAuB,CAAC;IAG9D,MAAMY,OAAO,MAAMb,QAAQ,OAAO,CAAgDW;IAClF,IAAIE,MAAM,iBAAiBC,mBACvB,MAAM,IAAIR,YAAY;QAClB,SAAS;QACT,MAAM;QACN,MAAM;YACF,OAAOJ,MAAM,OAAO;YACpB,MAAMS;QACV;IACJ;IAEJ,OAAO;QACH,IAAIE,KAAK,EAAE;QACX,QAAQE,UAAUF,KAAK,UAAU;QACjC,OAAOA,KAAK,MAAM,EAAE,SAAS;QAC7B,SAASA,KAAK,MAAM,EAAE,WAAW;IACrC;AACJ"}

package/graphql/deleteModel/index.d.ts

@@ -1,3 +1,22 @@
-import type { RequestContextInitializer } from "@webiny/event-handler-core";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/abstractions.js";
+import { Logger } from "@webiny/api-core/features/logger/index.js";
+import { CmsGraphQLSchemaPlugin, CmsGraphQLSchemaFactory } from "@webiny/api-headless-cms";
+import { HeadlessCms } from "@webiny/api-headless-cms/features/shared/abstractions.js";
 import type { HcmsTasksContext } from "../../types.js";
-export declare const createDeleteModelGraphQl: <T extends HcmsTasksContext = HcmsTasksContext>() => RequestContextInitializer.Interface;
+/**
+ * Contributes the fullyDeleteModel schema. Previously a `RequestContextInitializer` that built the
+ * plugin and then registered a `CmsGraphQLSchemaFactory` holding it; since `execute()` is already
+ * awaited by `generateSchema`, the readiness check and the plugin construction can simply live
+ * there instead.
+ */
+declare class DeleteModelGraphQLSchemaFactory implements CmsGraphQLSchemaFactory.Interface {
+    private readonly tenantContext;
+    private readonly headlessCms;
+    private readonly logger;
+    constructor(tenantContext: TenantContext.Interface, headlessCms: HeadlessCms.Interface, logger: Logger.Interface);
+    execute(): Promise<CmsGraphQLSchemaPlugin<HcmsTasksContext>[]>;
+}
+export declare const DeleteModelGraphQLSchemaFactoryImpl: typeof DeleteModelGraphQLSchemaFactory & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-headless-cms").ICmsGraphQLSchemaFactory>;
+};
+export {};

package/graphql/deleteModel/index.js

@@ -1,5 +1,7 @@
 import zod from "zod";
-import { CmsGraphQLSchemaFactory, CmsGraphQLSchemaPlugin, isHeadlessCmsReady } from "@webiny/api-headless-cms";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/abstractions.js";
+import { Logger } from "@webiny/api-core/features/logger/index.js";
+import { CmsGraphQLSchemaFactory, CmsGraphQLSchemaPlugin } from "@webiny/api-headless-cms";
 import { HeadlessCms } from "@webiny/api-headless-cms/features/shared/abstractions.js";
 import { DeleteModelOperations } from "./abstractions.js";
 import { ErrorResponse, Response, createResolverDecorator, resolve } from "@webiny/api-graphql";
@@ -25,12 +27,16 @@ const cancelValidation = zod.object({
 const getValidation = zod.object({
     modelId: zod.string()
 }).readonly();
-const createDeleteModelGraphQl = ()=>({
-        async init (inputContext) {
-            const ready = await isHeadlessCmsReady(inputContext);
-            if (!ready || !inputContext.container.resolve(HeadlessCms).MANAGE) return;
-            const plugin = new CmsGraphQLSchemaPlugin({
-                typeDefs: `
+class DeleteModelGraphQLSchemaFactory {
+    constructor(tenantContext, headlessCms, logger){
+        this.tenantContext = tenantContext;
+        this.headlessCms = headlessCms;
+        this.logger = logger;
+    }
+    async execute() {
+        if (!this.tenantContext.getTenant() || !this.headlessCms.MANAGE) return [];
+        const plugin = new CmsGraphQLSchemaPlugin({
+            typeDefs: `
                 enum DeleteCmsModelTaskStatus {
                     running
                     done
@@ -78,66 +84,75 @@ const createDeleteModelGraphQl = ()=>({
                     cancelFullyDeleteModel(modelId: ID!): CancelDeleteCmsModelResponse!
                 }
             `,
-                resolvers: {
-                    CmsContentModel: {
-                        isBeingDeleted: async (model, _, context)=>{
-                            try {
-                                return await context.container.resolve(DeleteModelOperations).isModelBeingDeleted(model.modelId);
-                            } catch (ex) {
-                                console.error(ex);
-                            }
-                            return true;
+            resolvers: {
+                CmsContentModel: {
+                    isBeingDeleted: async (model, _, context)=>{
+                        try {
+                            return await context.container.resolve(DeleteModelOperations).isModelBeingDeleted(model.modelId);
+                        } catch (ex) {
+                            this.logger.error({
+                                error: ex,
+                                modelId: model.modelId
+                            }, "Failed to read the delete-model status.");
                         }
-                    },
-                    Query: {
-                        getDeleteModelProgress: async (_, args, context)=>resolve(async ()=>{
-                                const input = getValidation.safeParse(args);
-                                if (input.error) throw createZodError(input.error);
-                                return context.container.resolve(DeleteModelOperations).getDeleteModelProgress(input.data.modelId);
-                            })
-                    },
-                    Mutation: {
-                        fullyDeleteModel: async (_, args, context)=>resolve(async ()=>{
-                                const input = deleteValidation.safeParse(args);
-                                if (input.error) throw createZodError(input.error);
-                                return context.container.resolve(DeleteModelOperations).fullyDeleteModel(input.data.modelId);
-                            }),
-                        cancelFullyDeleteModel: async (_, args, context)=>resolve(async ()=>{
-                                const input = cancelValidation.safeParse(args);
-                                if (input.error) throw createZodError(input.error);
-                                return context.container.resolve(DeleteModelOperations).cancelFullyDeleteModel(input.data.modelId);
-                            })
+                        return true;
                     }
                 },
-                resolverDecorators: {
-                    ["Query.listContentModels"]: [
-                        createResolverDecorator((resolver)=>async (parent, args, context, info)=>{
-                                const result = await resolver(parent, args, context, info);
-                                if (result.error || !Array.isArray(result.data)) return result;
-                                if (args?.includeBeingDeleted !== false) return result;
-                                const listed = result.data;
-                                try {
-                                    const beingDeletedList = await context.container.resolve(DeleteModelOperations).listModelsBeingDeleted();
-                                    return new Response(listed.filter((model)=>{
-                                        if (!model?.modelId) return false;
-                                        if (beingDeletedList.some((item)=>item.modelId === model.modelId)) return false;
-                                        return true;
-                                    }));
-                                } catch (ex) {
-                                    return new ErrorResponse(ex);
-                                }
-                            })
-                    ]
+                Query: {
+                    getDeleteModelProgress: async (_, args, context)=>resolve(async ()=>{
+                            const input = getValidation.safeParse(args);
+                            if (input.error) throw createZodError(input.error);
+                            return context.container.resolve(DeleteModelOperations).getDeleteModelProgress(input.data.modelId);
+                        })
+                },
+                Mutation: {
+                    fullyDeleteModel: async (_, args, context)=>resolve(async ()=>{
+                            const input = deleteValidation.safeParse(args);
+                            if (input.error) throw createZodError(input.error);
+                            return context.container.resolve(DeleteModelOperations).fullyDeleteModel(input.data.modelId);
+                        }),
+                    cancelFullyDeleteModel: async (_, args, context)=>resolve(async ()=>{
+                            const input = cancelValidation.safeParse(args);
+                            if (input.error) throw createZodError(input.error);
+                            return context.container.resolve(DeleteModelOperations).cancelFullyDeleteModel(input.data.modelId);
+                        })
                 }
-            });
-            plugin.name = "headless-cms.graphql.fullyDeleteModel";
-            inputContext.container.registerInstance(CmsGraphQLSchemaFactory, {
-                execute: ()=>[
-                        plugin
-                    ]
-            });
-        }
-    });
-export { createDeleteModelGraphQl };
+            },
+            resolverDecorators: {
+                ["Query.listContentModels"]: [
+                    createResolverDecorator((resolver)=>async (parent, args, context, info)=>{
+                            const result = await resolver(parent, args, context, info);
+                            if (result.error || !Array.isArray(result.data)) return result;
+                            if (args?.includeBeingDeleted !== false) return result;
+                            const listed = result.data;
+                            try {
+                                const beingDeletedList = await context.container.resolve(DeleteModelOperations).listModelsBeingDeleted();
+                                return new Response(listed.filter((model)=>{
+                                    if (!model?.modelId) return false;
+                                    if (beingDeletedList.some((item)=>item.modelId === model.modelId)) return false;
+                                    return true;
+                                }));
+                            } catch (ex) {
+                                return new ErrorResponse(ex);
+                            }
+                        })
+                ]
+            }
+        });
+        plugin.name = "headless-cms.graphql.fullyDeleteModel";
+        return [
+            plugin
+        ];
+    }
+}
+const DeleteModelGraphQLSchemaFactoryImpl = CmsGraphQLSchemaFactory.createImplementation({
+    implementation: DeleteModelGraphQLSchemaFactory,
+    dependencies: [
+        TenantContext,
+        HeadlessCms,
+        Logger
+    ]
+});
+export { DeleteModelGraphQLSchemaFactoryImpl };
 
 //# sourceMappingURL=index.js.map

package/graphql/deleteModel/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/deleteModel/index.js","sources":["../../../src/graphql/deleteModel/index.ts"],"sourcesContent":["import zod from \"zod\";\nimport type { RequestContextInitializer } from \"@webiny/event-handler-core\";\nimport {\n    CmsGraphQLSchemaPlugin,\n    CmsGraphQLSchemaFactory,\n    isHeadlessCmsReady\n} from \"@webiny/api-headless-cms\";\nimport { HeadlessCms } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { DeleteModelOperations } from \"~/graphql/deleteModel/abstractions.js\";\nimport type { HcmsTasksContext } from \"~/types.js\";\nimport { createResolverDecorator } from \"@webiny/api-graphql\";\nimport { ErrorResponse } from \"@webiny/api-graphql\";\nimport { resolve } from \"@webiny/api-graphql\";\nimport { Response } from \"@webiny/api-graphql\";\nimport { createZodError } from \"@webiny/utils\";\nimport type { IDeleteCmsModelTask } from \"~/features/DeleteModelTask/types.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { validateConfirmation } from \"~/helpers/confirmation.js\";\n\nconst deleteValidation = zod\n    .object({\n        modelId: zod.string(),\n        confirmation: zod.string()\n    })\n    .superRefine((value, context) => {\n        if (validateConfirmation(value)) {\n            return;\n        }\n        context.addIssue({\n            code: zod.ZodIssueCode.custom,\n            message: `Confirmation input does not match.`,\n            fatal: true,\n            path: [\"confirmation\"]\n        });\n    })\n    .readonly();\n\nconst cancelValidation = zod\n    .object({\n        modelId: zod.string()\n    })\n    .readonly();\n\nconst getValidation = zod\n    .object({\n        modelId: zod.string()\n    })\n    .readonly();\n\nexport const createDeleteModelGraphQl = <\n    T extends HcmsTasksContext = HcmsTasksContext\n>(): RequestContextInitializer.Interface => ({\n    async init(inputContext: T) {\n        const ready = await isHeadlessCmsReady(inputContext);\n\n        if (!ready || !inputContext.container.resolve(HeadlessCms).MANAGE) {\n            return;\n        }\n\n        const plugin = new CmsGraphQLSchemaPlugin<T>({\n            typeDefs: /* GraphQL */ `\n                enum DeleteCmsModelTaskStatus {\n                    running\n                    done\n                    error\n                    canceled\n                }\n                type DeleteCmsModelTask {\n                    id: ID!\n                    status: DeleteCmsModelTaskStatus!\n                    deleted: Int!\n                    total: Int!\n                }\n\n                type GetDeleteCmsModelProgressResponse {\n                    data: DeleteCmsModelTask\n                    error: CmsError\n                }\n\n                type FullyDeleteCmsModelResponse {\n                    data: DeleteCmsModelTask\n                    error: CmsError\n                }\n\n                type CancelDeleteCmsModelResponse {\n                    data: DeleteCmsModelTask\n                    error: CmsError\n                }\n\n                extend type CmsContentModel {\n                    isBeingDeleted: Boolean!\n                }\n\n                extend type Query {\n                    getDeleteModelProgress(modelId: ID!): GetDeleteCmsModelProgressResponse!\n                    listContentModels(\n                        includeBeingDeleted: Boolean = false\n                    ): CmsContentModelListResponse\n                }\n\n                extend type Mutation {\n                    fullyDeleteModel(\n                        modelId: ID!\n                        confirmation: String!\n                    ): FullyDeleteCmsModelResponse!\n                    cancelFullyDeleteModel(modelId: ID!): CancelDeleteCmsModelResponse!\n                }\n            `,\n            resolvers: {\n                CmsContentModel: {\n                    isBeingDeleted: async (model: CmsModel, _: unknown, context) => {\n                        try {\n                            return await context.container\n                                .resolve(DeleteModelOperations)\n                                .isModelBeingDeleted(model.modelId);\n                        } catch (ex) {\n                            console.error(ex);\n                        }\n                        return true;\n                    }\n                },\n                Query: {\n                    getDeleteModelProgress: async (_: unknown, args: unknown, context) => {\n                        return resolve<IDeleteCmsModelTask>(async () => {\n                            const input = getValidation.safeParse(args);\n                            if (input.error) {\n                                throw createZodError(input.error);\n                            }\n                            return context.container\n                                .resolve(DeleteModelOperations)\n                                .getDeleteModelProgress(input.data.modelId);\n                        });\n                    }\n                },\n                Mutation: {\n                    fullyDeleteModel: async (_: unknown, args: unknown, context) => {\n                        return resolve<IDeleteCmsModelTask>(async () => {\n                            const input = deleteValidation.safeParse(args);\n                            if (input.error) {\n                                throw createZodError(input.error);\n                            }\n                            return context.container\n                                .resolve(DeleteModelOperations)\n                                .fullyDeleteModel(input.data.modelId);\n                        });\n                    },\n                    cancelFullyDeleteModel: async (_: unknown, args: unknown, context) => {\n                        return resolve<IDeleteCmsModelTask>(async () => {\n                            const input = cancelValidation.safeParse(args);\n                            if (input.error) {\n                                throw createZodError(input.error);\n                            }\n                            return context.container\n                                .resolve(DeleteModelOperations)\n                                .cancelFullyDeleteModel(input.data.modelId);\n                        });\n                    }\n                }\n            },\n            resolverDecorators: {\n                [\"Query.listContentModels\"]: [\n                    createResolverDecorator<any, any, HcmsTasksContext>(\n                        resolver => async (parent, args, context, info) => {\n                            // TODO @bruno figure out how to fix these types\n                            const result = (await resolver(parent, args, context, info)) as any;\n                            if (result.error || !Array.isArray(result.data)) {\n                                return result;\n                            }\n\n                            if (args?.includeBeingDeleted !== false) {\n                                return result;\n                            }\n\n                            const listed = result.data as CmsModel[];\n\n                            try {\n                                const beingDeletedList = await context.container\n                                    .resolve(DeleteModelOperations)\n                                    .listModelsBeingDeleted();\n\n                                return new Response(\n                                    listed.filter(model => {\n                                        if (!model?.modelId) {\n                                            return false;\n                                        } else if (\n                                            beingDeletedList.some(\n                                                item => item.modelId === model.modelId\n                                            )\n                                        ) {\n                                            return false;\n                                        }\n                                        return true;\n                                    })\n                                );\n                            } catch (ex) {\n                                return new ErrorResponse(ex);\n                            }\n                        }\n                    )\n                ]\n            }\n        });\n        plugin.name = \"headless-cms.graphql.fullyDeleteModel\";\n        inputContext.container.registerInstance(CmsGraphQLSchemaFactory, {\n            execute: () => [plugin]\n        });\n    }\n});\n"],"names":["deleteValidation","zod","value","context","validateConfirmation","cancelValidation","getValidation","createDeleteModelGraphQl","inputContext","ready","isHeadlessCmsReady","HeadlessCms","plugin","CmsGraphQLSchemaPlugin","model","_","DeleteModelOperations","ex","console","args","resolve","input","createZodError","createResolverDecorator","resolver","parent","info","result","Array","listed","beingDeletedList","Response","item","ErrorResponse","CmsGraphQLSchemaFactory"],"mappings":";;;;;;;AAmBA,MAAMA,mBAAmBC,IAAAA,MACd,CAAC;IACJ,SAASA,IAAI,MAAM;IACnB,cAAcA,IAAI,MAAM;AAC5B,GACC,WAAW,CAAC,CAACC,OAAOC;IACjB,IAAIC,qBAAqBF,QACrB;IAEJC,QAAQ,QAAQ,CAAC;QACb,MAAMF,IAAI,YAAY,CAAC,MAAM;QAC7B,SAAS;QACT,OAAO;QACP,MAAM;YAAC;SAAe;IAC1B;AACJ,GACC,QAAQ;AAEb,MAAMI,mBAAmBJ,IAAAA,MACd,CAAC;IACJ,SAASA,IAAI,MAAM;AACvB,GACC,QAAQ;AAEb,MAAMK,gBAAgBL,IAAAA,MACX,CAAC;IACJ,SAASA,IAAI,MAAM;AACvB,GACC,QAAQ;AAEN,MAAMM,2BAA2B,IAEK;QACzC,MAAM,MAAKC,YAAe;YACtB,MAAMC,QAAQ,MAAMC,mBAAmBF;YAEvC,IAAI,CAACC,SAAS,CAACD,aAAa,SAAS,CAAC,OAAO,CAACG,aAAa,MAAM,EAC7D;YAGJ,MAAMC,SAAS,IAAIC,uBAA0B;gBACzC,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YA+CzB,CAAC;gBACD,WAAW;oBACP,iBAAiB;wBACb,gBAAgB,OAAOC,OAAiBC,GAAYZ;4BAChD,IAAI;gCACA,OAAO,MAAMA,QAAQ,SAAS,CACzB,OAAO,CAACa,uBACR,mBAAmB,CAACF,MAAM,OAAO;4BAC1C,EAAE,OAAOG,IAAI;gCACTC,QAAQ,KAAK,CAACD;4BAClB;4BACA,OAAO;wBACX;oBACJ;oBACA,OAAO;wBACH,wBAAwB,OAAOF,GAAYI,MAAehB,UAC/CiB,QAA6B;gCAChC,MAAMC,QAAQf,cAAc,SAAS,CAACa;gCACtC,IAAIE,MAAM,KAAK,EACX,MAAMC,eAAeD,MAAM,KAAK;gCAEpC,OAAOlB,QAAQ,SAAS,CACnB,OAAO,CAACa,uBACR,sBAAsB,CAACK,MAAM,IAAI,CAAC,OAAO;4BAClD;oBAER;oBACA,UAAU;wBACN,kBAAkB,OAAON,GAAYI,MAAehB,UACzCiB,QAA6B;gCAChC,MAAMC,QAAQrB,iBAAiB,SAAS,CAACmB;gCACzC,IAAIE,MAAM,KAAK,EACX,MAAMC,eAAeD,MAAM,KAAK;gCAEpC,OAAOlB,QAAQ,SAAS,CACnB,OAAO,CAACa,uBACR,gBAAgB,CAACK,MAAM,IAAI,CAAC,OAAO;4BAC5C;wBAEJ,wBAAwB,OAAON,GAAYI,MAAehB,UAC/CiB,QAA6B;gCAChC,MAAMC,QAAQhB,iBAAiB,SAAS,CAACc;gCACzC,IAAIE,MAAM,KAAK,EACX,MAAMC,eAAeD,MAAM,KAAK;gCAEpC,OAAOlB,QAAQ,SAAS,CACnB,OAAO,CAACa,uBACR,sBAAsB,CAACK,MAAM,IAAI,CAAC,OAAO;4BAClD;oBAER;gBACJ;gBACA,oBAAoB;oBAChB,CAAC,0BAA0B,EAAE;wBACzBE,wBACIC,CAAAA,WAAY,OAAOC,QAAQN,MAAMhB,SAASuB;gCAEtC,MAAMC,SAAU,MAAMH,SAASC,QAAQN,MAAMhB,SAASuB;gCACtD,IAAIC,OAAO,KAAK,IAAI,CAACC,MAAM,OAAO,CAACD,OAAO,IAAI,GAC1C,OAAOA;gCAGX,IAAIR,MAAM,wBAAwB,OAC9B,OAAOQ;gCAGX,MAAME,SAASF,OAAO,IAAI;gCAE1B,IAAI;oCACA,MAAMG,mBAAmB,MAAM3B,QAAQ,SAAS,CAC3C,OAAO,CAACa,uBACR,sBAAsB;oCAE3B,OAAO,IAAIe,SACPF,OAAO,MAAM,CAACf,CAAAA;wCACV,IAAI,CAACA,OAAO,SACR,OAAO;wCACJ,IACHgB,iBAAiB,IAAI,CACjBE,CAAAA,OAAQA,KAAK,OAAO,KAAKlB,MAAM,OAAO,GAG1C,OAAO;wCAEX,OAAO;oCACX;gCAER,EAAE,OAAOG,IAAI;oCACT,OAAO,IAAIgB,cAAchB;gCAC7B;4BACJ;qBAEP;gBACL;YACJ;YACAL,OAAO,IAAI,GAAG;YACdJ,aAAa,SAAS,CAAC,gBAAgB,CAAC0B,yBAAyB;gBAC7D,SAAS,IAAM;wBAACtB;qBAAO;YAC3B;QACJ;IACJ"}
+{"version":3,"file":"graphql/deleteModel/index.js","sources":["../../../src/graphql/deleteModel/index.ts"],"sourcesContent":["import zod from \"zod\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/abstractions.js\";\nimport { Logger } from \"@webiny/api-core/features/logger/index.js\";\nimport { CmsGraphQLSchemaPlugin, CmsGraphQLSchemaFactory } from \"@webiny/api-headless-cms\";\nimport { HeadlessCms } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { DeleteModelOperations } from \"~/graphql/deleteModel/abstractions.js\";\nimport type { HcmsTasksContext } from \"~/types.js\";\nimport { createResolverDecorator } from \"@webiny/api-graphql\";\nimport { ErrorResponse } from \"@webiny/api-graphql\";\nimport { resolve } from \"@webiny/api-graphql\";\nimport { Response } from \"@webiny/api-graphql\";\nimport { createZodError } from \"@webiny/utils\";\nimport type { IDeleteCmsModelTask } from \"~/features/DeleteModelTask/types.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { validateConfirmation } from \"~/helpers/confirmation.js\";\n\nconst deleteValidation = zod\n    .object({\n        modelId: zod.string(),\n        confirmation: zod.string()\n    })\n    .superRefine((value, context) => {\n        if (validateConfirmation(value)) {\n            return;\n        }\n        context.addIssue({\n            code: zod.ZodIssueCode.custom,\n            message: `Confirmation input does not match.`,\n            fatal: true,\n            path: [\"confirmation\"]\n        });\n    })\n    .readonly();\n\nconst cancelValidation = zod\n    .object({\n        modelId: zod.string()\n    })\n    .readonly();\n\nconst getValidation = zod\n    .object({\n        modelId: zod.string()\n    })\n    .readonly();\n\n/**\n * Contributes the fullyDeleteModel schema. Previously a `RequestContextInitializer` that built the\n * plugin and then registered a `CmsGraphQLSchemaFactory` holding it; since `execute()` is already\n * awaited by `generateSchema`, the readiness check and the plugin construction can simply live\n * there instead.\n */\nclass DeleteModelGraphQLSchemaFactory implements CmsGraphQLSchemaFactory.Interface {\n    constructor(\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly headlessCms: HeadlessCms.Interface,\n        private readonly logger: Logger.Interface\n    ) {}\n\n    async execute() {\n        type T = HcmsTasksContext;\n\n        // On a fresh project there is no tenant until installation completes; and the delete-model\n        // schema only belongs on the MANAGE endpoint. (`isHeadlessCmsReady` only checks the tenant.)\n        if (!this.tenantContext.getTenant() || !this.headlessCms.MANAGE) {\n            return [];\n        }\n\n        const plugin = new CmsGraphQLSchemaPlugin<T>({\n            typeDefs: /* GraphQL */ `\n                enum DeleteCmsModelTaskStatus {\n                    running\n                    done\n                    error\n                    canceled\n                }\n                type DeleteCmsModelTask {\n                    id: ID!\n                    status: DeleteCmsModelTaskStatus!\n                    deleted: Int!\n                    total: Int!\n                }\n\n                type GetDeleteCmsModelProgressResponse {\n                    data: DeleteCmsModelTask\n                    error: CmsError\n                }\n\n                type FullyDeleteCmsModelResponse {\n                    data: DeleteCmsModelTask\n                    error: CmsError\n                }\n\n                type CancelDeleteCmsModelResponse {\n                    data: DeleteCmsModelTask\n                    error: CmsError\n                }\n\n                extend type CmsContentModel {\n                    isBeingDeleted: Boolean!\n                }\n\n                extend type Query {\n                    getDeleteModelProgress(modelId: ID!): GetDeleteCmsModelProgressResponse!\n                    listContentModels(\n                        includeBeingDeleted: Boolean = false\n                    ): CmsContentModelListResponse\n                }\n\n                extend type Mutation {\n                    fullyDeleteModel(\n                        modelId: ID!\n                        confirmation: String!\n                    ): FullyDeleteCmsModelResponse!\n                    cancelFullyDeleteModel(modelId: ID!): CancelDeleteCmsModelResponse!\n                }\n            `,\n            resolvers: {\n                CmsContentModel: {\n                    isBeingDeleted: async (model: CmsModel, _: unknown, context) => {\n                        try {\n                            return await context.container\n                                .resolve(DeleteModelOperations)\n                                .isModelBeingDeleted(model.modelId);\n                        } catch (ex) {\n                            this.logger.error(\n                                { error: ex, modelId: model.modelId },\n                                \"Failed to read the delete-model status.\"\n                            );\n                        }\n                        return true;\n                    }\n                },\n                Query: {\n                    getDeleteModelProgress: async (_: unknown, args: unknown, context) => {\n                        return resolve<IDeleteCmsModelTask>(async () => {\n                            const input = getValidation.safeParse(args);\n                            if (input.error) {\n                                throw createZodError(input.error);\n                            }\n                            return context.container\n                                .resolve(DeleteModelOperations)\n                                .getDeleteModelProgress(input.data.modelId);\n                        });\n                    }\n                },\n                Mutation: {\n                    fullyDeleteModel: async (_: unknown, args: unknown, context) => {\n                        return resolve<IDeleteCmsModelTask>(async () => {\n                            const input = deleteValidation.safeParse(args);\n                            if (input.error) {\n                                throw createZodError(input.error);\n                            }\n                            return context.container\n                                .resolve(DeleteModelOperations)\n                                .fullyDeleteModel(input.data.modelId);\n                        });\n                    },\n                    cancelFullyDeleteModel: async (_: unknown, args: unknown, context) => {\n                        return resolve<IDeleteCmsModelTask>(async () => {\n                            const input = cancelValidation.safeParse(args);\n                            if (input.error) {\n                                throw createZodError(input.error);\n                            }\n                            return context.container\n                                .resolve(DeleteModelOperations)\n                                .cancelFullyDeleteModel(input.data.modelId);\n                        });\n                    }\n                }\n            },\n            resolverDecorators: {\n                [\"Query.listContentModels\"]: [\n                    createResolverDecorator<any, any, HcmsTasksContext>(\n                        resolver => async (parent, args, context, info) => {\n                            // TODO @bruno figure out how to fix these types\n                            const result = (await resolver(parent, args, context, info)) as any;\n                            if (result.error || !Array.isArray(result.data)) {\n                                return result;\n                            }\n\n                            if (args?.includeBeingDeleted !== false) {\n                                return result;\n                            }\n\n                            const listed = result.data as CmsModel[];\n\n                            try {\n                                const beingDeletedList = await context.container\n                                    .resolve(DeleteModelOperations)\n                                    .listModelsBeingDeleted();\n\n                                return new Response(\n                                    listed.filter(model => {\n                                        if (!model?.modelId) {\n                                            return false;\n                                        } else if (\n                                            beingDeletedList.some(\n                                                item => item.modelId === model.modelId\n                                            )\n                                        ) {\n                                            return false;\n                                        }\n                                        return true;\n                                    })\n                                );\n                            } catch (ex) {\n                                return new ErrorResponse(ex);\n                            }\n                        }\n                    )\n                ]\n            }\n        });\n        plugin.name = \"headless-cms.graphql.fullyDeleteModel\";\n        return [plugin];\n    }\n}\n\nexport const DeleteModelGraphQLSchemaFactoryImpl = CmsGraphQLSchemaFactory.createImplementation({\n    implementation: DeleteModelGraphQLSchemaFactory,\n    dependencies: [TenantContext, HeadlessCms, Logger]\n});\n"],"names":["deleteValidation","zod","value","context","validateConfirmation","cancelValidation","getValidation","DeleteModelGraphQLSchemaFactory","tenantContext","headlessCms","logger","plugin","CmsGraphQLSchemaPlugin","model","_","DeleteModelOperations","ex","args","resolve","input","createZodError","createResolverDecorator","resolver","parent","info","result","Array","listed","beingDeletedList","Response","item","ErrorResponse","DeleteModelGraphQLSchemaFactoryImpl","CmsGraphQLSchemaFactory","TenantContext","HeadlessCms","Logger"],"mappings":";;;;;;;;;AAgBA,MAAMA,mBAAmBC,IAAAA,MACd,CAAC;IACJ,SAASA,IAAI,MAAM;IACnB,cAAcA,IAAI,MAAM;AAC5B,GACC,WAAW,CAAC,CAACC,OAAOC;IACjB,IAAIC,qBAAqBF,QACrB;IAEJC,QAAQ,QAAQ,CAAC;QACb,MAAMF,IAAI,YAAY,CAAC,MAAM;QAC7B,SAAS;QACT,OAAO;QACP,MAAM;YAAC;SAAe;IAC1B;AACJ,GACC,QAAQ;AAEb,MAAMI,mBAAmBJ,IAAAA,MACd,CAAC;IACJ,SAASA,IAAI,MAAM;AACvB,GACC,QAAQ;AAEb,MAAMK,gBAAgBL,IAAAA,MACX,CAAC;IACJ,SAASA,IAAI,MAAM;AACvB,GACC,QAAQ;AAQb,MAAMM;IACF,YACqBC,aAAsC,EACtCC,WAAkC,EAClCC,MAAwB,CAC3C;aAHmBF,aAAa,GAAbA;aACAC,WAAW,GAAXA;aACAC,MAAM,GAANA;IAClB;IAEH,MAAM,UAAU;QAKZ,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAC3D,OAAO,EAAE;QAGb,MAAMC,SAAS,IAAIC,uBAA0B;YACzC,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YA+CzB,CAAC;YACD,WAAW;gBACP,iBAAiB;oBACb,gBAAgB,OAAOC,OAAiBC,GAAYX;wBAChD,IAAI;4BACA,OAAO,MAAMA,QAAQ,SAAS,CACzB,OAAO,CAACY,uBACR,mBAAmB,CAACF,MAAM,OAAO;wBAC1C,EAAE,OAAOG,IAAI;4BACT,IAAI,CAAC,MAAM,CAAC,KAAK,CACb;gCAAE,OAAOA;gCAAI,SAASH,MAAM,OAAO;4BAAC,GACpC;wBAER;wBACA,OAAO;oBACX;gBACJ;gBACA,OAAO;oBACH,wBAAwB,OAAOC,GAAYG,MAAed,UAC/Ce,QAA6B;4BAChC,MAAMC,QAAQb,cAAc,SAAS,CAACW;4BACtC,IAAIE,MAAM,KAAK,EACX,MAAMC,eAAeD,MAAM,KAAK;4BAEpC,OAAOhB,QAAQ,SAAS,CACnB,OAAO,CAACY,uBACR,sBAAsB,CAACI,MAAM,IAAI,CAAC,OAAO;wBAClD;gBAER;gBACA,UAAU;oBACN,kBAAkB,OAAOL,GAAYG,MAAed,UACzCe,QAA6B;4BAChC,MAAMC,QAAQnB,iBAAiB,SAAS,CAACiB;4BACzC,IAAIE,MAAM,KAAK,EACX,MAAMC,eAAeD,MAAM,KAAK;4BAEpC,OAAOhB,QAAQ,SAAS,CACnB,OAAO,CAACY,uBACR,gBAAgB,CAACI,MAAM,IAAI,CAAC,OAAO;wBAC5C;oBAEJ,wBAAwB,OAAOL,GAAYG,MAAed,UAC/Ce,QAA6B;4BAChC,MAAMC,QAAQd,iBAAiB,SAAS,CAACY;4BACzC,IAAIE,MAAM,KAAK,EACX,MAAMC,eAAeD,MAAM,KAAK;4BAEpC,OAAOhB,QAAQ,SAAS,CACnB,OAAO,CAACY,uBACR,sBAAsB,CAACI,MAAM,IAAI,CAAC,OAAO;wBAClD;gBAER;YACJ;YACA,oBAAoB;gBAChB,CAAC,0BAA0B,EAAE;oBACzBE,wBACIC,CAAAA,WAAY,OAAOC,QAAQN,MAAMd,SAASqB;4BAEtC,MAAMC,SAAU,MAAMH,SAASC,QAAQN,MAAMd,SAASqB;4BACtD,IAAIC,OAAO,KAAK,IAAI,CAACC,MAAM,OAAO,CAACD,OAAO,IAAI,GAC1C,OAAOA;4BAGX,IAAIR,MAAM,wBAAwB,OAC9B,OAAOQ;4BAGX,MAAME,SAASF,OAAO,IAAI;4BAE1B,IAAI;gCACA,MAAMG,mBAAmB,MAAMzB,QAAQ,SAAS,CAC3C,OAAO,CAACY,uBACR,sBAAsB;gCAE3B,OAAO,IAAIc,SACPF,OAAO,MAAM,CAACd,CAAAA;oCACV,IAAI,CAACA,OAAO,SACR,OAAO;oCACJ,IACHe,iBAAiB,IAAI,CACjBE,CAAAA,OAAQA,KAAK,OAAO,KAAKjB,MAAM,OAAO,GAG1C,OAAO;oCAEX,OAAO;gCACX;4BAER,EAAE,OAAOG,IAAI;gCACT,OAAO,IAAIe,cAAcf;4BAC7B;wBACJ;iBAEP;YACL;QACJ;QACAL,OAAO,IAAI,GAAG;QACd,OAAO;YAACA;SAAO;IACnB;AACJ;AAEO,MAAMqB,sCAAsCC,wBAAwB,oBAAoB,CAAC;IAC5F,gBAAgB1B;IAChB,cAAc;QAAC2B;QAAeC;QAAaC;KAAO;AACtD"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-tasks",
-	"version": "6.6.0-alpha.0",
+	"version": "6.6.0-alpha.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -17,28 +17,28 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-aco": "6.6.0-alpha.0",
-		"@webiny/api-graphql": "6.6.0-alpha.0",
-		"@webiny/api-headless-cms": "6.6.0-alpha.0",
-		"@webiny/api-headless-cms-bulk-actions": "6.6.0-alpha.0",
-		"@webiny/background-tasks": "6.6.0-alpha.0",
-		"@webiny/error": "6.6.0-alpha.0",
-		"@webiny/feature": "6.6.0-alpha.0",
-		"@webiny/utils": "6.6.0-alpha.0",
+		"@webiny/api-aco": "6.6.0-alpha.1",
+		"@webiny/api-graphql": "6.6.0-alpha.1",
+		"@webiny/api-headless-cms": "6.6.0-alpha.1",
+		"@webiny/api-headless-cms-bulk-actions": "6.6.0-alpha.1",
+		"@webiny/background-tasks": "6.6.0-alpha.1",
+		"@webiny/error": "6.6.0-alpha.1",
+		"@webiny/feature": "6.6.0-alpha.1",
+		"@webiny/utils": "6.6.0-alpha.1",
 		"graphql": "16.14.2",
 		"zod": "4.4.3"
 	},
 	"devDependencies": {
-		"@webiny/api-core": "6.6.0-alpha.0",
-		"@webiny/api-headless-cms-testing": "6.6.0-alpha.0",
-		"@webiny/api-opensearch": "6.6.0-alpha.0",
-		"@webiny/build-tools": "6.6.0-alpha.0",
-		"@webiny/event-handler-core": "6.6.0-alpha.0",
-		"@webiny/handler": "6.6.0-alpha.0",
-		"@webiny/plugins": "6.6.0-alpha.0",
-		"@webiny/project-utils": "6.6.0-alpha.0",
+		"@webiny/api-core": "6.6.0-alpha.1",
+		"@webiny/api-headless-cms-testing": "6.6.0-alpha.1",
+		"@webiny/api-opensearch": "6.6.0-alpha.1",
+		"@webiny/build-tools": "6.6.0-alpha.1",
+		"@webiny/event-handler-core": "6.6.0-alpha.1",
+		"@webiny/handler": "6.6.0-alpha.1",
+		"@webiny/plugins": "6.6.0-alpha.1",
+		"@webiny/wcp": "6.6.0-alpha.1",
 		"typescript": "7.0.2",
-		"vitest": "4.1.10"
+		"vitest": "4.1.11"
 	},
 	"publishConfig": {
 		"access": "public"

package/graphql/deleteModel/crud.d.ts

@@ -1,2 +0,0 @@
-import type { RequestContextInitializer } from "@webiny/event-handler-core";
-export declare const createDeleteModelCrud: () => RequestContextInitializer.Interface;

package/graphql/deleteModel/crud.js

@@ -1,56 +0,0 @@
-import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/abstractions.js";
-import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
-import { createCacheKey, createMemoryCache } from "@webiny/api-headless-cms/utils/index.js";
-import { DisableModelFeature } from "../../features/DisableModel/feature.js";
-import { createDeleteModelStore } from "../../helpers/store.js";
-import { fullyDeleteModel } from "./fullyDeleteModel.js";
-import { cancelDeleteModel } from "./cancelDeleteModel.js";
-import { getDeleteModelProgress } from "./getDeleteModelProgress.js";
-import { DeleteModelOperations } from "./abstractions.js";
-const createDeleteModelCrud = ()=>({
-        async init (context) {
-            const getTenant = ()=>context.container.resolve(TenantContext).getTenant().id;
-            const getStore = ()=>createDeleteModelStore(context.container.resolve(GlobalKeyValueStore), getTenant());
-            const cache = createMemoryCache();
-            const listModelsBeingDeleted = async ()=>{
-                const cacheKey = createCacheKey({
-                    tenant: getTenant(),
-                    type: "deleteModel"
-                });
-                return cache.getOrSet(cacheKey, ()=>getStore().list());
-            };
-            const isModelBeingDeleted = async (modelId)=>{
-                const items = await listModelsBeingDeleted();
-                return items.some((item)=>item.modelId === modelId);
-            };
-            const operations = {
-                listModelsBeingDeleted,
-                isModelBeingDeleted,
-                fullyDeleteModel: async (modelId)=>{
-                    const result = await fullyDeleteModel({
-                        context,
-                        modelId
-                    });
-                    cache.clear();
-                    return result;
-                },
-                cancelFullyDeleteModel: async (modelId)=>{
-                    const result = await cancelDeleteModel({
-                        context,
-                        modelId
-                    });
-                    cache.clear();
-                    return result;
-                },
-                getDeleteModelProgress: async (modelId)=>getDeleteModelProgress({
-                        context,
-                        modelId
-                    })
-            };
-            context.container.registerInstance(DeleteModelOperations, operations);
-            DisableModelFeature.register(context.container);
-        }
-    });
-export { createDeleteModelCrud };
-
-//# sourceMappingURL=crud.js.map

package/graphql/deleteModel/crud.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"graphql/deleteModel/crud.js","sources":["../../../src/graphql/deleteModel/crud.ts"],"sourcesContent":["import type { HcmsTasksContext } from \"~/types.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/abstractions.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport { createCacheKey } from \"@webiny/api-headless-cms/utils/index.js\";\nimport { createMemoryCache } from \"@webiny/api-headless-cms/utils/index.js\";\nimport type { IStoreValue } from \"~/features/DeleteModelTask/types.js\";\nimport type { RequestContextInitializer } from \"@webiny/event-handler-core\";\nimport { DisableModelFeature } from \"~/features/DisableModel/feature.js\";\nimport { createDeleteModelStore } from \"~/helpers/store.js\";\nimport { fullyDeleteModel } from \"~/graphql/deleteModel/fullyDeleteModel.js\";\nimport { cancelDeleteModel } from \"~/graphql/deleteModel/cancelDeleteModel.js\";\nimport { getDeleteModelProgress } from \"~/graphql/deleteModel/getDeleteModelProgress.js\";\nimport { DeleteModelOperations } from \"~/graphql/deleteModel/abstractions.js\";\n\nexport const createDeleteModelCrud = (): RequestContextInitializer.Interface => ({\n    async init(context: HcmsTasksContext) {\n        const getTenant = (): string => {\n            return context.container.resolve(TenantContext).getTenant().id;\n        };\n\n        const getStore = () => {\n            return createDeleteModelStore(\n                context.container.resolve(GlobalKeyValueStore),\n                getTenant()\n            );\n        };\n\n        const cache = createMemoryCache<Promise<IStoreValue[]>>();\n\n        const listModelsBeingDeleted = async (): Promise<IStoreValue[]> => {\n            const cacheKey = createCacheKey({\n                tenant: getTenant(),\n                type: \"deleteModel\"\n            });\n\n            return cache.getOrSet(cacheKey, () => getStore().list());\n        };\n\n        const isModelBeingDeleted = async (modelId: string): Promise<boolean> => {\n            const items = await listModelsBeingDeleted();\n            return items.some(item => item.modelId === modelId);\n        };\n\n        const operations: DeleteModelOperations.Interface = {\n            listModelsBeingDeleted,\n            isModelBeingDeleted,\n            fullyDeleteModel: async (modelId: string) => {\n                const result = await fullyDeleteModel({ context, modelId });\n                cache.clear();\n                return result;\n            },\n            cancelFullyDeleteModel: async (modelId: string) => {\n                const result = await cancelDeleteModel({ context, modelId });\n                cache.clear();\n                return result;\n            },\n            getDeleteModelProgress: async (modelId: string) => {\n                return getDeleteModelProgress({ context, modelId });\n            }\n        };\n\n        context.container.registerInstance(DeleteModelOperations, operations);\n\n        DisableModelFeature.register(context.container);\n    }\n});\n"],"names":["createDeleteModelCrud","context","getTenant","TenantContext","getStore","createDeleteModelStore","GlobalKeyValueStore","cache","createMemoryCache","listModelsBeingDeleted","cacheKey","createCacheKey","isModelBeingDeleted","modelId","items","item","operations","result","fullyDeleteModel","cancelDeleteModel","getDeleteModelProgress","DeleteModelOperations","DisableModelFeature"],"mappings":";;;;;;;;;AAcO,MAAMA,wBAAwB,IAA4C;QAC7E,MAAM,MAAKC,OAAyB;YAChC,MAAMC,YAAY,IACPD,QAAQ,SAAS,CAAC,OAAO,CAACE,eAAe,SAAS,GAAG,EAAE;YAGlE,MAAMC,WAAW,IACNC,uBACHJ,QAAQ,SAAS,CAAC,OAAO,CAACK,sBAC1BJ;YAIR,MAAMK,QAAQC;YAEd,MAAMC,yBAAyB;gBAC3B,MAAMC,WAAWC,eAAe;oBAC5B,QAAQT;oBACR,MAAM;gBACV;gBAEA,OAAOK,MAAM,QAAQ,CAACG,UAAU,IAAMN,WAAW,IAAI;YACzD;YAEA,MAAMQ,sBAAsB,OAAOC;gBAC/B,MAAMC,QAAQ,MAAML;gBACpB,OAAOK,MAAM,IAAI,CAACC,CAAAA,OAAQA,KAAK,OAAO,KAAKF;YAC/C;YAEA,MAAMG,aAA8C;gBAChDP;gBACAG;gBACA,kBAAkB,OAAOC;oBACrB,MAAMI,SAAS,MAAMC,iBAAiB;wBAAEjB;wBAASY;oBAAQ;oBACzDN,MAAM,KAAK;oBACX,OAAOU;gBACX;gBACA,wBAAwB,OAAOJ;oBAC3B,MAAMI,SAAS,MAAME,kBAAkB;wBAAElB;wBAASY;oBAAQ;oBAC1DN,MAAM,KAAK;oBACX,OAAOU;gBACX;gBACA,wBAAwB,OAAOJ,UACpBO,uBAAuB;wBAAEnB;wBAASY;oBAAQ;YAEzD;YAEAZ,QAAQ,SAAS,CAAC,gBAAgB,CAACoB,uBAAuBL;YAE1DM,oBAAoB,QAAQ,CAACrB,QAAQ,SAAS;QAClD;IACJ"}