@webiny/api-headless-cms-ddb-es 5.34.8-beta.1 → 5.35.0-beta.0

package/operations/entry/elasticsearch/fields.js

@@ -1,30 +1,26 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createModelFields = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
+var _plugins = require("../../../plugins");
 const createSystemField = field => {
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
     id: field.fieldId,
     label: field.fieldId
   });
 };
-
 const createSystemFields = () => {
   return {
     id: {
       type: "text",
-      isSystemField: true,
-      isSearchable: true,
-      isSortable: true,
+      systemField: true,
+      searchable: true,
+      sortable: true,
       field: createSystemField({
         storageId: "id",
         fieldId: "id",
@@ -34,9 +30,9 @@ const createSystemFields = () => {
     },
     entryId: {
       type: "text",
-      isSystemField: true,
-      isSearchable: true,
-      isSortable: true,
+      systemField: true,
+      searchable: true,
+      sortable: true,
       field: createSystemField({
         storageId: "entryId",
         fieldId: "entryId",
@@ -48,9 +44,9 @@ const createSystemFields = () => {
       type: "date",
       unmappedType: "date",
       keyword: false,
-      isSystemField: true,
-      isSearchable: true,
-      isSortable: true,
+      systemField: true,
+      searchable: true,
+      sortable: true,
       field: createSystemField({
         storageId: "savedOn",
         fieldId: "savedOn",
@@ -65,9 +61,9 @@ const createSystemFields = () => {
       type: "date",
       unmappedType: "date",
       keyword: false,
-      isSystemField: true,
-      isSearchable: true,
-      isSortable: true,
+      systemField: true,
+      searchable: true,
+      sortable: true,
       field: createSystemField({
         storageId: "createdOn",
         fieldId: "createdOn",
@@ -81,9 +77,9 @@ const createSystemFields = () => {
     createdBy: {
       type: "text",
       unmappedType: undefined,
-      isSystemField: true,
-      isSearchable: true,
-      isSortable: false,
+      systemField: true,
+      searchable: true,
+      sortable: false,
       path: "createdBy.id",
       field: createSystemField({
         storageId: "createdBy",
@@ -95,9 +91,9 @@ const createSystemFields = () => {
     ownedBy: {
       type: "text",
       unmappedType: undefined,
-      isSystemField: true,
-      isSearchable: true,
-      isSortable: false,
+      systemField: true,
+      searchable: true,
+      sortable: false,
       path: "ownedBy.id",
       field: createSystemField({
         storageId: "ownedBy",
@@ -110,9 +106,9 @@ const createSystemFields = () => {
       type: "number",
       unmappedType: undefined,
       keyword: false,
-      isSystemField: true,
-      isSearchable: true,
-      isSortable: true,
+      systemField: true,
+      searchable: true,
+      sortable: true,
       field: createSystemField({
         storageId: "version",
         fieldId: "version",
@@ -124,9 +120,9 @@ const createSystemFields = () => {
       type: "string",
       unmappedType: undefined,
       keyword: false,
-      isSystemField: true,
-      isSearchable: true,
-      isSortable: false,
+      systemField: true,
+      searchable: true,
+      sortable: false,
       field: createSystemField({
         storageId: "status",
         fieldId: "status",
@@ -136,7 +132,38 @@ const createSystemFields = () => {
     }
   };
 };
-
+const buildCustomFields = params => {
+  const {
+    fields,
+    fieldTypePlugins
+  } = params;
+  return fields.reduce((collection, field) => {
+    const typePlugin = fieldTypePlugins[field.fieldType];
+    if (!typePlugin) {
+      return collection;
+    }
+    let unmappedType = undefined;
+    if (typePlugin.unmappedType) {
+      unmappedType = typePlugin.unmappedType(field);
+    }
+    collection[field.fieldId] = {
+      type: field.fieldType,
+      field: createSystemField({
+        storageId: field.fieldId,
+        fieldId: field.fieldId,
+        type: field.fieldType
+      }),
+      unmappedType,
+      fullTextSearch: field.searchable ? typePlugin.fullTextSearch : false,
+      searchable: field.searchable || typePlugin.searchable,
+      sortable: field.sortable || typePlugin.sortable,
+      systemField: false,
+      path: field.path,
+      parents: []
+    };
+    return collection;
+  }, {});
+};
 const buildFieldsList = params => {
   const {
     plugins,
@@ -145,25 +172,20 @@ const buildFieldsList = params => {
   } = params;
   return fields.reduce((result, field) => {
     var _field$settings;
-
     const plugin = plugins[field.type];
-
     if (!plugin) {
       throw new _error.default(`There is no plugin for field type "${field.type}".`);
     }
-
     const {
-      isSearchable,
-      isSortable,
+      searchable,
+      sortable,
       unmappedType,
       fullTextSearch
     } = plugin;
     /**
      * If a field has child fields, go through them and add them to a result.
      */
-
     const childFields = ((_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.fields) || [];
-
     if (childFields.length > 0) {
       /**
        * Let's build all the child fields
@@ -177,72 +199,63 @@ const buildFieldsList = params => {
           type: field.type
         }]
       });
-      /**
-       *
-       */
-
       Object.assign(result, childResult);
     }
-
     const identifier = [...parents.map(p => p.fieldId), field.fieldId].join(".");
     result[identifier] = {
       type: field.type,
       parents,
-      isSearchable,
-      isSortable,
+      searchable,
+      sortable,
       fullTextSearch,
       unmappedType: typeof unmappedType === "function" ? unmappedType(field) : undefined,
-      isSystemField: false,
+      systemField: false,
       field
     };
     return result;
   }, {});
 };
-
 const createModelFields = ({
   plugins,
-  fields
+  model
 }) => {
-  if (!fields || fields.length === 0) {
-    return createSystemFields();
-  }
+  const fields = model.fields;
+  const fieldDefinitionPlugins = plugins.byType(_plugins.CmsElasticsearchModelFieldPlugin.type).filter(plugin => {
+    return plugin.canBeApplied(model.modelId);
+  });
   /**
    * Collect all unmappedType from elastic plugins.
    */
-
-
   const unmappedTypes = plugins.byType("cms-model-field-to-elastic-search").reduce((acc, plugin) => {
     if (!plugin.unmappedType) {
       return acc;
     }
-
     acc[plugin.fieldType] = plugin.unmappedType;
     return acc;
   }, {});
   /**
    * Collect all field types from the plugins.
    */
-
   const fieldTypePlugins = plugins.byType("cms-model-field-to-graphql").reduce((types, plugin) => {
     const {
       fieldType,
-      isSearchable,
-      isSortable,
       fullTextSearch
     } = plugin;
     types[fieldType] = {
       unmappedType: unmappedTypes[fieldType],
-      isSearchable,
-      isSortable,
+      searchable: plugin.isSearchable,
+      sortable: plugin.isSortable,
       fullTextSearch
     };
     return types;
   }, {});
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, createSystemFields()), buildFieldsList({
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, createSystemFields()), buildCustomFields({
+    fields: fieldDefinitionPlugins,
+    fieldTypePlugins
+  })), buildFieldsList({
     fields,
     plugins: fieldTypePlugins,
     parents: []
   }));
 };
-
 exports.createModelFields = createModelFields;

package/operations/entry/elasticsearch/fields.js.map

@@ -1 +1 @@
-{"version":3,"names":["createSystemField","field","id","fieldId","label","createSystemFields","type","isSystemField","isSearchable","isSortable","storageId","parents","entryId","savedOn","unmappedType","keyword","settings","createdOn","createdBy","undefined","path","ownedBy","version","status","buildFieldsList","params","plugins","fields","reduce","result","plugin","WebinyError","fullTextSearch","childFields","length","childResult","Object","assign","identifier","map","p","join","createModelFields","unmappedTypes","byType","acc","fieldType","fieldTypePlugins","types"],"sources":["fields.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsModelField, CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport { ModelFieldParent, ModelFields } from \"./types\";\n\ntype PartialCmsModelField = Partial<CmsModelField> &\n    Pick<CmsModelField, \"storageId\" | \"fieldId\" | \"type\">;\nconst createSystemField = (field: PartialCmsModelField): CmsModelField => {\n    return {\n        ...field,\n        id: field.fieldId,\n        label: field.fieldId\n    };\n};\n\nconst createSystemFields = (): ModelFields => {\n    return {\n        id: {\n            type: \"text\",\n            isSystemField: true,\n            isSearchable: true,\n            isSortable: true,\n            field: createSystemField({\n                storageId: \"id\",\n                fieldId: \"id\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        entryId: {\n            type: \"text\",\n            isSystemField: true,\n            isSearchable: true,\n            isSortable: true,\n            field: createSystemField({\n                storageId: \"entryId\",\n                fieldId: \"entryId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        savedOn: {\n            type: \"date\",\n            unmappedType: \"date\",\n            keyword: false,\n            isSystemField: true,\n            isSearchable: true,\n            isSortable: true,\n            field: createSystemField({\n                storageId: \"savedOn\",\n                fieldId: \"savedOn\",\n                type: \"datetime\",\n                settings: {\n                    type: \"dateTimeWithoutTimezone\"\n                }\n            }),\n            parents: []\n        },\n        createdOn: {\n            type: \"date\",\n            unmappedType: \"date\",\n            keyword: false,\n            isSystemField: true,\n            isSearchable: true,\n            isSortable: true,\n            field: createSystemField({\n                storageId: \"createdOn\",\n                fieldId: \"createdOn\",\n                type: \"text\",\n                settings: {\n                    type: \"dateTimeWithoutTimezone\"\n                }\n            }),\n            parents: []\n        },\n        createdBy: {\n            type: \"text\",\n            unmappedType: undefined,\n            isSystemField: true,\n            isSearchable: true,\n            isSortable: false,\n            path: \"createdBy.id\",\n            field: createSystemField({\n                storageId: \"createdBy\",\n                fieldId: \"createdBy\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        ownedBy: {\n            type: \"text\",\n            unmappedType: undefined,\n            isSystemField: true,\n            isSearchable: true,\n            isSortable: false,\n            path: \"ownedBy.id\",\n            field: createSystemField({\n                storageId: \"ownedBy\",\n                fieldId: \"ownedBy\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        version: {\n            type: \"number\",\n            unmappedType: undefined,\n            keyword: false,\n            isSystemField: true,\n            isSearchable: true,\n            isSortable: true,\n            field: createSystemField({\n                storageId: \"version\",\n                fieldId: \"version\",\n                type: \"number\"\n            }),\n            parents: []\n        },\n        status: {\n            type: \"string\",\n            unmappedType: undefined,\n            keyword: false,\n            isSystemField: true,\n            isSearchable: true,\n            isSortable: false,\n            field: createSystemField({\n                storageId: \"status\",\n                fieldId: \"status\",\n                type: \"string\"\n            }),\n            parents: []\n        }\n    };\n};\n\ninterface UnmappedFieldTypes {\n    [type: string]: (field: CmsModelField) => string | undefined;\n}\n\ninterface FieldTypePlugin {\n    unmappedType?: (field: CmsModelField) => string | undefined;\n    isSearchable: boolean;\n    isSortable: boolean;\n    fullTextSearch?: boolean;\n}\ninterface FieldTypePlugins {\n    [key: string]: FieldTypePlugin;\n}\n\ninterface BuildParams {\n    plugins: FieldTypePlugins;\n    fields: CmsModelField[];\n    parents: ModelFieldParent[];\n}\nconst buildFieldsList = (params: BuildParams): ModelFields => {\n    const { plugins, fields, parents } = params;\n\n    return fields.reduce<ModelFields>((result, field) => {\n        const plugin = plugins[field.type];\n        if (!plugin) {\n            throw new WebinyError(`There is no plugin for field type \"${field.type}\".`);\n        }\n\n        const { isSearchable, isSortable, unmappedType, fullTextSearch } = plugin;\n        /**\n         * If a field has child fields, go through them and add them to a result.\n         */\n        const childFields = field.settings?.fields || [];\n        if (childFields.length > 0) {\n            /**\n             * Let's build all the child fields\n             */\n            const childResult = buildFieldsList({\n                fields: childFields,\n                plugins,\n                parents: [\n                    ...parents,\n                    {\n                        fieldId: field.fieldId,\n                        storageId: field.storageId,\n                        type: field.type\n                    }\n                ]\n            });\n            /**\n             *\n             */\n            Object.assign(result, childResult);\n        }\n\n        const identifier = [...parents.map(p => p.fieldId), field.fieldId].join(\".\");\n\n        result[identifier] = {\n            type: field.type,\n            parents,\n            isSearchable,\n            isSortable,\n            fullTextSearch,\n            unmappedType: typeof unmappedType === \"function\" ? unmappedType(field) : undefined,\n            isSystemField: false,\n            field\n        };\n\n        return result;\n    }, {});\n};\n\ninterface Params {\n    plugins: PluginsContainer;\n    fields?: CmsModelField[];\n}\nexport const createModelFields = ({ plugins, fields }: Params) => {\n    if (!fields || fields.length === 0) {\n        return createSystemFields();\n    }\n    /**\n     * Collect all unmappedType from elastic plugins.\n     */\n    const unmappedTypes = plugins\n        .byType<CmsModelFieldToElasticsearchPlugin>(\"cms-model-field-to-elastic-search\")\n        .reduce<UnmappedFieldTypes>((acc, plugin) => {\n            if (!plugin.unmappedType) {\n                return acc;\n            }\n            acc[plugin.fieldType] = plugin.unmappedType;\n            return acc;\n        }, {});\n    /**\n     * Collect all field types from the plugins.\n     */\n    const fieldTypePlugins = plugins\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce<FieldTypePlugins>((types, plugin) => {\n            const { fieldType, isSearchable, isSortable, fullTextSearch } = plugin;\n            types[fieldType] = {\n                unmappedType: unmappedTypes[fieldType],\n                isSearchable,\n                isSortable,\n                fullTextSearch\n            };\n            return types;\n        }, {});\n\n    return {\n        ...createSystemFields(),\n        ...buildFieldsList({\n            fields,\n            plugins: fieldTypePlugins,\n            parents: []\n        })\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["createSystemField","field","id","fieldId","label","createSystemFields","type","systemField","searchable","sortable","storageId","parents","entryId","savedOn","unmappedType","keyword","settings","createdOn","createdBy","undefined","path","ownedBy","version","status","buildCustomFields","params","fields","fieldTypePlugins","reduce","collection","typePlugin","fieldType","fullTextSearch","buildFieldsList","plugins","result","plugin","WebinyError","childFields","length","childResult","Object","assign","identifier","map","p","join","createModelFields","model","fieldDefinitionPlugins","byType","CmsElasticsearchModelFieldPlugin","filter","canBeApplied","modelId","unmappedTypes","acc","types","isSearchable","isSortable"],"sources":["fields.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport {\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"@webiny/api-headless-cms/types\";\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport { ModelFieldParent, ModelFields } from \"./types\";\nimport { CmsElasticsearchModelFieldPlugin } from \"~/plugins\";\n\ntype PartialCmsModelField = Partial<CmsModelField> &\n    Pick<CmsModelField, \"storageId\" | \"fieldId\" | \"type\">;\nconst createSystemField = (field: PartialCmsModelField): CmsModelField => {\n    return {\n        ...field,\n        id: field.fieldId,\n        label: field.fieldId\n    };\n};\n\nconst createSystemFields = (): ModelFields => {\n    return {\n        id: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"id\",\n                fieldId: \"id\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        entryId: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"entryId\",\n                fieldId: \"entryId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        savedOn: {\n            type: \"date\",\n            unmappedType: \"date\",\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"savedOn\",\n                fieldId: \"savedOn\",\n                type: \"datetime\",\n                settings: {\n                    type: \"dateTimeWithoutTimezone\"\n                }\n            }),\n            parents: []\n        },\n        createdOn: {\n            type: \"date\",\n            unmappedType: \"date\",\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"createdOn\",\n                fieldId: \"createdOn\",\n                type: \"text\",\n                settings: {\n                    type: \"dateTimeWithoutTimezone\"\n                }\n            }),\n            parents: []\n        },\n        createdBy: {\n            type: \"text\",\n            unmappedType: undefined,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            path: \"createdBy.id\",\n            field: createSystemField({\n                storageId: \"createdBy\",\n                fieldId: \"createdBy\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        ownedBy: {\n            type: \"text\",\n            unmappedType: undefined,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            path: \"ownedBy.id\",\n            field: createSystemField({\n                storageId: \"ownedBy\",\n                fieldId: \"ownedBy\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        version: {\n            type: \"number\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"version\",\n                fieldId: \"version\",\n                type: \"number\"\n            }),\n            parents: []\n        },\n        status: {\n            type: \"string\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"status\",\n                fieldId: \"status\",\n                type: \"string\"\n            }),\n            parents: []\n        }\n    };\n};\n\ninterface UnmappedFieldTypes {\n    [type: string]: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n}\n\ninterface FieldTypePlugin {\n    unmappedType?: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n    searchable: boolean;\n    sortable: boolean;\n    fullTextSearch?: boolean;\n}\n\ninterface FieldTypePlugins {\n    [key: string]: FieldTypePlugin;\n}\n\ninterface BuildCustomFieldsParams {\n    fields: CmsElasticsearchModelFieldPlugin[];\n    fieldTypePlugins: FieldTypePlugins;\n}\n\nconst buildCustomFields = (params: BuildCustomFieldsParams) => {\n    const { fields, fieldTypePlugins } = params;\n\n    return fields.reduce<ModelFields>((collection, field) => {\n        const typePlugin = fieldTypePlugins[field.fieldType];\n        if (!typePlugin) {\n            return collection;\n        }\n        let unmappedType: string | undefined = undefined;\n        if (typePlugin.unmappedType) {\n            unmappedType = typePlugin.unmappedType(field);\n        }\n\n        collection[field.fieldId] = {\n            type: field.fieldType,\n            field: createSystemField({\n                storageId: field.fieldId,\n                fieldId: field.fieldId,\n                type: field.fieldType\n            }),\n            unmappedType,\n            fullTextSearch: field.searchable ? typePlugin.fullTextSearch : false,\n            searchable: field.searchable || typePlugin.searchable,\n            sortable: field.sortable || typePlugin.sortable,\n            systemField: false,\n            path: field.path,\n            parents: []\n        };\n\n        return collection;\n    }, {});\n};\n\ninterface BuildParams {\n    plugins: FieldTypePlugins;\n    fields: CmsModelField[];\n    parents: ModelFieldParent[];\n}\n\nconst buildFieldsList = (params: BuildParams): ModelFields => {\n    const { plugins, fields, parents } = params;\n\n    return fields.reduce<ModelFields>((result, field) => {\n        const plugin = plugins[field.type];\n        if (!plugin) {\n            throw new WebinyError(`There is no plugin for field type \"${field.type}\".`);\n        }\n\n        const { searchable, sortable, unmappedType, fullTextSearch } = plugin;\n        /**\n         * If a field has child fields, go through them and add them to a result.\n         */\n        const childFields = field.settings?.fields || [];\n        if (childFields.length > 0) {\n            /**\n             * Let's build all the child fields\n             */\n            const childResult = buildFieldsList({\n                fields: childFields,\n                plugins,\n                parents: [\n                    ...parents,\n                    {\n                        fieldId: field.fieldId,\n                        storageId: field.storageId,\n                        type: field.type\n                    }\n                ]\n            });\n            Object.assign(result, childResult);\n        }\n\n        const identifier = [...parents.map(p => p.fieldId), field.fieldId].join(\".\");\n\n        result[identifier] = {\n            type: field.type,\n            parents,\n            searchable,\n            sortable,\n            fullTextSearch,\n            unmappedType: typeof unmappedType === \"function\" ? unmappedType(field) : undefined,\n            systemField: false,\n            field\n        };\n\n        return result;\n    }, {});\n};\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\n\nexport const createModelFields = ({ plugins, model }: Params) => {\n    const fields = model.fields;\n    const fieldDefinitionPlugins = plugins\n        .byType<CmsElasticsearchModelFieldPlugin>(CmsElasticsearchModelFieldPlugin.type)\n        .filter(plugin => {\n            return plugin.canBeApplied(model.modelId);\n        });\n    /**\n     * Collect all unmappedType from elastic plugins.\n     */\n    const unmappedTypes = plugins\n        .byType<CmsModelFieldToElasticsearchPlugin>(\"cms-model-field-to-elastic-search\")\n        .reduce<UnmappedFieldTypes>((acc, plugin) => {\n            if (!plugin.unmappedType) {\n                return acc;\n            }\n            acc[plugin.fieldType] = plugin.unmappedType;\n            return acc;\n        }, {});\n    /**\n     * Collect all field types from the plugins.\n     */\n    const fieldTypePlugins = plugins\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce<FieldTypePlugins>((types, plugin) => {\n            const { fieldType, fullTextSearch } = plugin;\n            types[fieldType] = {\n                unmappedType: unmappedTypes[fieldType],\n                searchable: plugin.isSearchable,\n                sortable: plugin.isSortable,\n                fullTextSearch\n            };\n            return types;\n        }, {});\n\n    return {\n        ...createSystemFields(),\n        ...buildCustomFields({\n            fields: fieldDefinitionPlugins,\n            fieldTypePlugins\n        }),\n        ...buildFieldsList({\n            fields,\n            plugins: fieldTypePlugins,\n            parents: []\n        })\n    };\n};\n"],"mappings":"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"}

package/operations/entry/elasticsearch/filtering/applyFiltering.js

@@ -1,20 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createApplyFiltering = void 0;
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _transformValueForSearch = require("../transformValueForSearch");
-
 var _keyword = require("../keyword");
-
 var _path = require("./path");
-
 const createApplyFiltering = ({
   operatorPlugins,
   searchPlugins
@@ -31,13 +25,11 @@ const createApplyFiltering = ({
       field
     } = params;
     const plugin = operatorPlugins[operator];
-
     if (!plugin) {
-      throw new _error.default("Operator plugin missing.", "PLUGIN_MISSING", {
+      throw new _error.default(`Elasticsearch operator "${operator}" plugin missing.`, "PLUGIN_MISSING", {
         operator
       });
     }
-
     const value = (0, _transformValueForSearch.transformValueForSearch)({
       plugins: searchPlugins,
       field: field.field,
@@ -62,5 +54,4 @@ const createApplyFiltering = ({
     });
   };
 };
-
 exports.createApplyFiltering = createApplyFiltering;

package/operations/entry/elasticsearch/filtering/applyFiltering.js.map

@@ -1 +1 @@
-{"version":3,"names":["createApplyFiltering","operatorPlugins","searchPlugins","createFieldPath","createFieldPathFactory","plugins","params","key","value","initialValue","query","operator","field","plugin","WebinyError","transformValueForSearch","keyword","hasKeyword","basePath","path","apply","name","fieldId"],"sources":["applyFiltering.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { transformValueForSearch } from \"~/operations/entry/elasticsearch/transformValueForSearch\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword\";\nimport {\n    ElasticsearchQueryBuilderOperatorPlugins,\n    ElasticsearchQuerySearchValuePlugins\n} from \"~/operations/entry/elasticsearch/types\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path\";\nimport { ApplyFilteringCb } from \"~/plugins/CmsEntryFilterPlugin\";\n\ninterface CreateParams {\n    operatorPlugins: ElasticsearchQueryBuilderOperatorPlugins;\n    searchPlugins: ElasticsearchQuerySearchValuePlugins;\n}\n\nexport const createApplyFiltering = ({\n    operatorPlugins,\n    searchPlugins\n}: CreateParams): ApplyFilteringCb => {\n    const createFieldPath = createFieldPathFactory({\n        plugins: searchPlugins\n    });\n\n    return params => {\n        const { key, value: initialValue, query, operator, field } = params;\n\n        const plugin = operatorPlugins[operator];\n        if (!plugin) {\n            throw new WebinyError(\"Operator plugin missing.\", \"PLUGIN_MISSING\", {\n                operator\n            });\n        }\n\n        const value = transformValueForSearch({\n            plugins: searchPlugins,\n            field: field.field,\n            value: initialValue\n        });\n\n        const keyword = hasKeyword(field);\n\n        const { basePath, path } = createFieldPath({\n            field,\n            value,\n            key,\n            keyword\n        });\n\n        plugin.apply(query, {\n            name: field.field.fieldId,\n            basePath,\n            path,\n            value,\n            keyword\n        });\n    };\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAKA;;AAQO,MAAMA,oBAAoB,GAAG,CAAC;EACjCC,eADiC;EAEjCC;AAFiC,CAAD,KAGE;EAClC,MAAMC,eAAe,GAAG,IAAAC,4BAAA,EAAuB;IAC3CC,OAAO,EAAEH;EADkC,CAAvB,CAAxB;EAIA,OAAOI,MAAM,IAAI;IACb,MAAM;MAAEC,GAAF;MAAOC,KAAK,EAAEC,YAAd;MAA4BC,KAA5B;MAAmCC,QAAnC;MAA6CC;IAA7C,IAAuDN,MAA7D;IAEA,MAAMO,MAAM,GAAGZ,eAAe,CAACU,QAAD,CAA9B;;IACA,IAAI,CAACE,MAAL,EAAa;MACT,MAAM,IAAIC,cAAJ,CAAgB,0BAAhB,EAA4C,gBAA5C,EAA8D;QAChEH;MADgE,CAA9D,CAAN;IAGH;;IAED,MAAMH,KAAK,GAAG,IAAAO,gDAAA,EAAwB;MAClCV,OAAO,EAAEH,aADyB;MAElCU,KAAK,EAAEA,KAAK,CAACA,KAFqB;MAGlCJ,KAAK,EAAEC;IAH2B,CAAxB,CAAd;IAMA,MAAMO,OAAO,GAAG,IAAAC,mBAAA,EAAWL,KAAX,CAAhB;IAEA,MAAM;MAAEM,QAAF;MAAYC;IAAZ,IAAqBhB,eAAe,CAAC;MACvCS,KADuC;MAEvCJ,KAFuC;MAGvCD,GAHuC;MAIvCS;IAJuC,CAAD,CAA1C;IAOAH,MAAM,CAACO,KAAP,CAAaV,KAAb,EAAoB;MAChBW,IAAI,EAAET,KAAK,CAACA,KAAN,CAAYU,OADF;MAEhBJ,QAFgB;MAGhBC,IAHgB;MAIhBX,KAJgB;MAKhBQ;IALgB,CAApB;EAOH,CAhCD;AAiCH,CAzCM"}
+{"version":3,"names":["createApplyFiltering","operatorPlugins","searchPlugins","createFieldPath","createFieldPathFactory","plugins","params","key","value","initialValue","query","operator","field","plugin","WebinyError","transformValueForSearch","keyword","hasKeyword","basePath","path","apply","name","fieldId"],"sources":["applyFiltering.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { transformValueForSearch } from \"~/operations/entry/elasticsearch/transformValueForSearch\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword\";\nimport {\n    ElasticsearchQueryBuilderOperatorPlugins,\n    ElasticsearchQuerySearchValuePlugins\n} from \"~/operations/entry/elasticsearch/types\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path\";\nimport { ApplyFilteringCb } from \"~/plugins/CmsEntryFilterPlugin\";\n\ninterface CreateParams {\n    operatorPlugins: ElasticsearchQueryBuilderOperatorPlugins;\n    searchPlugins: ElasticsearchQuerySearchValuePlugins;\n}\n\nexport const createApplyFiltering = ({\n    operatorPlugins,\n    searchPlugins\n}: CreateParams): ApplyFilteringCb => {\n    const createFieldPath = createFieldPathFactory({\n        plugins: searchPlugins\n    });\n\n    return params => {\n        const { key, value: initialValue, query, operator, field } = params;\n\n        const plugin = operatorPlugins[operator];\n        if (!plugin) {\n            throw new WebinyError(\n                `Elasticsearch operator \"${operator}\" plugin missing.`,\n                \"PLUGIN_MISSING\",\n                {\n                    operator\n                }\n            );\n        }\n\n        const value = transformValueForSearch({\n            plugins: searchPlugins,\n            field: field.field,\n            value: initialValue\n        });\n\n        const keyword = hasKeyword(field);\n\n        const { basePath, path } = createFieldPath({\n            field,\n            value,\n            key,\n            keyword\n        });\n\n        plugin.apply(query, {\n            name: field.field.fieldId,\n            basePath,\n            path,\n            value,\n            keyword\n        });\n    };\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AAKA;AAQO,MAAMA,oBAAoB,GAAG,CAAC;EACjCC,eAAe;EACfC;AACU,CAAC,KAAuB;EAClC,MAAMC,eAAe,GAAG,IAAAC,4BAAsB,EAAC;IAC3CC,OAAO,EAAEH;EACb,CAAC,CAAC;EAEF,OAAOI,MAAM,IAAI;IACb,MAAM;MAAEC,GAAG;MAAEC,KAAK,EAAEC,YAAY;MAAEC,KAAK;MAAEC,QAAQ;MAAEC;IAAM,CAAC,GAAGN,MAAM;IAEnE,MAAMO,MAAM,GAAGZ,eAAe,CAACU,QAAQ,CAAC;IACxC,IAAI,CAACE,MAAM,EAAE;MACT,MAAM,IAAIC,cAAW,CAChB,2BAA0BH,QAAS,mBAAkB,EACtD,gBAAgB,EAChB;QACIA;MACJ,CAAC,CACJ;IACL;IAEA,MAAMH,KAAK,GAAG,IAAAO,gDAAuB,EAAC;MAClCV,OAAO,EAAEH,aAAa;MACtBU,KAAK,EAAEA,KAAK,CAACA,KAAK;MAClBJ,KAAK,EAAEC;IACX,CAAC,CAAC;IAEF,MAAMO,OAAO,GAAG,IAAAC,mBAAU,EAACL,KAAK,CAAC;IAEjC,MAAM;MAAEM,QAAQ;MAAEC;IAAK,CAAC,GAAGhB,eAAe,CAAC;MACvCS,KAAK;MACLJ,KAAK;MACLD,GAAG;MACHS;IACJ,CAAC,CAAC;IAEFH,MAAM,CAACO,KAAK,CAACV,KAAK,EAAE;MAChBW,IAAI,EAAET,KAAK,CAACA,KAAK,CAACU,OAAO;MACzBJ,QAAQ;MACRC,IAAI;MACJX,KAAK;MACLQ;IACJ,CAAC,CAAC;EACN,CAAC;AACL,CAAC;AAAC"}

package/operations/entry/elasticsearch/filtering/exec.js

@@ -1,51 +1,37 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createExecFiltering = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _search = require("../plugins/search");
-
 var _operator = require("../plugins/operator");
-
 var _initialQuery = require("../initialQuery");
-
 var _apiElasticsearch = require("@webiny/api-elasticsearch");
-
 var _values = require("./values");
-
 var _populated = require("./populated");
-
 var _applyFiltering = require("./applyFiltering");
-
 var _CmsEntryFilterPlugin = require("../../../../plugins/CmsEntryFilterPlugin");
-
 var _assignMinimumShouldMatchToQuery = require("../assignMinimumShouldMatchToQuery");
-
 const createExecFiltering = params => {
   const {
     fields,
     plugins,
     model
   } = params;
+
   /**
    * We need the search plugins as key -> plugin value, so it is easy to find plugin we need, without iterating through array.
    */
-
   const searchPlugins = (0, _search.createSearchPluginList)({
     plugins
   });
   /**
    * We need the operator plugins, which we execute on our where conditions.
    */
-
   const operatorPlugins = (0, _operator.createOperatorPluginList)({
     plugins,
     locale: model.locale
@@ -58,19 +44,15 @@ const createExecFiltering = params => {
     collection[plugin.fieldType] = plugin;
     return collection;
   }, {});
-
   const getFilterPlugin = type => {
     const plugin = filteringPlugins[type] || filteringPlugins["*"];
-
     if (plugin) {
       return plugin;
     }
-
     throw new _error.default(`There is no filtering plugin for the given field type "${type}".`, "FILTERING_PLUGIN_ERROR", {
       type
     });
   };
-
   const execFiltering = params => {
     const {
       where: initialWhere,
@@ -79,63 +61,50 @@ const createExecFiltering = params => {
     /**
      * No point in continuing if no "where" conditions exist.
      */
-
     const keys = Object.keys(initialWhere);
-
     if (keys.length === 0) {
       return;
     }
-
     const where = (0, _objectSpread2.default)({}, initialWhere);
-
     for (const key in where) {
       const value = where[key];
       /**
        * We always skip if no value is defined.
        * Only skip undefined value, null is valid.
        */
-
       if (value === undefined) {
         continue;
-      } //
-
+      }
+      //
       /**
        * When we are running with AND, the "value" MUST be an array.
-       */
-      else if (key === "AND") {
+       */else if (key === "AND") {
         const childWhereList = (0, _values.getWhereValues)(value, "AND");
         const childQuery = (0, _initialQuery.createBaseQuery)();
-
         for (const childWhere of childWhereList) {
           execFiltering({
             query: childQuery,
             where: childWhere
           });
         }
-
         const childQueryBool = (0, _populated.getPopulated)(childQuery);
-
         if (Object.keys(childQueryBool).length === 0) {
           continue;
         }
-
         query.filter.push({
           bool: childQueryBool
         });
         continue;
-      } //
-
+      }
+      //
       /**
        * When we are running with OR, the "value" must be an array.
-       */
-      else if (key === "OR") {
+       */else if (key === "OR") {
         const childWhereList = (0, _values.getWhereValues)(value, "OR");
         /**
          * Each of the conditions MUST produce it's own should section.
          */
-
         const should = [];
-
         for (const childWhere of childWhereList) {
           const childQuery = (0, _initialQuery.createBaseQuery)();
           execFiltering({
@@ -143,58 +112,48 @@ const createExecFiltering = params => {
             where: childWhere
           });
           const childQueryBool = (0, _populated.getPopulated)(childQuery);
-
           if (Object.keys(childQueryBool).length === 0) {
             continue;
           }
-
           should.push({
             bool: childQueryBool
           });
         }
-
         if (should.length === 0) {
           continue;
         }
-
         query.should.push(...should);
         /**
          * If there are any should, minimum to have is 1.
          * Of course, do not override if it's already set.
          */
-
         (0, _assignMinimumShouldMatchToQuery.assignMinimumShouldMatchToQuery)({
           query
         });
         continue;
       }
-
       const {
         field: whereFieldId,
         operator
       } = (0, _apiElasticsearch.parseWhereKey)(key);
       let fieldId = whereFieldId;
+
       /**
        * TODO This will be required until the storage operations receive the fieldId instead of field storageId.
        * TODO For this to work without field searching, we need to refactor how the query looks like.
        *
        * Storage operations should NEVER receive an field storageId, only alias - fieldId.
        */
-
       const cmsModelField = model.fields.find(f => f.fieldId === fieldId);
-
       if (!cmsModelField && !fields[fieldId]) {
-        throw new _error.default(`There is no CMS Model Field field "${fieldId}".`);
+        throw new _error.default(`There is no CMS Model Field "${fieldId}".`);
       } else if (cmsModelField) {
         fieldId = cmsModelField.fieldId;
       }
-
       const field = fields[fieldId];
-
       if (!field) {
         throw new _error.default(`There is no field "${fieldId}".`);
       }
-
       const filterPlugin = getFilterPlugin(field.type);
       filterPlugin.exec({
         applyFiltering,
@@ -208,8 +167,6 @@ const createExecFiltering = params => {
       });
     }
   };
-
   return execFiltering;
 };
-
 exports.createExecFiltering = createExecFiltering;