@truedat/core 8.6.7 → 8.7.1

package/src/search/FilterMultilevelDropdown.js

@@ -34,7 +34,7 @@ export default function FilterMultilevelDropdown() {
 
   useEffect(() => {
     const activeOptions = _.filter((option) =>
-      _.includes(option.id)(activeFilterSelectedValues)
+      _.includes(option.id)(activeFilterSelectedValues),
     )(options);
 
     _.flow(
@@ -44,18 +44,18 @@ export default function FilterMultilevelDropdown() {
           option.id,
           ..._.map("id")(option.descendents),
         ],
-        []
+        [],
       ),
       _.uniq,
-      setSelected
+      setSelected,
     )(activeOptions);
     if (_.isEmpty(open) && _.isEmpty(displayed)) {
       const withAncestors = _.flow(
         _.reduce(
           (acc, option) => [...acc, ..._.map("id")(option.ancestors)],
-          []
+          [],
         ),
-        _.uniq
+        _.uniq,
       )(activeOptions);
       const newDisplayed = [..._.map("id")(activeOptions), ...withAncestors];
       !_.isEqual(open, withAncestors) && setOpen(withAncestors);
@@ -81,7 +81,7 @@ export default function FilterMultilevelDropdown() {
   const handleClick = (e, selection) => {
     const option = _.find({ id: selection })(options);
     const ancestorsToDelete = _.intersection(_.map("id")(option.ancestors))(
-      activeFilterSelectedValues
+      activeFilterSelectedValues,
     );
     if (!_.isEmpty(ancestorsToDelete)) {
       const active = _.union([selection])(activeFilterSelectedValues);
@@ -90,7 +90,7 @@ export default function FilterMultilevelDropdown() {
     } else if (_.includes(selection)(activeFilterSelectedValues)) {
       const descendents = _.map("id")(option.descendents);
       const value = _.without([selection, ...descendents])(
-        activeFilterSelectedValues
+        activeFilterSelectedValues,
       );
       toggleFilterValue({ filter, value });
     } else {
@@ -121,8 +121,8 @@ export default function FilterMultilevelDropdown() {
         (domain) =>
           match(domain.name, query) ||
           _.some((descendent) => match(descendent.name, query))(
-            domain.descendents
-          )
+            domain.descendents,
+          ),
       )(all);
     }
     return all;
@@ -130,7 +130,7 @@ export default function FilterMultilevelDropdown() {
 
   const filterDisplayed = (all) =>
     _.filter((domain) => domain.level == 0 || _.contains(domain.id)(displayed))(
-      all
+      all,
     );
 
   const filteredOptions = _.flow(filterSearch, filterDisplayed)(options);

package/src/search/FilterQueryDropdown.js

@@ -38,13 +38,13 @@ export default function FilterQueryDropdown() {
 
   useEffect(() => {
     const activeOptions = _.filter((option) =>
-      _.includes(option.value)(activeFilterSelectedValues)
+      _.includes(option.value)(activeFilterSelectedValues),
     )(options);
 
     _.flow(
       _.reduce((acc, option) => [...acc, option], []),
       _.uniq,
-      setSelected
+      setSelected,
     )(activeOptions);
   }, [activeFilterSelectedValues, options]);
 
@@ -57,7 +57,7 @@ export default function FilterQueryDropdown() {
   const filteredOptions = _.filter(
     (option) =>
       match(option.text, localQuery) &&
-      !_.includes(option.value)(activeFilterSelectedValues)
+      !_.includes(option.value)(activeFilterSelectedValues),
   )(sortedOptions);
 
   return (
@@ -126,7 +126,7 @@ export default function FilterQueryDropdown() {
             toggleFilterValue={toggleFilterValue}
             option={option}
             active={_.includes(_.prop("value")(option))(
-              activeFilterSelectedValues
+              activeFilterSelectedValues,
             )}
           />
         ))}

package/src/search/HierarchyFilterDropdown.js

@@ -18,7 +18,7 @@ const PopulatedHierarchyFilterDropdown = () => {
     _.first,
     _.prop("value"),
     (value) => value.split("_"),
-    _.first
+    _.first,
   )(options);
 
   const { data, error, loading: hierarchyLoading } = useHierarchy(hierarchyId);
@@ -30,29 +30,29 @@ const PopulatedHierarchyFilterDropdown = () => {
   const includedKeys = _.flow(
     _.map("value"),
     _.flatMap(getKeyAndParents(hierarchyOptions)),
-    _.uniq
+    _.uniq,
   )(options);
 
   const filterIncludedKeys = _.filter(({ key }) =>
-    _.includes(key)(includedKeys)
+    _.includes(key)(includedKeys),
   );
 
   const filteredChildren = _.flow(_.prop("children"), filterIncludedKeys);
 
   const filteredOptions = _.flow(
     filterIncludedKeys,
-    _.map((node) => ({ ...node, children: filteredChildren(node) }))
+    _.map((node) => ({ ...node, children: filteredChildren(node) })),
   )(hierarchyOptions);
 
   const idActiveValues = _.map((key) =>
-    _.flow(_.find({ key }), _.prop("id"))(filteredOptions)
+    _.flow(_.find({ key }), _.prop("id"))(filteredOptions),
   )(activeFilterSelectedValues);
 
   const handleToggleFilterValue = ({ filter, value }) => {
     const getChildrenKeys = (id) => {
       const { key, descendents } = _.flow(
         _.find({ id }),
-        _.pick(["key", "descendents"])
+        _.pick(["key", "descendents"]),
       )(filteredOptions);
       const descendentKeys = _.map("key")(descendents);
       return [key, ...descendentKeys];
@@ -61,7 +61,7 @@ const PopulatedHierarchyFilterDropdown = () => {
     const newValue = _.flow(
       _.flatMap(getChildrenKeys),
       _.uniq,
-      _.reject(_.isNil)
+      _.reject(_.isNil),
     )(value);
 
     toggleFilterValue({ filter, value: newValue });

package/src/search/SearchContext.js

@@ -68,7 +68,7 @@ export const SearchContextProvider = (props) => {
         setLoading(false);
       });
     }),
-    []
+    [],
   );
 
   const debouncedTriggerSearchFilters = useCallback(
@@ -78,7 +78,7 @@ export const SearchContextProvider = (props) => {
         setLoadingFilters(false);
       });
     }),
-    []
+    [],
   );
 
   useEffect(() => {
@@ -147,12 +147,12 @@ export const SearchContextProvider = (props) => {
   const filters = _.flow(
     _.propOr({}, "data"),
     _.omit(omitFilters),
-    _.omitBy(_.flow(_.propOr([], "values"), (values) => _.size(values) < 2))
+    _.omitBy(_.flow(_.propOr([], "values"), (values) => _.size(values) < 2)),
   )(filtersPayload);
 
   const allFilters = _.flow(
     _.propOr({}, "data"),
-    _.omit(omitFilters)
+    _.omit(omitFilters),
   )(filtersPayload);
 
   const availableFilters = _.flow(_.keys, _.without(selectedFilters))(filters);
@@ -163,18 +163,18 @@ export const SearchContextProvider = (props) => {
     ({ values, type }) => ({
       values: _.flow(
         _.concat(_.prop(activeFilterName)(allActiveFilters)),
-        _.uniq
+        _.uniq,
       )(values),
       type,
     }),
     formatFilterValues,
     _.map(makeOption(translations(formatMessage), activeFilterName)),
-    _.reject((item) => _.values(item).includes(undefined))
+    _.reject((item) => _.values(item).includes(undefined)),
   )(filters);
 
   const activeFilterSelectedValues = _.flow(
     _.propOr([], activeFilterName),
-    toFilterValues
+    toFilterValues,
   )(allActiveFilters);
 
   const [customSearchMust, setCustomSearchMust] = useState({});
@@ -193,7 +193,7 @@ export const SearchContextProvider = (props) => {
       dateFilters,
       hiddenFilters,
       customSearchMust,
-    ]
+    ],
   );
 
   const filterMust = useMemo(
@@ -202,11 +202,11 @@ export const SearchContextProvider = (props) => {
       ...hiddenFilters,
       ..._.flow(
         _.pickBy(_.negate(_.isEmpty)),
-        _.omit(activeFilterName)
+        _.omit(activeFilterName),
       )(allActiveFilters),
     }),
 
-    [allActiveFilters, activeFilterName, defaultFilters, hiddenFilters]
+    [allActiveFilters, activeFilterName, defaultFilters, hiddenFilters],
   );
 
   const sort = useMemo(
@@ -214,7 +214,7 @@ export const SearchContextProvider = (props) => {
       sortColumn
         ? { [sortColumn]: sortDirection === "ascending" ? "asc" : "desc" }
         : null,
-    [sortColumn, sortDirection]
+    [sortColumn, sortDirection],
   );
 
   const triggerFilters = useFilters?.()?.trigger;
@@ -266,14 +266,14 @@ export const SearchContextProvider = (props) => {
   const getMustFilters = (filters) =>
     _.flow(
       _.pickBy((value, key) => !key.startsWith("mustnot.")),
-      _.mapKeys(mapDomainFilterKey)
+      _.mapKeys(mapDomainFilterKey),
     )(filters);
 
   const getMustNotFilters = (filters) =>
     _.flow(
       _.pickBy((value, key) => key.startsWith("mustnot.")),
       _.mapKeys((key) => key.replace("mustnot.", "")),
-      _.mapKeys(mapDomainFilterKey)
+      _.mapKeys(mapDomainFilterKey),
     )(filters);
 
   const makeFiltersGroup = (filters, groups) =>
@@ -281,14 +281,14 @@ export const SearchContextProvider = (props) => {
       _.groupBy((filter) =>
         _.flow(
           _.find(([_group, fields]) => _.contains(filter)(fields)),
-          _.prop("[0]")
-        )(groups)
+          _.prop("[0]"),
+        )(groups),
       ),
       _.toPairs,
       _.remove(([key, _value]) => {
         return _.startsWith("_")(key);
       }),
-      _.fromPairs
+      _.fromPairs,
     )(filters);
 
   const filtersByGroup = makeFiltersGroup(availableFilters, filtersGroup);
@@ -297,7 +297,7 @@ export const SearchContextProvider = (props) => {
     _.flow(
       _.prop("[0]"),
       (groupName) => _.prop(groupName)(filtersByGroup),
-      _.isEmpty
+      _.isEmpty,
     )(groups);
 
   const availableGroupedFilters = _.flow(
@@ -306,7 +306,7 @@ export const SearchContextProvider = (props) => {
     _.map(([groupName, _filters]) => [
       groupName,
       _.prop(groupName)(filtersByGroup),
-    ])
+    ]),
   )(filtersGroup);
 
   const handleSortSelection = (columnName) => {
@@ -317,7 +317,7 @@ export const SearchContextProvider = (props) => {
       setSortDirection("ascending");
     } else {
       setSortDirection(
-        sortDirection === "ascending" ? "descending" : "ascending"
+        sortDirection === "ascending" ? "descending" : "ascending",
       );
     }
   };

package/src/search/SearchDateFilter.js

@@ -11,7 +11,9 @@ const SearchDateFilter = ({
   searchField = "updated_at",
   isGrantDateRange = false,
 }) => {
-  const dateFormatter = dateFilterFormatter(isGrantDateRange ? "grantDateFilter" : undefined);
+  const dateFormatter = dateFilterFormatter(
+    isGrantDateRange ? "grantDateFilter" : undefined,
+  );
 
   const { setDateFilters } = useSearchContext();
 
@@ -24,7 +26,15 @@ const SearchDateFilter = ({
 
   return active ? (
     <DateFilter
-      label={<FormattedMessage id={isGrantDateRange ? "filter.start_date_end_date" : "filter.updated_at"} />}
+      label={
+        <FormattedMessage
+          id={
+            isGrantDateRange
+              ? "filter.start_date_end_date"
+              : "filter.updated_at"
+          }
+        />
+      }
       name={searchField}
       onChange={onChangeDateFilter}
       defaultValues={defaultValues}

package/src/search/SearchFilters.js

@@ -65,7 +65,7 @@ export default function SearchFilters() {
                   })}
                   onClick={() => addFilter({ filter })}
                 />
-              ))
+              )),
             )(filters)}
           </Fragment>
         ))(availableGroupedFilters)}

