@olenbetong/synergi-react 2.8.0 → 3.0.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.map +1 -1
- package/es/chrome/AppShell/index.d.ts +8 -0
- package/es/chrome/AppShell/index.js +10 -130
- package/es/components/ImageEditor/ImageEditor.css +10 -0
- package/es/components/ImageEditor/ImageEditor.d.ts +12 -0
- package/es/components/ImageEditor/ImageEditor.js +27 -6
- package/es/components/ImageEditor/index.d.ts +3 -0
- package/es/components/ImageEditor/index.js +3 -0
- package/es/components/ImageEditor/plugins/cropPlugin/CropOverlay.js +27 -5
- package/es/components/ImageEditor/plugins/cropPlugin/CropToolbar.js +4 -3
- package/es/components/ImageEditor/plugins/cropPlugin/useCropTool.d.ts +20 -3
- package/es/components/ImageEditor/plugins/cropPlugin/useCropTool.js +216 -33
- package/es/components/ImageEditor/plugins/zoomPlugin/ZoomContext.d.ts +5 -0
- package/es/components/ImageEditor/plugins/zoomPlugin/ZoomContext.js +7 -0
- package/es/components/ImageEditor/plugins/zoomPlugin/ZoomControls.js +1 -1
- package/es/components/ImageEditor/useEdgeDetection.d.ts +0 -2
- package/es/components/ImageEditor/useEdgeDetection.js +11 -30
- package/es/components/ImageEditor/useImageHistory.d.ts +6 -1
- package/es/components/ImageEditor/useImageHistory.js +21 -23
- package/es/components/ImageEditor/useOpenCV.d.ts +26 -1
- package/es/components/ImageEditor/useOpenCV.js +108 -42
- package/es/components/SplitContainer/index.js +2 -4
- package/es/elements/ElementDamage/DamageFormButtons.d.ts +2 -3
- package/es/elements/ElementDamage/DamageFormButtons.js +1 -1
- package/es/elements/ElementDamage/TransportElementSelect.d.ts +1 -2
- package/es/elements/index.d.ts +5 -0
- package/es/elements/index.js +5 -0
- package/es/filter/ChipListInput.d.ts +13 -0
- package/es/filter/ChipListInput.js +34 -0
- package/es/filter/FilterBuilder.css +152 -0
- package/es/filter/FilterBuilder.d.ts +115 -0
- package/es/filter/FilterBuilder.js +146 -0
- package/es/filter/FilterBuilder.test.d.ts +1 -0
- package/es/filter/FilterBuilder.test.js +120 -0
- package/es/filter/FilterEditor.css +231 -0
- package/es/filter/FilterEditor.d.ts +17 -0
- package/es/filter/FilterEditor.js +38 -0
- package/es/filter/FilterEditor.test.d.ts +1 -0
- package/es/filter/FilterEditor.test.js +183 -0
- package/es/filter/FilterGroupEditor.d.ts +22 -0
- package/es/filter/FilterGroupEditor.js +34 -0
- package/es/filter/FilterNameDialog.css +22 -0
- package/es/filter/FilterNameDialog.d.ts +18 -0
- package/es/filter/FilterNameDialog.js +32 -0
- package/es/filter/FilterRow.d.ts +14 -0
- package/es/filter/FilterRow.js +32 -0
- package/es/filter/FilterShareDialog.css +28 -0
- package/es/filter/FilterShareDialog.d.ts +23 -0
- package/es/filter/FilterShareDialog.js +63 -0
- package/es/filter/FilterStringField.d.ts +15 -0
- package/es/filter/FilterStringField.js +37 -0
- package/es/filter/FilterValueEditor.d.ts +16 -0
- package/es/filter/FilterValueEditor.js +85 -0
- package/es/filter/SavedFilterTree.css +107 -0
- package/es/filter/SavedFilterTree.d.ts +45 -0
- package/es/filter/SavedFilterTree.js +44 -0
- package/es/filter/SavedFilterTree.test.d.ts +1 -0
- package/es/filter/SavedFilterTree.test.js +75 -0
- package/es/filter/index.d.ts +11 -0
- package/es/filter/index.js +10 -0
- package/es/filter/types.d.ts +34 -0
- package/es/filter/types.js +1 -0
- package/es/index.d.ts +2 -1
- package/es/index.js +6 -1
- package/es/mui/MuiThemeProvider.d.ts +24 -0
- package/es/mui/MuiThemeProvider.js +152 -0
- package/es/mui/index.d.ts +1 -0
- package/es/mui/index.js +1 -0
- package/es/report/ReportLauncher.css +147 -0
- package/es/report/ReportLauncher.d.ts +55 -0
- package/es/report/ReportLauncher.js +142 -0
- package/es/report/ReportLauncher.test.d.ts +1 -0
- package/es/report/ReportLauncher.test.js +231 -0
- package/es/report/ReportParameters.css +29 -0
- package/es/report/ReportParameters.d.ts +46 -0
- package/es/report/ReportParameters.js +65 -0
- package/es/report/ReportParameters.test.d.ts +1 -0
- package/es/report/ReportParameters.test.js +84 -0
- package/es/report/index.d.ts +2 -0
- package/es/report/index.js +2 -0
- package/es/test/setup.d.ts +1 -0
- package/es/test/setup.js +6 -0
- package/package.json +22 -7
- package/src/chrome/AppShell/index.tsx +34 -171
- package/src/components/ImageEditor/ImageEditor.css +10 -0
- package/src/components/ImageEditor/ImageEditor.tsx +40 -5
- package/src/components/ImageEditor/index.ts +1 -0
- package/src/components/ImageEditor/plugins/cropPlugin/CropOverlay.tsx +66 -20
- package/src/components/ImageEditor/plugins/cropPlugin/CropToolbar.tsx +19 -3
- package/src/components/ImageEditor/plugins/cropPlugin/useCropTool.ts +266 -39
- package/src/components/ImageEditor/plugins/zoomPlugin/ZoomContext.tsx +8 -0
- package/src/components/ImageEditor/useEdgeDetection.ts +11 -51
- package/src/components/ImageEditor/useImageHistory.ts +27 -19
- package/src/components/ImageEditor/useOpenCV.ts +112 -62
- package/src/components/LinkedCardList/index.scss +4 -2
- package/src/components/ProgressBar/index.scss +4 -2
- package/src/components/SplitContainer/index.tsx +3 -4
- package/src/filter/ChipListInput.tsx +79 -0
- package/src/filter/FilterBuilder.css +152 -0
- package/src/filter/FilterBuilder.test.tsx +153 -0
- package/src/filter/FilterBuilder.tsx +435 -0
- package/src/filter/FilterEditor.css +231 -0
- package/src/filter/FilterEditor.test.tsx +259 -0
- package/src/filter/FilterEditor.tsx +74 -0
- package/src/filter/FilterGroupEditor.tsx +160 -0
- package/src/filter/FilterNameDialog.css +22 -0
- package/src/filter/FilterNameDialog.tsx +81 -0
- package/src/filter/FilterRow.tsx +117 -0
- package/src/filter/FilterShareDialog.css +28 -0
- package/src/filter/FilterShareDialog.tsx +201 -0
- package/src/filter/FilterStringField.tsx +77 -0
- package/src/filter/FilterValueEditor.tsx +220 -0
- package/src/filter/SavedFilterTree.css +107 -0
- package/src/filter/SavedFilterTree.test.tsx +94 -0
- package/src/filter/SavedFilterTree.tsx +222 -0
- package/src/filter/index.ts +11 -0
- package/src/filter/types.ts +38 -0
- package/src/index.ts +39 -1
- package/src/mui/MuiThemeProvider.tsx +174 -0
- package/src/mui/index.ts +1 -0
- package/src/report/ReportLauncher.css +147 -0
- package/src/report/ReportLauncher.test.tsx +281 -0
- package/src/report/ReportLauncher.tsx +421 -0
- package/src/report/ReportParameters.css +29 -0
- package/src/report/ReportParameters.test.tsx +133 -0
- package/src/report/ReportParameters.tsx +198 -0
- package/src/report/index.ts +2 -0
- package/src/test/setup.ts +8 -0
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import "./FilterBuilder.css";
|
|
3
|
+
import { Button, Checkbox, Dialog, Heading } from "@digdir/designsystemet-react";
|
|
4
|
+
import { XMarkIcon } from "@navikt/aksel-icons";
|
|
5
|
+
import { canEditSavedFilter, canSetCrossDomain, canShareSavedFilter, createEmptyFilter, findSavedFilter, getLocalizedString, isEmptyFilter, pruneFilter, } from "@olenbetong/appframe-core";
|
|
6
|
+
import { setNamedFilter, useFilterConversion, useSavedFilters } from "@olenbetong/appframe-react";
|
|
7
|
+
import clsx from "clsx";
|
|
8
|
+
import { useCallback, useEffect, useState } from "react";
|
|
9
|
+
import { FilterEditor } from "./FilterEditor.js";
|
|
10
|
+
import { FilterNameDialog } from "./FilterNameDialog.js";
|
|
11
|
+
import { FilterShareDialog } from "./FilterShareDialog.js";
|
|
12
|
+
import { SavedFilterTree } from "./SavedFilterTree.js";
|
|
13
|
+
/**
|
|
14
|
+
* The web port of the Windows filter builder: the saved-filter list, the
|
|
15
|
+
* criteria editor and the save/share toolbar.
|
|
16
|
+
*
|
|
17
|
+
* Saved filters are stored as criteria strings, so selecting one round-trips
|
|
18
|
+
* through the conversion endpoint to rebuild the tree, and saving converts the
|
|
19
|
+
* tree back.
|
|
20
|
+
*
|
|
21
|
+
* @example
|
|
22
|
+
* ```jsx
|
|
23
|
+
* <FilterBuilder
|
|
24
|
+
* open={open}
|
|
25
|
+
* fields={dsPersons.getFields()}
|
|
26
|
+
* viewName="aviw_Personnel_Persons"
|
|
27
|
+
* dataObject={dsPersons}
|
|
28
|
+
* onClose={() => setOpen(false)}
|
|
29
|
+
* />
|
|
30
|
+
* ```
|
|
31
|
+
*/
|
|
32
|
+
export function FilterBuilder({ fields, viewName, dbObjectId, reportId, getFieldOptions, variant = "dialog", open = true, onClose, value, defaultValue, onChange, onApply, dataObject, filterType = "filterObject", slotName = "filterBuilder", showFilterString = true, onFilterStringChange, onSelect, saveValues, hideActions, actions, renderMain, hideSavedFilters, className, "data-size": size = "sm", }) {
|
|
33
|
+
let resolvedId = dbObjectId ?? viewName;
|
|
34
|
+
let { mine, shared, filters, loading, save, rename, remove, setCrossDomain } = useSavedFilters({
|
|
35
|
+
dbObjectId: reportId ? undefined : resolvedId,
|
|
36
|
+
reportId,
|
|
37
|
+
});
|
|
38
|
+
let [uncontrolled, setUncontrolled] = useState(() => defaultValue ?? createEmptyFilter());
|
|
39
|
+
let isControlled = value !== undefined;
|
|
40
|
+
let filter = isControlled ? (value ?? createEmptyFilter()) : uncontrolled;
|
|
41
|
+
let [selectedId, setSelectedId] = useState(null);
|
|
42
|
+
let [dirty, setDirty] = useState(false);
|
|
43
|
+
let [saving, setSaving] = useState(false);
|
|
44
|
+
let [sharing, setSharing] = useState(false);
|
|
45
|
+
let [error, setError] = useState(null);
|
|
46
|
+
let { filterString, isConverting, parseFilterString } = useFilterConversion(filter, { viewName });
|
|
47
|
+
let selected = findSavedFilter(filters, selectedId);
|
|
48
|
+
useEffect(() => {
|
|
49
|
+
onFilterStringChange?.(filterString);
|
|
50
|
+
}, [filterString, onFilterStringChange]);
|
|
51
|
+
let update = useCallback((next) => {
|
|
52
|
+
if (!isControlled)
|
|
53
|
+
setUncontrolled(next);
|
|
54
|
+
onChange?.(next);
|
|
55
|
+
setDirty(true);
|
|
56
|
+
}, [isControlled, onChange]);
|
|
57
|
+
function applyFilter(next, markClean) {
|
|
58
|
+
if (!isControlled)
|
|
59
|
+
setUncontrolled(next);
|
|
60
|
+
onChange?.(next);
|
|
61
|
+
if (markClean)
|
|
62
|
+
setDirty(false);
|
|
63
|
+
}
|
|
64
|
+
async function handleSelect(filterId) {
|
|
65
|
+
setSelectedId(filterId);
|
|
66
|
+
setError(null);
|
|
67
|
+
if (filterId === null) {
|
|
68
|
+
applyFilter(createEmptyFilter(), true);
|
|
69
|
+
onSelect?.(null);
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
let savedFilter = findSavedFilter(filters, filterId);
|
|
73
|
+
if (!savedFilter)
|
|
74
|
+
return;
|
|
75
|
+
onSelect?.(savedFilter);
|
|
76
|
+
// Filters are stored as criteria strings, so the tree has to be rebuilt.
|
|
77
|
+
let parsed = await parseFilterString(savedFilter.criteria);
|
|
78
|
+
applyFilter(parsed ?? createEmptyFilter(), true);
|
|
79
|
+
}
|
|
80
|
+
async function handleSave(name) {
|
|
81
|
+
setSaving(false);
|
|
82
|
+
setError(null);
|
|
83
|
+
try {
|
|
84
|
+
// Saving under an existing name of the user's own replaces that
|
|
85
|
+
// filter rather than creating a duplicate.
|
|
86
|
+
let existing = mine.find((candidate) => candidate.name === name);
|
|
87
|
+
let saved = await save({
|
|
88
|
+
...saveValues,
|
|
89
|
+
filterId: existing?.filterId ?? null,
|
|
90
|
+
name,
|
|
91
|
+
criteria: filterString,
|
|
92
|
+
crossDomain: existing?.crossDomain ?? undefined,
|
|
93
|
+
});
|
|
94
|
+
if (saved)
|
|
95
|
+
setSelectedId(saved.filterId);
|
|
96
|
+
setDirty(false);
|
|
97
|
+
}
|
|
98
|
+
catch (cause) {
|
|
99
|
+
setError(String(cause?.message ?? cause));
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
async function handleOverwrite() {
|
|
103
|
+
if (!selected)
|
|
104
|
+
return;
|
|
105
|
+
setError(null);
|
|
106
|
+
try {
|
|
107
|
+
await save({ ...saveValues, filterId: selected.filterId, name: selected.name, criteria: filterString });
|
|
108
|
+
setDirty(false);
|
|
109
|
+
}
|
|
110
|
+
catch (cause) {
|
|
111
|
+
setError(String(cause?.message ?? cause));
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
function handleRename(savedFilter) {
|
|
115
|
+
let name = globalThis.prompt?.(getLocalizedString("Filter name"), savedFilter.name);
|
|
116
|
+
if (name?.trim())
|
|
117
|
+
void rename(savedFilter.filterId, name.trim());
|
|
118
|
+
}
|
|
119
|
+
function handleDelete(savedFilter) {
|
|
120
|
+
let message = getLocalizedString("Delete the filter {0}?").replace("{0}", savedFilter.name);
|
|
121
|
+
if (!globalThis.confirm?.(message))
|
|
122
|
+
return;
|
|
123
|
+
void remove(savedFilter.filterId).then(() => {
|
|
124
|
+
if (savedFilter.filterId === selectedId)
|
|
125
|
+
void handleSelect(null);
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
function handleApply() {
|
|
129
|
+
let pruned = pruneFilter(filter);
|
|
130
|
+
if (dataObject) {
|
|
131
|
+
setNamedFilter(dataObject, slotName, pruned, { type: filterType });
|
|
132
|
+
}
|
|
133
|
+
onApply?.(pruned, filterString);
|
|
134
|
+
onClose?.();
|
|
135
|
+
}
|
|
136
|
+
let isEmpty = isEmptyFilter(filter);
|
|
137
|
+
let canOverwrite = Boolean(selected) && canEditSavedFilter(selected) && dirty && !isEmpty;
|
|
138
|
+
let editor = (_jsx(FilterEditor, { fields: fields, value: filter, viewName: viewName, getFieldOptions: getFieldOptions, showFilterString: showFilterString, "data-size": size, onChange: update }));
|
|
139
|
+
let content = (_jsxs("div", { className: clsx("ObFilterBuilder-root", hideSavedFilters && "ObFilterBuilder-root--noSavedFilters", className), "data-size": size, children: [!hideSavedFilters && (_jsx("div", { className: "ObFilterBuilder-sidebar", children: _jsx(SavedFilterTree, { mine: mine, shared: shared, value: selectedId, dirty: dirty, loading: loading, "data-size": size, onChange: (filterId) => void handleSelect(filterId), onRename: handleRename, onDelete: handleDelete }) })), _jsx("div", { className: "ObFilterBuilder-main", children: renderMain ? renderMain(editor) : editor }), error && (_jsx("p", { className: "ObFilterBuilder-error", role: "alert", children: error })), _jsxs("div", { className: "ObFilterBuilder-footer", children: [!hideSavedFilters && (_jsxs("div", { className: "ObFilterBuilder-toolbar", children: [_jsx(Button, { type: "button", variant: "secondary", "data-size": size, disabled: !selected || !canShareSavedFilter(selected), onClick: () => setSharing(true), children: getLocalizedString("Sharing...") }), _jsx(Button, { type: "button", variant: "secondary", "data-size": size, disabled: isEmpty || isConverting, onClick: () => setSaving(true), children: getLocalizedString("Save as") }), _jsx(Button, { type: "button", variant: "secondary", "data-size": size, disabled: !canOverwrite || isConverting, onClick: () => void handleOverwrite(), children: getLocalizedString("Save") }), _jsx(Checkbox, { "data-size": size, label: getLocalizedString("All Domains"), checked: selected?.crossDomain ?? false, disabled: !selected || !canSetCrossDomain(selected), onChange: (event) => {
|
|
140
|
+
if (selected)
|
|
141
|
+
void setCrossDomain(selected.filterId, event.currentTarget.checked);
|
|
142
|
+
} })] })), !hideActions && (_jsx("div", { className: "ObFilterBuilder-actions", children: actions ?? (_jsxs(_Fragment, { children: [_jsx(Button, { type: "button", "data-size": size, onClick: handleApply, children: getLocalizedString("OK") }), _jsx(Button, { type: "button", variant: "secondary", "data-size": size, onClick: onClose, children: getLocalizedString("Cancel") })] })) }))] }), _jsx(FilterNameDialog, { open: saving, defaultName: selected?.name ?? "", existingNames: mine.map((candidate) => candidate.name), "data-size": size, onCancel: () => setSaving(false), onSubmit: (name) => void handleSave(name) }), _jsx(FilterShareDialog, { open: sharing, filterId: selectedId, filterName: selected?.name, "data-size": size, onClose: () => setSharing(false) })] }));
|
|
143
|
+
if (variant === "inline")
|
|
144
|
+
return content;
|
|
145
|
+
return (_jsxs(Dialog, { open: open, closedby: "closerequest", closeButton: false, "data-size": size, className: "ObFilterBuilder-dialog", onClose: onClose, children: [_jsxs(Dialog.Block, { className: "ObFilterBuilder-dialogHeader", children: [_jsx(Heading, { level: 2, "data-size": "xs", children: getLocalizedString("Edit filter") }), _jsx(Button, { type: "button", variant: "tertiary", "data-color": "neutral", "data-size": size, icon: true, "aria-label": getLocalizedString("Close"), onClick: onClose, children: _jsx(XMarkIcon, { "aria-hidden": true }) })] }), _jsx(Dialog.Block, { className: "ObFilterBuilder-dialogBody", children: content })] }));
|
|
146
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { render, screen, waitFor } from "@testing-library/react";
|
|
3
|
+
import userEvent from "@testing-library/user-event";
|
|
4
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
5
|
+
const save = vi.fn(async () => undefined);
|
|
6
|
+
const remove = vi.fn(async () => undefined);
|
|
7
|
+
const rename = vi.fn(async () => undefined);
|
|
8
|
+
const setCrossDomain = vi.fn(async () => undefined);
|
|
9
|
+
const setNamedFilter = vi.fn();
|
|
10
|
+
const parseFilterString = vi.fn(async () => null);
|
|
11
|
+
let savedFilters = [];
|
|
12
|
+
vi.mock("@olenbetong/appframe-react", async (importOriginal) => ({
|
|
13
|
+
...(await importOriginal()),
|
|
14
|
+
setNamedFilter: (...args) => setNamedFilter(...args),
|
|
15
|
+
useSavedFilters: () => ({
|
|
16
|
+
filters: savedFilters,
|
|
17
|
+
mine: savedFilters.filter((filter) => filter.createdByUser),
|
|
18
|
+
shared: savedFilters.filter((filter) => !filter.createdByUser),
|
|
19
|
+
loading: false,
|
|
20
|
+
error: null,
|
|
21
|
+
refresh: vi.fn(),
|
|
22
|
+
save,
|
|
23
|
+
rename,
|
|
24
|
+
remove,
|
|
25
|
+
setCrossDomain,
|
|
26
|
+
}),
|
|
27
|
+
useFilterConversion: () => ({
|
|
28
|
+
filterString: "[PersonID] Like '%a%'",
|
|
29
|
+
isConverting: false,
|
|
30
|
+
error: null,
|
|
31
|
+
parseFilterString,
|
|
32
|
+
}),
|
|
33
|
+
}));
|
|
34
|
+
const { FilterBuilder } = await import("./FilterBuilder.js");
|
|
35
|
+
const FIELDS = [
|
|
36
|
+
{ name: "PersonID", caption: "Person ID", type: "string", nullable: true },
|
|
37
|
+
{ name: "Age", caption: "Age", type: "number" },
|
|
38
|
+
];
|
|
39
|
+
function savedFilter(overrides) {
|
|
40
|
+
return {
|
|
41
|
+
primKey: `pk-${overrides.filterId}`,
|
|
42
|
+
criteria: "[PersonID] Like '%a%'",
|
|
43
|
+
dbObjectId: "aviw_Test_View",
|
|
44
|
+
accessLevel: "Manager",
|
|
45
|
+
createdByUser: true,
|
|
46
|
+
createdBy: "bvh",
|
|
47
|
+
domain: "OB",
|
|
48
|
+
crossDomain: false,
|
|
49
|
+
isPersonallyShared: false,
|
|
50
|
+
hideCriteria: false,
|
|
51
|
+
headerText: null,
|
|
52
|
+
comment: null,
|
|
53
|
+
parameters: null,
|
|
54
|
+
reportTitle: null,
|
|
55
|
+
created: null,
|
|
56
|
+
updated: null,
|
|
57
|
+
...overrides,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
function renderBuilder(props = {}) {
|
|
61
|
+
return render(_jsx(FilterBuilder, { fields: FIELDS, viewName: "aviw_Test_View", variant: "inline", ...props }));
|
|
62
|
+
}
|
|
63
|
+
describe("FilterBuilder", () => {
|
|
64
|
+
beforeEach(() => {
|
|
65
|
+
vi.clearAllMocks();
|
|
66
|
+
savedFilters = [savedFilter({ filterId: 1, name: "Agder" })];
|
|
67
|
+
});
|
|
68
|
+
it("renders the saved filters beside the editor", () => {
|
|
69
|
+
renderBuilder();
|
|
70
|
+
expect(screen.getByRole("button", { name: "New Filter" })).toBeTruthy();
|
|
71
|
+
expect(screen.getByRole("button", { name: "Agder" })).toBeTruthy();
|
|
72
|
+
expect(screen.getByLabelText("Add condition")).toBeTruthy();
|
|
73
|
+
});
|
|
74
|
+
it("disables save and share until a filter is selected", () => {
|
|
75
|
+
renderBuilder();
|
|
76
|
+
expect(screen.getByRole("button", { name: "Sharing..." }).hasAttribute("disabled")).toBe(true);
|
|
77
|
+
expect(screen.getByRole("button", { name: "Save" }).hasAttribute("disabled")).toBe(true);
|
|
78
|
+
});
|
|
79
|
+
it("disables save as while the filter is empty", () => {
|
|
80
|
+
renderBuilder();
|
|
81
|
+
expect(screen.getByRole("button", { name: "Save as" }).hasAttribute("disabled")).toBe(true);
|
|
82
|
+
});
|
|
83
|
+
it("parses the criteria of a selected filter back into the tree", async () => {
|
|
84
|
+
renderBuilder();
|
|
85
|
+
await userEvent.click(screen.getByRole("button", { name: "Agder" }));
|
|
86
|
+
expect(parseFilterString).toHaveBeenCalledWith("[PersonID] Like '%a%'");
|
|
87
|
+
});
|
|
88
|
+
it("applies the pruned filter to the data object", async () => {
|
|
89
|
+
let dataObject = {};
|
|
90
|
+
renderBuilder({
|
|
91
|
+
dataObject,
|
|
92
|
+
defaultValue: {
|
|
93
|
+
type: "group",
|
|
94
|
+
mode: "and",
|
|
95
|
+
items: [{ type: "expression", column: "PersonID", operator: "like", value: "a", valueType: "string" }],
|
|
96
|
+
},
|
|
97
|
+
});
|
|
98
|
+
await userEvent.click(screen.getByRole("button", { name: "OK" }));
|
|
99
|
+
expect(setNamedFilter).toHaveBeenCalledWith(dataObject, "filterBuilder", expect.objectContaining({ type: "group" }), { type: "filterObject" });
|
|
100
|
+
});
|
|
101
|
+
it("reports an empty filter as null", async () => {
|
|
102
|
+
let onApply = vi.fn();
|
|
103
|
+
renderBuilder({ onApply });
|
|
104
|
+
await userEvent.click(screen.getByRole("button", { name: "OK" }));
|
|
105
|
+
expect(onApply).toHaveBeenCalledWith(null, "[PersonID] Like '%a%'");
|
|
106
|
+
});
|
|
107
|
+
it("saves under a new name and replaces a filter that already uses it", async () => {
|
|
108
|
+
renderBuilder({
|
|
109
|
+
defaultValue: {
|
|
110
|
+
type: "group",
|
|
111
|
+
mode: "and",
|
|
112
|
+
items: [{ type: "expression", column: "PersonID", operator: "like", value: "a", valueType: "string" }],
|
|
113
|
+
},
|
|
114
|
+
});
|
|
115
|
+
await userEvent.click(screen.getByRole("button", { name: "Save as" }));
|
|
116
|
+
await userEvent.type(screen.getByRole("textbox", { name: "Filter name" }), "Agder");
|
|
117
|
+
await userEvent.click(screen.getByRole("button", { name: "Replace" }));
|
|
118
|
+
await waitFor(() => expect(save).toHaveBeenCalledWith(expect.objectContaining({ filterId: 1, name: "Agder", criteria: "[PersonID] Like '%a%'" })));
|
|
119
|
+
});
|
|
120
|
+
});
|
|
@@ -0,0 +1,231 @@
|
|
|
1
|
+
.ObFilterEditor-root {
|
|
2
|
+
display: flex;
|
|
3
|
+
flex-direction: column;
|
|
4
|
+
gap: var(--ds-size-2);
|
|
5
|
+
min-block-size: 0;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
/*
|
|
9
|
+
* The conditions scroll, the generated filter string does not, so it stays in
|
|
10
|
+
* view at the foot of the editor. The flex basis keeps the scroll area usable
|
|
11
|
+
* when the editor is short, as on a phone, but — unlike a minimum height — it
|
|
12
|
+
* still lets the editor shrink when it shares a fixed height with content below
|
|
13
|
+
* it, which would otherwise overflow and overlap that content.
|
|
14
|
+
*/
|
|
15
|
+
.ObFilterEditor-body {
|
|
16
|
+
display: flex;
|
|
17
|
+
flex-direction: column;
|
|
18
|
+
gap: var(--ds-size-2);
|
|
19
|
+
flex: 1 1 min(16rem, 50dvh);
|
|
20
|
+
min-block-size: 0;
|
|
21
|
+
overflow: auto;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
.ObFilterEditor-filterString {
|
|
25
|
+
flex: 0 0 auto;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
.ObFilterEditor-intro {
|
|
29
|
+
margin: 0;
|
|
30
|
+
color: var(--ds-color-neutral-text-subtle);
|
|
31
|
+
font-size: var(--ds-font-size-2);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
.ObFilterEditor-groups {
|
|
35
|
+
display: flex;
|
|
36
|
+
flex-direction: column;
|
|
37
|
+
gap: var(--ds-size-3);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
.ObFilterEditor-group {
|
|
41
|
+
display: flex;
|
|
42
|
+
flex-direction: column;
|
|
43
|
+
gap: var(--ds-size-2);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/*
|
|
47
|
+
* The border is drawn around the conditions only, not the group header, and the
|
|
48
|
+
* whole box is indented so the header reads as owning the conditions below it
|
|
49
|
+
* rather than as a sibling of the first one.
|
|
50
|
+
*/
|
|
51
|
+
.ObFilterEditor-groupItems {
|
|
52
|
+
display: flex;
|
|
53
|
+
flex-direction: column;
|
|
54
|
+
gap: var(--ds-size-2);
|
|
55
|
+
|
|
56
|
+
margin-inline-start: var(--ds-size-4);
|
|
57
|
+
padding: var(--ds-size-2);
|
|
58
|
+
border: 1px solid var(--ds-color-neutral-border-subtle);
|
|
59
|
+
border-radius: var(--ds-border-radius-md);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/* Nested groups are tinted so the tree structure is readable. */
|
|
63
|
+
.ObFilterEditor-groupItems .ObFilterEditor-groupItems {
|
|
64
|
+
background-color: var(--ds-color-neutral-surface-tinted);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
.ObFilterEditor-groupHeader {
|
|
68
|
+
display: flex;
|
|
69
|
+
align-items: center;
|
|
70
|
+
gap: var(--ds-size-2);
|
|
71
|
+
flex-wrap: wrap;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
.ObFilterEditor-groupButton svg {
|
|
75
|
+
flex: 0 0 auto;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/*
|
|
79
|
+
* The group buttons do not fit next to the operator select on a phone, so only
|
|
80
|
+
* their icon is shown. `aria-label` carries the name either way.
|
|
81
|
+
*/
|
|
82
|
+
@media (width < 40rem) {
|
|
83
|
+
.ObFilterEditor-groupButtonLabel {
|
|
84
|
+
display: none;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
.ObFilterEditor-groupItems {
|
|
88
|
+
margin-inline-start: var(--ds-size-2);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
.ObFilterEditor-groupMode {
|
|
93
|
+
flex: 0 0 auto;
|
|
94
|
+
width: auto;
|
|
95
|
+
min-width: 6rem;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
.ObFilterEditor-groupLabel {
|
|
99
|
+
font-weight: 600;
|
|
100
|
+
font-size: var(--ds-font-size-2);
|
|
101
|
+
text-transform: uppercase;
|
|
102
|
+
letter-spacing: 0.04em;
|
|
103
|
+
color: var(--ds-color-neutral-text-subtle);
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
.ObFilterEditor-row {
|
|
107
|
+
display: flex;
|
|
108
|
+
align-items: center;
|
|
109
|
+
gap: var(--ds-size-2);
|
|
110
|
+
flex-wrap: wrap;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/*
|
|
114
|
+
* On narrow viewports the parts of a condition wrap onto several lines, which
|
|
115
|
+
* makes neighbouring conditions run together. Separate them with extra spacing
|
|
116
|
+
* and a rule so it stays obvious where one condition ends and the next begins.
|
|
117
|
+
*/
|
|
118
|
+
@media (width < 40rem) {
|
|
119
|
+
.ObFilterEditor-row {
|
|
120
|
+
gap: var(--ds-size-3);
|
|
121
|
+
padding-block-end: var(--ds-size-3);
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
.ObFilterEditor-row:not(:last-child) {
|
|
125
|
+
border-block-end: 1px solid var(--ds-color-neutral-border-subtle);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
.ObFilterEditor-field {
|
|
130
|
+
flex: 1 1 12rem;
|
|
131
|
+
min-width: 10rem;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
.ObFilterEditor-operator {
|
|
135
|
+
flex: 0 1 12rem;
|
|
136
|
+
min-width: 8rem;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
.ObFilterEditor-valueCell {
|
|
140
|
+
display: flex;
|
|
141
|
+
align-items: center;
|
|
142
|
+
gap: var(--ds-size-1);
|
|
143
|
+
flex: 2 1 14rem;
|
|
144
|
+
min-width: 10rem;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
.ObFilterEditor-value {
|
|
148
|
+
flex: 1 1 auto;
|
|
149
|
+
min-width: 0;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
.ObFilterEditor-pair {
|
|
153
|
+
display: flex;
|
|
154
|
+
align-items: center;
|
|
155
|
+
gap: var(--ds-size-2);
|
|
156
|
+
flex: 1 1 auto;
|
|
157
|
+
min-width: 0;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
.ObFilterEditor-pairSeparator {
|
|
161
|
+
flex: 0 0 auto;
|
|
162
|
+
color: var(--ds-color-neutral-text-subtle);
|
|
163
|
+
font-size: var(--ds-font-size-2);
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
.ObFilterEditor-chipList {
|
|
167
|
+
display: flex;
|
|
168
|
+
align-items: center;
|
|
169
|
+
flex-wrap: wrap;
|
|
170
|
+
gap: var(--ds-size-1);
|
|
171
|
+
flex: 1 1 auto;
|
|
172
|
+
min-width: 0;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
.ObFilterEditor-chipListInput {
|
|
176
|
+
flex: 1 1 6rem;
|
|
177
|
+
min-width: 6rem;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
.ObFilterEditor-iconButton {
|
|
181
|
+
display: inline-flex;
|
|
182
|
+
align-items: center;
|
|
183
|
+
justify-content: center;
|
|
184
|
+
flex: 0 0 auto;
|
|
185
|
+
|
|
186
|
+
width: 2rem;
|
|
187
|
+
height: 2rem;
|
|
188
|
+
padding: 0;
|
|
189
|
+
|
|
190
|
+
background: none;
|
|
191
|
+
border: none;
|
|
192
|
+
border-radius: var(--ds-border-radius-md);
|
|
193
|
+
color: var(--ds-color-neutral-text-subtle);
|
|
194
|
+
cursor: pointer;
|
|
195
|
+
|
|
196
|
+
&:hover {
|
|
197
|
+
background-color: var(--ds-color-neutral-surface-hover);
|
|
198
|
+
color: var(--ds-color-neutral-text-default);
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
&[aria-pressed="true"] {
|
|
202
|
+
background-color: var(--ds-color-surface-active);
|
|
203
|
+
color: var(--ds-color-text-default);
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
svg {
|
|
207
|
+
width: 1.25rem;
|
|
208
|
+
height: 1.25rem;
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
.ObFilterEditor-filterString {
|
|
213
|
+
display: flex;
|
|
214
|
+
flex-direction: column;
|
|
215
|
+
gap: var(--ds-size-1);
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
.ObFilterEditor-hint {
|
|
219
|
+
color: var(--ds-color-neutral-text-subtle);
|
|
220
|
+
font-size: var(--ds-font-size-1);
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
/*
|
|
224
|
+
* The converting hint sits on the label row rather than under the input, so that
|
|
225
|
+
* it appearing and disappearing does not shift the layout.
|
|
226
|
+
*/
|
|
227
|
+
.ObFilterEditor-filterStringLabel {
|
|
228
|
+
display: flex;
|
|
229
|
+
align-items: baseline;
|
|
230
|
+
gap: var(--ds-size-2);
|
|
231
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import "./FilterEditor.css";
|
|
2
|
+
import type { FilterEditorProps } from "./types.js";
|
|
3
|
+
/**
|
|
4
|
+
* The criteria tree of the filter builder. Groups can be nested and each group
|
|
5
|
+
* combines its items with either `and` or `or`, matching the advanced filter
|
|
6
|
+
* editor in the Windows client.
|
|
7
|
+
*
|
|
8
|
+
* Works both controlled (`value` + `onChange`) and uncontrolled
|
|
9
|
+
* (`defaultValue`). Saving and sharing filters is handled by `FilterBuilder`,
|
|
10
|
+
* which composes this component.
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* ```jsx
|
|
14
|
+
* <FilterEditor fields={fields} value={filter} onChange={setFilter} showFilterString />
|
|
15
|
+
* ```
|
|
16
|
+
*/
|
|
17
|
+
export declare function FilterEditor({ fields, value, defaultValue, onChange, readOnly, showFilterString, viewName, getFieldOptions, className, "data-size": size, }: FilterEditorProps): import("react").JSX.Element;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import "./FilterEditor.css";
|
|
3
|
+
import { getLocalizedString, toFilterTree } from "@olenbetong/appframe-core";
|
|
4
|
+
import clsx from "clsx";
|
|
5
|
+
import { useMemo, useState } from "react";
|
|
6
|
+
import { FilterGroupEditor } from "./FilterGroupEditor.js";
|
|
7
|
+
import { FilterStringField } from "./FilterStringField.js";
|
|
8
|
+
/**
|
|
9
|
+
* The criteria tree of the filter builder. Groups can be nested and each group
|
|
10
|
+
* combines its items with either `and` or `or`, matching the advanced filter
|
|
11
|
+
* editor in the Windows client.
|
|
12
|
+
*
|
|
13
|
+
* Works both controlled (`value` + `onChange`) and uncontrolled
|
|
14
|
+
* (`defaultValue`). Saving and sharing filters is handled by `FilterBuilder`,
|
|
15
|
+
* which composes this component.
|
|
16
|
+
*
|
|
17
|
+
* @example
|
|
18
|
+
* ```jsx
|
|
19
|
+
* <FilterEditor fields={fields} value={filter} onChange={setFilter} showFilterString />
|
|
20
|
+
* ```
|
|
21
|
+
*/
|
|
22
|
+
export function FilterEditor({ fields, value, defaultValue, onChange, readOnly, showFilterString, viewName, getFieldOptions, className, "data-size": size = "sm", }) {
|
|
23
|
+
let [uncontrolled, setUncontrolled] = useState(() => toFilterTree(defaultValue));
|
|
24
|
+
let isControlled = value !== undefined;
|
|
25
|
+
// Normalizing on every render would create a new tree each time, which
|
|
26
|
+
// retriggers the filter string conversion.
|
|
27
|
+
let controlled = useMemo(() => toFilterTree(value), [value]);
|
|
28
|
+
let filter = isControlled ? controlled : uncontrolled;
|
|
29
|
+
let visibleFields = useMemo(() => fields.filter((field) => !field.excludeFromFilter), [fields]);
|
|
30
|
+
function update(next) {
|
|
31
|
+
if (!isControlled)
|
|
32
|
+
setUncontrolled(next);
|
|
33
|
+
onChange?.(next);
|
|
34
|
+
}
|
|
35
|
+
return (_jsxs("div", { className: clsx("ObFilterEditor-root", className), "data-size": size, children: [_jsxs("div", { className: "ObFilterEditor-body", children: [_jsx("p", { className: "ObFilterEditor-intro", children: filter.mode === "and"
|
|
36
|
+
? getLocalizedString("Find rows that match all of these criteria:")
|
|
37
|
+
: getLocalizedString("Find rows that match one or more of these criteria:") }), _jsx(FilterGroupEditor, { filter: filter, path: [], fields: visibleFields, getFieldOptions: getFieldOptions, readOnly: readOnly, "data-size": size, onChange: update })] }), showFilterString && (_jsx(FilterStringField, { filter: filter, viewName: viewName, readOnly: readOnly, "data-size": size, onChange: update }))] }));
|
|
38
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|