@truedat/core 4.40.9 → 4.40.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## [4.40.10] 2022-03-21
4
+
5
+ ### Changed
6
+
7
+ - [TD-4447] Default message for filters now strips any prefix
8
+
3
9
  ## [4.40.0] 2022-03-07
4
10
 
5
11
  ### Changed
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@truedat/core",
3
- "version": "4.40.9",
3
+ "version": "4.40.10",
4
4
  "description": "Truedat Web Core",
5
5
  "sideEffects": false,
6
6
  "jsnext:main": "src/index.js",
@@ -32,7 +32,7 @@
32
32
  "@babel/plugin-transform-modules-commonjs": "^7.15.0",
33
33
  "@babel/preset-env": "^7.15.0",
34
34
  "@babel/preset-react": "^7.14.5",
35
- "@truedat/test": "4.40.9",
35
+ "@truedat/test": "4.40.10",
36
36
  "babel-jest": "^27.0.6",
37
37
  "babel-plugin-dynamic-import-node": "^2.3.3",
38
38
  "babel-plugin-lodash": "^3.3.4",
@@ -106,5 +106,5 @@
106
106
  "react-dom": ">= 16.8.6 < 17",
107
107
  "semantic-ui-react": ">= 0.88.2 < 2.1"
108
108
  },
109
- "gitHead": "618928c0c77ccea1e95b9a6d3255ecf8cbed0c90"
109
+ "gitHead": "2a753ab01d2f856c32336cebc938b83f4bc97ea6"
110
110
  }
@@ -5,12 +5,14 @@ import { Dropdown } from "semantic-ui-react";
5
5
  import { FormattedMessage, useIntl } from "react-intl";
6
6
  import { i18nOrder } from "../services/sort";
7
7
 
8
+ const removePrefix = _.replace(/^.*\./, "");
9
+
8
10
  export const AvailableFilters = ({
9
11
  addFilter,
10
12
  disabled,
11
13
  filters,
12
14
  loading,
13
- resetFilters
15
+ resetFilters,
14
16
  }) => {
15
17
  const { formatMessage } = useIntl();
16
18
  return (
@@ -38,12 +40,12 @@ export const AvailableFilters = ({
38
40
  {_.flow(
39
41
  _.defaultTo([]),
40
42
  _.sortBy(i18nOrder(formatMessage, "filters")),
41
- _.map(filter => (
43
+ _.map((filter) => (
42
44
  <Dropdown.Item
43
45
  key={filter}
44
46
  text={formatMessage({
45
47
  id: `filters.${filter}`,
46
- defaultMessage: filter
48
+ defaultMessage: removePrefix(filter),
47
49
  })}
48
50
  onClick={() => addFilter({ filter })}
49
51
  />
@@ -59,7 +61,7 @@ AvailableFilters.propTypes = {
59
61
  disabled: PropTypes.bool,
60
62
  filters: PropTypes.array,
61
63
  resetFilters: PropTypes.func,
62
- loading: PropTypes.bool
64
+ loading: PropTypes.bool,
63
65
  };
64
66
 
65
67
  export default AvailableFilters;
@@ -4,9 +4,10 @@ import PropTypes from "prop-types";
4
4
  import { FormattedMessage } from "react-intl";
5
5
  import { Label, Icon, Dropdown, Dimmer, Loader } from "semantic-ui-react";
6
6
  import { accentInsensitivePathOrder } from "../services/sort";
7
-
8
7
  import FilterItem from "./FilterItem";
9
8
 
9
+ const removePrefix = _.replace(/^.*\./, "");
10
+
10
11
  export const FilterDropdown = ({
11
12
  activeValues,
12
13
  closeFilter,
@@ -25,7 +26,10 @@ export const FilterDropdown = ({
25
26
  upward={false}
26
27
  trigger={
27
28
  <Label key={filter}>
28
- <FormattedMessage id={`filters.${filter}`} defaultMessage={filter} />
29
+ <FormattedMessage
30
+ id={`filters.${filter}`}
31
+ defaultMessage={removePrefix(filter)}
32
+ />
29
33
  <Icon
30
34
  name="delete"
31
35
  onClick={(e) => {