@webiny/api-headless-cms-ddb-es 5.19.1 → 5.20.0-beta.0

package/elasticsearch/search/refSearch.js

@@ -7,10 +7,15 @@ exports.createRefSearchPlugin = void 0;
 
 var _CmsEntryElasticsearchQueryBuilderValueSearchPlugin = require("../../plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin");
 
-const createPath = params => {
-  const value = `${params.value || ""}`;
-  const target = value && value.includes("#") ? "id" : "entryId";
-  return `${params.field.fieldId}.${target}`;
+const createPath = ({
+  field,
+  key
+}) => {
+  if (key && key.match("entryId") === null) {
+    return `${field.fieldId}.id`;
+  }
+
+  return `${field.fieldId}.entryId`;
 };
 
 const transform = params => {

package/helpers/createElasticsearchQueryBody.js

@@ -63,6 +63,7 @@ const createElasticsearchSortParams = args => {
       searchable: modelField.isSearchable,
       field: modelField.field.fieldId,
       path: createFieldPath({
+        key: modelField.field.fieldId,
         parentPath,
         modelField,
         searchPlugin
@@ -144,14 +145,16 @@ const createInitialQueryValue = args => {
 const createFieldPath = ({
   modelField,
   searchPlugin,
-  parentPath
+  parentPath,
+  key
 }) => {
   let path;
 
   if (searchPlugin && typeof searchPlugin.createPath === "function") {
     path = searchPlugin.createPath({
       field: modelField.field,
-      value: null
+      value: null,
+      key
     });
   } else if (typeof modelField.path === "function") {
     path = modelField.path(modelField.field.fieldId);
@@ -222,7 +225,8 @@ const fieldPathFactory = params => {
     modelField,
     value,
     parentPath,
-    keyword
+    keyword,
+    key
   } = params;
   const field = modelField.field;
   let fieldPath;
@@ -230,7 +234,8 @@ const fieldPathFactory = params => {
   if (plugin) {
     fieldPath = plugin.createPath({
       field,
-      value
+      value,
+      key
     });
   }
 
@@ -256,6 +261,7 @@ const applyFiltering = params => {
     query,
     modelField,
     operator,
+    key,
     value: initialValue,
     operatorPlugins,
     searchPlugins,
@@ -281,14 +287,16 @@ const applyFiltering = params => {
       plugin: fieldSearchPlugin,
       modelField,
       parentPath: modelField.isSystemField ? null : parentPath,
-      value
+      value,
+      key
     }),
     path: fieldPathFactory({
       plugin: fieldSearchPlugin,
       modelField,
       value,
       parentPath: modelField.isSystemField ? null : parentPath,
-      keyword
+      keyword,
+      key
     }),
     value,
     keyword
@@ -381,6 +389,7 @@ const execElasticsearchBuildQueryPlugins = params => {
           query,
           modelField,
           operator,
+          key: whereKey,
           value: where[key][whereKey],
           searchPlugins,
           operatorPlugins,
@@ -395,6 +404,7 @@ const execElasticsearchBuildQueryPlugins = params => {
       query,
       modelField,
       operator,
+      key,
       value: where[key],
       searchPlugins,
       operatorPlugins,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-ddb-es",
-	"version": "5.19.1",
+	"version": "5.20.0-beta.0",
 	"main": "index.js",
 	"keywords": [
 		"@webiny/api-headless-cms",
@@ -23,15 +23,15 @@
 	"license": "MIT",
 	"dependencies": {
 		"@babel/runtime": "7.16.3",
-		"@webiny/api-headless-cms": "5.19.1",
-		"@webiny/api-upgrade": "5.19.1",
-		"@webiny/db-dynamodb": "5.19.1",
-		"@webiny/error": "5.19.1",
-		"@webiny/handler": "5.19.1",
-		"@webiny/handler-aws": "5.19.1",
-		"@webiny/handler-db": "5.19.1",
-		"@webiny/plugins": "5.19.1",
-		"@webiny/utils": "5.19.1",
+		"@webiny/api-headless-cms": "5.20.0-beta.0",
+		"@webiny/api-upgrade": "5.20.0-beta.0",
+		"@webiny/db-dynamodb": "5.20.0-beta.0",
+		"@webiny/error": "5.20.0-beta.0",
+		"@webiny/handler": "5.20.0-beta.0",
+		"@webiny/handler-aws": "5.20.0-beta.0",
+		"@webiny/handler-db": "5.20.0-beta.0",
+		"@webiny/plugins": "5.20.0-beta.0",
+		"@webiny/utils": "5.20.0-beta.0",
 		"dataloader": "2.0.0",
 		"dynamodb-toolbox": "0.3.5",
 		"jsonpack": "1.1.5",
@@ -47,10 +47,10 @@
 		"@elastic/elasticsearch": "7.12.0",
 		"@shelf/jest-elasticsearch": "^1.0.0",
 		"@types/jsonpack": "^1.1.0",
-		"@webiny/api-dynamodb-to-elasticsearch": "^5.19.1",
-		"@webiny/api-elasticsearch": "^5.19.1",
-		"@webiny/cli": "^5.19.1",
-		"@webiny/project-utils": "^5.19.1",
+		"@webiny/api-dynamodb-to-elasticsearch": "^5.20.0-beta.0",
+		"@webiny/api-elasticsearch": "^5.20.0-beta.0",
+		"@webiny/cli": "^5.20.0-beta.0",
+		"@webiny/project-utils": "^5.20.0-beta.0",
 		"jest": "^26.6.3",
 		"jest-dynalite": "^3.2.0",
 		"jest-environment-node": "^26.6.2",
@@ -69,5 +69,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "1424145d10add470e70fba9c44225656894e0028"
+	"gitHead": "2de02bc113e15e3ffa8e1d82deb9d27417787188"
 }

package/plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin.d.ts

@@ -2,6 +2,7 @@ import { Plugin } from "@webiny/plugins/Plugin";
 import { CmsModelField } from "@webiny/api-headless-cms/types";
 export interface CreatePathCallableParams<T = any> {
     field: CmsModelField;
+    key: string;
     value: T;
 }
 export interface CreatePathCallable<T = any> {