@truedat/core 4.39.0 → 4.40.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.40.0] 2022-03-27
+
+### Changed
+
+- [TD-4491] Simplified `SelectedFilters` component and `formatFilterValues`
+  function
+
 ## [4.37.4] 2022-02-04
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.39.0",
+  "version": "4.40.0",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -106,5 +106,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "f3d2fe3fcdec546afc22d0a79c4f4f3dfb91ea48"
+  "gitHead": "0bd677584da73a5021a5c96f2e5525fde9a1958a"
 }

package/src/components/DateTime.js

@@ -3,11 +3,13 @@ import PropTypes from "prop-types";
 import Moment from "react-moment";
 
 export const DateTime = ({ value, className }) =>
-  value ? <Moment className={className} date={value} format="YYYY-MM-DD HH:mm" /> : null;
+  value ? (
+    <Moment className={className} date={value} format="YYYY-MM-DD HH:mm" />
+  ) : null;
 
 DateTime.propTypes = {
   value: PropTypes.string,
-  className: PropTypes.className,
+  className: PropTypes.string,
 };
 
 export default DateTime;

package/src/components/SelectedFilters.js

@@ -19,7 +19,7 @@ export const SelectedFilters = ({
   saveFilters,
   selectedFilter,
   selectedFilters,
-  selectedFilterActiveValues,
+  selectedFilterActiveValues: activeValues,
   selectedFilterValues,
   selectedUserFilter,
   toggleFilterValue,
@@ -40,36 +40,33 @@ export const SelectedFilters = ({
       />
     )}
     <div className="selectedFilters">
-      {!_.isEmpty(selectedFilters) && (
-        <div className="appliedFilters">
-          <FormattedMessage id="search.applied_filters" />
-        </div>
-      )}
-      {!_.isEmpty(selectedFilters) &&
-        selectedFilters.map((filter) => {
-          const filterOptions = _.isEqual(filter, selectedFilter)
-            ? selectedFilterValues
-            : null;
-          const props = {
-            key: filter,
-            activeValues: selectedFilterActiveValues,
-            closeFilter: closeFilter,
-            filter,
-            loading,
-            openFilter,
-            options: filterOptions,
-            removeFilter,
-            toggleFilterValue,
-            filterItemMapping,
-          };
-          return selectedFilter === "taxonomy" ? (
-            <FilterMultilevelDropdown {...props} />
-          ) : (
-            <FilterDropdown {...props} />
-          );
-        })}
-      {!_.isEmpty(selectedFilters) && (
+      {_.isEmpty(selectedFilters) ? null : (
         <>
+          <div className="appliedFilters">
+            <FormattedMessage id="search.applied_filters" />
+          </div>
+          {selectedFilters.map((filter) => {
+            const options = _.isEqual(filter, selectedFilter)
+              ? selectedFilterValues
+              : null;
+            const props = {
+              key: filter,
+              activeValues,
+              closeFilter,
+              filter,
+              loading,
+              openFilter,
+              options,
+              removeFilter,
+              toggleFilterValue,
+              filterItemMapping,
+            };
+            return selectedFilter === "taxonomy" ? (
+              <FilterMultilevelDropdown {...props} />
+            ) : (
+              <FilterDropdown {...props} />
+            );
+          })}
           <a className="resetFilters" onClick={() => resetFilters()}>
             <FormattedMessage id="search.clear_filters" />
           </a>

package/src/services/filters.js

@@ -28,17 +28,10 @@ export const getSearchPayload = (searchQuery, props) => {
   ]);
 };
 
-export const formatFilterValues = (selectedFilter) => (values) => {
-  if (selectedFilter === "taxonomy") {
-    const domains = _.flow(
-      _.map((domain) => ({ ...domain, parent_id: _.head(domain.parent_ids) })),
-      _.map(_.omit(["parent_ids"]))
-    )(values);
-    return getDomainSelectorOptions({ domains });
-  }
-
-  return values;
-};
+export const formatFilterValues = (selectedFilter) => (values) =>
+  selectedFilter === "taxonomy"
+    ? getDomainSelectorOptions({ domains: values })
+    : values;
 
 export const toFilterValues = (filterValues) =>
   _.map((v) => (_.isObject(v) ? v.id : v))(filterValues);