@truedat/core 8.9.0 → 8.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "8.9.0",
+  "version": "8.10.0",
   "description": "Truedat Web Core",
   "sideEffects": [
     "**/*.css",
@@ -54,7 +54,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.9.0",
+    "@truedat/test": "8.10.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -95,5 +95,5 @@
     "swr": "^2.3.3",
     "turndown": "^7.2.2"
   },
-  "gitHead": "beff9d7e01556d63d42e54c9f7b641503ee658b2"
+  "gitHead": "f18f60e317c52a90197068ed60908966ca7f58f0"
 }

package/src/search/SearchContext.js

@@ -34,6 +34,10 @@ export const SearchContextProvider = (props) => {
   const omitFilters = _.propOr([], "omitFilters")(props);
   const translations = _.propOr(() => ({}), "translations")(props);
   const filtersGroup = _.propOr([], "filtersGroup")(props);
+  const searchFiltersPropsMapping = _.propOr(
+    {},
+    "searchFiltersPropsMapping",
+  )(props);
   const enrichSearchPayload = useState(_.prop("enrichSearchPayload")(props))[0];
 
   const { formatMessage } = useIntl();
@@ -47,7 +51,8 @@ export const SearchContextProvider = (props) => {
   const [activeFilterName, setActiveFilterName] = useState([]);
   const [allActiveFilters, setAllActiveFilters] =
     useState(initialActiveFilters);
-  const [hiddenFilters, setHiddenFilters] = useState({});
+  const initialHiddenFilters = _.propOr({}, "initialHiddenFilters")(props);
+  const [hiddenFilters, setHiddenFilters] = useState(initialHiddenFilters);
   const [dateFilters, setDateFilters] = useState({});
   const [toggleDateFilter, setToggleDateFilter] = useState(false);
   const [defaultFilters, setDefaultFilters] = useState(initialDefaultFilters);
@@ -147,7 +152,16 @@ export const SearchContextProvider = (props) => {
   const filters = _.flow(
     _.propOr({}, "data"),
     _.omit(omitFilters),
-    _.omitBy(_.flow(_.propOr([], "values"), (values) => _.size(values) < 2)),
+    _.omitBy(
+      _.cond([
+        [_.matches({ type: "search" }), _.stubFalse],
+        [
+          _.flow(_.propOr([], "values"), (values) => _.size(values) < 2),
+          _.stubTrue,
+        ],
+        [_.stubTrue, _.stubFalse],
+      ]),
+    ),
   )(filtersPayload);
 
   const allFilters = _.flow(
@@ -320,6 +334,8 @@ export const SearchContextProvider = (props) => {
         sortDirection === "ascending" ? "descending" : "ascending",
       );
     }
+
+    setPage(1);
   };
 
   const setQueryAndScoreSort = (query) => {
@@ -388,6 +404,7 @@ export const SearchContextProvider = (props) => {
     userFiltersType,
     userFilterScope,
     useDomainSearchFilter,
+    searchFiltersPropsMapping,
 
     setOnSearchChange,
   };

package/src/search/SearchSelectedFilters.js

@@ -2,7 +2,9 @@ import _ from "lodash/fp";
 import { useState } from "react";
 import { FormattedMessage } from "react-intl";
 import { useLocation } from "react-router";
+import { useDispatch } from "react-redux";
 import DomainSearchFilter from "../components/DomainSearchFilter";
+import SearchFilterDropdown from "../components/SearchFilterDropdown";
 import ModalSaveFilter from "./ModalSaveFilter";
 import UserFilters from "./UserFilters";
 import FilterDropdown from "./FilterDropdown";
@@ -15,6 +17,7 @@ const MIN_LENGTH_FOR_QUERY_DROPDOWN = 8;
 
 export default function SearchSelectedFilters() {
   const context = useSearchContext();
+  const dispatch = useDispatch();
   const {
     selectedFilters,
     resetFilters,
@@ -23,6 +26,7 @@ export default function SearchSelectedFilters() {
     activeFilterValues,
     userFiltersType,
     useDomainSearchFilter,
+    searchFiltersPropsMapping,
   } = context;
   const [selectedUserFilter, setSelectedUserFilter] = useState();
   const { pathname } = useLocation();
@@ -75,6 +79,20 @@ export default function SearchSelectedFilters() {
                     )
                   ) : filterType === "hierarchy" ? (
                     <HierarchyFilterDropdown />
+                  ) : filterType === "search" &&
+                    _.prop(filter)(searchFiltersPropsMapping) ? (
+                    <SearchFilterDropdown
+                      filter={filter}
+                      loading={context.loadingFilters}
+                      openFilter={context.openFilter}
+                      closeFilter={context.closeFilter}
+                      removeFilter={context.removeFilter}
+                      toggleFilterValue={context.toggleFilterValue}
+                      activeValues={context.activeFilterSelectedValues}
+                      open={_.isEqual(filter, activeFilterName)}
+                      searchFilterDispacher={(action) => dispatch(action)}
+                      {..._.prop(filter)(searchFiltersPropsMapping)}
+                    />
                   ) : _.size(options) >= MIN_LENGTH_FOR_QUERY_DROPDOWN ? (
                     <FilterQueryDropdown />
                   ) : (

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

@@ -311,6 +311,38 @@ describe("<SearchContextProvider />", () => {
     jest.useRealTimers();
   });
 
+  it("keeps search type filters without values in available filters", async () => {
+    jest.useFakeTimers();
+    const triggerFiltersSpy = jest.fn().mockReturnValue({
+      then: (callback) =>
+        callback({
+          data: {
+            data: {
+              status: { type: "term", values: ["draft", "published"] },
+              linked_structures_ids: { type: "search", index: "structures" },
+            },
+          },
+        }),
+    });
+    const useFiltersSpy = () => ({ trigger: triggerFiltersSpy });
+
+    const rendered = render(
+      <SearchContextProvider {...searchProps} useFilters={useFiltersSpy}>
+        <ContextConsumer onSearchChangeSpy={jest.fn()} />
+      </SearchContextProvider>,
+      renderOpts,
+    );
+
+    jest.runAllTimers();
+
+    await waitFor(() =>
+      expect(
+        rendered.getByText(/available:\["status","linked_structures_ids"\]/i),
+      ).toBeInTheDocument(),
+    );
+    jest.useRealTimers();
+  });
+
   it("handles active and hidden filter toggles and removals", async () => {
     jest.useFakeTimers();
     const user = userEvent.setup({

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

@@ -53,6 +53,17 @@ jest.mock("../HierarchyFilterDropdown", () => ({
   default: () => <div data-testid="hierarchy-filter-dropdown" />,
 }));
 
+jest.mock("../../components/SearchFilterDropdown", () => ({
+  __esModule: true,
+  default: ({ filter, placeholder }) => (
+    <div
+      data-testid="search-filter-dropdown"
+      data-filter={filter}
+      data-placeholder={placeholder}
+    />
+  ),
+}));
+
 jest.mock("../../components/DomainSearchFilter", () => ({
   __esModule: true,
   default: ({ filter, options }) => (