@webiny/api-aco 0.0.0-unstable.496cf268ac → 0.0.0-unstable.606fc9c866

package/record/record.model.js

@@ -8,7 +8,6 @@ var _createModelField = require("../utils/createModelField");
 const typeField = () => (0, _createModelField.createModelField)({
   label: "Type",
   type: "text",
-  parent: "searchRecord",
   validation: [{
     name: "required",
     message: "Value is required."
@@ -16,18 +15,15 @@ const typeField = () => (0, _createModelField.createModelField)({
 });
 const titleField = () => (0, _createModelField.createModelField)({
   label: "Title",
-  type: "text",
-  parent: "searchRecord"
+  type: "text"
 });
 const contentField = () => (0, _createModelField.createModelField)({
   label: "Content",
-  type: "text",
-  parent: "searchRecord"
+  type: "text"
 });
 const locationField = fields => (0, _createModelField.createModelField)({
   label: "Location",
   type: "object",
-  parent: "searchRecord",
   multipleValues: false,
   settings: {
     fields
@@ -36,7 +32,6 @@ const locationField = fields => (0, _createModelField.createModelField)({
 const locationFolderIdField = () => (0, _createModelField.createModelField)({
   label: "Folder Id",
   type: "text",
-  parent: "searchRecord Location",
   validation: [{
     name: "required",
     message: "Value is required."
@@ -44,8 +39,12 @@ const locationFolderIdField = () => (0, _createModelField.createModelField)({
 });
 const dataField = () => (0, _createModelField.createModelField)({
   label: "Data",
-  type: "wby-aco-json",
-  parent: "searchRecord"
+  type: "wby-aco-json"
+});
+const tagsField = () => (0, _createModelField.createModelField)({
+  label: "Tags",
+  type: "text",
+  multipleValues: true
 });
 const SEARCH_RECORD_MODEL_ID = "acoSearchRecord";
 exports.SEARCH_RECORD_MODEL_ID = SEARCH_RECORD_MODEL_ID;
@@ -54,8 +53,8 @@ const createSearchModelDefinition = () => {
     name: "ACO - Search Record",
     modelId: SEARCH_RECORD_MODEL_ID,
     titleFieldId: "title",
-    layout: [["searchRecord_type"], ["searchRecord_title"], ["searchRecord_content"], ["searchRecord_location"], ["searchRecord_data"]],
-    fields: [typeField(), titleField(), contentField(), locationField([locationFolderIdField()]), dataField()],
+    layout: [["type"], ["title"], ["content"], ["location"], ["data"], ["tags"]],
+    fields: [typeField(), titleField(), contentField(), locationField([locationFolderIdField()]), dataField(), tagsField()],
     description: "ACO - Search record model",
     isPrivate: true
   };

package/record/record.model.js.map

@@ -1 +1 @@
-{"version":3,"names":["typeField","createModelField","label","type","parent","validation","name","message","titleField","contentField","locationField","fields","multipleValues","settings","locationFolderIdField","dataField","SEARCH_RECORD_MODEL_ID","createSearchModelDefinition","modelId","titleFieldId","layout","description","isPrivate"],"sources":["record.model.ts"],"sourcesContent":["import { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nimport { createModelField } from \"~/utils/createModelField\";\n\nexport type SearchRecordModelDefinition = Pick<\n    CmsModel,\n    \"name\" | \"modelId\" | \"layout\" | \"titleFieldId\" | \"description\" | \"fields\" | \"isPrivate\"\n> & { isPrivate: true };\n\nconst typeField = () =>\n    createModelField({\n        label: \"Type\",\n        type: \"text\",\n        parent: \"searchRecord\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst titleField = () =>\n    createModelField({\n        label: \"Title\",\n        type: \"text\",\n        parent: \"searchRecord\"\n    });\n\nconst contentField = () =>\n    createModelField({\n        label: \"Content\",\n        type: \"text\",\n        parent: \"searchRecord\"\n    });\n\nconst locationField = (fields: CmsModelField[]) =>\n    createModelField({\n        label: \"Location\",\n        type: \"object\",\n        parent: \"searchRecord\",\n        multipleValues: false,\n        settings: { fields }\n    });\n\nconst locationFolderIdField = () =>\n    createModelField({\n        label: \"Folder Id\",\n        type: \"text\",\n        parent: \"searchRecord Location\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst dataField = () =>\n    createModelField({\n        label: \"Data\",\n        type: \"wby-aco-json\",\n        parent: \"searchRecord\"\n    });\n\nexport const SEARCH_RECORD_MODEL_ID = \"acoSearchRecord\";\n\nexport const createSearchModelDefinition = (): SearchRecordModelDefinition => {\n    return {\n        name: \"ACO - Search Record\",\n        modelId: SEARCH_RECORD_MODEL_ID,\n        titleFieldId: \"title\",\n        layout: [\n            [\"searchRecord_type\"],\n            [\"searchRecord_title\"],\n            [\"searchRecord_content\"],\n            [\"searchRecord_location\"],\n            [\"searchRecord_data\"]\n        ],\n        fields: [\n            typeField(),\n            titleField(),\n            contentField(),\n            locationField([locationFolderIdField()]),\n            dataField()\n        ],\n        description: \"ACO - Search record model\",\n        isPrivate: true\n    };\n};\n"],"mappings":";;;;;;AAEA;AAOA,MAAMA,SAAS,GAAG,MACd,IAAAC,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,cAAc;EACtBC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMC,UAAU,GAAG,MACf,IAAAP,kCAAgB,EAAC;EACbC,KAAK,EAAE,OAAO;EACdC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEN,MAAMK,YAAY,GAAG,MACjB,IAAAR,kCAAgB,EAAC;EACbC,KAAK,EAAE,SAAS;EAChBC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEN,MAAMM,aAAa,GAAIC,MAAuB,IAC1C,IAAAV,kCAAgB,EAAC;EACbC,KAAK,EAAE,UAAU;EACjBC,IAAI,EAAE,QAAQ;EACdC,MAAM,EAAE,cAAc;EACtBQ,cAAc,EAAE,KAAK;EACrBC,QAAQ,EAAE;IAAEF;EAAO;AACvB,CAAC,CAAC;AAEN,MAAMG,qBAAqB,GAAG,MAC1B,IAAAb,kCAAgB,EAAC;EACbC,KAAK,EAAE,WAAW;EAClBC,IAAI,EAAE,MAAM;EACZC,MAAM,EAAE,uBAAuB;EAC/BC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMQ,SAAS,GAAG,MACd,IAAAd,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,cAAc;EACpBC,MAAM,EAAE;AACZ,CAAC,CAAC;AAEC,MAAMY,sBAAsB,GAAG,iBAAiB;AAAC;AAEjD,MAAMC,2BAA2B,GAAG,MAAmC;EAC1E,OAAO;IACHX,IAAI,EAAE,qBAAqB;IAC3BY,OAAO,EAAEF,sBAAsB;IAC/BG,YAAY,EAAE,OAAO;IACrBC,MAAM,EAAE,CACJ,CAAC,mBAAmB,CAAC,EACrB,CAAC,oBAAoB,CAAC,EACtB,CAAC,sBAAsB,CAAC,EACxB,CAAC,uBAAuB,CAAC,EACzB,CAAC,mBAAmB,CAAC,CACxB;IACDT,MAAM,EAAE,CACJX,SAAS,EAAE,EACXQ,UAAU,EAAE,EACZC,YAAY,EAAE,EACdC,aAAa,CAAC,CAACI,qBAAqB,EAAE,CAAC,CAAC,EACxCC,SAAS,EAAE,CACd;IACDM,WAAW,EAAE,2BAA2B;IACxCC,SAAS,EAAE;EACf,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["typeField","createModelField","label","type","validation","name","message","titleField","contentField","locationField","fields","multipleValues","settings","locationFolderIdField","dataField","tagsField","SEARCH_RECORD_MODEL_ID","createSearchModelDefinition","modelId","titleFieldId","layout","description","isPrivate"],"sources":["record.model.ts"],"sourcesContent":["import { CmsModelField } from \"@webiny/api-headless-cms/types\";\nimport { createModelField } from \"~/utils/createModelField\";\nimport { CmsPrivateModelFull } from \"@webiny/api-headless-cms\";\n\nexport type SearchRecordModelDefinition = Omit<CmsPrivateModelFull, \"noValidate\" | \"group\">;\n\nconst typeField = () =>\n    createModelField({\n        label: \"Type\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst titleField = () =>\n    createModelField({\n        label: \"Title\",\n        type: \"text\"\n    });\n\nconst contentField = () =>\n    createModelField({\n        label: \"Content\",\n        type: \"text\"\n    });\n\nconst locationField = (fields: CmsModelField[]) =>\n    createModelField({\n        label: \"Location\",\n        type: \"object\",\n        multipleValues: false,\n        settings: { fields }\n    });\n\nconst locationFolderIdField = () =>\n    createModelField({\n        label: \"Folder Id\",\n        type: \"text\",\n        validation: [\n            {\n                name: \"required\",\n                message: \"Value is required.\"\n            }\n        ]\n    });\n\nconst dataField = () =>\n    createModelField({\n        label: \"Data\",\n        type: \"wby-aco-json\"\n    });\n\nconst tagsField = () =>\n    createModelField({\n        label: \"Tags\",\n        type: \"text\",\n        multipleValues: true\n    });\n\nexport const SEARCH_RECORD_MODEL_ID = \"acoSearchRecord\";\n\nexport const createSearchModelDefinition = (): SearchRecordModelDefinition => {\n    return {\n        name: \"ACO - Search Record\",\n        modelId: SEARCH_RECORD_MODEL_ID,\n        titleFieldId: \"title\",\n        layout: [[\"type\"], [\"title\"], [\"content\"], [\"location\"], [\"data\"], [\"tags\"]],\n        fields: [\n            typeField(),\n            titleField(),\n            contentField(),\n            locationField([locationFolderIdField()]),\n            dataField(),\n            tagsField()\n        ],\n        description: \"ACO - Search record model\",\n        isPrivate: true\n    };\n};\n"],"mappings":";;;;;;AACA;AAKA,MAAMA,SAAS,GAAG,MACd,IAAAC,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMC,UAAU,GAAG,MACf,IAAAN,kCAAgB,EAAC;EACbC,KAAK,EAAE,OAAO;EACdC,IAAI,EAAE;AACV,CAAC,CAAC;AAEN,MAAMK,YAAY,GAAG,MACjB,IAAAP,kCAAgB,EAAC;EACbC,KAAK,EAAE,SAAS;EAChBC,IAAI,EAAE;AACV,CAAC,CAAC;AAEN,MAAMM,aAAa,GAAIC,MAAuB,IAC1C,IAAAT,kCAAgB,EAAC;EACbC,KAAK,EAAE,UAAU;EACjBC,IAAI,EAAE,QAAQ;EACdQ,cAAc,EAAE,KAAK;EACrBC,QAAQ,EAAE;IAAEF;EAAO;AACvB,CAAC,CAAC;AAEN,MAAMG,qBAAqB,GAAG,MAC1B,IAAAZ,kCAAgB,EAAC;EACbC,KAAK,EAAE,WAAW;EAClBC,IAAI,EAAE,MAAM;EACZC,UAAU,EAAE,CACR;IACIC,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE;EACb,CAAC;AAET,CAAC,CAAC;AAEN,MAAMQ,SAAS,GAAG,MACd,IAAAb,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE;AACV,CAAC,CAAC;AAEN,MAAMY,SAAS,GAAG,MACd,IAAAd,kCAAgB,EAAC;EACbC,KAAK,EAAE,MAAM;EACbC,IAAI,EAAE,MAAM;EACZQ,cAAc,EAAE;AACpB,CAAC,CAAC;AAEC,MAAMK,sBAAsB,GAAG,iBAAiB;AAAC;AAEjD,MAAMC,2BAA2B,GAAG,MAAmC;EAC1E,OAAO;IACHZ,IAAI,EAAE,qBAAqB;IAC3Ba,OAAO,EAAEF,sBAAsB;IAC/BG,YAAY,EAAE,OAAO;IACrBC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IAC5EV,MAAM,EAAE,CACJV,SAAS,EAAE,EACXO,UAAU,EAAE,EACZC,YAAY,EAAE,EACdC,aAAa,CAAC,CAACI,qBAAqB,EAAE,CAAC,CAAC,EACxCC,SAAS,EAAE,EACXC,SAAS,EAAE,CACd;IACDM,WAAW,EAAE,2BAA2B;IACxCC,SAAS,EAAE;EACf,CAAC;AACL,CAAC;AAAC"}

package/record/record.so.js

@@ -5,37 +5,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createSearchRecordOperations = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _valueKeyStorageConverter = require("@webiny/api-headless-cms/utils/converters/valueKeyStorageConverter");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _record = require("./record.model");
 var _createAcoStorageOperations = require("../createAcoStorageOperations");
 var _createListSort = require("../utils/createListSort");
 var _createOperationsWrapper = require("../utils/createOperationsWrapper");
 var _getFieldValues = require("../utils/getFieldValues");
+var _acoRecordId = require("../utils/acoRecordId");
+const _excluded = ["tags", "data"];
 const createSearchRecordOperations = params => {
   const {
-    cms,
-    getCmsContext
+    cms
   } = params;
   const {
     withModel
   } = (0, _createOperationsWrapper.createOperationsWrapper)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
     modelName: _record.SEARCH_RECORD_MODEL_ID
   }));
-  const getRecord = async (initialModel, id) => {
-    const context = getCmsContext();
-    const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
-      model: initialModel,
-      plugins: context.plugins
-    });
-
+  const getRecord = async (model, id) => {
     /**
      * The record "id" has been passed by the original entry.
      * We need to retrieve it via `cms.storageOperations.entries.getLatestByIds()` method and return the first one.
      */
     const revisions = await cms.storageOperations.entries.getLatestByIds(model, {
-      ids: [id]
+      ids: [(0, _acoRecordId.attachAcoRecordPrefix)(id)]
     });
     if (revisions.length === 0) {
       throw new _error.default("Record not found.", "NOT_FOUND", {
@@ -50,7 +45,7 @@ const createSearchRecordOperations = params => {
     }) {
       return withModel(async model => {
         const record = await getRecord(model, id);
-        return (0, _getFieldValues.getFieldValues)(record, _createAcoStorageOperations.baseFields, true);
+        return (0, _getFieldValues.getRecordFieldValues)(record, _createAcoStorageOperations.baseFields);
       });
     },
     listRecords(params) {
@@ -63,15 +58,51 @@ const createSearchRecordOperations = params => {
           sort: (0, _createListSort.createListSort)(sort),
           where: (0, _objectSpread2.default)({}, where || {})
         }));
-        return [entries.map(entry => (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields, true)), meta];
+        return [entries.map(entry => (0, _getFieldValues.getRecordFieldValues)(entry, _createAcoStorageOperations.baseFields)), meta];
+      });
+    },
+    listTags(params) {
+      return withModel(async model => {
+        const {
+          where
+        } = params;
+        const allTags = await cms.getUniqueFieldValues(model, {
+          where: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, where || {}), {}, {
+            latest: true
+          }),
+          fieldId: "tags"
+        });
+        const tags = allTags.flatMap(item => Array.isArray(item) ? item : [item]) // flatten the nested arrays
+        .filter((item, index, array) => item && array.indexOf(item) === index) // remove duplicates and falsy values
+        .sort() // sort the values
+        .map(tag => ({
+          tag
+        })); // create tag item object
+
+        const meta = {
+          hasMoreItems: false,
+          totalCount: tags.length,
+          cursor: null
+        };
+        return [tags, meta];
       });
     },
     createRecord({
-      data
+      data: SearchRecordData
     }) {
       return withModel(async model => {
-        const entry = await cms.createEntry(model, data);
-        return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields, true);
+        const {
+            tags = [],
+            data = {}
+          } = SearchRecordData,
+          rest = (0, _objectWithoutProperties2.default)(SearchRecordData, _excluded);
+        const entry = await cms.createEntry(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          tags,
+          data
+        }, rest), {}, {
+          id: (0, _acoRecordId.attachAcoRecordPrefix)(rest.id)
+        }));
+        return (0, _getFieldValues.getRecordFieldValues)(entry, _createAcoStorageOperations.baseFields);
       });
     },
     updateRecord({
@@ -79,17 +110,19 @@ const createSearchRecordOperations = params => {
       data
     }) {
       return withModel(async model => {
-        const original = await getRecord(model, id);
+        const original = await this.getRecord({
+          id
+        });
         const input = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), data);
-        const entry = await cms.updateEntry(model, original.id, input);
-        return (0, _getFieldValues.getFieldValues)(entry, _createAcoStorageOperations.baseFields, true);
+        const entry = await cms.updateEntry(model, (0, _acoRecordId.attachAcoRecordPrefix)(original.id), input);
+        return (0, _getFieldValues.getRecordFieldValues)(entry, _createAcoStorageOperations.baseFields);
       });
     },
     deleteRecord({
       id
     }) {
       return withModel(async model => {
-        await cms.deleteEntry(model, id);
+        await cms.deleteEntry(model, (0, _acoRecordId.attachAcoRecordPrefix)(id));
         return true;
       });
     }

package/record/record.so.js.map

@@ -1 +1 @@
-{"version":3,"names":["createSearchRecordOperations","params","cms","getCmsContext","withModel","createOperationsWrapper","modelName","SEARCH_RECORD_MODEL_ID","getRecord","initialModel","id","context","model","attachCmsModelFieldConverters","plugins","revisions","storageOperations","entries","getLatestByIds","ids","length","WebinyError","record","getFieldValues","baseFields","listRecords","sort","where","meta","listLatestEntries","createListSort","map","entry","createRecord","data","createEntry","updateRecord","original","input","updateEntry","deleteRecord","deleteEntry"],"sources":["record.so.ts"],"sourcesContent":["import { attachCmsModelFieldConverters } from \"@webiny/api-headless-cms/utils/converters/valueKeyStorageConverter\";\n\nimport WebinyError from \"@webiny/error\";\n\nimport { SEARCH_RECORD_MODEL_ID } from \"./record.model\";\nimport { baseFields, CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { createListSort } from \"~/utils/createListSort\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper\";\nimport { getFieldValues } from \"~/utils/getFieldValues\";\n\nimport { AcoSearchRecordStorageOperations } from \"./record.types\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\n\nexport const createSearchRecordOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoSearchRecordStorageOperations => {\n    const { cms, getCmsContext } = params;\n\n    const { withModel } = createOperationsWrapper({\n        ...params,\n        modelName: SEARCH_RECORD_MODEL_ID\n    });\n\n    const getRecord = async (initialModel: CmsModel, id: string) => {\n        const context = getCmsContext();\n\n        const model = attachCmsModelFieldConverters({\n            model: initialModel,\n            plugins: context.plugins\n        });\n\n        /**\n         * The record \"id\" has been passed by the original entry.\n         * We need to retrieve it via `cms.storageOperations.entries.getLatestByIds()` method and return the first one.\n         */\n        const revisions = await cms.storageOperations.entries.getLatestByIds(model, {\n            ids: [id]\n        });\n\n        if (revisions.length === 0) {\n            throw new WebinyError(\"Record not found.\", \"NOT_FOUND\", {\n                id\n            });\n        }\n\n        return revisions[0];\n    };\n\n    return {\n        async getRecord({ id }) {\n            return withModel(async model => {\n                const record = await getRecord(model, id);\n                return getFieldValues(record, baseFields, true);\n            });\n        },\n        listRecords(params) {\n            return withModel(async model => {\n                const { sort, where } = params;\n\n                const [entries, meta] = await cms.listLatestEntries(model, {\n                    ...params,\n                    sort: createListSort(sort),\n                    where: {\n                        ...(where || {})\n                    }\n                });\n\n                return [entries.map(entry => getFieldValues(entry, baseFields, true)), meta];\n            });\n        },\n        createRecord({ data }) {\n            return withModel(async model => {\n                const entry = await cms.createEntry(model, data);\n\n                return getFieldValues(entry, baseFields, true);\n            });\n        },\n        updateRecord({ id, data }) {\n            return withModel(async model => {\n                const original = await getRecord(model, id);\n\n                const input = {\n                    ...original,\n                    ...data\n                };\n\n                const entry = await cms.updateEntry(model, original.id, input);\n\n                return getFieldValues(entry, baseFields, true);\n            });\n        },\n        deleteRecord({ id }) {\n            return withModel(async model => {\n                await cms.deleteEntry(model, id);\n                return true;\n            });\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["createSearchRecordOperations","params","cms","withModel","createOperationsWrapper","modelName","SEARCH_RECORD_MODEL_ID","getRecord","model","id","revisions","storageOperations","entries","getLatestByIds","ids","attachAcoRecordPrefix","length","WebinyError","record","getRecordFieldValues","baseFields","listRecords","sort","where","meta","listLatestEntries","createListSort","map","entry","listTags","allTags","getUniqueFieldValues","latest","fieldId","tags","flatMap","item","Array","isArray","filter","index","array","indexOf","tag","hasMoreItems","totalCount","cursor","createRecord","data","SearchRecordData","rest","createEntry","updateRecord","original","input","updateEntry","deleteRecord","deleteEntry"],"sources":["record.so.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { SEARCH_RECORD_MODEL_ID } from \"./record.model\";\nimport { baseFields, CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { createListSort } from \"~/utils/createListSort\";\nimport { createOperationsWrapper } from \"~/utils/createOperationsWrapper\";\nimport { getRecordFieldValues } from \"~/utils/getFieldValues\";\nimport { AcoSearchRecordStorageOperations } from \"./record.types\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { attachAcoRecordPrefix } from \"~/utils/acoRecordId\";\n\nexport const createSearchRecordOperations = (\n    params: CreateAcoStorageOperationsParams\n): AcoSearchRecordStorageOperations => {\n    const { cms } = params;\n\n    const { withModel } = createOperationsWrapper({\n        ...params,\n        modelName: SEARCH_RECORD_MODEL_ID\n    });\n\n    const getRecord = async (model: CmsModel, id: string) => {\n        /**\n         * The record \"id\" has been passed by the original entry.\n         * We need to retrieve it via `cms.storageOperations.entries.getLatestByIds()` method and return the first one.\n         */\n        const revisions = await cms.storageOperations.entries.getLatestByIds(model, {\n            ids: [attachAcoRecordPrefix(id)]\n        });\n\n        if (revisions.length === 0) {\n            throw new WebinyError(\"Record not found.\", \"NOT_FOUND\", {\n                id\n            });\n        }\n\n        return revisions[0];\n    };\n\n    return {\n        async getRecord({ id }) {\n            return withModel(async model => {\n                const record = await getRecord(model, id);\n                return getRecordFieldValues(record, baseFields);\n            });\n        },\n        listRecords(params) {\n            return withModel(async model => {\n                const { sort, where } = params;\n\n                const [entries, meta] = await cms.listLatestEntries(model, {\n                    ...params,\n                    sort: createListSort(sort),\n                    where: {\n                        ...(where || {})\n                    }\n                });\n\n                return [entries.map(entry => getRecordFieldValues(entry, baseFields)), meta];\n            });\n        },\n        listTags(params) {\n            return withModel(async model => {\n                const { where } = params;\n\n                const allTags = await cms.getUniqueFieldValues(model, {\n                    where: {\n                        ...(where || {}),\n                        latest: true\n                    },\n                    fieldId: \"tags\"\n                });\n\n                const tags = allTags\n                    .flatMap(item => (Array.isArray(item) ? item : [item])) // flatten the nested arrays\n                    .filter((item, index, array) => item && array.indexOf(item) === index) // remove duplicates and falsy values\n                    .sort() // sort the values\n                    .map(tag => ({\n                        tag\n                    })); // create tag item object\n\n                const meta = {\n                    hasMoreItems: false,\n                    totalCount: tags.length,\n                    cursor: null\n                };\n\n                return [tags, meta];\n            });\n        },\n        createRecord({ data: SearchRecordData }) {\n            return withModel(async model => {\n                const { tags = [], data = {}, ...rest } = SearchRecordData;\n                const entry = await cms.createEntry(model, {\n                    tags,\n                    data,\n                    ...rest,\n                    id: attachAcoRecordPrefix(rest.id)\n                });\n\n                return getRecordFieldValues(entry, baseFields);\n            });\n        },\n        updateRecord(this: AcoSearchRecordStorageOperations, { id, data }) {\n            return withModel(async model => {\n                const original = await this.getRecord({ id });\n\n                const input = {\n                    ...original,\n                    ...data\n                };\n\n                const entry = await cms.updateEntry(\n                    model,\n                    attachAcoRecordPrefix(original.id),\n                    input\n                );\n\n                return getRecordFieldValues(entry, baseFields);\n            });\n        },\n        deleteRecord({ id }) {\n            return withModel(async model => {\n                await cms.deleteEntry(model, attachAcoRecordPrefix(id));\n                return true;\n            });\n        }\n    };\n};\n"],"mappings":"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"}

package/record/record.types.d.ts

@@ -8,16 +8,23 @@ export interface Location {
 }
 export interface SearchRecord<TData extends GenericSearchData = GenericSearchData> extends AcoBaseFields {
     type: string;
-    title?: string;
+    title: string;
     content?: string;
-    location?: Location;
-    data?: TData;
+    location: Location;
+    data: TData;
+    tags: string[];
 }
+export declare type SearchRecordTag = {
+    tag: string;
+};
 export interface ListSearchRecordsWhere {
     type: string;
     location?: {
         folderId: string;
     };
+    tags_in?: string[];
+    tags_startsWith?: string;
+    tags_not_startsWith?: string;
 }
 export interface ListSearchRecordsParams {
     where?: ListSearchRecordsWhere;
@@ -26,20 +33,28 @@ export interface ListSearchRecordsParams {
     limit?: number;
     after?: string | null;
 }
-export declare type CreateSearchRecordParams<TData> = Pick<SearchRecord<TData>, "id" | "title" | "content" | "type" | "location" | "data">;
+export declare type CreateSearchRecordParams<TData> = Pick<SearchRecord<TData>, "id" | "title" | "content" | "type" | "location" | "data" | "tags">;
 export interface UpdateSearchRecordParams<TData extends GenericSearchData> {
     title?: string;
     content?: string;
     location?: Location;
     data?: TData;
+    tags?: string[];
 }
 export interface DeleteSearchRecordParams {
     id: string;
 }
+export interface ListSearchRecordTagsWhere {
+    type: string;
+}
+export interface ListSearchRecordTagsParams {
+    where?: ListSearchRecordTagsWhere;
+}
 export interface StorageOperationsGetSearchRecordParams {
     id: string;
 }
 export declare type StorageOperationsListSearchRecordsParams = ListSearchRecordsParams;
+export declare type StorageOperationsListSearchRecordTagsParams = ListSearchRecordTagsParams;
 export interface StorageOperationsCreateSearchRecordParams<TData extends GenericSearchData = GenericSearchData> {
     data: CreateSearchRecordParams<TData>;
 }
@@ -72,6 +87,7 @@ export interface OnSearchRecordAfterDeleteTopicParams<TData extends GenericSearc
 export interface AcoSearchRecordCrud {
     get<TData>(id: string): Promise<SearchRecord<TData>>;
     list<TData>(params: ListSearchRecordsParams): Promise<[SearchRecord<TData>[], ListMeta]>;
+    listTags(params: ListSearchRecordTagsParams): Promise<[SearchRecordTag[], ListMeta]>;
     create<TData>(data: CreateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;
     update<TData>(id: string, data: UpdateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;
     delete(id: string): Promise<Boolean>;
@@ -85,6 +101,7 @@ export interface AcoSearchRecordCrud {
 export interface AcoSearchRecordStorageOperations {
     getRecord<TData extends GenericSearchData = GenericSearchData>(params: StorageOperationsGetSearchRecordParams): Promise<SearchRecord<TData>>;
     listRecords<TData extends GenericSearchData = GenericSearchData>(params: StorageOperationsListSearchRecordsParams): Promise<[SearchRecord<TData>[], ListMeta]>;
+    listTags(params: StorageOperationsListSearchRecordTagsParams): Promise<[SearchRecordTag[], ListMeta]>;
     createRecord<TData extends GenericSearchData = GenericSearchData>(params: StorageOperationsCreateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;
     updateRecord<TData extends GenericSearchData = GenericSearchData>(params: StorageOperationsUpdateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;
     deleteRecord(params: StorageOperationsDeleteSearchRecordParams): Promise<boolean>;

package/record/record.types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["record.types.ts"],"sourcesContent":["import { AcoBaseFields, ListMeta, ListSort } from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport type GenericSearchData = {\n    [key: string]: any;\n};\n\nexport interface Location {\n    folderId: string;\n}\n\nexport interface SearchRecord<TData extends GenericSearchData = GenericSearchData>\n    extends AcoBaseFields {\n    type: string;\n    title?: string;\n    content?: string;\n    location?: Location;\n    data?: TData;\n}\n\nexport interface ListSearchRecordsWhere {\n    type: string;\n    location?: {\n        folderId: string;\n    };\n}\n\nexport interface ListSearchRecordsParams {\n    where?: ListSearchRecordsWhere;\n    search?: string;\n    sort?: ListSort;\n    limit?: number;\n    after?: string | null;\n}\n\nexport type CreateSearchRecordParams<TData> = Pick<\n    SearchRecord<TData>,\n    \"id\" | \"title\" | \"content\" | \"type\" | \"location\" | \"data\"\n>;\n\nexport interface UpdateSearchRecordParams<TData extends GenericSearchData> {\n    title?: string;\n    content?: string;\n    location?: Location;\n    data?: TData;\n}\n\nexport interface DeleteSearchRecordParams {\n    id: string;\n}\n\nexport interface StorageOperationsGetSearchRecordParams {\n    id: string;\n}\n\nexport type StorageOperationsListSearchRecordsParams = ListSearchRecordsParams;\n\nexport interface StorageOperationsCreateSearchRecordParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    data: CreateSearchRecordParams<TData>;\n}\nexport interface StorageOperationsUpdateSearchRecordParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    id: string;\n    data: UpdateSearchRecordParams<TData>;\n}\nexport type StorageOperationsDeleteSearchRecordParams = DeleteSearchRecordParams;\n\nexport interface OnSearchRecordBeforeCreateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    input: CreateSearchRecordParams<TData>;\n}\n\nexport interface OnSearchRecordAfterCreateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface OnSearchRecordBeforeUpdateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    original: SearchRecord<TData>;\n    input: Record<string, any>;\n}\n\nexport interface OnSearchRecordAfterUpdateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    original: SearchRecord<TData>;\n    record: SearchRecord<TData>;\n    input: Record<string, any>;\n}\n\nexport interface OnSearchRecordBeforeDeleteTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface OnSearchRecordAfterDeleteTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface AcoSearchRecordCrud {\n    get<TData>(id: string): Promise<SearchRecord<TData>>;\n    list<TData>(params: ListSearchRecordsParams): Promise<[SearchRecord<TData>[], ListMeta]>;\n    create<TData>(data: CreateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;\n    update<TData>(id: string, data: UpdateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;\n    delete(id: string): Promise<Boolean>;\n    onSearchRecordBeforeCreate: Topic<OnSearchRecordBeforeCreateTopicParams>;\n    onSearchRecordAfterCreate: Topic<OnSearchRecordAfterCreateTopicParams>;\n    onSearchRecordBeforeUpdate: Topic<OnSearchRecordBeforeUpdateTopicParams>;\n    onSearchRecordAfterUpdate: Topic<OnSearchRecordAfterUpdateTopicParams>;\n    onSearchRecordBeforeDelete: Topic<OnSearchRecordBeforeDeleteTopicParams>;\n    onSearchRecordAfterDelete: Topic<OnSearchRecordAfterDeleteTopicParams>;\n}\nexport interface AcoSearchRecordStorageOperations {\n    getRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsGetSearchRecordParams\n    ): Promise<SearchRecord<TData>>;\n    listRecords<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsListSearchRecordsParams\n    ): Promise<[SearchRecord<TData>[], ListMeta]>;\n    createRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsCreateSearchRecordParams<TData>\n    ): Promise<SearchRecord<TData>>;\n    updateRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsUpdateSearchRecordParams<TData>\n    ): Promise<SearchRecord<TData>>;\n    deleteRecord(params: StorageOperationsDeleteSearchRecordParams): Promise<boolean>;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["record.types.ts"],"sourcesContent":["import { AcoBaseFields, ListMeta, ListSort } from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport type GenericSearchData = {\n    [key: string]: any;\n};\n\nexport interface Location {\n    folderId: string;\n}\n\nexport interface SearchRecord<TData extends GenericSearchData = GenericSearchData>\n    extends AcoBaseFields {\n    type: string;\n    title: string;\n    content?: string;\n    location: Location;\n    data: TData;\n    tags: string[];\n}\n\nexport type SearchRecordTag = {\n    tag: string;\n};\n\nexport interface ListSearchRecordsWhere {\n    type: string;\n    location?: {\n        folderId: string;\n    };\n    tags_in?: string[];\n    tags_startsWith?: string;\n    tags_not_startsWith?: string;\n}\n\nexport interface ListSearchRecordsParams {\n    where?: ListSearchRecordsWhere;\n    search?: string;\n    sort?: ListSort;\n    limit?: number;\n    after?: string | null;\n}\n\nexport type CreateSearchRecordParams<TData> = Pick<\n    SearchRecord<TData>,\n    \"id\" | \"title\" | \"content\" | \"type\" | \"location\" | \"data\" | \"tags\"\n>;\n\nexport interface UpdateSearchRecordParams<TData extends GenericSearchData> {\n    title?: string;\n    content?: string;\n    location?: Location;\n    data?: TData;\n    tags?: string[];\n}\n\nexport interface DeleteSearchRecordParams {\n    id: string;\n}\n\nexport interface ListSearchRecordTagsWhere {\n    type: string;\n}\n\nexport interface ListSearchRecordTagsParams {\n    where?: ListSearchRecordTagsWhere;\n}\n\nexport interface StorageOperationsGetSearchRecordParams {\n    id: string;\n}\n\nexport type StorageOperationsListSearchRecordsParams = ListSearchRecordsParams;\nexport type StorageOperationsListSearchRecordTagsParams = ListSearchRecordTagsParams;\n\nexport interface StorageOperationsCreateSearchRecordParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    data: CreateSearchRecordParams<TData>;\n}\nexport interface StorageOperationsUpdateSearchRecordParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    id: string;\n    data: UpdateSearchRecordParams<TData>;\n}\nexport type StorageOperationsDeleteSearchRecordParams = DeleteSearchRecordParams;\n\nexport interface OnSearchRecordBeforeCreateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    input: CreateSearchRecordParams<TData>;\n}\n\nexport interface OnSearchRecordAfterCreateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface OnSearchRecordBeforeUpdateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    original: SearchRecord<TData>;\n    input: Record<string, any>;\n}\n\nexport interface OnSearchRecordAfterUpdateTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    original: SearchRecord<TData>;\n    record: SearchRecord<TData>;\n    input: Record<string, any>;\n}\n\nexport interface OnSearchRecordBeforeDeleteTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface OnSearchRecordAfterDeleteTopicParams<\n    TData extends GenericSearchData = GenericSearchData\n> {\n    record: SearchRecord<TData>;\n}\n\nexport interface AcoSearchRecordCrud {\n    get<TData>(id: string): Promise<SearchRecord<TData>>;\n    list<TData>(params: ListSearchRecordsParams): Promise<[SearchRecord<TData>[], ListMeta]>;\n    listTags(params: ListSearchRecordTagsParams): Promise<[SearchRecordTag[], ListMeta]>;\n    create<TData>(data: CreateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;\n    update<TData>(id: string, data: UpdateSearchRecordParams<TData>): Promise<SearchRecord<TData>>;\n    delete(id: string): Promise<Boolean>;\n    onSearchRecordBeforeCreate: Topic<OnSearchRecordBeforeCreateTopicParams>;\n    onSearchRecordAfterCreate: Topic<OnSearchRecordAfterCreateTopicParams>;\n    onSearchRecordBeforeUpdate: Topic<OnSearchRecordBeforeUpdateTopicParams>;\n    onSearchRecordAfterUpdate: Topic<OnSearchRecordAfterUpdateTopicParams>;\n    onSearchRecordBeforeDelete: Topic<OnSearchRecordBeforeDeleteTopicParams>;\n    onSearchRecordAfterDelete: Topic<OnSearchRecordAfterDeleteTopicParams>;\n}\nexport interface AcoSearchRecordStorageOperations {\n    getRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsGetSearchRecordParams\n    ): Promise<SearchRecord<TData>>;\n    listRecords<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsListSearchRecordsParams\n    ): Promise<[SearchRecord<TData>[], ListMeta]>;\n    listTags(\n        params: StorageOperationsListSearchRecordTagsParams\n    ): Promise<[SearchRecordTag[], ListMeta]>;\n    createRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsCreateSearchRecordParams<TData>\n    ): Promise<SearchRecord<TData>>;\n    updateRecord<TData extends GenericSearchData = GenericSearchData>(\n        params: StorageOperationsUpdateSearchRecordParams<TData>\n    ): Promise<SearchRecord<TData>>;\n    deleteRecord(params: StorageOperationsDeleteSearchRecordParams): Promise<boolean>;\n}\n"],"mappings":""}

package/types.d.ts

@@ -5,6 +5,8 @@ import { SecurityContext, SecurityIdentity } from "@webiny/api-security/types";
 import { CmsContext } from "@webiny/api-headless-cms/types";
 import { AcoSearchRecordCrud, AcoSearchRecordStorageOperations } from "./record/record.types";
 import { AcoFolderCrud, AcoFolderStorageOperations } from "./folder/folder.types";
+export * from "./folder/folder.types";
+export * from "./record/record.types";
 export interface User {
     id: string;
     type: string;
@@ -41,3 +43,7 @@ export declare type AcoStorageOperations = AcoFolderStorageOperations & AcoSearc
 export interface AcoContext extends BaseContext, I18NContext, TenancyContext, SecurityContext, CmsContext {
     aco: AdvancedContentOrganisation;
 }
+/**
+ * @deprecated Use AcoContext instead
+ */
+export declare type ACOContext = AcoContext;

package/types.js

@@ -3,7 +3,34 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  ListSortDirection: true
+};
 exports.ListSortDirection = void 0;
+var _folder = require("./folder/folder.types");
+Object.keys(_folder).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _folder[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _folder[key];
+    }
+  });
+});
+var _record = require("./record/record.types");
+Object.keys(_record).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _record[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _record[key];
+    }
+  });
+});
 let ListSortDirection;
 exports.ListSortDirection = ListSortDirection;
 (function (ListSortDirection) {

package/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["ListSortDirection"],"sources":["types.ts"],"sourcesContent":["import { Tenant, TenancyContext } from \"@webiny/api-tenancy/types\";\nimport { Context as BaseContext } from \"@webiny/handler/types\";\nimport { I18NContext, I18NLocale } from \"@webiny/api-i18n/types\";\nimport { SecurityContext, SecurityIdentity } from \"@webiny/api-security/types\";\nimport { CmsContext } from \"@webiny/api-headless-cms/types\";\nimport { AcoSearchRecordCrud, AcoSearchRecordStorageOperations } from \"~/record/record.types\";\nimport { AcoFolderCrud, AcoFolderStorageOperations } from \"~/folder/folder.types\";\n\nexport interface User {\n    id: string;\n    type: string;\n    displayName: string | null;\n}\n\nexport interface ListMeta {\n    cursor: string | null;\n    totalCount: number;\n    hasMoreItems: boolean;\n}\n\nexport enum ListSortDirection {\n    ASC,\n    DESC\n}\n\nexport type ListSort = Record<string, ListSortDirection>;\n\nexport interface AcoBaseFields {\n    id: string;\n    entryId: string;\n    createdOn: string;\n    createdBy: User;\n    savedOn: string;\n}\n\nexport interface AdvancedContentOrganisation {\n    folder: AcoFolderCrud;\n    search: AcoSearchRecordCrud;\n}\n\nexport interface CreateAcoParams {\n    getIdentity: () => SecurityIdentity;\n    getLocale: () => I18NLocale;\n    getTenant: () => Tenant;\n    storageOperations: AcoStorageOperations;\n}\n\nexport type AcoStorageOperations = AcoFolderStorageOperations & AcoSearchRecordStorageOperations;\n\nexport interface AcoContext\n    extends BaseContext,\n        I18NContext,\n        TenancyContext,\n        SecurityContext,\n        CmsContext {\n    aco: AdvancedContentOrganisation;\n}\n"],"mappings":";;;;;;IAoBYA,iBAAiB;AAAA;AAAA,WAAjBA,iBAAiB;EAAjBA,iBAAiB,CAAjBA,iBAAiB;EAAjBA,iBAAiB,CAAjBA,iBAAiB;AAAA,GAAjBA,iBAAiB,iCAAjBA,iBAAiB"}
+{"version":3,"names":["ListSortDirection"],"sources":["types.ts"],"sourcesContent":["import { Tenant, TenancyContext } from \"@webiny/api-tenancy/types\";\nimport { Context as BaseContext } from \"@webiny/handler/types\";\nimport { I18NContext, I18NLocale } from \"@webiny/api-i18n/types\";\nimport { SecurityContext, SecurityIdentity } from \"@webiny/api-security/types\";\nimport { CmsContext } from \"@webiny/api-headless-cms/types\";\nimport { AcoSearchRecordCrud, AcoSearchRecordStorageOperations } from \"~/record/record.types\";\nimport { AcoFolderCrud, AcoFolderStorageOperations } from \"~/folder/folder.types\";\n\nexport * from \"./folder/folder.types\";\nexport * from \"./record/record.types\";\n\nexport interface User {\n    id: string;\n    type: string;\n    displayName: string | null;\n}\n\nexport interface ListMeta {\n    cursor: string | null;\n    totalCount: number;\n    hasMoreItems: boolean;\n}\n\nexport enum ListSortDirection {\n    ASC,\n    DESC\n}\n\nexport type ListSort = Record<string, ListSortDirection>;\n\nexport interface AcoBaseFields {\n    id: string;\n    entryId: string;\n    createdOn: string;\n    createdBy: User;\n    savedOn: string;\n}\n\nexport interface AdvancedContentOrganisation {\n    folder: AcoFolderCrud;\n    search: AcoSearchRecordCrud;\n}\n\nexport interface CreateAcoParams {\n    getIdentity: () => SecurityIdentity;\n    getLocale: () => I18NLocale;\n    getTenant: () => Tenant;\n    storageOperations: AcoStorageOperations;\n}\n\nexport type AcoStorageOperations = AcoFolderStorageOperations & AcoSearchRecordStorageOperations;\n\nexport interface AcoContext\n    extends BaseContext,\n        I18NContext,\n        TenancyContext,\n        SecurityContext,\n        CmsContext {\n    aco: AdvancedContentOrganisation;\n}\n\n/**\n * @deprecated Use AcoContext instead\n */\nexport type ACOContext = AcoContext;\n"],"mappings":";;;;;;;;;AAQA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAAsC,IAc1BA,iBAAiB;AAAA;AAAA,WAAjBA,iBAAiB;EAAjBA,iBAAiB,CAAjBA,iBAAiB;EAAjBA,iBAAiB,CAAjBA,iBAAiB;AAAA,GAAjBA,iBAAiB,iCAAjBA,iBAAiB"}

package/utils/acoRecordId.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 006
+ * PageDataMigration in ddb-es and ddb
+ */
+export declare const attachAcoRecordPrefix: (id: string) => string;
+export declare const removeAcoRecordPrefix: (id: string) => string;

package/utils/acoRecordId.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.removeAcoRecordPrefix = exports.attachAcoRecordPrefix = void 0;
+/**
+ * !!! DO NOT CHANGE THIS !!!
+ * If this is changed, you will need to create new migration which changes the IDs for the users.
+ *
+ * packages/migrations/src/migrations/5.35.0/006/ddb/PageDataMigration.ts:236
+ * packages/migrations/src/migrations/5.35.0/006/ddb-es/PageDataMigration.ts:419
+ */
+const WBY_ACO_PREFIX = "wby-aco-";
+/**
+ * 006
+ * PageDataMigration in ddb-es and ddb
+ */
+
+const attachAcoRecordPrefix = id => {
+  if (id.startsWith(WBY_ACO_PREFIX)) {
+    return id;
+  }
+  return `${WBY_ACO_PREFIX}${id}`;
+};
+exports.attachAcoRecordPrefix = attachAcoRecordPrefix;
+const removeAcoRecordPrefix = id => {
+  if (id.startsWith(WBY_ACO_PREFIX) === false) {
+    return id;
+  }
+  return id.substring(WBY_ACO_PREFIX.length);
+};
+exports.removeAcoRecordPrefix = removeAcoRecordPrefix;

package/utils/acoRecordId.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["WBY_ACO_PREFIX","attachAcoRecordPrefix","id","startsWith","removeAcoRecordPrefix","substring","length"],"sources":["acoRecordId.ts"],"sourcesContent":["/**\n * !!! DO NOT CHANGE THIS !!!\n * If this is changed, you will need to create new migration which changes the IDs for the users.\n *\n * packages/migrations/src/migrations/5.35.0/006/ddb/PageDataMigration.ts:236\n * packages/migrations/src/migrations/5.35.0/006/ddb-es/PageDataMigration.ts:419\n */\nconst WBY_ACO_PREFIX = \"wby-aco-\";\n/**\n * 006\n * PageDataMigration in ddb-es and ddb\n */\n\nexport const attachAcoRecordPrefix = (id: string) => {\n    if (id.startsWith(WBY_ACO_PREFIX)) {\n        return id;\n    }\n    return `${WBY_ACO_PREFIX}${id}`;\n};\n\nexport const removeAcoRecordPrefix = (id: string) => {\n    if (id.startsWith(WBY_ACO_PREFIX) === false) {\n        return id;\n    }\n    return id.substring(WBY_ACO_PREFIX.length);\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,cAAc,GAAG,UAAU;AACjC;AACA;AACA;AACA;;AAEO,MAAMC,qBAAqB,GAAIC,EAAU,IAAK;EACjD,IAAIA,EAAE,CAACC,UAAU,CAACH,cAAc,CAAC,EAAE;IAC/B,OAAOE,EAAE;EACb;EACA,OAAQ,GAAEF,cAAe,GAAEE,EAAG,EAAC;AACnC,CAAC;AAAC;AAEK,MAAME,qBAAqB,GAAIF,EAAU,IAAK;EACjD,IAAIA,EAAE,CAACC,UAAU,CAACH,cAAc,CAAC,KAAK,KAAK,EAAE;IACzC,OAAOE,EAAE;EACb;EACA,OAAOA,EAAE,CAACG,SAAS,CAACL,cAAc,CAACM,MAAM,CAAC;AAC9C,CAAC;AAAC"}

package/utils/createModelField.d.ts

@@ -1,6 +1,5 @@
 import { CmsModelField } from "@webiny/api-headless-cms/types";
 export interface CreateModelFieldParams extends Omit<CmsModelField, "id" | "storageId" | "fieldId"> {
     fieldId?: string;
-    parent: string;
 }
 export declare const createModelField: (params: CreateModelFieldParams) => CmsModelField;

package/utils/createModelField.js

@@ -11,7 +11,6 @@ const createModelField = params => {
     label,
     fieldId: initialFieldId,
     type,
-    parent,
     settings = {},
     listValidation = [],
     validation = [],
@@ -22,10 +21,9 @@ const createModelField = params => {
     }
   } = params;
   const fieldId = initialFieldId ? (0, _camelCase.default)(initialFieldId) : (0, _camelCase.default)(label);
-  const id = `${(0, _camelCase.default)(parent)}_${fieldId}`;
   return {
-    id,
-    storageId: fieldId,
+    id: fieldId,
+    storageId: `${type}@${fieldId}`,
     fieldId,
     label,
     type,

package/utils/createModelField.js.map

@@ -1 +1 @@
-{"version":3,"names":["createModelField","params","label","fieldId","initialFieldId","type","parent","settings","listValidation","validation","multipleValues","predefinedValues","values","enabled","camelCase","id","storageId"],"sources":["createModelField.ts"],"sourcesContent":["import { CmsModelField } from \"@webiny/api-headless-cms/types\";\nimport camelCase from \"lodash/camelCase\";\n\nexport interface CreateModelFieldParams\n    extends Omit<CmsModelField, \"id\" | \"storageId\" | \"fieldId\"> {\n    fieldId?: string;\n    parent: string;\n}\n\nexport const createModelField = (params: CreateModelFieldParams): CmsModelField => {\n    const {\n        label,\n        fieldId: initialFieldId,\n        type,\n        parent,\n        settings = {},\n        listValidation = [],\n        validation = [],\n        multipleValues = false,\n        predefinedValues = {\n            values: [],\n            enabled: false\n        }\n    } = params;\n\n    const fieldId = initialFieldId ? camelCase(initialFieldId) : camelCase(label);\n    const id = `${camelCase(parent)}_${fieldId}`;\n\n    return {\n        id,\n        storageId: fieldId,\n        fieldId,\n        label,\n        type,\n        settings,\n        listValidation,\n        validation,\n        multipleValues,\n        predefinedValues\n    };\n};\n"],"mappings":";;;;;;;AACA;AAQO,MAAMA,gBAAgB,GAAIC,MAA8B,IAAoB;EAC/E,MAAM;IACFC,KAAK;IACLC,OAAO,EAAEC,cAAc;IACvBC,IAAI;IACJC,MAAM;IACNC,QAAQ,GAAG,CAAC,CAAC;IACbC,cAAc,GAAG,EAAE;IACnBC,UAAU,GAAG,EAAE;IACfC,cAAc,GAAG,KAAK;IACtBC,gBAAgB,GAAG;MACfC,MAAM,EAAE,EAAE;MACVC,OAAO,EAAE;IACb;EACJ,CAAC,GAAGZ,MAAM;EAEV,MAAME,OAAO,GAAGC,cAAc,GAAG,IAAAU,kBAAS,EAACV,cAAc,CAAC,GAAG,IAAAU,kBAAS,EAACZ,KAAK,CAAC;EAC7E,MAAMa,EAAE,GAAI,GAAE,IAAAD,kBAAS,EAACR,MAAM,CAAE,IAAGH,OAAQ,EAAC;EAE5C,OAAO;IACHY,EAAE;IACFC,SAAS,EAAEb,OAAO;IAClBA,OAAO;IACPD,KAAK;IACLG,IAAI;IACJE,QAAQ;IACRC,cAAc;IACdC,UAAU;IACVC,cAAc;IACdC;EACJ,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["createModelField","params","label","fieldId","initialFieldId","type","settings","listValidation","validation","multipleValues","predefinedValues","values","enabled","camelCase","id","storageId"],"sources":["createModelField.ts"],"sourcesContent":["import { CmsModelField } from \"@webiny/api-headless-cms/types\";\nimport camelCase from \"lodash/camelCase\";\n\nexport interface CreateModelFieldParams\n    extends Omit<CmsModelField, \"id\" | \"storageId\" | \"fieldId\"> {\n    fieldId?: string;\n}\n\nexport const createModelField = (params: CreateModelFieldParams): CmsModelField => {\n    const {\n        label,\n        fieldId: initialFieldId,\n        type,\n        settings = {},\n        listValidation = [],\n        validation = [],\n        multipleValues = false,\n        predefinedValues = {\n            values: [],\n            enabled: false\n        }\n    } = params;\n\n    const fieldId = initialFieldId ? camelCase(initialFieldId) : camelCase(label);\n\n    return {\n        id: fieldId,\n        storageId: `${type}@${fieldId}`,\n        fieldId,\n        label,\n        type,\n        settings,\n        listValidation,\n        validation,\n        multipleValues,\n        predefinedValues\n    };\n};\n"],"mappings":";;;;;;;AACA;AAOO,MAAMA,gBAAgB,GAAIC,MAA8B,IAAoB;EAC/E,MAAM;IACFC,KAAK;IACLC,OAAO,EAAEC,cAAc;IACvBC,IAAI;IACJC,QAAQ,GAAG,CAAC,CAAC;IACbC,cAAc,GAAG,EAAE;IACnBC,UAAU,GAAG,EAAE;IACfC,cAAc,GAAG,KAAK;IACtBC,gBAAgB,GAAG;MACfC,MAAM,EAAE,EAAE;MACVC,OAAO,EAAE;IACb;EACJ,CAAC,GAAGX,MAAM;EAEV,MAAME,OAAO,GAAGC,cAAc,GAAG,IAAAS,kBAAS,EAACT,cAAc,CAAC,GAAG,IAAAS,kBAAS,EAACX,KAAK,CAAC;EAE7E,OAAO;IACHY,EAAE,EAAEX,OAAO;IACXY,SAAS,EAAG,GAAEV,IAAK,IAAGF,OAAQ,EAAC;IAC/BA,OAAO;IACPD,KAAK;IACLG,IAAI;IACJC,QAAQ;IACRC,cAAc;IACdC,UAAU;IACVC,cAAc;IACdC;EACJ,CAAC;AACL,CAAC;AAAC"}

package/utils/createOperationsWrapper.js

@@ -13,14 +13,14 @@ const createOperationsWrapper = params => {
     modelName
   } = params;
   const withModel = async cb => {
-    security.disableAuthorization();
-    const model = await cms.getModel(modelName);
-    if (!model) {
-      throw new _error.default(`Could not find "${modelName}" model.`, "MODEL_NOT_FOUND_ERROR");
-    }
-    const result = await cb(model);
-    security.enableAuthorization();
-    return result;
+    return security.withoutAuthorization(async () => {
+      const model = await cms.getModel(modelName);
+      if (!model) {
+        throw new _error.default(`Could not find "${modelName}" model.`, "MODEL_NOT_FOUND_ERROR");
+      }
+      const result = await cb(model);
+      return result;
+    });
   };
   return {
     withModel

package/utils/createOperationsWrapper.js.map

@@ -1 +1 @@
-{"version":3,"names":["createOperationsWrapper","params","cms","security","modelName","withModel","cb","disableAuthorization","model","getModel","WebinyError","result","enableAuthorization"],"sources":["createOperationsWrapper.ts"],"sourcesContent":["import { CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface CreateOperationsWrapperParams extends CreateAcoStorageOperationsParams {\n    modelName: string;\n}\n\nexport const createOperationsWrapper = (params: CreateOperationsWrapperParams) => {\n    const { cms, security, modelName } = params;\n\n    const withModel = async <TResult>(\n        cb: (model: CmsModel) => Promise<TResult>\n    ): Promise<TResult> => {\n        security.disableAuthorization();\n        const model = await cms.getModel(modelName);\n\n        if (!model) {\n            throw new WebinyError(`Could not find \"${modelName}\" model.`, \"MODEL_NOT_FOUND_ERROR\");\n        }\n\n        const result = await cb(model);\n\n        security.enableAuthorization();\n\n        return result;\n    };\n\n    return {\n        withModel\n    };\n};\n"],"mappings":";;;;;;;AAEA;AAMO,MAAMA,uBAAuB,GAAIC,MAAqC,IAAK;EAC9E,MAAM;IAAEC,GAAG;IAAEC,QAAQ;IAAEC;EAAU,CAAC,GAAGH,MAAM;EAE3C,MAAMI,SAAS,GAAG,MACdC,EAAyC,IACtB;IACnBH,QAAQ,CAACI,oBAAoB,EAAE;IAC/B,MAAMC,KAAK,GAAG,MAAMN,GAAG,CAACO,QAAQ,CAACL,SAAS,CAAC;IAE3C,IAAI,CAACI,KAAK,EAAE;MACR,MAAM,IAAIE,cAAW,CAAE,mBAAkBN,SAAU,UAAS,EAAE,uBAAuB,CAAC;IAC1F;IAEA,MAAMO,MAAM,GAAG,MAAML,EAAE,CAACE,KAAK,CAAC;IAE9BL,QAAQ,CAACS,mBAAmB,EAAE;IAE9B,OAAOD,MAAM;EACjB,CAAC;EAED,OAAO;IACHN;EACJ,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["createOperationsWrapper","params","cms","security","modelName","withModel","cb","withoutAuthorization","model","getModel","WebinyError","result"],"sources":["createOperationsWrapper.ts"],"sourcesContent":["import { CreateAcoStorageOperationsParams } from \"~/createAcoStorageOperations\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface CreateOperationsWrapperParams extends CreateAcoStorageOperationsParams {\n    modelName: string;\n}\n\nexport const createOperationsWrapper = (params: CreateOperationsWrapperParams) => {\n    const { cms, security, modelName } = params;\n\n    const withModel = async <TResult>(\n        cb: (model: CmsModel) => Promise<TResult>\n    ): Promise<TResult> => {\n        return security.withoutAuthorization(async () => {\n            const model = await cms.getModel(modelName);\n\n            if (!model) {\n                throw new WebinyError(\n                    `Could not find \"${modelName}\" model.`,\n                    \"MODEL_NOT_FOUND_ERROR\"\n                );\n            }\n\n            const result = await cb(model);\n\n            return result;\n        });\n    };\n\n    return {\n        withModel\n    };\n};\n"],"mappings":";;;;;;;AAEA;AAMO,MAAMA,uBAAuB,GAAIC,MAAqC,IAAK;EAC9E,MAAM;IAAEC,GAAG;IAAEC,QAAQ;IAAEC;EAAU,CAAC,GAAGH,MAAM;EAE3C,MAAMI,SAAS,GAAG,MACdC,EAAyC,IACtB;IACnB,OAAOH,QAAQ,CAACI,oBAAoB,CAAC,YAAY;MAC7C,MAAMC,KAAK,GAAG,MAAMN,GAAG,CAACO,QAAQ,CAACL,SAAS,CAAC;MAE3C,IAAI,CAACI,KAAK,EAAE;QACR,MAAM,IAAIE,cAAW,CAChB,mBAAkBN,SAAU,UAAS,EACtC,uBAAuB,CAC1B;MACL;MAEA,MAAMO,MAAM,GAAG,MAAML,EAAE,CAACE,KAAK,CAAC;MAE9B,OAAOG,MAAM;IACjB,CAAC,CAAC;EACN,CAAC;EAED,OAAO;IACHN;EACJ,CAAC;AACL,CAAC;AAAC"}

package/utils/getFieldValues.d.ts

@@ -1,2 +1,5 @@
 import { CmsEntry } from "@webiny/api-headless-cms/types";
-export declare function getFieldValues(entry: CmsEntry, fields: string[], useEntryId?: boolean): any;
+import { SearchRecord } from "../record/record.types";
+import { Folder } from "../folder/folder.types";
+export declare function getRecordFieldValues(entry: CmsEntry, fields: string[]): SearchRecord<any>;
+export declare function getFolderFieldValues(entry: CmsEntry, fields: string[]): Folder;

package/utils/getFieldValues.js

@@ -4,16 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFieldValues = getFieldValues;
+exports.getFolderFieldValues = getFolderFieldValues;
+exports.getRecordFieldValues = getRecordFieldValues;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _pick = _interopRequireDefault(require("lodash/pick"));
-var _utils = require("@webiny/utils");
-function getFieldValues(entry, fields, useEntryId) {
-  // We return the `id` without version in case of `useEntryId` flag is passed.
-  const {
-    id
-  } = (0, _utils.parseIdentifier)(entry.id);
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _pick.default)(entry, fields)), entry.values), useEntryId && {
-    id
-  });
+function getRecordFieldValues(entry, fields) {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _pick.default)(entry, fields)), entry.values);
+}
+function getFolderFieldValues(entry, fields) {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _pick.default)(entry, fields)), entry.values);
 }

