@webiny/api-headless-cms 5.18.3 → 5.19.0-beta.0

package/content/plugins/crud/index.js

@@ -25,6 +25,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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; }
 
+const debug = process.env.DEBUG === "true";
+
 const createContentCruds = params => {
   const {
     storageOperations
@@ -35,7 +37,7 @@ const createContentCruds = params => {
      * It is to make sure that we load setup context before the CRUD init in our internal code.
      */
     if (!context.cms) {
-      console.log(`Missing initial "cms" on the context. Make sure that you set it up before creating Content CRUDs.`);
+      debug && console.log(`Missing initial "cms" on the context. Make sure that you set it up before creating Content CRUDs.`);
       return;
     }
 
@@ -55,7 +57,9 @@ const createContentCruds = params => {
       context.plugins.register(storageOperations.plugins);
     }
 
-    context.cms = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context.cms), (0, _system.createSystemCrud)({
+    context.cms = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context.cms), {}, {
+      storageOperations
+    }, (0, _system.createSystemCrud)({
       context,
       getTenant,
       getIdentity,
@@ -79,8 +83,6 @@ const createContentCruds = params => {
       storageOperations
     })), (0, _contentEntry.createContentEntryCrud)({
       context,
-      getLocale,
-      getTenant,
       getIdentity,
       storageOperations
     }));

package/content/plugins/graphqlFields/ref.js

@@ -11,6 +11,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _createTypeName = require("../utils/createTypeName");
 
+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; }
@@ -23,17 +25,30 @@ const createListFilters = ({
   field
 }) => {
   return `
-        ${field.fieldId}: String
-        ${field.fieldId}_in: [String!]
-        ${field.fieldId}_not: String
-        ${field.fieldId}_not_in: [String!]
+        ${field.fieldId}: RefFieldWhereInput
+    `;
+};
+
+const createFilteringTypeDef = () => {
+  return `
+        input RefFieldWhereInput {
+            id: String
+            id_not: String
+            id_in: [String!]
+            id_not_in: [String]
+            entryId: String
+            entryId_not: String
+            entryId_in: [String!]
+            entryId_not_in: [String!]
+        }
     `;
 };
 
 const appendTypename = (entries, typename) => {
   return entries.map(item => {
-    item["__typename"] = typename;
-    return item;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      __typename: typename
+    });
   });
 };
 
@@ -77,26 +92,27 @@ const plugin = {
             return [];
           }
 
-          const entriesByModel = value.map((ref, index) => {
-            return {
-              entryId: ref.entryId,
-              modelId: ref.modelId,
-              index
-            };
-          });
-          const getters = entriesByModel.map(async ({
-            modelId,
-            entryId
-          }) => {
-            // Get model manager, to get access to CRUD methods
+          const entriesByModel = value.reduce((collection, ref) => {
+            if (!collection[ref.modelId]) {
+              collection[ref.modelId] = [];
+            } else if (collection[ref.modelId].includes(ref.entryId) === true) {
+              return collection;
+            }
+
+            collection[ref.modelId].push(ref.entryId);
+            return collection;
+          }, {});
+          const getters = Object.keys(entriesByModel).map(async modelId => {
+            const idList = entriesByModel[modelId]; // Get model manager, to get access to CRUD methods
+
             const model = await cms.getModelManager(modelId);
             let entries; // `read` API works with `published` data
 
             if (cms.READ) {
-              entries = await model.getPublishedByIds([entryId]);
+              entries = await model.getPublishedByIds(idList);
             } // `preview` and `manage` with `latest` data
             else {
-              entries = await model.getLatestByIds([entryId]);
+              entries = await model.getLatestByIds(idList);
             }
 
             return appendTypename(entries, modelIdToTypeName.get(modelId));
@@ -143,17 +159,19 @@ const plugin = {
         }));
       }
 
-      if (!unionFields.length) {
-        return null;
-      }
-
+      const unionFieldsTypeDef = unionFields.map(({
+        field,
+        typeName
+      }) => `union ${typeName} = ${field.settings.models.map(({
+        modelId
+      }) => (0, _createTypeName.createReadTypeName)(modelId)).join(" | ")}`).join("\n");
+      const filteringTypeDef = `
+                ${createFilteringTypeDef()}
+                
+                ${unionFieldsTypeDef}
+            `;
       return {
-        typeDefs: unionFields.map(({
-          field,
-          typeName
-        }) => `union ${typeName} = ${field.settings.models.map(({
-          modelId
-        }) => (0, _createTypeName.createReadTypeName)(modelId)).join(" | ")}`).join("\n"),
+        typeDefs: filteringTypeDef,
         resolvers: {}
       };
     },
