@truedat/core 4.36.9 → 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.
Files changed (6) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/package.json +2 -2
  3. package/src/components/ModalSaveFilter.js +3 -1
  4. package/src/components/SelectedFilters.js +4 -0
  5. package/src/components/UserFilters.js +3 -1
  6. package/src/routes.js +2 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## [Unreleased]
4
+
5
+ ### Added
6
+
7
+ - [TD-2929] Added `scope` control on `SelectedFilters` for generic `UserSearchFilters`
8
+
3
9
  ## [4.36.8] 2022-01-24
4
10
 
5
11
  ### Changed
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@truedat/core",
3
- "version": "4.36.9",
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": "4b56a9ae46e2454719a2ae31022bc0d700a65dd3"
107
+ "gitHead": "1c418784d34e171a6d62dd7fab3dfd05400998ba"
108
108
  }
package/src/components/ModalSaveFilter.js CHANGED
@@ -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;
package/src/components/SelectedFilters.js CHANGED
@@ -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;
package/src/components/UserFilters.js CHANGED
@@ -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;
package/src/routes.js CHANGED
@@ -85,6 +85,7 @@ export const ROLES_NEW = "/roles/new";
85
85
  export const RULE = "/rules/:id";
86
86
  export const RULES = "/rules";
87
87
  export const RULE_EDIT = "/rules/:id/edit";
88
+ export const RULE_EVENTS = "/rules/:id/events";
88
89
  export const RULE_IMPLEMENTATION =
89
90
  "/rules/:id/implementations/:implementation_id";
90
91
  export const RULE_IMPLEMENTATIONS = "/rules/:id/implementations";
@@ -233,6 +234,7 @@ const routes = {
233
234
  ROLES_NEW,
234
235
  ROLES,
235
236
  RULE_EDIT,
237
+ RULE_EVENTS,
236
238
  RULE_IMPLEMENTATION_EVENTS,
237
239
  RULE_IMPLEMENTATION_CLONE,
238
240
  RULE_IMPLEMENTATION_EDIT,