@truedat/core 4.46.12 → 4.47.2

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@truedat/core",
3
- "version": "4.46.12",
3
+ "version": "4.47.2",
4
4
  "description": "Truedat Web Core",
5
5
  "sideEffects": false,
6
6
  "jsnext:main": "src/index.js",
@@ -35,7 +35,7 @@
35
35
  "@testing-library/jest-dom": "^5.16.4",
36
36
  "@testing-library/react": "^12.0.0",
37
37
  "@testing-library/user-event": "^13.2.1",
38
- "@truedat/test": "4.46.12",
38
+ "@truedat/test": "4.47.2",
39
39
  "babel-jest": "^28.1.0",
40
40
  "babel-plugin-dynamic-import-node": "^2.3.3",
41
41
  "babel-plugin-lodash": "^3.3.4",
@@ -112,5 +112,5 @@
112
112
  "react-dom": ">= 16.8.6 < 17",
113
113
  "semantic-ui-react": ">= 0.88.2 < 2.1"
114
114
  },
115
- "gitHead": "97adb120fffb6392692f94ed99b5f74385ce0f0b"
115
+ "gitHead": "53cb62b57d41745cfcd4c0b90154a6cfcd168534"
116
116
  }
@@ -25,70 +25,61 @@ export const SelectedFilters = ({
25
25
  toggleFilterValue,
26
26
  userFilters,
27
27
  userFilterScope,
28
- }) => {
29
- useEffect(
30
- () => () => {
31
- resetFilters();
32
- },
33
- [resetFilters]
34
- );
35
-
36
- return (
37
- <>
38
- {_.isEmpty(userFilters) ? null : (
39
- <UserFilters
40
- applyUserFilter={applyUserFilter}
41
- userFilterScope={userFilterScope}
42
- deleteUserFilter={deleteUserFilter}
43
- resetFilters={resetFilters}
44
- selectedUserFilter={selectedUserFilter}
45
- userFilters={userFilters}
46
- disabled={loading}
47
- />
28
+ }) => (
29
+ <>
30
+ {_.isEmpty(userFilters) ? null : (
31
+ <UserFilters
32
+ applyUserFilter={applyUserFilter}
33
+ userFilterScope={userFilterScope}
34
+ deleteUserFilter={deleteUserFilter}
35
+ resetFilters={resetFilters}
36
+ selectedUserFilter={selectedUserFilter}
37
+ userFilters={userFilters}
38
+ disabled={loading}
39
+ />
40
+ )}
41
+ <div className="selectedFilters">
42
+ {_.isEmpty(selectedFilters) ? null : (
43
+ <>
44
+ <div className="appliedFilters">
45
+ <FormattedMessage id="search.applied_filters" />
46
+ </div>
47
+ {selectedFilters.map((filter) => {
48
+ const options = _.isEqual(filter, selectedFilter)
49
+ ? selectedFilterValues
50
+ : null;
51
+ const props = {
52
+ key: filter,
53
+ activeValues,
54
+ closeFilter,
55
+ filter,
56
+ loading,
57
+ openFilter,
58
+ options,
59
+ removeFilter,
60
+ toggleFilterValue,
61
+ };
62
+ return selectedFilter === "taxonomy" ? (
63
+ <FilterMultilevelDropdown {...props} />
64
+ ) : (
65
+ <FilterDropdown {...props} />
66
+ );
67
+ })}
68
+ <a className="resetFilters" onClick={() => resetFilters()}>
69
+ <FormattedMessage id="search.clear_filters" />
70
+ </a>
71
+ {saveFilters && (
72
+ <ModalSaveFilter
73
+ saveFilters={saveFilters}
74
+ activeFilters={activeFilters}
75
+ scope={userFilterScope}
76
+ />
77
+ )}
78
+ </>
48
79
  )}
49
- <div className="selectedFilters">
50
- {_.isEmpty(selectedFilters) ? null : (
51
- <>
52
- <div className="appliedFilters">
53
- <FormattedMessage id="search.applied_filters" />
54
- </div>
55
- {selectedFilters.map((filter) => {
56
- const options = _.isEqual(filter, selectedFilter)
57
- ? selectedFilterValues
58
- : null;
59
- const props = {
60
- key: filter,
61
- activeValues,
62
- closeFilter,
63
- filter,
64
- loading,
65
- openFilter,
66
- options,
67
- removeFilter,
68
- toggleFilterValue,
69
- };
70
- return selectedFilter === "taxonomy" ? (
71
- <FilterMultilevelDropdown {...props} />
72
- ) : (
73
- <FilterDropdown {...props} />
74
- );
75
- })}
76
- <a className="resetFilters" onClick={() => resetFilters()}>
77
- <FormattedMessage id="search.clear_filters" />
78
- </a>
79
- {saveFilters && (
80
- <ModalSaveFilter
81
- saveFilters={saveFilters}
82
- activeFilters={activeFilters}
83
- scope={userFilterScope}
84
- />
85
- )}
86
- </>
87
- )}
88
- </div>
89
- </>
90
- );
91
- };
80
+ </div>
81
+ </>
82
+ );
92
83
 
93
84
  SelectedFilters.propTypes = {
94
85
  activeFilters: PropTypes.object,