@truedat/bg 5.0.5 → 5.2.0

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 (4) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/package.json +5 -5
  3. package/src/taxonomy/selectors/__tests__/getDomainSelectorOptions.spec.js +81 -23
  4. package/src/taxonomy/selectors/index.js +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## [5.1.1] 2023-02-10
4
+
5
+ ### Fixed
6
+
7
+ - [TD-5201] Fixed domain childrens aren't alphabetically sorted in selector
8
+
3
9
  ## [4.59.11] 2023-01-16
4
10
 
5
11
  ### Added
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@truedat/bg",
3
- "version": "5.0.5",
3
+ "version": "5.2.0",
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.5",
35
35
  "@testing-library/react": "^12.0.0",
36
36
  "@testing-library/user-event": "^13.2.1",
37
- "@truedat/test": "5.0.5",
37
+ "@truedat/test": "5.2.0",
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": "5.0.5",
90
- "@truedat/df": "5.0.5",
89
+ "@truedat/core": "5.2.0",
90
+ "@truedat/df": "5.2.0",
91
91
  "decode-uri-component": "^0.2.2",
92
92
  "file-saver": "^2.0.5",
93
93
  "moment": "^2.29.4",
@@ -110,5 +110,5 @@
110
110
  "react-dom": ">= 16.8.6 < 17",
111
111
  "semantic-ui-react": ">= 2.0.3 < 2.2"
112
112
  },
113
- "gitHead": "a90adc0fcf336af276a585669065b661e28a8739"
113
+ "gitHead": "20710c8ea4c857547cdaeac20dfada1bdf64e9d2"
114
114
  }
package/src/taxonomy/selectors/__tests__/getDomainSelectorOptions.spec.js CHANGED
@@ -2,64 +2,122 @@ import { getDomainSelectorOptions } from "..";
2
2
 
