@webiny/api-headless-cms 5.23.1-beta.0 → 5.24.0

package/content/plugins/utils/renderListFilterFields.d.ts

@@ -1,10 +1,11 @@
-import { CmsFieldTypePlugins, CmsModel } from "../../../types";
+import { ApiEndpoint, CmsFieldTypePlugins, CmsModel } from "../../../types";
+interface RenderListFilterFieldsParams {
+    model: CmsModel;
+    type: ApiEndpoint;
+    fieldTypePlugins: CmsFieldTypePlugins;
+}
 interface RenderListFilterFields {
-    (params: {
-        model: CmsModel;
-        type: "read" | "manage";
-        fieldTypePlugins: CmsFieldTypePlugins;
-    }): string;
+    (params: RenderListFilterFieldsParams): string;
 }
 export declare const renderListFilterFields: RenderListFilterFields;
 export {};

package/content/plugins/utils/renderListFilterFields.js

@@ -1,13 +1,24 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderListFilterFields = void 0;
 
-var _get = _interopRequireDefault(require("lodash/get"));
+/**
+ * We cast as read type, because input and output of read and manage are same. This way we ease things.
+ * Internal stuff so it should be ok.
+ * TODO note that if changing read/manage types, change this as well.
+ */
+const getCreateListFilters = (plugins, fieldType, type) => {
+  if (!plugins[fieldType]) {
+    return null;
+  } else if (!plugins[fieldType][type]) {
+    return null;
+  }
+
+  return plugins[fieldType][type].createListFilters;
+};
 
 const renderListFilterFields = ({
   model,
@@ -16,21 +27,22 @@ const renderListFilterFields = ({
 }) => {
   const fields = [["id: ID", "id_not: ID", "id_in: [ID!]", "id_not_in: [ID!]", "entryId: String", "entryId_not: String", "entryId_in: [String!]", "entryId_not_in: [String!]", "createdOn: DateTime", "createdOn_gt: DateTime", "createdOn_gte: DateTime", "createdOn_lt: DateTime", "createdOn_lte: DateTime", "createdOn_between: [DateTime!]", "createdOn_not_between: [DateTime!]", "savedOn: DateTime", "savedOn_gt: DateTime", "savedOn_gte: DateTime", "savedOn_lt: DateTime", "savedOn_lte: DateTime", "savedOn_between: [DateTime!]", "savedOn_not_between: [DateTime!]", "createdBy: String", "createdBy_not: String", "createdBy_in: [String!]", "createdBy_not_in: [String!]", "ownedBy: String", "ownedBy_not: String", "ownedBy_in: [String!]", "ownedBy_not_in: [String!]"].join("\n")];
 
-  for (let i = 0; i < model.fields.length; i++) {
-    const field = model.fields[i]; // Every time a client updates content model's fields, we check the type of each field. If a field plugin
+  for (const field of model.fields) {
+    // 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.
+    const createListFilters = getCreateListFilters(fieldTypePlugins, field.type, type);
 
-    const createListFilters = (0, _get.default)(fieldTypePlugins, `${field.type}.${type}.createListFilters`);
-
-    if (typeof createListFilters === "function") {
-      fields.push(createListFilters({
-        model,
-        field
-      }));
+    if (typeof createListFilters !== "function") {
+      continue;
     }
+
+    fields.push(createListFilters({
+      model,
+      field
+    }));
   }
 
   return fields.filter(Boolean).join("\n");

package/content/plugins/utils/renderSortEnum.js

@@ -1,14 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderSortEnum = void 0;
 
-var _get = _interopRequireDefault(require("lodash/get"));
-
 const renderSortEnum = ({
   model,
   fieldTypePlugins
@@ -16,7 +12,11 @@ const renderSortEnum = ({
   const sorters = [`id_ASC`, `id_DESC`, "savedOn_ASC", "savedOn_DESC", "createdOn_ASC", "createdOn_DESC"];
 
   for (const field of model.fields) {
-    const isSortable = (0, _get.default)(fieldTypePlugins, `${field.type}.isSortable`);
+    if (!fieldTypePlugins[field.type]) {
+      continue;
+    }
+
+    const isSortable = fieldTypePlugins[field.type].isSortable;
 
     if (!isSortable) {
       continue;

package/migrateCMSPermissions.d.ts

@@ -5,13 +5,13 @@ declare type Group = {
 declare type Model = {
     [code: string]: string[];
 };
-declare type CMSPermission = {
+interface CMSPermission {
     name: string;
     rwd?: string;
     pw?: string;
     own?: boolean;
     groups?: Group;
     models?: Model;
-};
+}
 export declare const migrateCMSPermissions: (permissions: CMSPermission[], getModel: (modelId: string) => Promise<CmsModel>) => Promise<CMSPermission[]>;
 export {};

package/migrateCMSPermissions.js

@@ -11,6 +11,10 @@ var _mergeWith = _interopRequireDefault(require("lodash/mergeWith"));
 
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 
+/**
+ * Not used anymore so ignore.
+ */
+// @ts-nocheck
 var AccessTypes;
 
 (function (AccessTypes) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "5.23.1-beta.0",
+	"version": "5.24.0",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -21,27 +21,28 @@
 		"@babel/runtime": "7.16.7",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api-file-manager": "5.23.1-beta.0",
-		"@webiny/api-i18n": "5.23.1-beta.0",
-		"@webiny/api-i18n-content": "5.23.1-beta.0",
-		"@webiny/api-i18n-ddb": "5.23.1-beta.0",
-		"@webiny/api-security": "5.23.1-beta.0",
-		"@webiny/api-tenancy": "5.23.1-beta.0",
-		"@webiny/api-upgrade": "5.23.1-beta.0",
-		"@webiny/error": "5.23.1-beta.0",
-		"@webiny/handler": "5.23.1-beta.0",
-		"@webiny/handler-aws": "5.23.1-beta.0",
-		"@webiny/handler-db": "5.23.1-beta.0",
-		"@webiny/handler-graphql": "5.23.1-beta.0",
-		"@webiny/handler-http": "5.23.1-beta.0",
-		"@webiny/plugins": "5.23.1-beta.0",
-		"@webiny/pubsub": "5.23.1-beta.0",
-		"@webiny/utils": "5.23.1-beta.0",
-		"@webiny/validation": "5.23.1-beta.0",
+		"@webiny/api-file-manager": "5.24.0",
+		"@webiny/api-i18n": "5.24.0",
+		"@webiny/api-i18n-content": "5.24.0",
+		"@webiny/api-i18n-ddb": "5.24.0",
+		"@webiny/api-security": "5.24.0",
+		"@webiny/api-tenancy": "5.24.0",
+		"@webiny/api-upgrade": "5.24.0",
+		"@webiny/error": "5.24.0",
+		"@webiny/handler": "5.24.0",
+		"@webiny/handler-aws": "5.24.0",
+		"@webiny/handler-db": "5.24.0",
+		"@webiny/handler-graphql": "5.24.0",
+		"@webiny/handler-http": "5.24.0",
+		"@webiny/plugins": "5.24.0",
+		"@webiny/pubsub": "5.24.0",
+		"@webiny/utils": "5.24.0",
+		"@webiny/validation": "5.24.0",
 		"boolean": "3.1.4",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.0.0",
 		"dot-prop": "6.0.1",
+		"graphql-tag": "2.12.6",
 		"lodash": "4.17.21",
 		"p-map": "4.0.0",
 		"p-reduce": "2.1.0",
@@ -54,10 +55,10 @@
 		"@babel/core": "^7.16.0",
 		"@babel/preset-env": "^7.16.4",
 		"@babel/preset-flow": "^7.16.0",
-		"@webiny/api-security-so-ddb": "^5.23.1-beta.0",
-		"@webiny/api-tenancy-so-ddb": "^5.23.1-beta.0",
-		"@webiny/cli": "^5.23.1-beta.0",
-		"@webiny/project-utils": "^5.23.1-beta.0",
+		"@webiny/api-security-so-ddb": "^5.24.0",
+		"@webiny/api-tenancy-so-ddb": "^5.24.0",
+		"@webiny/cli": "^5.24.0",
+		"@webiny/project-utils": "^5.24.0",
 		"apollo-graphql": "^0.9.5",
 		"get-yarn-workspaces": "^1.0.2",
 		"graphql": "^15.7.2",
@@ -77,5 +78,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "05db67aebc2de3c33ba0622f730157ae14143b95"
+	"gitHead": "be0cbfcaa9247c658c44179af7943cc5d6d71bc7"
 }

package/plugins/graphql/system.d.ts

@@ -1,5 +1,8 @@
 import { ErrorResponse, Response } from "@webiny/handler-graphql";
 import { CmsContext } from "../../types";
+interface CmsMutationUpgradeArgs {
+    version: string;
+}
 declare const _default: {
     typeDefs: string;
     resolvers: {
@@ -8,9 +11,7 @@ declare const _default: {
         };
         CmsMutation: {
             install: (_: any, __: any, { cms }: CmsContext) => Promise<ErrorResponse | Response<boolean>>;
-            upgrade: (_: any, { version }: {
-                version: any;
-            }, { cms }: CmsContext) => Promise<ErrorResponse | Response<boolean>>;
+            upgrade: (_: any, args: CmsMutationUpgradeArgs, { cms }: CmsContext) => Promise<ErrorResponse | Response<boolean>>;
         };
     };
 };

package/plugins/graphql/system.js

@@ -54,11 +54,13 @@ var _default = {
           return new _handlerGraphql.ErrorResponse(e);
         }
       },
-      upgrade: async (_, {
-        version
-      }, {
+      upgrade: async (_, args, {
         cms
       }) => {
+        const {
+          version
+        } = args;
+
         try {
           await cms.upgradeSystem(version);
           return new _handlerGraphql.Response(true);

package/plugins/upgrades/v5.5.0/index.js

@@ -13,6 +13,10 @@ var _migrateCMSPermissions = require("../../../migrateCMSPermissions");
 
 var _helpers = require("./helpers");
 
+/**
+ * Not used anymore so ignore.
+ */
+// @ts-nocheck
 const plugin = {
   name: "api-upgrade-cms-5.5.0",
   type: "api-upgrade",

package/types.d.ts

@@ -10,11 +10,12 @@ import { DbContext } from "@webiny/handler-db/types";
 import { FileManagerContext } from "@webiny/api-file-manager/types";
 import { UpgradePlugin } from "@webiny/api-upgrade/types";
 import { Topic } from "@webiny/pubsub/types";
+export declare type ApiEndpoint = "manage" | "preview" | "read";
 export interface HeadlessCms extends CmsSettingsContext, CmsSystemContext, CmsGroupContext, CmsModelContext, CmsEntryContext {
     /**
      * API type
      */
-    type: "manage" | "preview" | "read" | string;
+    type: ApiEndpoint;
     /**
      * Requested locale
      */
@@ -370,14 +371,15 @@ export interface CmsModelFieldDefinition {
     fields: string;
     typeDefs?: string;
 }
+interface CmsModelFieldToGraphQLCreateResolverParams {
+    models: CmsModel[];
+    model: CmsModel;
+    graphQLType: string;
+    field: CmsModelField;
+    createFieldResolvers: any;
+}
 export interface CmsModelFieldToGraphQLCreateResolver {
-    (params: {
-        models: CmsModel[];
-        model: CmsModel;
-        graphQLType: string;
-        field: CmsModelField;
-        createFieldResolvers: any;
-    }): GraphQLFieldResolver | {
+    (params: CmsModelFieldToGraphQLCreateResolverParams): GraphQLFieldResolver | {
         resolver: GraphQLFieldResolver;
         typeResolvers: Resolvers<CmsContext>;
     } | false;
@@ -511,7 +513,6 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          */
         createSchema?: (params: {
             models: CmsModel[];
-            model: CmsModel;
         }) => GraphQLSchemaDefinition<CmsContext>;
     };
     manage: {
@@ -554,7 +555,6 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          */
         createSchema?: (params: {
             models: CmsModel[];
-            model: CmsModel;
         }) => GraphQLSchemaDefinition<CmsContext>;
         /**
          * Definition of the field type for GraphQL - be aware if multiple values is selected. Probably same as `read.createTypeField`.
@@ -1181,11 +1181,11 @@ export interface CmsModelManager {
     /**
      * Create a entry.
      */
-    create: (data: Record<string, any>) => Promise<CmsEntry>;
+    create: (data: CreateCmsEntryInput) => Promise<CmsEntry>;
     /**
      * Update a entry.
      */
-    update: (id: string, data: Record<string, any>) => Promise<CmsEntry>;
+    update: (id: string, data: UpdateCmsEntryInput) => Promise<CmsEntry>;
     /**
      * Delete a entry.
      */

package/utils.d.ts

@@ -1,7 +1,7 @@
 import { SecurityPermission } from "@webiny/api-security/types";
 import { CmsModel, CmsContext, CreatedBy, CmsGroupPermission, CmsGroup } from "./types";
-export declare const hasRwd: (permission: any, rwd: any) => any;
-export declare const hasPw: (permission: any, pw: any) => any;
+export declare const hasRwd: (permission: SecurityPermission, rwd: string) => boolean;
+export declare const hasPw: (permission: SecurityPermission, pw: string) => boolean;
 export declare const checkPermissions: <TPermission extends SecurityPermission = SecurityPermission>(context: CmsContext, name: string, check?: {
     rwd?: string;
     pw?: string;
@@ -21,5 +21,5 @@ export declare const validateOwnership: (context: CmsContext, permission: Securi
 export declare const checkModelAccess: (context: CmsContext, model: CmsModel) => Promise<void>;
 export declare const validateModelAccess: (context: CmsContext, model: CmsModel) => Promise<boolean>;
 export declare const validateGroupAccess: (context: CmsContext, permission: CmsGroupPermission, group: CmsGroup) => boolean;
-export declare const toSlug: (text: any) => string;
-export declare const filterAsync: <T = Record<string, any>>(items: T[], predicate: (T: any) => Promise<boolean>) => Promise<T[]>;
+export declare const toSlug: (text: string) => string;
+export declare const filterAsync: <T = Record<string, any>>(items: T[], predicate: (param: T) => Promise<boolean>) => Promise<T[]>;