@nocobase/client-v2 2.2.0-beta.8 → 2.2.0-beta.9

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 (65) hide show
  1. package/es/BaseApplication.d.ts +2 -0
  2. package/es/RouteRepository.d.ts +8 -0
  3. package/es/RouterManager.d.ts +15 -0
  4. package/es/authRedirect.d.ts +1 -0
  5. package/es/entry-actions/EntryActionManager.d.ts +24 -0
  6. package/es/entry-actions/index.d.ts +9 -0
  7. package/es/flow/admin-shell/BaseLayoutModel.d.ts +6 -0
  8. package/es/flow/admin-shell/BaseLayoutRouteCoordinator.d.ts +7 -0
  9. package/es/flow/admin-shell/admin-layout/AppListRender.d.ts +2 -1
  10. package/es/flow/admin-shell/admin-layout/AppSwitcherActionPanelModel.d.ts +24 -0
  11. package/es/flow/admin-shell/admin-layout/index.d.ts +1 -0
  12. package/es/flow/admin-shell/admin-layout/useApplications.d.ts +7 -2
  13. package/es/flow/models/base/ActionModelCore.d.ts +2 -0
  14. package/es/flow/routeTransientInputArgs.d.ts +14 -0
  15. package/es/index.d.ts +2 -0
  16. package/es/index.mjs +212 -126
  17. package/es/utils/markdownSanitize.d.ts +11 -0
  18. package/lib/index.js +198 -112
  19. package/package.json +7 -7
  20. package/src/BaseApplication.tsx +2 -0
  21. package/src/RouteRepository.ts +25 -0
  22. package/src/RouterManager.tsx +142 -1
  23. package/src/__tests__/RouteRepository.test.ts +23 -0
  24. package/src/__tests__/RouterManager.test.ts +125 -0
  25. package/src/__tests__/authRedirect.test.ts +17 -0
  26. package/src/authRedirect.ts +38 -0
  27. package/src/entry-actions/EntryActionManager.ts +76 -0
  28. package/src/entry-actions/index.ts +10 -0
  29. package/src/flow/FlowPage.tsx +29 -2
  30. package/src/flow/__tests__/FlowPage.test.tsx +152 -25
  31. package/src/flow/__tests__/FlowRoute.test.tsx +547 -2
  32. package/src/flow/actions/__tests__/dataScopeFilter.test.ts +62 -0
  33. package/src/flow/actions/__tests__/openView.defineProps.route.test.tsx +80 -20
  34. package/src/flow/actions/dataScopeFilter.ts +10 -1
  35. package/src/flow/actions/dateTimeFormat.tsx +2 -2
  36. package/src/flow/actions/openView.tsx +21 -1
  37. package/src/flow/admin-shell/BaseLayoutModel.tsx +124 -0
  38. package/src/flow/admin-shell/BaseLayoutRouteCoordinator.ts +184 -42
  39. package/src/flow/admin-shell/__tests__/AdminLayoutRouteCoordinator.test.ts +1016 -119
  40. package/src/flow/admin-shell/admin-layout/AdminLayoutComponent.tsx +41 -4
  41. package/src/flow/admin-shell/admin-layout/AdminLayoutEntryGuard.test.tsx +177 -1
  42. package/src/flow/admin-shell/admin-layout/AdminLayoutEntryGuard.tsx +20 -0
  43. package/src/flow/admin-shell/admin-layout/AppListRender.tsx +13 -2
  44. package/src/flow/admin-shell/admin-layout/AppSwitcherActionPanelModel.tsx +289 -0
  45. package/src/flow/admin-shell/admin-layout/__tests__/AdminLayoutModel.test.tsx +436 -2
  46. package/src/flow/admin-shell/admin-layout/__tests__/TopbarActionsBar.test.tsx +48 -0
  47. package/src/flow/admin-shell/admin-layout/index.ts +1 -0
  48. package/src/flow/admin-shell/admin-layout/useApplications.tsx +81 -12
  49. package/src/flow/common/Markdown/Display.tsx +14 -3
  50. package/src/flow/common/Markdown/Edit.tsx +19 -7
  51. package/src/flow/components/FlowRoute.tsx +128 -16
  52. package/src/flow/internal/components/Markdown/util.ts +2 -1
  53. package/src/flow/models/base/ActionModel.tsx +10 -8
  54. package/src/flow/models/base/ActionModelCore.tsx +5 -0
  55. package/src/flow/models/blocks/table/TableColumnModel.tsx +6 -2
  56. package/src/flow/models/blocks/table/__tests__/TableColumnModel.test.tsx +51 -0
  57. package/src/flow/models/fields/AssociationFieldModel/RecordSelectFieldModel.tsx +45 -13
  58. package/src/flow/models/fields/TextareaFieldModel.tsx +42 -19
  59. package/src/flow/models/fields/__tests__/TextareaFieldModel.test.tsx +32 -1
  60. package/src/flow/models/topbar/TopbarActionModel.tsx +78 -3
  61. package/src/flow/routeTransientInputArgs.ts +27 -0
  62. package/src/flow/utils/__tests__/dateTimeFormat.test.ts +42 -0
  63. package/src/index.ts +2 -0
  64. package/src/nocobase-buildin-plugin/index.tsx +7 -1
  65. package/src/utils/markdownSanitize.ts +88 -0
