@truedat/core 7.2.3 → 7.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "7.2.3",
+  "version": "7.2.5",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -36,7 +36,7 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "7.2.3",
+    "@truedat/test": "7.2.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -118,5 +118,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "1f8b6f4d6fbd6e278493c35885e540c14f9c551b"
+  "gitHead": "1f3cfdc8ebc43228b46b00bf690c2bf963d368d5"
 }

package/src/search/SearchContext.js

@@ -214,7 +214,8 @@ export const SearchContextProvider = (props) => {
 
     const filterParam = {
       ...(!_.isEmpty(query) && { query }),
-      must: filterMust,
+      must: getMustFilters(filterMust),
+      must_not: getMustNotFilters(filterMust),
     };
     debouncedTriggerSearchFilters(filterParam);
   }, [query, filterMust]);
@@ -226,7 +227,8 @@ export const SearchContextProvider = (props) => {
 
     const filterParam = {
       ...(!_.isEmpty(query) && { query }),
-      must: searchMust,
+      must: getMustFilters(searchMust),
+      must_not: getMustNotFilters(searchMust),
       ...enrichSearchPayload,
       sort,
       page: page - 1,
@@ -245,6 +247,15 @@ export const SearchContextProvider = (props) => {
     enrichSearchPayload,
   ]);
 
+  const getMustFilters = (filters) =>
+    _.pickBy((value, key) => !key.startsWith("mustnot."))(filters);
+
+  const getMustNotFilters = (filters) =>
+    _.flow(
+      _.pickBy((value, key) => key.startsWith("mustnot.")),
+      _.mapKeys((key) => key.replace("mustnot.", ""))
+    )(filters);
+
   const makeFiltersGroup = (filters, groups) =>
     _.flow(
       _.groupBy((filter) =>

package/src/search/__tests__/SearchContext.spec.js

@@ -0,0 +1,76 @@
+import React from "react";
+import { render } from "@truedat/test/render";
+import { SearchContextProvider } from "@truedat/core/search/SearchContext";
+
+jest.mock("react-router-dom", () => ({
+  ...jest.requireActual("react-router-dom"),
+  useLocation: jest.fn(),
+}));
+
+const useFilters = () => ({
+  trigger: () => ({
+    then: (callback) =>
+      callback({
+        data: [],
+      }),
+  }),
+});
+
+const useSearch = () => ({
+  trigger: () => ({
+    then: (callback) =>
+      callback({
+        data,
+        headers: {},
+      }),
+  }),
+});
+
+const data = {
+  data: [
+    {
+      id: 1,
+      name: "concept",
+      status: "draft",
+      last_change_at: "2020-01-01T00:00:00.000Z",
+    },
+  ],
+};
+
+const searchProps = {
+  initialSortColumn: "name.raw",
+  initialSortDirection: "ascending",
+  useSearch: useSearch,
+  useFilters: useFilters,
+  userFiltersType: "business_concept_user_filters",
+  omitFilters: [],
+  translations: jest.fn(),
+};
+
+const renderOpts = {
+  messages: {
+    en: {
+      "concepts.props.type": "Type",
+      "concepts.props.name": "Term",
+    },
+  },
+};
+
+describe("<SearchContextProvider />", () => {
+  const ChildComponent = () => <div>Child Component</div>;
+
+  it(`matches the latest snapshot`, async () => {
+    jest
+      .spyOn(require("react-router-dom"), "useLocation")
+      .mockReturnValue({ pathname: "/concepts" });
+
+    const { container, findByText } = render(
+      <SearchContextProvider {...searchProps} defaultFilters={{}}>
+        <ChildComponent />
+      </SearchContextProvider>,
+      renderOpts
+    );
+    await findByText(/Child Component/);
+    expect(container).toMatchSnapshot();
+  });
+});

package/src/search/__tests__/__snapshots__/SearchContext.spec.js.snap

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<SearchContextProvider /> matches the latest snapshot 1`] = `
+<div>
+  <div>
+    Child Component
+  </div>
+</div>
+`;