@webiny/api-headless-cms 5.41.0-dbt.0 → 5.41.1-beta.0

package/constants.d.ts

@@ -1,5 +1,6 @@
 import { CmsIdentity } from "./types";
 export declare const ROOT_FOLDER = "root";
+export declare const CMS_MODEL_SINGLETON_TAG = "singleton";
 export declare const ENTRY_META_FIELDS: readonly ["createdOn", "modifiedOn", "savedOn", "deletedOn", "restoredOn", "firstPublishedOn", "lastPublishedOn", "createdBy", "modifiedBy", "savedBy", "deletedBy", "restoredBy", "firstPublishedBy", "lastPublishedBy", "revisionCreatedOn", "revisionModifiedOn", "revisionSavedOn", "revisionDeletedOn", "revisionRestoredOn", "revisionFirstPublishedOn", "revisionLastPublishedOn", "revisionCreatedBy", "revisionModifiedBy", "revisionSavedBy", "revisionDeletedBy", "revisionRestoredBy", "revisionFirstPublishedBy", "revisionLastPublishedBy"];
 export type EntryMetaFieldName = (typeof ENTRY_META_FIELDS)[number];
 export interface RecordWithEntryMetaFields {

package/constants.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pickEntryMetaFields = exports.isRevisionEntryMetaField = exports.isRestoredEntryMetaField = exports.isNullableEntryMetaField = exports.isNonNullableEntryMetaField = exports.isIdentityEntryMetaField = exports.isEntryLevelEntryMetaField = exports.isDeletedEntryMetaField = exports.isDateTimeEntryMetaField = exports.ROOT_FOLDER = exports.ENTRY_META_FIELDS = void 0;
+exports.pickEntryMetaFields = exports.isRevisionEntryMetaField = exports.isRestoredEntryMetaField = exports.isNullableEntryMetaField = exports.isNonNullableEntryMetaField = exports.isIdentityEntryMetaField = exports.isEntryLevelEntryMetaField = exports.isDeletedEntryMetaField = exports.isDateTimeEntryMetaField = exports.ROOT_FOLDER = exports.ENTRY_META_FIELDS = exports.CMS_MODEL_SINGLETON_TAG = void 0;
 const ROOT_FOLDER = exports.ROOT_FOLDER = "root";
+const CMS_MODEL_SINGLETON_TAG = exports.CMS_MODEL_SINGLETON_TAG = "singleton";
 
 // Content entries - xOn and xBy meta fields.
 const ENTRY_META_FIELDS = exports.ENTRY_META_FIELDS = [

package/constants.js.map

@@ -1 +1 @@
-{"version":3,"names":["ROOT_FOLDER","exports","ENTRY_META_FIELDS","pickEntryMetaFields","object","filter","pickedEntryMetaFields","entryMetaFieldName","fieldExists","undefined","mustPick","Object","assign","isNullableEntryMetaField","fieldName","lcFieldName","toLowerCase","includes","isNonNullableEntryMetaField","isDateTimeEntryMetaField","endsWith","isIdentityEntryMetaField","isRevisionEntryMetaField","startsWith","isEntryLevelEntryMetaField","isDeletedEntryMetaField","isRestoredEntryMetaField"],"sources":["constants.ts"],"sourcesContent":["import { CmsIdentity } from \"~/types\";\n\nexport const ROOT_FOLDER = \"root\";\n\n// Content entries - xOn and xBy meta fields.\nexport const ENTRY_META_FIELDS = [\n    // Entry-level meta fields.\n    \"createdOn\",\n    \"modifiedOn\",\n    \"savedOn\",\n    \"deletedOn\",\n    \"restoredOn\",\n    \"firstPublishedOn\",\n    \"lastPublishedOn\",\n    \"createdBy\",\n    \"modifiedBy\",\n    \"savedBy\",\n    \"deletedBy\",\n    \"restoredBy\",\n    \"firstPublishedBy\",\n    \"lastPublishedBy\",\n\n    // Revision-level meta fields.\n    \"revisionCreatedOn\",\n    \"revisionModifiedOn\",\n    \"revisionSavedOn\",\n    \"revisionDeletedOn\",\n    \"revisionRestoredOn\",\n    \"revisionFirstPublishedOn\",\n    \"revisionLastPublishedOn\",\n    \"revisionCreatedBy\",\n    \"revisionModifiedBy\",\n    \"revisionSavedBy\",\n    \"revisionDeletedBy\",\n    \"revisionRestoredBy\",\n    \"revisionFirstPublishedBy\",\n    \"revisionLastPublishedBy\"\n] as const;\n\nexport type EntryMetaFieldName = (typeof ENTRY_META_FIELDS)[number];\n\nexport interface RecordWithEntryMetaFields {\n    revisionCreatedOn: string;\n    revisionSavedOn: string;\n    revisionModifiedOn: string | null;\n    revisionDeletedOn: string | null;\n    revisionRestoredOn: string | null;\n    revisionFirstPublishedOn: string | null;\n    revisionLastPublishedOn: string | null;\n    revisionCreatedBy: CmsIdentity;\n    revisionSavedBy: CmsIdentity;\n    revisionModifiedBy: CmsIdentity | null;\n    revisionDeletedBy: CmsIdentity | null;\n    revisionRestoredBy: CmsIdentity | null;\n    revisionFirstPublishedBy: CmsIdentity | null;\n    revisionLastPublishedBy: CmsIdentity | null;\n\n    // Entry-level meta fields.\n    createdOn: string;\n    savedOn: string;\n    modifiedOn: string | null;\n    deletedOn: string | null;\n    restoredOn: string | null;\n    firstPublishedOn: string | null;\n    lastPublishedOn: string | null;\n    createdBy: CmsIdentity;\n    savedBy: CmsIdentity;\n    modifiedBy: CmsIdentity | null;\n    deletedBy: CmsIdentity | null;\n    restoredBy: CmsIdentity | null;\n    firstPublishedBy: CmsIdentity | null;\n    lastPublishedBy: CmsIdentity | null;\n}\n\nexport const pickEntryMetaFields = (\n    object: Partial<RecordWithEntryMetaFields>,\n    filter?: (fieldName: EntryMetaFieldName | string) => boolean\n) => {\n    const pickedEntryMetaFields: Partial<RecordWithEntryMetaFields> = {};\n    for (const entryMetaFieldName of ENTRY_META_FIELDS) {\n        const fieldExists = entryMetaFieldName in object;\n        if (!fieldExists) {\n            object[entryMetaFieldName] = undefined;\n        }\n\n        const mustPick = !filter || filter(entryMetaFieldName);\n        if (mustPick) {\n            Object.assign(pickedEntryMetaFields, {\n                [entryMetaFieldName]: object[entryMetaFieldName]\n            });\n        }\n    }\n\n    return pickedEntryMetaFields;\n};\n\nexport const isNullableEntryMetaField = (fieldName: string) => {\n    // Only modifiedX, publishedX, deletedX fields are nullable.\n    const lcFieldName = fieldName.toLowerCase();\n    return (\n        lcFieldName.includes(\"modified\") ||\n        lcFieldName.includes(\"published\") ||\n        lcFieldName.includes(\"deleted\") ||\n        lcFieldName.includes(\"restored\")\n    );\n};\n\nexport const isNonNullableEntryMetaField = (fieldName: string) => {\n    return !isNullableEntryMetaField(fieldName);\n};\n\nexport const isDateTimeEntryMetaField = (fieldName: string) => {\n    // Only field ending with \"On\" are date/time fields.\n    return fieldName.endsWith(\"On\");\n};\n\nexport const isIdentityEntryMetaField = (fieldName: string) => {\n    // Only field ending with \"On\" are date/time fields.\n    return fieldName.endsWith(\"By\");\n};\n\nexport const isRevisionEntryMetaField = (fieldName: string) => {\n    return (\n        ENTRY_META_FIELDS.includes(fieldName as EntryMetaFieldName) &&\n        fieldName.startsWith(\"revision\")\n    );\n};\n\nexport const isEntryLevelEntryMetaField = (fieldName: string) => {\n    return (\n        ENTRY_META_FIELDS.includes(fieldName as EntryMetaFieldName) &&\n        !fieldName.startsWith(\"revision\")\n    );\n};\n\nexport const isDeletedEntryMetaField = (fieldName: string) => {\n    return (\n        ENTRY_META_FIELDS.includes(fieldName as EntryMetaFieldName) && fieldName.includes(\"deleted\")\n    );\n};\n\nexport const isRestoredEntryMetaField = (fieldName: string) => {\n    return (\n        ENTRY_META_FIELDS.includes(fieldName as EntryMetaFieldName) &&\n        fieldName.includes(\"restored\")\n    );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ROOT_FOLDER","exports","CMS_MODEL_SINGLETON_TAG","ENTRY_META_FIELDS","pickEntryMetaFields","object","filter","pickedEntryMetaFields","entryMetaFieldName","fieldExists","undefined","mustPick","Object","assign","isNullableEntryMetaField","fieldName","lcFieldName","toLowerCase","includes","isNonNullableEntryMetaField","isDateTimeEntryMetaField","endsWith","isIdentityEntryMetaField","isRevisionEntryMetaField","startsWith","isEntryLevelEntryMetaField","isDeletedEntryMetaField","isRestoredEntryMetaField"],"sources":["constants.ts"],"sourcesContent":["import { CmsIdentity } from \"~/types\";\n\nexport const ROOT_FOLDER = \"root\";\n\nexport const CMS_MODEL_SINGLETON_TAG = \"singleton\";\n\n// Content entries - xOn and xBy meta fields.\nexport const ENTRY_META_FIELDS = [\n    // Entry-level meta fields.\n    \"createdOn\",\n    \"modifiedOn\",\n    \"savedOn\",\n    \"deletedOn\",\n    \"restoredOn\",\n    \"firstPublishedOn\",\n    \"lastPublishedOn\",\n    \"createdBy\",\n    \"modifiedBy\",\n    \"savedBy\",\n    \"deletedBy\",\n    \"restoredBy\",\n    \"firstPublishedBy\",\n    \"lastPublishedBy\",\n\n    // Revision-level meta fields.\n    \"revisionCreatedOn\",\n    \"revisionModifiedOn\",\n    \"revisionSavedOn\",\n    \"revisionDeletedOn\",\n    \"revisionRestoredOn\",\n    \"revisionFirstPublishedOn\",\n    \"revisionLastPublishedOn\",\n    \"revisionCreatedBy\",\n    \"revisionModifiedBy\",\n    \"revisionSavedBy\",\n    \"revisionDeletedBy\",\n    \"revisionRestoredBy\",\n    \"revisionFirstPublishedBy\",\n    \"revisionLastPublishedBy\"\n] as const;\n\nexport type EntryMetaFieldName = (typeof ENTRY_META_FIELDS)[number];\n\nexport interface RecordWithEntryMetaFields {\n    revisionCreatedOn: string;\n    revisionSavedOn: string;\n    revisionModifiedOn: string | null;\n    revisionDeletedOn: string | null;\n    revisionRestoredOn: string | null;\n    revisionFirstPublishedOn: string | null;\n    revisionLastPublishedOn: string | null;\n    revisionCreatedBy: CmsIdentity;\n    revisionSavedBy: CmsIdentity;\n    revisionModifiedBy: CmsIdentity | null;\n    revisionDeletedBy: CmsIdentity | null;\n    revisionRestoredBy: CmsIdentity | null;\n    revisionFirstPublishedBy: CmsIdentity | null;\n    revisionLastPublishedBy: CmsIdentity | null;\n\n    // Entry-level meta fields.\n    createdOn: string;\n    savedOn: string;\n    modifiedOn: string | null;\n    deletedOn: string | null;\n    restoredOn: string | null;\n    firstPublishedOn: string | null;\n    lastPublishedOn: string | null;\n    createdBy: CmsIdentity;\n    savedBy: CmsIdentity;\n    modifiedBy: CmsIdentity | null;\n    deletedBy: CmsIdentity | null;\n    restoredBy: CmsIdentity | null;\n    firstPublishedBy: CmsIdentity | null;\n    lastPublishedBy: CmsIdentity | null;\n}\n\nexport const pickEntryMetaFields = (\n    object: Partial<RecordWithEntryMetaFields>,\n    filter?: (fieldName: EntryMetaFieldName | string) => boolean\n) => {\n    const pickedEntryMetaFields: Partial<RecordWithEntryMetaFields> = {};\n    for (const entryMetaFieldName of ENTRY_META_FIELDS) {\n        const fieldExists = entryMetaFieldName in object;\n        if (!fieldExists) {\n            object[entryMetaFieldName] = undefined;\n        }\n\n        const mustPick = !filter || filter(entryMetaFieldName);\n        if (mustPick) {\n            Object.assign(pickedEntryMetaFields, {\n                [entryMetaFieldName]: object[entryMetaFieldName]\n            });\n        }\n    }\n\n    return pickedEntryMetaFields;\n};\n\nexport const isNullableEntryMetaField = (fieldName: string) => {\n    // Only modifiedX, publishedX, deletedX fields are nullable.\n    const lcFieldName = fieldName.toLowerCase();\n    return (\n        lcFieldName.includes(\"modified\") ||\n        lcFieldName.includes(\"published\") ||\n        lcFieldName.includes(\"deleted\") ||\n        lcFieldName.includes(\"restored\")\n    );\n};\n\nexport const isNonNullableEntryMetaField = (fieldName: string) => {\n    return !isNullableEntryMetaField(fieldName);\n};\n\nexport const isDateTimeEntryMetaField = (fieldName: string) => {\n    // Only field ending with \"On\" are date/time fields.\n    return fieldName.endsWith(\"On\");\n};\n\nexport const isIdentityEntryMetaField = (fieldName: string) => {\n    // Only field ending with \"On\" are date/time fields.\n    return fieldName.endsWith(\"By\");\n};\n\nexport const isRevisionEntryMetaField = (fieldName: string) => {\n    return (\n        ENTRY_META_FIELDS.includes(fieldName as EntryMetaFieldName) &&\n        fieldName.startsWith(\"revision\")\n    );\n};\n\nexport const isEntryLevelEntryMetaField = (fieldName: string) => {\n    return (\n        ENTRY_META_FIELDS.includes(fieldName as EntryMetaFieldName) &&\n        !fieldName.startsWith(\"revision\")\n    );\n};\n\nexport const isDeletedEntryMetaField = (fieldName: string) => {\n    return (\n        ENTRY_META_FIELDS.includes(fieldName as EntryMetaFieldName) && fieldName.includes(\"deleted\")\n    );\n};\n\nexport const isRestoredEntryMetaField = (fieldName: string) => {\n    return (\n        ENTRY_META_FIELDS.includes(fieldName as EntryMetaFieldName) &&\n        fieldName.includes(\"restored\")\n    );\n};\n"],"mappings":"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","ignoreList":[]}

package/crud/contentEntry/afterDelete.js

@@ -13,8 +13,14 @@ const assignAfterEntryDelete = params => {
   onEntryAfterDelete.subscribe(async params => {
     const {
       entry,
-      model
+      model,
+      permanent
     } = params;
+
+    // If the entry is being moved to the trash, we keep the model fields locked because the entry can be restored.
+    if (!permanent) {
+      return;
+    }
     const {
       items
     } = await context.cms.storageOperations.entries.list(model, {

package/crud/contentEntry/afterDelete.js.map

@@ -1 +1 @@
-{"version":3,"names":["_markLockedFields","require","assignAfterEntryDelete","params","context","onEntryAfterDelete","subscribe","entry","model","items","cms","storageOperations","entries","list","where","entryId_not","entryId","latest","limit","length","markUnlockedFields","exports"],"sources":["afterDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnEntryAfterDeleteTopicParams, CmsContext } from \"~/types\";\nimport { markUnlockedFields } from \"./markLockedFields\";\n\ninterface AssignAfterEntryDeleteParams {\n    context: CmsContext;\n    onEntryAfterDelete: Topic<OnEntryAfterDeleteTopicParams>;\n}\nexport const assignAfterEntryDelete = (params: AssignAfterEntryDeleteParams) => {\n    const { context, onEntryAfterDelete } = params;\n\n    onEntryAfterDelete.subscribe(async params => {\n        const { entry, model } = params;\n\n        const { items } = await context.cms.storageOperations.entries.list(model, {\n            where: {\n                entryId_not: entry.entryId,\n                latest: true\n            },\n            limit: 1\n        });\n        if (items.length > 0) {\n            return;\n        }\n        await markUnlockedFields({\n            context,\n            model\n        });\n    });\n};\n"],"mappings":";;;;;;AAEA,IAAAA,iBAAA,GAAAC,OAAA;AAMO,MAAMC,sBAAsB,GAAIC,MAAoC,IAAK;EAC5E,MAAM;IAAEC,OAAO;IAAEC;EAAmB,CAAC,GAAGF,MAAM;EAE9CE,kBAAkB,CAACC,SAAS,CAAC,MAAMH,MAAM,IAAI;IACzC,MAAM;MAAEI,KAAK;MAAEC;IAAM,CAAC,GAAGL,MAAM;IAE/B,MAAM;MAAEM;IAAM,CAAC,GAAG,MAAML,OAAO,CAACM,GAAG,CAACC,iBAAiB,CAACC,OAAO,CAACC,IAAI,CAACL,KAAK,EAAE;MACtEM,KAAK,EAAE;QACHC,WAAW,EAAER,KAAK,CAACS,OAAO;QAC1BC,MAAM,EAAE;MACZ,CAAC;MACDC,KAAK,EAAE;IACX,CAAC,CAAC;IACF,IAAIT,KAAK,CAACU,MAAM,GAAG,CAAC,EAAE;MAClB;IACJ;IACA,MAAM,IAAAC,oCAAkB,EAAC;MACrBhB,OAAO;MACPI;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC;AAACa,OAAA,CAAAnB,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["_markLockedFields","require","assignAfterEntryDelete","params","context","onEntryAfterDelete","subscribe","entry","model","permanent","items","cms","storageOperations","entries","list","where","entryId_not","entryId","latest","limit","length","markUnlockedFields","exports"],"sources":["afterDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnEntryAfterDeleteTopicParams, CmsContext } from \"~/types\";\nimport { markUnlockedFields } from \"./markLockedFields\";\n\ninterface AssignAfterEntryDeleteParams {\n    context: CmsContext;\n    onEntryAfterDelete: Topic<OnEntryAfterDeleteTopicParams>;\n}\nexport const assignAfterEntryDelete = (params: AssignAfterEntryDeleteParams) => {\n    const { context, onEntryAfterDelete } = params;\n\n    onEntryAfterDelete.subscribe(async params => {\n        const { entry, model, permanent } = params;\n\n        // If the entry is being moved to the trash, we keep the model fields locked because the entry can be restored.\n        if (!permanent) {\n            return;\n        }\n        const { items } = await context.cms.storageOperations.entries.list(model, {\n            where: {\n                entryId_not: entry.entryId,\n                latest: true\n            },\n            limit: 1\n        });\n        if (items.length > 0) {\n            return;\n        }\n        await markUnlockedFields({\n            context,\n            model\n        });\n    });\n};\n"],"mappings":";;;;;;AAEA,IAAAA,iBAAA,GAAAC,OAAA;AAMO,MAAMC,sBAAsB,GAAIC,MAAoC,IAAK;EAC5E,MAAM;IAAEC,OAAO;IAAEC;EAAmB,CAAC,GAAGF,MAAM;EAE9CE,kBAAkB,CAACC,SAAS,CAAC,MAAMH,MAAM,IAAI;IACzC,MAAM;MAAEI,KAAK;MAAEC,KAAK;MAAEC;IAAU,CAAC,GAAGN,MAAM;;IAE1C;IACA,IAAI,CAACM,SAAS,EAAE;MACZ;IACJ;IACA,MAAM;MAAEC;IAAM,CAAC,GAAG,MAAMN,OAAO,CAACO,GAAG,CAACC,iBAAiB,CAACC,OAAO,CAACC,IAAI,CAACN,KAAK,EAAE;MACtEO,KAAK,EAAE;QACHC,WAAW,EAAET,KAAK,CAACU,OAAO;QAC1BC,MAAM,EAAE;MACZ,CAAC;MACDC,KAAK,EAAE;IACX,CAAC,CAAC;IACF,IAAIT,KAAK,CAACU,MAAM,GAAG,CAAC,EAAE;MAClB;IACJ;IACA,MAAM,IAAAC,oCAAkB,EAAC;MACrBjB,OAAO;MACPI;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC;AAACc,OAAA,CAAApB,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/crud/contentEntry/useCases/DeleteEntry/TransformEntryMoveToBin.js

@@ -7,7 +7,6 @@ exports.TransformEntryMoveToBin = void 0;
 var _entryStorage = require("../../../../utils/entryStorage");
 var _date = require("../../../../utils/date");
 var _identity = require("../../../../utils/identity");
-var _entryDataValidation = require("../../entryDataValidation");
 var _constants = require("../../../../constants");
 class TransformEntryMoveToBin {
   constructor(context, getIdentity) {
@@ -24,13 +23,6 @@ class TransformEntryMoveToBin {
     };
   }
   async createDeleteEntryData(model, originalEntry) {
-    await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
-      context: this.context,
-      model,
-      data: originalEntry.values,
-      entry: originalEntry,
-      skipValidators: ["required"]
-    });
     const currentDateTime = new Date().toISOString();
     const currentIdentity = this.getIdentity();
     const entry = {

package/crud/contentEntry/useCases/DeleteEntry/TransformEntryMoveToBin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_entryStorage","require","_date","_identity","_entryDataValidation","_constants","TransformEntryMoveToBin","constructor","context","getIdentity","execute","model","initialEntry","originalEntry","entryFromStorageTransform","entry","createDeleteEntryData","storageEntry","entryToStorageTransform","validateModelEntryDataOrThrow","data","values","skipValidators","currentDateTime","Date","toISOString","currentIdentity","wbyDeleted","location","folderId","ROOT_FOLDER","binOriginalFolderId","deletedOn","getDate","deletedBy","revisionDeletedOn","revisionDeletedBy","exports"],"sources":["TransformEntryMoveToBin.ts"],"sourcesContent":["import { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { entryFromStorageTransform, entryToStorageTransform } from \"~/utils/entryStorage\";\nimport { getDate } from \"~/utils/date\";\nimport { getIdentity } from \"~/utils/identity\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation\";\nimport { CmsContext, CmsEntry, CmsEntryStorageOperationsMoveToBinParams, CmsModel } from \"~/types\";\nimport { ROOT_FOLDER } from \"~/constants\";\n\nexport class TransformEntryMoveToBin {\n    private context: CmsContext;\n    private getIdentity: () => SecurityIdentity;\n\n    constructor(context: CmsContext, getIdentity: () => SecurityIdentity) {\n        this.context = context;\n        this.getIdentity = getIdentity;\n    }\n    async execute(\n        model: CmsModel,\n        initialEntry: CmsEntry\n    ): Promise<CmsEntryStorageOperationsMoveToBinParams> {\n        const originalEntry = await entryFromStorageTransform(this.context, model, initialEntry);\n        const entry = await this.createDeleteEntryData(model, originalEntry);\n        const storageEntry = await entryToStorageTransform(this.context, model, entry);\n\n        return {\n            entry,\n            storageEntry\n        };\n    }\n\n    private async createDeleteEntryData(model: CmsModel, originalEntry: CmsEntry) {\n        await validateModelEntryDataOrThrow({\n            context: this.context,\n            model,\n            data: originalEntry.values,\n            entry: originalEntry,\n            skipValidators: [\"required\"]\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.getIdentity();\n\n        const entry: CmsEntry = {\n            ...originalEntry,\n            wbyDeleted: true,\n\n            /**\n             * Entry location fields. 👇\n             */\n            location: {\n                folderId: ROOT_FOLDER\n            },\n            binOriginalFolderId: originalEntry.location?.folderId,\n\n            /**\n             * Entry-level meta fields. 👇\n             */\n            deletedOn: getDate(currentDateTime, null),\n            deletedBy: getIdentity(currentIdentity, null),\n\n            /**\n             * Revision-level meta fields. 👇\n             */\n            revisionDeletedOn: getDate(currentDateTime, null),\n            revisionDeletedBy: getIdentity(currentIdentity, null)\n        };\n\n        return entry;\n    }\n}\n"],"mappings":";;;;;;AACA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAH,OAAA;AAEA,IAAAI,UAAA,GAAAJ,OAAA;AAEO,MAAMK,uBAAuB,CAAC;EAIjCC,WAAWA,CAACC,OAAmB,EAAEC,WAAmC,EAAE;IAClE,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,WAAW,GAAGA,WAAW;EAClC;EACA,MAAMC,OAAOA,CACTC,KAAe,EACfC,YAAsB,EAC2B;IACjD,MAAMC,aAAa,GAAG,MAAM,IAAAC,uCAAyB,EAAC,IAAI,CAACN,OAAO,EAAEG,KAAK,EAAEC,YAAY,CAAC;IACxF,MAAMG,KAAK,GAAG,MAAM,IAAI,CAACC,qBAAqB,CAACL,KAAK,EAAEE,aAAa,CAAC;IACpE,MAAMI,YAAY,GAAG,MAAM,IAAAC,qCAAuB,EAAC,IAAI,CAACV,OAAO,EAAEG,KAAK,EAAEI,KAAK,CAAC;IAE9E,OAAO;MACHA,KAAK;MACLE;IACJ,CAAC;EACL;EAEA,MAAcD,qBAAqBA,CAACL,KAAe,EAAEE,aAAuB,EAAE;IAC1E,MAAM,IAAAM,kDAA6B,EAAC;MAChCX,OAAO,EAAE,IAAI,CAACA,OAAO;MACrBG,KAAK;MACLS,IAAI,EAAEP,aAAa,CAACQ,MAAM;MAC1BN,KAAK,EAAEF,aAAa;MACpBS,cAAc,EAAE,CAAC,UAAU;IAC/B,CAAC,CAAC;IAEF,MAAMC,eAAe,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;IAChD,MAAMC,eAAe,GAAG,IAAI,CAACjB,WAAW,CAAC,CAAC;IAE1C,MAAMM,KAAe,GAAG;MACpB,GAAGF,aAAa;MAChBc,UAAU,EAAE,IAAI;MAEhB;AACZ;AACA;MACYC,QAAQ,EAAE;QACNC,QAAQ,EAAEC;MACd,CAAC;MACDC,mBAAmB,EAAElB,aAAa,CAACe,QAAQ,EAAEC,QAAQ;MAErD;AACZ;AACA;MACYG,SAAS,EAAE,IAAAC,aAAO,EAACV,eAAe,EAAE,IAAI,CAAC;MACzCW,SAAS,EAAE,IAAAzB,qBAAW,EAACiB,eAAe,EAAE,IAAI,CAAC;MAE7C;AACZ;AACA;MACYS,iBAAiB,EAAE,IAAAF,aAAO,EAACV,eAAe,EAAE,IAAI,CAAC;MACjDa,iBAAiB,EAAE,IAAA3B,qBAAW,EAACiB,eAAe,EAAE,IAAI;IACxD,CAAC;IAED,OAAOX,KAAK;EAChB;AACJ;AAACsB,OAAA,CAAA/B,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["_entryStorage","require","_date","_identity","_constants","TransformEntryMoveToBin","constructor","context","getIdentity","execute","model","initialEntry","originalEntry","entryFromStorageTransform","entry","createDeleteEntryData","storageEntry","entryToStorageTransform","currentDateTime","Date","toISOString","currentIdentity","wbyDeleted","location","folderId","ROOT_FOLDER","binOriginalFolderId","deletedOn","getDate","deletedBy","revisionDeletedOn","revisionDeletedBy","exports"],"sources":["TransformEntryMoveToBin.ts"],"sourcesContent":["import { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { entryFromStorageTransform, entryToStorageTransform } from \"~/utils/entryStorage\";\nimport { getDate } from \"~/utils/date\";\nimport { getIdentity } from \"~/utils/identity\";\nimport { CmsContext, CmsEntry, CmsEntryStorageOperationsMoveToBinParams, CmsModel } from \"~/types\";\nimport { ROOT_FOLDER } from \"~/constants\";\n\nexport class TransformEntryMoveToBin {\n    private context: CmsContext;\n    private getIdentity: () => SecurityIdentity;\n\n    constructor(context: CmsContext, getIdentity: () => SecurityIdentity) {\n        this.context = context;\n        this.getIdentity = getIdentity;\n    }\n    async execute(\n        model: CmsModel,\n        initialEntry: CmsEntry\n    ): Promise<CmsEntryStorageOperationsMoveToBinParams> {\n        const originalEntry = await entryFromStorageTransform(this.context, model, initialEntry);\n        const entry = await this.createDeleteEntryData(model, originalEntry);\n        const storageEntry = await entryToStorageTransform(this.context, model, entry);\n\n        return {\n            entry,\n            storageEntry\n        };\n    }\n\n    private async createDeleteEntryData(model: CmsModel, originalEntry: CmsEntry) {\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.getIdentity();\n\n        const entry: CmsEntry = {\n            ...originalEntry,\n            wbyDeleted: true,\n\n            /**\n             * Entry location fields. 👇\n             */\n            location: {\n                folderId: ROOT_FOLDER\n            },\n            binOriginalFolderId: originalEntry.location?.folderId,\n\n            /**\n             * Entry-level meta fields. 👇\n             */\n            deletedOn: getDate(currentDateTime, null),\n            deletedBy: getIdentity(currentIdentity, null),\n\n            /**\n             * Revision-level meta fields. 👇\n             */\n            revisionDeletedOn: getDate(currentDateTime, null),\n            revisionDeletedBy: getIdentity(currentIdentity, null)\n        };\n\n        return entry;\n    }\n}\n"],"mappings":";;;;;;AACA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAEA,IAAAG,UAAA,GAAAH,OAAA;AAEO,MAAMI,uBAAuB,CAAC;EAIjCC,WAAWA,CAACC,OAAmB,EAAEC,WAAmC,EAAE;IAClE,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,WAAW,GAAGA,WAAW;EAClC;EACA,MAAMC,OAAOA,CACTC,KAAe,EACfC,YAAsB,EAC2B;IACjD,MAAMC,aAAa,GAAG,MAAM,IAAAC,uCAAyB,EAAC,IAAI,CAACN,OAAO,EAAEG,KAAK,EAAEC,YAAY,CAAC;IACxF,MAAMG,KAAK,GAAG,MAAM,IAAI,CAACC,qBAAqB,CAACL,KAAK,EAAEE,aAAa,CAAC;IACpE,MAAMI,YAAY,GAAG,MAAM,IAAAC,qCAAuB,EAAC,IAAI,CAACV,OAAO,EAAEG,KAAK,EAAEI,KAAK,CAAC;IAE9E,OAAO;MACHA,KAAK;MACLE;IACJ,CAAC;EACL;EAEA,MAAcD,qBAAqBA,CAACL,KAAe,EAAEE,aAAuB,EAAE;IAC1E,MAAMM,eAAe,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;IAChD,MAAMC,eAAe,GAAG,IAAI,CAACb,WAAW,CAAC,CAAC;IAE1C,MAAMM,KAAe,GAAG;MACpB,GAAGF,aAAa;MAChBU,UAAU,EAAE,IAAI;MAEhB;AACZ;AACA;MACYC,QAAQ,EAAE;QACNC,QAAQ,EAAEC;MACd,CAAC;MACDC,mBAAmB,EAAEd,aAAa,CAACW,QAAQ,EAAEC,QAAQ;MAErD;AACZ;AACA;MACYG,SAAS,EAAE,IAAAC,aAAO,EAACV,eAAe,EAAE,IAAI,CAAC;MACzCW,SAAS,EAAE,IAAArB,qBAAW,EAACa,eAAe,EAAE,IAAI,CAAC;MAE7C;AACZ;AACA;MACYS,iBAAiB,EAAE,IAAAF,aAAO,EAACV,eAAe,EAAE,IAAI,CAAC;MACjDa,iBAAiB,EAAE,IAAAvB,qBAAW,EAACa,eAAe,EAAE,IAAI;IACxD,CAAC;IAED,OAAOP,KAAK;EAChB;AACJ;AAACkB,OAAA,CAAA3B,uBAAA,GAAAA,uBAAA","ignoreList":[]}

package/crud/contentEntry/useCases/RestoreEntryFromBin/TransformEntryRestoreFromBin.js

@@ -7,7 +7,6 @@ exports.TransformEntryRestoreFromBin = void 0;
 var _entryStorage = require("../../../../utils/entryStorage");
 var _date = require("../../../../utils/date");
 var _identity = require("../../../../utils/identity");
-var _entryDataValidation = require("../../entryDataValidation");
 class TransformEntryRestoreFromBin {
   constructor(context, getIdentity) {
     this.context = context;
@@ -23,13 +22,6 @@ class TransformEntryRestoreFromBin {
     };
   }
   async createRestoreFromBinEntryData(model, originalEntry) {
-    await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
-      context: this.context,
-      model,
-      data: originalEntry.values,
-      entry: originalEntry,
-      skipValidators: ["required"]
-    });
     const currentDateTime = new Date().toISOString();
     const currentIdentity = this.getIdentity();
     const entry = {

package/crud/contentEntry/useCases/RestoreEntryFromBin/TransformEntryRestoreFromBin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_entryStorage","require","_date","_identity","_entryDataValidation","TransformEntryRestoreFromBin","constructor","context","getIdentity","execute","model","initialEntry","originalEntry","entryFromStorageTransform","entry","createRestoreFromBinEntryData","storageEntry","entryToStorageTransform","validateModelEntryDataOrThrow","data","values","skipValidators","currentDateTime","Date","toISOString","currentIdentity","wbyDeleted","location","folderId","binOriginalFolderId","restoredOn","getDate","restoredBy","revisionRestoredOn","revisionRestoredBy","exports"],"sources":["TransformEntryRestoreFromBin.ts"],"sourcesContent":["import { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { entryFromStorageTransform, entryToStorageTransform } from \"~/utils/entryStorage\";\nimport { getDate } from \"~/utils/date\";\nimport { getIdentity } from \"~/utils/identity\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation\";\nimport { CmsContext, CmsEntry, CmsEntryStorageOperationsMoveToBinParams, CmsModel } from \"~/types\";\n\nexport class TransformEntryRestoreFromBin {\n    private context: CmsContext;\n    private getIdentity: () => SecurityIdentity;\n\n    constructor(context: CmsContext, getIdentity: () => SecurityIdentity) {\n        this.context = context;\n        this.getIdentity = getIdentity;\n    }\n    async execute(\n        model: CmsModel,\n        initialEntry: CmsEntry\n    ): Promise<CmsEntryStorageOperationsMoveToBinParams> {\n        const originalEntry = await entryFromStorageTransform(this.context, model, initialEntry);\n        const entry = await this.createRestoreFromBinEntryData(model, originalEntry);\n        const storageEntry = await entryToStorageTransform(this.context, model, entry);\n\n        return {\n            entry,\n            storageEntry\n        };\n    }\n\n    private async createRestoreFromBinEntryData(model: CmsModel, originalEntry: CmsEntry) {\n        await validateModelEntryDataOrThrow({\n            context: this.context,\n            model,\n            data: originalEntry.values,\n            entry: originalEntry,\n            skipValidators: [\"required\"]\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.getIdentity();\n\n        const entry: CmsEntry = {\n            ...originalEntry,\n            wbyDeleted: false,\n\n            /**\n             * Entry location fields. 👇\n             */\n            location: {\n                folderId: originalEntry.binOriginalFolderId\n            },\n            binOriginalFolderId: null,\n\n            /**\n             * Entry-level meta fields. 👇\n             */\n            restoredOn: getDate(currentDateTime, null),\n            restoredBy: getIdentity(currentIdentity, null),\n\n            /**\n             * Revision-level meta fields. 👇\n             */\n            revisionRestoredOn: getDate(currentDateTime, null),\n            revisionRestoredBy: getIdentity(currentIdentity, null)\n        };\n\n        return entry;\n    }\n}\n"],"mappings":";;;;;;AACA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAH,OAAA;AAGO,MAAMI,4BAA4B,CAAC;EAItCC,WAAWA,CAACC,OAAmB,EAAEC,WAAmC,EAAE;IAClE,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,WAAW,GAAGA,WAAW;EAClC;EACA,MAAMC,OAAOA,CACTC,KAAe,EACfC,YAAsB,EAC2B;IACjD,MAAMC,aAAa,GAAG,MAAM,IAAAC,uCAAyB,EAAC,IAAI,CAACN,OAAO,EAAEG,KAAK,EAAEC,YAAY,CAAC;IACxF,MAAMG,KAAK,GAAG,MAAM,IAAI,CAACC,6BAA6B,CAACL,KAAK,EAAEE,aAAa,CAAC;IAC5E,MAAMI,YAAY,GAAG,MAAM,IAAAC,qCAAuB,EAAC,IAAI,CAACV,OAAO,EAAEG,KAAK,EAAEI,KAAK,CAAC;IAE9E,OAAO;MACHA,KAAK;MACLE;IACJ,CAAC;EACL;EAEA,MAAcD,6BAA6BA,CAACL,KAAe,EAAEE,aAAuB,EAAE;IAClF,MAAM,IAAAM,kDAA6B,EAAC;MAChCX,OAAO,EAAE,IAAI,CAACA,OAAO;MACrBG,KAAK;MACLS,IAAI,EAAEP,aAAa,CAACQ,MAAM;MAC1BN,KAAK,EAAEF,aAAa;MACpBS,cAAc,EAAE,CAAC,UAAU;IAC/B,CAAC,CAAC;IAEF,MAAMC,eAAe,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;IAChD,MAAMC,eAAe,GAAG,IAAI,CAACjB,WAAW,CAAC,CAAC;IAE1C,MAAMM,KAAe,GAAG;MACpB,GAAGF,aAAa;MAChBc,UAAU,EAAE,KAAK;MAEjB;AACZ;AACA;MACYC,QAAQ,EAAE;QACNC,QAAQ,EAAEhB,aAAa,CAACiB;MAC5B,CAAC;MACDA,mBAAmB,EAAE,IAAI;MAEzB;AACZ;AACA;MACYC,UAAU,EAAE,IAAAC,aAAO,EAACT,eAAe,EAAE,IAAI,CAAC;MAC1CU,UAAU,EAAE,IAAAxB,qBAAW,EAACiB,eAAe,EAAE,IAAI,CAAC;MAE9C;AACZ;AACA;MACYQ,kBAAkB,EAAE,IAAAF,aAAO,EAACT,eAAe,EAAE,IAAI,CAAC;MAClDY,kBAAkB,EAAE,IAAA1B,qBAAW,EAACiB,eAAe,EAAE,IAAI;IACzD,CAAC;IAED,OAAOX,KAAK;EAChB;AACJ;AAACqB,OAAA,CAAA9B,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["_entryStorage","require","_date","_identity","TransformEntryRestoreFromBin","constructor","context","getIdentity","execute","model","initialEntry","originalEntry","entryFromStorageTransform","entry","createRestoreFromBinEntryData","storageEntry","entryToStorageTransform","currentDateTime","Date","toISOString","currentIdentity","wbyDeleted","location","folderId","binOriginalFolderId","restoredOn","getDate","restoredBy","revisionRestoredOn","revisionRestoredBy","exports"],"sources":["TransformEntryRestoreFromBin.ts"],"sourcesContent":["import { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { entryFromStorageTransform, entryToStorageTransform } from \"~/utils/entryStorage\";\nimport { getDate } from \"~/utils/date\";\nimport { getIdentity } from \"~/utils/identity\";\nimport { CmsContext, CmsEntry, CmsEntryStorageOperationsMoveToBinParams, CmsModel } from \"~/types\";\n\nexport class TransformEntryRestoreFromBin {\n    private context: CmsContext;\n    private getIdentity: () => SecurityIdentity;\n\n    constructor(context: CmsContext, getIdentity: () => SecurityIdentity) {\n        this.context = context;\n        this.getIdentity = getIdentity;\n    }\n    async execute(\n        model: CmsModel,\n        initialEntry: CmsEntry\n    ): Promise<CmsEntryStorageOperationsMoveToBinParams> {\n        const originalEntry = await entryFromStorageTransform(this.context, model, initialEntry);\n        const entry = await this.createRestoreFromBinEntryData(model, originalEntry);\n        const storageEntry = await entryToStorageTransform(this.context, model, entry);\n\n        return {\n            entry,\n            storageEntry\n        };\n    }\n\n    private async createRestoreFromBinEntryData(model: CmsModel, originalEntry: CmsEntry) {\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.getIdentity();\n\n        const entry: CmsEntry = {\n            ...originalEntry,\n            wbyDeleted: false,\n\n            /**\n             * Entry location fields. 👇\n             */\n            location: {\n                folderId: originalEntry.binOriginalFolderId\n            },\n            binOriginalFolderId: null,\n\n            /**\n             * Entry-level meta fields. 👇\n             */\n            restoredOn: getDate(currentDateTime, null),\n            restoredBy: getIdentity(currentIdentity, null),\n\n            /**\n             * Revision-level meta fields. 👇\n             */\n            revisionRestoredOn: getDate(currentDateTime, null),\n            revisionRestoredBy: getIdentity(currentIdentity, null)\n        };\n\n        return entry;\n    }\n}\n"],"mappings":";;;;;;AACA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAGO,MAAMG,4BAA4B,CAAC;EAItCC,WAAWA,CAACC,OAAmB,EAAEC,WAAmC,EAAE;IAClE,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,WAAW,GAAGA,WAAW;EAClC;EACA,MAAMC,OAAOA,CACTC,KAAe,EACfC,YAAsB,EAC2B;IACjD,MAAMC,aAAa,GAAG,MAAM,IAAAC,uCAAyB,EAAC,IAAI,CAACN,OAAO,EAAEG,KAAK,EAAEC,YAAY,CAAC;IACxF,MAAMG,KAAK,GAAG,MAAM,IAAI,CAACC,6BAA6B,CAACL,KAAK,EAAEE,aAAa,CAAC;IAC5E,MAAMI,YAAY,GAAG,MAAM,IAAAC,qCAAuB,EAAC,IAAI,CAACV,OAAO,EAAEG,KAAK,EAAEI,KAAK,CAAC;IAE9E,OAAO;MACHA,KAAK;MACLE;IACJ,CAAC;EACL;EAEA,MAAcD,6BAA6BA,CAACL,KAAe,EAAEE,aAAuB,EAAE;IAClF,MAAMM,eAAe,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;IAChD,MAAMC,eAAe,GAAG,IAAI,CAACb,WAAW,CAAC,CAAC;IAE1C,MAAMM,KAAe,GAAG;MACpB,GAAGF,aAAa;MAChBU,UAAU,EAAE,KAAK;MAEjB;AACZ;AACA;MACYC,QAAQ,EAAE;QACNC,QAAQ,EAAEZ,aAAa,CAACa;MAC5B,CAAC;MACDA,mBAAmB,EAAE,IAAI;MAEzB;AACZ;AACA;MACYC,UAAU,EAAE,IAAAC,aAAO,EAACT,eAAe,EAAE,IAAI,CAAC;MAC1CU,UAAU,EAAE,IAAApB,qBAAW,EAACa,eAAe,EAAE,IAAI,CAAC;MAE9C;AACZ;AACA;MACYQ,kBAAkB,EAAE,IAAAF,aAAO,EAACT,eAAe,EAAE,IAAI,CAAC;MAClDY,kBAAkB,EAAE,IAAAtB,qBAAW,EAACa,eAAe,EAAE,IAAI;IACzD,CAAC;IAED,OAAOP,KAAK;EAChB;AACJ;AAACiB,OAAA,CAAA1B,4BAAA,GAAAA,4BAAA","ignoreList":[]}

package/crud/contentModel/beforeDelete.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.assignModelBeforeDelete = void 0;
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
+var _constants = require("../../constants");
 const assignModelBeforeDelete = params => {
   const {
     onModelBeforeDelete,
@@ -22,6 +23,36 @@ const assignModelBeforeDelete = params => {
         modelId: model.modelId
       });
     }
+    const tags = Array.isArray(model.tags) ? model.tags : [];
+    /**
+     * If the model is a singleton, we need to delete all entries.
+     * There will be either 0 or 1 entries in latest or deleted, but let's put high limit, just in case...
+     */
+    if (tags.includes(_constants.CMS_MODEL_SINGLETON_TAG)) {
+      const [latestEntries] = await context.cms.listLatestEntries(model, {
+        limit: 10000
+      });
+      if (latestEntries.length > 0) {
+        for (const item of latestEntries) {
+          await context.cms.deleteEntry(model, item.id, {
+            permanently: true
+          });
+        }
+        return;
+      }
+      const [deletedEntries] = await context.cms.listDeletedEntries(model, {
+        limit: 10000
+      });
+      if (deletedEntries.length === 0) {
+        return;
+      }
+      for (const item of deletedEntries) {
+        await context.cms.deleteEntry(model, item.id, {
+          permanently: true
+        });
+      }
+      return;
+    }
     try {
       const [latestEntries] = await context.cms.listLatestEntries(model, {
         limit: 1

package/crud/contentModel/beforeDelete.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_CmsModelPlugin","assignModelBeforeDelete","params","onModelBeforeDelete","context","subscribe","model","modelPlugin","plugins","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","latestEntries","cms","listLatestEntries","limit","length","deletedEntries","listDeletedEntries","ex","from","message","code","data","exports"],"sources":["beforeDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { CmsContext, OnModelBeforeDeleteTopicParams } from \"~/types\";\nimport WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\n\ninterface AssignBeforeModelDeleteParams {\n    onModelBeforeDelete: Topic<OnModelBeforeDeleteTopicParams>;\n    context: CmsContext;\n}\nexport const assignModelBeforeDelete = (params: AssignBeforeModelDeleteParams) => {\n    const { onModelBeforeDelete, context } = params;\n\n    onModelBeforeDelete.subscribe(async params => {\n        const { model } = params;\n\n        const modelPlugin = context.plugins\n            .byType<CmsModelPlugin>(CmsModelPlugin.type)\n            .find(item => item.contentModel.modelId === model.modelId);\n\n        if (modelPlugin) {\n            throw new WebinyError(\n                \"Content models defined via plugins cannot be deleted.\",\n                \"CONTENT_MODEL_DELETE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        try {\n            const [latestEntries] = await context.cms.listLatestEntries(model, { limit: 1 });\n\n            if (latestEntries.length > 0) {\n                throw new WebinyError(\n                    `Cannot delete content model \"${model.modelId}\" because there are existing entries.`,\n                    \"CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED\"\n                );\n            }\n\n            const [deletedEntries] = await context.cms.listDeletedEntries(model, { limit: 1 });\n\n            if (deletedEntries.length > 0) {\n                throw new WebinyError(\n                    `Cannot delete content model \"${model.modelId}\" because there are existing entries in the trash.`,\n                    \"CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED\"\n                );\n            }\n        } catch (ex) {\n            throw WebinyError.from(ex, {\n                message: \"Could not retrieve a list of content entries from the model.\",\n                code: \"ENTRIES_ERROR\",\n                data: {\n                    model\n                }\n            });\n        }\n    });\n};\n"],"mappings":";;;;;;;AAEA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAMO,MAAME,uBAAuB,GAAIC,MAAqC,IAAK;EAC9E,MAAM;IAAEC,mBAAmB;IAAEC;EAAQ,CAAC,GAAGF,MAAM;EAE/CC,mBAAmB,CAACE,SAAS,CAAC,MAAMH,MAAM,IAAI;IAC1C,MAAM;MAAEI;IAAM,CAAC,GAAGJ,MAAM;IAExB,MAAMK,WAAW,GAAGH,OAAO,CAACI,OAAO,CAC9BC,MAAM,CAAiBC,8BAAc,CAACC,IAAI,CAAC,CAC3CC,IAAI,CAACC,IAAI,IAAIA,IAAI,CAACC,YAAY,CAACC,OAAO,KAAKT,KAAK,CAACS,OAAO,CAAC;IAE9D,IAAIR,WAAW,EAAE;MACb,MAAM,IAAIS,cAAW,CACjB,uDAAuD,EACvD,4BAA4B,EAC5B;QACID,OAAO,EAAET,KAAK,CAACS;MACnB,CACJ,CAAC;IACL;IAEA,IAAI;MACA,MAAM,CAACE,aAAa,CAAC,GAAG,MAAMb,OAAO,CAACc,GAAG,CAACC,iBAAiB,CAACb,KAAK,EAAE;QAAEc,KAAK,EAAE;MAAE,CAAC,CAAC;MAEhF,IAAIH,aAAa,CAACI,MAAM,GAAG,CAAC,EAAE;QAC1B,MAAM,IAAIL,cAAW,CAChB,gCAA+BV,KAAK,CAACS,OAAQ,uCAAsC,EACpF,yCACJ,CAAC;MACL;MAEA,MAAM,CAACO,cAAc,CAAC,GAAG,MAAMlB,OAAO,CAACc,GAAG,CAACK,kBAAkB,CAACjB,KAAK,EAAE;QAAEc,KAAK,EAAE;MAAE,CAAC,CAAC;MAElF,IAAIE,cAAc,CAACD,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,IAAIL,cAAW,CAChB,gCAA+BV,KAAK,CAACS,OAAQ,oDAAmD,EACjG,yCACJ,CAAC;MACL;IACJ,CAAC,CAAC,OAAOS,EAAE,EAAE;MACT,MAAMR,cAAW,CAACS,IAAI,CAACD,EAAE,EAAE;QACvBE,OAAO,EAAE,8DAA8D;QACvEC,IAAI,EAAE,eAAe;QACrBC,IAAI,EAAE;UACFtB;QACJ;MACJ,CAAC,CAAC;IACN;EACJ,CAAC,CAAC;AACN,CAAC;AAACuB,OAAA,CAAA5B,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["_error","_interopRequireDefault","require","_CmsModelPlugin","_constants","assignModelBeforeDelete","params","onModelBeforeDelete","context","subscribe","model","modelPlugin","plugins","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","tags","Array","isArray","includes","CMS_MODEL_SINGLETON_TAG","latestEntries","cms","listLatestEntries","limit","length","deleteEntry","id","permanently","deletedEntries","listDeletedEntries","ex","from","message","code","data","exports"],"sources":["beforeDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { CmsContext, OnModelBeforeDeleteTopicParams } from \"~/types\";\nimport WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { CMS_MODEL_SINGLETON_TAG } from \"~/constants\";\n\ninterface AssignBeforeModelDeleteParams {\n    onModelBeforeDelete: Topic<OnModelBeforeDeleteTopicParams>;\n    context: CmsContext;\n}\nexport const assignModelBeforeDelete = (params: AssignBeforeModelDeleteParams) => {\n    const { onModelBeforeDelete, context } = params;\n\n    onModelBeforeDelete.subscribe(async params => {\n        const { model } = params;\n\n        const modelPlugin = context.plugins\n            .byType<CmsModelPlugin>(CmsModelPlugin.type)\n            .find(item => item.contentModel.modelId === model.modelId);\n\n        if (modelPlugin) {\n            throw new WebinyError(\n                \"Content models defined via plugins cannot be deleted.\",\n                \"CONTENT_MODEL_DELETE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        const tags = Array.isArray(model.tags) ? model.tags : [];\n        /**\n         * If the model is a singleton, we need to delete all entries.\n         * There will be either 0 or 1 entries in latest or deleted, but let's put high limit, just in case...\n         */\n        if (tags.includes(CMS_MODEL_SINGLETON_TAG)) {\n            const [latestEntries] = await context.cms.listLatestEntries(model, {\n                limit: 10000\n            });\n\n            if (latestEntries.length > 0) {\n                for (const item of latestEntries) {\n                    await context.cms.deleteEntry(model, item.id, {\n                        permanently: true\n                    });\n                }\n                return;\n            }\n\n            const [deletedEntries] = await context.cms.listDeletedEntries(model, {\n                limit: 10000\n            });\n\n            if (deletedEntries.length === 0) {\n                return;\n            }\n\n            for (const item of deletedEntries) {\n                await context.cms.deleteEntry(model, item.id, {\n                    permanently: true\n                });\n            }\n\n            return;\n        }\n\n        try {\n            const [latestEntries] = await context.cms.listLatestEntries(model, { limit: 1 });\n\n            if (latestEntries.length > 0) {\n                throw new WebinyError(\n                    `Cannot delete content model \"${model.modelId}\" because there are existing entries.`,\n                    \"CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED\"\n                );\n            }\n\n            const [deletedEntries] = await context.cms.listDeletedEntries(model, { limit: 1 });\n\n            if (deletedEntries.length > 0) {\n                throw new WebinyError(\n                    `Cannot delete content model \"${model.modelId}\" because there are existing entries in the trash.`,\n                    \"CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED\"\n                );\n            }\n        } catch (ex) {\n            throw WebinyError.from(ex, {\n                message: \"Could not retrieve a list of content entries from the model.\",\n                code: \"ENTRIES_ERROR\",\n                data: {\n                    model\n                }\n            });\n        }\n    });\n};\n"],"mappings":"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","ignoreList":[]}