@@ -7,44 +7,105 @@
7
7
  * For more information, please refer to: https://www.nocobase.com/agreement.
8
8
  */
9
9
 
10
- import { render } from '@testing-library/react';
10
+ import { render, waitFor } from '@testing-library/react';
11
11
  import React from 'react';
12
12
  import { afterEach, describe, expect, it, vi } from 'vitest';
13
13
  import { FlowPage } from '../FlowPage';
14
14
 
15
- const mocks = vi.hoisted(() => ({
16
- rendererProps: undefined as any,
17
- model: {
15
+ type TestContextProperty = {
16
+ value?: unknown;
17
+ get?: () => unknown;
18
+ };
19
+
20
+ type TestModelContext = {
21
+ isMobileLayout: boolean;
22
+ themeToken: {
23
+ marginBlock: number;
24
+ };
25
+ addDelegate: ReturnType<typeof vi.fn>;
26
+ defineProperty: ReturnType<typeof vi.fn>;
27
+ };
28
+
29
+ type TestPageModel = {
30
+ uid: string;
31
+ props: {
32
+ showFlowSettings: boolean;
33
+ };
34
+ context: TestModelContext;
35
+ removeParentDelegate: ReturnType<typeof vi.fn>;
36
+ };
37
+
38
+ type RendererProps = {
39
+ model?: TestPageModel;
40
+ showFlowSettings?: boolean;
41
+ } & Record<string, unknown>;
42
+
43
+ const defineContextProperty = (context: TestModelContext, key: string, property: TestContextProperty) => {
44
+ Object.defineProperty(context, key, {
45
+ configurable: true,
46
+ enumerable: true,
47
+ get: property.get || (() => property.value),
48
+ });
49
+ };
50
+
51
+ const createPageModel = (): TestPageModel => {
52
+ const context = {
53
+ isMobileLayout: false,
54
+ themeToken: {
55
+ marginBlock: 16,
56
+ },
57
+ addDelegate: vi.fn(),
58
+ defineProperty: vi.fn((key: string, property: TestContextProperty) => {
59
+ defineContextProperty(context, key, property);
60
+ }),
61
+ };
62
+
63
+ return {
18
64
  uid: 'public-form-page',
19
65
  props: {
20
66
  showFlowSettings: false,
21
67
  },
22
- context: {
23
- isMobileLayout: false,
24
- themeToken: {
25
- marginBlock: 16,
26
- },
27
- },
28
- },
68
+ context,
69
+ removeParentDelegate: vi.fn(),
70
+ };
71
+ };
72
+
73
+ const mocks = vi.hoisted(() => ({
74
+ rendererMobileStates: [] as boolean[],
75
+ rendererProps: undefined as RendererProps | undefined,
76
+ model: undefined as TestPageModel | undefined,
77
+ viewInputMobileLayout: true as boolean | undefined,
78
+ contextMobileLayout: undefined as boolean | undefined,
29
79
  }));
30
80
 
31
81
  vi.mock('@nocobase/flow-engine', async () => {
32
- const actual = await vi.importActual<any>('@nocobase/flow-engine');
82
+ const actual = await vi.importActual<typeof import('@nocobase/flow-engine')>('@nocobase/flow-engine');
33
83
  const ReactModule = await import('react');
84
+ class TestPageModelClass {}
34
85
 
35
86
  return {
36
87
  ...actual,
37
- FlowModelRenderer: vi.fn((props: any) => {
88
+ FlowModelRenderer: vi.fn((props: RendererProps) => {
38
89
  mocks.rendererProps = props;
90
+ if (typeof props.model?.context.isMobileLayout === 'boolean') {
91
+ mocks.rendererMobileStates.push(props.model.context.isMobileLayout);
92
+ }
39
93
  return ReactModule.createElement('div', { 'data-testid': 'flow-model-renderer' });
40
94
  }),
41
95
  useFlowEngine: vi.fn(() => ({
42
- getModelClassAsync: vi.fn(),
43
- loadOrCreateModel: vi.fn(),
96
+ getModelClassAsync: vi.fn(async () => TestPageModelClass),
97
+ loadOrCreateModel: vi.fn(async () => mocks.model),
44
98
  context: {},
99
+ translate: vi.fn((value: string) => value),
45
100
  })),
46
101
  useFlowModelById: vi.fn(() => mocks.model),
47
102
  useFlowViewContext: vi.fn(() => ({
103
+ view: {
104
+ inputArgs: {
105
+ ...(typeof mocks.viewInputMobileLayout === 'boolean' ? { isMobileLayout: mocks.viewInputMobileLayout } : {}),
106
+ },
107
+ },
108
+ ...(typeof mocks.contextMobileLayout === 'boolean' ? { isMobileLayout: mocks.contextMobileLayout } : {}),
48
109
  themeToken: {
49
110
  marginBlock: 16,
50
111
  },
@@ -53,27 +114,93 @@ vi.mock('@nocobase/flow-engine', async () => {
53
114
  });
54
115
 
55
116
  vi.mock('ahooks', async () => {
56
- const actual = await vi.importActual<any>('ahooks');
117
+ const actual = await vi.importActual<typeof import('ahooks')>('ahooks');
118
+ const ReactModule = await import('react');
57
119
  return {
58
120
  ...actual,
59
- useRequest: vi.fn(() => ({
60
- loading: false,
61
- data: {
62
- uid: 'public-form-page',
63
- },
64
- error: null,
65
- })),
121
+ useRequest: vi.fn((service: () => Promise<unknown>) => {
122
+ const serviceRef = ReactModule.useRef(service);
123
+ const [state, setState] = ReactModule.useState<{
124
+ loading: boolean;
125
+ data?: unknown;
126
+ error?: unknown;
127
+ }>({
128
+ loading: true,
129
+ });
130
+
131
+ ReactModule.useEffect(() => {
132
+ let active = true;
133
+ serviceRef
134
+ .current()
135
+ .then((data) => {
136
+ if (active) {
137
+ setState({ loading: false, data, error: null });
138
+ }
139
+ })
140
+ .catch((error) => {
141
+ if (active) {
142
+ setState({ loading: false, data: undefined, error });
143
+ }
144
+ });
145
+
146
+ return () => {
147
+ active = false;
148
+ };
149
+ }, []);
150
+
151
+ return state;
152
+ }),
66
153
  };
67
154
  });
68
155
 
69
156
  describe('FlowPage', () => {
70
157
  afterEach(() => {
158
+ mocks.rendererMobileStates = [];
71
159
  mocks.rendererProps = undefined;
160
+ mocks.model = undefined;
161
+ mocks.viewInputMobileLayout = true;
162
+ mocks.contextMobileLayout = undefined;
72
163
  });
73
164
 
74
- it('uses showFlowSettings from page model props', () => {
165
+ it('uses showFlowSettings from page model props', async () => {
166
+ mocks.model = createPageModel();
75
167
  render(<FlowPage />);
76
168
 
77
- expect(mocks.rendererProps?.showFlowSettings).toBe(false);
169
+ await waitFor(() => {
170
+ expect((mocks.rendererProps as { showFlowSettings?: boolean } | undefined)?.showFlowSettings).toBe(false);
171
+ });
172
+ });
173
+
174
+ it('exposes mobile layout state from route-managed view inputArgs before first render', async () => {
175
+ mocks.model = createPageModel();
176
+ render(<FlowPage onModelLoaded={vi.fn()} />);
177
+
178
+ await waitFor(() => {
179
+ expect(mocks.rendererMobileStates.length).toBeGreaterThan(0);
180
+ });
181
+ expect(mocks.rendererMobileStates[0]).toBe(true);
78
182
  });
183
+
184
+ it.each([
185
+ { viewInputMobileLayout: true, contextMobileLayout: false, expected: false },
186
+ { viewInputMobileLayout: false, contextMobileLayout: true, expected: true },
187
+ { viewInputMobileLayout: undefined, contextMobileLayout: true, expected: true },
188
+ { viewInputMobileLayout: undefined, contextMobileLayout: false, expected: false },
189
+ { viewInputMobileLayout: true, contextMobileLayout: undefined, expected: true },
190
+ { viewInputMobileLayout: false, contextMobileLayout: undefined, expected: false },
191
+ ])(
192
+ 'resolves mobile layout state from view input args and layout context %#',
193
+ async ({ viewInputMobileLayout, contextMobileLayout, expected }) => {
194
+ mocks.viewInputMobileLayout = viewInputMobileLayout;
195
+ mocks.contextMobileLayout = contextMobileLayout;
196
+ mocks.model = createPageModel();
197
+
198
+ render(<FlowPage onModelLoaded={vi.fn()} />);
199
+
200
+ await waitFor(() => {
201
+ expect(mocks.rendererMobileStates.length).toBeGreaterThan(0);
202
+ });
203
+ expect(mocks.rendererMobileStates[0]).toBe(expected);
204
+ },
205
+ );
79
206
  });