@common-stack/client-react 0.6.1-alpha.3 → 1.0.1-alpha.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.
- package/lib/__tests__/fill-register-test.js +16 -41
- package/lib/__tests__/fill-register-test.js.map +1 -1
- package/lib/__tests__/helpers/sample-menu.js +1 -4
- package/lib/__tests__/helpers/sample-menu.js.map +1 -1
- package/lib/__tests__/integrated-routes.test.js +17 -44
- package/lib/__tests__/integrated-routes.test.js.map +1 -1
- package/lib/__tests__/router-render.test.js +14 -57
- package/lib/__tests__/router-render.test.js.map +1 -1
- package/lib/connector/base-connector.d.ts +53 -0
- package/lib/connector/base-connector.js +129 -0
- package/lib/connector/base-connector.js.map +1 -0
- package/lib/connector/connector.d.ts +9 -0
- package/lib/connector/connector.js +14 -0
- package/lib/connector/connector.js.map +1 -0
- package/lib/connector/connector.native.d.ts +9 -0
- package/lib/connector/connector.native.js +15 -0
- package/lib/connector/connector.native.js.map +1 -0
- package/lib/connector/connector.test.js +11 -0
- package/lib/connector/connector.test.js.map +1 -0
- package/lib/connector/index.d.ts +1 -0
- package/lib/connector/index.js +2 -0
- package/lib/connector/index.js.map +1 -0
- package/lib/index.d.ts +1 -2
- package/lib/index.js +10 -29
- package/lib/index.js.map +1 -1
- package/lib/index.native.d.ts +1 -1
- package/lib/index.native.js +10 -28
- package/lib/index.native.js.map +1 -1
- package/lib/interfaces/extended-feature.d.ts +50 -0
- package/lib/interfaces/extended-feature.js +1 -56
- package/lib/interfaces/extended-feature.js.map +1 -1
- package/lib/interfaces/feature.d.ts +13 -0
- package/lib/interfaces/feature.js +2 -0
- package/lib/interfaces/feature.js.map +1 -0
- package/lib/interfaces/index.d.ts +2 -0
- package/lib/interfaces/index.js +5 -20
- package/lib/interfaces/index.js.map +1 -1
- package/lib/interfaces/menu.js +2 -5
- package/lib/interfaces/menu.js.map +1 -1
- package/lib/interfaces/new-router.js +1 -2
- package/lib/interfaces/router.js +1 -2
- package/lib/inversify/InversifyContext.d.ts +4 -4
- package/lib/inversify/InversifyContext.js +6 -34
- package/lib/inversify/InversifyContext.js.map +1 -1
- package/lib/inversify/index.js +1 -17
- package/lib/inversify/index.js.map +1 -1
- package/lib/plugin-area/__tests__/higher-order-component-util.test.js +13 -38
- package/lib/plugin-area/__tests__/higher-order-component-util.test.js.map +1 -1
- package/lib/plugin-area/__tests__/plugin-api.test.js +11 -13
- package/lib/plugin-area/__tests__/plugin-api.test.js.map +1 -1
- package/lib/plugin-area/base-plugin-area.d.ts +1 -1
- package/lib/plugin-area/base-plugin-area.js +18 -39
- package/lib/plugin-area/base-plugin-area.js.map +1 -1
- package/lib/plugin-area/higher-order-component-util.js +3 -7
- package/lib/plugin-area/higher-order-component-util.js.map +1 -1
- package/lib/plugin-area/index.d.ts +2 -2
- package/lib/plugin-area/index.js +5 -35
- package/lib/plugin-area/index.js.map +1 -1
- package/lib/plugin-area/index.native.d.ts +2 -2
- package/lib/plugin-area/index.native.js +7 -37
- package/lib/plugin-area/index.native.js.map +1 -1
- package/lib/plugin-area/plugin-api.js +15 -18
- package/lib/plugin-area/plugin-api.js.map +1 -1
- package/lib/plugin-area/plugin-context.js +5 -32
- package/lib/plugin-area/plugin-context.js.map +1 -1
- package/lib/route/__tests__/admin-new-routes.test.js +11 -45
- package/lib/route/__tests__/admin-new-routes.test.js.map +1 -1
- package/lib/route/__tests__/getFlatMenus.test.js +5 -7
- package/lib/route/__tests__/getFlatMenus.test.js.map +1 -1
- package/lib/route/__tests__/render-routes-config.test.js +6 -18
- package/lib/route/__tests__/render-routes-config.test.js.map +1 -1
- package/lib/route/__tests__/route-type.test.js +1 -2
- package/lib/route/__tests__/route-type.test.js.map +1 -1
- package/lib/route/get-routes.js +22 -29
- package/lib/route/get-routes.js.map +1 -1
- package/lib/route/get-routes.test.js +6 -17
- package/lib/route/get-routes.test.js.map +1 -1
- package/lib/route/index.js +2 -18
- package/lib/route/index.js.map +1 -1
- package/lib/route/index.native.js +1 -17
- package/lib/route/index.native.js.map +1 -1
- package/lib/route/old/__tests__/config-sidebar-menu.test.d.ts +1 -0
- package/lib/route/old/__tests__/config-sidebar-menu.test.js +199 -198
- package/lib/route/old/__tests__/config-sidebar-menu.test.js.map +1 -1
- package/lib/route/old/get-menus.js +14 -21
- package/lib/route/old/get-menus.js.map +1 -1
- package/lib/route/old/get-routes-notused.js +14 -12
- package/lib/route/old/get-routes-notused.js.map +1 -1
- package/lib/route/old/render.d.ts +2 -2
- package/lib/route/old/render.js +4 -31
- package/lib/route/old/render.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.js +35 -40
- package/lib/route/react-navigation/get-navigation-utils.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.test.js +43 -26
- package/lib/route/react-navigation/get-navigation-utils.test.js.map +1 -1
- package/lib/route/react-navigation/index.js +2 -18
- package/lib/route/react-navigation/index.js.map +1 -1
- package/lib/route/react-navigation/react-native.sample.test.js +8 -22
- package/lib/route/react-navigation/react-native.sample.test.js.map +1 -1
- package/lib/route/react-navigation/react-native.sample1.test.js +14 -48
- package/lib/route/react-navigation/react-native.sample1.test.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.d.ts +2 -2
- package/lib/route/react-navigation/react-navigation-render.js +17 -32
- package/lib/route/react-navigation/react-navigation-render.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.test.js +23 -37
- package/lib/route/react-navigation/react-navigation-render.test.js.map +1 -1
- package/lib/route/react-navigation/root-navigation.js +5 -9
- package/lib/route/react-navigation/root-navigation.js.map +1 -1
- package/lib/route/react-navigation/routes.js +1 -2
- package/lib/route/react-navigation/types.d.ts +4 -4
- package/lib/route/react-navigation/types.js +1 -5
- package/lib/route/react-navigation/types.js.map +1 -1
- package/lib/route/render-routes.d.ts +2 -2
- package/lib/route/render-routes.js +33 -66
- package/lib/route/render-routes.js.map +1 -1
- package/lib/route/render-routes.native.d.ts +2 -2
- package/lib/route/render-routes.native.js +33 -66
- package/lib/route/render-routes.native.js.map +1 -1
- package/lib/route/render-routes.test.js +112 -126
- package/lib/route/render-routes.test.js.map +1 -1
- package/lib/route/root-navigation.js +3 -7
- package/lib/route/root-navigation.js.map +1 -1
- package/lib/route-based-plugin-area/__tests__/higher-order-component-util.test.js +13 -38
- package/lib/route-based-plugin-area/__tests__/higher-order-component-util.test.js.map +1 -1
- package/lib/route-based-plugin-area/__tests__/plugin-api.test.js +11 -13
- package/lib/route-based-plugin-area/__tests__/plugin-api.test.js.map +1 -1
- package/lib/route-based-plugin-area/higher-order-component-util.js +3 -7
- package/lib/route-based-plugin-area/higher-order-component-util.js.map +1 -1
- package/lib/route-based-plugin-area/index.js +2 -18
- package/lib/route-based-plugin-area/index.js.map +1 -1
- package/lib/route-based-plugin-area/plugin-api.js +15 -18
- package/lib/route-based-plugin-area/plugin-api.js.map +1 -1
- package/lib/route-based-plugin-area/plugin-context.js +5 -32
- package/lib/route-based-plugin-area/plugin-context.js.map +1 -1
- package/lib/route-based-plugin-area/route-based-plugin-area.d.ts +1 -1
- package/lib/route-based-plugin-area/route-based-plugin-area.js +12 -39
- package/lib/route-based-plugin-area/route-based-plugin-area.js.map +1 -1
- package/lib/router-factory/index.d.ts +1 -1
- package/lib/router-factory/index.js +6 -32
- package/lib/router-factory/index.js.map +1 -1
- package/lib/router-factory/index.native.d.ts +1 -1
- package/lib/router-factory/index.native.js +6 -32
- package/lib/router-factory/index.native.js.map +1 -1
- package/lib/utils/before-ssr.d.ts +5 -0
- package/lib/utils/before-ssr.js +9 -0
- package/lib/utils/before-ssr.js.map +1 -0
- package/lib/utils/combine.d.ts +1 -0
- package/lib/utils/combine.js +3 -0
- package/lib/utils/combine.js.map +1 -0
- package/lib/utils/hydrate.d.ts +4 -0
- package/lib/utils/hydrate.js +14 -0
- package/lib/utils/hydrate.js.map +1 -0
- package/lib/utils/index.d.ts +3 -0
- package/lib/utils/index.js +5 -18
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/sort-keys.js +3 -10
- package/lib/utils/sort-keys.js.map +1 -1
- package/lib/utils/sort-keys.test.js +2 -4
- package/lib/utils/sort-keys.test.js.map +1 -1
- package/lib/utils/utils.js +1 -5
- package/lib/utils/utils.js.map +1 -1
- package/package.json +6 -5
- package/lib/application/__tests__/react-client.test.d.ts +0 -1
- package/lib/application/__tests__/react-client.test.js +0 -23
- package/lib/application/__tests__/react-client.test.js.map +0 -1
- package/lib/application/base-apollo-client.d.ts +0 -21
- package/lib/application/base-apollo-client.js +0 -161
- package/lib/application/base-apollo-client.js.map +0 -1
- package/lib/application/base-redux-config.d.ts +0 -22
- package/lib/application/base-redux-config.js +0 -58
- package/lib/application/base-redux-config.js.map +0 -1
- package/lib/application/config.d.ts +0 -4
- package/lib/application/config.js +0 -38
- package/lib/application/config.js.map +0 -1
- package/lib/application/react-client.d.ts +0 -7
- package/lib/application/react-client.js +0 -152
- package/lib/application/react-client.js.map +0 -1
- package/lib/connector/base-react-client-feature.d.ts +0 -31
- package/lib/connector/base-react-client-feature.js +0 -102
- package/lib/connector/base-react-client-feature.js.map +0 -1
- package/lib/connector/monaco-connector.d.ts +0 -19
- package/lib/connector/monaco-connector.js +0 -76
- package/lib/connector/monaco-connector.js.map +0 -1
- package/lib/connector/react-client-feature.d.ts +0 -7
- package/lib/connector/react-client-feature.js +0 -15
- package/lib/connector/react-client-feature.js.map +0 -1
- package/lib/connector/react-client-feature.native.d.ts +0 -7
- package/lib/connector/react-client-feature.native.js +0 -18
- package/lib/connector/react-client-feature.native.js.map +0 -1
- package/lib/connector/react-client-feature.test.js +0 -10
- package/lib/connector/react-client-feature.test.js.map +0 -1
- package/lib/interfaces/monaco-feature.d.ts +0 -46
- package/lib/interfaces/monaco-feature.js +0 -3
- package/lib/interfaces/monaco-feature.js.map +0 -1
- package/lib/interfaces/react-client-feature.d.ts +0 -77
- package/lib/interfaces/react-client-feature.js +0 -3
- package/lib/interfaces/react-client-feature.js.map +0 -1
- /package/lib/connector/{react-client-feature.test.d.ts → connector.test.d.ts} +0 -0
|
@@ -1,199 +1,200 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
1
|
+
import { sortBy } from 'lodash-es';
|
|
2
|
+
import { getMenus } from '../get-menus';
|
|
3
|
+
import { Feature } from '../../../connector';
|
|
4
|
+
const genMenuData = (namespace = '') => ({
|
|
5
|
+
[namespace + '/a']: { name: 'a', icon: 'a', authority: 'guest' },
|
|
6
|
+
[namespace + '/a/1']: { name: '1', icon: '1' },
|
|
7
|
+
[namespace + '/a/m']: { name: 'm', icon: 'm' },
|
|
8
|
+
[namespace + '/b/b1']: { name: 'b1', icon: 'b1' },
|
|
9
|
+
['/b/b2']: { name: 'b2', icon: 'b2' },
|
|
10
|
+
['/a/m/a1']: { name: 'a1', icon: 'a1', category: 'middle' },
|
|
11
|
+
[namespace + '/a/m/a2']: { name: 'a2', icon: 'a2', category: 'top' },
|
|
12
|
+
});
|
|
13
|
+
describe('sort menu by priority', () => {
|
|
14
|
+
const sortMenusByPriority = (menus) => {
|
|
15
|
+
return sortBy(menus, (obj) => parseInt(obj.priority, 10));
|
|
16
|
+
};
|
|
17
|
+
const sortMenus = (sortByPriority, menus) => {
|
|
18
|
+
if (sortByPriority) {
|
|
19
|
+
const menuData = sortMenusByPriority(menus);
|
|
20
|
+
return menuData.map(menu => {
|
|
21
|
+
return {
|
|
22
|
+
children: menu.children && sortMenus(sortByPriority, menu.children),
|
|
23
|
+
info: menu.info,
|
|
24
|
+
priority: menu.priority
|
|
25
|
+
};
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
return menus;
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
const input = [
|
|
33
|
+
{
|
|
34
|
+
children: [
|
|
35
|
+
{
|
|
36
|
+
info: 'aa1',
|
|
37
|
+
priority: 1
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
info: 'aa3',
|
|
41
|
+
priority: 3
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
info: 'aa2',
|
|
45
|
+
priority: 2
|
|
46
|
+
}
|
|
47
|
+
],
|
|
48
|
+
info: 'aa',
|
|
49
|
+
priority: 2
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
children: [
|
|
53
|
+
{
|
|
54
|
+
info: 'bb1',
|
|
55
|
+
priority: 1
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
info: 'bb3',
|
|
59
|
+
priority: 3
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
info: 'bb2',
|
|
63
|
+
priority: 2
|
|
64
|
+
}
|
|
65
|
+
],
|
|
66
|
+
info: 'bb',
|
|
67
|
+
priority: 1
|
|
68
|
+
}
|
|
69
|
+
];
|
|
70
|
+
const output = [
|
|
71
|
+
{
|
|
72
|
+
children: [
|
|
73
|
+
{
|
|
74
|
+
info: 'bb1',
|
|
75
|
+
priority: 1,
|
|
76
|
+
children: undefined
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
info: 'bb2',
|
|
80
|
+
priority: 2,
|
|
81
|
+
children: undefined
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
info: 'bb3',
|
|
85
|
+
priority: 3,
|
|
86
|
+
children: undefined
|
|
87
|
+
}
|
|
88
|
+
],
|
|
89
|
+
info: 'bb',
|
|
90
|
+
priority: 1
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
children: [
|
|
94
|
+
{
|
|
95
|
+
info: 'aa1',
|
|
96
|
+
priority: 1,
|
|
97
|
+
children: undefined
|
|
98
|
+
},
|
|
99
|
+
{
|
|
100
|
+
info: 'aa2',
|
|
101
|
+
priority: 2,
|
|
102
|
+
children: undefined
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
info: 'aa3',
|
|
106
|
+
priority: 3,
|
|
107
|
+
children: undefined
|
|
108
|
+
}
|
|
109
|
+
],
|
|
110
|
+
info: 'aa',
|
|
111
|
+
priority: 2
|
|
112
|
+
}
|
|
113
|
+
];
|
|
114
|
+
test('test sort menus', () => {
|
|
115
|
+
let sortByPriority = true;
|
|
116
|
+
expect(sortMenus(sortByPriority, input)).toEqual(output);
|
|
117
|
+
sortByPriority = false;
|
|
118
|
+
expect(sortMenus(sortByPriority, input)).toEqual(input);
|
|
119
|
+
});
|
|
120
|
+
});
|
|
121
|
+
describe('getMenu utility with basic paths', () => {
|
|
122
|
+
function formatter(data, parentAuthority = undefined) {
|
|
123
|
+
return data.map(item => {
|
|
124
|
+
let { path } = item;
|
|
125
|
+
const result = {
|
|
126
|
+
...item,
|
|
127
|
+
path,
|
|
128
|
+
authority: item.authority || parentAuthority,
|
|
129
|
+
};
|
|
130
|
+
if (item.children) {
|
|
131
|
+
result.children = formatter(item.children, item.authority || parentAuthority);
|
|
132
|
+
}
|
|
133
|
+
return result;
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
function getFlatMenuData(menus) {
|
|
137
|
+
let keys = {};
|
|
138
|
+
menus.forEach(item => {
|
|
139
|
+
if (item.children) {
|
|
140
|
+
keys[item.path] = { ...item };
|
|
141
|
+
keys = { ...keys, ...getFlatMenuData(item.children) };
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
keys[item.path] = { ...item };
|
|
145
|
+
}
|
|
146
|
+
});
|
|
147
|
+
return keys;
|
|
148
|
+
}
|
|
149
|
+
test('with /a', () => {
|
|
150
|
+
const data = getMenus('/', genMenuData());
|
|
151
|
+
const formattedData = formatter(data);
|
|
152
|
+
expect(data).toMatchSnapshot();
|
|
153
|
+
expect(formattedData).toMatchSnapshot();
|
|
154
|
+
expect(getFlatMenuData(formattedData)).toMatchSnapshot();
|
|
155
|
+
});
|
|
156
|
+
test('with given menu', () => {
|
|
157
|
+
const genDashboardMenu = {
|
|
158
|
+
['/dashboard']: {},
|
|
159
|
+
['/dashboard/name']: {},
|
|
160
|
+
['/userinfo']: {},
|
|
161
|
+
['/userinfo/:id']: {},
|
|
162
|
+
['/userinfo/:id/info']: {},
|
|
163
|
+
};
|
|
164
|
+
const menu = [
|
|
165
|
+
{
|
|
166
|
+
path: '/dashboard',
|
|
167
|
+
children: [
|
|
168
|
+
{
|
|
169
|
+
path: '/dashboard/name',
|
|
170
|
+
},
|
|
171
|
+
],
|
|
172
|
+
},
|
|
173
|
+
{
|
|
174
|
+
path: '/userinfo',
|
|
175
|
+
children: [
|
|
176
|
+
{
|
|
177
|
+
path: '/userinfo/:id',
|
|
178
|
+
children: [
|
|
179
|
+
{
|
|
180
|
+
path: '/userinfo/:id/info',
|
|
181
|
+
},
|
|
182
|
+
],
|
|
183
|
+
},
|
|
184
|
+
],
|
|
185
|
+
},
|
|
186
|
+
];
|
|
187
|
+
const data = getMenus('/', genDashboardMenu);
|
|
188
|
+
expect(data).toMatchObject(menu);
|
|
189
|
+
});
|
|
190
|
+
});
|
|
191
|
+
describe('getMenu utility with connector', () => {
|
|
192
|
+
it('with connector', () => {
|
|
193
|
+
const connector = new Feature({ menuConfig: [genMenuData()] });
|
|
194
|
+
const connector2 = new Feature({ menuConfig: [genMenuData('/test')] });
|
|
195
|
+
const feature = new Feature(connector, connector2);
|
|
196
|
+
const finalMenu = feature.getMenus();
|
|
197
|
+
expect(finalMenu).toMatchSnapshot();
|
|
198
|
+
});
|
|
199
|
+
});
|
|
199
200
|
//# sourceMappingURL=config-sidebar-menu.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-sidebar-menu.test.js","sourceRoot":"","sources":["../../../../src/route/old/__tests__/config-sidebar-menu.test.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"config-sidebar-menu.test.js","sourceRoot":"","sources":["../../../../src/route/old/__tests__/config-sidebar-menu.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var t = {};
|
|
4
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
-
t[p] = s[p];
|
|
6
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
-
t[p[i]] = s[p[i]];
|
|
10
|
-
}
|
|
11
|
-
return t;
|
|
12
|
-
};
|
|
13
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.getMenus = void 0;
|
|
15
|
-
const interfaces_1 = require("../../interfaces");
|
|
16
|
-
function getMenus(path, menuData) {
|
|
1
|
+
import { IMenuPosition } from '../../interfaces';
|
|
2
|
+
export function getMenus(path, menuData) {
|
|
17
3
|
if (!path.startsWith('/')) {
|
|
18
4
|
throw new Error('Invalid path!');
|
|
19
5
|
}
|
|
@@ -25,13 +11,17 @@ function getMenus(path, menuData) {
|
|
|
25
11
|
return menuPath.indexOf(searchPath) === 0 || menuPath === path;
|
|
26
12
|
});
|
|
27
13
|
const mappedMenuPaths = routes.map(mPath => {
|
|
28
|
-
return
|
|
14
|
+
return {
|
|
15
|
+
route: mPath,
|
|
16
|
+
position: IMenuPosition.Middle,
|
|
17
|
+
...menuData[mPath],
|
|
18
|
+
};
|
|
29
19
|
});
|
|
30
20
|
const root = {
|
|
31
21
|
// just to satisfy types added following
|
|
32
22
|
// TOOD need to correct types so we don't have to enter them.
|
|
33
23
|
name: 'root',
|
|
34
|
-
position:
|
|
24
|
+
position: IMenuPosition.Logo,
|
|
35
25
|
};
|
|
36
26
|
mappedMenuPaths.forEach(menutItem => {
|
|
37
27
|
const children = menutItem.route.split('/');
|
|
@@ -54,10 +44,13 @@ function getMenus(path, menuData) {
|
|
|
54
44
|
if (!lastNode.children) {
|
|
55
45
|
lastNode.children = [];
|
|
56
46
|
}
|
|
57
|
-
const { route: ignore
|
|
58
|
-
lastNode.children.push(
|
|
47
|
+
const { route: ignore, ...rest } = menutItem;
|
|
48
|
+
lastNode.children.push({
|
|
49
|
+
path: menutItem.route,
|
|
50
|
+
...rest,
|
|
51
|
+
exact: menuData[menutItem.route].hasOwnProperty('exact') ? menuData[menutItem.route].exact : true,
|
|
52
|
+
});
|
|
59
53
|
});
|
|
60
54
|
return root.children;
|
|
61
55
|
}
|
|
62
|
-
exports.getMenus = getMenus;
|
|
63
56
|
//# sourceMappingURL=get-menus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-menus.js","sourceRoot":"","sources":["../../../src/route/old/get-menus.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-menus.js","sourceRoot":"","sources":["../../../src/route/old/get-menus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getRoutes2 = exports.isUrl = void 0;
|
|
4
|
-
const utils_1 = require("../../utils");
|
|
1
|
+
import { formatSlash } from '../../utils';
|
|
5
2
|
/* eslint no-useless-escape:0 */
|
|
6
3
|
const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/g;
|
|
7
|
-
function isUrl(path) {
|
|
4
|
+
export function isUrl(path) {
|
|
8
5
|
return reg.test(path);
|
|
9
6
|
}
|
|
10
|
-
exports.isUrl = isUrl;
|
|
11
7
|
/**
|
|
12
8
|
* Generates Routes based on the key value, where key has the path of the route and value
|
|
13
9
|
* has rest of the values for building a `<Router ../>` component.
|
|
@@ -16,12 +12,15 @@ exports.isUrl = isUrl;
|
|
|
16
12
|
* @param routerData
|
|
17
13
|
* @deprecated
|
|
18
14
|
*/
|
|
19
|
-
function getRoutes2(path, routerData) {
|
|
15
|
+
export function getRoutes2(path, routerData) {
|
|
20
16
|
const routes = Object.keys(routerData).filter(routePath => {
|
|
21
17
|
return routePath.match(path);
|
|
22
18
|
});
|
|
23
19
|
const mappedRoutes = routes.map(paths => {
|
|
24
|
-
return
|
|
20
|
+
return {
|
|
21
|
+
route: paths,
|
|
22
|
+
...routerData[paths],
|
|
23
|
+
};
|
|
25
24
|
});
|
|
26
25
|
const root = {};
|
|
27
26
|
mappedRoutes.forEach(eachRoute => {
|
|
@@ -50,12 +49,15 @@ function getRoutes2(path, routerData) {
|
|
|
50
49
|
if (!lastNode.routes) {
|
|
51
50
|
lastNode.routes = [];
|
|
52
51
|
}
|
|
53
|
-
const modfiedRoute =
|
|
54
|
-
lastNode.routes.push(
|
|
52
|
+
const modfiedRoute = formatSlash(eachRoute.route);
|
|
53
|
+
lastNode.routes.push({
|
|
54
|
+
...eachRoute,
|
|
55
55
|
// route: modfiedRoute,
|
|
56
|
-
path: modfiedRoute,
|
|
56
|
+
path: modfiedRoute,
|
|
57
|
+
exact: routerData[eachRoute.route].hasOwnProperty('exact') ? routerData[eachRoute.route].exact : true,
|
|
58
|
+
component: eachRoute.component,
|
|
59
|
+
});
|
|
57
60
|
});
|
|
58
61
|
return root.routes;
|
|
59
62
|
}
|
|
60
|
-
exports.getRoutes2 = getRoutes2;
|
|
61
63
|
//# sourceMappingURL=get-routes-notused.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-routes-notused.js","sourceRoot":"","sources":["../../../src/route/old/get-routes-notused.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-routes-notused.js","sourceRoot":"","sources":["../../../src/route/old/get-routes-notused.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,gCAAgC;AAChC,MAAM,GAAG,GAAG,+JAA+J,CAAC;AAE5K,MAAM,UAAU,KAAK,CAAC,IAAI;IACxB,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AACD;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,UAAsB;IAC7D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QACxD,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAC1D,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,GAAG,UAAU,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAkC,EAC3C,CAAC;IACF,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/B,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjB,gDAAgD;QAChD,IAAI,SAAS,CAAC,KAAK,KAAK,GAAG,EAAE;YAC3B,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9B,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBACzD,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACzC,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;iBAClD;YACH,CAAC,CAAC,CAAC;YACH,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;gBACpB,MAAM;aACP;YACD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtC,2CAA2C;YAC3C,QAAQ,CAAC,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAc,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAc,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;SAClI;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC;SACtB;QACD,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,GAAG,SAAS;YACZ,uBAAuB;YACvB,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACrG,SAAS,EAAE,SAAS,CAAC,SAAS;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export declare const renderRoutes: (routes: any, solidRoutes: any, extraProps?: {}, switchProps?: {}) => JSX.Element;
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
export declare const renderRoutes: (routes: any, solidRoutes: any, extraProps?: {}, switchProps?: {}) => React.JSX.Element;
|
package/lib/route/old/render.js
CHANGED
|
@@ -1,33 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.renderRoutes = void 0;
|
|
27
|
-
const React = __importStar(require("react"));
|
|
28
|
-
const react_router_dom_1 = require("react-router-dom");
|
|
29
|
-
const renderRoutes = (routes, solidRoutes, extraProps = {}, switchProps = {}) => routes ? (React.createElement(React.Fragment, null, [
|
|
30
|
-
...solidRoutes, ...routes.map((route, i) => (React.createElement(react_router_dom_1.Route, { key: route.key || i, path: route.path, exact: route.exact, strict: route.strict, render: props => route.render ? (route.render(Object.assign(Object.assign(Object.assign({}, props), extraProps), { route: route }))) : (React.createElement(route.component, Object.assign({}, props, extraProps, { route: route }))) }))),
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { Route } from 'react-router-dom';
|
|
3
|
+
export const renderRoutes = (routes, solidRoutes, extraProps = {}, switchProps = {}) => routes ? (React.createElement(React.Fragment, null, [
|
|
4
|
+
...solidRoutes, ...routes.map((route, i) => (React.createElement(Route, { key: route.key || i, path: route.path, exact: route.exact, strict: route.strict, render: props => route.render ? (route.render({ ...props, ...extraProps, route: route })) : (React.createElement(route.component, { ...props, ...extraProps, route: route })) }))),
|
|
31
5
|
])) : null;
|
|
32
|
-
exports.renderRoutes = renderRoutes;
|
|
33
6
|
//# sourceMappingURL=render.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/route/old/render.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/route/old/render.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,EAAE,CACvF,MAAM,CAAC,CAAC,CAAC,CACP,0CACG;IACC,GAAG,WAAW,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAC1C,oBAAC,KAAK,IACJ,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,EACnB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,MAAM,EAAE,KAAK,CAAC,EAAE,CACd,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CACb,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CACxD,CAAC,CAAC,CAAC,CACF,oBAAC,KAAK,CAAC,SAAS,OAAK,KAAK,KAAM,UAAU,EAAE,KAAK,EAAE,KAAK,GAAI,CAC7D,GAEH,CACH,CAAC;CACH,CACA,CACJ,CAAC,CAAC,CAAC,IAAI,CAAC"}
|