@webiny/api-headless-cms 0.0.0-unstable.97a151f74d → 0.0.0-unstable.98511f29f1

package/utils/permissions/ModelsPermissions.js

@@ -0,0 +1,91 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ModelsPermissions = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _apiSecurity = require("@webiny/api-security");
+class ModelsPermissions extends _apiSecurity.AppPermissions {
+  constructor(params) {
+    super(params);
+    (0, _defineProperty2.default)(this, "modelGroupsPermissions", void 0);
+    this.modelGroupsPermissions = params.modelGroupsPermissions;
+  }
+  async canAccessModel({
+    model,
+    locale
+  }) {
+    if (await this.hasFullAccess()) {
+      return true;
+    }
+    const modelGroupsPermissions = this.modelGroupsPermissions;
+
+    // eslint-disable-next-line
+    const modelsPermissions = this;
+    const canReadGroups = await modelGroupsPermissions.ensure({
+      rwd: "r"
+    }, {
+      throw: false
+    });
+    if (!canReadGroups) {
+      return false;
+    }
+    const canReadModels = await modelsPermissions.ensure({
+      rwd: "r"
+    }, {
+      throw: false
+    });
+    if (!canReadModels) {
+      return false;
+    }
+    const modelGroupsPermissionsList = await modelGroupsPermissions.getPermissions();
+    const modelsPermissionsList = await this.getPermissions();
+    for (let i = 0; i < modelGroupsPermissionsList.length; i++) {
+      const modelGroupPermission = modelGroupsPermissionsList[i];
+      const {
+        groups
+      } = modelGroupPermission;
+      for (let j = 0; j < modelsPermissionsList.length; j++) {
+        const modelPermission = modelsPermissionsList[j];
+        const {
+          models
+        } = modelPermission;
+        // when no models or groups defined on permission
+        // it means user has access to everything
+        if (!models && !groups) {
+          return true;
+        }
+
+        // Does the model belong to a group for which user has permission?
+        if (groups) {
+          if (Array.isArray(groups[locale]) === false || groups[locale].includes(model.group.id) === false) {
+            continue;
+          }
+        }
+
+        // Does the user have access to the specific model?
+        if (models) {
+          if (Array.isArray(models[locale]) === false || models[locale].includes(model.modelId) === false) {
+            continue;
+          }
+        }
+        return true;
+      }
+    }
+    return false;
+  }
+  async ensureCanAccessModel(params) {
+    const canAccessModel = await this.canAccessModel(params);
+    if (canAccessModel) {
+      return;
+    }
+    throw new _apiSecurity.NotAuthorizedError({
+      data: {
+        reason: `Not allowed to access model "${params.model.modelId}".`
+      }
+    });
+  }
+}
+exports.ModelsPermissions = ModelsPermissions;

package/utils/permissions/ModelsPermissions.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_apiSecurity","require","ModelsPermissions","AppPermissions","constructor","params","_defineProperty2","default","modelGroupsPermissions","canAccessModel","model","locale","hasFullAccess","modelsPermissions","canReadGroups","ensure","rwd","throw","canReadModels","modelGroupsPermissionsList","getPermissions","modelsPermissionsList","i","length","modelGroupPermission","groups","j","modelPermission","models","Array","isArray","includes","group","id","modelId","ensureCanAccessModel","NotAuthorizedError","data","reason","exports"],"sources":["ModelsPermissions.ts"],"sourcesContent":["import { AppPermissions, AppPermissionsParams, NotAuthorizedError } from \"@webiny/api-security\";\nimport { CmsGroupPermission, CmsModel, CmsModelPermission } from \"~/types\";\nimport { ModelGroupsPermissions } from \"~/utils/permissions/ModelGroupsPermissions\";\n\nexport interface ModelsPermissionsParams extends AppPermissionsParams<CmsGroupPermission> {\n    modelGroupsPermissions: ModelGroupsPermissions;\n}\n\nexport interface CanAccessModelParams {\n    model: CmsModel;\n    locale: string;\n}\n\nexport interface EnsureModelAccessParams {\n    model: CmsModel;\n    locale: string;\n}\n\nexport class ModelsPermissions extends AppPermissions<CmsModelPermission> {\n    private modelGroupsPermissions: ModelGroupsPermissions;\n\n    constructor(params: ModelsPermissionsParams) {\n        super(params);\n        this.modelGroupsPermissions = params.modelGroupsPermissions;\n    }\n\n    async canAccessModel({ model, locale }: CanAccessModelParams) {\n        if (await this.hasFullAccess()) {\n            return true;\n        }\n\n        const modelGroupsPermissions = this.modelGroupsPermissions;\n\n        // eslint-disable-next-line\n        const modelsPermissions = this;\n\n        const canReadGroups = await modelGroupsPermissions.ensure({ rwd: \"r\" }, { throw: false });\n        if (!canReadGroups) {\n            return false;\n        }\n\n        const canReadModels = await modelsPermissions.ensure({ rwd: \"r\" }, { throw: false });\n        if (!canReadModels) {\n            return false;\n        }\n\n        const modelGroupsPermissionsList = await modelGroupsPermissions.getPermissions();\n        const modelsPermissionsList = await this.getPermissions();\n\n        for (let i = 0; i < modelGroupsPermissionsList.length; i++) {\n            const modelGroupPermission = modelGroupsPermissionsList[i];\n\n            const { groups } = modelGroupPermission;\n\n            for (let j = 0; j < modelsPermissionsList.length; j++) {\n                const modelPermission = modelsPermissionsList[j];\n\n                const { models } = modelPermission;\n                // when no models or groups defined on permission\n                // it means user has access to everything\n                if (!models && !groups) {\n                    return true;\n                }\n\n                // Does the model belong to a group for which user has permission?\n                if (groups) {\n                    if (\n                        Array.isArray(groups[locale]) === false ||\n                        groups[locale].includes(model.group.id) === false\n                    ) {\n                        continue;\n                    }\n                }\n\n                // Does the user have access to the specific model?\n                if (models) {\n                    if (\n                        Array.isArray(models[locale]) === false ||\n                        models[locale].includes(model.modelId) === false\n                    ) {\n                        continue;\n                    }\n                }\n\n                return true;\n            }\n        }\n\n        return false;\n    }\n\n    async ensureCanAccessModel(params: EnsureModelAccessParams) {\n        const canAccessModel = await this.canAccessModel(params);\n        if (canAccessModel) {\n            return;\n        }\n\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access model \"${params.model.modelId}\".`\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAkBO,MAAMC,iBAAiB,SAASC,2BAAc,CAAqB;EAGtEC,WAAWA,CAACC,MAA+B,EAAE;IACzC,KAAK,CAACA,MAAM,CAAC;IAAC,IAAAC,gBAAA,CAAAC,OAAA;IACd,IAAI,CAACC,sBAAsB,GAAGH,MAAM,CAACG,sBAAsB;EAC/D;EAEA,MAAMC,cAAcA,CAAC;IAAEC,KAAK;IAAEC;EAA6B,CAAC,EAAE;IAC1D,IAAI,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC,EAAE;MAC5B,OAAO,IAAI;IACf;IAEA,MAAMJ,sBAAsB,GAAG,IAAI,CAACA,sBAAsB;;IAE1D;IACA,MAAMK,iBAAiB,GAAG,IAAI;IAE9B,MAAMC,aAAa,GAAG,MAAMN,sBAAsB,CAACO,MAAM,CAAC;MAAEC,GAAG,EAAE;IAAI,CAAC,EAAE;MAAEC,KAAK,EAAE;IAAM,CAAC,CAAC;IACzF,IAAI,CAACH,aAAa,EAAE;MAChB,OAAO,KAAK;IAChB;IAEA,MAAMI,aAAa,GAAG,MAAML,iBAAiB,CAACE,MAAM,CAAC;MAAEC,GAAG,EAAE;IAAI,CAAC,EAAE;MAAEC,KAAK,EAAE;IAAM,CAAC,CAAC;IACpF,IAAI,CAACC,aAAa,EAAE;MAChB,OAAO,KAAK;IAChB;IAEA,MAAMC,0BAA0B,GAAG,MAAMX,sBAAsB,CAACY,cAAc,CAAC,CAAC;IAChF,MAAMC,qBAAqB,GAAG,MAAM,IAAI,CAACD,cAAc,CAAC,CAAC;IAEzD,KAAK,IAAIE,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGH,0BAA0B,CAACI,MAAM,EAAED,CAAC,EAAE,EAAE;MACxD,MAAME,oBAAoB,GAAGL,0BAA0B,CAACG,CAAC,CAAC;MAE1D,MAAM;QAAEG;MAAO,CAAC,GAAGD,oBAAoB;MAEvC,KAAK,IAAIE,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGL,qBAAqB,CAACE,MAAM,EAAEG,CAAC,EAAE,EAAE;QACnD,MAAMC,eAAe,GAAGN,qBAAqB,CAACK,CAAC,CAAC;QAEhD,MAAM;UAAEE;QAAO,CAAC,GAAGD,eAAe;QAClC;QACA;QACA,IAAI,CAACC,MAAM,IAAI,CAACH,MAAM,EAAE;UACpB,OAAO,IAAI;QACf;;QAEA;QACA,IAAIA,MAAM,EAAE;UACR,IACII,KAAK,CAACC,OAAO,CAACL,MAAM,CAACd,MAAM,CAAC,CAAC,KAAK,KAAK,IACvCc,MAAM,CAACd,MAAM,CAAC,CAACoB,QAAQ,CAACrB,KAAK,CAACsB,KAAK,CAACC,EAAE,CAAC,KAAK,KAAK,EACnD;YACE;UACJ;QACJ;;QAEA;QACA,IAAIL,MAAM,EAAE;UACR,IACIC,KAAK,CAACC,OAAO,CAACF,MAAM,CAACjB,MAAM,CAAC,CAAC,KAAK,KAAK,IACvCiB,MAAM,CAACjB,MAAM,CAAC,CAACoB,QAAQ,CAACrB,KAAK,CAACwB,OAAO,CAAC,KAAK,KAAK,EAClD;YACE;UACJ;QACJ;QAEA,OAAO,IAAI;MACf;IACJ;IAEA,OAAO,KAAK;EAChB;EAEA,MAAMC,oBAAoBA,CAAC9B,MAA+B,EAAE;IACxD,MAAMI,cAAc,GAAG,MAAM,IAAI,CAACA,cAAc,CAACJ,MAAM,CAAC;IACxD,IAAII,cAAc,EAAE;MAChB;IACJ;IAEA,MAAM,IAAI2B,+BAAkB,CAAC;MACzBC,IAAI,EAAE;QACFC,MAAM,EAAG,gCAA+BjC,MAAM,CAACK,KAAK,CAACwB,OAAQ;MACjE;IACJ,CAAC,CAAC;EACN;AACJ;AAACK,OAAA,CAAArC,iBAAA,GAAAA,iBAAA"}

