@webiny/api-headless-cms 5.25.0-beta.5 → 5.25.1-beta.0

package/content/graphQLHandlerFactory.js

@@ -192,7 +192,9 @@ const graphQLHandlerFactory = (options = {}) => {
     }
 
   };
-  return [...(debug ? (0, _debugPlugins.default)() : []), handler];
+  return [...(debug ? (0, _debugPlugins.default)() : []), handler, {
+    type: "wcp-telemetry-tracker"
+  }];
 };
 
 exports.graphQLHandlerFactory = graphQLHandlerFactory;

package/content/graphQLHandlerFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["graphQLHandlerFactory.ts"],"names":["DEFAULT_HEADERS","DEFAULT_CACHE_MAX_AGE","OPTIONS_HEADERS","respond","http","result","response","body","JSON","stringify","statusCode","headers","schemaList","Map","generateCacheKey","args","context","locale","type","lastModelChange","cms","getModelLastChange","code","toISOString","join","generateSchema","plugins","register","typeDefs","resolvers","schemaPlugins","byType","GraphQLSchemaPlugin","pl","push","schema","getSchema","tenantId","tenancy","getCurrentTenant","id","cacheKey","has","set","key","cache","get","checkEndpointAccess","permission","security","getPermission","NotAuthorizedError","data","reason","graphQLHandlerFactory","options","debug","handler","name","handle","next","request","method","toLowerCase","ex","NotAuthorizedResponse","getLocale","parse"],"mappings":"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","sourcesContent":["import { boolean } from \"boolean\";\nimport { GraphQLSchema } from \"graphql\";\nimport { makeExecutableSchema } from \"@graphql-tools/schema\";\nimport { CmsContext } from \"~/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { NotAuthorizedError, NotAuthorizedResponse } from \"@webiny/api-security\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport processRequestBody from \"@webiny/handler-graphql/processRequestBody\";\nimport buildSchemaPlugins from \"./plugins/buildSchemaPlugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins\";\nimport { getWebinyVersionHeaders } from \"@webiny/utils\";\nimport { HttpObject } from \"@webiny/handler-http/types\";\nimport { HandlerPlugin } from \"@webiny/handler/types\";\nimport { GraphQLRequestBody } from \"@webiny/handler-graphql/types\";\n\nexport interface CreateGraphQLHandlerOptions {\n    debug?: boolean;\n}\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\ninterface Args {\n    context: CmsContext;\n    type: string;\n    locale: I18NLocale;\n}\n\nconst DEFAULT_HEADERS: Record<string, string> = {\n    \"Access-Control-Allow-Origin\": \"*\",\n    \"Access-Control-Allow-Headers\": \"*\",\n    \"Access-Control-Allow-Methods\": \"OPTIONS,POST\",\n    \"Content-Type\": \"application/json\",\n    ...getWebinyVersionHeaders()\n};\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\n\nconst OPTIONS_HEADERS: Record<string, string> = {\n    \"Access-Control-Max-Age\": `${DEFAULT_CACHE_MAX_AGE}`,\n    \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`\n};\n\nconst respond = (http: HttpObject, result: unknown) => {\n    return http.response({\n        body: JSON.stringify(result),\n        statusCode: 200,\n        headers: DEFAULT_HEADERS\n    });\n};\nconst schemaList = new Map<string, SchemaCache>();\n\nconst generateCacheKey = async (args: Args): Promise<string> => {\n    const { context, locale, type } = args;\n    const lastModelChange = await context.cms.getModelLastChange();\n    return [locale.code, type, lastModelChange.toISOString()].join(\"#\");\n};\n\nconst generateSchema = async (args: Args): Promise<GraphQLSchema> => {\n    const { context } = args;\n\n    context.plugins.register(await buildSchemaPlugins(context));\n    /**\n     * Really hard to type this to satisfy the makeExecutableSchema\n     */\n    // TODO @ts-refactor\n    const typeDefs: any = [];\n    const resolvers: any = [];\n\n    // Get schema definitions from plugins\n    const schemaPlugins = context.plugins.byType<GraphQLSchemaPlugin>(GraphQLSchemaPlugin.type);\n    for (const pl of schemaPlugins) {\n        typeDefs.push(pl.schema.typeDefs);\n        resolvers.push(pl.schema.resolvers);\n    }\n\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers\n    });\n};\n\n// gets an existing schema or rewrites existing one or creates a completely new one\n// depending on the schemaId created from type and locale parameters\nconst getSchema = async (args: Args): Promise<GraphQLSchema> => {\n    const { context, type, locale } = args;\n    const tenantId = context.tenancy.getCurrentTenant().id;\n    const id = `${tenantId}#${type}#${locale.code}`;\n\n    const cacheKey = await generateCacheKey(args);\n    if (!schemaList.has(id)) {\n        const schema = await generateSchema(args);\n\n        schemaList.set(id, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    }\n    /**\n     * Safe to cast because check was done few lines up.\n     */\n    const cache = schemaList.get(id) as SchemaCache;\n    if (cache.key === cacheKey) {\n        return cache.schema;\n    }\n    const schema = await generateSchema(args);\n    schemaList.set(id, {\n        key: cacheKey,\n        schema\n    });\n    return schema;\n};\n\nconst checkEndpointAccess = async (context: CmsContext): Promise<void> => {\n    const permission = await context.security.getPermission(`cms.endpoint.${context.cms.type}`);\n    if (!permission) {\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access \"${context.cms.type}\" endpoint.`\n            }\n        });\n    }\n};\n\nexport const graphQLHandlerFactory = (\n    options: CreateGraphQLHandlerOptions = {}\n): PluginCollection => {\n    const debug = boolean(options.debug);\n\n    const handler: HandlerPlugin = {\n        type: \"handler\",\n        name: \"handler-graphql-content-model\",\n        async handle(context: CmsContext, next) {\n            const { http } = context;\n\n            if (!http || !http.request) {\n                return next();\n            }\n\n            const method = (http.request.method || \"\").toLowerCase();\n            /**\n             * In case of OPTIONS method we just return the headers since there is no need to go further.\n             */\n            if (method.toLowerCase() === \"options\") {\n                return http.response({\n                    statusCode: 204,\n                    headers: {\n                        ...DEFAULT_HEADERS,\n                        ...OPTIONS_HEADERS\n                    }\n                });\n            }\n            /**\n             * We expect, and allow, only POST method to access our GraphQL\n             */\n            if (method !== \"post\") {\n                return next();\n            }\n\n            try {\n                await checkEndpointAccess(context);\n            } catch (ex) {\n                return respond(http, new NotAuthorizedResponse(ex));\n            }\n\n            const schema = await getSchema({\n                context,\n                locale: context.cms.getLocale(),\n                type: context.cms.type\n            });\n\n            const body: GraphQLRequestBody | GraphQLRequestBody[] = JSON.parse(http.request.body);\n\n            const result = await processRequestBody(body, schema, context);\n            return respond(http, result);\n        }\n    };\n\n    return [...(debug ? debugPlugins() : []), handler];\n};\n"]}
+{"version":3,"sources":["graphQLHandlerFactory.ts"],"names":["DEFAULT_HEADERS","DEFAULT_CACHE_MAX_AGE","OPTIONS_HEADERS","respond","http","result","response","body","JSON","stringify","statusCode","headers","schemaList","Map","generateCacheKey","args","context","locale","type","lastModelChange","cms","getModelLastChange","code","toISOString","join","generateSchema","plugins","register","typeDefs","resolvers","schemaPlugins","byType","GraphQLSchemaPlugin","pl","push","schema","getSchema","tenantId","tenancy","getCurrentTenant","id","cacheKey","has","set","key","cache","get","checkEndpointAccess","permission","security","getPermission","NotAuthorizedError","data","reason","graphQLHandlerFactory","options","debug","handler","name","handle","next","request","method","toLowerCase","ex","NotAuthorizedResponse","getLocale","parse"],"mappings":"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","sourcesContent":["import { boolean } from \"boolean\";\nimport { GraphQLSchema } from \"graphql\";\nimport { makeExecutableSchema } from \"@graphql-tools/schema\";\nimport { CmsContext } from \"~/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { NotAuthorizedError, NotAuthorizedResponse } from \"@webiny/api-security\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport processRequestBody from \"@webiny/handler-graphql/processRequestBody\";\nimport buildSchemaPlugins from \"./plugins/buildSchemaPlugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins\";\nimport { getWebinyVersionHeaders } from \"@webiny/utils\";\nimport { HttpObject } from \"@webiny/handler-http/types\";\nimport { HandlerPlugin } from \"@webiny/handler/types\";\nimport { GraphQLRequestBody } from \"@webiny/handler-graphql/types\";\n\nexport interface CreateGraphQLHandlerOptions {\n    debug?: boolean;\n}\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\ninterface Args {\n    context: CmsContext;\n    type: string;\n    locale: I18NLocale;\n}\n\nconst DEFAULT_HEADERS: Record<string, string> = {\n    \"Access-Control-Allow-Origin\": \"*\",\n    \"Access-Control-Allow-Headers\": \"*\",\n    \"Access-Control-Allow-Methods\": \"OPTIONS,POST\",\n    \"Content-Type\": \"application/json\",\n    ...getWebinyVersionHeaders()\n};\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\n\nconst OPTIONS_HEADERS: Record<string, string> = {\n    \"Access-Control-Max-Age\": `${DEFAULT_CACHE_MAX_AGE}`,\n    \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`\n};\n\nconst respond = (http: HttpObject, result: unknown) => {\n    return http.response({\n        body: JSON.stringify(result),\n        statusCode: 200,\n        headers: DEFAULT_HEADERS\n    });\n};\nconst schemaList = new Map<string, SchemaCache>();\n\nconst generateCacheKey = async (args: Args): Promise<string> => {\n    const { context, locale, type } = args;\n    const lastModelChange = await context.cms.getModelLastChange();\n    return [locale.code, type, lastModelChange.toISOString()].join(\"#\");\n};\n\nconst generateSchema = async (args: Args): Promise<GraphQLSchema> => {\n    const { context } = args;\n\n    context.plugins.register(await buildSchemaPlugins(context));\n    /**\n     * Really hard to type this to satisfy the makeExecutableSchema\n     */\n    // TODO @ts-refactor\n    const typeDefs: any = [];\n    const resolvers: any = [];\n\n    // Get schema definitions from plugins\n    const schemaPlugins = context.plugins.byType<GraphQLSchemaPlugin>(GraphQLSchemaPlugin.type);\n    for (const pl of schemaPlugins) {\n        typeDefs.push(pl.schema.typeDefs);\n        resolvers.push(pl.schema.resolvers);\n    }\n\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers\n    });\n};\n\n// gets an existing schema or rewrites existing one or creates a completely new one\n// depending on the schemaId created from type and locale parameters\nconst getSchema = async (args: Args): Promise<GraphQLSchema> => {\n    const { context, type, locale } = args;\n    const tenantId = context.tenancy.getCurrentTenant().id;\n    const id = `${tenantId}#${type}#${locale.code}`;\n\n    const cacheKey = await generateCacheKey(args);\n    if (!schemaList.has(id)) {\n        const schema = await generateSchema(args);\n\n        schemaList.set(id, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    }\n    /**\n     * Safe to cast because check was done few lines up.\n     */\n    const cache = schemaList.get(id) as SchemaCache;\n    if (cache.key === cacheKey) {\n        return cache.schema;\n    }\n    const schema = await generateSchema(args);\n    schemaList.set(id, {\n        key: cacheKey,\n        schema\n    });\n    return schema;\n};\n\nconst checkEndpointAccess = async (context: CmsContext): Promise<void> => {\n    const permission = await context.security.getPermission(`cms.endpoint.${context.cms.type}`);\n    if (!permission) {\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access \"${context.cms.type}\" endpoint.`\n            }\n        });\n    }\n};\n\nexport const graphQLHandlerFactory = (\n    options: CreateGraphQLHandlerOptions = {}\n): PluginCollection => {\n    const debug = boolean(options.debug);\n\n    const handler: HandlerPlugin = {\n        type: \"handler\",\n        name: \"handler-graphql-content-model\",\n        async handle(context: CmsContext, next) {\n            const { http } = context;\n\n            if (!http || !http.request) {\n                return next();\n            }\n\n            const method = (http.request.method || \"\").toLowerCase();\n            /**\n             * In case of OPTIONS method we just return the headers since there is no need to go further.\n             */\n            if (method.toLowerCase() === \"options\") {\n                return http.response({\n                    statusCode: 204,\n                    headers: {\n                        ...DEFAULT_HEADERS,\n                        ...OPTIONS_HEADERS\n                    }\n                });\n            }\n            /**\n             * We expect, and allow, only POST method to access our GraphQL\n             */\n            if (method !== \"post\") {\n                return next();\n            }\n\n            try {\n                await checkEndpointAccess(context);\n            } catch (ex) {\n                return respond(http, new NotAuthorizedResponse(ex));\n            }\n\n            const schema = await getSchema({\n                context,\n                locale: context.cms.getLocale(),\n                type: context.cms.type\n            });\n\n            const body: GraphQLRequestBody | GraphQLRequestBody[] = JSON.parse(http.request.body);\n\n            const result = await processRequestBody(body, schema, context);\n            return respond(http, result);\n        }\n    };\n\n    return [...(debug ? debugPlugins() : []), handler, { type: \"wcp-telemetry-tracker\" }];\n};\n"]}

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

