@olenbetong/synergi-react 4.3.1 → 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/dist/styles/styles.css +1 -1
- package/dist/styles/styles.css.map +1 -1
- package/es/components/Checkbox/index.js +1 -9
- 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.d.ts +7 -0
- package/es/components/MergeProgressDialog/MergeProgressDialogDs.js +20 -0
- package/es/components/MergeProgressDialog/index.d.ts +3 -8
- package/es/components/MergeProgressDialog/index.js +4 -133
- package/es/components/MergeProgressDialog/useMergeJob.d.ts +36 -0
- package/es/components/MergeProgressDialog/useMergeJob.js +142 -0
- package/es/components/Portal/index.js +20 -20
- package/es/components/ProgressBar/index.css +1 -1
- package/es/components/SplitContainer/index.js +3 -1
- package/es/components/Toolbar/index.js +6 -1
- package/es/elements/ElementLookupDialog/BarcodeScanner/BarcodeScanner.css +81 -0
- package/es/elements/ElementLookupDialog/BarcodeScanner/DeadIcon.d.ts +2 -2
- package/es/elements/ElementLookupDialog/BarcodeScanner/DeadIcon.js +1 -2
- package/es/elements/ElementLookupDialog/BarcodeScanner/Error.js +3 -29
- package/es/elements/ElementLookupDialog/BarcodeScanner/decoders/zxing.js +8 -0
- package/es/elements/ElementLookupDialog/BarcodeScanner/index.d.ts +1 -0
- package/es/elements/ElementLookupDialog/BarcodeScanner/index.js +3 -28
- 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/index.d.ts +2 -1
- package/es/index.js +2 -1
- package/es/mui/index.d.ts +1 -0
- package/es/mui/index.js +1 -0
- package/es/useTranslation/index.js +5 -3
- package/package.json +34 -15
- package/src/chrome/AppShell/AppShell.test.tsx +48 -0
- package/src/chrome/openReport.test.ts +50 -0
- package/src/colorScheme.test.ts +188 -0
- package/src/components/Checkbox/Checkbox.browser.test.tsx +116 -0
- package/src/components/Checkbox/index.tsx +1 -10
- package/src/components/ColorCard/ColorCard.test.tsx +34 -0
- package/src/components/DateNavigator/DateNavigator.test.tsx +175 -0
- package/src/components/FilePond.browser.test.tsx +389 -0
- package/src/components/FilePond.tsx +3 -12
- package/src/components/ImageEditor/ImageEditor.browser.test.tsx +286 -0
- package/src/components/ImageEditor/ImageEditor.test.tsx +299 -0
- package/src/components/ImageEditor/plugins/cropPlugin/useCropTool.test.ts +225 -0
- package/src/components/ImageEditor/plugins/plugins.browser.test.ts +252 -0
- 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/useZoomPan.test.ts +154 -0
- package/src/components/ImageEditor/useEdgeDetection.test.ts +96 -0
- package/src/components/ImageEditor/useImageHistory.test.ts +409 -0
- package/src/components/ImageEditor/useImageHistory.ts +10 -1
- package/src/components/ImageEditor/useOpenCV.test.ts +208 -0
- package/src/components/MergeProgressDialog/MergeProgressDialogDs.browser.test.tsx +156 -0
- package/src/components/MergeProgressDialog/MergeProgressDialogDs.tsx +92 -0
- package/src/components/MergeProgressDialog/index.tsx +5 -158
- package/src/components/MergeProgressDialog/useMergeJob.test.ts +326 -0
- package/src/components/MergeProgressDialog/useMergeJob.ts +170 -0
- package/src/components/PdfViewer/PdfViewer.browser.test.tsx +78 -0
- package/src/components/Portal/Portal.test.tsx +106 -0
- package/src/components/Portal/index.tsx +22 -25
- package/src/components/ProgressBar/index.scss +23 -54
- 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 +3 -1
- 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 +6 -1
- package/src/components/ValueToggleGroup/ValueToggleGroup.test.tsx +112 -0
- package/src/elements/ElementLookupDialog/BarcodeScanner/BarcodeScanner.browser.test.tsx +175 -0
- package/src/elements/ElementLookupDialog/BarcodeScanner/BarcodeScanner.css +81 -0
- package/src/elements/ElementLookupDialog/BarcodeScanner/DeadIcon.tsx +4 -4
- package/src/elements/ElementLookupDialog/BarcodeScanner/Error.tsx +7 -36
- 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/BarcodeScanner/index.tsx +20 -49
- package/src/elements/ElementLookupDialog/HIDScanner/useHIDScanner.test.ts +124 -0
- package/src/elements/ElementLookupDialog/HIDScanner/useHIDScanner.ts +2 -1
- package/src/elements/ElementLookupDialog/getElement.test.ts +133 -0
- package/src/elements/ElementLookupDialog/utils/Giai.test.ts +53 -0
- 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/i18n.test.ts +31 -0
- package/src/index.ts +5 -1
- package/src/mui/index.ts +1 -0
- 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 +15 -0
- 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 -1
- package/es/test/setup.js +0 -6
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
import { Button, Card, Dialog, Heading, Link, Table } from "@digdir/designsystemet-react";
|
|
2
|
+
import { PlusIcon } from "@navikt/aksel-icons";
|
|
3
|
+
import { ResponsiveDialog } from "@olenbetong/appframe-ds";
|
|
4
|
+
import { useDataWithFilter } from "@olenbetong/appframe-react";
|
|
5
|
+
import { type RefObject, useImperativeHandle, useMemo, useState } from "react";
|
|
6
|
+
import type { DamagesRecord } from "../elements/data/dsDamages.js";
|
|
7
|
+
import { dsDamagesDuplicateCheck } from "../elements/data/dsDamagesDuplicateCheck.js";
|
|
8
|
+
import type { DuplicateElementDamageHandle } from "../elements/ElementDamage/DuplicateDamage/index.js";
|
|
9
|
+
import type { Element } from "../elements/ElementLookup.js";
|
|
10
|
+
import { getLocalizedString } from "../i18n.js";
|
|
11
|
+
|
|
12
|
+
export type { DuplicateElementDamageHandle };
|
|
13
|
+
|
|
14
|
+
export type DuplicateElementDamageDialogProps = {
|
|
15
|
+
open: boolean;
|
|
16
|
+
onClose: () => void;
|
|
17
|
+
record: DamagesRecord[];
|
|
18
|
+
onRegisterAnyway: () => void;
|
|
19
|
+
loading: boolean;
|
|
20
|
+
linkToDamage: boolean;
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Lists the unfixed damages already registered on an element: a table on wide screens, cards on
|
|
25
|
+
* narrow ones. Designsystemet version of `DuplicateElementDamageDialog` in
|
|
26
|
+
* `@olenbetong/synergi-react/elements`.
|
|
27
|
+
*/
|
|
28
|
+
export function DuplicateElementDamageDialog({
|
|
29
|
+
open,
|
|
30
|
+
onClose,
|
|
31
|
+
record,
|
|
32
|
+
onRegisterAnyway,
|
|
33
|
+
loading,
|
|
34
|
+
linkToDamage,
|
|
35
|
+
}: DuplicateElementDamageDialogProps) {
|
|
36
|
+
function damageId(damage: DamagesRecord) {
|
|
37
|
+
return linkToDamage ? <Link href={`${damage.ID}`}>{damage.ID}</Link> : damage.ID;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
return (
|
|
41
|
+
<ResponsiveDialog
|
|
42
|
+
open={open}
|
|
43
|
+
onClose={onClose}
|
|
44
|
+
maxWidth="md"
|
|
45
|
+
title={getLocalizedString("This element has one or more unfixed registered damage")}
|
|
46
|
+
>
|
|
47
|
+
<Dialog.Block>
|
|
48
|
+
<Table className="ObElementsDuplicate-table ObElementsDuplicate-wide" zebra>
|
|
49
|
+
<Table.Head>
|
|
50
|
+
<Table.Row>
|
|
51
|
+
<Table.HeaderCell>ID</Table.HeaderCell>
|
|
52
|
+
<Table.HeaderCell>{getLocalizedString("Date")}</Table.HeaderCell>
|
|
53
|
+
<Table.HeaderCell>{getLocalizedString("Description")}</Table.HeaderCell>
|
|
54
|
+
<Table.HeaderCell>{getLocalizedString("Cause")}</Table.HeaderCell>
|
|
55
|
+
<Table.HeaderCell>{getLocalizedString("Action")}</Table.HeaderCell>
|
|
56
|
+
</Table.Row>
|
|
57
|
+
</Table.Head>
|
|
58
|
+
<Table.Body>
|
|
59
|
+
{record.map((damage) => (
|
|
60
|
+
<Table.Row key={damage.PrimKey}>
|
|
61
|
+
<Table.Cell>{damageId(damage)}</Table.Cell>
|
|
62
|
+
<Table.Cell>{damage.Date.toLocaleDateString()}</Table.Cell>
|
|
63
|
+
<Table.Cell>{damage.Description}</Table.Cell>
|
|
64
|
+
<Table.Cell>{damage.Cause}</Table.Cell>
|
|
65
|
+
<Table.Cell>{damage.Action}</Table.Cell>
|
|
66
|
+
</Table.Row>
|
|
67
|
+
))}
|
|
68
|
+
</Table.Body>
|
|
69
|
+
</Table>
|
|
70
|
+
<div className="ObElementsDuplicate-cards ObElementsDuplicate-narrow">
|
|
71
|
+
{record.map((damage) => (
|
|
72
|
+
<Card key={damage.PrimKey} data-color="neutral" variant="tinted" className="ObElementsDuplicate-card">
|
|
73
|
+
<Card.Block>
|
|
74
|
+
<span className="ObElements-subtle">
|
|
75
|
+
{damage.Date.toLocaleDateString()} · {damageId(damage)}
|
|
76
|
+
</span>
|
|
77
|
+
<Heading level={3} data-size="2xs">
|
|
78
|
+
{damage.ElementID} - {damage.DisplayName}
|
|
79
|
+
</Heading>
|
|
80
|
+
<dl>
|
|
81
|
+
<dt>{getLocalizedString("Description")}</dt>
|
|
82
|
+
<dd>{damage.Description}</dd>
|
|
83
|
+
<dt>{getLocalizedString("Cause")}</dt>
|
|
84
|
+
<dd>{damage.Cause}</dd>
|
|
85
|
+
<dt>{getLocalizedString("Action")}</dt>
|
|
86
|
+
<dd>{damage.Action}</dd>
|
|
87
|
+
</dl>
|
|
88
|
+
</Card.Block>
|
|
89
|
+
</Card>
|
|
90
|
+
))}
|
|
91
|
+
</div>
|
|
92
|
+
</Dialog.Block>
|
|
93
|
+
<Dialog.Block className="ObElementsLookupDialog-actions">
|
|
94
|
+
<Button variant="tertiary" onClick={onClose}>
|
|
95
|
+
{getLocalizedString("Cancel")}
|
|
96
|
+
</Button>
|
|
97
|
+
<Button variant="primary" loading={loading} onClick={onRegisterAnyway}>
|
|
98
|
+
{!loading && <PlusIcon aria-hidden />}
|
|
99
|
+
{getLocalizedString("Register damage anyway")}
|
|
100
|
+
</Button>
|
|
101
|
+
</Dialog.Block>
|
|
102
|
+
</ResponsiveDialog>
|
|
103
|
+
);
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
export type DuplicateElementDamageProps = {
|
|
107
|
+
element: Element | null;
|
|
108
|
+
ref?: RefObject<DuplicateElementDamageHandle | null>;
|
|
109
|
+
/** External control of dialog visibility */
|
|
110
|
+
open?: boolean;
|
|
111
|
+
onOpenChange?: (value: boolean) => void;
|
|
112
|
+
/** Skip duplicate checking (used in edit mode) */
|
|
113
|
+
disableCheck?: boolean;
|
|
114
|
+
/** Loading state for the submit button */
|
|
115
|
+
loading?: boolean;
|
|
116
|
+
/** Link the damage IDs to the damage form */
|
|
117
|
+
linkToDamage?: boolean;
|
|
118
|
+
/** Called when the user presses "register anyway" in the dialog */
|
|
119
|
+
onRegisterAnyway?: () => void;
|
|
120
|
+
};
|
|
121
|
+
|
|
122
|
+
/**
|
|
123
|
+
* Checks for unfixed damages on the chosen element and shows them before a new one is
|
|
124
|
+
* registered. Designsystemet version of `DuplicateElementDamage` in
|
|
125
|
+
* `@olenbetong/synergi-react/elements`, with the same handle.
|
|
126
|
+
*/
|
|
127
|
+
export function DuplicateElementDamage({
|
|
128
|
+
element,
|
|
129
|
+
ref,
|
|
130
|
+
open: controlledOpen,
|
|
131
|
+
onOpenChange,
|
|
132
|
+
disableCheck = false,
|
|
133
|
+
loading = false,
|
|
134
|
+
linkToDamage = true,
|
|
135
|
+
onRegisterAnyway,
|
|
136
|
+
}: DuplicateElementDamageProps) {
|
|
137
|
+
let [record, setRecord] = useState<DamagesRecord[]>([]);
|
|
138
|
+
let [uncontrolledOpen, setUncontrolledOpen] = useState(false);
|
|
139
|
+
let open = controlledOpen === undefined ? uncontrolledOpen : controlledOpen;
|
|
140
|
+
|
|
141
|
+
let whereClause = useMemo(() => {
|
|
142
|
+
if (!element) {
|
|
143
|
+
return "1=0";
|
|
144
|
+
}
|
|
145
|
+
return `Domain = '${element.Domain}' AND ElementID = '${element.ElementID}' AND ProjectID = '${element.ProjectID}'`;
|
|
146
|
+
}, [element]);
|
|
147
|
+
|
|
148
|
+
let duplicateRecord = useDataWithFilter(dsDamagesDuplicateCheck, whereClause, "whereClause");
|
|
149
|
+
|
|
150
|
+
async function runDuplicateCheck(): Promise<DamagesRecord[] | null> {
|
|
151
|
+
if (disableCheck) {
|
|
152
|
+
return null;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
if (duplicateRecord.length > 0) {
|
|
156
|
+
setRecord(duplicateRecord);
|
|
157
|
+
setUncontrolledOpen(true);
|
|
158
|
+
|
|
159
|
+
return duplicateRecord;
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
return null;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
useImperativeHandle(ref, () => ({
|
|
166
|
+
onClose: () => setUncontrolledOpen(false),
|
|
167
|
+
checkDuplicate: () => runDuplicateCheck(),
|
|
168
|
+
record,
|
|
169
|
+
}));
|
|
170
|
+
|
|
171
|
+
return (
|
|
172
|
+
<DuplicateElementDamageDialog
|
|
173
|
+
open={open}
|
|
174
|
+
onClose={() => {
|
|
175
|
+
setRecord([]);
|
|
176
|
+
setUncontrolledOpen(false);
|
|
177
|
+
onOpenChange?.(false);
|
|
178
|
+
}}
|
|
179
|
+
record={record}
|
|
180
|
+
onRegisterAnyway={onRegisterAnyway ?? (() => {})}
|
|
181
|
+
loading={loading}
|
|
182
|
+
linkToDamage={linkToDamage}
|
|
183
|
+
/>
|
|
184
|
+
);
|
|
185
|
+
}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { Button, Textfield } from "@digdir/designsystemet-react";
|
|
2
|
+
import { MagnifyingGlassIcon } from "@navikt/aksel-icons";
|
|
3
|
+
import { type ReactNode, type RefObject, useEffect, useImperativeHandle, useState } from "react";
|
|
4
|
+
import type { DecoderFactory } from "../elements/ElementLookupDialog/BarcodeScanner/index.js";
|
|
5
|
+
import type { AddElement } from "../elements/ElementLookupDialog/index.js";
|
|
6
|
+
import type { Element, ElementLookupHandle } from "../elements/ElementLookup.js";
|
|
7
|
+
import { getLocalizedString } from "../i18n.js";
|
|
8
|
+
import { ElementLookupDialog } from "./ElementLookupDialog.js";
|
|
9
|
+
|
|
10
|
+
export type { Element, ElementLookupHandle };
|
|
11
|
+
|
|
12
|
+
export type ElementLookupProps = {
|
|
13
|
+
value?: Element | null;
|
|
14
|
+
defaultValue?: Element | null;
|
|
15
|
+
ref?: RefObject<ElementLookupHandle | null>;
|
|
16
|
+
elementIDRequired?: boolean;
|
|
17
|
+
openLookupDialogIcon?: boolean;
|
|
18
|
+
onChange?: (value: Element | null) => void;
|
|
19
|
+
onDialogChange?: (open: boolean) => void;
|
|
20
|
+
/** Engine for the camera tab of the lookup dialog. Defaults to zxing-wasm. */
|
|
21
|
+
decoder?: DecoderFactory;
|
|
22
|
+
/** Extra controls in the camera tab footer, e.g. an engine picker. */
|
|
23
|
+
scannerActions?: ReactNode;
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Read-only project and element fields filled from the element lookup dialog, with the hidden
|
|
28
|
+
* `ProjectID` and `ElementRef` inputs a form posts. Designsystemet version of `ElementLookup` in
|
|
29
|
+
* `@olenbetong/synergi-react/elements`.
|
|
30
|
+
*/
|
|
31
|
+
export function ElementLookup({
|
|
32
|
+
value,
|
|
33
|
+
defaultValue,
|
|
34
|
+
ref,
|
|
35
|
+
elementIDRequired = false,
|
|
36
|
+
openLookupDialogIcon,
|
|
37
|
+
onChange,
|
|
38
|
+
onDialogChange,
|
|
39
|
+
decoder,
|
|
40
|
+
scannerActions,
|
|
41
|
+
}: ElementLookupProps) {
|
|
42
|
+
let [dialogOpen, setDialogOpen] = useState(false);
|
|
43
|
+
let [element, setElement] = useState<Element | null>(defaultValue ?? null);
|
|
44
|
+
let [initialDefault, setInitialDefault] = useState(defaultValue);
|
|
45
|
+
let elementValue = value === undefined ? element : value;
|
|
46
|
+
|
|
47
|
+
// A default value that arrives after the first render (loader data) is taken once.
|
|
48
|
+
if (defaultValue && !initialDefault) {
|
|
49
|
+
setInitialDefault(defaultValue);
|
|
50
|
+
if (value === undefined) setElement(defaultValue);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
useImperativeHandle(ref, () => ({
|
|
54
|
+
openDialog: () => setDialogOpen(true),
|
|
55
|
+
closeDialog: () => setDialogOpen(false),
|
|
56
|
+
}));
|
|
57
|
+
|
|
58
|
+
useEffect(() => {
|
|
59
|
+
onDialogChange?.(dialogOpen);
|
|
60
|
+
}, [dialogOpen]); // oxlint-disable-line react-hooks/exhaustive-deps (only run when the dialog opens or closes)
|
|
61
|
+
|
|
62
|
+
async function handleAddElement(addElement: AddElement) {
|
|
63
|
+
onChange?.(addElement.element);
|
|
64
|
+
setElement(addElement.element);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return (
|
|
68
|
+
<>
|
|
69
|
+
<ElementLookupDialog
|
|
70
|
+
open={dialogOpen}
|
|
71
|
+
mode="single"
|
|
72
|
+
onClose={() => setDialogOpen(false)}
|
|
73
|
+
onAdd={handleAddElement}
|
|
74
|
+
allowEmptyElement={!elementIDRequired}
|
|
75
|
+
decoder={decoder}
|
|
76
|
+
scannerActions={scannerActions}
|
|
77
|
+
/>
|
|
78
|
+
|
|
79
|
+
<input type="hidden" name="ProjectID" value={elementValue?.ProjectID ?? ""} />
|
|
80
|
+
<input type="hidden" name="ElementRef" value={elementValue?.PrimKey ?? ""} />
|
|
81
|
+
|
|
82
|
+
<Textfield
|
|
83
|
+
id="NewElementDamage_Project"
|
|
84
|
+
value={elementValue ? `${elementValue.ProjectID}: ${elementValue.ProjectName}` : ""}
|
|
85
|
+
label={getLocalizedString("Project")}
|
|
86
|
+
required
|
|
87
|
+
readOnly
|
|
88
|
+
autoComplete="off"
|
|
89
|
+
/>
|
|
90
|
+
<div style={{ display: "flex", alignItems: "flex-end", gap: "var(--ds-size-2)" }}>
|
|
91
|
+
<Textfield
|
|
92
|
+
style={{ flex: 1 }}
|
|
93
|
+
name="ElementID"
|
|
94
|
+
id="NewElementDamage_ElementID"
|
|
95
|
+
value={elementValue?.ElementID ?? ""}
|
|
96
|
+
label={getLocalizedString("Element ID")}
|
|
97
|
+
required={elementIDRequired}
|
|
98
|
+
readOnly
|
|
99
|
+
autoComplete="off"
|
|
100
|
+
/>
|
|
101
|
+
{openLookupDialogIcon && (
|
|
102
|
+
<Button
|
|
103
|
+
icon
|
|
104
|
+
variant="secondary"
|
|
105
|
+
aria-label={getLocalizedString("Search for element")}
|
|
106
|
+
onClick={() => setDialogOpen(true)}
|
|
107
|
+
>
|
|
108
|
+
<MagnifyingGlassIcon aria-hidden />
|
|
109
|
+
</Button>
|
|
110
|
+
)}
|
|
111
|
+
</div>
|
|
112
|
+
</>
|
|
113
|
+
);
|
|
114
|
+
}
|
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
import { DataProviderHandlerAPI } from "@olenbetong/appframe-data";
|
|
2
|
+
import { render, screen, within } from "@testing-library/react";
|
|
3
|
+
import { userEvent } from "vitest/browser";
|
|
4
|
+
import readerWasmUrl from "zxing-wasm/reader/zxing_reader.wasm?url";
|
|
5
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
6
|
+
|
|
7
|
+
import { createZxingDecoder } from "../elements/ElementLookupDialog/BarcodeScanner/index";
|
|
8
|
+
import type { ElementDetails } from "../elements/ElementLookupDialog/getElement";
|
|
9
|
+
import { createGs1Label, type FakeCamera, installFakeCamera } from "../test/fakeCamera";
|
|
10
|
+
import "./elements-ds.css";
|
|
11
|
+
|
|
12
|
+
import { ElementLookupDialog } from "./ElementLookupDialog";
|
|
13
|
+
|
|
14
|
+
const zxing = createZxingDecoder({ wasmUrl: readerWasmUrl });
|
|
15
|
+
|
|
16
|
+
/*
|
|
17
|
+
* Every test scans its own asset references: `getElement` caches what it has looked up for the
|
|
18
|
+
* rest of the page's life, and a cached element would not reach the stubbed lookup.
|
|
19
|
+
*/
|
|
20
|
+
let nextReference = 20000;
|
|
21
|
+
function newElement(): { reference: string; uri: string; epc: string; details: ElementDetails } {
|
|
22
|
+
let reference = String(nextReference++);
|
|
23
|
+
let elementId = `AA${reference}`;
|
|
24
|
+
// GIAI-96: header 0x34, filter 0, partition 5, 24-bit company prefix, 58-bit asset reference.
|
|
25
|
+
let bits = `00110100000101${(7043210).toString(2).padStart(24, "0")}${BigInt(reference).toString(2).padStart(58, "0")}`;
|
|
26
|
+
|
|
27
|
+
return {
|
|
28
|
+
reference,
|
|
29
|
+
uri: `urn:epc:id:giai:7043210.${reference}`,
|
|
30
|
+
epc: BigInt(`0b${bits}`).toString(16).toUpperCase(),
|
|
31
|
+
details: {
|
|
32
|
+
PrimKey: `pk-${reference}`,
|
|
33
|
+
Domain: "OB",
|
|
34
|
+
Created: new Date("2026-01-01"),
|
|
35
|
+
ProjectID: "PT19-1004",
|
|
36
|
+
ProjectName: "E39 Kristiansand - Mandal",
|
|
37
|
+
ProjectDomain: "OB",
|
|
38
|
+
ElementID: elementId,
|
|
39
|
+
DisplayName: `Wall ${elementId}`,
|
|
40
|
+
GiaiUri: `urn:epc:id:giai:7043210.${reference}`,
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** The elements register, as the lookup view answers a `[GiaiUri] = '...'` query. */
|
|
46
|
+
let register: ElementDetails[];
|
|
47
|
+
let retrieve: ReturnType<typeof vi.spyOn>;
|
|
48
|
+
let alert: ReturnType<typeof vi.spyOn>;
|
|
49
|
+
let camera: FakeCamera;
|
|
50
|
+
|
|
51
|
+
beforeEach(() => {
|
|
52
|
+
register = [];
|
|
53
|
+
retrieve = vi
|
|
54
|
+
.spyOn(DataProviderHandlerAPI.prototype, "retrieve")
|
|
55
|
+
// `retrieve` is overloaded (plain and paged); the lookup uses the plain form.
|
|
56
|
+
.mockImplementation((async (parameters: { whereClause?: string }) => {
|
|
57
|
+
let uri = /\[GiaiUri\] = '([^']+)'/.exec(parameters.whereClause ?? "")?.[1];
|
|
58
|
+
return register.filter((element) => element.GiaiUri === uri);
|
|
59
|
+
}) as any);
|
|
60
|
+
alert = vi.spyOn(window, "alert").mockImplementation(() => {});
|
|
61
|
+
// Activity logging posts to the server; there is none here. Everything else (the WebAssembly) passes.
|
|
62
|
+
let realFetch = window.fetch.bind(window);
|
|
63
|
+
vi.spyOn(window, "fetch").mockImplementation((input, init) =>
|
|
64
|
+
String(input instanceof Request ? input.url : input).includes("/api/logging/")
|
|
65
|
+
? Promise.resolve(new Response("{}"))
|
|
66
|
+
: realFetch(input, init),
|
|
67
|
+
);
|
|
68
|
+
camera = installFakeCamera();
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
afterEach(() => {
|
|
72
|
+
camera.restore();
|
|
73
|
+
vi.restoreAllMocks();
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
async function scanWithKeyboardScanner(text: string) {
|
|
77
|
+
await userEvent.click(screen.getByRole("tab", { name: "Scanner" }));
|
|
78
|
+
await screen.findByText(/Listening for scanned elements/);
|
|
79
|
+
await userEvent.keyboard(`${text}{Enter}`);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
describe("ElementLookupDialog", () => {
|
|
83
|
+
it("adds the element whose label the camera sees", async () => {
|
|
84
|
+
let element = newElement();
|
|
85
|
+
register.push(element.details);
|
|
86
|
+
camera.show(await createGs1Label("7043210", element.reference));
|
|
87
|
+
let onAdd = vi.fn(async () => {});
|
|
88
|
+
let onClose = vi.fn();
|
|
89
|
+
|
|
90
|
+
render(<ElementLookupDialog open mode="single" onAdd={onAdd} onClose={onClose} decoder={zxing} />);
|
|
91
|
+
|
|
92
|
+
let item = await screen.findByText(element.details.DisplayName, {}, { timeout: 5000 });
|
|
93
|
+
expect(within(item.closest("li")!).getByText(element.details.ElementID)).toBeInTheDocument();
|
|
94
|
+
expect(retrieve).toHaveBeenCalledWith({ whereClause: `[GiaiUri] = '${element.uri}'` });
|
|
95
|
+
|
|
96
|
+
await userEvent.click(screen.getByRole("button", { name: "Add element" }));
|
|
97
|
+
|
|
98
|
+
expect(onAdd).toHaveBeenCalledWith(expect.objectContaining({ element: element.details, mode: "camera-barcode" }));
|
|
99
|
+
expect(onClose).toHaveBeenCalled();
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
it("adds the element an RFID reader in keyboard mode reads", async () => {
|
|
103
|
+
let element = newElement();
|
|
104
|
+
register.push(element.details);
|
|
105
|
+
let onAdd = vi.fn(async () => {});
|
|
106
|
+
|
|
107
|
+
render(<ElementLookupDialog open mode="single" onAdd={onAdd} onClose={() => {}} decoder={zxing} />);
|
|
108
|
+
await scanWithKeyboardScanner(element.epc);
|
|
109
|
+
|
|
110
|
+
await screen.findByText(element.details.DisplayName);
|
|
111
|
+
expect(retrieve).toHaveBeenCalledWith({ whereClause: `[GiaiUri] = '${element.uri}'` });
|
|
112
|
+
|
|
113
|
+
await userEvent.click(screen.getByRole("button", { name: "Add element" }));
|
|
114
|
+
expect(onAdd).toHaveBeenCalledWith(expect.objectContaining({ element: element.details, mode: "hid-rfid" }));
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
it("tells a barcode typed by a keyboard scanner from an RFID tag", async () => {
|
|
118
|
+
let element = newElement();
|
|
119
|
+
register.push(element.details);
|
|
120
|
+
let onAdd = vi.fn(async () => {});
|
|
121
|
+
|
|
122
|
+
render(<ElementLookupDialog open mode="single" onAdd={onAdd} onClose={() => {}} decoder={zxing} />);
|
|
123
|
+
await scanWithKeyboardScanner(`80047043210${element.reference}`);
|
|
124
|
+
|
|
125
|
+
await screen.findByText(element.details.DisplayName);
|
|
126
|
+
await userEvent.click(screen.getByRole("button", { name: "Add element" }));
|
|
127
|
+
expect(onAdd).toHaveBeenCalledWith(expect.objectContaining({ mode: "hid-barcode" }));
|
|
128
|
+
});
|
|
129
|
+
|
|
130
|
+
it("keeps only the latest element in single mode", async () => {
|
|
131
|
+
let first = newElement();
|
|
132
|
+
let second = newElement();
|
|
133
|
+
register.push(first.details, second.details);
|
|
134
|
+
|
|
135
|
+
render(<ElementLookupDialog open mode="single" onAdd={async () => {}} onClose={() => {}} decoder={zxing} />);
|
|
136
|
+
await scanWithKeyboardScanner(first.epc);
|
|
137
|
+
await screen.findByText(first.details.DisplayName);
|
|
138
|
+
await userEvent.keyboard(`${second.epc}{Enter}`);
|
|
139
|
+
|
|
140
|
+
await screen.findByText(second.details.DisplayName);
|
|
141
|
+
expect(screen.queryByText(first.details.DisplayName)).not.toBeInTheDocument();
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
it("collects several elements in multi mode, once each, and lets one be removed", async () => {
|
|
145
|
+
let first = newElement();
|
|
146
|
+
let second = newElement();
|
|
147
|
+
register.push(first.details, second.details);
|
|
148
|
+
let onAdd = vi.fn(async () => {});
|
|
149
|
+
|
|
150
|
+
render(<ElementLookupDialog open mode="multi" onAdd={onAdd} onClose={() => {}} decoder={zxing} />);
|
|
151
|
+
await scanWithKeyboardScanner(first.epc);
|
|
152
|
+
await screen.findByText(first.details.DisplayName);
|
|
153
|
+
await userEvent.keyboard(`${second.epc}{Enter}`);
|
|
154
|
+
await screen.findByText(second.details.DisplayName);
|
|
155
|
+
// The first tag again: no duplicate.
|
|
156
|
+
await userEvent.keyboard(`${first.epc}{Enter}`);
|
|
157
|
+
|
|
158
|
+
expect(await screen.findByText("2 elements selected")).toBeInTheDocument();
|
|
159
|
+
expect(screen.getAllByText(first.details.DisplayName)).toHaveLength(1);
|
|
160
|
+
|
|
161
|
+
let firstItem = screen.getByText(first.details.DisplayName).closest("li")!;
|
|
162
|
+
await userEvent.click(within(firstItem).getByRole("button", { name: "Remove" }));
|
|
163
|
+
expect(await screen.findByText("1 elements selected")).toBeInTheDocument();
|
|
164
|
+
|
|
165
|
+
await userEvent.click(screen.getByRole("button", { name: "Add element" }));
|
|
166
|
+
expect(onAdd).toHaveBeenCalledWith([expect.objectContaining({ element: second.details })]);
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
it("says so when the scanned element is not registered", async () => {
|
|
170
|
+
let unknown = newElement();
|
|
171
|
+
|
|
172
|
+
render(<ElementLookupDialog open mode="single" onAdd={async () => {}} onClose={() => {}} decoder={zxing} />);
|
|
173
|
+
await scanWithKeyboardScanner(unknown.epc);
|
|
174
|
+
|
|
175
|
+
await vi.waitFor(() => expect(alert).toHaveBeenCalledWith("Element not found"));
|
|
176
|
+
expect(screen.getByRole("button", { name: "Add element" })).toBeDisabled();
|
|
177
|
+
});
|
|
178
|
+
|
|
179
|
+
it("has nothing to add until something is scanned", async () => {
|
|
180
|
+
render(<ElementLookupDialog open mode="single" onAdd={async () => {}} onClose={() => {}} decoder={zxing} />);
|
|
181
|
+
|
|
182
|
+
expect(await screen.findByRole("button", { name: "Add element" })).toBeDisabled();
|
|
183
|
+
});
|
|
184
|
+
|
|
185
|
+
it("offers no manual entry when searching", async () => {
|
|
186
|
+
render(<ElementLookupDialog open mode="search" onAdd={async () => {}} onClose={() => {}} decoder={zxing} />);
|
|
187
|
+
|
|
188
|
+
expect(await screen.findByRole("tab", { name: "Scanner" })).toBeInTheDocument();
|
|
189
|
+
expect(screen.queryByRole("tab", { name: "Manual" })).not.toBeInTheDocument();
|
|
190
|
+
expect(screen.getByRole("button", { name: "Search for element" })).toBeInTheDocument();
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
it("opens on the tab the caller asks for", async () => {
|
|
194
|
+
render(
|
|
195
|
+
<ElementLookupDialog
|
|
196
|
+
open
|
|
197
|
+
mode="single"
|
|
198
|
+
initialTab="scanner"
|
|
199
|
+
onAdd={async () => {}}
|
|
200
|
+
onClose={() => {}}
|
|
201
|
+
decoder={zxing}
|
|
202
|
+
/>,
|
|
203
|
+
);
|
|
204
|
+
|
|
205
|
+
expect(await screen.findByText(/Listening for scanned elements/)).toBeInTheDocument();
|
|
206
|
+
});
|
|
207
|
+
});
|