3
3
  describe("selectors: getDomainSelectorOptions", () => {
4
4
  const domains = [
5
- { id: 1, name: "domain1" },
6
- { id: 2, name: "domain2", parent_id: 1 },
7
- { id: 3, name: "domain3" },
8
- { id: 4, name: "domain4", parent_id: 0 },
9
- { id: 5, name: "domain2", parent_id: 2 },
5
+ { id: 1, name: "a_domain1" },
6
+ { id: 2, name: "b_domain11", parent_id: 1 },
7
+ { id: 3, name: "a_domain12", parent_id: 1 },
8
+ { id: 4, name: "d_domain13", parent_id: 1 },
9
+ { id: 5, name: "c_domain13", parent_id: 1 },
10
+ { id: 6, name: "d_domain2" },
11
+ { id: 7, name: "c_domain3", parent_id: 0 },
12
+ { id: 8, name: "b_domain111", parent_id: 2 },
13
+ { id: 9, name: "a_domain112", parent_id: 2 },
10
14
  ];
11
15
 
12
- it("foo", () => {
16
+ it("get domain options correctly and sorted aphabetically", () => {
13
17
  const options = getDomainSelectorOptions({ domains });
14
18
  expect(options).toEqual([
15
19
  {
16
20
  ancestors: [],
17
- children: [{ id: 2, name: "domain2", parent_id: 1 }],
21
+ children: [
22
+ { id: 3, name: "a_domain12", parent_id: 1 },
23
+ { id: 2, name: "b_domain11", parent_id: 1 },
24
+ { id: 5, name: "c_domain13", parent_id: 1 },
25
+ { id: 4, name: "d_domain13", parent_id: 1 },
26
+ ],
18
27
  descendents: [
19
- { id: 2, name: "domain2", parent_id: 1 },
20
- { id: 5, name: "domain2", parent_id: 2 },
28
+ { id: 9, name: "a_domain112", parent_id: 2 },
29
+ { id: 3, name: "a_domain12", parent_id: 1 },
30
+ { id: 2, name: "b_domain11", parent_id: 1 },
31
+ { id: 8, name: "b_domain111", parent_id: 2 },
32
+ { id: 5, name: "c_domain13", parent_id: 1 },
33
+ { id: 4, name: "d_domain13", parent_id: 1 },
21
34
  ],
22
35
  id: 1,
23
36
  level: 0,
24
- name: "domain1",
37
+ name: "a_domain1",
38
+ },
39
+ {
40
+ ancestors: [{ id: 1, name: "a_domain1" }],
41
+ children: [],
42
+ descendents: [],
43
+ id: 3,
44
+ level: 1,
45
+ name: "a_domain12",
46
+ parent_id: 1,
25
47
  },
26
48
  {
27
- ancestors: [{ id: 1, name: "domain1" }],
28
- children: [{ id: 5, name: "domain2", parent_id: 2 }],
29
- descendents: [{ id: 5, name: "domain2", parent_id: 2 }],
49
+ ancestors: [{ id: 1, name: "a_domain1" }],
50
+ children: [
51
+ { id: 9, name: "a_domain112", parent_id: 2 },
52
+ { id: 8, name: "b_domain111", parent_id: 2 },
53
+ ],
54
+ descendents: [
55
+ { id: 9, name: "a_domain112", parent_id: 2 },
56
+ { id: 8, name: "b_domain111", parent_id: 2 },
57
+ ],
30
58
  id: 2,
31
59
  level: 1,
32
- name: "domain2",
60
+ name: "b_domain11",
33
61
  parent_id: 1,
34
62
  },
35
63
  {
36
64
  ancestors: [
37
- { id: 1, name: "domain1" },
38
- { id: 2, name: "domain2", parent_id: 1 },
65
+ { id: 1, name: "a_domain1" },
66
+ { id: 2, name: "b_domain11", parent_id: 1 },
39
67
  ],
40
68
  children: [],
41
69
  descendents: [],
42
- id: 5,
70
+ id: 9,
71
+ level: 2,
72
+ name: "a_domain112",
73
+ parent_id: 2,
74
+ },
75
+ {
76
+ ancestors: [
77
+ { id: 1, name: "a_domain1" },
78
+ { id: 2, name: "b_domain11", parent_id: 1 },
79
+ ],
80
+ children: [],
81
+ descendents: [],
82
+ id: 8,
43
83
  level: 2,
44
- name: "domain2",
84
+ name: "b_domain111",
45
85
  parent_id: 2,
46
86
  },
87
+ {
88
+ ancestors: [{ id: 1, name: "a_domain1" }],
89
+ children: [],
90
+ descendents: [],
91
+ id: 5,
92
+ level: 1,
93
+ name: "c_domain13",
94
+ parent_id: 1,
95
+ },
96
+ {
97
+ ancestors: [{ id: 1, name: "a_domain1" }],
98
+ children: [],
99
+ descendents: [],
100
+ id: 4,
101
+ level: 1,
102
+ name: "d_domain13",
103
+ parent_id: 1,
104
+ },
47
105
  {
48
106
  ancestors: [],
49
107
  children: [],
50
108
  descendents: [],
51
- id: 3,
109
+ id: 7,
52
110
  level: 0,
53
- name: "domain3",
111
+ name: "c_domain3",
112
+ parent_id: 0,
54
113
  },
55
114
  {
56
115
  ancestors: [],
57
116
  children: [],
58
117
  descendents: [],
59
- id: 4,
118
+ id: 6,
60
119
  level: 0,
61
- name: "domain4",
62
- parent_id: 0,
120
+ name: "d_domain2",
63
121
  },
64
122
  ]);
65
123
  });
package/src/taxonomy/selectors/index.js CHANGED
@@ -131,13 +131,13 @@ const getAncestorDomains = createSelector(
131
131
  const reduceTaxonomy = (domains) => (domainsInLevel, level) => {
132
132
  if (domains)
133
133
  return _.reduce((acc, domain) => {
134
- const children = findChildrenIn(domains)(domain);
134
+ const children = _.sortBy(["name"])(findChildrenIn(domains)(domain));
135
135
  return [
136
136
  ...acc,
137
137
  {
138
138
  ...domain,
139
139
  ancestors: findAncestorsIn(domains)([domain]),
140
- descendents: findDescendents([domain])(domains),
140
+ descendents: _.sortBy(["name"])(findDescendents([domain])(domains)),
141
141
  children,
142
142
  level,
143
143
  },