@@ -162,19 +180,37 @@ const plugin = {
   },
   manage: {
     createSchema() {
+      /**
+       * entryId in RefFieldInput is deprecated but cannot mark it as GraphQL does not allow marking input fields as deprecated
+       */
       return {
         typeDefs: `
                     type RefField {
                         modelId: String!
                         entryId: ID!
+                        id: ID!
                     }
                     
                     input RefFieldInput {
                         modelId: String!
-                        entryId: ID!
+                        id: ID!
                     }
+                    
+                    ${createFilteringTypeDef()}
                 `,
-        resolvers: {}
+        resolvers: {
+          RefField: {
+            entryId: parent => {
+              const {
+                id
+              } = (0, _utils.parseIdentifier)(parent.entryId || parent.id);
+              return id;
+            },
+            id: parent => {
+              return parent.id || parent.entryId;
+            }
+          }
+        }
       };
     },
 
@@ -182,7 +218,7 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return `${field.fieldId}: [RefField]`;
+        return `${field.fieldId}: [RefField!]`;
       }
 
       return `${field.fieldId}: RefField`;
@@ -192,7 +228,7 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [RefFieldInput]";
+        return field.fieldId + ": [RefFieldInput!]";
       }
 
       return field.fieldId + ": RefFieldInput";

package/content/plugins/modelManager/DefaultCmsModelManager.js

