@webiny/api-headless-cms 5.19.0-beta.3 → 5.19.0

package/content/plugins/crud/contentEntry/referenceFieldsMapping.d.ts

@@ -7,6 +7,7 @@ interface Params {
     context: CmsContext;
     model: CmsModel;
     input: Record<string, ReferenceObject | ReferenceObject[]>;
+    validateEntries?: boolean;
 }
 export declare const referenceFieldsMapping: (params: Params) => Promise<Record<string, any>>;
 export {};

package/content/plugins/crud/contentEntry/referenceFieldsMapping.js

@@ -13,6 +13,8 @@ var _error = _interopRequireDefault(require("@webiny/error"));
 
 var _dotProp = _interopRequireDefault(require("dot-prop"));
 
+var _utils = require("@webiny/utils");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -116,11 +118,26 @@ const buildReferenceFieldPaths = params => {
   }, []);
 };
 
+const getReferenceFieldValue = ref => {
+  if (!ref) {
+    return {
+      id: null,
+      modelId: null
+    };
+  }
+
+  return {
+    id: (ref.id || ref.entryId || "").trim() || null,
+    modelId: (ref.modelId || "").trim() || null
+  };
+};
+
 const referenceFieldsMapping = async params => {
   const {
     context,
     model,
-    input
+    input,
+    validateEntries = false
   } = params;
 
   let output = _objectSpread({}, input);
@@ -141,21 +158,26 @@ const referenceFieldsMapping = async params => {
   for (const path of referenceFieldPaths) {
     const ref = _dotProp.default.get(output, path);
 
-    if (!ref || !ref.id || !ref.modelId) {
+    const {
+      id,
+      modelId
+    } = getReferenceFieldValue(ref);
+
+    if (!id || !modelId) {
       continue;
     }
 
-    if (!referencesByModel[ref.modelId]) {
-      referencesByModel[ref.modelId] = [];
+    if (!referencesByModel[modelId]) {
+      referencesByModel[modelId] = [];
     }
 
-    referencesByModel[ref.modelId].push(ref.id);
+    referencesByModel[modelId].push(id);
 
-    if (!pathsByReferenceId[ref.id]) {
-      pathsByReferenceId[ref.id] = [];
+    if (!pathsByReferenceId[id]) {
+      pathsByReferenceId[id] = [];
     }
 
-    pathsByReferenceId[ref.id].push(path);
+    pathsByReferenceId[id].push(path);
   }
   /**
    * Again, no point in going further.
@@ -197,7 +219,11 @@ const referenceFieldsMapping = async params => {
   const results = await Promise.all(promises);
   const records = results.reduce((collection, entries) => {
     for (const entry of entries) {
-      collection[entry.id] = entry;
+      collection[entry.id] = {
+        id: entry.id,
+        entryId: entry.entryId,
+        modelId: entry.modelId
+      };
     }
 
     return collection;
@@ -209,15 +235,24 @@ const referenceFieldsMapping = async params => {
   for (const modelId in referencesByModel) {
     const entries = referencesByModel[modelId];
 
-    for (const entry of entries) {
-      if (records[entry]) {
+    for (const id of entries) {
+      if (records[id]) {
         continue;
+      } else if (validateEntries === true) {
+        throw new _error.default(`Missing referenced entry with id "${id}" in model "${modelId}".`, "ENTRY_NOT_FOUND", {
+          id,
+          model: modelId
+        });
       }
 
-      throw new _error.default(`Missing referenced entry with id "${entry}" in model "${modelId}".`, "ENTRY_NOT_FOUND", {
-        entry,
-        model: modelId
-      });
+      const {
+        id: entryId
+      } = (0, _utils.parseIdentifier)(id);
+      records[id] = {
+        id,
+        entryId,
+        modelId
+      };
     }
   }
   /**
@@ -230,10 +265,14 @@ const referenceFieldsMapping = async params => {
     const paths = pathsByReferenceId[id];
 
     if (!entry) {
-      throw new _error.default("Missing entry in records.", "ENTRY_ERROR", {
-        id,
-        paths
-      });
+      if (validateEntries === true) {
+        throw new _error.default("Missing entry in records.", "ENTRY_ERROR", {
+          id,
+          paths
+        });
+      }
+
+      continue;
     }
 
     for (const path of paths) {

package/content/plugins/crud/contentEntry.crud.js

@@ -380,7 +380,8 @@ const createContentEntryCrud = params => {
       const input = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
-        input: initialInput
+        input: initialInput,
+        validateEntries: true
       });
       const identity = context.security.getIdentity();
       const locale = context.cms.getLocale();
@@ -480,7 +481,8 @@ const createContentEntryCrud = params => {
       const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
-        input: initialValues
+        input: initialValues,
+        validateEntries: false
       });
       utils.checkOwnership(context, permission, originalEntry);
       const latestEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, latestStorageEntry);
@@ -578,7 +580,8 @@ const createContentEntryCrud = params => {
       const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
-        input: initialValues
+        input: initialValues,
+        validateEntries: false
       });
       /**
        * We always send the full entry to the hooks and storage operations update.
@@ -656,7 +659,8 @@ const createContentEntryCrud = params => {
       const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
-        input: originalEntry.values
+        input: originalEntry.values,
+        validateEntries: false
       });
 
       const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {

package/content/plugins/crud/contentModel/beforeDelete.js

@@ -35,7 +35,8 @@ const assignBeforeModelDelete = params => {
       const result = await storageOperations.entries.list(model, {
         where: {
           tenant: model.tenant,
-          locale: model.locale
+          locale: model.locale,
+          latest: true
         },
         limit: 1
       });

package/content/plugins/crud/index.js

@@ -42,7 +42,7 @@ const createContentCruds = params => {
     }
 
     const getLocale = () => {
-      return context.i18n.getCurrentLocale();
+      return context.cms.getLocale();
     };
 
     const getIdentity = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "5.19.0-beta.3",
+	"version": "5.19.0",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -21,23 +21,23 @@
 		"@babel/runtime": "7.16.3",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api-file-manager": "5.19.0-beta.3",
-		"@webiny/api-i18n": "5.19.0-beta.3",
-		"@webiny/api-i18n-content": "5.19.0-beta.3",
-		"@webiny/api-i18n-ddb": "5.19.0-beta.3",
-		"@webiny/api-security": "5.19.0-beta.3",
-		"@webiny/api-tenancy": "5.19.0-beta.3",
-		"@webiny/api-upgrade": "5.19.0-beta.3",
-		"@webiny/error": "5.19.0-beta.3",
-		"@webiny/handler": "5.19.0-beta.3",
-		"@webiny/handler-aws": "5.19.0-beta.3",
-		"@webiny/handler-db": "5.19.0-beta.3",
-		"@webiny/handler-graphql": "5.19.0-beta.3",
-		"@webiny/handler-http": "5.19.0-beta.3",
-		"@webiny/plugins": "5.19.0-beta.3",
-		"@webiny/pubsub": "5.19.0-beta.3",
-		"@webiny/utils": "5.19.0-beta.3",
-		"@webiny/validation": "5.19.0-beta.3",
+		"@webiny/api-file-manager": "5.19.0",
+		"@webiny/api-i18n": "5.19.0",
+		"@webiny/api-i18n-content": "5.19.0",
+		"@webiny/api-i18n-ddb": "5.19.0",
+		"@webiny/api-security": "5.19.0",
+		"@webiny/api-tenancy": "5.19.0",
+		"@webiny/api-upgrade": "5.19.0",
+		"@webiny/error": "5.19.0",
+		"@webiny/handler": "5.19.0",
+		"@webiny/handler-aws": "5.19.0",
+		"@webiny/handler-db": "5.19.0",
+		"@webiny/handler-graphql": "5.19.0",
+		"@webiny/handler-http": "5.19.0",
+		"@webiny/plugins": "5.19.0",
+		"@webiny/pubsub": "5.19.0",
+		"@webiny/utils": "5.19.0",
+		"@webiny/validation": "5.19.0",
 		"boolean": "3.1.4",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.0.0",
@@ -54,10 +54,10 @@
 		"@babel/core": "^7.5.5",
 		"@babel/preset-env": "^7.5.5",
 		"@babel/preset-flow": "^7.0.0",
-		"@webiny/api-security-so-ddb": "^5.19.0-beta.3",
-		"@webiny/api-tenancy-so-ddb": "^5.19.0-beta.3",
-		"@webiny/cli": "^5.19.0-beta.3",
-		"@webiny/project-utils": "^5.19.0-beta.3",
+		"@webiny/api-security-so-ddb": "^5.19.0",
+		"@webiny/api-tenancy-so-ddb": "^5.19.0",
+		"@webiny/cli": "^5.19.0",
+		"@webiny/project-utils": "^5.19.0",
 		"apollo-graphql": "^0.4.1",
 		"get-yarn-workspaces": "^1.0.2",
 		"graphql": "^14.6.0",
@@ -77,5 +77,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "a1cca819f83172183b907de16fd5746d07d13ad0"
+	"gitHead": "9cb14e343f881e70ce71967ff525b52f385b64d3"
 }

package/plugins/context.js

@@ -17,7 +17,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var _default = () => {
   return new _ContextPlugin.ContextPlugin(context => {
-    const locale = context.i18n.getCurrentLocale();
+    const locale = context.i18nContent.getLocale();
     context.cms = _objectSpread(_objectSpread({}, context.cms || {}), {}, {
       locale: locale ? locale.code : "en-US",
 

package/plugins/crud/index.js

@@ -42,7 +42,7 @@ const createAdminCruds = params => {
     }
 
     const getLocale = () => {
-      return context.i18n.getCurrentLocale();
+      return context.cms.getLocale();
     };
 
     const getIdentity = () => {