@olenbetong/synergi-react 5.0.0 → 5.1.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/es/components/Checkbox/index.js +1 -9
- package/es/components/CodeEditor/CodeEditor.css +6 -6
- package/es/components/FilePond.js +3 -12
- package/es/components/ImageEditor/plugins/redactPlugin/useRedactTool.js +18 -14
- package/es/components/ImageEditor/useImageHistory.js +13 -1
- package/es/components/MergeProgressDialog/MergeProgressDialogDs.js +1 -1
- package/es/components/MergeProgressDialog/useMergeJob.js +5 -4
- package/es/components/Portal/index.js +20 -20
- package/es/components/SplitContainer/index.js +3 -1
- package/es/components/Toolbar/Toolbar.css +137 -137
- package/es/components/Toolbar/index.js +6 -1
- package/es/elements/ElementLookupDialog/BarcodeScanner/decoders/zxing.js +8 -0
- package/es/elements/ElementLookupDialog/HIDScanner/useHIDScanner.js +3 -1
- package/es/elements-ds/DescriptionInput.d.ts +16 -0
- package/es/elements-ds/DescriptionInput.js +41 -0
- package/es/elements-ds/DuplicateElementDamage.d.ts +40 -0
- package/es/elements-ds/DuplicateElementDamage.js +57 -0
- package/es/elements-ds/ElementLookup.d.ts +23 -0
- package/es/elements-ds/ElementLookup.js +35 -0
- package/es/elements-ds/ElementLookupDialog.d.ts +7 -0
- package/es/elements-ds/ElementLookupDialog.js +84 -0
- package/es/elements-ds/FormFields.d.ts +43 -0
- package/es/elements-ds/FormFields.js +67 -0
- package/es/elements-ds/HIDScanner.d.ts +7 -0
- package/es/elements-ds/HIDScanner.js +36 -0
- package/es/elements-ds/ManualForm.d.ts +7 -0
- package/es/elements-ds/ManualForm.js +70 -0
- package/es/elements-ds/ProjectSelect.d.ts +28 -0
- package/es/elements-ds/ProjectSelect.js +45 -0
- package/es/elements-ds/elements-ds.css +157 -0
- package/es/elements-ds/index.d.ts +12 -0
- package/es/elements-ds/index.js +14 -0
- package/es/useTranslation/index.js +5 -3
- package/package.json +15 -3
- package/src/chrome/AppShell/AppShell.test.tsx +48 -0
- package/src/chrome/AppShell/index.tsx +29 -29
- package/src/chrome/openReport.test.ts +50 -0
- package/src/chrome/openReport.ts +34 -34
- package/src/colorScheme.test.ts +188 -0
- package/src/colorScheme.ts +125 -125
- package/src/components/Checkbox/Checkbox.browser.test.tsx +116 -0
- package/src/components/Checkbox/index.tsx +1 -10
- package/src/components/CodeEditor/CodeEditor.css +6 -6
- package/src/components/CodeEditor/CodeEditor.tsx +173 -173
- package/src/components/CodeEditor/index.ts +1 -1
- package/src/components/ColorCard/ColorCard.test.tsx +34 -0
- package/src/components/DateNavigator/DateNavigator.test.tsx +175 -0
- package/src/components/DateNavigator/index.tsx +186 -186
- package/src/components/FilePond.browser.test.tsx +389 -0
- package/src/components/FilePond.tsx +303 -312
- package/src/components/ImageEditor/ImageEditor.browser.test.tsx +286 -0
- package/src/components/ImageEditor/ImageEditor.test.tsx +299 -0
- package/src/components/ImageEditor/ImageEditor.tsx +348 -348
- package/src/components/ImageEditor/index.ts +9 -9
- package/src/components/ImageEditor/plugins/cropPlugin/CropOverlay.tsx +165 -165
- package/src/components/ImageEditor/plugins/cropPlugin/CropToolbar.tsx +48 -48
- package/src/components/ImageEditor/plugins/cropPlugin/useCropTool.test.ts +225 -0
- package/src/components/ImageEditor/plugins/cropPlugin/useCropTool.ts +405 -405
- package/src/components/ImageEditor/plugins/plugins.browser.test.ts +252 -0
- package/src/components/ImageEditor/plugins/redactPlugin/RedactToolbar.tsx +47 -47
- package/src/components/ImageEditor/plugins/redactPlugin/useRedactTool.test.ts +89 -0
- package/src/components/ImageEditor/plugins/redactPlugin/useRedactTool.ts +16 -13
- package/src/components/ImageEditor/plugins/zoomPlugin/ZoomContext.tsx +23 -23
- package/src/components/ImageEditor/plugins/zoomPlugin/ZoomControls.tsx +40 -40
- package/src/components/ImageEditor/plugins/zoomPlugin/useZoomPan.test.ts +154 -0
- package/src/components/ImageEditor/useActiveTool.ts +21 -21
- package/src/components/ImageEditor/useEdgeDetection.test.ts +96 -0
- package/src/components/ImageEditor/useEdgeDetection.ts +319 -319
- package/src/components/ImageEditor/useImageHistory.test.ts +409 -0
- package/src/components/ImageEditor/useImageHistory.ts +206 -197
- package/src/components/ImageEditor/useOpenCV.test.ts +208 -0
- package/src/components/ImageEditor/useOpenCV.ts +184 -184
- package/src/components/LinkedCardList/index.scss +95 -95
- package/src/components/MergeProgressDialog/MergeProgressDialogDs.browser.test.tsx +156 -0
- package/src/components/MergeProgressDialog/MergeProgressDialogDs.tsx +1 -0
- package/src/components/MergeProgressDialog/useMergeJob.test.ts +326 -0
- package/src/components/MergeProgressDialog/useMergeJob.ts +4 -3
- package/src/components/PageBanner/index.tsx +80 -80
- package/src/components/PdfViewer/PdfViewer.browser.test.tsx +78 -0
- package/src/components/PdfViewer/PdfViewer.tsx +158 -158
- package/src/components/Portal/Portal.test.tsx +106 -0
- package/src/components/Portal/index.tsx +22 -25
- package/src/components/Sidebar/Sidebar.browser.test.tsx +57 -0
- package/src/components/Sidebar/Sidebar.test.tsx +123 -0
- package/src/components/SplitContainer/SplitContainer.browser.test.tsx +304 -0
- package/src/components/SplitContainer/index.tsx +335 -333
- package/src/components/Toolbar/Toolbar.css +137 -137
- package/src/components/Toolbar/Toolbar.test.tsx +216 -0
- package/src/components/Toolbar/ToolbarBreadcrumbs.browser.test.tsx +137 -0
- package/src/components/Toolbar/index.tsx +270 -265
- package/src/components/ValueToggleGroup/ValueToggleGroup.test.tsx +112 -0
- package/src/designsystemet-web-types.d.ts +24 -24
- package/src/elements/ElementDamage/DamageFormButtons.tsx +35 -35
- package/src/elements/ElementDamage/DescriptionInput.tsx +120 -120
- package/src/elements/ElementDamage/DuplicateDamage/DesktopView.tsx +82 -82
- package/src/elements/ElementDamage/DuplicateDamage/DublicateElementDamageDialog.tsx +67 -67
- package/src/elements/ElementDamage/DuplicateDamage/PhoneView.tsx +45 -45
- package/src/elements/ElementDamage/ElementNumberTextField.tsx +41 -41
- package/src/elements/ElementDamage/RegisterFix.tsx +100 -100
- package/src/elements/ElementDamage/SubmitButtons.tsx +40 -40
- package/src/elements/ElementDamage/TransportElementSelect.tsx +52 -52
- package/src/elements/ElementLookup.tsx +123 -123
- package/src/elements/ElementLookupDialog/BarcodeScanner/BarcodeScanner.browser.test.tsx +175 -0
- package/src/elements/ElementLookupDialog/BarcodeScanner/decoders/zxing.ts +8 -0
- package/src/elements/ElementLookupDialog/BarcodeScanner/engines.browser.test.ts +225 -0
- package/src/elements/ElementLookupDialog/HIDScanner/index.tsx +67 -67
- package/src/elements/ElementLookupDialog/HIDScanner/useHIDScanner.test.ts +124 -0
- package/src/elements/ElementLookupDialog/HIDScanner/useHIDScanner.ts +2 -1
- package/src/elements/ElementLookupDialog/Manual/ManualForm.tsx +141 -141
- package/src/elements/ElementLookupDialog/getElement.test.ts +133 -0
- package/src/elements/ElementLookupDialog/index.tsx +226 -226
- package/src/elements/ElementLookupDialog/utils/Giai.test.ts +53 -0
- package/src/elements/ElementLookupDialog/utils/Giai.ts +209 -209
- package/src/elements/ProjectSelect.tsx +130 -130
- package/src/elements/index.ts +15 -15
- package/src/elements-ds/DamageForm.browser.test.tsx +530 -0
- package/src/elements-ds/DescriptionInput.tsx +114 -0
- package/src/elements-ds/DuplicateElementDamage.tsx +185 -0
- package/src/elements-ds/ElementLookup.tsx +114 -0
- package/src/elements-ds/ElementLookupDialog.browser.test.tsx +207 -0
- package/src/elements-ds/ElementLookupDialog.tsx +196 -0
- package/src/elements-ds/FormFields.tsx +176 -0
- package/src/elements-ds/HIDScanner.tsx +53 -0
- package/src/elements-ds/ManualForm.tsx +129 -0
- package/src/elements-ds/ProjectSelect.tsx +120 -0
- package/src/elements-ds/elements-ds.css +157 -0
- package/src/elements-ds/index.ts +16 -0
- package/src/filter/index.ts +34 -34
- package/src/i18n.test.ts +31 -0
- package/src/i18n.ts +13 -13
- package/src/mui/MuiThemeProvider.tsx +135 -135
- package/src/test/fakeCamera.ts +98 -0
- package/src/test/fakeDataApi.ts +90 -0
- package/src/test/setup.browser.ts +21 -0
- package/src/test/setup.ts +23 -23
- package/src/useTranslation/index.ts +5 -3
- package/src/useTranslation/useTranslation.test.ts +128 -0
- package/es/elements/ElementLookupDialog/BarcodeScanner/decoders.test.d.ts +0 -1
- package/es/elements/ElementLookupDialog/BarcodeScanner/decoders.test.js +0 -103
- package/es/test/setup.d.ts +0 -6
- package/es/test/setup.js +0 -6
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
import { act, render, screen } from "@testing-library/react";
|
|
2
|
+
import { useState } from "react";
|
|
3
|
+
import { userEvent } from "vitest/browser";
|
|
4
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
5
|
+
|
|
6
|
+
import { MergeProgressDialogDs } from "./MergeProgressDialogDs";
|
|
7
|
+
|
|
8
|
+
/** A stand-in for the merger's server-sent event stream; the test plays the server. */
|
|
9
|
+
class FakeEventSource {
|
|
10
|
+
static instances: FakeEventSource[] = [];
|
|
11
|
+
|
|
12
|
+
url: string;
|
|
13
|
+
closed = false;
|
|
14
|
+
listeners = new Map<string, ((event: Event) => void)[]>();
|
|
15
|
+
|
|
16
|
+
constructor(url: string) {
|
|
17
|
+
this.url = url;
|
|
18
|
+
FakeEventSource.instances.push(this);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
addEventListener(type: string, listener: (event: Event) => void) {
|
|
22
|
+
this.listeners.set(type, [...(this.listeners.get(type) ?? []), listener]);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
close() {
|
|
26
|
+
this.closed = true;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
emit(type: string, data: unknown) {
|
|
30
|
+
let event = new MessageEvent(type, { data: JSON.stringify(data) });
|
|
31
|
+
act(() => {
|
|
32
|
+
for (let listener of this.listeners.get(type) ?? []) listener(event);
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
static get last() {
|
|
37
|
+
return FakeEventSource.instances[FakeEventSource.instances.length - 1];
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
let windowOpen: ReturnType<typeof vi.spyOn>;
|
|
42
|
+
|
|
43
|
+
beforeEach(() => {
|
|
44
|
+
FakeEventSource.instances = [];
|
|
45
|
+
vi.stubGlobal("EventSource", FakeEventSource);
|
|
46
|
+
vi.spyOn(window, "fetch").mockImplementation(async () => new Response(JSON.stringify({ jobId: "job-7" })));
|
|
47
|
+
windowOpen = vi.spyOn(window, "open").mockImplementation(() => null);
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
afterEach(() => {
|
|
51
|
+
vi.unstubAllGlobals();
|
|
52
|
+
vi.restoreAllMocks();
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
/** The dialog as the apps use it: open from a button, closed through `onClose`. */
|
|
56
|
+
function Harness({ onClose }: { onClose: () => void }) {
|
|
57
|
+
let [open, setOpen] = useState(true);
|
|
58
|
+
return (
|
|
59
|
+
<MergeProgressDialogDs
|
|
60
|
+
open={open}
|
|
61
|
+
onClose={() => {
|
|
62
|
+
onClose();
|
|
63
|
+
setOpen(false);
|
|
64
|
+
}}
|
|
65
|
+
getMergerId={async () => 42}
|
|
66
|
+
/>
|
|
67
|
+
);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
async function started() {
|
|
71
|
+
await vi.waitFor(() => expect(FakeEventSource.instances).toHaveLength(1));
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
describe("MergeProgressDialogDs", () => {
|
|
75
|
+
it("shows the job starting, then its progress", async () => {
|
|
76
|
+
render(<Harness onClose={() => {}} />);
|
|
77
|
+
|
|
78
|
+
let dialog = await screen.findByRole("dialog");
|
|
79
|
+
await vi.waitFor(() => expect(dialog).toBeVisible());
|
|
80
|
+
expect(screen.getByRole("heading", { name: "Merging drawings" })).toBeInTheDocument();
|
|
81
|
+
expect(screen.getByText("Starting merge job…")).toBeInTheDocument();
|
|
82
|
+
|
|
83
|
+
await started();
|
|
84
|
+
FakeEventSource.last.emit("progress", { completed: 3, total: 12, currentFile: "B-204.pdf" });
|
|
85
|
+
|
|
86
|
+
expect(await screen.findByText(/3 \/ 12 files/)).toBeInTheDocument();
|
|
87
|
+
expect(screen.getByText("B-204.pdf")).toBeInTheDocument();
|
|
88
|
+
expect(screen.getByRole("progressbar")).toBeInTheDocument();
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
it("cannot be dismissed while the job runs", async () => {
|
|
92
|
+
let onClose = vi.fn();
|
|
93
|
+
render(<Harness onClose={onClose} />);
|
|
94
|
+
await started();
|
|
95
|
+
FakeEventSource.last.emit("progress", { completed: 1, total: 4 });
|
|
96
|
+
|
|
97
|
+
expect(screen.getByRole("button", { name: "Close" })).toBeDisabled();
|
|
98
|
+
await userEvent.keyboard("{Escape}");
|
|
99
|
+
|
|
100
|
+
expect(screen.getByRole("dialog")).toBeVisible();
|
|
101
|
+
expect(onClose).not.toHaveBeenCalled();
|
|
102
|
+
expect(FakeEventSource.last.closed).toBe(false);
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
it("has no close button in the header while the job runs", async () => {
|
|
106
|
+
let onClose = vi.fn();
|
|
107
|
+
render(<Harness onClose={onClose} />);
|
|
108
|
+
await started();
|
|
109
|
+
FakeEventSource.last.emit("progress", { completed: 1, total: 4 });
|
|
110
|
+
|
|
111
|
+
// Only the disabled Close button: Designsystemet's own close button in the header would
|
|
112
|
+
// end the dialog, and with it the job's event stream.
|
|
113
|
+
expect(screen.getAllByRole("button")).toEqual([screen.getByRole("button", { name: "Close" })]);
|
|
114
|
+
let enabled = screen.queryAllByRole("button").filter((button) => !(button as HTMLButtonElement).disabled);
|
|
115
|
+
for (let button of enabled) await userEvent.click(button);
|
|
116
|
+
|
|
117
|
+
expect(screen.getByRole("dialog")).toBeVisible();
|
|
118
|
+
expect(onClose).not.toHaveBeenCalled();
|
|
119
|
+
expect(FakeEventSource.last.closed).toBe(false);
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
it("offers the download and closes once the merge is done", async () => {
|
|
123
|
+
let onClose = vi.fn();
|
|
124
|
+
render(<Harness onClose={onClose} />);
|
|
125
|
+
await started();
|
|
126
|
+
|
|
127
|
+
FakeEventSource.last.emit("done", { fileName: "drawings.pdf" });
|
|
128
|
+
|
|
129
|
+
expect(await screen.findByRole("heading", { name: "Merge complete" })).toBeInTheDocument();
|
|
130
|
+
expect(windowOpen).toHaveBeenCalledWith("/api/ob/merger/download/job-7");
|
|
131
|
+
expect(screen.getByRole("link", { name: "click here to open it" })).toHaveAttribute(
|
|
132
|
+
"href",
|
|
133
|
+
"/api/ob/merger/download/job-7",
|
|
134
|
+
);
|
|
135
|
+
|
|
136
|
+
await userEvent.click(screen.getByRole("button", { name: "Close" }));
|
|
137
|
+
|
|
138
|
+
expect(onClose).toHaveBeenCalled();
|
|
139
|
+
await vi.waitFor(() => expect(screen.queryByRole("dialog")).toBeNull());
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
it("shows why the merge failed and can then be closed with Escape", async () => {
|
|
143
|
+
let onClose = vi.fn();
|
|
144
|
+
render(<Harness onClose={onClose} />);
|
|
145
|
+
await started();
|
|
146
|
+
|
|
147
|
+
FakeEventSource.last.emit("error", { message: "Drawing A-101 is missing" });
|
|
148
|
+
|
|
149
|
+
expect(await screen.findByRole("heading", { name: "Merge failed" })).toBeInTheDocument();
|
|
150
|
+
expect(screen.getByText("Drawing A-101 is missing")).toBeInTheDocument();
|
|
151
|
+
expect(screen.getByRole("button", { name: "Close" })).toBeEnabled();
|
|
152
|
+
|
|
153
|
+
await userEvent.keyboard("{Escape}");
|
|
154
|
+
await vi.waitFor(() => expect(onClose).toHaveBeenCalled());
|
|
155
|
+
});
|
|
156
|
+
});
|
|
@@ -0,0 +1,326 @@
|
|
|
1
|
+
import { act, renderHook } from "@testing-library/react";
|
|
2
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
3
|
+
|
|
4
|
+
import { type MergeJobOptions, useMergeJob } from "./useMergeJob";
|
|
5
|
+
|
|
6
|
+
/** A stand-in for the merger's server-sent event stream; the test plays the server. */
|
|
7
|
+
class FakeEventSource {
|
|
8
|
+
static instances: FakeEventSource[] = [];
|
|
9
|
+
|
|
10
|
+
url: string;
|
|
11
|
+
closed = false;
|
|
12
|
+
listeners = new Map<string, ((event: Event) => void)[]>();
|
|
13
|
+
|
|
14
|
+
constructor(url: string) {
|
|
15
|
+
this.url = url;
|
|
16
|
+
FakeEventSource.instances.push(this);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
addEventListener(type: string, listener: (event: Event) => void) {
|
|
20
|
+
this.listeners.set(type, [...(this.listeners.get(type) ?? []), listener]);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
close() {
|
|
24
|
+
this.closed = true;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
emit(type: string, data?: unknown) {
|
|
28
|
+
let event = new MessageEvent(type, { data: data === undefined ? undefined : JSON.stringify(data) });
|
|
29
|
+
act(() => {
|
|
30
|
+
for (let listener of this.listeners.get(type) ?? []) listener(event);
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** What EventSource fires when the connection drops: an error with no data. */
|
|
35
|
+
drop() {
|
|
36
|
+
act(() => {
|
|
37
|
+
for (let listener of this.listeners.get("error") ?? []) listener(new Event("error"));
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
static get last() {
|
|
42
|
+
return FakeEventSource.instances[FakeEventSource.instances.length - 1];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
let fetchMock: ReturnType<typeof vi.fn>;
|
|
47
|
+
let windowOpen: ReturnType<typeof vi.spyOn>;
|
|
48
|
+
|
|
49
|
+
beforeEach(() => {
|
|
50
|
+
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "setInterval", "clearInterval", "Date"] });
|
|
51
|
+
FakeEventSource.instances = [];
|
|
52
|
+
vi.stubGlobal("EventSource", FakeEventSource);
|
|
53
|
+
fetchMock = vi.fn(async () => new Response(JSON.stringify({ jobId: "job-1" }), { status: 200 }));
|
|
54
|
+
vi.stubGlobal("fetch", fetchMock);
|
|
55
|
+
windowOpen = vi.spyOn(window, "open").mockImplementation(() => null);
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
afterEach(() => {
|
|
59
|
+
vi.useRealTimers();
|
|
60
|
+
vi.unstubAllGlobals();
|
|
61
|
+
vi.restoreAllMocks();
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
function renderMergeJob(initial: Partial<MergeJobOptions> = {}) {
|
|
65
|
+
let options: MergeJobOptions = {
|
|
66
|
+
open: true,
|
|
67
|
+
onClose: vi.fn(),
|
|
68
|
+
getMergerId: vi.fn(async () => 42),
|
|
69
|
+
...initial,
|
|
70
|
+
};
|
|
71
|
+
let hook = renderHook((props: MergeJobOptions) => useMergeJob(props), { initialProps: options });
|
|
72
|
+
return { ...hook, options };
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/** Lets the merger ID, the start request and its JSON body resolve. */
|
|
76
|
+
async function settle() {
|
|
77
|
+
await act(async () => {
|
|
78
|
+
for (let i = 0; i < 5; i++) await Promise.resolve();
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
describe("useMergeJob", () => {
|
|
83
|
+
it("does nothing until the dialog opens", async () => {
|
|
84
|
+
let { result, options } = renderMergeJob({ open: false });
|
|
85
|
+
await settle();
|
|
86
|
+
|
|
87
|
+
expect(options.getMergerId).not.toHaveBeenCalled();
|
|
88
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
89
|
+
expect(result.current.phase).toEqual({ kind: "preparing" });
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
it("starts the merge for the merger ID and follows its events", async () => {
|
|
93
|
+
let { result } = renderMergeJob();
|
|
94
|
+
|
|
95
|
+
expect(result.current.phase.kind).toBe("preparing");
|
|
96
|
+
expect(result.current.title).toBe("Merging drawings");
|
|
97
|
+
expect(result.current.canClose).toBe(false);
|
|
98
|
+
|
|
99
|
+
await settle();
|
|
100
|
+
|
|
101
|
+
expect(fetchMock).toHaveBeenCalledExactlyOnceWith("/api/ob/merger/start/42/pdf", { method: "POST" });
|
|
102
|
+
expect(FakeEventSource.instances.map((es) => es.url)).toEqual(["/api/ob/merger/events/job-1"]);
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
it("asks for a zip when the merge type is zip", async () => {
|
|
106
|
+
renderMergeJob({ mergeType: "zip" });
|
|
107
|
+
await settle();
|
|
108
|
+
|
|
109
|
+
expect(fetchMock).toHaveBeenCalledWith("/api/ob/merger/start/42/zip", { method: "POST" });
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
it("shows progress and cannot be closed while the job runs", async () => {
|
|
113
|
+
let { result } = renderMergeJob();
|
|
114
|
+
await settle();
|
|
115
|
+
|
|
116
|
+
FakeEventSource.last.emit("progress", { completed: 0, total: 4 });
|
|
117
|
+
expect(result.current.phase).toMatchObject({ kind: "processing", completed: 0, total: 4, currentFile: "" });
|
|
118
|
+
expect(result.current.pct).toBe(0);
|
|
119
|
+
expect(result.current.remaining).toBeNull();
|
|
120
|
+
|
|
121
|
+
FakeEventSource.last.emit("progress", { completed: 1, total: 4, currentFile: "A-101.pdf" });
|
|
122
|
+
expect(result.current.phase).toMatchObject({ completed: 1, currentFile: "A-101.pdf" });
|
|
123
|
+
expect(result.current.pct).toBe(25);
|
|
124
|
+
expect(result.current.canClose).toBe(false);
|
|
125
|
+
expect(result.current.title).toBe("Merging drawings");
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
it("estimates the time left from the pace so far", async () => {
|
|
129
|
+
let { result } = renderMergeJob();
|
|
130
|
+
await settle();
|
|
131
|
+
|
|
132
|
+
FakeEventSource.last.emit("progress", { completed: 0, total: 4 });
|
|
133
|
+
act(() => vi.advanceTimersByTime(10_000));
|
|
134
|
+
FakeEventSource.last.emit("progress", { completed: 1, total: 4 });
|
|
135
|
+
|
|
136
|
+
// 10 s per file, three files to go.
|
|
137
|
+
expect(result.current.remaining).toBe("~30s");
|
|
138
|
+
|
|
139
|
+
// The estimate is recomputed every second, not only when an event arrives.
|
|
140
|
+
act(() => vi.advanceTimersByTime(10_000));
|
|
141
|
+
expect(result.current.remaining).toBe("~1m");
|
|
142
|
+
|
|
143
|
+
act(() => vi.advanceTimersByTime(1_000));
|
|
144
|
+
expect(result.current.remaining).toBe("~1m 3s");
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
it("never shows 60 seconds in a minute estimate", async () => {
|
|
148
|
+
let { result } = renderMergeJob();
|
|
149
|
+
await settle();
|
|
150
|
+
|
|
151
|
+
FakeEventSource.last.emit("progress", { completed: 0, total: 3 });
|
|
152
|
+
act(() => vi.advanceTimersByTime(59_800));
|
|
153
|
+
FakeEventSource.last.emit("progress", { completed: 1, total: 3 });
|
|
154
|
+
|
|
155
|
+
// 2 x 59.8 s = 119.6 s, which rounds up to two minutes, not "1m 60s".
|
|
156
|
+
expect(result.current.remaining).toBe("~2m");
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
it("opens the download when the merge is done and lets the user close", async () => {
|
|
160
|
+
let { result } = renderMergeJob();
|
|
161
|
+
await settle();
|
|
162
|
+
let es = FakeEventSource.last;
|
|
163
|
+
|
|
164
|
+
es.emit("progress", { completed: 2, total: 2 });
|
|
165
|
+
es.emit("done", { fileName: "drawings.pdf" });
|
|
166
|
+
|
|
167
|
+
expect(result.current.phase).toEqual({ kind: "completed", jobId: "job-1", fileName: "drawings.pdf" });
|
|
168
|
+
expect(result.current.title).toBe("Merge complete");
|
|
169
|
+
expect(result.current.canClose).toBe(true);
|
|
170
|
+
expect(es.closed).toBe(true);
|
|
171
|
+
expect(windowOpen).toHaveBeenCalledExactlyOnceWith("/api/ob/merger/download/job-1");
|
|
172
|
+
|
|
173
|
+
// The server closes the stream after "done", which fires error; that is not a failure.
|
|
174
|
+
es.drop();
|
|
175
|
+
act(() => vi.advanceTimersByTime(60_000));
|
|
176
|
+
expect(result.current.phase.kind).toBe("completed");
|
|
177
|
+
expect(FakeEventSource.instances).toHaveLength(1);
|
|
178
|
+
});
|
|
179
|
+
|
|
180
|
+
it("reports the message of an error the server sends", async () => {
|
|
181
|
+
let { result } = renderMergeJob();
|
|
182
|
+
await settle();
|
|
183
|
+
let es = FakeEventSource.last;
|
|
184
|
+
|
|
185
|
+
es.emit("error", { message: "Drawing A-101 is missing" });
|
|
186
|
+
|
|
187
|
+
expect(result.current.phase).toEqual({ kind: "failed", error: "Drawing A-101 is missing" });
|
|
188
|
+
expect(result.current.title).toBe("Merge failed");
|
|
189
|
+
expect(result.current.canClose).toBe(true);
|
|
190
|
+
expect(es.closed).toBe(true);
|
|
191
|
+
expect(FakeEventSource.instances).toHaveLength(1);
|
|
192
|
+
});
|
|
193
|
+
|
|
194
|
+
it("reports an unknown error when the server's error cannot be read", async () => {
|
|
195
|
+
let { result } = renderMergeJob();
|
|
196
|
+
await settle();
|
|
197
|
+
|
|
198
|
+
act(() => {
|
|
199
|
+
let event = new MessageEvent("error", { data: "<html>Bad gateway</html>" });
|
|
200
|
+
for (let listener of FakeEventSource.last.listeners.get("error") ?? []) listener(event);
|
|
201
|
+
});
|
|
202
|
+
|
|
203
|
+
expect(result.current.phase).toEqual({ kind: "failed", error: "Unknown error" });
|
|
204
|
+
});
|
|
205
|
+
|
|
206
|
+
it("reconnects with a backoff when the connection drops", async () => {
|
|
207
|
+
let { result } = renderMergeJob();
|
|
208
|
+
await settle();
|
|
209
|
+
|
|
210
|
+
FakeEventSource.last.emit("progress", { completed: 1, total: 4 });
|
|
211
|
+
FakeEventSource.last.drop();
|
|
212
|
+
expect(FakeEventSource.instances[0].closed).toBe(true);
|
|
213
|
+
expect(result.current.phase.kind).toBe("processing");
|
|
214
|
+
|
|
215
|
+
act(() => vi.advanceTimersByTime(999));
|
|
216
|
+
expect(FakeEventSource.instances).toHaveLength(1);
|
|
217
|
+
act(() => vi.advanceTimersByTime(1));
|
|
218
|
+
expect(FakeEventSource.instances).toHaveLength(2);
|
|
219
|
+
expect(FakeEventSource.last.url).toBe("/api/ob/merger/events/job-1");
|
|
220
|
+
|
|
221
|
+
// The second drop waits longer.
|
|
222
|
+
FakeEventSource.last.drop();
|
|
223
|
+
act(() => vi.advanceTimersByTime(1_999));
|
|
224
|
+
expect(FakeEventSource.instances).toHaveLength(2);
|
|
225
|
+
act(() => vi.advanceTimersByTime(1));
|
|
226
|
+
expect(FakeEventSource.instances).toHaveLength(3);
|
|
227
|
+
|
|
228
|
+
// Progress on the new connection carries on from where the job was.
|
|
229
|
+
FakeEventSource.last.emit("progress", { completed: 2, total: 4 });
|
|
230
|
+
expect(result.current.phase).toMatchObject({ kind: "processing", completed: 2 });
|
|
231
|
+
|
|
232
|
+
// ...and resets the backoff.
|
|
233
|
+
FakeEventSource.last.drop();
|
|
234
|
+
act(() => vi.advanceTimersByTime(1_000));
|
|
235
|
+
expect(FakeEventSource.instances).toHaveLength(4);
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
it("gives up after about half a minute of failed reconnects", async () => {
|
|
239
|
+
let { result } = renderMergeJob();
|
|
240
|
+
await settle();
|
|
241
|
+
|
|
242
|
+
for (let delay of [1000, 2000, 3000, 5000, 8000, 13000]) {
|
|
243
|
+
FakeEventSource.last.drop();
|
|
244
|
+
expect(result.current.phase.kind).toBe("preparing");
|
|
245
|
+
act(() => vi.advanceTimersByTime(delay));
|
|
246
|
+
}
|
|
247
|
+
expect(FakeEventSource.instances).toHaveLength(7);
|
|
248
|
+
|
|
249
|
+
FakeEventSource.last.drop();
|
|
250
|
+
expect(result.current.phase).toEqual({ kind: "failed", error: "Unknown error" });
|
|
251
|
+
act(() => vi.advanceTimersByTime(60_000));
|
|
252
|
+
expect(FakeEventSource.instances).toHaveLength(7);
|
|
253
|
+
});
|
|
254
|
+
|
|
255
|
+
it("fails when the job cannot be started", async () => {
|
|
256
|
+
fetchMock.mockResolvedValueOnce(new Response("", { status: 500, statusText: "Internal Server Error" }));
|
|
257
|
+
let { result } = renderMergeJob();
|
|
258
|
+
await settle();
|
|
259
|
+
|
|
260
|
+
expect(result.current.phase).toEqual({ kind: "failed", error: "500 Internal Server Error" });
|
|
261
|
+
expect(result.current.canClose).toBe(true);
|
|
262
|
+
expect(FakeEventSource.instances).toHaveLength(0);
|
|
263
|
+
});
|
|
264
|
+
|
|
265
|
+
it("fails when the merger ID cannot be created", async () => {
|
|
266
|
+
let { result } = renderMergeJob({ getMergerId: vi.fn(async () => Promise.reject(new Error("No drawings"))) });
|
|
267
|
+
await settle();
|
|
268
|
+
|
|
269
|
+
expect(result.current.phase).toEqual({ kind: "failed", error: "No drawings" });
|
|
270
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
271
|
+
});
|
|
272
|
+
|
|
273
|
+
it("does not start the job when the dialog closes before the merger ID arrives", async () => {
|
|
274
|
+
let resolveId!: (id: number) => void;
|
|
275
|
+
let getMergerId = vi.fn(() => new Promise<number>((resolve) => (resolveId = resolve)));
|
|
276
|
+
let { rerender, options } = renderMergeJob({ getMergerId });
|
|
277
|
+
|
|
278
|
+
rerender({ ...options, open: false });
|
|
279
|
+
resolveId(42);
|
|
280
|
+
await settle();
|
|
281
|
+
|
|
282
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
283
|
+
expect(FakeEventSource.instances).toHaveLength(0);
|
|
284
|
+
});
|
|
285
|
+
|
|
286
|
+
it("stops listening and reconnecting when the dialog closes", async () => {
|
|
287
|
+
let { result, rerender, options } = renderMergeJob();
|
|
288
|
+
await settle();
|
|
289
|
+
FakeEventSource.last.drop();
|
|
290
|
+
|
|
291
|
+
rerender({ ...options, open: false });
|
|
292
|
+
act(() => vi.advanceTimersByTime(60_000));
|
|
293
|
+
|
|
294
|
+
expect(FakeEventSource.instances).toHaveLength(1);
|
|
295
|
+
expect(result.current.phase.kind).toBe("preparing");
|
|
296
|
+
});
|
|
297
|
+
|
|
298
|
+
it("closes the stream and tells the app when the user closes", async () => {
|
|
299
|
+
let { result, options } = renderMergeJob();
|
|
300
|
+
await settle();
|
|
301
|
+
let es = FakeEventSource.last;
|
|
302
|
+
es.emit("done", {});
|
|
303
|
+
|
|
304
|
+
act(() => result.current.handleClose());
|
|
305
|
+
|
|
306
|
+
expect(es.closed).toBe(true);
|
|
307
|
+
expect(options.onClose).toHaveBeenCalledOnce();
|
|
308
|
+
});
|
|
309
|
+
|
|
310
|
+
it("starts a fresh job each time the dialog opens again", async () => {
|
|
311
|
+
let { result, rerender, options } = renderMergeJob();
|
|
312
|
+
await settle();
|
|
313
|
+
FakeEventSource.last.emit("done", { fileName: "first.pdf" });
|
|
314
|
+
|
|
315
|
+
fetchMock.mockResolvedValueOnce(new Response(JSON.stringify({ jobId: "job-2" })));
|
|
316
|
+
rerender({ ...options, open: false });
|
|
317
|
+
rerender({ ...options, open: true });
|
|
318
|
+
|
|
319
|
+
expect(result.current.phase).toEqual({ kind: "preparing" });
|
|
320
|
+
expect(result.current.canClose).toBe(false);
|
|
321
|
+
await settle();
|
|
322
|
+
|
|
323
|
+
expect(options.getMergerId).toHaveBeenCalledTimes(2);
|
|
324
|
+
expect(FakeEventSource.last.url).toBe("/api/ob/merger/events/job-2");
|
|
325
|
+
});
|
|
326
|
+
});
|
|
@@ -19,9 +19,10 @@ export type MergePhase =
|
|
|
19
19
|
const RECONNECT_DELAYS_MS = [1000, 2000, 3000, 5000, 8000, 13000];
|
|
20
20
|
|
|
21
21
|
function formatRemaining(ms: number) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
let
|
|
22
|
+
let total = Math.ceil(ms / 1000);
|
|
23
|
+
if (total < 60) return `~${total}s`;
|
|
24
|
+
let mins = Math.floor(total / 60);
|
|
25
|
+
let secs = total % 60;
|
|
25
26
|
return secs > 0 ? `~${mins}m ${secs}s` : `~${mins}m`;
|
|
26
27
|
}
|
|
27
28
|
|
|
@@ -1,80 +1,80 @@
|
|
|
1
|
-
import "./index.scss";
|
|
2
|
-
|
|
3
|
-
import clsx from "clsx";
|
|
4
|
-
import React from "react";
|
|
5
|
-
|
|
6
|
-
export type PageBannerProps = React.HTMLProps<HTMLDivElement> & {
|
|
7
|
-
as?: "header" | "section" | "div";
|
|
8
|
-
};
|
|
9
|
-
|
|
10
|
-
export function PageBanner({ as, className, children, ...other }: PageBannerProps) {
|
|
11
|
-
const Component = as ? as : "section";
|
|
12
|
-
|
|
13
|
-
return (
|
|
14
|
-
<Component className={clsx("ObPageBanner-root", className)} {...other}>
|
|
15
|
-
<div className="container px-0">
|
|
16
|
-
<div className={"ObPageBanner-pageBannerInner"}>{children}</div>
|
|
17
|
-
</div>
|
|
18
|
-
</Component>
|
|
19
|
-
);
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export type BannerImageProps = React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
|
|
23
|
-
|
|
24
|
-
export const BannerImage = React.forwardRef<HTMLImageElement, BannerImageProps>(function BannerImage(
|
|
25
|
-
props: BannerImageProps,
|
|
26
|
-
ref,
|
|
27
|
-
) {
|
|
28
|
-
const { className, ...other } = props;
|
|
29
|
-
return <img ref={ref} className={clsx("ObPageBanner-bannerImage", className)} alt="" {...other} />;
|
|
30
|
-
});
|
|
31
|
-
|
|
32
|
-
export type TabListProps = Pick<React.HTMLProps<HTMLDivElement>, "id" | "className" | "children"> & {
|
|
33
|
-
as?: "ul" | "ol" | "nav" | "div" | "span";
|
|
34
|
-
sticky?: boolean;
|
|
35
|
-
};
|
|
36
|
-
|
|
37
|
-
export function TabList({ as, className, children, sticky, ...other }: TabListProps) {
|
|
38
|
-
const Component = as ? as : "nav";
|
|
39
|
-
|
|
40
|
-
return (
|
|
41
|
-
<Component
|
|
42
|
-
className={clsx("ObPageBanner-pageBanner", "ObPageBanner-tabList", sticky && "sticky", className)}
|
|
43
|
-
{...other}
|
|
44
|
-
>
|
|
45
|
-
<div className="container px-0">
|
|
46
|
-
<div className={"ObPageBanner-tabListInner"}>{children}</div>
|
|
47
|
-
</div>
|
|
48
|
-
</Component>
|
|
49
|
-
);
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
export type TabProps = Pick<React.HTMLProps<HTMLDivElement>, "id" | "className" | "children"> &
|
|
53
|
-
Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href" | "target" | "rel"> & {
|
|
54
|
-
active?: boolean;
|
|
55
|
-
as?: "a" | "li" | "div" | "span";
|
|
56
|
-
};
|
|
57
|
-
|
|
58
|
-
export function Tab({ active, as, className, children, ...other }: TabProps) {
|
|
59
|
-
const Component = as ? as : "a";
|
|
60
|
-
|
|
61
|
-
return (
|
|
62
|
-
<Component className={clsx("ObPageBanner-tab", active && "active", className)} {...other}>
|
|
63
|
-
{children}
|
|
64
|
-
</Component>
|
|
65
|
-
);
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
export type TitleProps = Pick<React.HTMLProps<HTMLDivElement>, "id" | "className" | "children"> & {
|
|
69
|
-
as?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "div" | "span" | "p";
|
|
70
|
-
};
|
|
71
|
-
|
|
72
|
-
export function Title({ as, className, children, ...other }: TitleProps) {
|
|
73
|
-
const Component = as ? as : "h1";
|
|
74
|
-
|
|
75
|
-
return (
|
|
76
|
-
<Component className={clsx("ObPageBanner-bannerTitle", className)} {...other}>
|
|
77
|
-
{children}
|
|
78
|
-
</Component>
|
|
79
|
-
);
|
|
80
|
-
}
|
|
1
|
+
import "./index.scss";
|
|
2
|
+
|
|
3
|
+
import clsx from "clsx";
|
|
4
|
+
import React from "react";
|
|
5
|
+
|
|
6
|
+
export type PageBannerProps = React.HTMLProps<HTMLDivElement> & {
|
|
7
|
+
as?: "header" | "section" | "div";
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
export function PageBanner({ as, className, children, ...other }: PageBannerProps) {
|
|
11
|
+
const Component = as ? as : "section";
|
|
12
|
+
|
|
13
|
+
return (
|
|
14
|
+
<Component className={clsx("ObPageBanner-root", className)} {...other}>
|
|
15
|
+
<div className="container px-0">
|
|
16
|
+
<div className={"ObPageBanner-pageBannerInner"}>{children}</div>
|
|
17
|
+
</div>
|
|
18
|
+
</Component>
|
|
19
|
+
);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export type BannerImageProps = React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
|
|
23
|
+
|
|
24
|
+
export const BannerImage = React.forwardRef<HTMLImageElement, BannerImageProps>(function BannerImage(
|
|
25
|
+
props: BannerImageProps,
|
|
26
|
+
ref,
|
|
27
|
+
) {
|
|
28
|
+
const { className, ...other } = props;
|
|
29
|
+
return <img ref={ref} className={clsx("ObPageBanner-bannerImage", className)} alt="" {...other} />;
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
export type TabListProps = Pick<React.HTMLProps<HTMLDivElement>, "id" | "className" | "children"> & {
|
|
33
|
+
as?: "ul" | "ol" | "nav" | "div" | "span";
|
|
34
|
+
sticky?: boolean;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
export function TabList({ as, className, children, sticky, ...other }: TabListProps) {
|
|
38
|
+
const Component = as ? as : "nav";
|
|
39
|
+
|
|
40
|
+
return (
|
|
41
|
+
<Component
|
|
42
|
+
className={clsx("ObPageBanner-pageBanner", "ObPageBanner-tabList", sticky && "sticky", className)}
|
|
43
|
+
{...other}
|
|
44
|
+
>
|
|
45
|
+
<div className="container px-0">
|
|
46
|
+
<div className={"ObPageBanner-tabListInner"}>{children}</div>
|
|
47
|
+
</div>
|
|
48
|
+
</Component>
|
|
49
|
+
);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
export type TabProps = Pick<React.HTMLProps<HTMLDivElement>, "id" | "className" | "children"> &
|
|
53
|
+
Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href" | "target" | "rel"> & {
|
|
54
|
+
active?: boolean;
|
|
55
|
+
as?: "a" | "li" | "div" | "span";
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
export function Tab({ active, as, className, children, ...other }: TabProps) {
|
|
59
|
+
const Component = as ? as : "a";
|
|
60
|
+
|
|
61
|
+
return (
|
|
62
|
+
<Component className={clsx("ObPageBanner-tab", active && "active", className)} {...other}>
|
|
63
|
+
{children}
|
|
64
|
+
</Component>
|
|
65
|
+
);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
export type TitleProps = Pick<React.HTMLProps<HTMLDivElement>, "id" | "className" | "children"> & {
|
|
69
|
+
as?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "div" | "span" | "p";
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
export function Title({ as, className, children, ...other }: TitleProps) {
|
|
73
|
+
const Component = as ? as : "h1";
|
|
74
|
+
|
|
75
|
+
return (
|
|
76
|
+
<Component className={clsx("ObPageBanner-bannerTitle", className)} {...other}>
|
|
77
|
+
{children}
|
|
78
|
+
</Component>
|
|
79
|
+
);
|
|
80
|
+
}
|