@truedat/core 4.37.2 → 4.37.3
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
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@truedat/core",
|
|
3
|
-
"version": "4.37.
|
|
3
|
+
"version": "4.37.3",
|
|
4
4
|
"description": "Truedat Web Core",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"jsnext:main": "src/index.js",
|
|
@@ -104,5 +104,5 @@
|
|
|
104
104
|
"react-dom": ">= 16.8.6 < 17",
|
|
105
105
|
"semantic-ui-react": ">= 0.88.2 < 2.1"
|
|
106
106
|
},
|
|
107
|
-
"gitHead": "
|
|
107
|
+
"gitHead": "1c418784d34e171a6d62dd7fab3dfd05400998ba"
|
|
108
108
|
}
|
|
@@ -29,7 +29,7 @@ SaveFilterForm.propTypes = {
|
|
|
29
29
|
setFilterName: PropTypes.func,
|
|
30
30
|
};
|
|
31
31
|
|
|
32
|
-
export const ModalSaveFilter = ({ saveFilters, activeFilters }) => {
|
|
32
|
+
export const ModalSaveFilter = ({ saveFilters, activeFilters, scope }) => {
|
|
33
33
|
const [filterName, setFilterName] = useState("");
|
|
34
34
|
|
|
35
35
|
const actions = (handleSubmit) => [
|
|
@@ -52,6 +52,7 @@ export const ModalSaveFilter = ({ saveFilters, activeFilters }) => {
|
|
|
52
52
|
saveFilters({
|
|
53
53
|
filters: activeFilters,
|
|
54
54
|
filterName: filterName,
|
|
55
|
+
scope,
|
|
55
56
|
});
|
|
56
57
|
};
|
|
57
58
|
|
|
@@ -78,6 +79,7 @@ export const ModalSaveFilter = ({ saveFilters, activeFilters }) => {
|
|
|
78
79
|
ModalSaveFilter.propTypes = {
|
|
79
80
|
saveFilters: PropTypes.func,
|
|
80
81
|
activeFilters: PropTypes.object,
|
|
82
|
+
scope: PropTypes.string,
|
|
81
83
|
};
|
|
82
84
|
|
|
83
85
|
export default ModalSaveFilter;
|
|
@@ -24,12 +24,14 @@ export const SelectedFilters = ({
|
|
|
24
24
|
selectedUserFilter,
|
|
25
25
|
toggleFilterValue,
|
|
26
26
|
userFilters,
|
|
27
|
+
userFilterScope,
|
|
27
28
|
filterItemMapping,
|
|
28
29
|
}) => (
|
|
29
30
|
<>
|
|
30
31
|
{!_.isEmpty(userFilters) && (
|
|
31
32
|
<UserFilters
|
|
32
33
|
applyUserFilter={applyUserFilter}
|
|
34
|
+
userFilterScope={userFilterScope}
|
|
33
35
|
deleteUserFilter={deleteUserFilter}
|
|
34
36
|
resetFilters={resetFilters}
|
|
35
37
|
selectedUserFilter={selectedUserFilter}
|
|
@@ -74,6 +76,7 @@ export const SelectedFilters = ({
|
|
|
74
76
|
<ModalSaveFilter
|
|
75
77
|
saveFilters={saveFilters}
|
|
76
78
|
activeFilters={activeFilters}
|
|
79
|
+
scope={userFilterScope}
|
|
77
80
|
/>
|
|
78
81
|
)}
|
|
79
82
|
</>
|
|
@@ -100,6 +103,7 @@ SelectedFilters.propTypes = {
|
|
|
100
103
|
selectedUserFilter: PropTypes.string,
|
|
101
104
|
toggleFilterValue: PropTypes.func,
|
|
102
105
|
userFilters: PropTypes.array,
|
|
106
|
+
userFilterScope: PropTypes.string,
|
|
103
107
|
};
|
|
104
108
|
|
|
105
109
|
export default SelectedFilters;
|
|
@@ -11,6 +11,7 @@ export const UserFilters = ({
|
|
|
11
11
|
resetFilters,
|
|
12
12
|
selectedUserFilter,
|
|
13
13
|
userFilters,
|
|
14
|
+
userFilterScope,
|
|
14
15
|
}) => {
|
|
15
16
|
return (
|
|
16
17
|
<>
|
|
@@ -29,7 +30,7 @@ export const UserFilters = ({
|
|
|
29
30
|
if (selectedUserFilter == userFilter.name) {
|
|
30
31
|
resetFilters();
|
|
31
32
|
} else {
|
|
32
|
-
applyUserFilter({ userFilter });
|
|
33
|
+
applyUserFilter({ userFilter, scope: userFilterScope });
|
|
33
34
|
}
|
|
34
35
|
}}
|
|
35
36
|
className="userFilter"
|
|
@@ -78,6 +79,7 @@ UserFilters.propTypes = {
|
|
|
78
79
|
resetFilters: PropTypes.func,
|
|
79
80
|
selectedUserFilter: PropTypes.string,
|
|
80
81
|
userFilters: PropTypes.array,
|
|
82
|
+
userFilterScope: PropTypes.string,
|
|
81
83
|
};
|
|
82
84
|
|
|
83
85
|
export default UserFilters;
|