@truedat/core 5.9.2 → 5.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "5.9.2",
+  "version": "5.9.3",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -35,7 +35,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "5.9.2",
+    "@truedat/test": "5.9.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -117,5 +117,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "ba5871e60ce56d909e08e0ec304f9b9c6a30ca1c"
+  "gitHead": "703abeeedf1ca0f6ecbc09c9633178e9dcd83e20"
 }

package/src/selectors/__tests__/makeSearchQuerySelector.spec.js

@@ -14,17 +14,17 @@ describe("selectors: makeSearchQuerySelector", () => {
     it("should omit filters for which no values are active", () => {
       const state = { conceptQuery, conceptActiveFilters };
       expect(searchQuerySelector(state)).toMatchObject({
-        filters: { foo: ["foo1"] }
+        must: { foo: ["foo1"] },
       });
     });
 
     it("should sort by name", () => {
       const state = {
         conceptQuery: { ...conceptQuery, sort: [{ "name.raw": "asc" }] },
-        conceptActiveFilters
+        conceptActiveFilters,
       };
       expect(searchQuerySelector(state)).toMatchObject({
-        sort: [{ "name.raw": "asc" }]
+        sort: [{ "name.raw": "asc" }],
       });
     });
 
@@ -41,7 +41,7 @@ describe("selectors: makeSearchQuerySelector", () => {
     it("should trim the query string", () => {
       const state = { conceptQuery, conceptActiveFilters };
       expect(searchQuerySelector(state)).toMatchObject({
-        query: "to be trimmed"
+        query: "to be trimmed",
       });
     });
 
@@ -54,12 +54,12 @@ describe("selectors: makeSearchQuerySelector", () => {
       const state = {
         conceptQuery: {
           ...conceptQuery,
-          sort: [{ _score: "desc" }, { "name.raw": "asc" }]
+          sort: [{ _score: "desc" }, { "name.raw": "asc" }],
         },
-        conceptActiveFilters
+        conceptActiveFilters,
       };
       expect(searchQuerySelector(state)).toMatchObject({
-        sort: [{ _score: "desc" }, { "name.raw": "asc" }]
+        sort: [{ _score: "desc" }, { "name.raw": "asc" }],
       });
     });
   });
@@ -72,13 +72,13 @@ describe("selectors: makeSearchQuerySelector", () => {
       name: "updated_at",
       type: "since",
       value: "1",
-      unit: "d"
+      unit: "d",
     };
     const state = { conceptQuery, conceptActiveFilters, dateFilter };
 
     it("includes the date filter and active filters", () => {
       expect(searchQuerySelector(state)).toMatchObject({
-        filters: { updated_at: { gte: "now-1d" }, foo: ["foo1"] }
+        must: { updated_at: { gte: "now-1d" }, foo: ["foo1"] },
       });
     });
   });

package/src/selectors/makeSearchQuerySelector.js

@@ -28,8 +28,8 @@ export const makeSearchFiltersSelector = (activeFiltersProp, dateFilterProp) =>
     prop(activeFiltersProp),
     makeDateFiltersSelector(dateFilterProp),
     (activeFilters, activeDateFilters) => {
-      const filters = omitBy(isEmpty)(activeFilters);
-      return { ...filters, ...activeDateFilters };
+      const must = omitBy(isEmpty)(activeFilters);
+      return { ...must, ...activeDateFilters };
     }
   );
 
@@ -51,12 +51,12 @@ export const makeSearchQuerySelector = (
       const filters = omitBy(isEmpty)(activeFilters);
       const q = trim(query)
         ? {
-            filters,
+            must: filters,
             query: trim(query),
             page: page - 1,
             sort: sort,
           }
-        : { filters, page: page - 1, sort: sort };
+        : { must: filters, page: page - 1, sort: sort };
       return getSearchPayload(q, ownProps);
     }
   );

package/src/services/__tests__/filters.spec.js

@@ -48,9 +48,9 @@ describe("services: filters", () => {
   describe("getSearchPayload", () => {
     const query = "foo";
     const page = 11;
-    const filters = { foo: ["foo1"] };
+    const must = { foo: ["foo1"] };
     const sort = "baz";
-    const searchQuery = { query, page, filters, sort };
+    const searchQuery = { query, page, must, sort };
     const defaultFilters = { bar: ["bar1"] };
     const linkable = true;
     const size = 1234;
@@ -63,7 +63,7 @@ describe("services: filters", () => {
           pageSize: size,
         })
       ).toEqual({
-        filters: { ...filters, ...defaultFilters },
+        must: { ...must, ...defaultFilters },
         only_linkable: true,
         page,
         query,
@@ -74,7 +74,7 @@ describe("services: filters", () => {
   });
 
   describe("isEmbedded", () => {
-    test("returns true iff item has name and id prop", () => {
+    test("returns true if item has name and id prop", () => {
       expect(isEmbedded({ id: 123, name: "foo" })).toBe(true);
       expect(isEmbedded(123)).toBe(false);
       expect(isEmbedded("123")).toBe(false);

package/src/services/filters.js

@@ -19,12 +19,12 @@ export const mergeFilters = _.mergeAllWith(filterCustomizer);
 
 export const getSearchPayload = (searchQuery, props) => {
   const { defaultFilters = {}, linkable, pageSize: size = 20 } = props;
-  const { query, page, filters: userFilters, sort } = searchQuery;
+  const { query, page, must: userFilters, sort } = searchQuery;
   const filters = mergeFilters([defaultFilters, userFilters]);
   return _.assignAll([
     {},
     linkable ? { only_linkable: true } : {},
-    { filters, query, page, size, sort },
+    { must: filters, query, page, size, sort },
   ]);
 };