@olenbetong/synergi-react 5.0.0 → 5.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/styles/styles.css +1 -1
- package/dist/styles/styles.css.map +1 -1
- package/es/components/Checkbox/index.css +1 -1
- package/es/components/Checkbox/index.js +1 -9
- package/es/components/CodeEditor/CodeEditor.css +6 -6
- package/es/components/ColorCard/index.css +17 -28
- package/es/components/DateNavigator/index.css +5 -7
- package/es/components/FilePond.js +3 -12
- package/es/components/ImageEditor/ImageEditor.css +10 -10
- package/es/components/ImageEditor/ImageEditor.js +4 -4
- package/es/components/ImageEditor/ResponsiveButton.js +2 -2
- package/es/components/ImageEditor/plugins/cropPlugin/CropToolbar.js +1 -1
- package/es/components/ImageEditor/plugins/redactPlugin/RedactToolbar.js +1 -1
- package/es/components/ImageEditor/plugins/redactPlugin/useRedactTool.js +18 -14
- package/es/components/ImageEditor/useImageHistory.js +13 -1
- package/es/components/MergeProgressDialog/MergeProgressDialogDs.js +3 -3
- package/es/components/MergeProgressDialog/useMergeJob.js +5 -4
- package/es/components/PageBanner/index.css +1 -1
- package/es/components/PdfViewer/PdfViewer.js +1 -1
- package/es/components/Portal/index.js +20 -20
- package/es/components/Spinner/index.css +1 -1
- package/es/components/SplitContainer/index.css +1 -1
- 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/components/ValueToggleGroup/index.css +2 -2
- package/es/elements/ElementLookupDialog/BarcodeScanner/BarcodeScanner.css +7 -7
- 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/index.css +1 -1
- package/es/useTranslation/index.js +5 -3
- package/package.json +16 -4
- 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.scss +2 -2
- 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/ColorCard/index.css +17 -28
- package/src/components/DateNavigator/DateNavigator.test.tsx +175 -0
- package/src/components/DateNavigator/index.css +5 -7
- 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.css +10 -10
- package/src/components/ImageEditor/ImageEditor.test.tsx +299 -0
- package/src/components/ImageEditor/ImageEditor.tsx +348 -348
- package/src/components/ImageEditor/ResponsiveButton.tsx +2 -2
- 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 +42 -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 +4 -3
- package/src/components/MergeProgressDialog/useMergeJob.test.ts +326 -0
- package/src/components/MergeProgressDialog/useMergeJob.ts +4 -3
- package/src/components/PageBanner/index.scss +10 -10
- 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/Spinner/index.css +1 -1
- package/src/components/SplitContainer/SplitContainer.browser.test.tsx +304 -0
- package/src/components/SplitContainer/index.scss +5 -1
- 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/components/ValueToggleGroup/index.css +2 -2
- 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/BarcodeScanner.css +7 -7
- 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 +194 -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
|
@@ -1,52 +1,52 @@
|
|
|
1
|
-
import DropDownArrowIcon from "@mui/icons-material/KeyboardArrowDown";
|
|
2
|
-
import { Button, ListItemText, Menu, MenuItem } from "@mui/material";
|
|
3
|
-
import { useState } from "react";
|
|
4
|
-
import type { TransportElementsRecord } from "../data/dsTransportElements.js";
|
|
5
|
-
import { getLocalizedString } from "../../i18n.js";
|
|
6
|
-
|
|
7
|
-
export type TransportElementSelectProps = {
|
|
8
|
-
elements: TransportElementsRecord[];
|
|
9
|
-
onSelect: (element: TransportElementsRecord) => void;
|
|
10
|
-
};
|
|
11
|
-
|
|
12
|
-
export function TransportElementSelect({ elements, onSelect }: TransportElementSelectProps) {
|
|
13
|
-
let [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
|
|
14
|
-
let open = !!anchorEl;
|
|
15
|
-
let [selected, setSelected] = useState<TransportElementsRecord | null>(null);
|
|
16
|
-
|
|
17
|
-
function handleChange(element: TransportElementsRecord) {
|
|
18
|
-
setAnchorEl(null);
|
|
19
|
-
onSelect(element);
|
|
20
|
-
setSelected(element);
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
return (
|
|
24
|
-
<>
|
|
25
|
-
<Button
|
|
26
|
-
id="select_element"
|
|
27
|
-
variant="contained"
|
|
28
|
-
endIcon={
|
|
29
|
-
<DropDownArrowIcon
|
|
30
|
-
style={{ transform: open ? "rotate(180deg)" : "rotate(0deg)", transition: "transform 0.2s" }}
|
|
31
|
-
/>
|
|
32
|
-
}
|
|
33
|
-
sx={{ width: "165px" }}
|
|
34
|
-
aria-controls={open ? "basic-menu" : undefined}
|
|
35
|
-
aria-haspopup="true"
|
|
36
|
-
aria-expanded={open ? "true" : undefined}
|
|
37
|
-
onClick={(event) => setAnchorEl(event.currentTarget)}
|
|
38
|
-
>
|
|
39
|
-
{selected ? `${selected.ElementID} - ${selected.Name}` : getLocalizedString("Select element")}
|
|
40
|
-
</Button>
|
|
41
|
-
<Menu id="menu_element" anchorEl={anchorEl} open={open} onClose={() => setAnchorEl(null)}>
|
|
42
|
-
{elements.map((element) => (
|
|
43
|
-
<MenuItem key={element.PrimKey} onClick={() => handleChange(element)}>
|
|
44
|
-
<ListItemText>
|
|
45
|
-
{element.ElementID} - {element.Name}
|
|
46
|
-
</ListItemText>
|
|
47
|
-
</MenuItem>
|
|
48
|
-
))}
|
|
49
|
-
</Menu>
|
|
50
|
-
</>
|
|
51
|
-
);
|
|
52
|
-
}
|
|
1
|
+
import DropDownArrowIcon from "@mui/icons-material/KeyboardArrowDown";
|
|
2
|
+
import { Button, ListItemText, Menu, MenuItem } from "@mui/material";
|
|
3
|
+
import { useState } from "react";
|
|
4
|
+
import type { TransportElementsRecord } from "../data/dsTransportElements.js";
|
|
5
|
+
import { getLocalizedString } from "../../i18n.js";
|
|
6
|
+
|
|
7
|
+
export type TransportElementSelectProps = {
|
|
8
|
+
elements: TransportElementsRecord[];
|
|
9
|
+
onSelect: (element: TransportElementsRecord) => void;
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
export function TransportElementSelect({ elements, onSelect }: TransportElementSelectProps) {
|
|
13
|
+
let [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null);
|
|
14
|
+
let open = !!anchorEl;
|
|
15
|
+
let [selected, setSelected] = useState<TransportElementsRecord | null>(null);
|
|
16
|
+
|
|
17
|
+
function handleChange(element: TransportElementsRecord) {
|
|
18
|
+
setAnchorEl(null);
|
|
19
|
+
onSelect(element);
|
|
20
|
+
setSelected(element);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return (
|
|
24
|
+
<>
|
|
25
|
+
<Button
|
|
26
|
+
id="select_element"
|
|
27
|
+
variant="contained"
|
|
28
|
+
endIcon={
|
|
29
|
+
<DropDownArrowIcon
|
|
30
|
+
style={{ transform: open ? "rotate(180deg)" : "rotate(0deg)", transition: "transform 0.2s" }}
|
|
31
|
+
/>
|
|
32
|
+
}
|
|
33
|
+
sx={{ width: "165px" }}
|
|
34
|
+
aria-controls={open ? "basic-menu" : undefined}
|
|
35
|
+
aria-haspopup="true"
|
|
36
|
+
aria-expanded={open ? "true" : undefined}
|
|
37
|
+
onClick={(event) => setAnchorEl(event.currentTarget)}
|
|
38
|
+
>
|
|
39
|
+
{selected ? `${selected.ElementID} - ${selected.Name}` : getLocalizedString("Select element")}
|
|
40
|
+
</Button>
|
|
41
|
+
<Menu id="menu_element" anchorEl={anchorEl} open={open} onClose={() => setAnchorEl(null)}>
|
|
42
|
+
{elements.map((element) => (
|
|
43
|
+
<MenuItem key={element.PrimKey} onClick={() => handleChange(element)}>
|
|
44
|
+
<ListItemText>
|
|
45
|
+
{element.ElementID} - {element.Name}
|
|
46
|
+
</ListItemText>
|
|
47
|
+
</MenuItem>
|
|
48
|
+
))}
|
|
49
|
+
</Menu>
|
|
50
|
+
</>
|
|
51
|
+
);
|
|
52
|
+
}
|
|
@@ -1,123 +1,123 @@
|
|
|
1
|
-
import SearchIcon from "@mui/icons-material/Search";
|
|
2
|
-
import { IconButton, TextField } from "@mui/material";
|
|
3
|
-
import { type ReactNode, type RefObject, useEffect, useImperativeHandle, useRef, useState } from "react";
|
|
4
|
-
import { type AddElement, ElementLookupDialog } from "./ElementLookupDialog";
|
|
5
|
-
import type { DecoderFactory } from "./ElementLookupDialog/BarcodeScanner";
|
|
6
|
-
import { getLocalizedString } from "../i18n.js";
|
|
7
|
-
|
|
8
|
-
export type Element = {
|
|
9
|
-
Domain: string;
|
|
10
|
-
PrimKey: string;
|
|
11
|
-
ProjectID: string;
|
|
12
|
-
ProjectName: string;
|
|
13
|
-
ElementID: string | null;
|
|
14
|
-
};
|
|
15
|
-
|
|
16
|
-
export type ElementLookupHandle = {
|
|
17
|
-
openDialog: () => void;
|
|
18
|
-
closeDialog: () => void;
|
|
19
|
-
};
|
|
20
|
-
|
|
21
|
-
export type ElementLookupProps = {
|
|
22
|
-
value?: Element | null;
|
|
23
|
-
defaultValue?: Element | null;
|
|
24
|
-
ref?: RefObject<ElementLookupHandle | null>;
|
|
25
|
-
elementIDRequired?: boolean;
|
|
26
|
-
openLookupDialogIcon?: boolean;
|
|
27
|
-
onChange?: (value: Element | null) => void;
|
|
28
|
-
onDialogChange?: (open: boolean) => void;
|
|
29
|
-
/** Engine for the camera tab of the lookup dialog. Defaults to zxing-wasm. */
|
|
30
|
-
decoder?: DecoderFactory;
|
|
31
|
-
/** Extra controls in the camera tab footer, e.g. an engine picker. */
|
|
32
|
-
scannerActions?: ReactNode;
|
|
33
|
-
};
|
|
34
|
-
|
|
35
|
-
export function ElementLookup({
|
|
36
|
-
value,
|
|
37
|
-
defaultValue,
|
|
38
|
-
ref,
|
|
39
|
-
elementIDRequired = false,
|
|
40
|
-
openLookupDialogIcon,
|
|
41
|
-
onChange,
|
|
42
|
-
onDialogChange,
|
|
43
|
-
decoder,
|
|
44
|
-
scannerActions,
|
|
45
|
-
}: ElementLookupProps) {
|
|
46
|
-
let initializedRef = useRef<boolean>(false);
|
|
47
|
-
|
|
48
|
-
let [openElementLookupDialog, setOpenElementLookupDialog] = useState<boolean>(false);
|
|
49
|
-
let [element, setElement] = useState<Element | null>(defaultValue ?? null);
|
|
50
|
-
let elementValue = value === undefined ? element : value;
|
|
51
|
-
|
|
52
|
-
useEffect(() => {
|
|
53
|
-
if (initializedRef.current) {
|
|
54
|
-
return;
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
if (value === undefined && defaultValue) {
|
|
58
|
-
setElement(defaultValue);
|
|
59
|
-
initializedRef.current = true;
|
|
60
|
-
}
|
|
61
|
-
}, [defaultValue]); // oxlint-disable-line react-hooks/exhaustive-deps (intentionally skipping "value" dependency as this shouldn't run when "value" changes)
|
|
62
|
-
|
|
63
|
-
useImperativeHandle(ref, () => ({
|
|
64
|
-
openDialog: () => setOpenElementLookupDialog(true),
|
|
65
|
-
closeDialog: () => setOpenElementLookupDialog(false),
|
|
66
|
-
}));
|
|
67
|
-
|
|
68
|
-
async function handleAddElement(addElement: AddElement) {
|
|
69
|
-
onChange?.(addElement.element);
|
|
70
|
-
setElement(addElement.element);
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
useEffect(() => {
|
|
74
|
-
onDialogChange?.(openElementLookupDialog);
|
|
75
|
-
}, [openElementLookupDialog]); // oxlint-disable-line react-hooks/exhaustive-deps (only run when openElementLookupDialog changes)
|
|
76
|
-
|
|
77
|
-
return (
|
|
78
|
-
<>
|
|
79
|
-
<ElementLookupDialog
|
|
80
|
-
open={openElementLookupDialog}
|
|
81
|
-
mode="single"
|
|
82
|
-
onClose={() => setOpenElementLookupDialog(false)}
|
|
83
|
-
onAdd={handleAddElement}
|
|
84
|
-
allowEmptyElement={!elementIDRequired}
|
|
85
|
-
decoder={decoder}
|
|
86
|
-
scannerActions={scannerActions}
|
|
87
|
-
/>
|
|
88
|
-
|
|
89
|
-
<input type="hidden" name="ProjectID" value={elementValue?.ProjectID ?? ""} />
|
|
90
|
-
<input type="hidden" name="ElementRef" value={elementValue?.PrimKey ?? ""} />
|
|
91
|
-
|
|
92
|
-
<TextField
|
|
93
|
-
id="NewElementDamge_Project"
|
|
94
|
-
value={elementValue ? `${elementValue.ProjectID}: ${elementValue.ProjectName}` : ""}
|
|
95
|
-
label={getLocalizedString("Project")}
|
|
96
|
-
fullWidth
|
|
97
|
-
required
|
|
98
|
-
autoComplete="off"
|
|
99
|
-
slotProps={{ htmlInput: { readOnly: true } }}
|
|
100
|
-
/>
|
|
101
|
-
<TextField
|
|
102
|
-
name="ElementID"
|
|
103
|
-
id="NewElementDamage_ElementID"
|
|
104
|
-
value={elementValue ? elementValue.ElementID : ""}
|
|
105
|
-
label={getLocalizedString("Element ID")}
|
|
106
|
-
fullWidth
|
|
107
|
-
required={elementIDRequired}
|
|
108
|
-
autoComplete="off"
|
|
109
|
-
slotProps={{
|
|
110
|
-
htmlInput: { readOnly: true },
|
|
111
|
-
input: {
|
|
112
|
-
endAdornment: openLookupDialogIcon ? (
|
|
113
|
-
<IconButton onClick={() => setOpenElementLookupDialog(true)}>
|
|
114
|
-
<SearchIcon />
|
|
115
|
-
</IconButton>
|
|
116
|
-
) : undefined,
|
|
117
|
-
},
|
|
118
|
-
inputLabel: { shrink: !!elementValue?.ElementID },
|
|
119
|
-
}}
|
|
120
|
-
/>
|
|
121
|
-
</>
|
|
122
|
-
);
|
|
123
|
-
}
|
|
1
|
+
import SearchIcon from "@mui/icons-material/Search";
|
|
2
|
+
import { IconButton, TextField } from "@mui/material";
|
|
3
|
+
import { type ReactNode, type RefObject, useEffect, useImperativeHandle, useRef, useState } from "react";
|
|
4
|
+
import { type AddElement, ElementLookupDialog } from "./ElementLookupDialog";
|
|
5
|
+
import type { DecoderFactory } from "./ElementLookupDialog/BarcodeScanner";
|
|
6
|
+
import { getLocalizedString } from "../i18n.js";
|
|
7
|
+
|
|
8
|
+
export type Element = {
|
|
9
|
+
Domain: string;
|
|
10
|
+
PrimKey: string;
|
|
11
|
+
ProjectID: string;
|
|
12
|
+
ProjectName: string;
|
|
13
|
+
ElementID: string | null;
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
export type ElementLookupHandle = {
|
|
17
|
+
openDialog: () => void;
|
|
18
|
+
closeDialog: () => void;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
export type ElementLookupProps = {
|
|
22
|
+
value?: Element | null;
|
|
23
|
+
defaultValue?: Element | null;
|
|
24
|
+
ref?: RefObject<ElementLookupHandle | null>;
|
|
25
|
+
elementIDRequired?: boolean;
|
|
26
|
+
openLookupDialogIcon?: boolean;
|
|
27
|
+
onChange?: (value: Element | null) => void;
|
|
28
|
+
onDialogChange?: (open: boolean) => void;
|
|
29
|
+
/** Engine for the camera tab of the lookup dialog. Defaults to zxing-wasm. */
|
|
30
|
+
decoder?: DecoderFactory;
|
|
31
|
+
/** Extra controls in the camera tab footer, e.g. an engine picker. */
|
|
32
|
+
scannerActions?: ReactNode;
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
export function ElementLookup({
|
|
36
|
+
value,
|
|
37
|
+
defaultValue,
|
|
38
|
+
ref,
|
|
39
|
+
elementIDRequired = false,
|
|
40
|
+
openLookupDialogIcon,
|
|
41
|
+
onChange,
|
|
42
|
+
onDialogChange,
|
|
43
|
+
decoder,
|
|
44
|
+
scannerActions,
|
|
45
|
+
}: ElementLookupProps) {
|
|
46
|
+
let initializedRef = useRef<boolean>(false);
|
|
47
|
+
|
|
48
|
+
let [openElementLookupDialog, setOpenElementLookupDialog] = useState<boolean>(false);
|
|
49
|
+
let [element, setElement] = useState<Element | null>(defaultValue ?? null);
|
|
50
|
+
let elementValue = value === undefined ? element : value;
|
|
51
|
+
|
|
52
|
+
useEffect(() => {
|
|
53
|
+
if (initializedRef.current) {
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
if (value === undefined && defaultValue) {
|
|
58
|
+
setElement(defaultValue);
|
|
59
|
+
initializedRef.current = true;
|
|
60
|
+
}
|
|
61
|
+
}, [defaultValue]); // oxlint-disable-line react-hooks/exhaustive-deps (intentionally skipping "value" dependency as this shouldn't run when "value" changes)
|
|
62
|
+
|
|
63
|
+
useImperativeHandle(ref, () => ({
|
|
64
|
+
openDialog: () => setOpenElementLookupDialog(true),
|
|
65
|
+
closeDialog: () => setOpenElementLookupDialog(false),
|
|
66
|
+
}));
|
|
67
|
+
|
|
68
|
+
async function handleAddElement(addElement: AddElement) {
|
|
69
|
+
onChange?.(addElement.element);
|
|
70
|
+
setElement(addElement.element);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
useEffect(() => {
|
|
74
|
+
onDialogChange?.(openElementLookupDialog);
|
|
75
|
+
}, [openElementLookupDialog]); // oxlint-disable-line react-hooks/exhaustive-deps (only run when openElementLookupDialog changes)
|
|
76
|
+
|
|
77
|
+
return (
|
|
78
|
+
<>
|
|
79
|
+
<ElementLookupDialog
|
|
80
|
+
open={openElementLookupDialog}
|
|
81
|
+
mode="single"
|
|
82
|
+
onClose={() => setOpenElementLookupDialog(false)}
|
|
83
|
+
onAdd={handleAddElement}
|
|
84
|
+
allowEmptyElement={!elementIDRequired}
|
|
85
|
+
decoder={decoder}
|
|
86
|
+
scannerActions={scannerActions}
|
|
87
|
+
/>
|
|
88
|
+
|
|
89
|
+
<input type="hidden" name="ProjectID" value={elementValue?.ProjectID ?? ""} />
|
|
90
|
+
<input type="hidden" name="ElementRef" value={elementValue?.PrimKey ?? ""} />
|
|
91
|
+
|
|
92
|
+
<TextField
|
|
93
|
+
id="NewElementDamge_Project"
|
|
94
|
+
value={elementValue ? `${elementValue.ProjectID}: ${elementValue.ProjectName}` : ""}
|
|
95
|
+
label={getLocalizedString("Project")}
|
|
96
|
+
fullWidth
|
|
97
|
+
required
|
|
98
|
+
autoComplete="off"
|
|
99
|
+
slotProps={{ htmlInput: { readOnly: true } }}
|
|
100
|
+
/>
|
|
101
|
+
<TextField
|
|
102
|
+
name="ElementID"
|
|
103
|
+
id="NewElementDamage_ElementID"
|
|
104
|
+
value={elementValue ? elementValue.ElementID : ""}
|
|
105
|
+
label={getLocalizedString("Element ID")}
|
|
106
|
+
fullWidth
|
|
107
|
+
required={elementIDRequired}
|
|
108
|
+
autoComplete="off"
|
|
109
|
+
slotProps={{
|
|
110
|
+
htmlInput: { readOnly: true },
|
|
111
|
+
input: {
|
|
112
|
+
endAdornment: openLookupDialogIcon ? (
|
|
113
|
+
<IconButton onClick={() => setOpenElementLookupDialog(true)}>
|
|
114
|
+
<SearchIcon />
|
|
115
|
+
</IconButton>
|
|
116
|
+
) : undefined,
|
|
117
|
+
},
|
|
118
|
+
inputLabel: { shrink: !!elementValue?.ElementID },
|
|
119
|
+
}}
|
|
120
|
+
/>
|
|
121
|
+
</>
|
|
122
|
+
);
|
|
123
|
+
}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { render, screen } from "@testing-library/react";
|
|
2
|
+
import readerWasmUrl from "zxing-wasm/reader/zxing_reader.wasm?url";
|
|
3
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
4
|
+
|
|
5
|
+
import { createGs1Label, createSeparatedLabel, type FakeCamera, GS, installFakeCamera } from "../../../test/fakeCamera";
|
|
6
|
+
import Giai from "../utils/Giai";
|
|
7
|
+
import type { DecoderFactory } from "./decoder";
|
|
8
|
+
import { BarcodeScanner, createZxingDecoder } from "./index";
|
|
9
|
+
|
|
10
|
+
// The real zxing engine, with its WebAssembly served locally instead of from the CDN.
|
|
11
|
+
const zxing = createZxingDecoder({ wasmUrl: readerWasmUrl });
|
|
12
|
+
|
|
13
|
+
/** What the scanner reports for each label, and the element identity both resolve to. */
|
|
14
|
+
const ELEMENT = "8004704321012345";
|
|
15
|
+
const OTHER_ELEMENT = "8004704321067890";
|
|
16
|
+
const ELEMENT_URI = "urn:epc:id:giai:7043210.12345";
|
|
17
|
+
|
|
18
|
+
let camera: FakeCamera;
|
|
19
|
+
|
|
20
|
+
beforeEach(() => {
|
|
21
|
+
camera = installFakeCamera();
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
afterEach(() => {
|
|
25
|
+
camera.restore();
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
describe("BarcodeScanner with the zxing engine", () => {
|
|
29
|
+
it("reads a GS1 element label held in front of the camera", async () => {
|
|
30
|
+
let onRead = vi.fn();
|
|
31
|
+
camera.show(await createGs1Label("7043210", "12345"));
|
|
32
|
+
|
|
33
|
+
render(<BarcodeScanner decoder={zxing} onRead={onRead} />);
|
|
34
|
+
|
|
35
|
+
await vi.waitFor(() => expect(onRead).toHaveBeenCalledWith(ELEMENT), { timeout: 5000 });
|
|
36
|
+
expect(await screen.findByTestId("barcode-engine")).toHaveTextContent("zxing");
|
|
37
|
+
expect(Giai.fromString(onRead.mock.calls[0][0]).toEpcPureIdentityUri()).toBe(ELEMENT_URI);
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
it("reads a label that separates prefix and reference with GS", async () => {
|
|
41
|
+
let onRead = vi.fn();
|
|
42
|
+
camera.show(await createSeparatedLabel("7043210", "12345"));
|
|
43
|
+
|
|
44
|
+
render(<BarcodeScanner decoder={zxing} onRead={onRead} />);
|
|
45
|
+
|
|
46
|
+
await vi.waitFor(() => expect(onRead).toHaveBeenCalledWith(`80047043210${GS}12345`), { timeout: 5000 });
|
|
47
|
+
expect(Giai.fromString(onRead.mock.calls[0][0]).toEpcPureIdentityUri()).toBe(ELEMENT_URI);
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
it("asks for the rear camera", async () => {
|
|
51
|
+
render(<BarcodeScanner decoder={zxing} onRead={() => {}} />);
|
|
52
|
+
|
|
53
|
+
await vi.waitFor(() => expect(camera.getUserMedia).toHaveBeenCalled());
|
|
54
|
+
expect(camera.getUserMedia.mock.calls[0][0]).toMatchObject({
|
|
55
|
+
audio: false,
|
|
56
|
+
video: { facingMode: { ideal: "environment" } },
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it("reads a label that is small and off-centre in the picture", async () => {
|
|
61
|
+
let onRead = vi.fn();
|
|
62
|
+
camera.show(await createGs1Label("7043210", "12345"), { x: 420, y: 300, size: 130 });
|
|
63
|
+
|
|
64
|
+
render(<BarcodeScanner decoder={zxing} onRead={onRead} />);
|
|
65
|
+
|
|
66
|
+
await vi.waitFor(() => expect(onRead).toHaveBeenCalledWith(ELEMENT), { timeout: 5000 });
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
it("reads two labels in view at the same time", async () => {
|
|
70
|
+
let onRead = vi.fn();
|
|
71
|
+
camera.show(await createGs1Label("7043210", "12345"), { x: 30, y: 180, size: 260 });
|
|
72
|
+
camera.show(await createGs1Label("7043210", "67890"), { x: 350, y: 180, size: 260 });
|
|
73
|
+
|
|
74
|
+
render(<BarcodeScanner decoder={zxing} onRead={onRead} />);
|
|
75
|
+
|
|
76
|
+
await vi.waitFor(
|
|
77
|
+
() => {
|
|
78
|
+
expect(onRead).toHaveBeenCalledWith(ELEMENT);
|
|
79
|
+
expect(onRead).toHaveBeenCalledWith(OTHER_ELEMENT);
|
|
80
|
+
},
|
|
81
|
+
{ timeout: 5000 },
|
|
82
|
+
);
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
it("reports a label that stays in view once, and again after it has been away", async () => {
|
|
86
|
+
let onRead = vi.fn();
|
|
87
|
+
let label = await createGs1Label("7043210", "12345");
|
|
88
|
+
camera.show(label);
|
|
89
|
+
|
|
90
|
+
render(<BarcodeScanner decoder={zxing} onRead={onRead} />);
|
|
91
|
+
await vi.waitFor(() => expect(onRead).toHaveBeenCalledOnce(), { timeout: 5000 });
|
|
92
|
+
|
|
93
|
+
// Many frames later, still in view: no second read.
|
|
94
|
+
await new Promise((resolve) => setTimeout(resolve, 1500));
|
|
95
|
+
expect(onRead).toHaveBeenCalledOnce();
|
|
96
|
+
|
|
97
|
+
// Out of view for more than a second, then back.
|
|
98
|
+
camera.clear();
|
|
99
|
+
await new Promise((resolve) => setTimeout(resolve, 1300));
|
|
100
|
+
camera.show(label);
|
|
101
|
+
|
|
102
|
+
await vi.waitFor(() => expect(onRead).toHaveBeenCalledTimes(2), { timeout: 5000 });
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
it("reads nothing from an empty picture", async () => {
|
|
106
|
+
let onRead = vi.fn();
|
|
107
|
+
|
|
108
|
+
render(<BarcodeScanner decoder={zxing} onRead={onRead} />);
|
|
109
|
+
await screen.findByTestId("barcode-engine");
|
|
110
|
+
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
111
|
+
|
|
112
|
+
expect(onRead).not.toHaveBeenCalled();
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
describe("BarcodeScanner failures", () => {
|
|
117
|
+
it("says so when there is no camera", async () => {
|
|
118
|
+
camera.getUserMedia.mockRejectedValue(new DOMException("Requested device not found", "NotFoundError"));
|
|
119
|
+
|
|
120
|
+
render(<BarcodeScanner decoder={zxing} onRead={() => {}} />);
|
|
121
|
+
|
|
122
|
+
expect(await screen.findByText("No camera available")).toBeInTheDocument();
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
it("says so when camera access is refused", async () => {
|
|
126
|
+
camera.getUserMedia.mockRejectedValue(new DOMException("Permission denied", "NotAllowedError"));
|
|
127
|
+
|
|
128
|
+
render(<BarcodeScanner decoder={zxing} onRead={() => {}} />);
|
|
129
|
+
|
|
130
|
+
expect(await screen.findByText("No camera available")).toBeInTheDocument();
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
it("says so when the browser cannot run the engine", async () => {
|
|
134
|
+
let unsupported: DecoderFactory = async () => {
|
|
135
|
+
throw new Error("WebAssembly is not supported");
|
|
136
|
+
};
|
|
137
|
+
|
|
138
|
+
render(<BarcodeScanner decoder={unsupported} onRead={() => {}} />);
|
|
139
|
+
|
|
140
|
+
expect(await screen.findByText(/A browser that supports WebAssembly is required/)).toBeInTheDocument();
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
it("keeps scanning when one frame fails to decode", async () => {
|
|
144
|
+
let onRead = vi.fn();
|
|
145
|
+
let calls = 0;
|
|
146
|
+
let flaky: DecoderFactory = async () => ({
|
|
147
|
+
name: "flaky",
|
|
148
|
+
async decodeFrame() {
|
|
149
|
+
calls++;
|
|
150
|
+
if (calls === 1) throw new Error("decode failed");
|
|
151
|
+
return [
|
|
152
|
+
{
|
|
153
|
+
text: ELEMENT,
|
|
154
|
+
corners: [
|
|
155
|
+
{ x: 0, y: 0 },
|
|
156
|
+
{ x: 1, y: 0 },
|
|
157
|
+
{ x: 1, y: 1 },
|
|
158
|
+
{ x: 0, y: 1 },
|
|
159
|
+
],
|
|
160
|
+
},
|
|
161
|
+
];
|
|
162
|
+
},
|
|
163
|
+
async decodeImage() {
|
|
164
|
+
return [];
|
|
165
|
+
},
|
|
166
|
+
});
|
|
167
|
+
let warn = vi.spyOn(console, "warn").mockImplementation(() => {});
|
|
168
|
+
|
|
169
|
+
render(<BarcodeScanner decoder={flaky} onRead={onRead} />);
|
|
170
|
+
|
|
171
|
+
await vi.waitFor(() => expect(onRead).toHaveBeenCalledWith(ELEMENT), { timeout: 5000 });
|
|
172
|
+
expect(warn).toHaveBeenCalled();
|
|
173
|
+
warn.mockRestore();
|
|
174
|
+
});
|
|
175
|
+
});
|
|
@@ -24,18 +24,18 @@
|
|
|
24
24
|
display: flex;
|
|
25
25
|
align-items: center;
|
|
26
26
|
justify-content: space-between;
|
|
27
|
-
padding: 0.5rem 1.5rem;
|
|
27
|
+
padding: var(--ds-size-2, 0.5rem) var(--ds-size-6, 1.5rem);
|
|
28
28
|
color: white;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
.ob-barcode-scanner__actions {
|
|
32
32
|
display: flex;
|
|
33
33
|
align-items: center;
|
|
34
|
-
gap: 0.5rem;
|
|
34
|
+
gap: var(--ds-size-2, 0.5rem);
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
.ob-barcode-scanner__engine {
|
|
38
|
-
font-size: 0.75rem;
|
|
38
|
+
font-size: var(--ds-font-size-1, 0.75rem);
|
|
39
39
|
opacity: 0.7;
|
|
40
40
|
}
|
|
41
41
|
|
|
@@ -43,12 +43,12 @@
|
|
|
43
43
|
display: inline-flex;
|
|
44
44
|
align-items: center;
|
|
45
45
|
justify-content: center;
|
|
46
|
-
padding: 0.75rem;
|
|
46
|
+
padding: var(--ds-size-3, 0.75rem);
|
|
47
47
|
border: 0;
|
|
48
48
|
border-radius: 50%;
|
|
49
49
|
background: transparent;
|
|
50
50
|
color: inherit;
|
|
51
|
-
font-size: 1.75rem;
|
|
51
|
+
font-size: var(--ds-font-size-7, 1.75rem);
|
|
52
52
|
cursor: pointer;
|
|
53
53
|
}
|
|
54
54
|
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
.ob-barcode-scanner__error-icon {
|
|
78
|
-
margin: 1rem 0;
|
|
78
|
+
margin: var(--ds-size-4, 1rem) 0;
|
|
79
79
|
color: #eee;
|
|
80
|
-
font-size: 3.5rem;
|
|
80
|
+
font-size: var(--ds-font-size-10, 3.5rem);
|
|
81
81
|
}
|
|
@@ -13,8 +13,15 @@ export type ZxingDecoderOptions = {
|
|
|
13
13
|
imageOptions?: ReaderOptions;
|
|
14
14
|
};
|
|
15
15
|
|
|
16
|
+
/*
|
|
17
|
+
* `textMode: "Plain"` returns the symbol's content as encoded, with GS1 separators as U+001D -
|
|
18
|
+
* what `Giai.fromString` parses and the other engines return. zxing's own default ("HRI") gives
|
|
19
|
+
* the human-readable form instead: `(8004)7043210...` for a GS1 label and `<GS>` for a separator,
|
|
20
|
+
* neither of which resolves to an element.
|
|
21
|
+
*/
|
|
16
22
|
const defaultFrameOptions: ReaderOptions = {
|
|
17
23
|
formats: ["DataMatrix"],
|
|
24
|
+
textMode: "Plain",
|
|
18
25
|
tryHarder: false,
|
|
19
26
|
tryRotate: true,
|
|
20
27
|
tryInvert: false,
|
|
@@ -24,6 +31,7 @@ const defaultFrameOptions: ReaderOptions = {
|
|
|
24
31
|
|
|
25
32
|
const defaultImageOptions: ReaderOptions = {
|
|
26
33
|
formats: ["DataMatrix"],
|
|
34
|
+
textMode: "Plain",
|
|
27
35
|
tryHarder: true,
|
|
28
36
|
tryRotate: true,
|
|
29
37
|
tryInvert: true,
|