package/utils/permissions/SettingsPermissions.d.ts

@@ -0,0 +1,4 @@
+import { CmsSettingsPermission } from "../../types";
+import { AppPermissions } from "@webiny/api-security";
+export declare class SettingsPermissions extends AppPermissions<CmsSettingsPermission> {
+}

package/utils/permissions/SettingsPermissions.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SettingsPermissions = void 0;
+var _apiSecurity = require("@webiny/api-security");
+class SettingsPermissions extends _apiSecurity.AppPermissions {}
+exports.SettingsPermissions = SettingsPermissions;

package/utils/permissions/SettingsPermissions.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_apiSecurity","require","SettingsPermissions","AppPermissions","exports"],"sources":["SettingsPermissions.ts"],"sourcesContent":["import { CmsSettingsPermission } from \"~/types\";\nimport { AppPermissions } from \"@webiny/api-security\";\n\nexport class SettingsPermissions extends AppPermissions<CmsSettingsPermission> {}\n"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAEO,MAAMC,mBAAmB,SAASC,2BAAc,CAAwB;AAAEC,OAAA,CAAAF,mBAAA,GAAAA,mBAAA"}

package/utils/renderFields.d.ts

@@ -1,6 +1,8 @@
 import { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField, CmsModelFieldDefinition } from "../types";
 interface RenderFieldsParams {
+    models: CmsModel[];
     model: CmsModel;
+    fields: CmsModelField[];
     type: ApiEndpoint;
     fieldTypePlugins: CmsFieldTypePlugins;
 }
@@ -8,8 +10,8 @@ interface RenderFields {
     (params: RenderFieldsParams): CmsModelFieldDefinition[];
 }
 export declare const renderFields: RenderFields;
