@terreno/ui 57.3.0 → 57.4.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/AnnouncementBanner.d.ts +12 -0
- package/dist/AnnouncementBanner.js +61 -0
- package/dist/AnnouncementBanner.js.map +1 -0
- package/dist/AnnouncementNavigator.d.ts +11 -0
- package/dist/AnnouncementNavigator.js +189 -0
- package/dist/AnnouncementNavigator.js.map +1 -0
- package/dist/AnnouncementScreen.d.ts +12 -0
- package/dist/AnnouncementScreen.js +28 -0
- package/dist/AnnouncementScreen.js.map +1 -0
- package/dist/AreaChart.d.ts +5 -0
- package/dist/AreaChart.js +69 -0
- package/dist/AreaChart.js.map +1 -0
- package/dist/BarChart.d.ts +5 -0
- package/dist/BarChart.js +89 -0
- package/dist/BarChart.js.map +1 -0
- package/dist/Button.js +17 -3
- package/dist/Button.js.map +1 -1
- package/dist/Common.d.ts +96 -0
- package/dist/Common.js.map +1 -1
- package/dist/DashboardGrid.d.ts +4 -0
- package/dist/DashboardGrid.js +38 -0
- package/dist/DashboardGrid.js.map +1 -0
- package/dist/DataTable.js +83 -11
- package/dist/DataTable.js.map +1 -1
- package/dist/DonutChart.d.ts +5 -0
- package/dist/DonutChart.js +84 -0
- package/dist/DonutChart.js.map +1 -0
- package/dist/Filter.js +12 -2
- package/dist/Filter.js.map +1 -1
- package/dist/GPTChat.d.ts +7 -1
- package/dist/GPTChat.js +28 -15
- package/dist/GPTChat.js.map +1 -1
- package/dist/LineChart.d.ts +5 -0
- package/dist/LineChart.js +68 -0
- package/dist/LineChart.js.map +1 -0
- package/dist/MarkdownEmbed.d.ts +6 -0
- package/dist/MarkdownEmbed.js +17 -0
- package/dist/MarkdownEmbed.js.map +1 -0
- package/dist/MarkdownView.js +38 -3
- package/dist/MarkdownView.js.map +1 -1
- package/dist/Modal.js +12 -10
- package/dist/Modal.js.map +1 -1
- package/dist/ModalSheet.d.ts +5 -1
- package/dist/ModalSheet.js +31 -13
- package/dist/ModalSheet.js.map +1 -1
- package/dist/MultiselectField.js +4 -9
- package/dist/MultiselectField.js.map +1 -1
- package/dist/NotificationBell.d.ts +16 -0
- package/dist/NotificationBell.js +15 -0
- package/dist/NotificationBell.js.map +1 -0
- package/dist/NotificationInbox.d.ts +21 -0
- package/dist/NotificationInbox.js +41 -0
- package/dist/NotificationInbox.js.map +1 -0
- package/dist/NotificationPreferences.d.ts +14 -0
- package/dist/NotificationPreferences.js +32 -0
- package/dist/NotificationPreferences.js.map +1 -0
- package/dist/TextField.js +83 -6
- package/dist/TextField.js.map +1 -1
- package/dist/announcementBuildVersion.d.ts +6 -0
- package/dist/announcementBuildVersion.js +21 -0
- package/dist/announcementBuildVersion.js.map +1 -0
- package/dist/announcementFrequency.d.ts +42 -0
- package/dist/announcementFrequency.js +163 -0
- package/dist/announcementFrequency.js.map +1 -0
- package/dist/announcementPlatform.d.ts +2 -0
- package/dist/announcementPlatform.js +11 -0
- package/dist/announcementPlatform.js.map +1 -0
- package/dist/charts/ChartFrame.d.ts +12 -0
- package/dist/charts/ChartFrame.js +13 -0
- package/dist/charts/ChartFrame.js.map +1 -0
- package/dist/charts/bars.d.ts +18 -0
- package/dist/charts/bars.js +29 -0
- package/dist/charts/bars.js.map +1 -0
- package/dist/charts/layout.d.ts +47 -0
- package/dist/charts/layout.js +56 -0
- package/dist/charts/layout.js.map +1 -0
- package/dist/charts/paths.d.ts +31 -0
- package/dist/charts/paths.js +52 -0
- package/dist/charts/paths.js.map +1 -0
- package/dist/charts/scales.d.ts +6 -0
- package/dist/charts/scales.js +43 -0
- package/dist/charts/scales.js.map +1 -0
- package/dist/charts/theme.d.ts +9 -0
- package/dist/charts/theme.js +15 -0
- package/dist/charts/theme.js.map +1 -0
- package/dist/charts/types/chartTypes.d.ts +17 -0
- package/dist/charts/types/chartTypes.js +2 -0
- package/dist/charts/types/chartTypes.js.map +1 -0
- package/dist/dashboardGridLayout.d.ts +22 -0
- package/dist/dashboardGridLayout.js +33 -0
- package/dist/dashboardGridLayout.js.map +1 -0
- package/dist/dataTableFilters.d.ts +33 -0
- package/dist/dataTableFilters.js +221 -0
- package/dist/dataTableFilters.js.map +1 -0
- package/dist/dataTableListQuery.d.ts +42 -0
- package/dist/dataTableListQuery.js +161 -0
- package/dist/dataTableListQuery.js.map +1 -0
- package/dist/index.d.ts +18 -1
- package/dist/index.js +11 -1
- package/dist/index.js.map +1 -1
- package/dist/lazyBoundaries/heavyOptionalExports.d.ts +12 -0
- package/dist/lazyBoundaries/heavyOptionalExports.js +8 -0
- package/dist/lazyBoundaries/heavyOptionalExports.js.map +1 -1
- package/dist/markdownEmbeds.d.ts +6 -0
- package/dist/markdownEmbeds.js +59 -0
- package/dist/markdownEmbeds.js.map +1 -0
- package/dist/testing/resolveTestId.js +2 -1
- package/dist/testing/resolveTestId.js.map +1 -1
- package/dist/testing/types.d.ts +3 -0
- package/dist/textFieldOscillationGuard.d.ts +25 -0
- package/dist/textFieldOscillationGuard.js +41 -0
- package/dist/textFieldOscillationGuard.js.map +1 -0
- package/dist/useAcknowledgeAnnouncement.d.ts +71 -0
- package/dist/useAcknowledgeAnnouncement.js +94 -0
- package/dist/useAcknowledgeAnnouncement.js.map +1 -0
- package/dist/useAnnouncements.d.ts +73 -0
- package/dist/useAnnouncements.js +66 -0
- package/dist/useAnnouncements.js.map +1 -0
- package/package.json +7 -18
- package/src/AnnouncementBanner.test.tsx +267 -0
- package/src/AnnouncementBanner.tsx +128 -0
- package/src/AnnouncementNavigator.test.tsx +759 -0
- package/src/AnnouncementNavigator.tsx +287 -0
- package/src/AnnouncementScreen.test.tsx +97 -0
- package/src/AnnouncementScreen.tsx +70 -0
- package/src/AreaChart.test.tsx +68 -0
- package/src/AreaChart.tsx +194 -0
- package/src/BarChart.test.tsx +96 -0
- package/src/BarChart.tsx +208 -0
- package/src/Button.test.tsx +66 -0
- package/src/Button.tsx +17 -2
- package/src/Common.ts +95 -0
- package/src/ConsentNavigator.test.tsx +55 -0
- package/src/DashboardGrid.test.tsx +75 -0
- package/src/DashboardGrid.tsx +69 -0
- package/src/DataTable.test.tsx +296 -1
- package/src/DataTable.tsx +210 -18
- package/src/DonutChart.test.tsx +121 -0
- package/src/DonutChart.tsx +160 -0
- package/src/EmojiSelector.test.tsx +51 -0
- package/src/Field.test.tsx +18 -0
- package/src/Filter.test.tsx +25 -0
- package/src/Filter.tsx +38 -7
- package/src/GPTChat.test.tsx +107 -0
- package/src/GPTChat.tsx +176 -86
- package/src/LineChart.test.tsx +166 -0
- package/src/LineChart.tsx +190 -0
- package/src/MarkdownEmbed.test.tsx +34 -0
- package/src/MarkdownEmbed.tsx +43 -0
- package/src/MarkdownView.test.tsx +59 -2
- package/src/MarkdownView.tsx +51 -3
- package/src/Modal.test.tsx +107 -14
- package/src/Modal.tsx +20 -8
- package/src/ModalSheet.test.tsx +121 -9
- package/src/ModalSheet.tsx +46 -11
- package/src/MultiselectField.test.tsx +21 -0
- package/src/MultiselectField.tsx +11 -13
- package/src/NotificationBell.test.tsx +91 -0
- package/src/NotificationBell.tsx +77 -0
- package/src/NotificationInbox.test.tsx +130 -0
- package/src/NotificationInbox.tsx +144 -0
- package/src/NotificationPreferences.test.tsx +25 -0
- package/src/NotificationPreferences.tsx +75 -0
- package/src/RootImportRegression.test.tsx +20 -0
- package/src/TextField.test.tsx +421 -0
- package/src/TextField.tsx +121 -4
- package/src/__snapshots__/Field.test.tsx.snap +22 -0
- package/src/__snapshots__/ModalSheet.test.tsx.snap +4 -1
- package/src/__snapshots__/TextArea.test.tsx.snap +5 -5
- package/src/__snapshots__/TextField.test.tsx.snap +5 -5
- package/src/announcementBuildVersion.test.ts +43 -0
- package/src/announcementBuildVersion.ts +21 -0
- package/src/announcementFrequency.test.ts +245 -0
- package/src/announcementFrequency.ts +246 -0
- package/src/announcementPlatform.test.ts +27 -0
- package/src/announcementPlatform.ts +13 -0
- package/src/charts/ChartFrame.tsx +67 -0
- package/src/charts/bars.test.ts +56 -0
- package/src/charts/bars.ts +53 -0
- package/src/charts/layout.test.ts +80 -0
- package/src/charts/layout.ts +99 -0
- package/src/charts/paths.test.ts +79 -0
- package/src/charts/paths.ts +100 -0
- package/src/charts/scales.test.ts +59 -0
- package/src/charts/scales.ts +60 -0
- package/src/charts/theme.test.ts +22 -0
- package/src/charts/theme.ts +24 -0
- package/src/charts/types/chartTypes.ts +19 -0
- package/src/dashboardGridLayout.test.ts +90 -0
- package/src/dashboardGridLayout.ts +60 -0
- package/src/dataTableFilters.test.tsx +552 -0
- package/src/dataTableFilters.tsx +441 -0
- package/src/dataTableListQuery.test.ts +220 -0
- package/src/dataTableListQuery.ts +201 -0
- package/src/index.tsx +21 -1
- package/src/lazyBoundaries/heavyOptionalExports.tsx +28 -0
- package/src/login/__snapshots__/LoginScreen.test.tsx.snap +22 -0
- package/src/markdownEmbeds.test.ts +53 -0
- package/src/markdownEmbeds.ts +62 -0
- package/src/pdfHtmlTemplate.test.ts +119 -0
- package/src/signUp/__snapshots__/SignUpScreen.test.tsx.snap +22 -0
- package/src/testing/resolveTestId.test.ts +3 -0
- package/src/testing/resolveTestId.ts +1 -0
- package/src/testing/types.ts +3 -0
- package/src/textFieldOscillationGuard.test.ts +63 -0
- package/src/textFieldOscillationGuard.ts +89 -0
- package/src/types/react-native-markdown-display.d.ts +6 -0
- package/src/types/react-native-swiper-flatlist.d.ts +5 -5
- package/src/useAcknowledgeAnnouncement.test.ts +223 -0
- package/src/useAcknowledgeAnnouncement.ts +166 -0
- package/src/useAnnouncements.test.ts +226 -0
- package/src/useAnnouncements.ts +150 -0
|
@@ -0,0 +1,441 @@
|
|
|
1
|
+
import type React from "react";
|
|
2
|
+
import {type FC, useCallback, useEffect, useMemo, useRef, useState} from "react";
|
|
3
|
+
import {Platform} from "react-native";
|
|
4
|
+
|
|
5
|
+
import {BooleanField} from "./BooleanField";
|
|
6
|
+
import {Box} from "./Box";
|
|
7
|
+
import {Button} from "./Button";
|
|
8
|
+
import type {DataTableColumnFilter} from "./Common";
|
|
9
|
+
import {DateTimeField} from "./DateTimeField";
|
|
10
|
+
import {
|
|
11
|
+
DATA_TABLE_CHOICE_EMPTY_LABEL,
|
|
12
|
+
DATA_TABLE_CHOICE_EMPTY_VALUE,
|
|
13
|
+
endOfUtcDay,
|
|
14
|
+
startOfUtcDay,
|
|
15
|
+
} from "./dataTableListQuery";
|
|
16
|
+
import {Filter} from "./Filter";
|
|
17
|
+
import {MultiselectField} from "./MultiselectField";
|
|
18
|
+
import {NumberField} from "./NumberField";
|
|
19
|
+
import {TextField} from "./TextField";
|
|
20
|
+
|
|
21
|
+
export interface DataTableFilterFieldsProps {
|
|
22
|
+
filters: DataTableColumnFilter[];
|
|
23
|
+
onDraftChange: (next: Record<string, unknown>) => void;
|
|
24
|
+
draftValues: Record<string, unknown>;
|
|
25
|
+
search?: string;
|
|
26
|
+
onSearchDraftChange?: (search: string) => void;
|
|
27
|
+
showSearch?: boolean;
|
|
28
|
+
/**
|
|
29
|
+
* Render a per-field clear control for filters whose input cannot express "unset"
|
|
30
|
+
* (booleans). Only needed when one surface hosts several filters, because the
|
|
31
|
+
* surface-level clear would otherwise reset all of them.
|
|
32
|
+
*/
|
|
33
|
+
showFieldClear?: boolean;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
const parseNumberRangeDraft = (value: unknown): {$gte?: number; $lte?: number} => {
|
|
37
|
+
if (value == null || typeof value !== "object" || Array.isArray(value)) {
|
|
38
|
+
return {};
|
|
39
|
+
}
|
|
40
|
+
const record = value as {$gte?: unknown; $lte?: unknown; gte?: unknown; lte?: unknown};
|
|
41
|
+
const next: {$gte?: number; $lte?: number} = {};
|
|
42
|
+
const gte = record.$gte ?? record.gte;
|
|
43
|
+
const lte = record.$lte ?? record.lte;
|
|
44
|
+
if (typeof gte === "number" && !Number.isNaN(gte)) {
|
|
45
|
+
next.$gte = gte;
|
|
46
|
+
}
|
|
47
|
+
if (typeof lte === "number" && !Number.isNaN(lte)) {
|
|
48
|
+
next.$lte = lte;
|
|
49
|
+
}
|
|
50
|
+
return next;
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
const toChoiceValue = (value: unknown): string[] => {
|
|
54
|
+
if (Array.isArray(value)) {
|
|
55
|
+
return value.map((entry) => String(entry));
|
|
56
|
+
}
|
|
57
|
+
if (typeof value === "string" && value.trim() !== "") {
|
|
58
|
+
return [value.trim()];
|
|
59
|
+
}
|
|
60
|
+
return [];
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
export const DataTableFilterFields: FC<DataTableFilterFieldsProps> = ({
|
|
64
|
+
draftValues,
|
|
65
|
+
filters,
|
|
66
|
+
onDraftChange,
|
|
67
|
+
onSearchDraftChange,
|
|
68
|
+
search = "",
|
|
69
|
+
showFieldClear = false,
|
|
70
|
+
showSearch = false,
|
|
71
|
+
}) => {
|
|
72
|
+
const draftValuesRef = useRef(draftValues);
|
|
73
|
+
draftValuesRef.current = draftValues;
|
|
74
|
+
|
|
75
|
+
const setField = useCallback(
|
|
76
|
+
(key: string, value: unknown): void => {
|
|
77
|
+
const next = {...draftValuesRef.current, [key]: value};
|
|
78
|
+
draftValuesRef.current = next;
|
|
79
|
+
onDraftChange(next);
|
|
80
|
+
},
|
|
81
|
+
[onDraftChange]
|
|
82
|
+
);
|
|
83
|
+
|
|
84
|
+
const filterFields = useMemo((): React.ReactNode[] => {
|
|
85
|
+
const nodes: React.ReactNode[] = [];
|
|
86
|
+
if (showSearch && onSearchDraftChange) {
|
|
87
|
+
nodes.push(
|
|
88
|
+
<TextField
|
|
89
|
+
key="data-table-filter-search"
|
|
90
|
+
onChange={onSearchDraftChange}
|
|
91
|
+
testID="data-table-filter-search"
|
|
92
|
+
title="Search"
|
|
93
|
+
type="search"
|
|
94
|
+
value={search}
|
|
95
|
+
/>
|
|
96
|
+
);
|
|
97
|
+
}
|
|
98
|
+
for (const filter of filters) {
|
|
99
|
+
const field = filter.field;
|
|
100
|
+
const label = filter.label ?? field;
|
|
101
|
+
if (filter.renderFilter) {
|
|
102
|
+
nodes.push(
|
|
103
|
+
<Box key={field} width="100%">
|
|
104
|
+
{filter.renderFilter({
|
|
105
|
+
field,
|
|
106
|
+
onChange: (value) => setField(field, value),
|
|
107
|
+
value: draftValues[field],
|
|
108
|
+
})}
|
|
109
|
+
</Box>
|
|
110
|
+
);
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
if (filter.kind === "boolean") {
|
|
114
|
+
const raw = draftValues[field];
|
|
115
|
+
const boolValue = raw === true || raw === "true";
|
|
116
|
+
nodes.push(
|
|
117
|
+
<Box direction="column" gap={1} key={field} width="100%">
|
|
118
|
+
<BooleanField
|
|
119
|
+
onChange={(next: boolean) => setField(field, next)}
|
|
120
|
+
testID={`data-table-filter-${field}`}
|
|
121
|
+
title={label}
|
|
122
|
+
value={boolValue}
|
|
123
|
+
/>
|
|
124
|
+
{showFieldClear && raw !== undefined ? (
|
|
125
|
+
<Button
|
|
126
|
+
onClick={() => setField(field, undefined)}
|
|
127
|
+
testID={`data-table-filter-${field}-clear`}
|
|
128
|
+
text="Clear filter"
|
|
129
|
+
variant="ghost"
|
|
130
|
+
/>
|
|
131
|
+
) : null}
|
|
132
|
+
</Box>
|
|
133
|
+
);
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
if (filter.kind === "dateRange") {
|
|
137
|
+
const gteKey = `${field}_gte`;
|
|
138
|
+
const lteKey = `${field}_lte`;
|
|
139
|
+
nodes.push(
|
|
140
|
+
<Box direction="column" gap={2} key={field} width="100%">
|
|
141
|
+
<DateTimeField
|
|
142
|
+
onChange={(next: string) => setField(gteKey, startOfUtcDay(next))}
|
|
143
|
+
testID={`data-table-filter-${field}-gte`}
|
|
144
|
+
title={`${label} from`}
|
|
145
|
+
type="date"
|
|
146
|
+
value={String(draftValues[gteKey] ?? "")}
|
|
147
|
+
/>
|
|
148
|
+
<DateTimeField
|
|
149
|
+
onChange={(next: string) => setField(lteKey, endOfUtcDay(next))}
|
|
150
|
+
testID={`data-table-filter-${field}-lte`}
|
|
151
|
+
title={`${label} to`}
|
|
152
|
+
type="date"
|
|
153
|
+
value={String(draftValues[lteKey] ?? "")}
|
|
154
|
+
/>
|
|
155
|
+
</Box>
|
|
156
|
+
);
|
|
157
|
+
continue;
|
|
158
|
+
}
|
|
159
|
+
if (filter.kind === "numberRange") {
|
|
160
|
+
const range = parseNumberRangeDraft(draftValues[field]);
|
|
161
|
+
nodes.push(
|
|
162
|
+
<Box direction="column" gap={2} key={field} width="100%">
|
|
163
|
+
<NumberField
|
|
164
|
+
onChange={(next: string) => {
|
|
165
|
+
const parsed = next === "" ? undefined : Number(next);
|
|
166
|
+
const current = parseNumberRangeDraft(draftValues[field]);
|
|
167
|
+
setField(field, {
|
|
168
|
+
...current,
|
|
169
|
+
$gte: parsed === undefined || Number.isNaN(parsed) ? undefined : parsed,
|
|
170
|
+
});
|
|
171
|
+
}}
|
|
172
|
+
testID={`data-table-filter-${field}-gte`}
|
|
173
|
+
title={`${label} min`}
|
|
174
|
+
type="number"
|
|
175
|
+
value={range.$gte === undefined ? "" : String(range.$gte)}
|
|
176
|
+
/>
|
|
177
|
+
<NumberField
|
|
178
|
+
onChange={(next: string) => {
|
|
179
|
+
const parsed = next === "" ? undefined : Number(next);
|
|
180
|
+
const current = parseNumberRangeDraft(draftValues[field]);
|
|
181
|
+
setField(field, {
|
|
182
|
+
...current,
|
|
183
|
+
$lte: parsed === undefined || Number.isNaN(parsed) ? undefined : parsed,
|
|
184
|
+
});
|
|
185
|
+
}}
|
|
186
|
+
testID={`data-table-filter-${field}-lte`}
|
|
187
|
+
title={`${label} max`}
|
|
188
|
+
type="number"
|
|
189
|
+
value={range.$lte === undefined ? "" : String(range.$lte)}
|
|
190
|
+
/>
|
|
191
|
+
</Box>
|
|
192
|
+
);
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
195
|
+
if (filter.kind === "choice") {
|
|
196
|
+
const choiceOptions = filter.allowEmpty
|
|
197
|
+
? [
|
|
198
|
+
{label: DATA_TABLE_CHOICE_EMPTY_LABEL, value: DATA_TABLE_CHOICE_EMPTY_VALUE},
|
|
199
|
+
...(filter.options ?? []),
|
|
200
|
+
]
|
|
201
|
+
: (filter.options ?? []);
|
|
202
|
+
nodes.push(
|
|
203
|
+
<Box key={field} width="100%">
|
|
204
|
+
<MultiselectField
|
|
205
|
+
onChange={(next: string[]) => setField(field, next)}
|
|
206
|
+
options={choiceOptions}
|
|
207
|
+
testID={`data-table-filter-${field}`}
|
|
208
|
+
title={label}
|
|
209
|
+
value={toChoiceValue(draftValues[field])}
|
|
210
|
+
/>
|
|
211
|
+
</Box>
|
|
212
|
+
);
|
|
213
|
+
continue;
|
|
214
|
+
}
|
|
215
|
+
nodes.push(
|
|
216
|
+
<Box key={field} width="100%">
|
|
217
|
+
<TextField
|
|
218
|
+
onChange={(next: string) => setField(field, next)}
|
|
219
|
+
testID={`data-table-filter-${field}`}
|
|
220
|
+
title={label}
|
|
221
|
+
value={String(draftValues[field] ?? "")}
|
|
222
|
+
/>
|
|
223
|
+
</Box>
|
|
224
|
+
);
|
|
225
|
+
}
|
|
226
|
+
return nodes;
|
|
227
|
+
}, [draftValues, filters, onSearchDraftChange, search, setField, showFieldClear, showSearch]);
|
|
228
|
+
|
|
229
|
+
return (
|
|
230
|
+
<Box direction="column" gap={3} width="100%">
|
|
231
|
+
{filterFields}
|
|
232
|
+
</Box>
|
|
233
|
+
);
|
|
234
|
+
};
|
|
235
|
+
|
|
236
|
+
const clearFilterKeys = (
|
|
237
|
+
filter: DataTableColumnFilter,
|
|
238
|
+
values: Record<string, unknown>
|
|
239
|
+
): Record<string, unknown> => {
|
|
240
|
+
const next = {...values};
|
|
241
|
+
if (filter.kind === "dateRange") {
|
|
242
|
+
delete next[`${filter.field}_gte`];
|
|
243
|
+
delete next[`${filter.field}_lte`];
|
|
244
|
+
return next;
|
|
245
|
+
}
|
|
246
|
+
delete next[filter.field];
|
|
247
|
+
return next;
|
|
248
|
+
};
|
|
249
|
+
|
|
250
|
+
const pickFilterDraft = (
|
|
251
|
+
filter: DataTableColumnFilter,
|
|
252
|
+
values: Record<string, unknown>
|
|
253
|
+
): Record<string, unknown> => {
|
|
254
|
+
if (filter.kind === "dateRange") {
|
|
255
|
+
const next: Record<string, unknown> = {};
|
|
256
|
+
const gte = values[`${filter.field}_gte`];
|
|
257
|
+
const lte = values[`${filter.field}_lte`];
|
|
258
|
+
if (gte !== undefined) {
|
|
259
|
+
next[`${filter.field}_gte`] = gte;
|
|
260
|
+
}
|
|
261
|
+
if (lte !== undefined) {
|
|
262
|
+
next[`${filter.field}_lte`] = lte;
|
|
263
|
+
}
|
|
264
|
+
return next;
|
|
265
|
+
}
|
|
266
|
+
const value = values[filter.field];
|
|
267
|
+
if (value === undefined) {
|
|
268
|
+
return {};
|
|
269
|
+
}
|
|
270
|
+
return {[filter.field]: value};
|
|
271
|
+
};
|
|
272
|
+
|
|
273
|
+
const mergeFilterDraft = (
|
|
274
|
+
filter: DataTableColumnFilter,
|
|
275
|
+
applied: Record<string, unknown>,
|
|
276
|
+
draft: Record<string, unknown>
|
|
277
|
+
): Record<string, unknown> => {
|
|
278
|
+
const cleared = clearFilterKeys(filter, applied);
|
|
279
|
+
return {...cleared, ...draft};
|
|
280
|
+
};
|
|
281
|
+
|
|
282
|
+
export interface DataTableColumnFilterWebProps {
|
|
283
|
+
columnTitle: string;
|
|
284
|
+
filter: DataTableColumnFilter;
|
|
285
|
+
appliedValues: Record<string, unknown>;
|
|
286
|
+
onApply: (next: Record<string, unknown>) => void;
|
|
287
|
+
testID?: string;
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
/** Per-column web filter popover wired to DataTable controlled filter state. */
|
|
291
|
+
export const DataTableColumnFilterWeb: FC<DataTableColumnFilterWebProps> = ({
|
|
292
|
+
appliedValues,
|
|
293
|
+
columnTitle,
|
|
294
|
+
filter,
|
|
295
|
+
onApply,
|
|
296
|
+
testID,
|
|
297
|
+
}) => {
|
|
298
|
+
const [isOpen, setIsOpen] = useState(false);
|
|
299
|
+
const [draftValues, setDraftValues] = useState<Record<string, unknown>>({});
|
|
300
|
+
const draftValuesRef = useRef(draftValues);
|
|
301
|
+
draftValuesRef.current = draftValues;
|
|
302
|
+
|
|
303
|
+
const setDraftValuesSync = useCallback((next: Record<string, unknown>): void => {
|
|
304
|
+
draftValuesRef.current = next;
|
|
305
|
+
setDraftValues(next);
|
|
306
|
+
}, []);
|
|
307
|
+
|
|
308
|
+
const wasOpenRef = useRef(false);
|
|
309
|
+
// Seed draft only on closed → open so parent rerenders do not wipe in-progress input.
|
|
310
|
+
useEffect(() => {
|
|
311
|
+
const justOpened = isOpen && !wasOpenRef.current;
|
|
312
|
+
wasOpenRef.current = isOpen;
|
|
313
|
+
if (!justOpened) {
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
316
|
+
const next = pickFilterDraft(filter, appliedValues);
|
|
317
|
+
draftValuesRef.current = next;
|
|
318
|
+
setDraftValues(next);
|
|
319
|
+
}, [appliedValues, filter, isOpen]);
|
|
320
|
+
|
|
321
|
+
const handleApply = useCallback((): void => {
|
|
322
|
+
onApply(mergeFilterDraft(filter, appliedValues, draftValuesRef.current));
|
|
323
|
+
}, [appliedValues, filter, onApply]);
|
|
324
|
+
|
|
325
|
+
const handleClear = useCallback((): void => {
|
|
326
|
+
const next = clearFilterKeys(filter, draftValuesRef.current);
|
|
327
|
+
draftValuesRef.current = next;
|
|
328
|
+
setDraftValues(next);
|
|
329
|
+
}, [filter]);
|
|
330
|
+
|
|
331
|
+
if (Platform.OS !== "web") {
|
|
332
|
+
return null;
|
|
333
|
+
}
|
|
334
|
+
|
|
335
|
+
return (
|
|
336
|
+
<Filter
|
|
337
|
+
iconName="filter"
|
|
338
|
+
iconOnly
|
|
339
|
+
isOpen={isOpen}
|
|
340
|
+
label=""
|
|
341
|
+
onApply={handleApply}
|
|
342
|
+
onCancel={() => setIsOpen(false)}
|
|
343
|
+
onClear={handleClear}
|
|
344
|
+
onOpenChange={setIsOpen}
|
|
345
|
+
testID={testID}
|
|
346
|
+
triggerAccessibilityLabel={`Filter ${columnTitle}`}
|
|
347
|
+
variant="secondary"
|
|
348
|
+
>
|
|
349
|
+
<DataTableFilterFields
|
|
350
|
+
draftValues={draftValues}
|
|
351
|
+
filters={[filter]}
|
|
352
|
+
onDraftChange={setDraftValuesSync}
|
|
353
|
+
/>
|
|
354
|
+
</Filter>
|
|
355
|
+
);
|
|
356
|
+
};
|
|
357
|
+
|
|
358
|
+
export interface DataTableAdditionalFiltersWebProps {
|
|
359
|
+
appliedValues: Record<string, unknown>;
|
|
360
|
+
filters: DataTableColumnFilter[];
|
|
361
|
+
onApply: (next: Record<string, unknown>) => void;
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
/** Web toolbar filter for definitions that are not attached to visible columns. */
|
|
365
|
+
export const DataTableAdditionalFiltersWeb: FC<DataTableAdditionalFiltersWebProps> = ({
|
|
366
|
+
appliedValues,
|
|
367
|
+
filters,
|
|
368
|
+
onApply,
|
|
369
|
+
}) => {
|
|
370
|
+
const [isOpen, setIsOpen] = useState(false);
|
|
371
|
+
const [draftValues, setDraftValues] = useState<Record<string, unknown>>({});
|
|
372
|
+
const draftValuesRef = useRef(draftValues);
|
|
373
|
+
draftValuesRef.current = draftValues;
|
|
374
|
+
|
|
375
|
+
const setDraftValuesSync = useCallback((next: Record<string, unknown>): void => {
|
|
376
|
+
draftValuesRef.current = next;
|
|
377
|
+
setDraftValues(next);
|
|
378
|
+
}, []);
|
|
379
|
+
|
|
380
|
+
const wasOpenRef = useRef(false);
|
|
381
|
+
// Seed drafts only on closed → open. Recreated `filters` arrays must not reset typing.
|
|
382
|
+
useEffect(() => {
|
|
383
|
+
const justOpened = isOpen && !wasOpenRef.current;
|
|
384
|
+
wasOpenRef.current = isOpen;
|
|
385
|
+
if (!justOpened) {
|
|
386
|
+
return;
|
|
387
|
+
}
|
|
388
|
+
const next: Record<string, unknown> = {};
|
|
389
|
+
for (const filter of filters) {
|
|
390
|
+
Object.assign(next, pickFilterDraft(filter, appliedValues));
|
|
391
|
+
}
|
|
392
|
+
draftValuesRef.current = next;
|
|
393
|
+
setDraftValues(next);
|
|
394
|
+
}, [appliedValues, filters, isOpen]);
|
|
395
|
+
|
|
396
|
+
const handleApply = useCallback((): void => {
|
|
397
|
+
let next = {...appliedValues};
|
|
398
|
+
for (const filter of filters) {
|
|
399
|
+
next = clearFilterKeys(filter, next);
|
|
400
|
+
}
|
|
401
|
+
onApply({...next, ...draftValuesRef.current});
|
|
402
|
+
}, [appliedValues, filters, onApply]);
|
|
403
|
+
|
|
404
|
+
const handleClear = useCallback((): void => {
|
|
405
|
+
let next = {...draftValuesRef.current};
|
|
406
|
+
for (const filter of filters) {
|
|
407
|
+
next = clearFilterKeys(filter, next);
|
|
408
|
+
}
|
|
409
|
+
draftValuesRef.current = next;
|
|
410
|
+
setDraftValues(next);
|
|
411
|
+
}, [filters]);
|
|
412
|
+
|
|
413
|
+
const handleCancel = useCallback((): void => {
|
|
414
|
+
setIsOpen(false);
|
|
415
|
+
}, []);
|
|
416
|
+
|
|
417
|
+
if (Platform.OS !== "web") {
|
|
418
|
+
return null;
|
|
419
|
+
}
|
|
420
|
+
|
|
421
|
+
return (
|
|
422
|
+
<Filter
|
|
423
|
+
iconName="filter"
|
|
424
|
+
isOpen={isOpen}
|
|
425
|
+
label="More filters"
|
|
426
|
+
onApply={handleApply}
|
|
427
|
+
onCancel={handleCancel}
|
|
428
|
+
onClear={handleClear}
|
|
429
|
+
onOpenChange={setIsOpen}
|
|
430
|
+
testID="data-table-additional-filters"
|
|
431
|
+
variant="secondary"
|
|
432
|
+
>
|
|
433
|
+
<DataTableFilterFields
|
|
434
|
+
draftValues={draftValues}
|
|
435
|
+
filters={filters}
|
|
436
|
+
onDraftChange={setDraftValuesSync}
|
|
437
|
+
showFieldClear
|
|
438
|
+
/>
|
|
439
|
+
</Filter>
|
|
440
|
+
);
|
|
441
|
+
};
|
|
@@ -0,0 +1,220 @@
|
|
|
1
|
+
import {describe, expect, it} from "bun:test";
|
|
2
|
+
|
|
3
|
+
import type {DataTableColumn} from "./Common";
|
|
4
|
+
import {
|
|
5
|
+
buildChoiceFilterQueryValue,
|
|
6
|
+
buildDataTableListQuery,
|
|
7
|
+
DATA_TABLE_CHOICE_EMPTY_VALUE,
|
|
8
|
+
endOfUtcDay,
|
|
9
|
+
escapeRegexLiteral,
|
|
10
|
+
startOfUtcDay,
|
|
11
|
+
} from "./dataTableListQuery";
|
|
12
|
+
|
|
13
|
+
describe("escapeRegexLiteral", () => {
|
|
14
|
+
it("escapes regex metacharacters", () => {
|
|
15
|
+
expect(escapeRegexLiteral(".*")).toBe("\\.\\*");
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
describe("buildDataTableListQuery", () => {
|
|
20
|
+
const columns: DataTableColumn[] = [
|
|
21
|
+
{
|
|
22
|
+
columnType: "text",
|
|
23
|
+
filter: {field: "name", kind: "text"},
|
|
24
|
+
title: "Name",
|
|
25
|
+
width: 100,
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
columnType: "boolean",
|
|
29
|
+
filter: {field: "active", kind: "boolean"},
|
|
30
|
+
title: "Active",
|
|
31
|
+
width: 80,
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
columnType: "date",
|
|
35
|
+
filter: {field: "created", kind: "dateRange"},
|
|
36
|
+
title: "Created",
|
|
37
|
+
width: 120,
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
columnType: "number",
|
|
41
|
+
filter: {field: "age", kind: "numberRange"},
|
|
42
|
+
title: "Age",
|
|
43
|
+
width: 80,
|
|
44
|
+
},
|
|
45
|
+
{
|
|
46
|
+
columnType: "text",
|
|
47
|
+
filter: {
|
|
48
|
+
field: "role",
|
|
49
|
+
kind: "choice",
|
|
50
|
+
options: [{label: "Staff", value: "staff"}],
|
|
51
|
+
},
|
|
52
|
+
title: "Role",
|
|
53
|
+
width: 100,
|
|
54
|
+
},
|
|
55
|
+
];
|
|
56
|
+
|
|
57
|
+
it("emits search $or with escaped regex across searchFields", () => {
|
|
58
|
+
const params = buildDataTableListQuery({
|
|
59
|
+
columns: [],
|
|
60
|
+
search: ".*",
|
|
61
|
+
searchFields: ["title", "name"],
|
|
62
|
+
});
|
|
63
|
+
expect(params.$or).toEqual([
|
|
64
|
+
{title: {$options: "i", $regex: "\\.\\*"}},
|
|
65
|
+
{name: {$options: "i", $regex: "\\.\\*"}},
|
|
66
|
+
]);
|
|
67
|
+
expect(params.page).toBeUndefined();
|
|
68
|
+
expect(params.sort).toBeUndefined();
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
it("omits boolean when unset and emits true when set", () => {
|
|
72
|
+
expect(
|
|
73
|
+
buildDataTableListQuery({
|
|
74
|
+
columns,
|
|
75
|
+
filterValues: {},
|
|
76
|
+
}).active
|
|
77
|
+
).toBeUndefined();
|
|
78
|
+
expect(
|
|
79
|
+
buildDataTableListQuery({
|
|
80
|
+
columns,
|
|
81
|
+
filterValues: {active: true},
|
|
82
|
+
}).active
|
|
83
|
+
).toBe(true);
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
it("emits text, date bounds, number range, and choice $in", () => {
|
|
87
|
+
const params = buildDataTableListQuery({
|
|
88
|
+
columns,
|
|
89
|
+
filterValues: {
|
|
90
|
+
age: {$gte: 18, $lte: 65},
|
|
91
|
+
created_gte: "2024-01-01T00:00:00.000Z",
|
|
92
|
+
created_lte: "2024-12-31T23:59:59.999Z",
|
|
93
|
+
name: "alice",
|
|
94
|
+
role: ["staff"],
|
|
95
|
+
},
|
|
96
|
+
});
|
|
97
|
+
expect(params.name).toEqual({$options: "i", $regex: "alice"});
|
|
98
|
+
expect(params.created_gte).toBe("2024-01-01T00:00:00.000Z");
|
|
99
|
+
expect(params.created_lte).toBe("2024-12-31T23:59:59.999Z");
|
|
100
|
+
expect(params.age).toEqual({$gte: 18, $lte: 65});
|
|
101
|
+
expect(params.role).toBe("staff");
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
it("emits scalar equality for a single selected choice value", () => {
|
|
105
|
+
const params = buildDataTableListQuery({
|
|
106
|
+
columns,
|
|
107
|
+
filterValues: {role: "staff"},
|
|
108
|
+
});
|
|
109
|
+
expect(params.role).toBe("staff");
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
it("includes toolbar-only filters that are not visible columns", () => {
|
|
113
|
+
const params = buildDataTableListQuery({
|
|
114
|
+
columns: [],
|
|
115
|
+
filters: [{field: "status", kind: "choice"}],
|
|
116
|
+
filterValues: {status: ["open", "closed"]},
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
expect(params.status).toEqual({$in: ["open", "closed"]});
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
describe("buildDataTableListQuery date ranges", () => {
|
|
124
|
+
const columns: DataTableColumn[] = [
|
|
125
|
+
{
|
|
126
|
+
columnType: "date",
|
|
127
|
+
filter: {field: "created", kind: "dateRange"},
|
|
128
|
+
title: "Created",
|
|
129
|
+
width: 120,
|
|
130
|
+
},
|
|
131
|
+
];
|
|
132
|
+
|
|
133
|
+
it("emits only the lower bound when just from is set", () => {
|
|
134
|
+
const params = buildDataTableListQuery({
|
|
135
|
+
columns,
|
|
136
|
+
filterValues: {created_gte: "2026-01-15T00:00:00.000Z"},
|
|
137
|
+
});
|
|
138
|
+
expect(params.created_gte).toBe("2026-01-15T00:00:00.000Z");
|
|
139
|
+
expect(params.created_lte).toBeUndefined();
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
it("emits only the upper bound when just to is set", () => {
|
|
143
|
+
const params = buildDataTableListQuery({
|
|
144
|
+
columns,
|
|
145
|
+
filterValues: {created_lte: "2026-01-15T23:59:59.999Z"},
|
|
146
|
+
});
|
|
147
|
+
expect(params.created_lte).toBe("2026-01-15T23:59:59.999Z");
|
|
148
|
+
expect(params.created_gte).toBeUndefined();
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
describe("utc day bounds", () => {
|
|
153
|
+
it("opens the chosen day for lower bounds", () => {
|
|
154
|
+
expect(startOfUtcDay("2026-01-15T00:00:00.000Z")).toBe("2026-01-15T00:00:00.000Z");
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
it("closes the chosen day for upper bounds", () => {
|
|
158
|
+
expect(endOfUtcDay("2026-01-15T00:00:00.000Z")).toBe("2026-01-15T23:59:59.999Z");
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
it("passes through values that are not parseable dates", () => {
|
|
162
|
+
expect(startOfUtcDay("")).toBe("");
|
|
163
|
+
expect(endOfUtcDay("not-a-date")).toBe("not-a-date");
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
describe("buildChoiceFilterQueryValue", () => {
|
|
168
|
+
it("uses scalar equality for one concrete value", () => {
|
|
169
|
+
expect(buildChoiceFilterQueryValue(["high"], false)).toBe("high");
|
|
170
|
+
});
|
|
171
|
+
|
|
172
|
+
it("uses $in for multiple concrete values", () => {
|
|
173
|
+
expect(buildChoiceFilterQueryValue(["high", "low"], false)).toEqual({$in: ["high", "low"]});
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
it("uses empty sentinel for empty-only optional filters", () => {
|
|
177
|
+
expect(buildChoiceFilterQueryValue([DATA_TABLE_CHOICE_EMPTY_VALUE], true)).toEqual({
|
|
178
|
+
$in: [DATA_TABLE_CHOICE_EMPTY_VALUE],
|
|
179
|
+
});
|
|
180
|
+
});
|
|
181
|
+
|
|
182
|
+
it("combines empty sentinel with concrete values in $in", () => {
|
|
183
|
+
expect(buildChoiceFilterQueryValue(["high", DATA_TABLE_CHOICE_EMPTY_VALUE], true)).toEqual({
|
|
184
|
+
$in: ["high", DATA_TABLE_CHOICE_EMPTY_VALUE],
|
|
185
|
+
});
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
|
|
189
|
+
describe("buildDataTableListQuery optional choice empty", () => {
|
|
190
|
+
const priorityColumn: DataTableColumn = {
|
|
191
|
+
columnType: "text",
|
|
192
|
+
filter: {
|
|
193
|
+
allowEmpty: true,
|
|
194
|
+
field: "priority",
|
|
195
|
+
kind: "choice",
|
|
196
|
+
options: [
|
|
197
|
+
{label: "High", value: "high"},
|
|
198
|
+
{label: "Low", value: "low"},
|
|
199
|
+
],
|
|
200
|
+
},
|
|
201
|
+
title: "Priority",
|
|
202
|
+
width: 100,
|
|
203
|
+
};
|
|
204
|
+
|
|
205
|
+
it("emits scalar high for a single concrete priority", () => {
|
|
206
|
+
const params = buildDataTableListQuery({
|
|
207
|
+
columns: [priorityColumn],
|
|
208
|
+
filterValues: {priority: ["high"]},
|
|
209
|
+
});
|
|
210
|
+
expect(params.priority).toBe("high");
|
|
211
|
+
});
|
|
212
|
+
|
|
213
|
+
it("emits empty sentinel when only Empty is selected", () => {
|
|
214
|
+
const params = buildDataTableListQuery({
|
|
215
|
+
columns: [priorityColumn],
|
|
216
|
+
filterValues: {priority: [DATA_TABLE_CHOICE_EMPTY_VALUE]},
|
|
217
|
+
});
|
|
218
|
+
expect(params.priority).toEqual({$in: [DATA_TABLE_CHOICE_EMPTY_VALUE]});
|
|
219
|
+
});
|
|
220
|
+
});
|