@truedat/core 8.10.6 → 8.10.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "8.10.6",
+  "version": "8.10.8",
   "description": "Truedat Web Core",
   "sideEffects": [
     "**/*.css",
@@ -57,7 +57,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.10.6",
+    "@truedat/test": "8.10.8",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -98,5 +98,5 @@
     "swr": "^2.3.3",
     "turndown": "^7.2.2"
   },
-  "gitHead": "62c2090512da9f1456724c7263c446c4a4115a7f"
+  "gitHead": "9b804ee6faf939b955894cba0ed43495781152c8"
 }

package/src/search/ModalSaveFilter.js

@@ -61,7 +61,7 @@ export const ModalSaveFilter = () => {
       },
     };
     saveFilters(requestData).then(() => {
-      mutateUserFilters(userFiltersType);
+      mutateUserFilters(userFiltersType, userFilterScope);
     });
   };
 

package/src/search/SearchContext.js

@@ -326,6 +326,8 @@ export const SearchContextProvider = (props) => {
   const handleSortSelection = (columnName) => {
     if (!columnName) return;
 
+    setPage(1);
+
     if (sortColumn !== columnName) {
       setSortColumn(columnName);
       setSortDirection("ascending");
@@ -339,6 +341,7 @@ export const SearchContextProvider = (props) => {
   };
 
   const setQueryAndScoreSort = (query) => {
+    setPage(1);
     setSortColumn(query == "" ? initialSortColumn : "_score");
     setSortDirection(query == "" ? initialSortDirection : "descending");
     setQuery(query);

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

@@ -1,9 +1,19 @@
 import userEvent from "@testing-library/user-event";
-import { render } from "@truedat/test/render";
+import { render, waitForLoad } from "@truedat/test/render";
 import messages from "@truedat/core/messages";
 import SearchContext from "@truedat/core/search/SearchContext";
 import ModalSaveFilter from "../ModalSaveFilter";
 
+const mockMutateUserFilters = jest.fn();
+const mockTrigger = jest.fn();
+
+jest.mock("../../hooks/useUserFilters", () => ({
+  mutateUserFilters: mockMutateUserFilters,
+  useUserFilters: jest.fn(),
+  useUserFiltersCreate: () => ({ trigger: mockTrigger }),
+  useUserFiltersDelete: jest.fn(),
+}));
+
 const renderOpts = {
   messages: {
     en: {
@@ -24,6 +34,11 @@ describe("<ModalSaveFilter /> admin", () => {
     userFilterScope: "filters_scope",
   };
 
+  beforeEach(() => {
+    mockMutateUserFilters.mockClear();
+    mockTrigger.mockReset();
+  });
+
   it("matches the latest snapshot", () => {
     const { container } = render(
       <SearchContext value={searchProps}>
@@ -44,4 +59,17 @@ describe("<ModalSaveFilter /> admin", () => {
     userEvent.click(await findByText(/save/i));
     expect(container).toMatchSnapshot();
   });
+
+  it("passes userFilterScope to mutateUserFilters so the GET cache is invalidated", () => {
+    const fs = require("fs");
+    const path = require("path");
+    const source = fs.readFileSync(
+      path.join(__dirname, "..", "ModalSaveFilter.js"),
+      "utf8",
+    );
+
+    expect(source).toMatch(
+      /mutateUserFilters\(\s*userFiltersType\s*,\s*userFilterScope\s*\)/,
+    );
+  });
 });

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

@@ -71,12 +71,14 @@ describe("<SearchContextProvider />", () => {
       handleSortSelection,
       removeFilter,
       removeHiddenFilter,
+      selectPage,
       sortColumn,
       sortDirection,
       toggleFilterValue,
       toggleHiddenFilterValue,
       setQuery,
       query,
+      page,
       setOnSearchChange,
     } = useSearchContext();
 
@@ -128,9 +130,13 @@ describe("<SearchContextProvider />", () => {
         </button>
         <button onClick={() => setQuery("abc")}>set-query</button>
         <button onClick={() => setQuery("")}>clean-query</button>
+        <button onClick={() => selectPage({ activePage: 3 })}>
+          go-to-page-3
+        </button>
         <div>{`sort-column:${sortColumn}`}</div>
         <div>{`sort-direction:${sortDirection}`}</div>
         <div>{`query:${query}`}</div>
+        <div>{`page:${page}`}</div>
         <div>{`available:${JSON.stringify(availableFilters)}`}</div>
         <div>{`active:${JSON.stringify(allActiveFilters)}`}</div>
         <div>{`hidden:${JSON.stringify(hiddenFilters)}`}</div>
@@ -481,6 +487,25 @@ describe("<SearchContextProvider />", () => {
       expect(rendered.getByText(/^query:$/i)).toBeInTheDocument(),
     );
     await waitFor(() => expect(onSearchChangeSpy).toHaveBeenCalled());
+
+    await user.click(rendered.getByText(/go-to-page-3/i));
+    await waitFor(() =>
+      expect(rendered.getByText(/page:3/i)).toBeInTheDocument(),
+    );
+    await user.click(rendered.getByText(/set-query/i));
+    await waitFor(() =>
+      expect(rendered.getByText(/page:1/i)).toBeInTheDocument(),
+    );
+
+    await user.click(rendered.getByText(/go-to-page-3/i));
+    await waitFor(() =>
+      expect(rendered.getByText(/page:3/i)).toBeInTheDocument(),
+    );
+    await user.click(rendered.getByText(/sort-status/i));
+    await waitFor(() =>
+      expect(rendered.getByText(/page:1/i)).toBeInTheDocument(),
+    );
+
     jest.useRealTimers();
   });
 });