@@ -22,8 +22,7 @@ const assignAfterEntryDelete = params => {
     } = await context.cms.storageOperations.entries.list(model, {
       where: {
         entryId_not: entry.entryId,
-        latest: true,
-        tenant: model.tenant
+        latest: true
       },
       limit: 1
     });

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

@@ -1 +1 @@
-{"version":3,"sources":["afterDelete.ts"],"names":["assignAfterEntryDelete","params","context","onAfterEntryDelete","subscribe","entry","model","items","cms","storageOperations","entries","list","where","entryId_not","entryId","latest","tenant","limit","length"],"mappings":";;;;;;;AAEA;;AAMO,MAAMA,sBAAsB,GAAIC,MAAD,IAA0C;AAC5E,QAAM;AAAEC,IAAAA,OAAF;AAAWC,IAAAA;AAAX,MAAkCF,MAAxC;AAEAE,EAAAA,kBAAkB,CAACC,SAAnB,CAA6B,MAAMH,MAAN,IAAgB;AACzC,UAAM;AAAEI,MAAAA,KAAF;AAASC,MAAAA;AAAT,QAAmBL,MAAzB;AAEA,UAAM;AAAEM,MAAAA;AAAF,QAAY,MAAML,OAAO,CAACM,GAAR,CAAYC,iBAAZ,CAA8BC,OAA9B,CAAsCC,IAAtC,CAA2CL,KAA3C,EAAkD;AACtEM,MAAAA,KAAK,EAAE;AACHC,QAAAA,WAAW,EAAER,KAAK,CAACS,OADhB;AAEHC,QAAAA,MAAM,EAAE,IAFL;AAGHC,QAAAA,MAAM,EAAEV,KAAK,CAACU;AAHX,OAD+D;AAMtEC,MAAAA,KAAK,EAAE;AAN+D,KAAlD,CAAxB;;AAQA,QAAIV,KAAK,CAACW,MAAN,GAAe,CAAnB,EAAsB;AAClB;AACH;;AACD,UAAM,0CAAmB;AACrBhB,MAAAA,OADqB;AAErBI,MAAAA;AAFqB,KAAnB,CAAN;AAIH,GAlBD;AAmBH,CAtBM","sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { AfterEntryDeleteTopicParams, CmsContext } from \"~/types\";\nimport { markUnlockedFields } from \"./markLockedFields\";\n\ninterface AssignAfterEntryDeleteParams {\n    context: CmsContext;\n    onAfterEntryDelete: Topic<AfterEntryDeleteTopicParams>;\n}\nexport const assignAfterEntryDelete = (params: AssignAfterEntryDeleteParams) => {\n    const { context, onAfterEntryDelete } = params;\n\n    onAfterEntryDelete.subscribe(async params => {\n        const { entry, model } = params;\n\n        const { items } = await context.cms.storageOperations.entries.list(model, {\n            where: {\n                entryId_not: entry.entryId,\n                latest: true,\n                tenant: model.tenant\n            },\n            limit: 1\n        });\n        if (items.length > 0) {\n            return;\n        }\n        await markUnlockedFields({\n            context,\n            model\n        });\n    });\n};\n"]}
+{"version":3,"sources":["afterDelete.ts"],"names":["assignAfterEntryDelete","params","context","onAfterEntryDelete","subscribe","entry","model","items","cms","storageOperations","entries","list","where","entryId_not","entryId","latest","limit","length"],"mappings":";;;;;;;AAEA;;AAMO,MAAMA,sBAAsB,GAAIC,MAAD,IAA0C;AAC5E,QAAM;AAAEC,IAAAA,OAAF;AAAWC,IAAAA;AAAX,MAAkCF,MAAxC;AAEAE,EAAAA,kBAAkB,CAACC,SAAnB,CAA6B,MAAMH,MAAN,IAAgB;AACzC,UAAM;AAAEI,MAAAA,KAAF;AAASC,MAAAA;AAAT,QAAmBL,MAAzB;AAEA,UAAM;AAAEM,MAAAA;AAAF,QAAY,MAAML,OAAO,CAACM,GAAR,CAAYC,iBAAZ,CAA8BC,OAA9B,CAAsCC,IAAtC,CAA2CL,KAA3C,EAAkD;AACtEM,MAAAA,KAAK,EAAE;AACHC,QAAAA,WAAW,EAAER,KAAK,CAACS,OADhB;AAEHC,QAAAA,MAAM,EAAE;AAFL,OAD+D;AAKtEC,MAAAA,KAAK,EAAE;AAL+D,KAAlD,CAAxB;;AAOA,QAAIT,KAAK,CAACU,MAAN,GAAe,CAAnB,EAAsB;AAClB;AACH;;AACD,UAAM,0CAAmB;AACrBf,MAAAA,OADqB;AAErBI,MAAAA;AAFqB,KAAnB,CAAN;AAIH,GAjBD;AAkBH,CArBM","sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { AfterEntryDeleteTopicParams, CmsContext } from \"~/types\";\nimport { markUnlockedFields } from \"./markLockedFields\";\n\ninterface AssignAfterEntryDeleteParams {\n    context: CmsContext;\n    onAfterEntryDelete: Topic<AfterEntryDeleteTopicParams>;\n}\nexport const assignAfterEntryDelete = (params: AssignAfterEntryDeleteParams) => {\n    const { context, onAfterEntryDelete } = params;\n\n    onAfterEntryDelete.subscribe(async params => {\n        const { entry, model } = params;\n\n        const { items } = await context.cms.storageOperations.entries.list(model, {\n            where: {\n                entryId_not: entry.entryId,\n                latest: true\n            },\n            limit: 1\n        });\n        if (items.length > 0) {\n            return;\n        }\n        await markUnlockedFields({\n            context,\n            model\n        });\n    });\n};\n"]}

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

