@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,141 +1,141 @@
|
|
|
1
|
-
import Add from "@mui/icons-material/Add";
|
|
2
|
-
import { Alert, Button, TextField } from "@mui/material";
|
|
3
|
-
import { useId, useRef, useState } from "react";
|
|
4
|
-
import type { ProjectsRecord } from "../../data/dsProjects";
|
|
5
|
-
import { ProjectSelect } from "../../ProjectSelect";
|
|
6
|
-
import { type ElementDetails, getElement } from "../getElement";
|
|
7
|
-
import { getLocalizedString } from "../../../i18n.js";
|
|
8
|
-
|
|
9
|
-
const isElementsOnly = /^([a-z]{2,4}[\s]*[0-9]{4,8}[\s,]*)+$/i;
|
|
10
|
-
const matchElements = /([a-z]{2,4}[\s]*[0-9]{4,8})/gi;
|
|
11
|
-
|
|
12
|
-
export type ProjectRecordBase = {
|
|
13
|
-
Domain: string;
|
|
14
|
-
ProjectID: string;
|
|
15
|
-
ProjectName?: string;
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
export type AddElementManualFormProps = {
|
|
19
|
-
onAdd: (element: string | ElementDetails) => Promise<void>;
|
|
20
|
-
mode?: "single" | "multi";
|
|
21
|
-
defaultProject?: ProjectRecordBase;
|
|
22
|
-
allowEmptyElement?: boolean;
|
|
23
|
-
};
|
|
24
|
-
|
|
25
|
-
export function AddElementManualForm({
|
|
26
|
-
onAdd,
|
|
27
|
-
mode,
|
|
28
|
-
defaultProject,
|
|
29
|
-
allowEmptyElement = false,
|
|
30
|
-
}: AddElementManualFormProps) {
|
|
31
|
-
let id = useId();
|
|
32
|
-
let buttonRef = useRef<HTMLButtonElement>(null);
|
|
33
|
-
let [working, setWorking] = useState(false);
|
|
34
|
-
let [elementId, setElementId] = useState<string>("");
|
|
35
|
-
let [project, setProject] = useState<Partial<ProjectsRecord> | null>(defaultProject ?? null);
|
|
36
|
-
|
|
37
|
-
async function handleSubmit(evt: React.FormEvent<HTMLFormElement>) {
|
|
38
|
-
try {
|
|
39
|
-
evt.preventDefault();
|
|
40
|
-
evt.stopPropagation();
|
|
41
|
-
let formData = new FormData(evt.target as HTMLFormElement);
|
|
42
|
-
let elements = formData.get("ElementID");
|
|
43
|
-
let domain = formData.get("Domain");
|
|
44
|
-
let project: ProjectsRecord = JSON.parse(formData.get("Project") as string);
|
|
45
|
-
|
|
46
|
-
if (allowEmptyElement) {
|
|
47
|
-
if (!project.ProjectID) {
|
|
48
|
-
alert(getLocalizedString("Project is required"));
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
} else {
|
|
52
|
-
if (!project.ProjectID || !domain || !elements) {
|
|
53
|
-
let warning = getLocalizedString(
|
|
54
|
-
mode === "multi" ? "Project and elements are required" : "Project and element are required",
|
|
55
|
-
);
|
|
56
|
-
alert(warning);
|
|
57
|
-
return;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
if (elements) {
|
|
62
|
-
setWorking(true);
|
|
63
|
-
let record = (elements as string)
|
|
64
|
-
.match(matchElements)
|
|
65
|
-
?.map((elementId) => elementId.replace(/\s+/g, ""))
|
|
66
|
-
.map((elementId) =>
|
|
67
|
-
getElement({ projectId: project.ProjectID as string, elementId: elementId }, { mode: "manual" }),
|
|
68
|
-
);
|
|
69
|
-
|
|
70
|
-
if (!record) {
|
|
71
|
-
alert(getLocalizedString("Invalid elements"));
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
let loaded = (await Promise.all(record)).map((record) => onAdd(record));
|
|
76
|
-
await Promise.all(loaded);
|
|
77
|
-
setWorking(false);
|
|
78
|
-
} else {
|
|
79
|
-
onAdd({
|
|
80
|
-
PrimKey: "",
|
|
81
|
-
Domain: domain?.toString() ?? "",
|
|
82
|
-
Created: project?.Created,
|
|
83
|
-
ProjectID: project.ProjectID,
|
|
84
|
-
ProjectName: project.ProjectName,
|
|
85
|
-
ProjectDomain: project.Domain,
|
|
86
|
-
ElementID: "",
|
|
87
|
-
DisplayName: "",
|
|
88
|
-
GiaiUri: "",
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
} catch (error) {
|
|
92
|
-
setWorking(false);
|
|
93
|
-
alert((error as Error).message);
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
return (
|
|
98
|
-
<form id={id} onSubmit={handleSubmit} method="post">
|
|
99
|
-
<Alert severity="warning" sx={{ mb: 2 }}>
|
|
100
|
-
{getLocalizedString(
|
|
101
|
-
"Manually entering elements is a major source of errors. Only use this as a last resort. If the camera or scanner is not working, please contact the IT department.",
|
|
102
|
-
)}
|
|
103
|
-
</Alert>
|
|
104
|
-
|
|
105
|
-
<input type="hidden" name="Project" value={project ? JSON.stringify(project) : ""} />
|
|
106
|
-
|
|
107
|
-
<ProjectSelect
|
|
108
|
-
onChange={(project) => (project ? setProject(project) : setProject(null))}
|
|
109
|
-
value={project}
|
|
110
|
-
id="AddElement_Project"
|
|
111
|
-
/>
|
|
112
|
-
|
|
113
|
-
<TextField
|
|
114
|
-
variant="filled"
|
|
115
|
-
fullWidth
|
|
116
|
-
autoComplete="off"
|
|
117
|
-
margin="normal"
|
|
118
|
-
name="ElementID"
|
|
119
|
-
id="AddElement_ElementID"
|
|
120
|
-
label={getLocalizedString("Element ID")}
|
|
121
|
-
value={elementId}
|
|
122
|
-
onChange={(evt) => setElementId(evt.target.value)}
|
|
123
|
-
/>
|
|
124
|
-
|
|
125
|
-
<Button
|
|
126
|
-
form={id}
|
|
127
|
-
ref={buttonRef}
|
|
128
|
-
color="primary"
|
|
129
|
-
variant="contained"
|
|
130
|
-
size="large"
|
|
131
|
-
type="submit"
|
|
132
|
-
disabled={(!allowEmptyElement && !isElementsOnly.test(elementId)) || working}
|
|
133
|
-
loading={working}
|
|
134
|
-
loadingPosition="end"
|
|
135
|
-
endIcon={<Add />}
|
|
136
|
-
>
|
|
137
|
-
{getLocalizedString("Add")}
|
|
138
|
-
</Button>
|
|
139
|
-
</form>
|
|
140
|
-
);
|
|
141
|
-
}
|
|
1
|
+
import Add from "@mui/icons-material/Add";
|
|
2
|
+
import { Alert, Button, TextField } from "@mui/material";
|
|
3
|
+
import { useId, useRef, useState } from "react";
|
|
4
|
+
import type { ProjectsRecord } from "../../data/dsProjects";
|
|
5
|
+
import { ProjectSelect } from "../../ProjectSelect";
|
|
6
|
+
import { type ElementDetails, getElement } from "../getElement";
|
|
7
|
+
import { getLocalizedString } from "../../../i18n.js";
|
|
8
|
+
|
|
9
|
+
const isElementsOnly = /^([a-z]{2,4}[\s]*[0-9]{4,8}[\s,]*)+$/i;
|
|
10
|
+
const matchElements = /([a-z]{2,4}[\s]*[0-9]{4,8})/gi;
|
|
11
|
+
|
|
12
|
+
export type ProjectRecordBase = {
|
|
13
|
+
Domain: string;
|
|
14
|
+
ProjectID: string;
|
|
15
|
+
ProjectName?: string;
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
export type AddElementManualFormProps = {
|
|
19
|
+
onAdd: (element: string | ElementDetails) => Promise<void>;
|
|
20
|
+
mode?: "single" | "multi";
|
|
21
|
+
defaultProject?: ProjectRecordBase;
|
|
22
|
+
allowEmptyElement?: boolean;
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
export function AddElementManualForm({
|
|
26
|
+
onAdd,
|
|
27
|
+
mode,
|
|
28
|
+
defaultProject,
|
|
29
|
+
allowEmptyElement = false,
|
|
30
|
+
}: AddElementManualFormProps) {
|
|
31
|
+
let id = useId();
|
|
32
|
+
let buttonRef = useRef<HTMLButtonElement>(null);
|
|
33
|
+
let [working, setWorking] = useState(false);
|
|
34
|
+
let [elementId, setElementId] = useState<string>("");
|
|
35
|
+
let [project, setProject] = useState<Partial<ProjectsRecord> | null>(defaultProject ?? null);
|
|
36
|
+
|
|
37
|
+
async function handleSubmit(evt: React.FormEvent<HTMLFormElement>) {
|
|
38
|
+
try {
|
|
39
|
+
evt.preventDefault();
|
|
40
|
+
evt.stopPropagation();
|
|
41
|
+
let formData = new FormData(evt.target as HTMLFormElement);
|
|
42
|
+
let elements = formData.get("ElementID");
|
|
43
|
+
let domain = formData.get("Domain");
|
|
44
|
+
let project: ProjectsRecord = JSON.parse(formData.get("Project") as string);
|
|
45
|
+
|
|
46
|
+
if (allowEmptyElement) {
|
|
47
|
+
if (!project.ProjectID) {
|
|
48
|
+
alert(getLocalizedString("Project is required"));
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
} else {
|
|
52
|
+
if (!project.ProjectID || !domain || !elements) {
|
|
53
|
+
let warning = getLocalizedString(
|
|
54
|
+
mode === "multi" ? "Project and elements are required" : "Project and element are required",
|
|
55
|
+
);
|
|
56
|
+
alert(warning);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
if (elements) {
|
|
62
|
+
setWorking(true);
|
|
63
|
+
let record = (elements as string)
|
|
64
|
+
.match(matchElements)
|
|
65
|
+
?.map((elementId) => elementId.replace(/\s+/g, ""))
|
|
66
|
+
.map((elementId) =>
|
|
67
|
+
getElement({ projectId: project.ProjectID as string, elementId: elementId }, { mode: "manual" }),
|
|
68
|
+
);
|
|
69
|
+
|
|
70
|
+
if (!record) {
|
|
71
|
+
alert(getLocalizedString("Invalid elements"));
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
let loaded = (await Promise.all(record)).map((record) => onAdd(record));
|
|
76
|
+
await Promise.all(loaded);
|
|
77
|
+
setWorking(false);
|
|
78
|
+
} else {
|
|
79
|
+
onAdd({
|
|
80
|
+
PrimKey: "",
|
|
81
|
+
Domain: domain?.toString() ?? "",
|
|
82
|
+
Created: project?.Created,
|
|
83
|
+
ProjectID: project.ProjectID,
|
|
84
|
+
ProjectName: project.ProjectName,
|
|
85
|
+
ProjectDomain: project.Domain,
|
|
86
|
+
ElementID: "",
|
|
87
|
+
DisplayName: "",
|
|
88
|
+
GiaiUri: "",
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
} catch (error) {
|
|
92
|
+
setWorking(false);
|
|
93
|
+
alert((error as Error).message);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
return (
|
|
98
|
+
<form id={id} onSubmit={handleSubmit} method="post">
|
|
99
|
+
<Alert severity="warning" sx={{ mb: 2 }}>
|
|
100
|
+
{getLocalizedString(
|
|
101
|
+
"Manually entering elements is a major source of errors. Only use this as a last resort. If the camera or scanner is not working, please contact the IT department.",
|
|
102
|
+
)}
|
|
103
|
+
</Alert>
|
|
104
|
+
|
|
105
|
+
<input type="hidden" name="Project" value={project ? JSON.stringify(project) : ""} />
|
|
106
|
+
|
|
107
|
+
<ProjectSelect
|
|
108
|
+
onChange={(project) => (project ? setProject(project) : setProject(null))}
|
|
109
|
+
value={project}
|
|
110
|
+
id="AddElement_Project"
|
|
111
|
+
/>
|
|
112
|
+
|
|
113
|
+
<TextField
|
|
114
|
+
variant="filled"
|
|
115
|
+
fullWidth
|
|
116
|
+
autoComplete="off"
|
|
117
|
+
margin="normal"
|
|
118
|
+
name="ElementID"
|
|
119
|
+
id="AddElement_ElementID"
|
|
120
|
+
label={getLocalizedString("Element ID")}
|
|
121
|
+
value={elementId}
|
|
122
|
+
onChange={(evt) => setElementId(evt.target.value)}
|
|
123
|
+
/>
|
|
124
|
+
|
|
125
|
+
<Button
|
|
126
|
+
form={id}
|
|
127
|
+
ref={buttonRef}
|
|
128
|
+
color="primary"
|
|
129
|
+
variant="contained"
|
|
130
|
+
size="large"
|
|
131
|
+
type="submit"
|
|
132
|
+
disabled={(!allowEmptyElement && !isElementsOnly.test(elementId)) || working}
|
|
133
|
+
loading={working}
|
|
134
|
+
loadingPosition="end"
|
|
135
|
+
endIcon={<Add />}
|
|
136
|
+
>
|
|
137
|
+
{getLocalizedString("Add")}
|
|
138
|
+
</Button>
|
|
139
|
+
</form>
|
|
140
|
+
);
|
|
141
|
+
}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
import { DataProviderHandlerAPI } from "@olenbetong/appframe-data";
|
|
2
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
3
|
+
|
|
4
|
+
import { type ElementDetails, getElement } from "./getElement";
|
|
5
|
+
|
|
6
|
+
/*
|
|
7
|
+
* `getElement` caches every element it finds by scan for the rest of the page's life, so each test
|
|
8
|
+
* uses asset references of its own.
|
|
9
|
+
*/
|
|
10
|
+
let nextReference = 40000;
|
|
11
|
+
function element(): ElementDetails & { reference: string } {
|
|
12
|
+
let reference = String(nextReference++);
|
|
13
|
+
|
|
14
|
+
return {
|
|
15
|
+
reference,
|
|
16
|
+
PrimKey: `pk-${reference}`,
|
|
17
|
+
Domain: "OB",
|
|
18
|
+
Created: new Date("2026-01-01"),
|
|
19
|
+
ProjectID: "PT19-1004",
|
|
20
|
+
ProjectName: "E39 Kristiansand - Mandal",
|
|
21
|
+
ProjectDomain: "OB",
|
|
22
|
+
ElementID: `AA${reference}`,
|
|
23
|
+
DisplayName: `Wall AA${reference}`,
|
|
24
|
+
GiaiUri: `urn:epc:id:giai:7043210.${reference}`,
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/** A GS1 element label as a scanner reports it: AI 8004, company prefix, asset reference. */
|
|
29
|
+
function barcode(reference: string) {
|
|
30
|
+
return `80047043210${reference}`;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
let rows: ElementDetails[];
|
|
34
|
+
let retrieve: ReturnType<typeof vi.spyOn>;
|
|
35
|
+
|
|
36
|
+
beforeEach(() => {
|
|
37
|
+
rows = [];
|
|
38
|
+
retrieve = vi.spyOn(DataProviderHandlerAPI.prototype, "retrieve").mockImplementation((async () => rows) as any);
|
|
39
|
+
// Activity logging posts to the server.
|
|
40
|
+
vi.spyOn(globalThis, "fetch").mockResolvedValue(new Response("{}"));
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
afterEach(() => {
|
|
44
|
+
vi.restoreAllMocks();
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
describe("getElement", () => {
|
|
48
|
+
it("looks a scanned label up by its GIAI identity", async () => {
|
|
49
|
+
let found = element();
|
|
50
|
+
rows = [found];
|
|
51
|
+
|
|
52
|
+
let result = await getElement(barcode(found.reference), { mode: "camera-barcode" });
|
|
53
|
+
|
|
54
|
+
expect(result).toBe(found);
|
|
55
|
+
expect(retrieve).toHaveBeenCalledWith({ whereClause: `[GiaiUri] = '${found.GiaiUri}'` });
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it("looks an RFID tag up by the same identity as its label", async () => {
|
|
59
|
+
let found = element();
|
|
60
|
+
rows = [found];
|
|
61
|
+
// GIAI-96 EPC for 7043210.<reference>: header 0x34, filter 0, partition 5.
|
|
62
|
+
let bits = `00110100000101${(7043210).toString(2).padStart(24, "0")}${BigInt(found.reference).toString(2).padStart(58, "0")}`;
|
|
63
|
+
let epc = BigInt(`0b${bits}`).toString(16).toUpperCase();
|
|
64
|
+
|
|
65
|
+
await getElement(epc, { mode: "hid-rfid" });
|
|
66
|
+
|
|
67
|
+
expect(retrieve).toHaveBeenCalledWith({ whereClause: `[GiaiUri] = '${found.GiaiUri}'` });
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it("looks a manually entered element up by project and element ID", async () => {
|
|
71
|
+
let found = element();
|
|
72
|
+
rows = [found];
|
|
73
|
+
|
|
74
|
+
let result = await getElement({ projectId: "PT19-1004", elementId: found.ElementID }, { mode: "manual" });
|
|
75
|
+
|
|
76
|
+
expect(result).toBe(found);
|
|
77
|
+
expect(retrieve).toHaveBeenCalledWith({
|
|
78
|
+
whereClause: `[ProjectID] = 'PT19-1004' AND [ElementID] = '${found.ElementID}'`,
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
it("answers a label scanned again from its cache", async () => {
|
|
83
|
+
let found = element();
|
|
84
|
+
rows = [found];
|
|
85
|
+
let context = { mode: "camera-barcode" as const };
|
|
86
|
+
|
|
87
|
+
await getElement(barcode(found.reference), context);
|
|
88
|
+
let second: Parameters<typeof getElement>[1] = { mode: "camera-barcode" };
|
|
89
|
+
let result = await getElement(barcode(found.reference), second);
|
|
90
|
+
|
|
91
|
+
expect(result).toBe(found);
|
|
92
|
+
expect(retrieve).toHaveBeenCalledOnce();
|
|
93
|
+
expect(second.method).toBe("cache");
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
it("looks a manual entry up every time", async () => {
|
|
97
|
+
let found = element();
|
|
98
|
+
rows = [found];
|
|
99
|
+
let filter = { projectId: "PT19-1004", elementId: found.ElementID };
|
|
100
|
+
|
|
101
|
+
await getElement(filter, { mode: "manual" });
|
|
102
|
+
await getElement(filter, { mode: "manual" });
|
|
103
|
+
|
|
104
|
+
expect(retrieve).toHaveBeenCalledTimes(2);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it("fails for an element that is not registered, and does not remember the miss", async () => {
|
|
108
|
+
let missing = element();
|
|
109
|
+
|
|
110
|
+
await expect(getElement(barcode(missing.reference), { mode: "camera-barcode" })).rejects.toThrow(
|
|
111
|
+
"Element not found",
|
|
112
|
+
);
|
|
113
|
+
|
|
114
|
+
// Registered afterwards (e.g. the label was printed before the element was synced).
|
|
115
|
+
rows = [missing];
|
|
116
|
+
await expect(getElement(barcode(missing.reference), { mode: "camera-barcode" })).resolves.toBe(missing);
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
it("rejects a scan that is not an element identity without asking the server", async () => {
|
|
120
|
+
await expect(getElement("AA1001", { mode: "hid-barcode" })).rejects.toThrow();
|
|
121
|
+
expect(retrieve).not.toHaveBeenCalled();
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
it("records how the element was found on the context", async () => {
|
|
125
|
+
let found = element();
|
|
126
|
+
rows = [found];
|
|
127
|
+
let context: Parameters<typeof getElement>[1] = { mode: "camera-barcode" };
|
|
128
|
+
|
|
129
|
+
await getElement(barcode(found.reference), context);
|
|
130
|
+
|
|
131
|
+
expect(context).toMatchObject({ method: "database", result: found, filter: barcode(found.reference) });
|
|
132
|
+
});
|
|
133
|
+
});
|