package/utils/getFieldValues.js.map

@@ -1 +1 @@
-{"version":3,"names":["getFieldValues","entry","fields","useEntryId","id","parseIdentifier","pick","values"],"sources":["getFieldValues.ts"],"sourcesContent":["import pick from \"lodash/pick\";\n\nimport { CmsEntry } from \"@webiny/api-headless-cms/types\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\nexport function getFieldValues(entry: CmsEntry, fields: string[], useEntryId?: boolean): any {\n    // We return the `id` without version in case of `useEntryId` flag is passed.\n    const { id } = parseIdentifier(entry.id);\n    return { ...pick(entry, fields), ...entry.values, ...(useEntryId && { id }) };\n}\n"],"mappings":";;;;;;;;AAAA;AAGA;AAEO,SAASA,cAAc,CAACC,KAAe,EAAEC,MAAgB,EAAEC,UAAoB,EAAO;EACzF;EACA,MAAM;IAAEC;EAAG,CAAC,GAAG,IAAAC,sBAAe,EAACJ,KAAK,CAACG,EAAE,CAAC;EACxC,+FAAY,IAAAE,aAAI,EAACL,KAAK,EAAEC,MAAM,CAAC,GAAKD,KAAK,CAACM,MAAM,GAAMJ,UAAU,IAAI;IAAEC;EAAG,CAAC;AAC9E"}
+{"version":3,"names":["getRecordFieldValues","entry","fields","pick","values","getFolderFieldValues"],"sources":["getFieldValues.ts"],"sourcesContent":["import pick from \"lodash/pick\";\nimport { CmsEntry } from \"@webiny/api-headless-cms/types\";\nimport { SearchRecord } from \"~/record/record.types\";\nimport { Folder } from \"~/folder/folder.types\";\n\nexport function getRecordFieldValues(entry: CmsEntry, fields: string[]) {\n    return {\n        ...pick(entry, fields),\n        ...entry.values\n    } as SearchRecord<any>;\n}\n\nexport function getFolderFieldValues(entry: CmsEntry, fields: string[]) {\n    return { ...pick(entry, fields), ...entry.values } as Folder;\n}\n"],"mappings":";;;;;;;;;AAAA;AAKO,SAASA,oBAAoB,CAACC,KAAe,EAAEC,MAAgB,EAAE;EACpE,mEACO,IAAAC,aAAI,EAACF,KAAK,EAAEC,MAAM,CAAC,GACnBD,KAAK,CAACG,MAAM;AAEvB;AAEO,SAASC,oBAAoB,CAACJ,KAAe,EAAEC,MAAgB,EAAE;EACpE,mEAAY,IAAAC,aAAI,EAACF,KAAK,EAAEC,MAAM,CAAC,GAAKD,KAAK,CAACG,MAAM;AACpD"}

package/utils/modelFactory.d.ts

@@ -1,5 +1,5 @@
-import { CmsModelPlugin } from "@webiny/api-headless-cms";
-import { CmsModel, CmsGroup } from "@webiny/api-headless-cms/types";
+import { CmsModelPlugin, CmsPrivateModelFull } from "@webiny/api-headless-cms";
+import { CmsGroup } from "@webiny/api-headless-cms/types";
 interface Params {
     group: Pick<CmsGroup, "id" | "name">;
     /**
@@ -9,9 +9,7 @@ interface Params {
      */
     locale?: string;
     tenant?: string;
-    modelDefinition: Omit<CmsModel, "locale" | "tenant" | "webinyVersion" | "group" | "singularApiName" | "pluralApiName"> & {
-        isPrivate: true;
-    };
+    modelDefinition: Omit<CmsPrivateModelFull, "noValidate" | "group">;
 }
 export declare const modelFactory: (params: Params) => CmsModelPlugin;
 export {};