@webiny/api-aco 0.0.0-unstable.d65ec29d44 → 0.0.0-unstable.da99e0b846

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.d.ts

@@ -0,0 +1,9 @@
+import { CreateAcoStorageOperationsParams } from "../createAcoStorageOperations";
+import { CmsModel } from "@webiny/api-headless-cms/types";
+interface CreateOperationsWrapperParams extends CreateAcoStorageOperationsParams {
+    modelName: string;
+}
+export declare const createOperationsWrapper: (params: CreateOperationsWrapperParams) => {
+    withModel: <TResult>(cb: (model: CmsModel) => Promise<TResult>) => Promise<TResult>;
+};
+export {};

package/utils/createOperationsWrapper.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createOperationsWrapper = void 0;
+var _error = _interopRequireDefault(require("@webiny/error"));
+const createOperationsWrapper = params => {
+  const {
+    cms,
+    security,
+    modelName
+  } = params;
+  const withModel = async cb => {
+    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
+  };
+};
+exports.createOperationsWrapper = createOperationsWrapper;

package/utils/createOperationsWrapper.js.map

@@ -0,0 +1 @@
+{"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,2 @@
 import { CmsEntry } from "@webiny/api-headless-cms/types";
-export declare function getFieldValues(entry: CmsEntry, fields: string[]): any;
+export declare function getFieldValues(entry: CmsEntry, fields: string[], useEntryId?: boolean): any;

package/utils/getFieldValues.js

@@ -7,6 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.getFieldValues = getFieldValues;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _pick = _interopRequireDefault(require("lodash/pick"));
-function getFieldValues(entry, fields) {
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _pick.default)(entry, fields)), entry.values);
+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
+  });
 }

package/utils/getFieldValues.js.map

@@ -1 +1 @@
-{"version":3,"names":["getFieldValues","entry","fields","pick","values"],"sources":["getFieldValues.ts"],"sourcesContent":["import pick from \"lodash/pick\";\n\nimport { CmsEntry } from \"@webiny/api-headless-cms/types\";\n\nexport function getFieldValues(entry: CmsEntry, fields: string[]): any {\n    return { ...pick(entry, fields), ...entry.values };\n}\n"],"mappings":";;;;;;;;AAAA;AAIO,SAASA,cAAc,CAACC,KAAe,EAAEC,MAAgB,EAAO;EACnE,mEAAY,IAAAC,aAAI,EAACF,KAAK,EAAEC,MAAM,CAAC,GAAKD,KAAK,CAACG,MAAM;AACpD"}
+{"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"}

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,7 +9,7 @@ interface Params {
      */
     locale?: string;
     tenant?: string;
-    modelDefinition: Omit<CmsModel, "locale" | "tenant" | "webinyVersion" | "group">;
+    modelDefinition: Omit<CmsPrivateModelFull, "noValidate" | "group">;
 }
 export declare const modelFactory: (params: Params) => CmsModelPlugin;
 export {};

package/utils/modelFactory.js

@@ -14,10 +14,12 @@ const modelFactory = params => {
     tenant,
     modelDefinition
   } = params;
-  return (0, _apiHeadlessCms.createCmsModel)((0, _objectSpread2.default)({
+  return (0, _apiHeadlessCms.createCmsModel)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     group,
     locale,
     tenant
-  }, modelDefinition));
+  }, modelDefinition), {}, {
+    noValidate: true
+  }));
 };
 exports.modelFactory = modelFactory;

package/utils/modelFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["modelFactory","params","group","locale","tenant","modelDefinition","createCmsModel"],"sources":["modelFactory.ts"],"sourcesContent":["import { CmsModelPlugin, createCmsModel } from \"@webiny/api-headless-cms\";\nimport { CmsModel, CmsGroup } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    group: Pick<CmsGroup, \"id\" | \"name\">;\n    /**\n     * Locale and tenant do not need to be defined.\n     * In that case model is not bound to any locale or tenant.\n     * You can bind it to locale, tenant, both or none.\n     */\n    locale?: string;\n    tenant?: string;\n    modelDefinition: Omit<CmsModel, \"locale\" | \"tenant\" | \"webinyVersion\" | \"group\">;\n}\n\nexport const modelFactory = (params: Params): CmsModelPlugin => {\n    const { group, locale, tenant, modelDefinition } = params;\n\n    return createCmsModel({\n        group,\n        locale,\n        tenant,\n        ...modelDefinition\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAeO,MAAMA,YAAY,GAAIC,MAAc,IAAqB;EAC5D,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAgB,CAAC,GAAGJ,MAAM;EAEzD,OAAO,IAAAK,8BAAc;IACjBJ,KAAK;IACLC,MAAM;IACNC;EAAM,GACHC,eAAe,EACpB;AACN,CAAC;AAAC"}
+{"version":3,"names":["modelFactory","params","group","locale","tenant","modelDefinition","createCmsModel","noValidate"],"sources":["modelFactory.ts"],"sourcesContent":["import { CmsModelPlugin, CmsPrivateModelFull, createCmsModel } from \"@webiny/api-headless-cms\";\nimport { CmsGroup } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    group: Pick<CmsGroup, \"id\" | \"name\">;\n    /**\n     * Locale and tenant do not need to be defined.\n     * In that case model is not bound to any locale or tenant.\n     * You can bind it to locale, tenant, both or none.\n     */\n    locale?: string;\n    tenant?: string;\n    modelDefinition: Omit<CmsPrivateModelFull, \"noValidate\" | \"group\">;\n}\n\nexport const modelFactory = (params: Params): CmsModelPlugin => {\n    const { group, locale, tenant, modelDefinition } = params;\n\n    return createCmsModel({\n        group,\n        locale,\n        tenant,\n        ...modelDefinition,\n        noValidate: true\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAeO,MAAMA,YAAY,GAAIC,MAAc,IAAqB;EAC5D,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAgB,CAAC,GAAGJ,MAAM;EAEzD,OAAO,IAAAK,8BAAc;IACjBJ,KAAK;IACLC,MAAM;IACNC;EAAM,GACHC,eAAe;IAClBE,UAAU,EAAE;EAAI,GAClB;AACN,CAAC;AAAC"}