@@ -1,5 +1,6 @@
 import { CmsEntryContext, CmsContext, HeadlessCmsStorageOperations } from "../../../types";
 import { SecurityIdentity } from "@webiny/api-security/types";
+import { Tenant } from "@webiny/api-tenancy/types";
 export declare const STATUS_DRAFT = "draft";
 export declare const STATUS_PUBLISHED = "published";
 export declare const STATUS_UNPUBLISHED = "unpublished";
@@ -9,5 +10,6 @@ export interface CreateContentEntryCrudParams {
     storageOperations: HeadlessCmsStorageOperations;
     context: CmsContext;
     getIdentity: () => SecurityIdentity;
+    getTenant: () => Tenant;
 }
 export declare const createContentEntryCrud: (params: CreateContentEntryCrudParams) => CmsEntryContext;

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

@@ -176,11 +176,37 @@ const increaseEntryIdVersion = id => {
   };
 };
 
+const getSearchableFields = params => {
+  const {
+    plugins,
+    model,
+    fields
+  } = params;
+  const fieldPluginMap = plugins.byType("cms-model-field-to-graphql").reduce((collection, field) => {
+    collection[field.fieldType] = field;
+    return collection;
+  }, {});
+  return model.fields.filter(field => {
+    const plugin = fieldPluginMap[field.type];
+
+    if (!plugin) {
+      return false;
+    } else if (!plugin.fullTextSearch) {
+      return false;
+    } else if (!fields || fields.length === 0) {
+      return true;
+    }
+
+    return fields.includes(field.fieldId);
+  }).map(field => field.fieldId);
+};
+
 const createContentEntryCrud = params => {
   const {
     storageOperations,
     context,
-    getIdentity
+    getIdentity,
+    getTenant
   } = params;
   const onBeforeEntryCreate = (0, _pubsub.createTopic)();
   const onAfterEntryCreate = (0, _pubsub.createTopic)();
@@ -230,8 +256,7 @@ const createContentEntryCrud = params => {
   const deleteEntry = async params => {
     const {
       model,
-      entry,
-      storageEntry
+      entry
     } = params;
 
     try {
@@ -240,8 +265,7 @@ const createContentEntryCrud = params => {
         model
       });
       await storageOperations.entries.delete(model, {
-        entry,
-        storageEntry
+        entry
       });
       await onAfterEntryDelete.publish({
         entry,
@@ -301,14 +325,13 @@ const createContentEntryCrud = params => {
      */
     getEntryById: async (model, id) => {
       const where = {
-        id,
-        tenant: model.tenant
+        id
       };
       await onBeforeEntryGet.publish({
         where,
         model
       });
-      const [entry] = await getEntriesByIds(model, [where.id]);
+      const [entry] = await getEntriesByIds(model, [id]);
 
       if (!entry) {
         throw new _handlerGraphql.NotFoundError(`Entry by ID "${id}" not found.`);
@@ -391,13 +414,30 @@ const createContentEntryCrud = params => {
       });
       await utils.checkModelAccess(context, model);
       const {
-        where
+        where: initialWhere
       } = params;
+      /**
+       * We always assign tenant and locale because we do not allow one model to have content through multiple tenants.
+       */
+
+      const where = _objectSpread({}, initialWhere);
+      /**
+       * Possibly only get records which are owned by current user.
+       * Or if searching for the owner set that value - in the case that user can see other entries than their own.
+       */
+
+
+      const ownedBy = permission.own ? getIdentity().id : where.ownedBy;
+
+      if (ownedBy !== undefined) {
+        where.ownedBy = ownedBy;
+      }
       /**
        * Where must contain either latest or published keys.
        * We cannot list entries without one of those
        */
 
+
       if (where.latest && where.published) {
         throw new _error.default("Cannot list entries that are both published and latest.", "LIST_ENTRIES_ERROR", {
           where
@@ -407,34 +447,24 @@ const createContentEntryCrud = params => {
           where
         });
       }
-      /**
-       * Possibly only get records which are owned by current user.
-       * Or if searching for the owner set that value - in the case that user can see other entries than their own.
-       */
-
-
-      const ownedBy = permission.own ? getIdentity().id : where.ownedBy;
-
-      const listWhere = _objectSpread(_objectSpread({}, where), {}, {
-        tenant: model.tenant,
-        locale: model.locale
-      });
-
-      if (ownedBy !== undefined) {
-        listWhere.ownedBy = ownedBy;
-      }
 
       await onBeforeEntryList.publish({
-        where: listWhere,
+        where,
         model
       });
+      const fields = getSearchableFields({
+        model,
+        plugins: context.plugins,
+        fields: params.fields || []
+      });
       const {
         hasMoreItems,
         totalCount,
         cursor,
         items
       } = await storageOperations.entries.list(model, _objectSpread(_objectSpread({}, params), {}, {
-        where: listWhere
+        where,
+        fields
       }));
       const meta = {
         hasMoreItems,
@@ -450,11 +480,6 @@ const createContentEntryCrud = params => {
     },
     listLatestEntries: async function (model, params) {
       const where = (params === null || params === void 0 ? void 0 : params.where) || {};
-
-      if (!where.tenant) {
-        where.tenant = model.tenant;
-      }
-
       return context.cms.listEntries(model, _objectSpread(_objectSpread({
         sort: ["createdOn_DESC"]
       }, params || {}), {}, {
@@ -465,11 +490,6 @@ const createContentEntryCrud = params => {
     },
     listPublishedEntries: async function (model, params) {
       const where = (params === null || params === void 0 ? void 0 : params.where) || {};
-
-      if (!where.tenant) {
-        where.tenant = model.tenant;
-      }
-
       return context.cms.listEntries(model, _objectSpread(_objectSpread({
         sort: ["createdOn_DESC"]
       }, params || {}), {}, {
@@ -513,7 +533,7 @@ const createContentEntryCrud = params => {
       } = createEntryId(1);
       const entry = {
         webinyVersion: context.WEBINY_VERSION,
-        tenant: context.tenancy.getCurrentTenant().id,
+        tenant: getTenant().id,
         entryId,
         id,
         modelId: model.modelId,
@@ -537,7 +557,6 @@ const createContentEntryCrud = params => {
         });
         storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
         const result = await storageOperations.entries.create(model, {
-          input,
           entry,
           storageEntry
         });
@@ -643,8 +662,6 @@ const createContentEntryCrud = params => {
         const result = await storageOperations.entries.createRevisionFrom(model, {
           entry,
           storageEntry,
-          originalEntry,
-          originalStorageEntry,
           latestEntry,
           latestStorageEntry
         });
@@ -729,11 +746,8 @@ const createContentEntryCrud = params => {
         });
         storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
         const result = await storageOperations.entries.update(model, {
-          originalEntry,
-          originalStorageEntry,
           entry,
-          storageEntry,
-          input
+          storageEntry
         });
         await onAfterEntryUpdate.publish({
           entry,
@@ -802,11 +816,8 @@ const createContentEntryCrud = params => {
 
       try {
         await storageOperations.entries.update(model, {
-          originalEntry,
-          originalStorageEntry,
           entry,
-          storageEntry,
-          input: {}
+          storageEntry
         });
       } catch (ex) {
         throw new _error.default("Could not update existing entry with new data while re-publishing.", "REPUBLISH_UPDATE_ERROR", {
@@ -820,8 +831,6 @@ const createContentEntryCrud = params => {
 
       try {
         return await storageOperations.entries.publish(model, {
-          originalEntry,
-          originalStorageEntry,
           entry,
           storageEntry
         });
@@ -866,8 +875,7 @@ const createContentEntryCrud = params => {
       if (entryToDelete.id === latestEntryRevisionId && !previousStorageEntry) {
         return await deleteEntry({
           model,
-          entry: entryToDelete,
-          storageEntry: storageEntryToDelete
+          entry: entryToDelete
         });
       }
       /**
@@ -889,10 +897,10 @@ const createContentEntryCrud = params => {
           model
         });
         await storageOperations.entries.deleteRevision(model, {
-          entryToDelete,
-          storageEntryToDelete,
-          entryToSetAsLatest,
-          storageEntryToSetAsLatest
+          entry: entryToDelete,
+          storageEntry: storageEntryToDelete,
+          latestEntry: entryToSetAsLatest,
+          latestStorageEntry: storageEntryToSetAsLatest
         });
         await onAfterEntryDeleteRevision.publish({
           entry: entryToDelete,
@@ -901,10 +909,10 @@ const createContentEntryCrud = params => {
       } catch (ex) {
         throw new _error.default(ex.message, ex.code || "DELETE_REVISION_ERROR", {
           error: ex,
-          entryToDelete,
-          storageEntryToDelete,
-          entryToSetAsLatest,
-          storageEntryToSetAsLatest
+          entry: entryToDelete,
+          storageEntry: storageEntryToDelete,
+          latestEntry: entryToSetAsLatest,
+          latestStorageEntry: storageEntryToSetAsLatest
         });
       }
     },
@@ -925,8 +933,7 @@ const createContentEntryCrud = params => {
       const entry = await (0, _entryStorage.entryFromStorageTransform)(context, model, storageEntry);
       return await deleteEntry({
         model,
-        entry,
-        storageEntry
+        entry
       });
     },
     publishEntry: async (model, id) => {
@@ -963,9 +970,7 @@ const createContentEntryCrud = params => {
         storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
         const result = await storageOperations.entries.publish(model, {
           entry,
-          storageEntry,
-          originalEntry,
-          originalStorageEntry
+          storageEntry
         });
         await onAfterEntryPublish.publish({
           entry,
@@ -1022,8 +1027,6 @@ const createContentEntryCrud = params => {
         });
         storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
         const result = await storageOperations.entries.requestChanges(model, {
-          originalEntry,
-          originalStorageEntry,
           entry,
           storageEntry
         });
@@ -1084,8 +1087,6 @@ const createContentEntryCrud = params => {
         });
         storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
         const result = await storageOperations.entries.requestReview(model, {
-          originalEntry,
-          originalStorageEntry,
           entry,
           storageEntry
         });
@@ -1139,8 +1140,6 @@ const createContentEntryCrud = params => {
         });
         storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
         const result = await storageOperations.entries.unpublish(model, {
-          originalEntry,
-          originalStorageEntry,
           entry,
           storageEntry
         });