@truedat/bg 4.46.7 → 4.46.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 +6 -0
- package/package.json +5 -5
- package/src/concepts/components/ConceptFilters.js +17 -12
- package/src/concepts/components/ConceptFiltersLoader.js +3 -1
- package/src/concepts/components/ConceptHeader.js +4 -2
- package/src/concepts/components/ConceptRoutes.js +83 -77
- package/src/concepts/selectors/getConceptAvailableFilters.js +1 -1
- package/src/concepts/components/ConceptFiltersDefault.js +0 -19
- package/src/concepts/components/ConceptFiltersPublished.js +0 -20
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@truedat/bg",
|
|
3
|
-
"version": "4.46.
|
|
3
|
+
"version": "4.46.10",
|
|
4
4
|
"description": "Truedat Web Business Glossary",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"jsnext:main": "src/index.js",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@testing-library/jest-dom": "^5.16.4",
|
|
35
35
|
"@testing-library/react": "^12.0.0",
|
|
36
36
|
"@testing-library/user-event": "^13.2.1",
|
|
37
|
-
"@truedat/test": "4.46.
|
|
37
|
+
"@truedat/test": "4.46.10",
|
|
38
38
|
"babel-jest": "^28.1.0",
|
|
39
39
|
"babel-plugin-dynamic-import-node": "^2.3.3",
|
|
40
40
|
"babel-plugin-lodash": "^3.3.4",
|
|
@@ -86,8 +86,8 @@
|
|
|
86
86
|
]
|
|
87
87
|
},
|
|
88
88
|
"dependencies": {
|
|
89
|
-
"@truedat/core": "4.46.
|
|
90
|
-
"@truedat/df": "4.46.
|
|
89
|
+
"@truedat/core": "4.46.10",
|
|
90
|
+
"@truedat/df": "4.46.10",
|
|
91
91
|
"file-saver": "^2.0.5",
|
|
92
92
|
"moment": "^2.24.0",
|
|
93
93
|
"path-to-regexp": "^1.7.0",
|
|
@@ -107,5 +107,5 @@
|
|
|
107
107
|
"react-dom": ">= 16.8.6 < 17",
|
|
108
108
|
"semantic-ui-react": ">= 0.88.2 < 2.1"
|
|
109
109
|
},
|
|
110
|
-
"gitHead": "
|
|
110
|
+
"gitHead": "2bfaf01b4ff0cbd9166456e0cfff7028015d220f"
|
|
111
111
|
}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import
|
|
5
|
-
import
|
|
1
|
+
import { bindActionCreators } from "redux";
|
|
2
|
+
import { connect } from "react-redux";
|
|
3
|
+
import { AvailableFilters } from "@truedat/core/components";
|
|
4
|
+
import { addConceptFilter, resetConceptFilters } from "../routines";
|
|
5
|
+
import { getConceptAvailableFilters } from "../selectors";
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
);
|
|
7
|
+
const mapStateToProps = (state) => ({
|
|
8
|
+
filters: getConceptAvailableFilters(state),
|
|
9
|
+
disabled: state.conceptFiltersLoading,
|
|
10
|
+
loading: state.conceptFiltersLoading,
|
|
11
|
+
});
|
|
13
12
|
|
|
14
|
-
|
|
13
|
+
const mapDispatchToProps = (dispatch) =>
|
|
14
|
+
bindActionCreators(
|
|
15
|
+
{ addFilter: addConceptFilter, resetFilters: resetConceptFilters },
|
|
16
|
+
dispatch
|
|
17
|
+
);
|
|
18
|
+
|
|
19
|
+
export default connect(mapStateToProps, mapDispatchToProps)(AvailableFilters);
|
|
@@ -4,6 +4,8 @@ import { FiltersLoader } from "@truedat/core/components";
|
|
|
4
4
|
import { makeActiveFiltersSelector } from "@truedat/core/selectors";
|
|
5
5
|
import { clearConceptFilters, fetchConceptFilters } from "../routines";
|
|
6
6
|
|
|
7
|
+
const EMPTY = {};
|
|
8
|
+
|
|
7
9
|
const mapDispatchToProps = (dispatch) =>
|
|
8
10
|
bindActionCreators(
|
|
9
11
|
{ clearFilters: clearConceptFilters, fetchFilters: fetchConceptFilters },
|
|
@@ -17,7 +19,7 @@ const makeMapStateToProps = () => {
|
|
|
17
19
|
const mapStateToProps = (state, props) => ({
|
|
18
20
|
selectedFilter: state.conceptSelectedFilter,
|
|
19
21
|
filters: activeFiltersSelector(state, props),
|
|
20
|
-
defaultFilters: props?.defaultFilters ||
|
|
22
|
+
defaultFilters: props?.defaultFilters || EMPTY,
|
|
21
23
|
});
|
|
22
24
|
return mapStateToProps;
|
|
23
25
|
};
|
|
@@ -81,12 +81,14 @@ ConceptHeader.propTypes = {
|
|
|
81
81
|
template: PropTypes.object,
|
|
82
82
|
};
|
|
83
83
|
|
|
84
|
+
const EMPTY = {};
|
|
85
|
+
|
|
84
86
|
const mapStateToProps = ({ concept, conceptActions, conceptPermissions }) => ({
|
|
85
87
|
share: _.prop("share")(conceptPermissions),
|
|
86
88
|
concept,
|
|
87
89
|
setConfidentialConcept: _.prop("set_confidential")(conceptActions),
|
|
88
|
-
domain: concept.domain ||
|
|
89
|
-
template: concept.template ||
|
|
90
|
+
domain: concept.domain || EMPTY,
|
|
91
|
+
template: concept.template || EMPTY,
|
|
90
92
|
});
|
|
91
93
|
|
|
92
94
|
export default connect(mapStateToProps)(ConceptHeader);
|
|
@@ -44,22 +44,25 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
|
|
|
44
44
|
"business_glossary_view",
|
|
45
45
|
"business_glossary_management",
|
|
46
46
|
]);
|
|
47
|
-
const conceptsActive = useActiveRoutes([CONCEPTS, CONCEPTS_PENDING]);
|
|
48
47
|
return (
|
|
49
48
|
<>
|
|
50
|
-
<Route render={() => (conceptsActive ? <ConceptsLoader /> : null)} />
|
|
51
49
|
<Route
|
|
52
50
|
exact
|
|
53
51
|
path={CONCEPTS_PENDING}
|
|
54
52
|
render={() =>
|
|
55
53
|
authorized ? (
|
|
56
54
|
<>
|
|
57
|
-
<ConceptUserFiltersLoader />
|
|
58
55
|
<ConceptFiltersLoader
|
|
59
56
|
defaultFilters={{
|
|
60
57
|
status: ["pending_approval", "draft", "rejected"],
|
|
61
58
|
}}
|
|
62
59
|
/>
|
|
60
|
+
<ConceptsLoader
|
|
61
|
+
defaultFilters={{
|
|
62
|
+
status: ["pending_approval", "draft", "rejected"],
|
|
63
|
+
}}
|
|
64
|
+
/>
|
|
65
|
+
<ConceptUserFiltersLoader />
|
|
63
66
|
<Concepts
|
|
64
67
|
header="concepts.header.manage"
|
|
65
68
|
subheader="concepts.subheader.manage"
|
|
@@ -77,81 +80,84 @@ export const ConceptRoutes = ({ concept, conceptLoaded, templatesLoaded }) => {
|
|
|
77
80
|
path={CONCEPTS}
|
|
78
81
|
render={() =>
|
|
79
82
|
authorized ? (
|
|
80
|
-
|
|
81
|
-
<
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
83
|
+
<Switch>
|
|
84
|
+
<Route
|
|
85
|
+
exact
|
|
86
|
+
path={CONCEPTS}
|
|
87
|
+
render={() => (
|
|
88
|
+
<>
|
|
89
|
+
<ConceptFiltersLoader
|
|
90
|
+
defaultFilters={{
|
|
91
|
+
status: ["published"],
|
|
92
|
+
}}
|
|
93
|
+
/>
|
|
94
|
+
<ConceptsLoader
|
|
95
|
+
defaultFilters={{
|
|
96
|
+
status: ["published"],
|
|
97
|
+
}}
|
|
98
|
+
/>
|
|
99
|
+
<ConceptUserFiltersLoader />
|
|
100
|
+
<Concepts
|
|
101
|
+
header="concepts.header"
|
|
102
|
+
subheader="concepts.subheader.view"
|
|
103
|
+
icon="tags"
|
|
104
|
+
/>
|
|
105
|
+
</>
|
|
106
|
+
)}
|
|
107
|
+
/>
|
|
108
|
+
<Route
|
|
109
|
+
exact
|
|
110
|
+
path={CONCEPTS_BULK_UPDATE}
|
|
111
|
+
render={() => (
|
|
112
|
+
<>
|
|
113
|
+
<DomainsLoader />
|
|
114
|
+
<ConceptCrumbs conceptAction="actions.update" />
|
|
115
|
+
<TemplatesLoader scope="bg" />
|
|
116
|
+
{templatesLoaded && <ConceptsBulkUpdate />}
|
|
117
|
+
</>
|
|
118
|
+
)}
|
|
119
|
+
/>
|
|
120
|
+
<Route
|
|
121
|
+
exact
|
|
122
|
+
path={CONCEPTS_NEW}
|
|
123
|
+
render={() => (
|
|
124
|
+
<>
|
|
125
|
+
<DomainsLoader actions="create_business_concept" />
|
|
126
|
+
<ConceptCrumbs conceptAction="concepts.actions.create" />
|
|
127
|
+
<ConceptForm />
|
|
128
|
+
</>
|
|
129
|
+
)}
|
|
130
|
+
/>
|
|
131
|
+
<Route
|
|
132
|
+
exact
|
|
133
|
+
path={CONCEPT_EDIT}
|
|
134
|
+
render={() => (
|
|
135
|
+
<>
|
|
136
|
+
<ConceptCrumbs conceptAction="concepts.actions.edit" />
|
|
137
|
+
<TemplatesLoader scope="bg" />
|
|
138
|
+
<ConceptLoader />
|
|
139
|
+
{conceptLoaded && templatesLoaded && <ConceptEdit />}
|
|
140
|
+
</>
|
|
141
|
+
)}
|
|
142
|
+
/>
|
|
143
|
+
<Route
|
|
144
|
+
path={CONCEPT_VERSION}
|
|
145
|
+
render={() => (
|
|
146
|
+
<>
|
|
147
|
+
<ConceptLoader />
|
|
148
|
+
<DomainsLoader />
|
|
149
|
+
{conceptLoaded && <ConceptSubscriptionLoader />}
|
|
150
|
+
<RelationTagsLoader />
|
|
151
|
+
{conceptLoaded && (
|
|
152
|
+
<RelationsGraphLoader
|
|
153
|
+
resource_id={_.prop("business_concept_id")(concept)}
|
|
97
154
|
/>
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
render={() => (
|
|
105
|
-
<>
|
|
106
|
-
<DomainsLoader />
|
|
107
|
-
<ConceptCrumbs conceptAction="actions.update" />
|
|
108
|
-
<TemplatesLoader scope="bg" />
|
|
109
|
-
{templatesLoaded && <ConceptsBulkUpdate />}
|
|
110
|
-
</>
|
|
111
|
-
)}
|
|
112
|
-
/>
|
|
113
|
-
<Route
|
|
114
|
-
exact
|
|
115
|
-
path={CONCEPTS_NEW}
|
|
116
|
-
render={() => (
|
|
117
|
-
<>
|
|
118
|
-
<DomainsLoader actions="create_business_concept" />
|
|
119
|
-
<ConceptCrumbs conceptAction="concepts.actions.create" />
|
|
120
|
-
<ConceptForm />
|
|
121
|
-
</>
|
|
122
|
-
)}
|
|
123
|
-
/>
|
|
124
|
-
<Route
|
|
125
|
-
exact
|
|
126
|
-
path={CONCEPT_EDIT}
|
|
127
|
-
render={() => (
|
|
128
|
-
<>
|
|
129
|
-
<ConceptCrumbs conceptAction="concepts.actions.edit" />
|
|
130
|
-
<TemplatesLoader scope="bg" />
|
|
131
|
-
<ConceptLoader />
|
|
132
|
-
{conceptLoaded && templatesLoaded && <ConceptEdit />}
|
|
133
|
-
</>
|
|
134
|
-
)}
|
|
135
|
-
/>
|
|
136
|
-
<Route
|
|
137
|
-
path={CONCEPT_VERSION}
|
|
138
|
-
render={() => (
|
|
139
|
-
<>
|
|
140
|
-
<ConceptLoader />
|
|
141
|
-
<DomainsLoader />
|
|
142
|
-
{conceptLoaded && <ConceptSubscriptionLoader />}
|
|
143
|
-
<RelationTagsLoader />
|
|
144
|
-
{conceptLoaded && (
|
|
145
|
-
<RelationsGraphLoader
|
|
146
|
-
resource_id={_.prop("business_concept_id")(concept)}
|
|
147
|
-
/>
|
|
148
|
-
)}
|
|
149
|
-
{conceptLoaded && <Concept />}
|
|
150
|
-
</>
|
|
151
|
-
)}
|
|
152
|
-
/>
|
|
153
|
-
</Switch>
|
|
154
|
-
</>
|
|
155
|
+
)}
|
|
156
|
+
{conceptLoaded && <Concept />}
|
|
157
|
+
</>
|
|
158
|
+
)}
|
|
159
|
+
/>
|
|
160
|
+
</Switch>
|
|
155
161
|
) : (
|
|
156
162
|
<Unauthorized />
|
|
157
163
|
)
|
|
@@ -8,7 +8,7 @@ export const getConceptAvailableFilters = createSelector(
|
|
|
8
8
|
[getConceptFilters, getConceptSelectedFilters],
|
|
9
9
|
(conceptFilters, conceptSelectedFilters) =>
|
|
10
10
|
_.flow(
|
|
11
|
-
_.omitBy(values => _.size(values) < 2),
|
|
11
|
+
_.omitBy((values) => _.size(values) < 2),
|
|
12
12
|
_.keys,
|
|
13
13
|
_.without(conceptSelectedFilters)
|
|
14
14
|
)(conceptFilters)
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import { bindActionCreators } from "redux";
|
|
2
|
-
import { connect } from "react-redux";
|
|
3
|
-
import { AvailableFilters } from "@truedat/core/components";
|
|
4
|
-
import { addConceptFilter, resetConceptFilters } from "../routines";
|
|
5
|
-
import { getConceptAvailableFilters } from "../selectors";
|
|
6
|
-
|
|
7
|
-
const mapStateToProps = (state) => ({
|
|
8
|
-
filters: getConceptAvailableFilters(state),
|
|
9
|
-
disabled: state.conceptFiltersLoading,
|
|
10
|
-
loading: state.conceptFiltersLoading,
|
|
11
|
-
});
|
|
12
|
-
|
|
13
|
-
const mapDispatchToProps = (dispatch) =>
|
|
14
|
-
bindActionCreators(
|
|
15
|
-
{ addFilter: addConceptFilter, resetFilters: resetConceptFilters },
|
|
16
|
-
dispatch
|
|
17
|
-
);
|
|
18
|
-
|
|
19
|
-
export default connect(mapStateToProps, mapDispatchToProps)(AvailableFilters);
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import _ from "lodash/fp";
|
|
2
|
-
import { connect } from "react-redux";
|
|
3
|
-
import { bindActionCreators } from "redux";
|
|
4
|
-
import { AvailableFilters } from "@truedat/core/components";
|
|
5
|
-
import { addConceptFilter, resetConceptFilters } from "../routines";
|
|
6
|
-
import { getConceptAvailableFilters } from "../selectors";
|
|
7
|
-
|
|
8
|
-
const mapStateToProps = (state) => ({
|
|
9
|
-
filters: _.flow(getConceptAvailableFilters, _.without(["status"]))(state),
|
|
10
|
-
disabled: state.conceptFiltersLoading,
|
|
11
|
-
loading: state.conceptFiltersLoading,
|
|
12
|
-
});
|
|
13
|
-
|
|
14
|
-
const mapDispatchToProps = (dispatch) =>
|
|
15
|
-
bindActionCreators(
|
|
16
|
-
{ addFilter: addConceptFilter, resetFilters: resetConceptFilters },
|
|
17
|
-
dispatch
|
|
18
|
-
);
|
|
19
|
-
|
|
20
|
-
export default connect(mapStateToProps, mapDispatchToProps)(AvailableFilters);
|