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

package/graphql/deleteModel/cancelDeleteModel.js

@@ -1,37 +1,26 @@
 import { WebinyError } from "@webiny/error";
-import { createStoreKey } from "../../helpers/store.js";
+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 { assertModelDeletable } from "./assertModelDeletable.js";
 const cancelDeleteModel = async (params)=>{
-    const { context, modelId } = params;
-    const model = await context.cms.getModel(modelId);
-    const accessControl = context.container.resolve(AccessControl);
-    const canAccessModel = await accessControl.canAccessModel({
-        model,
-        rwd: "d"
+    const { getModel, accessControl, keyValueStore, getTask, abortTask, modelId } = params;
+    const modelResult = await getModel.execute(modelId);
+    if (modelResult.isFail()) throw modelResult.error;
+    const model = modelResult.value;
+    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"
+    const store = createDeleteModelStore(keyValueStore, model.tenant);
+    const existing = await store.get(model.modelId);
+    const taskId = existing?.task;
+    await store.remove(model.modelId);
+    if (!taskId) throw new WebinyError({
+        message: `Model "${modelId}" is not being deleted.`,
+        code: "MODEL_NOT_BEING_DELETED"
     });
-    if (!canAccessEntry) throw new NotAuthorizedError(`Not allowed to access "${model.modelId}" entries.`);
-    const storeKey = createStoreKey(model);
-    const result = await context.db.store.getValue(storeKey);
-    const taskId = result.data?.task;
-    await context.db.store.removeValue(storeKey);
-    if (!taskId) {
-        if (result.error) throw WebinyError.from(result.error, {
-            code: "DELETE_MODEL_NO_TASK_DEFINED"
-        });
-        throw new WebinyError({
-            message: `Model "${modelId}" is not being deleted.`,
-            code: "MODEL_NOT_BEING_DELETED"
-        });
-    }
-    const task = await context.tasks.getTask(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.tasks.abort({
+    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    IStoreValue\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createStoreKey } 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\";\n\nexport interface ICancelDeleteModelParams {\n    readonly context: Pick<HcmsTasksContext, \"cms\" | \"tasks\" | \"db\" | \"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 model = await context.cms.getModel(modelId);\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 storeKey = createStoreKey(model);\n\n    const result = await context.db.store.getValue<IStoreValue>(storeKey);\n\n    const taskId = result.data?.task;\n\n    await context.db.store.removeValue(storeKey);\n    if (!taskId) {\n        if (result.error) {\n            throw WebinyError.from(result.error, {\n                code: \"DELETE_MODEL_NO_TASK_DEFINED\"\n            });\n        }\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.tasks.getTask<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.tasks.abort<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","model","accessControl","AccessControl","canAccessModel","NotAuthorizedError","canAccessEntry","storeKey","createStoreKey","result","taskId","WebinyError","task","DELETE_MODEL_TASK","abortResult","canceledTask","getStatus"],"mappings":";;;;;;AAmBO,MAAMA,oBAAoB,OAC7BC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE,GAAGF;IAE7B,MAAMG,QAAQ,MAAMF,QAAQ,GAAG,CAAC,QAAQ,CAACC;IACzC,MAAME,gBAAgBH,QAAQ,SAAS,CAAC,OAAO,CAACI;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,WAAWC,eAAeP;IAEhC,MAAMQ,SAAS,MAAMV,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAcQ;IAE5D,MAAMG,SAASD,OAAO,IAAI,EAAE;IAE5B,MAAMV,QAAQ,EAAE,CAAC,KAAK,CAAC,WAAW,CAACQ;IACnC,IAAI,CAACG,QAAQ;QACT,IAAID,OAAO,KAAK,EACZ,MAAME,YAAY,IAAI,CAACF,OAAO,KAAK,EAAE;YACjC,MAAM;QACV;QAEJ,MAAM,IAAIE,YAAY;YAClB,SAAS,CAAC,OAAO,EAAEX,QAAQ,uBAAuB,CAAC;YACnD,MAAM;QACV;IACJ;IAEA,MAAMY,OAAO,MAAMb,QAAQ,KAAK,CAAC,OAAO,CAAgDW;IACxF,IAAIE,MAAM,iBAAiBC,mBACvB,MAAM,IAAIF,YAAY;QAClB,SAAS,CAAC,wGAAwG,EAAED,QAAQ;QAC5H,MAAM;QACN,MAAM;YACF,OAAOT,MAAM,OAAO;YACpB,MAAMS;QACV;IACJ;IAGJ,MAAMI,cAAc,MAAMf,QAAQ,KAAK,CAAC,KAAK,CAAgD;QACzF,IAAIa,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"}
+{"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, "cms" | "tasks" | "db" | "security">;
+    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,27 +1,21 @@
-import { createStoreKey, createStoreValue } from "../../helpers/store.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 { assertModelDeletable } from "./assertModelDeletable.js";
 const fullyDeleteModel = async (params)=>{
-    const { context, modelId } = params;
-    const model = await context.cms.getModel(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 canAccessModel = await context.cms.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 context.cms.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 storeKey = createStoreKey(model);
-    const result = await context.db.store.getValue(storeKey);
-    const taskId = result.data?.task;
-    if (taskId) throw new Error(`Model "${modelId}" is already getting deleted. Task id: ${taskId}.`);
-    const triggerResult = await context.tasks.trigger({
+    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 triggerTask.execute({
         input: {
             modelId
         },
@@ -29,8 +23,8 @@ const fullyDeleteModel = async (params)=>{
         name: `Fully delete model: ${modelId}`
     });
     const task = triggerResult.value;
-    const identity = context.security.getIdentity();
-    await context.db.store.storeValue(storeKey, createStoreValue({
+    const identity = identityContext.getIdentity();
+    await store.set(createStoreValue({
         ...model,
         identity: {
             id: identity.id,

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 type {\n    IDeleteCmsModelTask,\n    IDeleteModelTaskInput,\n    IStoreValue\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createStoreKey, 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\";\n\nexport interface IFullyDeleteModelParams {\n    readonly context: Pick<HcmsTasksContext, \"cms\" | \"tasks\" | \"db\" | \"security\">;\n    readonly modelId: string;\n}\n\nexport const fullyDeleteModel = async (\n    params: IFullyDeleteModelParams\n): Promise<IDeleteCmsModelTask> => {\n    const { context, modelId } = params;\n\n    const model = await context.cms.getModel(modelId);\n\n    if (model.isPrivate) {\n        throw new Error(`Cannot delete private model.`);\n    }\n\n    const canAccessModel = await context.cms.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 context.cms.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 storeKey = createStoreKey(model);\n    const result = await context.db.store.getValue<IStoreValue>(storeKey);\n    const taskId = result.data?.task;\n    if (taskId) {\n        throw new Error(`Model \"${modelId}\" is already getting deleted. Task id: ${taskId}.`);\n    }\n\n    const triggerResult = await context.tasks.trigger<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.security.getIdentity();\n\n    await context.db.store.storeValue(\n        storeKey,\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","model","Error","canAccessModel","NotAuthorizedError","canAccessEntry","storeKey","createStoreKey","result","taskId","triggerResult","DELETE_MODEL_TASK","task","identity","createStoreValue","getStatus"],"mappings":";;;;AAgBO,MAAMA,mBAAmB,OAC5BC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE,GAAGF;IAE7B,MAAMG,QAAQ,MAAMF,QAAQ,GAAG,CAAC,QAAQ,CAACC;IAEzC,IAAIC,MAAM,SAAS,EACf,MAAM,IAAIC,MAAM;IAGpB,MAAMC,iBAAiB,MAAMJ,QAAQ,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC;QAAEE;QAAO,KAAK;IAAI;IACxF,IAAI,CAACE,gBACD,MAAM,IAAIC,mBAAmB,CAAC,qCAAqC,EAAEH,MAAM,IAAI,CAAC,EAAE,CAAC;IAGvF,MAAMI,iBAAiB,MAAMN,QAAQ,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC;QAAEE;QAAO,KAAK;IAAI;IACxF,IAAI,CAACI,gBACD,MAAM,IAAID,mBAAmB,CAAC,uBAAuB,EAAEH,MAAM,OAAO,CAAC,UAAU,CAAC;IAGpF,IAAI,CAACA,OACD,MAAM,IAAIC,MAAM,CAAC,OAAO,EAAEF,QAAQ,YAAY,CAAC;IAEnD,MAAMM,WAAWC,eAAeN;IAChC,MAAMO,SAAS,MAAMT,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAcO;IAC5D,MAAMG,SAASD,OAAO,IAAI,EAAE;IAC5B,IAAIC,QACA,MAAM,IAAIP,MAAM,CAAC,OAAO,EAAEF,QAAQ,uCAAuC,EAAES,OAAO,CAAC,CAAC;IAGxF,MAAMC,gBAAgB,MAAMX,QAAQ,KAAK,CAAC,OAAO,CAAwB;QACrE,OAAO;YACHC;QACJ;QACA,YAAYW;QACZ,MAAM,CAAC,oBAAoB,EAAEX,SAAS;IAC1C;IAEA,MAAMY,OAAOF,cAAc,KAAK;IAEhC,MAAMG,WAAWd,QAAQ,QAAQ,CAAC,WAAW;IAE7C,MAAMA,QAAQ,EAAE,CAAC,KAAK,CAAC,UAAU,CAC7BO,UACAQ,iBAAiB;QACb,GAAGb,KAAK;QACR,UAAU;YACN,IAAIY,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"}
+{"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, "cms" | "tasks" | "db">;
+    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

@@ -1,14 +1,16 @@
 import { WebinyError } from "@webiny/error";
-import { NotFoundError } from "@webiny/handler-graphql";
-import { createStoreKey } from "../../helpers/store.js";
+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 { assertModelDeletable } from "./assertModelDeletable.js";
 const getDeleteModelProgress = async (params)=>{
-    const { context, modelId } = params;
+    const { getModel, accessControl, keyValueStore, getTask, modelId } = params;
     let model;
     try {
-        model = await context.cms.getModel(modelId);
+        const modelResult = await getModel.execute(modelId);
+        if (modelResult.isFail()) throw modelResult.error;
+        model = modelResult.value;
     } catch (ex) {
         if (ex instanceof NotFoundError === false) throw ex;
         throw new WebinyError({
@@ -19,21 +21,15 @@ const getDeleteModelProgress = async (params)=>{
             }
         });
     }
-    const canAccessModel = await context.cms.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 context.cms.accessControl.canAccessEntry({
-        model,
-        rwd: "w"
-    });
-    if (!canAccessEntry) throw new NotAuthorizedError(`Not allowed to access "${model.modelId}" entries.`);
-    const storeKey = createStoreKey(model);
-    const result = await context.db.store.getValue(storeKey);
-    const taskId = result.data?.task;
+    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.tasks.getTask(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/handler-graphql\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type {\n    IDeleteCmsModelTask,\n    IDeleteModelTaskInput,\n    IDeleteModelTaskOutput,\n    IStoreValue\n} from \"~/features/DeleteModelTask/types.js\";\nimport { createStoreKey } 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\";\n\nexport interface IGetDeleteModelProgress {\n    readonly context: Pick<HcmsTasksContext, \"cms\" | \"tasks\" | \"db\">;\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        model = await context.cms.getModel(modelId);\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 canAccessModel = await context.cms.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 context.cms.accessControl.canAccessEntry({ model, rwd: \"w\" });\n    if (!canAccessEntry) {\n        throw new NotAuthorizedError(`Not allowed to access \"${model.modelId}\" entries.`);\n    }\n\n    const storeKey = createStoreKey(model);\n    const result = await context.db.store.getValue<IStoreValue>(storeKey);\n\n    const taskId = result.data?.task;\n    if (!taskId) {\n        throw new Error(`Model \"${modelId}\" is not being deleted.`);\n    }\n\n    const task = await context.tasks.getTask<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","ex","NotFoundError","WebinyError","canAccessModel","NotAuthorizedError","canAccessEntry","storeKey","createStoreKey","result","taskId","Error","task","DELETE_MODEL_TASK","getStatus"],"mappings":";;;;;;AAoBO,MAAMA,yBAAyB,OAClCC;IAEA,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE,GAAGF;IAE7B,IAAIG;IACJ,IAAI;QACAA,QAAQ,MAAMF,QAAQ,GAAG,CAAC,QAAQ,CAACC;IACvC,EAAE,OAAOE,IAAI;QACT,IAAIA,cAAcC,kBAAkB,OAChC,MAAMD;QAEV,MAAM,IAAIE,YAAY;YAClB,SAAS;YACT,MAAM;YACN,MAAM;gBACF,OAAOJ;YACX;QACJ;IACJ;IAEA,MAAMK,iBAAiB,MAAMN,QAAQ,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC;QAAEE;QAAO,KAAK;IAAI;IACxF,IAAI,CAACI,gBACD,MAAM,IAAIC,mBAAmB,CAAC,qCAAqC,EAAEL,MAAM,IAAI,CAAC,EAAE,CAAC;IAGvF,MAAMM,iBAAiB,MAAMR,QAAQ,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC;QAAEE;QAAO,KAAK;IAAI;IACxF,IAAI,CAACM,gBACD,MAAM,IAAID,mBAAmB,CAAC,uBAAuB,EAAEL,MAAM,OAAO,CAAC,UAAU,CAAC;IAGpF,MAAMO,WAAWC,eAAeR;IAChC,MAAMS,SAAS,MAAMX,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAcS;IAE5D,MAAMG,SAASD,OAAO,IAAI,EAAE;IAC5B,IAAI,CAACC,QACD,MAAM,IAAIC,MAAM,CAAC,OAAO,EAAEZ,QAAQ,uBAAuB,CAAC;IAG9D,MAAMa,OAAO,MAAMd,QAAQ,KAAK,CAAC,OAAO,CAAgDY;IACxF,IAAIE,MAAM,iBAAiBC,mBACvB,MAAM,IAAIV,YAAY;QAClB,SAAS;QACT,MAAM;QACN,MAAM;YACF,OAAOH,MAAM,OAAO;YACpB,MAAMU;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"}
+{"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 { ContextPlugin } from "@webiny/api";
+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>() => ContextPlugin<T>;
+/**
+ * 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,7 +1,10 @@
 import zod from "zod";
-import { ContextPlugin } from "@webiny/api";
-import { CmsGraphQLSchemaPlugin, isHeadlessCmsReady } from "@webiny/api-headless-cms";
-import { ErrorResponse, Response, createResolverDecorator, resolve } from "@webiny/handler-graphql";
+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";
 import { createZodError } from "@webiny/utils";
 import { validateConfirmation } from "../../helpers/confirmation.js";
 const deleteValidation = zod.object({
@@ -24,10 +27,14 @@ const cancelValidation = zod.object({
 const getValidation = zod.object({
     modelId: zod.string()
 }).readonly();
-const createDeleteModelGraphQl = ()=>{
-    const contextPlugin = new ContextPlugin(async (inputContext)=>{
-        const ready = await isHeadlessCmsReady(inputContext);
-        if (!ready || !inputContext.cms.MANAGE) return;
+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 {
@@ -81,9 +88,12 @@ const createDeleteModelGraphQl = ()=>{
                 CmsContentModel: {
                     isBeingDeleted: async (model, _, context)=>{
                         try {
-                            return await context.cms.isModelBeingDeleted(model.modelId);
+                            return await context.container.resolve(DeleteModelOperations).isModelBeingDeleted(model.modelId);
                         } catch (ex) {
-                            console.error(ex);
+                            this.logger.error({
+                                error: ex,
+                                modelId: model.modelId
+                            }, "Failed to read the delete-model status.");
                         }
                         return true;
                     }
@@ -92,19 +102,19 @@ const createDeleteModelGraphQl = ()=>{
                     getDeleteModelProgress: async (_, args, context)=>resolve(async ()=>{
                             const input = getValidation.safeParse(args);
                             if (input.error) throw createZodError(input.error);
-                            return await context.cms.getDeleteModelProgress(input.data.modelId);
+                            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 await context.cms.fullyDeleteModel(input.data.modelId);
+                            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 await context.cms.cancelFullyDeleteModel(input.data.modelId);
+                            return context.container.resolve(DeleteModelOperations).cancelFullyDeleteModel(input.data.modelId);
                         })
                 }
             },
@@ -116,7 +126,7 @@ const createDeleteModelGraphQl = ()=>{
                             if (args?.includeBeingDeleted !== false) return result;
                             const listed = result.data;
                             try {
-                                const beingDeletedList = await context.cms.listModelsBeingDeleted();
+                                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;
@@ -130,11 +140,19 @@ const createDeleteModelGraphQl = ()=>{
             }
         });
         plugin.name = "headless-cms.graphql.fullyDeleteModel";
-        inputContext.plugins.register(plugin);
-    });
-    contextPlugin.name = "headless-cms.context.createDeleteModelGraphQl";
-    return contextPlugin;
-};
-export { createDeleteModelGraphQl };
+        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 { ContextPlugin } from \"@webiny/api\";\nimport { CmsGraphQLSchemaPlugin } from \"@webiny/api-headless-cms\";\nimport { isHeadlessCmsReady } from \"@webiny/api-headless-cms\";\nimport type { HcmsTasksContext } from \"~/types.js\";\nimport { createResolverDecorator } from \"@webiny/handler-graphql\";\nimport { ErrorResponse } from \"@webiny/handler-graphql\";\nimport { resolve } from \"@webiny/handler-graphql\";\nimport { Response } from \"@webiny/handler-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 = <T extends HcmsTasksContext = HcmsTasksContext>() => {\n    const contextPlugin = new ContextPlugin<T>(async inputContext => {\n        const ready = await isHeadlessCmsReady(inputContext);\n\n        if (!ready || !inputContext.cms.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.cms.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 await context.cms.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 await context.cms.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 await context.cms.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.cms.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.plugins.register(plugin);\n    });\n    contextPlugin.name = \"headless-cms.context.createDeleteModelGraphQl\";\n    return contextPlugin;\n};\n"],"names":["deleteValidation","zod","value","context","validateConfirmation","cancelValidation","getValidation","createDeleteModelGraphQl","contextPlugin","ContextPlugin","inputContext","ready","isHeadlessCmsReady","plugin","CmsGraphQLSchemaPlugin","model","_","ex","console","args","resolve","input","createZodError","createResolverDecorator","resolver","parent","info","result","Array","listed","beingDeletedList","Response","item","ErrorResponse"],"mappings":"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"}
+{"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":"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"}

package/helpers/store.d.ts

@@ -1,9 +1,14 @@
-import type { StorageKey } from "@webiny/db/types.js";
+import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/abstractions.js";
 import type { IStoreValue } from "../features/DeleteModelTask/types.js";
-export interface ICreateStoreKeyParams {
-    modelId: string;
-    tenant: string;
-}
-export declare const createStoreNamespace: (params: Pick<ICreateStoreKeyParams, "tenant">) => string;
-export declare const createStoreKey: (params: ICreateStoreKeyParams) => StorageKey;
 export declare const createStoreValue: (params: IStoreValue) => IStoreValue;
+export interface IDeleteModelStore {
+    list(): Promise<IStoreValue[]>;
+    get(modelId: string): Promise<IStoreValue | null>;
+    set(value: IStoreValue): Promise<void>;
+    remove(modelId: string): Promise<void>;
+}
+/**
+ * Delete-model tracking store, backed by the flavour-agnostic api-core key-value store (registered
+ * by both the DynamoDB and SQL cores). Replaces the old `@webiny/db` `DbInstance.store`.
+ */
+export declare const createDeleteModelStore: (store: GlobalKeyValueStore.Interface, tenant: string) => IDeleteModelStore;

package/helpers/store.js

@@ -1,11 +1,40 @@
-const createStoreNamespace = (params)=>`deletingCmsModel#T#${params.tenant}#`;
-const createStoreKey = (params)=>`${createStoreNamespace(params)}${params.modelId}`;
+const STORE_KEY = "cmsModelsBeingDeleted";
 const createStoreValue = (params)=>({
         modelId: params.modelId,
         task: params.task,
         identity: params.identity,
         tenant: params.tenant
     });
-export { createStoreKey, createStoreNamespace, createStoreValue };
+const createDeleteModelStore = (store, tenant)=>{
+    const options = {
+        scope: tenant
+    };
+    const readMap = async ()=>{
+        const result = await store.get(STORE_KEY, options);
+        return result.isFail() ? {} : result.value ?? {};
+    };
+    const writeMap = (map)=>store.set(STORE_KEY, map, options).then(()=>void 0);
+    return {
+        async list () {
+            return Object.values(await readMap());
+        },
+        async get (modelId) {
+            const map = await readMap();
+            return map[modelId] ?? null;
+        },
+        async set (value) {
+            const map = await readMap();
+            map[value.modelId] = value;
+            await writeMap(map);
+        },
+        async remove (modelId) {
+            const map = await readMap();
+            if (!(modelId in map)) return;
+            delete map[modelId];
+            await writeMap(map);
+        }
+    };
+};
+export { createDeleteModelStore, createStoreValue };
 
 //# sourceMappingURL=store.js.map

package/helpers/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers/store.js","sources":["../../src/helpers/store.ts"],"sourcesContent":["import type { StorageKey } from \"@webiny/db/types.js\";\nimport type { IStoreValue } from \"~/features/DeleteModelTask/types.js\";\n\nexport interface ICreateStoreKeyParams {\n    modelId: string;\n    tenant: string;\n}\n\nexport const createStoreNamespace = (params: Pick<ICreateStoreKeyParams, \"tenant\">) => {\n    return `deletingCmsModel#T#${params.tenant}#`;\n};\n\nexport const createStoreKey = (params: ICreateStoreKeyParams): StorageKey => {\n    return `${createStoreNamespace(params)}${params.modelId}`;\n};\n\nexport const createStoreValue = (params: IStoreValue): IStoreValue => {\n    return {\n        modelId: params.modelId,\n        task: params.task,\n        identity: params.identity,\n        tenant: params.tenant\n    };\n};\n"],"names":["createStoreNamespace","params","createStoreKey","createStoreValue"],"mappings":"AAQO,MAAMA,uBAAuB,CAACC,SAC1B,CAAC,mBAAmB,EAAEA,OAAO,MAAM,CAAC,CAAC,CAAC;AAG1C,MAAMC,iBAAiB,CAACD,SACpB,GAAGD,qBAAqBC,UAAUA,OAAO,OAAO,EAAE;AAGtD,MAAME,mBAAmB,CAACF,SACtB;QACH,SAASA,OAAO,OAAO;QACvB,MAAMA,OAAO,IAAI;QACjB,UAAUA,OAAO,QAAQ;QACzB,QAAQA,OAAO,MAAM;IACzB"}
+{"version":3,"file":"helpers/store.js","sources":["../../src/helpers/store.ts"],"sourcesContent":["import { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/abstractions.js\";\nimport type { IStoreValue } from \"~/features/DeleteModelTask/types.js\";\n\n/**\n * A single key per tenant holds the map of models currently being deleted (modelId -> record). The\n * api-core key-value store is get/set/delete only (no prefix scan), so we keep ONE map entry and\n * enumerate in memory rather than one entry per model. Tenant isolation comes from the store scope.\n */\nconst STORE_KEY = \"cmsModelsBeingDeleted\";\n\ntype StoreMap = Record<string, IStoreValue>;\n\nexport const createStoreValue = (params: IStoreValue): IStoreValue => {\n    return {\n        modelId: params.modelId,\n        task: params.task,\n        identity: params.identity,\n        tenant: params.tenant\n    };\n};\n\nexport interface IDeleteModelStore {\n    list(): Promise<IStoreValue[]>;\n    get(modelId: string): Promise<IStoreValue | null>;\n    set(value: IStoreValue): Promise<void>;\n    remove(modelId: string): Promise<void>;\n}\n\n/**\n * Delete-model tracking store, backed by the flavour-agnostic api-core key-value store (registered\n * by both the DynamoDB and SQL cores). Replaces the old `@webiny/db` `DbInstance.store`.\n */\nexport const createDeleteModelStore = (\n    store: GlobalKeyValueStore.Interface,\n    tenant: string\n): IDeleteModelStore => {\n    const options = { scope: tenant };\n\n    const readMap = async (): Promise<StoreMap> => {\n        const result = await store.get<StoreMap>(STORE_KEY, options);\n        // A missing key is a failed Result (KeyNotFound) — treat as an empty map.\n        return result.isFail() ? {} : (result.value ?? {});\n    };\n\n    const writeMap = (map: StoreMap): Promise<void> => {\n        return store.set(STORE_KEY, map, options).then(() => undefined);\n    };\n\n    return {\n        async list() {\n            return Object.values(await readMap());\n        },\n        async get(modelId) {\n            const map = await readMap();\n            return map[modelId] ?? null;\n        },\n        async set(value) {\n            const map = await readMap();\n            map[value.modelId] = value;\n            await writeMap(map);\n        },\n        async remove(modelId) {\n            const map = await readMap();\n            if (!(modelId in map)) {\n                return;\n            }\n            delete map[modelId];\n            await writeMap(map);\n        }\n    };\n};\n"],"names":["STORE_KEY","createStoreValue","params","createDeleteModelStore","store","tenant","options","readMap","result","writeMap","map","undefined","Object","modelId","value"],"mappings":"AAQA,MAAMA,YAAY;AAIX,MAAMC,mBAAmB,CAACC,SACtB;QACH,SAASA,OAAO,OAAO;QACvB,MAAMA,OAAO,IAAI;QACjB,UAAUA,OAAO,QAAQ;QACzB,QAAQA,OAAO,MAAM;IACzB;AAcG,MAAMC,yBAAyB,CAClCC,OACAC;IAEA,MAAMC,UAAU;QAAE,OAAOD;IAAO;IAEhC,MAAME,UAAU;QACZ,MAAMC,SAAS,MAAMJ,MAAM,GAAG,CAAWJ,WAAWM;QAEpD,OAAOE,OAAO,MAAM,KAAK,CAAC,IAAKA,OAAO,KAAK,IAAI,CAAC;IACpD;IAEA,MAAMC,WAAW,CAACC,MACPN,MAAM,GAAG,CAACJ,WAAWU,KAAKJ,SAAS,IAAI,CAAC,IAAMK;IAGzD,OAAO;QACH,MAAM;YACF,OAAOC,OAAO,MAAM,CAAC,MAAML;QAC/B;QACA,MAAM,KAAIM,OAAO;YACb,MAAMH,MAAM,MAAMH;YAClB,OAAOG,GAAG,CAACG,QAAQ,IAAI;QAC3B;QACA,MAAM,KAAIC,KAAK;YACX,MAAMJ,MAAM,MAAMH;YAClBG,GAAG,CAACI,MAAM,OAAO,CAAC,GAAGA;YACrB,MAAML,SAASC;QACnB;QACA,MAAM,QAAOG,OAAO;YAChB,MAAMH,MAAM,MAAMH;YAClB,IAAI,CAAEM,CAAAA,WAAWH,GAAE,GACf;YAEJ,OAAOA,GAAG,CAACG,QAAQ;YACnB,MAAMJ,SAASC;QACnB;IACJ;AACJ"}

package/index.d.ts

@@ -1,2 +1 @@
-export declare const createDeleteModelTask: () => import("@webiny/api").ContextPlugin<import("./types").HcmsTasksContext>[];
-export declare const createHcmsTasks: () => (import("@webiny/api").ContextPlugin<import("@webiny/api/types").Context> | (import("@webiny/api").ContextPlugin<import("@webiny/api/types").Context> | (import("@webiny/handler-aws/eventBridge").EventBridgeEventHandler<"WebinyEmptyTrashBin", Record<string, any>, any> | import("@webiny/handler/index").HandlerOnRequestPlugin<import("@webiny/handler/types").Context>)[] | import("@webiny/handler/index").BeforeHandlerPlugin<import("@webiny/api-headless-cms-bulk-actions/types").HcmsBulkActionsContext>)[])[];
+export { HcmsTasksFeature } from "./HcmsTasksFeature.js";

package/index.js

@@ -1,22 +1 @@
-import { createEmptyTrashBinsTask, createHcmsBulkActions } from "@webiny/api-headless-cms-bulk-actions";
-import { createContextPlugin } from "@webiny/api";
-import { DeleteModelTaskFeature } from "./features/DeleteModelTask/feature.js";
-import { createDeleteModelCrud } from "./graphql/deleteModel/crud.js";
-import { createDeleteModelGraphQl } from "./graphql/deleteModel/index.js";
-const createDeleteModelTask = ()=>[
-        createDeleteModelCrud(),
-        createDeleteModelGraphQl(),
-        createContextPlugin((context)=>{
-            DeleteModelTaskFeature.register(context.container);
-        })
-    ];
-const createHcmsTasks = ()=>[
-        createHcmsBulkActions({
-            batchSize: 100
-        }),
-        createEmptyTrashBinsTask(),
-        createDeleteModelTask()
-    ];
-export { createDeleteModelTask, createHcmsTasks };
-
-//# sourceMappingURL=index.js.map
+export { HcmsTasksFeature } from "./HcmsTasksFeature.js";