@common-stack/client-react 3.0.2-alpha.4 → 3.0.2-alpha.5
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/connector/base-connector.js +3 -10
- package/lib/connector/base-connector.js.map +1 -1
- package/lib/connector/connector.d.ts +0 -1
- package/lib/connector/connector.js +3 -8
- package/lib/connector/connector.js.map +1 -1
- package/lib/connector/connector.native.d.ts +0 -1
- package/lib/connector/connector.native.js +3 -9
- package/lib/connector/connector.native.js.map +1 -1
- package/lib/index.js +1 -11
- package/lib/index.js.map +1 -1
- package/lib/index.native.js +1 -11
- package/lib/index.native.js.map +1 -1
- package/lib/interfaces/menu.js +2 -3
- package/lib/interfaces/menu.js.map +1 -1
- package/lib/inversify/InversifyContext.js +4 -6
- package/lib/inversify/InversifyContext.js.map +1 -1
- package/lib/plugin-area/base-plugin-area.js +4 -10
- package/lib/plugin-area/base-plugin-area.js.map +1 -1
- package/lib/plugin-area/index.js +2 -6
- package/lib/plugin-area/index.js.map +1 -1
- package/lib/plugin-area/index.native.js +2 -7
- package/lib/plugin-area/index.native.js.map +1 -1
- package/lib/plugin-area/plugin-api.js +6 -9
- package/lib/plugin-area/plugin-api.js.map +1 -1
- package/lib/plugin-area/plugin-context.js +2 -18
- package/lib/plugin-area/plugin-context.js.map +1 -1
- package/lib/route/get-routes.js +3 -6
- package/lib/route/get-routes.js.map +1 -1
- package/lib/route/old/get-menus.js +2 -4
- package/lib/route/old/get-menus.js.map +1 -1
- package/lib/route/old/render.js +2 -5
- package/lib/route/old/render.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.js +3 -7
- package/lib/route/react-navigation/get-navigation-utils.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.js +6 -10
- package/lib/route/react-navigation/react-navigation-render.js.map +1 -1
- package/lib/route/react-navigation/root-navigation.js +3 -5
- package/lib/route/react-navigation/root-navigation.js.map +1 -1
- package/lib/route/react-navigation/types.js +1 -2
- package/lib/route/react-navigation/types.js.map +1 -1
- package/lib/route/render-routes-native.js +4 -62
- package/lib/route/render-routes-native.js.map +1 -1
- package/lib/route/render-routes.js +2 -132
- package/lib/route/render-routes.js.map +1 -1
- package/lib/route/root-navigation.js +3 -5
- package/lib/route/root-navigation.js.map +1 -1
- package/lib/route-based-plugin-area/plugin-api.js +6 -9
- package/lib/route-based-plugin-area/plugin-api.js.map +1 -1
- package/lib/route-based-plugin-area/plugin-context.js +2 -18
- package/lib/route-based-plugin-area/plugin-context.js.map +1 -1
- package/lib/route-based-plugin-area/route-based-plugin-area.js +4 -10
- package/lib/route-based-plugin-area/route-based-plugin-area.js.map +1 -1
- package/lib/router-factory/index.js +3 -7
- package/lib/router-factory/index.js.map +1 -1
- package/lib/router-factory/index.native.js +3 -7
- package/lib/router-factory/index.native.js.map +1 -1
- package/lib/utils/before-ssr.js +2 -4
- package/lib/utils/before-ssr.js.map +1 -1
- package/lib/utils/combine.js +1 -3
- package/lib/utils/combine.js.map +1 -1
- package/lib/utils/hydrate.js +2 -4
- package/lib/utils/hydrate.js.map +1 -1
- package/lib/utils/sort-keys.js +3 -5
- package/lib/utils/sort-keys.js.map +1 -1
- package/lib/utils/utils.js +2 -3
- package/lib/utils/utils.js.map +1 -1
- package/package.json +7 -6
- package/lib/__tests__/fill-register-test.js +0 -45
- package/lib/__tests__/fill-register-test.js.map +0 -1
- package/lib/__tests__/helpers/sample-menu.js +0 -75
- package/lib/__tests__/helpers/sample-menu.js.map +0 -1
- package/lib/__tests__/integrated-routes.test.js +0 -59
- package/lib/__tests__/integrated-routes.test.js.map +0 -1
- package/lib/__tests__/router-render.test.js +0 -49
- package/lib/__tests__/router-render.test.js.map +0 -1
- package/lib/connector/connector.test.js +0 -11
- package/lib/connector/connector.test.js.map +0 -1
- package/lib/connector/index.js +0 -2
- package/lib/connector/index.js.map +0 -1
- package/lib/interfaces/extended-feature.js +0 -2
- package/lib/interfaces/extended-feature.js.map +0 -1
- package/lib/interfaces/feature.js +0 -2
- package/lib/interfaces/feature.js.map +0 -1
- package/lib/interfaces/index.js +0 -6
- package/lib/interfaces/index.js.map +0 -1
- package/lib/interfaces/new-router.js +0 -2
- package/lib/interfaces/new-router.js.map +0 -1
- package/lib/interfaces/router.js +0 -2
- package/lib/interfaces/router.js.map +0 -1
- package/lib/inversify/index.js +0 -2
- package/lib/inversify/index.js.map +0 -1
- package/lib/plugin-area/__tests__/higher-order-component-util.test.js +0 -39
- package/lib/plugin-area/__tests__/higher-order-component-util.test.js.map +0 -1
- package/lib/plugin-area/__tests__/plugin-api.test.js +0 -52
- package/lib/plugin-area/__tests__/plugin-api.test.js.map +0 -1
- package/lib/plugin-area/higher-order-component-util.js +0 -19
- package/lib/plugin-area/higher-order-component-util.js.map +0 -1
- package/lib/route/__tests__/admin-new-routes.test.js +0 -145
- package/lib/route/__tests__/admin-new-routes.test.js.map +0 -1
- package/lib/route/__tests__/config-routes.test.d.ts +0 -0
- package/lib/route/__tests__/config-routes.test.js +0 -326
- package/lib/route/__tests__/config-routes.test.js.map +0 -1
- package/lib/route/__tests__/getFlatMenus.test.js +0 -94
- package/lib/route/__tests__/getFlatMenus.test.js.map +0 -1
- package/lib/route/__tests__/render-routes-config.test.js +0 -57
- package/lib/route/__tests__/render-routes-config.test.js.map +0 -1
- package/lib/route/__tests__/route-type.test.js +0 -8
- package/lib/route/__tests__/route-type.test.js.map +0 -1
- package/lib/route/get-routes.test.js +0 -184
- package/lib/route/get-routes.test.js.map +0 -1
- package/lib/route/index.js +0 -3
- package/lib/route/index.js.map +0 -1
- package/lib/route/index.native.js +0 -2
- package/lib/route/index.native.js.map +0 -1
- package/lib/route/old/__tests__/config-sidebar-menu.test.js +0 -200
- package/lib/route/old/__tests__/config-sidebar-menu.test.js.map +0 -1
- package/lib/route/old/get-routes-notused.js +0 -63
- package/lib/route/old/get-routes-notused.js.map +0 -1
- package/lib/route/react-navigation/get-navigation-utils.test.js +0 -180
- package/lib/route/react-navigation/get-navigation-utils.test.js.map +0 -1
- package/lib/route/react-navigation/index.js +0 -3
- package/lib/route/react-navigation/index.js.map +0 -1
- package/lib/route/react-navigation/react-native.sample.test.js +0 -13
- package/lib/route/react-navigation/react-native.sample.test.js.map +0 -1
- package/lib/route/react-navigation/react-native.sample1.test.js +0 -30
- package/lib/route/react-navigation/react-native.sample1.test.js.map +0 -1
- package/lib/route/react-navigation/react-navigation-render.test.js +0 -139
- package/lib/route/react-navigation/react-navigation-render.test.js.map +0 -1
- package/lib/route/react-navigation/routes.js +0 -2
- package/lib/route/react-navigation/routes.js.map +0 -1
- package/lib/route/render-routes.test.js +0 -452
- package/lib/route/render-routes.test.js.map +0 -1
- package/lib/route/test-routes.js +0 -578
- package/lib/route/test-routes.js.map +0 -1
- package/lib/route-based-plugin-area/__tests__/higher-order-component-util.test.js +0 -39
- package/lib/route-based-plugin-area/__tests__/higher-order-component-util.test.js.map +0 -1
- package/lib/route-based-plugin-area/__tests__/plugin-api.test.js +0 -52
- package/lib/route-based-plugin-area/__tests__/plugin-api.test.js.map +0 -1
- package/lib/route-based-plugin-area/higher-order-component-util.js +0 -19
- package/lib/route-based-plugin-area/higher-order-component-util.js.map +0 -1
- package/lib/route-based-plugin-area/index.js +0 -3
- package/lib/route-based-plugin-area/index.js.map +0 -1
- package/lib/utils/index.js +0 -6
- package/lib/utils/index.js.map +0 -1
- package/lib/utils/sort-keys.test.js +0 -59
- package/lib/utils/sort-keys.test.js.map +0 -1
|
@@ -1,145 +0,0 @@
|
|
|
1
|
-
import * as React from 'react';
|
|
2
|
-
import { getRoutes } from '../get-routes';
|
|
3
|
-
const sortKeys = require('sort-keys');
|
|
4
|
-
import { renderRoutes2 as renderRoutes } from '../render-routes';
|
|
5
|
-
import 'jest';
|
|
6
|
-
function MyComponent(props) {
|
|
7
|
-
return React.createElement("div", null,
|
|
8
|
-
"MyComponent ",
|
|
9
|
-
JSON.stringify(props));
|
|
10
|
-
}
|
|
11
|
-
const routerConfig1 = {
|
|
12
|
-
['/']: {
|
|
13
|
-
exact: false,
|
|
14
|
-
component: MyComponent
|
|
15
|
-
},
|
|
16
|
-
['//']: {
|
|
17
|
-
exact: true,
|
|
18
|
-
component: MyComponent
|
|
19
|
-
},
|
|
20
|
-
['//a']: {
|
|
21
|
-
component: MyComponent,
|
|
22
|
-
},
|
|
23
|
-
['/a/1']: {
|
|
24
|
-
component: MyComponent,
|
|
25
|
-
},
|
|
26
|
-
['/a/:b']: {
|
|
27
|
-
component: MyComponent,
|
|
28
|
-
},
|
|
29
|
-
['/a/:b/1']: {
|
|
30
|
-
component: MyComponent,
|
|
31
|
-
},
|
|
32
|
-
['/a/:b/c']: {
|
|
33
|
-
exact: true,
|
|
34
|
-
component: MyComponent,
|
|
35
|
-
},
|
|
36
|
-
['/a/:b/c/1']: {
|
|
37
|
-
component: MyComponent,
|
|
38
|
-
},
|
|
39
|
-
['/a/:c/1']: {
|
|
40
|
-
component: MyComponent,
|
|
41
|
-
},
|
|
42
|
-
['/a/2']: {
|
|
43
|
-
component: MyComponent,
|
|
44
|
-
},
|
|
45
|
-
['/a/2/1']: {
|
|
46
|
-
component: MyComponent,
|
|
47
|
-
},
|
|
48
|
-
['/ab/2/1']: {
|
|
49
|
-
component: MyComponent,
|
|
50
|
-
},
|
|
51
|
-
['/b/1']: {
|
|
52
|
-
component: MyComponent,
|
|
53
|
-
},
|
|
54
|
-
['/b/login/register']: {
|
|
55
|
-
component: MyComponent,
|
|
56
|
-
},
|
|
57
|
-
};
|
|
58
|
-
const routerConfig = {
|
|
59
|
-
["/login"]: { exact: true, component: MyComponent },
|
|
60
|
-
["/callback"]: { exact: true, component: MyComponent },
|
|
61
|
-
["/:orgName/usermenu/logout"]: { exact: true, component: MyComponent },
|
|
62
|
-
["/:orgName/usermenu/profile"]: { exact: true, component: MyComponent },
|
|
63
|
-
["/authenticate-popup"]: { exact: true, component: MyComponent },
|
|
64
|
-
["/reset-password"]: { exact: true, component: MyComponent },
|
|
65
|
-
["/:orgName/usermenu/account/"]: { exact: false, component: MyComponent },
|
|
66
|
-
["/:orgName/usermenu/billing"]: { exact: false, component: MyComponent },
|
|
67
|
-
["/"]: { exact: true, component: MyComponent },
|
|
68
|
-
["/:orgName/usermenu/account"]: { exact: false, component: MyComponent },
|
|
69
|
-
["/:orgName/usermenu/account-settings"]: { exact: true, component: MyComponent },
|
|
70
|
-
["/:orgName/teams/view/:teamName"]: { exact: false, component: MyComponent },
|
|
71
|
-
["/:orgName/teams"]: { exact: true, component: MyComponent },
|
|
72
|
-
["/:orgName/invitation"]: { exact: true, component: MyComponent },
|
|
73
|
-
["/:orgName/usermenu/organizations"]: { exact: true, component: MyComponent },
|
|
74
|
-
["/:orgName/usermenu/switch-organization"]: { exact: true, component: MyComponent },
|
|
75
|
-
["/:orgName/pref"]: { exact: false, component: MyComponent },
|
|
76
|
-
["/:orgName/members"]: { exact: false, component: MyComponent },
|
|
77
|
-
["/:orgName/dashboard"]: { exact: true, component: MyComponent },
|
|
78
|
-
["/:orgName/registries"]: { exact: true, component: MyComponent },
|
|
79
|
-
["/:orgName/create-workspace"]: { exact: true, component: MyComponent },
|
|
80
|
-
["/:orgName/workspace/:id/details"]: { exact: true, component: MyComponent },
|
|
81
|
-
["/:orgName/workspace/:id/editor"]: { exact: true, component: MyComponent },
|
|
82
|
-
["/:orgName/workspace/:id"]: { exact: true, component: undefined },
|
|
83
|
-
["/:orgName/repository"]: { exact: true, component: MyComponent },
|
|
84
|
-
["/:orgName/artifact"]: { exact: false, component: MyComponent },
|
|
85
|
-
["/:orgName"]: { exact: false, component: MyComponent },
|
|
86
|
-
};
|
|
87
|
-
const compare = ((a, b) => {
|
|
88
|
-
const aStr = String(a).toLowerCase();
|
|
89
|
-
const bStr = String(b).toLowerCase();
|
|
90
|
-
// Alphanumeric elements always come before non-alphanumeric elements
|
|
91
|
-
const aIsAlphanumeric = notStartWithColon(aStr);
|
|
92
|
-
const bIsAlphanumeric = notStartWithColon(bStr);
|
|
93
|
-
console.log('aIsAlphanumeric, bIsAlphanumeric', aIsAlphanumeric, bIsAlphanumeric);
|
|
94
|
-
if (aIsAlphanumeric && !bIsAlphanumeric) {
|
|
95
|
-
return -1;
|
|
96
|
-
}
|
|
97
|
-
else if (bIsAlphanumeric && !aIsAlphanumeric) {
|
|
98
|
-
return 1;
|
|
99
|
-
}
|
|
100
|
-
// Numerical elements always come before alphabetic elements
|
|
101
|
-
const aNum = Number(a);
|
|
102
|
-
const bNum = Number(b);
|
|
103
|
-
// If both are numerical, sort in the usual fashion (smaller goes first)
|
|
104
|
-
if (aNum && bNum) {
|
|
105
|
-
return aNum - bNum;
|
|
106
|
-
// If a is numerical but b isn't, put a first.
|
|
107
|
-
}
|
|
108
|
-
else if (aNum) {
|
|
109
|
-
return -1;
|
|
110
|
-
// If b is numerical but a isn't, put b first.
|
|
111
|
-
}
|
|
112
|
-
else if (bNum) {
|
|
113
|
-
return 1;
|
|
114
|
-
}
|
|
115
|
-
// In all other cases, default to usual sort order.
|
|
116
|
-
return aStr.localeCompare(bStr);
|
|
117
|
-
});
|
|
118
|
-
function notStartWithColon(str) {
|
|
119
|
-
return !str.match(/^\/:.*/);
|
|
120
|
-
}
|
|
121
|
-
describe('new getRoutes utility with basic routes', () => {
|
|
122
|
-
xtest('with /a', async () => {
|
|
123
|
-
const result = {
|
|
124
|
-
// component: any,
|
|
125
|
-
routes: [{
|
|
126
|
-
path: '/a', routes: [{ path: '/a/1', exact: true },
|
|
127
|
-
{ path: '/a/:b/1', exact: true },
|
|
128
|
-
{ path: '/a/2', routes: [{ 'exact': true, 'path': '/a/2/1' }] },
|
|
129
|
-
{ path: '/ab/2/1', exact: true }],
|
|
130
|
-
}],
|
|
131
|
-
};
|
|
132
|
-
const routes1 = getRoutes('/', sortKeys(routerConfig1));
|
|
133
|
-
// const routes = getRoutes(/^\/.*/, sortKeys(routerConfig, { compare }));
|
|
134
|
-
expect(routes1).toMatchSnapshot();
|
|
135
|
-
// expect(routes).toMatchSnapshot();
|
|
136
|
-
});
|
|
137
|
-
test('with org', async () => {
|
|
138
|
-
const routes1 = getRoutes('/', sortKeys(routerConfig1));
|
|
139
|
-
const renderedRoutes = renderRoutes({
|
|
140
|
-
routes: routes1,
|
|
141
|
-
});
|
|
142
|
-
expect(renderedRoutes).toMatchSnapshot();
|
|
143
|
-
});
|
|
144
|
-
});
|
|
145
|
-
//# sourceMappingURL=admin-new-routes.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"admin-new-routes.test.js","sourceRoot":"","sources":["../../../src/route/__tests__/admin-new-routes.test.tsx"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -1,326 +0,0 @@
|
|
|
1
|
-
// OUTDATED TEST NEED TO UPDATE
|
|
2
|
-
// import * as React from 'react';
|
|
3
|
-
// import * as renderer from 'react-test-renderer';
|
|
4
|
-
// import * as Loadable from 'react-loadable';
|
|
5
|
-
// import { Route } from 'react-router-dom';
|
|
6
|
-
// import { getRoutes } from '../get-routes';
|
|
7
|
-
// import { Feature } from '../../connector';
|
|
8
|
-
// import { FeatureWithRouterFactory } from '../../router-factory';
|
|
9
|
-
// import 'jest';
|
|
10
|
-
// function waitFor(delay) {
|
|
11
|
-
// return new Promise(resolve => {
|
|
12
|
-
// setTimeout(resolve, delay);
|
|
13
|
-
// });
|
|
14
|
-
// }
|
|
15
|
-
// function createLoader(delay, loader, error?: any) {
|
|
16
|
-
// return () => {
|
|
17
|
-
// return waitFor(delay).then(() => {
|
|
18
|
-
// if (loader) {
|
|
19
|
-
// return loader();
|
|
20
|
-
// } else {
|
|
21
|
-
// throw error;
|
|
22
|
-
// }
|
|
23
|
-
// });
|
|
24
|
-
// };
|
|
25
|
-
// }
|
|
26
|
-
// function MyLoadingComponent(props) {
|
|
27
|
-
// return <div>MyLoadingComponent {JSON.stringify(props)}</div>;
|
|
28
|
-
// }
|
|
29
|
-
// function MyComponent(props) {
|
|
30
|
-
// return <div>MyComponent {JSON.stringify(props)}</div>;
|
|
31
|
-
// }
|
|
32
|
-
// afterEach(async () => {
|
|
33
|
-
// try {
|
|
34
|
-
// await Loadable.preloadAll();
|
|
35
|
-
// } catch (err) {
|
|
36
|
-
// }
|
|
37
|
-
// });
|
|
38
|
-
// // Test case borrowed from
|
|
39
|
-
// // https://github.com/jamiebuilds/react-loadable/blob/master/__tests__/test.js
|
|
40
|
-
// test('loading success', async () => {
|
|
41
|
-
// let LoadableMyComponent = Loadable({
|
|
42
|
-
// loader: createLoader(400, () => MyComponent),
|
|
43
|
-
// loading: MyLoadingComponent,
|
|
44
|
-
// });
|
|
45
|
-
// let component1 = renderer.create(<LoadableMyComponent prop="foo" />);
|
|
46
|
-
// expect(component1.toJSON()).toMatchSnapshot(); // initial
|
|
47
|
-
// await waitFor(200);
|
|
48
|
-
// expect(component1.toJSON()).toMatchSnapshot(); // loading
|
|
49
|
-
// await waitFor(200);
|
|
50
|
-
// expect(component1.toJSON()).toMatchSnapshot(); // loaded
|
|
51
|
-
// let component2 = renderer.create(<LoadableMyComponent prop="bar" />);
|
|
52
|
-
// expect(component2.toJSON()).toMatchSnapshot(); // reload
|
|
53
|
-
// });
|
|
54
|
-
// const routerConfig = (namespace = '') => ({
|
|
55
|
-
// [namespace + '/a']: {
|
|
56
|
-
// component: MyComponent,
|
|
57
|
-
// },
|
|
58
|
-
// ['/a/1']: {
|
|
59
|
-
// component: MyComponent,
|
|
60
|
-
// },
|
|
61
|
-
// ['/a/:b/1']: {
|
|
62
|
-
// component: MyComponent,
|
|
63
|
-
// },
|
|
64
|
-
// [namespace + '/a/1']: {
|
|
65
|
-
// component: MyComponent,
|
|
66
|
-
// },
|
|
67
|
-
// [namespace + '/a/:c/1']: {
|
|
68
|
-
// component: MyComponent,
|
|
69
|
-
// },
|
|
70
|
-
// [namespace + '/a/2']: {
|
|
71
|
-
// component: MyComponent,
|
|
72
|
-
// },
|
|
73
|
-
// [namespace + '/a/2/1']: {
|
|
74
|
-
// component: MyComponent,
|
|
75
|
-
// },
|
|
76
|
-
// [namespace + '/ab/2/1']: {
|
|
77
|
-
// component: MyComponent,
|
|
78
|
-
// },
|
|
79
|
-
// [namespace + '/b/1']: {
|
|
80
|
-
// component: MyComponent,
|
|
81
|
-
// },
|
|
82
|
-
// [namespace + '/b/login/register']: {
|
|
83
|
-
// component: MyComponent,
|
|
84
|
-
// },
|
|
85
|
-
// });
|
|
86
|
-
// describe('getRoutes utility with basic routes', () => {
|
|
87
|
-
// test('with /a', async () => {
|
|
88
|
-
// const result = {
|
|
89
|
-
// // component: any,
|
|
90
|
-
// routes: [{
|
|
91
|
-
// path: '/a', exact: true, routes:
|
|
92
|
-
// [{ path: '/a/1', exact: true },
|
|
93
|
-
// { path: '/a/:b/1', exact: true },
|
|
94
|
-
// { path: '/a/2', exact: false, routes: [{ 'exact': true, 'path': '/a/2/1' }] },
|
|
95
|
-
// { path: '/ab/2/1', exact: true }],
|
|
96
|
-
// }],
|
|
97
|
-
// };
|
|
98
|
-
// const routes = getRoutes('/', routerConfig());
|
|
99
|
-
// expect(routes).toMatchSnapshot();
|
|
100
|
-
// });
|
|
101
|
-
// test('with /', async () => {
|
|
102
|
-
// const result =
|
|
103
|
-
// [{
|
|
104
|
-
// path: '/a', exact: false, routes:
|
|
105
|
-
// [
|
|
106
|
-
// { path: '/a/1', exact: true },
|
|
107
|
-
// { path: '/a/:b/1', exact: true },
|
|
108
|
-
// { path: '/a/:c/1', exact: true },
|
|
109
|
-
// {
|
|
110
|
-
// path: '/a/2', exact: false, routes:
|
|
111
|
-
// [
|
|
112
|
-
// { path: '/a/2/1', exact: true },
|
|
113
|
-
// ],
|
|
114
|
-
// },
|
|
115
|
-
// ],
|
|
116
|
-
// },
|
|
117
|
-
// { path: '/ab/2/1', exact: true },
|
|
118
|
-
// { path: '/b/1', exact: true },
|
|
119
|
-
// { path: '/b/login/register', exact: true }];
|
|
120
|
-
// const routes = getRoutes('/', routerConfig());
|
|
121
|
-
// expect(routes).toMatchSnapshot();
|
|
122
|
-
// expect(JSON.parse(JSON.stringify(routes))).toMatchObject(result);
|
|
123
|
-
// });
|
|
124
|
-
// test('with `@`in root throws error', async () => {
|
|
125
|
-
// try {
|
|
126
|
-
// getRoutes('@namespace.', routerConfig('@namespace'));
|
|
127
|
-
// } catch (e) {
|
|
128
|
-
// expect(e.message).toEqual('Invalid path!');
|
|
129
|
-
// }
|
|
130
|
-
// });
|
|
131
|
-
// xdescribe('getRoutes utility with realistic routes', () => {
|
|
132
|
-
// test('with realistic routes', () => {
|
|
133
|
-
// const genRoutes = {
|
|
134
|
-
// ['/path']: { component: MyComponent, exact: true },
|
|
135
|
-
// ['/path/a']: { component: MyComponent },
|
|
136
|
-
// ['/path/a/b']: { component: MyComponent },
|
|
137
|
-
// ['/path/child']: { component: MyComponent, exact: true },
|
|
138
|
-
// ['/path/child1']: { component: MyComponent, exact: true },
|
|
139
|
-
// };
|
|
140
|
-
// const routes = getRoutes('/', genRoutes);
|
|
141
|
-
// const result = [
|
|
142
|
-
// {
|
|
143
|
-
// // should render
|
|
144
|
-
// component: MyComponent,
|
|
145
|
-
// path: '/path',
|
|
146
|
-
// exact: true,
|
|
147
|
-
// routes: [
|
|
148
|
-
// {
|
|
149
|
-
// // should skip
|
|
150
|
-
// component: MyComponent,
|
|
151
|
-
// path: '/path/a',
|
|
152
|
-
// exact: false,
|
|
153
|
-
// routes: [
|
|
154
|
-
// {
|
|
155
|
-
// // should skip
|
|
156
|
-
// component: MyComponent,
|
|
157
|
-
// path: '/path/a/b',
|
|
158
|
-
// exact: true,
|
|
159
|
-
// },
|
|
160
|
-
// ],
|
|
161
|
-
// },
|
|
162
|
-
// {
|
|
163
|
-
// // should skip
|
|
164
|
-
// component: MyComponent,
|
|
165
|
-
// path: '/path/child',
|
|
166
|
-
// exact: true,
|
|
167
|
-
// },
|
|
168
|
-
// {
|
|
169
|
-
// // should render
|
|
170
|
-
// path: '/path/child1',
|
|
171
|
-
// component: MyComponent,
|
|
172
|
-
// },
|
|
173
|
-
// ],
|
|
174
|
-
// },
|
|
175
|
-
// ];
|
|
176
|
-
// expect(routes).toMatchObject(result);
|
|
177
|
-
// expect(routes).toMatchSnapshot();
|
|
178
|
-
// });
|
|
179
|
-
// it('another realistic test', () => {
|
|
180
|
-
// const genRoutes = [
|
|
181
|
-
// {
|
|
182
|
-
// ['/ghost']: { component: MyComponent },
|
|
183
|
-
// ['/pepper']: { component: MyComponent, exact: false },
|
|
184
|
-
// ['/pepper/:type']: { component: MyComponent, exact: false },
|
|
185
|
-
// ['/pepper/:type/scoville']: { component: MyComponent, exact: false },
|
|
186
|
-
// },
|
|
187
|
-
// ];
|
|
188
|
-
// const result = [
|
|
189
|
-
// {
|
|
190
|
-
// path: '/ghost',
|
|
191
|
-
// component: MyComponent,
|
|
192
|
-
// },
|
|
193
|
-
// {
|
|
194
|
-
// path: '/pepper',
|
|
195
|
-
// component: MyComponent,
|
|
196
|
-
// exact: false,
|
|
197
|
-
// routes: [
|
|
198
|
-
// {
|
|
199
|
-
// path: '/pepper/:type',
|
|
200
|
-
// component: MyComponent,
|
|
201
|
-
// exact: false,
|
|
202
|
-
// routes: [
|
|
203
|
-
// {
|
|
204
|
-
// path: '/pepper/:type/scoville',
|
|
205
|
-
// component: MyComponent,
|
|
206
|
-
// exact: false,
|
|
207
|
-
// },
|
|
208
|
-
// ],
|
|
209
|
-
// },
|
|
210
|
-
// ],
|
|
211
|
-
// },
|
|
212
|
-
// ];
|
|
213
|
-
// const connector = new Feature({ routeConfig: genRoutes });
|
|
214
|
-
// const connectorRoutes = connector.getConfiguredRoutes();
|
|
215
|
-
// expect(connectorRoutes).toMatchObject(result);
|
|
216
|
-
// });
|
|
217
|
-
// });
|
|
218
|
-
// it('with root', () => {
|
|
219
|
-
// const genRoutes = [
|
|
220
|
-
// {
|
|
221
|
-
// ['/']: { component: MyComponent, exact: false },
|
|
222
|
-
// ['/ghost']: { component: MyComponent },
|
|
223
|
-
// ['/pepper']: { component: MyComponent, exact: false },
|
|
224
|
-
// ['/pepper/:type']: { component: MyComponent, exact: false },
|
|
225
|
-
// ['/pepper/:type/scoville']: { component: MyComponent, exact: false },
|
|
226
|
-
// },
|
|
227
|
-
// ];
|
|
228
|
-
// const connector = new Feature({ routeConfig: genRoutes });
|
|
229
|
-
// const connectorRoutes = connector.getConfiguredRoutes();
|
|
230
|
-
// expect(connectorRoutes).toMatchSnapshot();
|
|
231
|
-
// });
|
|
232
|
-
// });
|
|
233
|
-
// xdescribe('connector configuredRoutes', () => {
|
|
234
|
-
// test('with no arguments passed', async () => {
|
|
235
|
-
// const connector = new Feature({ routeConfig: routerConfig() });
|
|
236
|
-
// const result = [{
|
|
237
|
-
// exact: false, path: '/a',
|
|
238
|
-
// routes: [
|
|
239
|
-
// { exact: true, path: '/a/1' },
|
|
240
|
-
// { path: '/a/:b/1', exact: true },
|
|
241
|
-
// { path: '/a/:c/1', exact: true },
|
|
242
|
-
// {
|
|
243
|
-
// exact: false, path: '/a/2',
|
|
244
|
-
// routes: [
|
|
245
|
-
// { exact: true, path: '/a/2/1' },
|
|
246
|
-
// ],
|
|
247
|
-
// }],
|
|
248
|
-
// },
|
|
249
|
-
// { exact: true, path: '/ab/2/1' },
|
|
250
|
-
// { exact: true, path: '/b/1' },
|
|
251
|
-
// { exact: true, path: '/b/login/register' }];
|
|
252
|
-
// const routes = connector.getConfiguredRoutes();
|
|
253
|
-
// expect(routes).toMatchSnapshot();
|
|
254
|
-
// expect(JSON.parse(JSON.stringify(routes))).toMatchObject(result);
|
|
255
|
-
// });
|
|
256
|
-
// test('with @namespace in routes', async () => {
|
|
257
|
-
// const connector = new Feature({ routeConfig: routerConfig('@namespace') });
|
|
258
|
-
// const result = [
|
|
259
|
-
// { exact: true, path: '/a/1' },
|
|
260
|
-
// { path: '/a/:b/1', exact: true },
|
|
261
|
-
// ];
|
|
262
|
-
// expect(JSON.parse(JSON.stringify(connector.getConfiguredRoutes()))).toMatchObject(result);
|
|
263
|
-
// });
|
|
264
|
-
// });
|
|
265
|
-
// xdescribe('connector getRoutes', () => {
|
|
266
|
-
// const staticRoutes = {
|
|
267
|
-
// route: [
|
|
268
|
-
// <Route key={'static1'} exact={true} path="/static1" component={MyComponent} />,
|
|
269
|
-
// <Route key={'static2'} exact={true} path="/static2" component={MyComponent} />,
|
|
270
|
-
// ],
|
|
271
|
-
// };
|
|
272
|
-
// const staticRoutes2 = {
|
|
273
|
-
// route: [
|
|
274
|
-
// <Route key={'static3'} exact={true} path="/static3" component={MyComponent} />,
|
|
275
|
-
// <Route key={'static4'} exact={true} path="/static4" component={MyComponent} />,
|
|
276
|
-
// ],
|
|
277
|
-
// };
|
|
278
|
-
// test('with only static routes', async () => {
|
|
279
|
-
// const connector = new Feature(staticRoutes, FeatureWithRouterFactory);
|
|
280
|
-
// expect(connector.routerFactory()).toMatchSnapshot();
|
|
281
|
-
// });
|
|
282
|
-
// test('with static routes and configurable routes', async () => {
|
|
283
|
-
// const connector = new Feature({ routeConfig: routerConfig() }, new Feature(staticRoutes));
|
|
284
|
-
// expect(connector.getRoutes()).toMatchSnapshot();
|
|
285
|
-
// });
|
|
286
|
-
// test('with only configurable routes', async () => {
|
|
287
|
-
// const connector = new Feature({ routeConfig: routerConfig() });
|
|
288
|
-
// expect(connector.getRoutes()).toMatchSnapshot();
|
|
289
|
-
// });
|
|
290
|
-
// test('with multiple Features', async () => {
|
|
291
|
-
// const connector = new Feature(
|
|
292
|
-
// { routeConfig: routerConfig() },
|
|
293
|
-
// new Feature(staticRoutes),
|
|
294
|
-
// new Feature(staticRoutes2),
|
|
295
|
-
// { routeConfig: routerConfig('/ac') },
|
|
296
|
-
// );
|
|
297
|
-
// const routes = connector.getRoutes();
|
|
298
|
-
// expect(routes).toMatchSnapshot();
|
|
299
|
-
// });
|
|
300
|
-
// });
|
|
301
|
-
// xdescribe('filter routes with realizting routes', () => {
|
|
302
|
-
// const genRoutes = {
|
|
303
|
-
// ['/']: { component: MyComponent, exact: true },
|
|
304
|
-
// ['/l']: { component: MyComponent },
|
|
305
|
-
// ['/rl']: { component: MyComponent },
|
|
306
|
-
// ['/:or/a/b']: { component: MyComponent },
|
|
307
|
-
// ['/:or/child']: { component: MyComponent, exact: true },
|
|
308
|
-
// ['/:or/child1']: { component: MyComponent, exact: true },
|
|
309
|
-
// };
|
|
310
|
-
// const result =
|
|
311
|
-
// [
|
|
312
|
-
// { path: '/', exact: true },
|
|
313
|
-
// { path: '/l' },
|
|
314
|
-
// { path: '/rl' },
|
|
315
|
-
// { path: '/:or/ab/2/1', exact: true },
|
|
316
|
-
// { path: '/:or/b/1', exact: true },
|
|
317
|
-
// { path: '/:or/b/login/register', exact: true }];
|
|
318
|
-
// const connector = new Feature({ routeConfig: genRoutes });
|
|
319
|
-
// const regexExpNotStartWithColon = /^\/(?!(:)).*/;
|
|
320
|
-
// const connectorRoutes = connector.getConfiguredRoutes('/');
|
|
321
|
-
// // TODO now need to filter routes which don't start with `/:or`. Something
|
|
322
|
-
// // similar to regex, we need to a netgaive `connector.getConfiguredRoutes('^/:or');`
|
|
323
|
-
// console.log('---ConnectorRoutes', connectorRoutes);
|
|
324
|
-
// // connectorRoutes.
|
|
325
|
-
// });
|
|
326
|
-
//# sourceMappingURL=config-routes.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"config-routes.test.js","sourceRoot":"","sources":["../../../src/route/__tests__/config-routes.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,94 +0,0 @@
|
|
|
1
|
-
import { getFlatMenus, transformRoute } from '@umijs/route-utils';
|
|
2
|
-
const routes = [
|
|
3
|
-
{
|
|
4
|
-
path: '/welcome',
|
|
5
|
-
name: 'welcome',
|
|
6
|
-
exact: true,
|
|
7
|
-
unaccessible: false,
|
|
8
|
-
},
|
|
9
|
-
{
|
|
10
|
-
path: '/admin',
|
|
11
|
-
name: 'admin',
|
|
12
|
-
access: 'canAdmin',
|
|
13
|
-
routes: [
|
|
14
|
-
{
|
|
15
|
-
path: '/admin/sub-page',
|
|
16
|
-
name: 'sub-page',
|
|
17
|
-
exact: true,
|
|
18
|
-
unaccessible: false,
|
|
19
|
-
},
|
|
20
|
-
],
|
|
21
|
-
},
|
|
22
|
-
{
|
|
23
|
-
name: 'list.table.result',
|
|
24
|
-
path: '/list/:id',
|
|
25
|
-
exact: true,
|
|
26
|
-
unaccessible: false,
|
|
27
|
-
},
|
|
28
|
-
{
|
|
29
|
-
name: 'list.table-list',
|
|
30
|
-
path: '/list',
|
|
31
|
-
exact: true,
|
|
32
|
-
unaccessible: false,
|
|
33
|
-
},
|
|
34
|
-
{ path: '/', redirect: '/welcome', exact: true, unaccessible: false },
|
|
35
|
-
];
|
|
36
|
-
const { menuData } = transformRoute(routes, true, ({ id }) => {
|
|
37
|
-
if (id === 'menu.list.table-list')
|
|
38
|
-
return 'query table';
|
|
39
|
-
if (id === 'menu.list.table.result')
|
|
40
|
-
return 'Data details';
|
|
41
|
-
if (id === 'menu.admin')
|
|
42
|
-
return 'Admin page';
|
|
43
|
-
if (id === 'menu.admin.sub-page')
|
|
44
|
-
return 'Secondary management page';
|
|
45
|
-
if (id === 'menu.welcome')
|
|
46
|
-
return 'welcome';
|
|
47
|
-
return id;
|
|
48
|
-
});
|
|
49
|
-
console.log('---Menu Data', menuData);
|
|
50
|
-
describe('getFlatMenus', () => {
|
|
51
|
-
it('normal', () => {
|
|
52
|
-
const flatMenus = getFlatMenus(menuData);
|
|
53
|
-
console.log('--flatMenus', flatMenus);
|
|
54
|
-
expect(Object.keys(flatMenus).length).toEqual(5);
|
|
55
|
-
expect(flatMenus['/list'].name).toEqual('Inquiry Form');
|
|
56
|
-
expect(flatMenus).toMatchSnapshot();
|
|
57
|
-
});
|
|
58
|
-
it('no has ket', () => {
|
|
59
|
-
const noHasKeyData = [
|
|
60
|
-
{
|
|
61
|
-
path: '/welcome',
|
|
62
|
-
name: '欢迎',
|
|
63
|
-
exact: true,
|
|
64
|
-
unaccessible: false,
|
|
65
|
-
locale: 'menu.welcome',
|
|
66
|
-
key: '/welcome',
|
|
67
|
-
routes: null,
|
|
68
|
-
pro_layout_parentKeys: [],
|
|
69
|
-
children: undefined,
|
|
70
|
-
},
|
|
71
|
-
{
|
|
72
|
-
path: '/welcome',
|
|
73
|
-
name: '欢迎',
|
|
74
|
-
key: '/admin/welcome',
|
|
75
|
-
exact: true,
|
|
76
|
-
unaccessible: false,
|
|
77
|
-
locale: 'menu.welcome',
|
|
78
|
-
routes: null,
|
|
79
|
-
children: undefined,
|
|
80
|
-
},
|
|
81
|
-
{
|
|
82
|
-
path: '/admin',
|
|
83
|
-
name: '管理页',
|
|
84
|
-
access: 'canAdmin',
|
|
85
|
-
routes: null,
|
|
86
|
-
locale: 'menu.admin',
|
|
87
|
-
pro_layout_parentKeys: [],
|
|
88
|
-
},
|
|
89
|
-
];
|
|
90
|
-
const flatMenus = getFlatMenus(noHasKeyData);
|
|
91
|
-
expect(Object.keys(flatMenus).length).toEqual(2);
|
|
92
|
-
});
|
|
93
|
-
});
|
|
94
|
-
//# sourceMappingURL=getFlatMenus.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getFlatMenus.test.js","sourceRoot":"","sources":["../../../src/route/__tests__/getFlatMenus.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,57 +0,0 @@
|
|
|
1
|
-
import { ConsoleLogger } from '@cdm-logger/server';
|
|
2
|
-
import { getRoutes } from '../get-routes';
|
|
3
|
-
export const logger = ConsoleLogger.create('test', { level: 'trace' });
|
|
4
|
-
function MyComponent(props) {
|
|
5
|
-
return {};
|
|
6
|
-
}
|
|
7
|
-
test('loading success', async () => {
|
|
8
|
-
const routerConfig = (namespace = '') => ({
|
|
9
|
-
[namespace + '/a']: {
|
|
10
|
-
component: () => MyComponent,
|
|
11
|
-
},
|
|
12
|
-
['/a']: {
|
|
13
|
-
component: () => MyComponent,
|
|
14
|
-
},
|
|
15
|
-
['/a/1']: {
|
|
16
|
-
component: () => MyComponent,
|
|
17
|
-
},
|
|
18
|
-
['/a/1/2']: {
|
|
19
|
-
component: () => MyComponent,
|
|
20
|
-
},
|
|
21
|
-
['/b']: {
|
|
22
|
-
component: () => MyComponent,
|
|
23
|
-
},
|
|
24
|
-
['/a/b']: {
|
|
25
|
-
component: () => MyComponent,
|
|
26
|
-
},
|
|
27
|
-
['/a/b/1']: {
|
|
28
|
-
component: () => MyComponent,
|
|
29
|
-
},
|
|
30
|
-
['/a/b/1/2']: {
|
|
31
|
-
component: () => MyComponent,
|
|
32
|
-
},
|
|
33
|
-
['/a/b/1/2/3']: {
|
|
34
|
-
component: () => MyComponent,
|
|
35
|
-
},
|
|
36
|
-
[namespace + '/a/1']: {
|
|
37
|
-
component: () => MyComponent,
|
|
38
|
-
},
|
|
39
|
-
[namespace + '/a/2']: {
|
|
40
|
-
component: () => MyComponent,
|
|
41
|
-
},
|
|
42
|
-
[namespace + '/a/2/1']: {
|
|
43
|
-
component: () => MyComponent,
|
|
44
|
-
},
|
|
45
|
-
[namespace + '/ab/2/1']: {
|
|
46
|
-
component: () => MyComponent,
|
|
47
|
-
},
|
|
48
|
-
[namespace + '/b/1']: {
|
|
49
|
-
component: () => MyComponent,
|
|
50
|
-
},
|
|
51
|
-
[namespace + '/b/c/e']: {
|
|
52
|
-
component: () => MyComponent,
|
|
53
|
-
},
|
|
54
|
-
});
|
|
55
|
-
console.log(getRoutes('/', routerConfig('@test'), null));
|
|
56
|
-
});
|
|
57
|
-
//# sourceMappingURL=render-routes-config.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"render-routes-config.test.js","sourceRoot":"","sources":["../../../src/route/__tests__/render-routes-config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,CAAC,MAAM,MAAM,GAAsB,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;AAE1F,SAAS,WAAW,CAAC,KAAK;IACtB,OAAO,EAAE,CAAA;AACb,CAAC;AAED,IAAI,CAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;IAC/B,MAAM,YAAY,GAAG,CAAC,SAAS,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;QACtC,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE;YAChB,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,IAAI,CAAC,EAAE;YACJ,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,MAAM,CAAC,EAAE;YACN,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,QAAQ,CAAC,EAAE;YACR,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,IAAI,CAAC,EAAE;YACJ,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,MAAM,CAAC,EAAE;YACN,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,QAAQ,CAAC,EAAE;YACR,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,UAAU,CAAC,EAAE;YACV,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,YAAY,CAAC,EAAE;YACZ,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE;YAClB,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE;YAClB,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,SAAS,GAAG,QAAQ,CAAC,EAAE;YACpB,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,SAAS,GAAG,SAAS,CAAC,EAAE;YACrB,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE;YAClB,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;QACD,CAAC,SAAS,GAAG,QAAQ,CAAC,EAAE;YACpB,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B;KACJ,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC"}
|