@@ -9,6 +9,8 @@ exports.DefaultCmsModelManager = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _utils = require("@webiny/utils");
+
 class DefaultCmsModelManager {
   constructor(context, model) {
     (0, _defineProperty2.default)(this, "_context", void 0);
@@ -22,7 +24,11 @@ class DefaultCmsModelManager {
   }
 
   async delete(id) {
-    if (id.includes("#")) {
+    const {
+      version
+    } = (0, _utils.parseIdentifier)(id);
+
+    if (version) {
       return this._context.cms.deleteEntryRevision(this._model, id);
     }
 

package/content/plugins/schema/contentEntries.js

@@ -46,7 +46,7 @@ const plugin = context => {
 
             input CmsModelEntryInput {
                 modelId: ID!
-                entryId: ID!
+                id: ID!
             }
 
             extend type Query {
@@ -101,7 +101,7 @@ const plugin = context => {
         async getContentEntry(_, args, context) {
           const {
             modelId,
-            entryId
+            id
           } = args.entry;
           const models = await context.cms.listModels();
           const model = models.find(m => m.modelId === modelId);
@@ -114,7 +114,7 @@ const plugin = context => {
             });
           }
 
-          const [entry] = await context.cms.getEntriesByIds(model, [entryId]);
+          const [entry] = await context.cms.getEntriesByIds(model, [id]);
           return new _handlerGraphql.Response({
             id: entry.id,
             model: {
@@ -128,33 +128,44 @@ const plugin = context => {
 
         async getContentEntries(_, args, context) {
           const models = await context.cms.listModels();
-          const entriesByModel = args.entries.map((ref, index) => {
-            return {
-              entryId: ref.entryId,
-              modelId: ref.modelId,
-              index
-            };
+          const modelsMap = models.reduce((collection, model) => {
+            collection[model.modelId] = model;
+            return collection;
+          }, {});
+          const entriesByModel = args.entries.reduce((collection, ref) => {
+            if (!collection[ref.modelId]) {
+              collection[ref.modelId] = [];
+            } else if (collection[ref.modelId].includes(ref.id) === true) {
+              return collection;
+            }
+
+            collection[ref.modelId].push(ref.id);
+            return collection;
+          }, {});
+          const getters = Object.keys(entriesByModel).map(async modelId => {
+            return context.cms.getEntriesByIds(modelsMap[modelId], entriesByModel[modelId]);
           });
-          const getters = entriesByModel.map(async ({
-            modelId,
-            entryId
-          }) => {
-            // Get model manager, to get access to CRUD methods
-            const model = models.find(m => m.modelId === modelId);
-            const entries = await context.cms.getEntriesByIds(model, [entryId]);
-            return entries.map(entry => ({
-              id: entry.id,
-              model: {
-                modelId: model.modelId,
-                name: model.name
-              },
-              status: entry.status,
-              title: (0, _getEntryTitle.getEntryTitle)(model, entry)
+
+          if (getters.length === 0) {
+            return new _handlerGraphql.Response([]);
+          }
+
+          const results = await Promise.all(getters);
+          const entries = results.reduce((collection, items) => {
+            return collection.concat(items.map(item => {
+              const model = modelsMap[item.modelId];
+              return {
+                id: item.id,
+                model: {
+                  modelId: model.modelId,
+                  name: model.name
+                },
+                status: item.status,
+                title: (0, _getEntryTitle.getEntryTitle)(model, item)
+              };
             }));
-          });
-          return new _handlerGraphql.Response(await Promise.all(getters).then(results => {
-            return results.reduce((result, item) => result.concat(item), []);
-          }));
+          }, []);
+          return new _handlerGraphql.Response(entries);
         }
 
       }

package/content/plugins/schema/createManageResolvers.js

@@ -123,8 +123,7 @@ const createManageResolvers = ({
       },
 
       async revisions(entry, _, context) {
-        const entryId = entry.id.split("#")[0];
-        const revisions = await context.cms.getEntryRevisions(model, entryId);
+        const revisions = await context.cms.getEntryRevisions(model, entry.entryId);
         return revisions.sort((a, b) => b.version - a.version);
       }
 

package/content/plugins/schema/resolvers/manage/resolveDelete.js

@@ -7,6 +7,8 @@ exports.resolveDelete = void 0;
 
 var _responses = require("@webiny/handler-graphql/responses");
 
+var _utils = require("@webiny/utils");
+
 const resolveDelete = ({
   model
 }) => async (_, {
@@ -15,7 +17,11 @@ const resolveDelete = ({
   cms
 }) => {
   try {
-    if (revision.includes("#")) {
+    const {
+      version
+    } = (0, _utils.parseIdentifier)(revision);
+
+    if (version) {
       await cms.deleteEntryRevision(model, revision);
     } else {
       await cms.deleteEntry(model, revision);

package/content/plugins/utils/renderSortEnum.js

@@ -14,18 +14,18 @@ const renderSortEnum = ({
   fieldTypePlugins
 }) => {
   const sorters = [`id_ASC`, `id_DESC`, "savedOn_ASC", "savedOn_DESC", "createdOn_ASC", "createdOn_DESC"];
-  const fieldIds = model.fields.filter(f => {
-    // Every time a client updates content model's fields, we check the type of each field. If a field plugin
-    // for a particular "field.type" doesn't exist on the backend yet, we throw an error. But still, we also
-    // want to be careful when accessing the field plugin here too. It is still possible to have a content model
-    // that contains a field, for which we don't have a plugin registered on the backend. For example, user
-    // could've just removed the plugin from the backend.
-    return (0, _get.default)(fieldTypePlugins, `${f.type}.isSortable`);
-  }).map(f => f.fieldId);
-  fieldIds.forEach(fieldId => {
-    sorters.push(`${fieldId}_ASC`);
-    sorters.push(`${fieldId}_DESC`);
-  });
+
+  for (const field of model.fields) {
+    const isSortable = (0, _get.default)(fieldTypePlugins, `${field.type}.isSortable`);
+
+    if (!isSortable) {
+      continue;
+    }
+
+    sorters.push(`${field.fieldId}_ASC`);
+    sorters.push(`${field.fieldId}_DESC`);
+  }
+
   return sorters.join("\n");
 };
 

package/content/plugins/validators/patternPlugins/index.js

@@ -15,5 +15,9 @@ var _lowerCase = _interopRequireDefault(require("./lowerCase"));
 
 var _upperCase = _interopRequireDefault(require("./upperCase"));
 
-var _default = [_email.default, _url.default, _lowerCase.default, _upperCase.default];
+var _lowerCaseSpace = _interopRequireDefault(require("./lowerCaseSpace"));
+
+var _upperCaseSpace = _interopRequireDefault(require("./upperCaseSpace"));
+
+var _default = [_email.default, _url.default, _lowerCase.default, _upperCase.default, _lowerCaseSpace.default, _upperCaseSpace.default];
 exports.default = _default;

package/content/plugins/validators/patternPlugins/lowerCaseSpace.d.ts

@@ -0,0 +1,3 @@
+import { CmsModelFieldPatternValidatorPlugin } from "../../../../types";
+declare const plugin: CmsModelFieldPatternValidatorPlugin;
+export default plugin;

package/content/plugins/validators/patternPlugins/lowerCaseSpace.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+const plugin = {
+  type: "cms-model-field-validator-pattern",
+  name: "cms-model-field-validator-pattern-lower-case-space",
+  pattern: {
+    name: "lowerCaseSpace",
+    regex: `^([a-z\\s]+)$`,
+    flags: ""
+  }
+};
+var _default = plugin;
+exports.default = _default;

package/content/plugins/validators/patternPlugins/upperCaseSpace.d.ts

@@ -0,0 +1,3 @@
+import { CmsModelFieldPatternValidatorPlugin } from "../../../../types";
+declare const plugin: CmsModelFieldPatternValidatorPlugin;
+export default plugin;

package/content/plugins/validators/patternPlugins/upperCaseSpace.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+const plugin = {
+  type: "cms-model-field-validator-pattern",
+  name: "cms-model-field-validator-pattern-upper-case-space",
+  pattern: {
+    name: "upperCaseSpace",
+    regex: `^([A-Z\\s]+)$`,
+    flags: ""
+  }
+};
+var _default = plugin;
+exports.default = _default;

package/index.d.ts

@@ -6,7 +6,7 @@ export declare type AdminContextParams = CreateAdminCrudsParams;
 export declare const createAdminHeadlessCmsContext: (params: AdminContextParams) => (import("@webiny/handler/plugins/ContextPlugin").ContextPlugin<import("./types").CmsContext> | import("@webiny/api-upgrade").UpgradePlugin<import("./types").CmsContext>[])[];
 export declare const createAdminHeadlessCmsGraphQL: () => import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("@webiny/handler/types").ContextInterface>;
 export declare type ContentContextParams = CreateContentCrudsParams;
-export declare const createContentHeadlessCmsContext: (params: ContentContextParams) => (import("./types").ModelManagerPlugin | import("@webiny/handler/plugins/ContextPlugin").ContextPlugin<import("./types").CmsContext> | import("./types").CmsModelFieldToGraphQLPlugin[] | StorageTransformPlugin<any, any> | (import("./types").CmsModelFieldValidatorPlugin | import("./types").CmsModelFieldPatternValidatorPlugin[])[])[];
+export declare const createContentHeadlessCmsContext: (params: ContentContextParams) => (import("./types").ModelManagerPlugin | import("./types").CmsModelFieldToGraphQLPlugin[] | StorageTransformPlugin<any, any> | import("@webiny/handler/plugins/ContextPlugin").ContextPlugin<import("./types").CmsContext> | (import("./types").CmsModelFieldValidatorPlugin | import("./types").CmsModelFieldPatternValidatorPlugin[])[])[];
 export declare type ContentGraphQLParams = CreateGraphQLHandlerOptions;
 export declare const createContentHeadlessCmsGraphQL: (params?: ContentGraphQLParams) => import("@webiny/plugins/types").PluginCollection;
 export { StorageTransformPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "5.18.3",
+	"version": "5.19.0-beta.0",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -21,26 +21,27 @@
 		"@babel/runtime": "7.16.3",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api-file-manager": "5.18.3",
-		"@webiny/api-i18n": "5.18.3",
-		"@webiny/api-i18n-content": "5.18.3",
-		"@webiny/api-i18n-ddb": "5.18.3",
-		"@webiny/api-security": "5.18.3",
-		"@webiny/api-tenancy": "5.18.3",
-		"@webiny/api-upgrade": "5.18.3",
-		"@webiny/error": "5.18.3",
-		"@webiny/handler": "5.18.3",
-		"@webiny/handler-aws": "5.18.3",
-		"@webiny/handler-db": "5.18.3",
-		"@webiny/handler-graphql": "5.18.3",
-		"@webiny/handler-http": "5.18.3",
-		"@webiny/plugins": "5.18.3",
-		"@webiny/pubsub": "5.18.3",
-		"@webiny/utils": "5.18.3",
-		"@webiny/validation": "5.18.3",
+		"@webiny/api-file-manager": "5.19.0-beta.0",
+		"@webiny/api-i18n": "5.19.0-beta.0",
+		"@webiny/api-i18n-content": "5.19.0-beta.0",
+		"@webiny/api-i18n-ddb": "5.19.0-beta.0",
+		"@webiny/api-security": "5.19.0-beta.0",
+		"@webiny/api-tenancy": "5.19.0-beta.0",
+		"@webiny/api-upgrade": "5.19.0-beta.0",
+		"@webiny/error": "5.19.0-beta.0",
+		"@webiny/handler": "5.19.0-beta.0",
+		"@webiny/handler-aws": "5.19.0-beta.0",
+		"@webiny/handler-db": "5.19.0-beta.0",
+		"@webiny/handler-graphql": "5.19.0-beta.0",
+		"@webiny/handler-http": "5.19.0-beta.0",
+		"@webiny/plugins": "5.19.0-beta.0",
+		"@webiny/pubsub": "5.19.0-beta.0",
+		"@webiny/utils": "5.19.0-beta.0",
+		"@webiny/validation": "5.19.0-beta.0",
 		"boolean": "3.1.4",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.0.0",
+		"dot-prop": "6.0.1",
 		"lodash": "4.17.21",
 		"p-map": "4.0.0",
 		"p-reduce": "2.1.0",
@@ -53,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.18.3",
-		"@webiny/api-tenancy-so-ddb": "^5.18.3",
-		"@webiny/cli": "^5.18.3",
-		"@webiny/project-utils": "^5.18.3",
+		"@webiny/api-security-so-ddb": "^5.19.0-beta.0",
+		"@webiny/api-tenancy-so-ddb": "^5.19.0-beta.0",
+		"@webiny/cli": "^5.19.0-beta.0",
+		"@webiny/project-utils": "^5.19.0-beta.0",
 		"apollo-graphql": "^0.4.1",
 		"get-yarn-workspaces": "^1.0.2",
 		"graphql": "^14.6.0",
@@ -76,5 +77,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "3ccdb07d10c57086a63eb42ba7484e17bc388297"
+	"gitHead": "6c834e0b356e9099800f4094f2023b05b951d8ea"
 }

package/plugins/crud/index.js

@@ -17,10 +17,16 @@ var _ContextPlugin = require("@webiny/handler/plugins/ContextPlugin");
 
 var _contentModelGroup = require("../../content/plugins/crud/contentModelGroup.crud");
 
+var _contentModel = require("../../content/plugins/crud/contentModel.crud");
+
+var _contentEntry = require("../../content/plugins/crud/contentEntry.crud");
+
 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; }
 
+const debug = process.env.DEBUG === "true";
+
 const createAdminCruds = params => {
   const {
     storageOperations
@@ -31,7 +37,7 @@ const createAdminCruds = params => {
      * It is to make sure that we load setup context before the CRUD init in our internal code.
      */
     if (!context.cms) {
-      console.log(`Missing initial "cms" on the context. Make sure that you set it up before creating Admin CRUDs.`);
+      debug && console.log(`Missing initial "cms" on the context. Make sure that you set it up before creating Admin CRUDs.`);
       return;
     }
 
@@ -51,7 +57,9 @@ const createAdminCruds = params => {
       context.plugins.register(storageOperations.plugins);
     }
 
-    context.cms = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context.cms), (0, _system.createSystemCrud)({
+    context.cms = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context.cms), {}, {
+      storageOperations
+    }, (0, _system.createSystemCrud)({
       context,
       getTenant,
       getIdentity,
@@ -67,6 +75,16 @@ const createAdminCruds = params => {
       getLocale,
       getIdentity,
       storageOperations
+    })), (0, _contentModel.createModelsCrud)({
+      context,
+      getTenant,
+      getLocale,
+      getIdentity,
+      storageOperations
+    })), (0, _contentEntry.createContentEntryCrud)({
+      context,
+      getIdentity,
+      storageOperations
     }));
 
     if (!storageOperations.init) {

package/plugins/crud/system.crud.js

@@ -161,9 +161,10 @@ const createSystemCrud = params => {
       }
 
       const upgradePlugins = context.plugins.byType("api-upgrade").filter(pl => pl.app === "headless-cms");
+      const installedAppVersion = await this.getSystemVersion();
       const plugin = (0, _apiUpgrade.getApplicablePlugin)({
         deployedVersion: context.WEBINY_VERSION,
-        installedAppVersion: await this.getVersion(),
+        installedAppVersion,
         upgradePlugins,
         upgradeToVersion: version
       });