-interface RenderFieldParams extends RenderFieldsParams {
+interface RenderFieldParams extends Omit<RenderFieldsParams, "fields"> {
     field: CmsModelField;
 }
-export declare const renderField: ({ model, type, field, fieldTypePlugins }: RenderFieldParams) => CmsModelFieldDefinition | null;
+export declare const renderField: ({ models, model, type, field, fieldTypePlugins }: RenderFieldParams) => CmsModelFieldDefinition | null;
 export {};

package/utils/renderFields.js

@@ -4,43 +4,44 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderFields = exports.renderField = void 0;
-
 var _getBaseFieldType = require("./getBaseFieldType");
-
 const renderFields = ({
+  models,
   model,
+  fields,
   type,
   fieldTypePlugins
 }) => {
-  return model.fields.map(field => renderField({
+  return fields.map(field => renderField({
+    models,
     model,
     type,
     field,
     fieldTypePlugins
   })).filter(Boolean);
 };
-
 exports.renderFields = renderFields;
-
 const renderField = ({
+  models,
   model,
   type,
   field,
   fieldTypePlugins
 }) => {
   const plugin = fieldTypePlugins[(0, _getBaseFieldType.getBaseFieldType)(field)];
-
   if (!plugin) {
     // Let's not render the field if it does not exist in the field plugins.
     return null;
   }
-
-  const defs = plugin[type].createTypeField({
+  const {
+    createTypeField
+  } = plugin[type];
+  const defs = createTypeField({
+    models,
     model,
     field,
     fieldTypePlugins
   });
-
   if (!defs) {
     return null;
   } else if (typeof defs === "string") {
@@ -48,8 +49,6 @@ const renderField = ({
       fields: defs
     };
   }
-
   return defs;
 };
-
 exports.renderField = renderField;

package/utils/renderFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["renderFields","model","type","fieldTypePlugins","fields","map","field","renderField","filter","Boolean","plugin","getBaseFieldType","defs","createTypeField"],"sources":["renderFields.ts"],"sourcesContent":["import {\n    ApiEndpoint,\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldDefinition,\n    CmsModelFieldToGraphQLPlugin\n} from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderFieldsParams {\n    model: CmsModel;\n    type: ApiEndpoint;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface RenderFields {\n    (params: RenderFieldsParams): CmsModelFieldDefinition[];\n}\n\nexport const renderFields: RenderFields = ({\n    model,\n    type,\n    fieldTypePlugins\n}): CmsModelFieldDefinition[] => {\n    return model.fields\n        .map(field => renderField({ model, type, field, fieldTypePlugins }))\n        .filter(Boolean) as CmsModelFieldDefinition[];\n};\n\ninterface RenderFieldParams extends RenderFieldsParams {\n    field: CmsModelField;\n}\n\nexport const renderField = ({\n    model,\n    type,\n    field,\n    fieldTypePlugins\n}: RenderFieldParams): CmsModelFieldDefinition | null => {\n    const plugin: CmsModelFieldToGraphQLPlugin = fieldTypePlugins[getBaseFieldType(field)];\n    if (!plugin) {\n        // Let's not render the field if it does not exist in the field plugins.\n        return null;\n    }\n    const defs = plugin[type].createTypeField({\n        model,\n        field,\n        fieldTypePlugins\n    });\n\n    if (!defs) {\n        return null;\n    } else if (typeof defs === \"string\") {\n        return {\n            fields: defs\n        };\n    }\n\n    return defs;\n};\n"],"mappings":";;;;;;;AAQA;;AAWO,MAAMA,YAA0B,GAAG,CAAC;EACvCC,KADuC;EAEvCC,IAFuC;EAGvCC;AAHuC,CAAD,KAIT;EAC7B,OAAOF,KAAK,CAACG,MAAN,CACFC,GADE,CACEC,KAAK,IAAIC,WAAW,CAAC;IAAEN,KAAF;IAASC,IAAT;IAAeI,KAAf;IAAsBH;EAAtB,CAAD,CADtB,EAEFK,MAFE,CAEKC,OAFL,CAAP;AAGH,CARM;;;;AAcA,MAAMF,WAAW,GAAG,CAAC;EACxBN,KADwB;EAExBC,IAFwB;EAGxBI,KAHwB;EAIxBH;AAJwB,CAAD,KAK8B;EACrD,MAAMO,MAAoC,GAAGP,gBAAgB,CAAC,IAAAQ,kCAAA,EAAiBL,KAAjB,CAAD,CAA7D;;EACA,IAAI,CAACI,MAAL,EAAa;IACT;IACA,OAAO,IAAP;EACH;;EACD,MAAME,IAAI,GAAGF,MAAM,CAACR,IAAD,CAAN,CAAaW,eAAb,CAA6B;IACtCZ,KADsC;IAEtCK,KAFsC;IAGtCH;EAHsC,CAA7B,CAAb;;EAMA,IAAI,CAACS,IAAL,EAAW;IACP,OAAO,IAAP;EACH,CAFD,MAEO,IAAI,OAAOA,IAAP,KAAgB,QAApB,EAA8B;IACjC,OAAO;MACHR,MAAM,EAAEQ;IADL,CAAP;EAGH;;EAED,OAAOA,IAAP;AACH,CA1BM"}
+{"version":3,"names":["_getBaseFieldType","require","renderFields","models","model","fields","type","fieldTypePlugins","map","field","renderField","filter","Boolean","exports","plugin","getBaseFieldType","createTypeField","defs"],"sources":["renderFields.ts"],"sourcesContent":["import {\n    ApiEndpoint,\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldDefinition,\n    CmsModelFieldToGraphQLPlugin\n} from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderFieldsParams {\n    models: CmsModel[];\n    model: CmsModel;\n    fields: CmsModelField[];\n    type: ApiEndpoint;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\ninterface RenderFields {\n    (params: RenderFieldsParams): CmsModelFieldDefinition[];\n}\n\nexport const renderFields: RenderFields = ({\n    models,\n    model,\n    fields,\n    type,\n    fieldTypePlugins\n}): CmsModelFieldDefinition[] => {\n    return fields\n        .map(field => renderField({ models, model, type, field, fieldTypePlugins }))\n        .filter(Boolean) as CmsModelFieldDefinition[];\n};\n\ninterface RenderFieldParams extends Omit<RenderFieldsParams, \"fields\"> {\n    field: CmsModelField;\n}\n\nexport const renderField = ({\n    models,\n    model,\n    type,\n    field,\n    fieldTypePlugins\n}: RenderFieldParams): CmsModelFieldDefinition | null => {\n    const plugin = fieldTypePlugins[getBaseFieldType(field)];\n    if (!plugin) {\n        // Let's not render the field if it does not exist in the field plugins.\n        return null;\n    }\n    const { createTypeField } = plugin[type] as CmsModelFieldToGraphQLPlugin[\"manage\"];\n    const defs = createTypeField({\n        models,\n        model,\n        field,\n        fieldTypePlugins\n    });\n\n    if (!defs) {\n        return null;\n    } else if (typeof defs === \"string\") {\n        return {\n            fields: defs\n        };\n    }\n\n    return defs;\n};\n"],"mappings":";;;;;;AAQA,IAAAA,iBAAA,GAAAC,OAAA;AAcO,MAAMC,YAA0B,GAAGA,CAAC;EACvCC,MAAM;EACNC,KAAK;EACLC,MAAM;EACNC,IAAI;EACJC;AACJ,CAAC,KAAgC;EAC7B,OAAOF,MAAM,CACRG,GAAG,CAACC,KAAK,IAAIC,WAAW,CAAC;IAAEP,MAAM;IAAEC,KAAK;IAAEE,IAAI;IAAEG,KAAK;IAAEF;EAAiB,CAAC,CAAC,CAAC,CAC3EI,MAAM,CAACC,OAAO,CAAC;AACxB,CAAC;AAACC,OAAA,CAAAX,YAAA,GAAAA,YAAA;AAMK,MAAMQ,WAAW,GAAGA,CAAC;EACxBP,MAAM;EACNC,KAAK;EACLE,IAAI;EACJG,KAAK;EACLF;AACe,CAAC,KAAqC;EACrD,MAAMO,MAAM,GAAGP,gBAAgB,CAAC,IAAAQ,kCAAgB,EAACN,KAAK,CAAC,CAAC;EACxD,IAAI,CAACK,MAAM,EAAE;IACT;IACA,OAAO,IAAI;EACf;EACA,MAAM;IAAEE;EAAgB,CAAC,GAAGF,MAAM,CAACR,IAAI,CAA2C;EAClF,MAAMW,IAAI,GAAGD,eAAe,CAAC;IACzBb,MAAM;IACNC,KAAK;IACLK,KAAK;IACLF;EACJ,CAAC,CAAC;EAEF,IAAI,CAACU,IAAI,EAAE;IACP,OAAO,IAAI;EACf,CAAC,MAAM,IAAI,OAAOA,IAAI,KAAK,QAAQ,EAAE;IACjC,OAAO;MACHZ,MAAM,EAAEY;IACZ,CAAC;EACL;EAEA,OAAOA,IAAI;AACf,CAAC;AAACJ,OAAA,CAAAH,WAAA,GAAAA,WAAA"}

package/utils/renderGetFilterFields.d.ts

@@ -1,6 +1,6 @@
-import { CmsFieldTypePlugins, CmsModel } from "../types";
+import { CmsFieldTypePlugins, CmsModelField } from "../types";
 interface RenderGetFilterFieldsParams {
-    model: CmsModel;
+    fields: CmsModelField[];
     fieldTypePlugins: CmsFieldTypePlugins;
 }
 interface RenderGetFilterFields {

package/utils/renderGetFilterFields.js

@@ -4,58 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderGetFilterFields = void 0;
-
 var _getBaseFieldType = require("./getBaseFieldType");
-
-const getCreateFilters = (plugins, fieldType) => {
-  if (!plugins[fieldType] || !plugins[fieldType].read.createGetFilters) {
-    return null;
-  }
-
-  return plugins[fieldType].read.createGetFilters;
-};
-
 const renderGetFilterFields = ({
-  model,
+  fields,
   fieldTypePlugins
 }) => {
-  const fieldIdList = model.fields.filter(field => {
+  const filters = ["id: ID", "entryId: String"];
+  for (const field of fields) {
+    var _plugin$read;
     // 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 baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
-
-    if (!fieldTypePlugins[baseType]) {
-      return false;
-    }
-
-    return fieldTypePlugins[baseType].isSearchable;
-  }).map(f => f.fieldId);
-  const filters = ["id: ID", "entryId: String"];
-
-  for (const fieldId of fieldIdList) {
-    const field = model.fields.find(item => item.fieldId === fieldId);
-
-    if (!field) {
+    const plugin = fieldTypePlugins[baseType];
+    if (!(plugin !== null && plugin !== void 0 && plugin.isSearchable)) {
       continue;
     }
-
-    const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
-    const createGetFilters = getCreateFilters(fieldTypePlugins, baseType);
-
+    const createGetFilters = (_plugin$read = plugin.read) === null || _plugin$read === void 0 ? void 0 : _plugin$read.createGetFilters;
     if (typeof createGetFilters !== "function") {
       continue;
     }
-
     filters.push(createGetFilters({
-      model,
       field
     }));
   }
-
   return filters.filter(Boolean).join("\n");
 };
-
 exports.renderGetFilterFields = renderGetFilterFields;

package/utils/renderGetFilterFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["getCreateFilters","plugins","fieldType","read","createGetFilters","renderGetFilterFields","model","fieldTypePlugins","fieldIdList","fields","filter","field","baseType","getBaseFieldType","isSearchable","map","f","fieldId","filters","find","item","push","Boolean","join"],"sources":["renderGetFilterFields.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderGetFilterFieldsParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface RenderGetFilterFields {\n    (params: RenderGetFilterFieldsParams): string;\n}\n\nconst getCreateFilters = (\n    plugins: CmsFieldTypePlugins,\n    fieldType: string\n): CmsModelFieldToGraphQLPlugin[\"read\"][\"createGetFilters\"] | null => {\n    if (!plugins[fieldType] || !plugins[fieldType].read.createGetFilters) {\n        return null;\n    }\n    return plugins[fieldType].read.createGetFilters;\n};\n\nexport const renderGetFilterFields: RenderGetFilterFields = ({ model, fieldTypePlugins }) => {\n    const fieldIdList = model.fields\n        .filter(field => {\n            // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n            // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n            // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n            // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n            // could've just removed the plugin from the backend.\n            const baseType = getBaseFieldType(field);\n            if (!fieldTypePlugins[baseType]) {\n                return false;\n            }\n            return fieldTypePlugins[baseType].isSearchable;\n        })\n        .map(f => f.fieldId);\n\n    const filters: string[] = [\"id: ID\", \"entryId: String\"];\n\n    for (const fieldId of fieldIdList) {\n        const field = model.fields.find(item => item.fieldId === fieldId);\n        if (!field) {\n            continue;\n        }\n        const baseType = getBaseFieldType(field);\n        const createGetFilters = getCreateFilters(fieldTypePlugins, baseType);\n        if (typeof createGetFilters !== \"function\") {\n            continue;\n        }\n        filters.push(createGetFilters({ model, field }));\n    }\n\n    return filters.filter(Boolean).join(\"\\n\");\n};\n"],"mappings":";;;;;;;AACA;;AAUA,MAAMA,gBAAgB,GAAG,CACrBC,OADqB,EAErBC,SAFqB,KAG6C;EAClE,IAAI,CAACD,OAAO,CAACC,SAAD,CAAR,IAAuB,CAACD,OAAO,CAACC,SAAD,CAAP,CAAmBC,IAAnB,CAAwBC,gBAApD,EAAsE;IAClE,OAAO,IAAP;EACH;;EACD,OAAOH,OAAO,CAACC,SAAD,CAAP,CAAmBC,IAAnB,CAAwBC,gBAA/B;AACH,CARD;;AAUO,MAAMC,qBAA4C,GAAG,CAAC;EAAEC,KAAF;EAASC;AAAT,CAAD,KAAiC;EACzF,MAAMC,WAAW,GAAGF,KAAK,CAACG,MAAN,CACfC,MADe,CACRC,KAAK,IAAI;IACb;IACA;IACA;IACA;IACA;IACA,MAAMC,QAAQ,GAAG,IAAAC,kCAAA,EAAiBF,KAAjB,CAAjB;;IACA,IAAI,CAACJ,gBAAgB,CAACK,QAAD,CAArB,EAAiC;MAC7B,OAAO,KAAP;IACH;;IACD,OAAOL,gBAAgB,CAACK,QAAD,CAAhB,CAA2BE,YAAlC;EACH,CAZe,EAafC,GAbe,CAaXC,CAAC,IAAIA,CAAC,CAACC,OAbI,CAApB;EAeA,MAAMC,OAAiB,GAAG,CAAC,QAAD,EAAW,iBAAX,CAA1B;;EAEA,KAAK,MAAMD,OAAX,IAAsBT,WAAtB,EAAmC;IAC/B,MAAMG,KAAK,GAAGL,KAAK,CAACG,MAAN,CAAaU,IAAb,CAAkBC,IAAI,IAAIA,IAAI,CAACH,OAAL,KAAiBA,OAA3C,CAAd;;IACA,IAAI,CAACN,KAAL,EAAY;MACR;IACH;;IACD,MAAMC,QAAQ,GAAG,IAAAC,kCAAA,EAAiBF,KAAjB,CAAjB;IACA,MAAMP,gBAAgB,GAAGJ,gBAAgB,CAACO,gBAAD,EAAmBK,QAAnB,CAAzC;;IACA,IAAI,OAAOR,gBAAP,KAA4B,UAAhC,EAA4C;MACxC;IACH;;IACDc,OAAO,CAACG,IAAR,CAAajB,gBAAgB,CAAC;MAAEE,KAAF;MAASK;IAAT,CAAD,CAA7B;EACH;;EAED,OAAOO,OAAO,CAACR,MAAR,CAAeY,OAAf,EAAwBC,IAAxB,CAA6B,IAA7B,CAAP;AACH,CAhCM"}
+{"version":3,"names":["_getBaseFieldType","require","renderGetFilterFields","fields","fieldTypePlugins","filters","field","_plugin$read","baseType","getBaseFieldType","plugin","isSearchable","createGetFilters","read","push","filter","Boolean","join","exports"],"sources":["renderGetFilterFields.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderGetFilterFieldsParams {\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface RenderGetFilterFields {\n    (params: RenderGetFilterFieldsParams): string;\n}\n\nexport const renderGetFilterFields: RenderGetFilterFields = ({ fields, fieldTypePlugins }) => {\n    const filters: string[] = [\"id: ID\", \"entryId: String\"];\n\n    for (const field of fields) {\n        // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n        // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n        // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n        // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n        // could've just removed the plugin from the backend.\n        const baseType = getBaseFieldType(field);\n        const plugin = fieldTypePlugins[baseType];\n        if (!plugin?.isSearchable) {\n            continue;\n        }\n        const createGetFilters = plugin.read?.createGetFilters;\n        if (typeof createGetFilters !== \"function\") {\n            continue;\n        }\n        filters.push(createGetFilters({ field }));\n    }\n\n    return filters.filter(Boolean).join(\"\\n\");\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAUO,MAAMC,qBAA4C,GAAGA,CAAC;EAAEC,MAAM;EAAEC;AAAiB,CAAC,KAAK;EAC1F,MAAMC,OAAiB,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC;EAEvD,KAAK,MAAMC,KAAK,IAAIH,MAAM,EAAE;IAAA,IAAAI,YAAA;IACxB;IACA;IACA;IACA;IACA;IACA,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACH,KAAK,CAAC;IACxC,MAAMI,MAAM,GAAGN,gBAAgB,CAACI,QAAQ,CAAC;IACzC,IAAI,EAACE,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEC,YAAY,GAAE;MACvB;IACJ;IACA,MAAMC,gBAAgB,IAAAL,YAAA,GAAGG,MAAM,CAACG,IAAI,cAAAN,YAAA,uBAAXA,YAAA,CAAaK,gBAAgB;IACtD,IAAI,OAAOA,gBAAgB,KAAK,UAAU,EAAE;MACxC;IACJ;IACAP,OAAO,CAACS,IAAI,CAACF,gBAAgB,CAAC;MAAEN;IAAM,CAAC,CAAC,CAAC;EAC7C;EAEA,OAAOD,OAAO,CAACU,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;AAC7C,CAAC;AAACC,OAAA,CAAAhB,qBAAA,GAAAA,qBAAA"}

package/utils/renderInputFields.d.ts

@@ -1,14 +1,16 @@
 import { CmsFieldTypePlugins, CmsModel, CmsModelField, CmsModelFieldDefinition } from "../types";
 interface RenderInputFieldsParams {
+    models: CmsModel[];
     model: CmsModel;
+    fields: CmsModelField[];
     fieldTypePlugins: CmsFieldTypePlugins;
 }
-interface RenderInputFieldParams extends RenderInputFieldsParams {
+interface RenderInputFieldParams extends Omit<RenderInputFieldsParams, "fields"> {
     field: CmsModelField;
 }
 interface RenderInputFields {
     (params: RenderInputFieldsParams): CmsModelFieldDefinition[];
 }
 export declare const renderInputFields: RenderInputFields;
-export declare const renderInputField: ({ model, field, fieldTypePlugins }: RenderInputFieldParams) => CmsModelFieldDefinition | null;
+export declare const renderInputField: ({ models, model, field, fieldTypePlugins }: RenderInputFieldParams) => CmsModelFieldDefinition | null;
 export {};

package/utils/renderInputFields.js

@@ -4,23 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderInputFields = exports.renderInputField = void 0;
-
 var _getBaseFieldType = require("./getBaseFieldType");
-
 const renderInputFields = ({
+  models,
   model,
+  fields,
   fieldTypePlugins
 }) => {
-  return model.fields.map(field => renderInputField({
-    model,
-    field,
-    fieldTypePlugins
-  })).filter(Boolean);
+  return fields.reduce((result, field) => {
+    const input = renderInputField({
+      models,
+      model,
+      field,
+      fieldTypePlugins
+    });
+    if (!input) {
+      return result;
+    }
+    result.push(input);
+    return result;
+  }, []);
 };
-
 exports.renderInputFields = renderInputFields;
-
 const renderInputField = ({
+  models,
   model,
   field,
   fieldTypePlugins
@@ -31,25 +38,21 @@ const renderInputField = ({
   // 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 plugin = fieldTypePlugins[(0, _getBaseFieldType.getBaseFieldType)(field)];
-
   if (!plugin) {
     // Let's not render the field if it does not exist in the field plugins.
     return null;
   }
-
   const def = plugin.manage.createInputField({
+    models,
     model,
     field,
     fieldTypePlugins
   });
-
   if (typeof def === "string") {
     return {
       fields: def
     };
   }
-
   return def;
 };
-
 exports.renderInputField = renderInputField;

package/utils/renderInputFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["renderInputFields","model","fieldTypePlugins","fields","map","field","renderInputField","filter","Boolean","plugin","getBaseFieldType","def","manage","createInputField"],"sources":["renderInputFields.ts"],"sourcesContent":["import {\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldDefinition,\n    CmsModelFieldToGraphQLPlugin\n} from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderInputFieldsParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface RenderInputFieldParams extends RenderInputFieldsParams {\n    field: CmsModelField;\n}\ninterface RenderInputFields {\n    (params: RenderInputFieldsParams): CmsModelFieldDefinition[];\n}\n\nexport const renderInputFields: RenderInputFields = ({\n    model,\n    fieldTypePlugins\n}): CmsModelFieldDefinition[] => {\n    return model.fields\n        .map(field => renderInputField({ model, field, fieldTypePlugins }))\n        .filter(Boolean) as CmsModelFieldDefinition[];\n};\n\nexport const renderInputField = ({\n    model,\n    field,\n    fieldTypePlugins\n}: RenderInputFieldParams): CmsModelFieldDefinition | null => {\n    // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n    // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n    // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n    // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n    // could've just removed the plugin from the backend.\n    const plugin: CmsModelFieldToGraphQLPlugin = fieldTypePlugins[getBaseFieldType(field)];\n\n    if (!plugin) {\n        // Let's not render the field if it does not exist in the field plugins.\n        return null;\n    }\n\n    const def = plugin.manage.createInputField({\n        model,\n        field,\n        fieldTypePlugins\n    });\n    if (typeof def === \"string\") {\n        return {\n            fields: def\n        };\n    }\n\n    return def;\n};\n"],"mappings":";;;;;;;AAOA;;AAaO,MAAMA,iBAAoC,GAAG,CAAC;EACjDC,KADiD;EAEjDC;AAFiD,CAAD,KAGnB;EAC7B,OAAOD,KAAK,CAACE,MAAN,CACFC,GADE,CACEC,KAAK,IAAIC,gBAAgB,CAAC;IAAEL,KAAF;IAASI,KAAT;IAAgBH;EAAhB,CAAD,CAD3B,EAEFK,MAFE,CAEKC,OAFL,CAAP;AAGH,CAPM;;;;AASA,MAAMF,gBAAgB,GAAG,CAAC;EAC7BL,KAD6B;EAE7BI,KAF6B;EAG7BH;AAH6B,CAAD,KAI8B;EAC1D;EACA;EACA;EACA;EACA;EACA,MAAMO,MAAoC,GAAGP,gBAAgB,CAAC,IAAAQ,kCAAA,EAAiBL,KAAjB,CAAD,CAA7D;;EAEA,IAAI,CAACI,MAAL,EAAa;IACT;IACA,OAAO,IAAP;EACH;;EAED,MAAME,GAAG,GAAGF,MAAM,CAACG,MAAP,CAAcC,gBAAd,CAA+B;IACvCZ,KADuC;IAEvCI,KAFuC;IAGvCH;EAHuC,CAA/B,CAAZ;;EAKA,IAAI,OAAOS,GAAP,KAAe,QAAnB,EAA6B;IACzB,OAAO;MACHR,MAAM,EAAEQ;IADL,CAAP;EAGH;;EAED,OAAOA,GAAP;AACH,CA7BM"}
+{"version":3,"names":["_getBaseFieldType","require","renderInputFields","models","model","fields","fieldTypePlugins","reduce","result","field","input","renderInputField","push","exports","plugin","getBaseFieldType","def","manage","createInputField"],"sources":["renderInputFields.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel, CmsModelField, CmsModelFieldDefinition } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderInputFieldsParams {\n    models: CmsModel[];\n    model: CmsModel;\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\ninterface RenderInputFieldParams extends Omit<RenderInputFieldsParams, \"fields\"> {\n    field: CmsModelField;\n}\n\ninterface RenderInputFields {\n    (params: RenderInputFieldsParams): CmsModelFieldDefinition[];\n}\n\nexport const renderInputFields: RenderInputFields = ({\n    models,\n    model,\n    fields,\n    fieldTypePlugins\n}): CmsModelFieldDefinition[] => {\n    return fields.reduce<CmsModelFieldDefinition[]>((result, field) => {\n        const input = renderInputField({ models, model, field, fieldTypePlugins });\n        if (!input) {\n            return result;\n        }\n        result.push(input);\n        return result;\n    }, []);\n};\n\nexport const renderInputField = ({\n    models,\n    model,\n    field,\n    fieldTypePlugins\n}: RenderInputFieldParams): CmsModelFieldDefinition | null => {\n    // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n    // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n    // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n    // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n    // could've just removed the plugin from the backend.\n    const plugin = fieldTypePlugins[getBaseFieldType(field)];\n\n    if (!plugin) {\n        // Let's not render the field if it does not exist in the field plugins.\n        return null;\n    }\n\n    const def = plugin.manage.createInputField({\n        models,\n        model,\n        field,\n        fieldTypePlugins\n    });\n    if (typeof def === \"string\") {\n        return {\n            fields: def\n        };\n    }\n\n    return def;\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAiBO,MAAMC,iBAAoC,GAAGA,CAAC;EACjDC,MAAM;EACNC,KAAK;EACLC,MAAM;EACNC;AACJ,CAAC,KAAgC;EAC7B,OAAOD,MAAM,CAACE,MAAM,CAA4B,CAACC,MAAM,EAAEC,KAAK,KAAK;IAC/D,MAAMC,KAAK,GAAGC,gBAAgB,CAAC;MAAER,MAAM;MAAEC,KAAK;MAAEK,KAAK;MAAEH;IAAiB,CAAC,CAAC;IAC1E,IAAI,CAACI,KAAK,EAAE;MACR,OAAOF,MAAM;IACjB;IACAA,MAAM,CAACI,IAAI,CAACF,KAAK,CAAC;IAClB,OAAOF,MAAM;EACjB,CAAC,EAAE,EAAE,CAAC;AACV,CAAC;AAACK,OAAA,CAAAX,iBAAA,GAAAA,iBAAA;AAEK,MAAMS,gBAAgB,GAAGA,CAAC;EAC7BR,MAAM;EACNC,KAAK;EACLK,KAAK;EACLH;AACoB,CAAC,KAAqC;EAC1D;EACA;EACA;EACA;EACA;EACA,MAAMQ,MAAM,GAAGR,gBAAgB,CAAC,IAAAS,kCAAgB,EAACN,KAAK,CAAC,CAAC;EAExD,IAAI,CAACK,MAAM,EAAE;IACT;IACA,OAAO,IAAI;EACf;EAEA,MAAME,GAAG,GAAGF,MAAM,CAACG,MAAM,CAACC,gBAAgB,CAAC;IACvCf,MAAM;IACNC,KAAK;IACLK,KAAK;IACLH;EACJ,CAAC,CAAC;EACF,IAAI,OAAOU,GAAG,KAAK,QAAQ,EAAE;IACzB,OAAO;MACHX,MAAM,EAAEW;IACZ,CAAC;EACL;EAEA,OAAOA,GAAG;AACd,CAAC;AAACH,OAAA,CAAAF,gBAAA,GAAAA,gBAAA"}

package/utils/renderListFilterFields.d.ts

@@ -1,8 +1,10 @@
-import { ApiEndpoint, CmsFieldTypePlugins, CmsModel } from "../types";
+import { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from "../types";
 interface RenderListFilterFieldsParams {
     model: CmsModel;
+    fields: CmsModelField[];
     type: ApiEndpoint;
     fieldTypePlugins: CmsFieldTypePlugins;
+    excludeFields?: string[];
 }
 interface RenderListFilterFields {
     (params: RenderListFilterFieldsParams): string;

package/utils/renderListFilterFields.js

@@ -4,59 +4,45 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderListFilterFields = void 0;
-
 var _getBaseFieldType = require("./getBaseFieldType");
-
-/**
- * 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 = params => {
   const {
     model,
+    fields,
     type,
-    fieldTypePlugins
+    fieldTypePlugins,
+    excludeFields = []
   } = params;
-  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")];
+  const result = ["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!]"];
   /**
    * We can find different statuses only in the manage API endpoint.
    */
-
   if (type === "manage") {
-    fields.push(...["status: String", "status_not: String", "status_in: [String!]", "status_not_in: [String!]"]);
+    result.push("status: String", "status_not: String", "status_in: [String!]", "status_not_in: [String!]");
   }
-
-  for (const field of model.fields) {
+  const finalFields = result.filter(field => {
+    return !excludeFields.some(excl => {
+      return field.startsWith(`${excl}_`) || field.startsWith(`${excl}: `);
+    });
+  });
+  for (const field of fields) {
+    var _fieldTypePlugins$bas;
     // 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, (0, _getBaseFieldType.getBaseFieldType)(field), type);
-
+    const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+    const createListFilters = (_fieldTypePlugins$bas = fieldTypePlugins[baseType]) === null || _fieldTypePlugins$bas === void 0 || (_fieldTypePlugins$bas = _fieldTypePlugins$bas[type]) === null || _fieldTypePlugins$bas === void 0 ? void 0 : _fieldTypePlugins$bas.createListFilters;
     if (typeof createListFilters !== "function") {
       continue;
     }
-
-    fields.push(createListFilters({
+    finalFields.push(createListFilters({
       model,
       field,
       plugins: fieldTypePlugins
     }));
   }
-
-  return fields.filter(Boolean).join("\n");
+  return finalFields.filter(Boolean).join("\n");
 };
-
 exports.renderListFilterFields = renderListFilterFields;

package/utils/renderListFilterFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["getCreateListFilters","plugins","fieldType","type","createListFilters","renderListFilterFields","params","model","fieldTypePlugins","fields","join","push","field","getBaseFieldType","filter","Boolean"],"sources":["renderListFilterFields.ts"],"sourcesContent":["import { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderListFilterFieldsParams {\n    model: CmsModel;\n    type: ApiEndpoint;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface RenderListFilterFields {\n    (params: RenderListFilterFieldsParams): string;\n}\n\ntype CreateListFiltersType =\n    | CmsModelFieldToGraphQLPlugin[\"read\"][\"createListFilters\"]\n    | CmsModelFieldToGraphQLPlugin[\"manage\"][\"createListFilters\"];\n/**\n * We cast as read type, because input and output of read and manage are same. This way we ease things.\n * Internal stuff so it should be ok.\n * TODO note that if changing read/manage types, change this as well.\n */\nconst getCreateListFilters = (\n    plugins: CmsFieldTypePlugins,\n    fieldType: string,\n    type: ApiEndpoint\n): CreateListFiltersType | null => {\n    if (!plugins[fieldType]) {\n        return null;\n    } else if (!plugins[fieldType][type]) {\n        return null;\n    }\n    return plugins[fieldType][type].createListFilters;\n};\n\nexport const renderListFilterFields: RenderListFilterFields = (params): string => {\n    const { model, type, fieldTypePlugins } = params;\n    const fields: string[] = [\n        [\n            \"id: ID\",\n            \"id_not: ID\",\n            \"id_in: [ID!]\",\n            \"id_not_in: [ID!]\",\n            \"entryId: String\",\n            \"entryId_not: String\",\n            \"entryId_in: [String!]\",\n            \"entryId_not_in: [String!]\",\n            \"createdOn: DateTime\",\n            \"createdOn_gt: DateTime\",\n            \"createdOn_gte: DateTime\",\n            \"createdOn_lt: DateTime\",\n            \"createdOn_lte: DateTime\",\n            \"createdOn_between: [DateTime!]\",\n            \"createdOn_not_between: [DateTime!]\",\n            \"savedOn: DateTime\",\n            \"savedOn_gt: DateTime\",\n            \"savedOn_gte: DateTime\",\n            \"savedOn_lt: DateTime\",\n            \"savedOn_lte: DateTime\",\n            \"savedOn_between: [DateTime!]\",\n            \"savedOn_not_between: [DateTime!]\",\n            \"createdBy: String\",\n            \"createdBy_not: String\",\n            \"createdBy_in: [String!]\",\n            \"createdBy_not_in: [String!]\",\n            \"ownedBy: String\",\n            \"ownedBy_not: String\",\n            \"ownedBy_in: [String!]\",\n            \"ownedBy_not_in: [String!]\"\n        ].join(\"\\n\")\n    ];\n    /**\n     * We can find different statuses only in the manage API endpoint.\n     */\n    if (type === \"manage\") {\n        fields.push(\n            ...[\n                \"status: String\",\n                \"status_not: String\",\n                \"status_in: [String!]\",\n                \"status_not_in: [String!]\"\n            ]\n        );\n    }\n\n    for (const field of model.fields) {\n        // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n        // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n        // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n        // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n        // could've just removed the plugin from the backend.\n\n        const createListFilters = getCreateListFilters(\n            fieldTypePlugins,\n            getBaseFieldType(field),\n            type\n        );\n        if (typeof createListFilters !== \"function\") {\n            continue;\n        }\n        fields.push(createListFilters({ model, field, plugins: fieldTypePlugins }));\n    }\n\n    return fields.filter(Boolean).join(\"\\n\");\n};\n"],"mappings":";;;;;;;AACA;;AAcA;AACA;AACA;AACA;AACA;AACA,MAAMA,oBAAoB,GAAG,CACzBC,OADyB,EAEzBC,SAFyB,EAGzBC,IAHyB,KAIM;EAC/B,IAAI,CAACF,OAAO,CAACC,SAAD,CAAZ,EAAyB;IACrB,OAAO,IAAP;EACH,CAFD,MAEO,IAAI,CAACD,OAAO,CAACC,SAAD,CAAP,CAAmBC,IAAnB,CAAL,EAA+B;IAClC,OAAO,IAAP;EACH;;EACD,OAAOF,OAAO,CAACC,SAAD,CAAP,CAAmBC,IAAnB,EAAyBC,iBAAhC;AACH,CAXD;;AAaO,MAAMC,sBAA8C,GAAIC,MAAD,IAAoB;EAC9E,MAAM;IAAEC,KAAF;IAASJ,IAAT;IAAeK;EAAf,IAAoCF,MAA1C;EACA,MAAMG,MAAgB,GAAG,CACrB,CACI,QADJ,EAEI,YAFJ,EAGI,cAHJ,EAII,kBAJJ,EAKI,iBALJ,EAMI,qBANJ,EAOI,uBAPJ,EAQI,2BARJ,EASI,qBATJ,EAUI,wBAVJ,EAWI,yBAXJ,EAYI,wBAZJ,EAaI,yBAbJ,EAcI,gCAdJ,EAeI,oCAfJ,EAgBI,mBAhBJ,EAiBI,sBAjBJ,EAkBI,uBAlBJ,EAmBI,sBAnBJ,EAoBI,uBApBJ,EAqBI,8BArBJ,EAsBI,kCAtBJ,EAuBI,mBAvBJ,EAwBI,uBAxBJ,EAyBI,yBAzBJ,EA0BI,6BA1BJ,EA2BI,iBA3BJ,EA4BI,qBA5BJ,EA6BI,uBA7BJ,EA8BI,2BA9BJ,EA+BEC,IA/BF,CA+BO,IA/BP,CADqB,CAAzB;EAkCA;AACJ;AACA;;EACI,IAAIP,IAAI,KAAK,QAAb,EAAuB;IACnBM,MAAM,CAACE,IAAP,CACI,GAAG,CACC,gBADD,EAEC,oBAFD,EAGC,sBAHD,EAIC,0BAJD,CADP;EAQH;;EAED,KAAK,MAAMC,KAAX,IAAoBL,KAAK,CAACE,MAA1B,EAAkC;IAC9B;IACA;IACA;IACA;IACA;IAEA,MAAML,iBAAiB,GAAGJ,oBAAoB,CAC1CQ,gBAD0C,EAE1C,IAAAK,kCAAA,EAAiBD,KAAjB,CAF0C,EAG1CT,IAH0C,CAA9C;;IAKA,IAAI,OAAOC,iBAAP,KAA6B,UAAjC,EAA6C;MACzC;IACH;;IACDK,MAAM,CAACE,IAAP,CAAYP,iBAAiB,CAAC;MAAEG,KAAF;MAASK,KAAT;MAAgBX,OAAO,EAAEO;IAAzB,CAAD,CAA7B;EACH;;EAED,OAAOC,MAAM,CAACK,MAAP,CAAcC,OAAd,EAAuBL,IAAvB,CAA4B,IAA5B,CAAP;AACH,CArEM"}
+{"version":3,"names":["_getBaseFieldType","require","renderListFilterFields","params","model","fields","type","fieldTypePlugins","excludeFields","result","push","finalFields","filter","field","some","excl","startsWith","_fieldTypePlugins$bas","baseType","getBaseFieldType","createListFilters","plugins","Boolean","join","exports"],"sources":["renderListFilterFields.ts"],"sourcesContent":["import {\n    ApiEndpoint,\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderListFilterFieldsParams {\n    model: CmsModel;\n    fields: CmsModelField[];\n    type: ApiEndpoint;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    excludeFields?: string[];\n}\ninterface RenderListFilterFields {\n    (params: RenderListFilterFieldsParams): string;\n}\n\ntype CreateListFiltersType =\n    | CmsModelFieldToGraphQLPlugin[\"read\"][\"createListFilters\"]\n    | CmsModelFieldToGraphQLPlugin[\"manage\"][\"createListFilters\"];\n\nexport const renderListFilterFields: RenderListFilterFields = (params): string => {\n    const { model, fields, type, fieldTypePlugins, excludeFields = [] } = params;\n    const result: string[] = [\n        \"id: ID\",\n        \"id_not: ID\",\n        \"id_in: [ID!]\",\n        \"id_not_in: [ID!]\",\n        \"entryId: String\",\n        \"entryId_not: String\",\n        \"entryId_in: [String!]\",\n        \"entryId_not_in: [String!]\",\n        \"createdOn: DateTime\",\n        \"createdOn_gt: DateTime\",\n        \"createdOn_gte: DateTime\",\n        \"createdOn_lt: DateTime\",\n        \"createdOn_lte: DateTime\",\n        \"createdOn_between: [DateTime!]\",\n        \"createdOn_not_between: [DateTime!]\",\n        \"savedOn: DateTime\",\n        \"savedOn_gt: DateTime\",\n        \"savedOn_gte: DateTime\",\n        \"savedOn_lt: DateTime\",\n        \"savedOn_lte: DateTime\",\n        \"savedOn_between: [DateTime!]\",\n        \"savedOn_not_between: [DateTime!]\",\n        \"createdBy: String\",\n        \"createdBy_not: String\",\n        \"createdBy_in: [String!]\",\n        \"createdBy_not_in: [String!]\",\n        \"ownedBy: String\",\n        \"ownedBy_not: String\",\n        \"ownedBy_in: [String!]\",\n        \"ownedBy_not_in: [String!]\"\n    ];\n    /**\n     * We can find different statuses only in the manage API endpoint.\n     */\n    if (type === \"manage\") {\n        result.push(\n            \"status: String\",\n            \"status_not: String\",\n            \"status_in: [String!]\",\n            \"status_not_in: [String!]\"\n        );\n    }\n\n    const finalFields = result.filter(field => {\n        return !excludeFields.some(excl => {\n            return field.startsWith(`${excl}_`) || field.startsWith(`${excl}: `);\n        });\n    });\n\n    for (const field of fields) {\n        // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n        // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n        // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n        // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n        // could've just removed the plugin from the backend.\n        const baseType = getBaseFieldType(field);\n        const createListFilters: CreateListFiltersType | undefined =\n            fieldTypePlugins[baseType]?.[type]?.createListFilters;\n        if (typeof createListFilters !== \"function\") {\n            continue;\n        }\n        finalFields.push(createListFilters({ model, field, plugins: fieldTypePlugins }));\n    }\n\n    return finalFields.filter(Boolean).join(\"\\n\");\n};\n"],"mappings":";;;;;;AAOA,IAAAA,iBAAA,GAAAC,OAAA;AAiBO,MAAMC,sBAA8C,GAAIC,MAAM,IAAa;EAC9E,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,IAAI;IAAEC,gBAAgB;IAAEC,aAAa,GAAG;EAAG,CAAC,GAAGL,MAAM;EAC5E,MAAMM,MAAgB,GAAG,CACrB,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,EAC3B,qBAAqB,EACrB,wBAAwB,EACxB,yBAAyB,EACzB,wBAAwB,EACxB,yBAAyB,EACzB,gCAAgC,EAChC,oCAAoC,EACpC,mBAAmB,EACnB,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,EACvB,8BAA8B,EAC9B,kCAAkC,EAClC,mBAAmB,EACnB,uBAAuB,EACvB,yBAAyB,EACzB,6BAA6B,EAC7B,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,CAC9B;EACD;AACJ;AACA;EACI,IAAIH,IAAI,KAAK,QAAQ,EAAE;IACnBG,MAAM,CAACC,IAAI,CACP,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EACtB,0BACJ,CAAC;EACL;EAEA,MAAMC,WAAW,GAAGF,MAAM,CAACG,MAAM,CAACC,KAAK,IAAI;IACvC,OAAO,CAACL,aAAa,CAACM,IAAI,CAACC,IAAI,IAAI;MAC/B,OAAOF,KAAK,CAACG,UAAU,CAAE,GAAED,IAAK,GAAE,CAAC,IAAIF,KAAK,CAACG,UAAU,CAAE,GAAED,IAAK,IAAG,CAAC;IACxE,CAAC,CAAC;EACN,CAAC,CAAC;EAEF,KAAK,MAAMF,KAAK,IAAIR,MAAM,EAAE;IAAA,IAAAY,qBAAA;IACxB;IACA;IACA;IACA;IACA;IACA,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACN,KAAK,CAAC;IACxC,MAAMO,iBAAoD,IAAAH,qBAAA,GACtDV,gBAAgB,CAACW,QAAQ,CAAC,cAAAD,qBAAA,gBAAAA,qBAAA,GAA1BA,qBAAA,CAA6BX,IAAI,CAAC,cAAAW,qBAAA,uBAAlCA,qBAAA,CAAoCG,iBAAiB;IACzD,IAAI,OAAOA,iBAAiB,KAAK,UAAU,EAAE;MACzC;IACJ;IACAT,WAAW,CAACD,IAAI,CAACU,iBAAiB,CAAC;MAAEhB,KAAK;MAAES,KAAK;MAAEQ,OAAO,EAAEd;IAAiB,CAAC,CAAC,CAAC;EACpF;EAEA,OAAOI,WAAW,CAACC,MAAM,CAACU,OAAO,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;AACjD,CAAC;AAACC,OAAA,CAAAtB,sBAAA,GAAAA,sBAAA"}

package/utils/renderSortEnum.d.ts

@@ -1,9 +1,13 @@
-import { CmsFieldTypePlugins, CmsModel } from "../types";
+import { CmsFieldTypePlugins, CmsModel, CmsModelField } from "../types";
+import { CmsGraphQLSchemaSorterPlugin } from "../plugins/CmsGraphQLSchemaSorterPlugin";
+interface RenderSortEnumParams {
+    model: CmsModel;
+    fields: CmsModelField[];
+    fieldTypePlugins: CmsFieldTypePlugins;
+    sorterPlugins?: CmsGraphQLSchemaSorterPlugin[];
+}
 interface RenderSortEnum {
-    (params: {
-        model: CmsModel;
-        fieldTypePlugins: CmsFieldTypePlugins;
-    }): string;
+    (params: RenderSortEnumParams): string;
 }
 export declare const renderSortEnum: RenderSortEnum;
 export {};