package/src/search/SearchSelectedFilters.js

@@ -2,12 +2,12 @@ import _ from "lodash/fp";
 import { useState } from "react";
 import { FormattedMessage } from "react-intl";
 import { useLocation } from "react-router";
+import DomainSearchFilter from "../components/DomainSearchFilter";
 import ModalSaveFilter from "./ModalSaveFilter";
 import UserFilters from "./UserFilters";
 import FilterDropdown from "./FilterDropdown";
 import FilterQueryDropdown from "./FilterQueryDropdown";
 import FilterMultilevelDropdown from "./FilterMultilevelDropdown";
-import DomainSearchFilter from "../components/DomainSearchFilter";
 import HierarchyFilterDropdown from "./HierarchyFilterDropdown";
 import SearchContext, { useSearchContext } from "./SearchContext";
 

package/src/search/SearchWidget.js

@@ -6,7 +6,11 @@ import SearchSelectedFilters from "./SearchSelectedFilters";
 import { useSearchContext } from "./SearchContext";
 import SearchDateFilter from "./SearchDateFilter";
 
-export default function SearchWidget({ dateFilter = false, searchField, isGrantDateRange = false }) {
+export default function SearchWidget({
+  dateFilter = false,
+  searchField,
+  isGrantDateRange = false,
+}) {
   const { formatMessage } = useIntl();
 
   const {
@@ -29,7 +33,7 @@ export default function SearchWidget({ dateFilter = false, searchField, isGrantD
     name: "start_date,end_date",
     type: "range",
     rangeStart: "",
-    rangeEnd: "", 
+    rangeEnd: "",
   };
 
   const onClickSearchDateFilter = () => {

package/src/search/UserFilter.js

@@ -22,7 +22,7 @@ export const UserFilter = ({
 
   const { trigger: deleteUserFilter } = useUserFiltersDelete(
     userFilter.id,
-    userFiltersType
+    userFiltersType,
   );
 
   const handleDelete = () => {

package/src/search/UserFilters.js

@@ -13,7 +13,7 @@ import { ConfirmModal } from "../components/ConfirmModal";
 export const DeleteModal = ({ userFilter, userFiltersType, mutate }) => {
   const { trigger: deleteUserFilter } = useUserFiltersDelete(
     userFilter.id,
-    userFiltersType
+    userFiltersType,
   );
   const handleDelete = () => {
     deleteUserFilter().then(() => {
@@ -95,9 +95,9 @@ export const UserFilters = ({
 
   const sortedUserFilters = _.flow(
     _.filter(({ filters }) =>
-      _.isNull(domainId) ? true : showDomainFilter(filters)
+      _.isNull(domainId) ? true : showDomainFilter(filters),
     ),
-    _.orderBy(["is_global", "id"], ["desc", "asc"])
+    _.orderBy(["is_global", "id"], ["desc", "asc"]),
   )(userFilters);
 
   return _.isEmpty(userFilters) ? null : (
@@ -124,7 +124,7 @@ export const UserFilters = ({
                         setSelectedUserFilter(null);
                       } else {
                         setAllActiveFilters(
-                          _.propOr({}, "filters")(userFilter)
+                          _.propOr({}, "filters")(userFilter),
                         );
                         setSelectedUserFilter(userFilter.name);
                       }

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

@@ -28,7 +28,7 @@ describe("<FilterDropdown/>", () => {
     const rendered = render(
       <SearchContext value={searchProps}>
         <FilterDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
@@ -38,7 +38,7 @@ describe("<FilterDropdown/>", () => {
     const rendered = render(
       <SearchContext value={searchProps}>
         <FilterDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
     expect(rendered.queryByRole("textbox")).not.toBeInTheDocument();
@@ -91,7 +91,7 @@ describe("<FilterDropdown/>", () => {
     const rendered = render(
       <SearchContext value={searchProps}>
         <FilterDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
     userEvent.click(rendered.container.querySelector('[class="delete icon"]'));

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

@@ -27,7 +27,7 @@ describe("<FilterQueryDropdown/>", () => {
     const rendered = render(
       <SearchContext value={searchProps}>
         <FilterQueryDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
@@ -37,11 +37,11 @@ describe("<FilterQueryDropdown/>", () => {
     const rendered = render(
       <SearchContext value={searchProps}>
         <FilterQueryDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
     const searchInput = rendered.container.querySelector(
-      ".search input[type='text']"
+      ".search input[type='text']",
     );
     expect(searchInput).toBeInTheDocument();
   });
@@ -52,7 +52,7 @@ describe("<FilterQueryDropdown/>", () => {
     const rendered = render(
       <SearchContext value={searchProps}>
         <FilterQueryDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
 
@@ -60,7 +60,7 @@ describe("<FilterQueryDropdown/>", () => {
 
     expect(searchProps.toggleFilterValue).toBeCalledTimes(0);
     await user.click(
-      rendered.getByRole("option", { name: new RegExp(selectedOption, "i") })
+      rendered.getByRole("option", { name: new RegExp(selectedOption, "i") }),
     );
     expect(searchProps.toggleFilterValue).toBeCalledWith({
       filter: searchProps.filter,
@@ -74,11 +74,11 @@ describe("<FilterQueryDropdown/>", () => {
     rendered.rerender(
       <SearchContext value={rerenderProps}>
         <FilterQueryDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
 
     expect(
-      within(rendered.getAllByRole("option")[0]).queryByText(selectedOption)
+      within(rendered.getAllByRole("option")[0]).queryByText(selectedOption),
     ).not.toBeNull();
   });
 
@@ -88,18 +88,18 @@ describe("<FilterQueryDropdown/>", () => {
     const rendered = render(
       <SearchContext value={searchProps}>
         <FilterQueryDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
 
     const input = rendered.container.querySelector(
-      ".search input[type='text']"
+      ".search input[type='text']",
     );
 
     expect(
       rendered.getByRole("option", {
         name: new RegExp(searchProps.options[1].text, "i"),
-      })
+      }),
     ).toBeInTheDocument();
 
     const user = userEvent.setup({ delay: null });
@@ -108,11 +108,11 @@ describe("<FilterQueryDropdown/>", () => {
     expect(
       rendered.queryByRole("option", {
         name: new RegExp(searchProps.options[1].text, "i"),
-      })
+      }),
     ).toBeNull();
 
     expect(
-      within(rendered.getByRole("option")).getByText(`value${searchText}`)
+      within(rendered.getByRole("option")).getByText(`value${searchText}`),
     ).toBeInTheDocument();
 
     expect(rendered.getAllByRole("option").length).toBe(1);
@@ -131,29 +131,31 @@ describe("<FilterQueryDropdown/>", () => {
     const rendered = render(
       <SearchContext value={customProps}>
         <FilterQueryDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
 
     const input = rendered.container.querySelector(
-      ".search input[type='text']"
+      ".search input[type='text']",
     );
 
     const user = userEvent.setup({ delay: null });
     await user.type(input, searchText);
 
     expect(
-      within(rendered.getAllByRole("option")[0]).getByText(selectedOption)
+      within(rendered.getAllByRole("option")[0]).getByText(selectedOption),
     ).toBeInTheDocument();
 
     expect(
-      within(rendered.getAllByRole("option")[1]).getByText(`value${searchText}`)
+      within(rendered.getAllByRole("option")[1]).getByText(
+        `value${searchText}`,
+      ),
     ).toBeInTheDocument();
 
     expect(
       rendered.queryByRole("option", {
         name: new RegExp(customProps.options[1].text, "i"),
-      })
+      }),
     ).toBeNull();
 
     expect(rendered.getAllByRole("option").length).toBe(2);
@@ -208,7 +210,7 @@ describe("<FilterQueryDropdown/>", () => {
     const rendered = render(
       <SearchContext value={searchProps}>
         <FilterQueryDropdown />
-      </SearchContext>
+      </SearchContext>,
     );
     await waitForLoad(rendered);
 

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

@@ -29,7 +29,7 @@ describe("<ModalSaveFilter /> admin", () => {
       <SearchContext value={searchProps}>
         <ModalSaveFilter />
       </SearchContext>,
-      renderOpts
+      renderOpts,
     );
     expect(container).toMatchSnapshot();
   });
@@ -39,7 +39,7 @@ describe("<ModalSaveFilter /> admin", () => {
       <SearchContext value={searchProps}>
         <ModalSaveFilter />
       </SearchContext>,
-      renderOpts
+      renderOpts,
     );
     userEvent.click(await findByText(/save/i));
     expect(container).toMatchSnapshot();