@macrostrat/data-sheet 2.0.2 → 2.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/CHANGELOG.md +10 -0
- package/README.md +17 -10
- package/dist/esm/{postgrest-table.d4e0260e.js → data-sheet.00171fc5.js} +76 -61
- package/dist/esm/data-sheet.00171fc5.js.map +1 -0
- package/dist/esm/{utils.5d81fe80.js → data-sheet.0adfe599.js} +2 -2
- package/dist/esm/{utils.5d81fe80.js.map → data-sheet.0adfe599.js.map} +1 -1
- package/dist/esm/{editor-popup.819ce365.js → data-sheet.1d6ac6c6.js} +28 -8
- package/dist/esm/data-sheet.1d6ac6c6.js.map +1 -0
- package/dist/esm/{data-loaders.b7de291b.js → data-sheet.2773da15.js} +12 -3
- package/dist/esm/data-sheet.2773da15.js.map +1 -0
- package/dist/esm/{main.module.7e0903d4.js → data-sheet.37e35216.js} +16 -1
- package/dist/esm/data-sheet.37e35216.js.map +1 -0
- package/dist/esm/{column-spec.e56f4d75.js → data-sheet.410c5122.js} +20 -7
- package/dist/esm/data-sheet.410c5122.js.map +1 -0
- package/dist/esm/{main.module.83442ac4.js → data-sheet.48635112.js} +4 -1
- package/dist/esm/data-sheet.48635112.js.map +1 -0
- package/dist/esm/{actions.module.560a3136.js → data-sheet.54cfa8e8.js} +1 -1
- package/dist/esm/{actions.module.560a3136.js.map → data-sheet.54cfa8e8.js.map} +1 -1
- package/dist/esm/{colors.75a92ad3.js → data-sheet.6021b6c9.js} +30 -21
- package/dist/esm/data-sheet.6021b6c9.js.map +1 -0
- package/dist/esm/{actions.module.684172fa.css → data-sheet.706f955d.css} +1 -1
- package/dist/esm/{actions.module.684172fa.css.map → data-sheet.706f955d.css.map} +1 -1
- package/dist/esm/{main.module.658cf7b2.css → data-sheet.91223ec6.css} +35 -1
- package/dist/esm/data-sheet.91223ec6.css.map +1 -0
- package/dist/esm/{actions.065d098d.js → data-sheet.a3eb6088.js} +4 -4
- package/dist/esm/{actions.065d098d.js.map → data-sheet.a3eb6088.js.map} +1 -1
- package/dist/esm/{main.module.df43976f.css → data-sheet.b3ccc91b.css} +8 -5
- package/dist/esm/data-sheet.b3ccc91b.css.map +1 -0
- package/dist/esm/{provider.fefae4a0.js → data-sheet.b4098761.js} +154 -12
- package/dist/esm/data-sheet.b4098761.js.map +1 -0
- package/dist/esm/{text-areas.ccfcf204.js → data-sheet.b5946d6b.js} +6 -5
- package/dist/esm/data-sheet.b5946d6b.js.map +1 -0
- package/dist/esm/{main.module.bd60788c.js → data-sheet.d570ef95.js} +22 -22
- package/dist/esm/data-sheet.d570ef95.js.map +1 -0
- package/dist/esm/{core.f82b5af0.js → data-sheet.e09ffc66.js} +181 -80
- package/dist/esm/data-sheet.e09ffc66.js.map +1 -0
- package/dist/esm/{components.f832ecf3.js → data-sheet.e37b4bd3.js} +5 -5
- package/dist/esm/{components.f832ecf3.js.map → data-sheet.e37b4bd3.js.map} +1 -1
- package/dist/esm/data-sheet.ef63e366.css +110 -0
- package/dist/esm/data-sheet.ef63e366.css.map +1 -0
- package/dist/esm/index.d.ts +36 -23
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +3 -3
- package/dist/node/data-sheet.0f66147e.js +2 -0
- package/dist/node/data-sheet.0f66147e.js.map +1 -0
- package/dist/node/data-sheet.171105c1.js +2 -0
- package/dist/node/data-sheet.171105c1.js.map +1 -0
- package/dist/node/data-sheet.1a487c3c.js +2 -0
- package/dist/node/data-sheet.1a487c3c.js.map +1 -0
- package/dist/node/data-sheet.28641e23.css +2 -0
- package/dist/node/data-sheet.28641e23.css.map +1 -0
- package/dist/node/data-sheet.2cac1a8c.js +2 -0
- package/dist/node/data-sheet.2cac1a8c.js.map +1 -0
- package/dist/node/data-sheet.2f64274d.css +2 -0
- package/dist/node/data-sheet.2f64274d.css.map +1 -0
- package/dist/node/data-sheet.3680e59d.js +2 -0
- package/dist/node/data-sheet.3680e59d.js.map +1 -0
- package/dist/node/data-sheet.47e3f95c.js +2 -0
- package/dist/node/data-sheet.47e3f95c.js.map +1 -0
- package/dist/node/data-sheet.50d0742f.js +2 -0
- package/dist/node/data-sheet.50d0742f.js.map +1 -0
- package/dist/node/data-sheet.599efaa9.js +2 -0
- package/dist/node/data-sheet.599efaa9.js.map +1 -0
- package/dist/node/data-sheet.7b95fbc1.css +2 -0
- package/dist/node/data-sheet.7b95fbc1.css.map +1 -0
- package/dist/node/data-sheet.7bbad640.js +2 -0
- package/dist/node/data-sheet.7bbad640.js.map +1 -0
- package/dist/node/data-sheet.945becc3.js +2 -0
- package/dist/node/data-sheet.945becc3.js.map +1 -0
- package/dist/node/data-sheet.95445483.js +2 -0
- package/dist/node/data-sheet.95445483.js.map +1 -0
- package/dist/node/data-sheet.a65463ef.js +2 -0
- package/dist/node/data-sheet.a65463ef.js.map +1 -0
- package/dist/node/data-sheet.c3eefdc9.js +2 -0
- package/dist/node/data-sheet.c3eefdc9.js.map +1 -0
- package/dist/node/data-sheet.e6e07d4a.js +2 -0
- package/dist/node/data-sheet.e6e07d4a.js.map +1 -0
- package/dist/node/data-sheet.f0223f39.js +2 -0
- package/dist/node/data-sheet.f0223f39.js.map +1 -0
- package/dist/node/{actions.module.565df529.css → data-sheet.ffaf8ac7.css} +1 -1
- package/dist/node/data-sheet.ffaf8ac7.css.map +1 -0
- package/dist/node/index.js +1 -1
- package/dist/node/index.js.map +1 -1
- package/package.json +8 -6
- package/src/__archive/base.ts +1 -1
- package/src/__archive/components/column-utils.ts +1 -1
- package/src/__archive/components/index.ts +3 -3
- package/src/__archive/components/toolbar.ts +4 -4
- package/src/__archive/editors/index.ts +2 -2
- package/src/__archive/main.ts +6 -6
- package/src/__archive/provider.ts +1 -1
- package/src/__archive/test-sheet/index.ts +5 -5
- package/src/__archive/virtualized.ts +2 -2
- package/src/components/colors.ts +38 -22
- package/src/components/editor-popup.ts +28 -6
- package/src/components/main.module.sass +33 -0
- package/src/components/text-areas.ts +2 -1
- package/src/core.ts +261 -105
- package/src/main.module.sass +19 -0
- package/src/postgrest-table/data-loaders.ts +44 -12
- package/src/postgrest-table/index.ts +104 -45
- package/src/postgrest-table/main.module.sass +6 -4
- package/src/provider.ts +286 -103
- package/src/utils/column-spec.ts +42 -3
- package/dist/esm/cell-renderers.8222e82a.js +0 -31
- package/dist/esm/cell-renderers.8222e82a.js.map +0 -1
- package/dist/esm/colors.75a92ad3.js.map +0 -1
- package/dist/esm/column-spec.e56f4d75.js.map +0 -1
- package/dist/esm/core.f82b5af0.js.map +0 -1
- package/dist/esm/data-loaders.b7de291b.js.map +0 -1
- package/dist/esm/editor-popup.819ce365.js.map +0 -1
- package/dist/esm/main.module.658cf7b2.css.map +0 -1
- package/dist/esm/main.module.7e0903d4.js.map +0 -1
- package/dist/esm/main.module.83442ac4.js.map +0 -1
- package/dist/esm/main.module.b66a4bc1.css +0 -91
- package/dist/esm/main.module.b66a4bc1.css.map +0 -1
- package/dist/esm/main.module.bd60788c.js.map +0 -1
- package/dist/esm/main.module.df43976f.css.map +0 -1
- package/dist/esm/postgrest-table.d4e0260e.js.map +0 -1
- package/dist/esm/provider.fefae4a0.js.map +0 -1
- package/dist/esm/text-areas.ccfcf204.js.map +0 -1
- package/dist/node/actions.4dfe63d8.js +0 -2
- package/dist/node/actions.4dfe63d8.js.map +0 -1
- package/dist/node/actions.module.565df529.css.map +0 -1
- package/dist/node/actions.module.61991621.js +0 -2
- package/dist/node/actions.module.61991621.js.map +0 -1
- package/dist/node/cell-renderers.bbaaeb83.js +0 -2
- package/dist/node/cell-renderers.bbaaeb83.js.map +0 -1
- package/dist/node/colors.fee61100.js +0 -2
- package/dist/node/colors.fee61100.js.map +0 -1
- package/dist/node/column-spec.da7354f5.js +0 -2
- package/dist/node/column-spec.da7354f5.js.map +0 -1
- package/dist/node/components.213ca3fc.js +0 -2
- package/dist/node/components.213ca3fc.js.map +0 -1
- package/dist/node/core.c404e4d4.js +0 -2
- package/dist/node/core.c404e4d4.js.map +0 -1
- package/dist/node/data-loaders.50ce46a4.js +0 -2
- package/dist/node/data-loaders.50ce46a4.js.map +0 -1
- package/dist/node/editor-popup.e19a3668.js +0 -2
- package/dist/node/editor-popup.e19a3668.js.map +0 -1
- package/dist/node/main.module.0802fb12.js +0 -2
- package/dist/node/main.module.0802fb12.js.map +0 -1
- package/dist/node/main.module.273015bb.js +0 -2
- package/dist/node/main.module.273015bb.js.map +0 -1
- package/dist/node/main.module.4cad6bbb.js +0 -2
- package/dist/node/main.module.4cad6bbb.js.map +0 -1
- package/dist/node/main.module.8370d601.css +0 -2
- package/dist/node/main.module.8370d601.css.map +0 -1
- package/dist/node/main.module.a197ee6f.css +0 -2
- package/dist/node/main.module.a197ee6f.css.map +0 -1
- package/dist/node/main.module.e5354239.css +0 -2
- package/dist/node/main.module.e5354239.css.map +0 -1
- package/dist/node/postgrest-table.49926421.js +0 -2
- package/dist/node/postgrest-table.49926421.js.map +0 -1
- package/dist/node/provider.f11d5828.js +0 -2
- package/dist/node/provider.f11d5828.js.map +0 -1
- package/dist/node/text-areas.64832f7d.js +0 -2
- package/dist/node/text-areas.64832f7d.js.map +0 -1
- package/dist/node/utils.897d92e2.js +0 -2
- package/dist/node/utils.897d92e2.js.map +0 -1
- package/src/postgrest-table/cell-renderers.ts +0 -24
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { useAsyncEffect } from "@macrostrat/ui-components";
|
|
4
4
|
import { debounce } from "underscore";
|
|
5
|
-
import { useCallback, useMemo, useReducer } from "react";
|
|
5
|
+
import { useCallback, useMemo, useReducer, useRef } from "react";
|
|
6
6
|
import update, { Spec } from "immutability-helper";
|
|
7
7
|
|
|
8
8
|
interface ChunkIndex {
|
|
@@ -11,7 +11,11 @@ interface ChunkIndex {
|
|
|
11
11
|
lastValue: any;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
import {
|
|
14
|
+
import {
|
|
15
|
+
PostgrestClient,
|
|
16
|
+
PostgrestQueryBuilder,
|
|
17
|
+
PostgrestFilterBuilder,
|
|
18
|
+
} from "@supabase/postgrest-js";
|
|
15
19
|
|
|
16
20
|
interface LazyLoaderState<T> {
|
|
17
21
|
data: (T | null)[];
|
|
@@ -40,7 +44,7 @@ function adjustArraySize<T>(arr: T[], newSize: number) {
|
|
|
40
44
|
|
|
41
45
|
function lazyLoadingReducer<T>(
|
|
42
46
|
state: LazyLoaderState<T>,
|
|
43
|
-
action: LazyLoaderAction<T
|
|
47
|
+
action: LazyLoaderAction<T>,
|
|
44
48
|
): LazyLoaderState<T> {
|
|
45
49
|
console.log(action);
|
|
46
50
|
switch (action.type) {
|
|
@@ -108,7 +112,7 @@ function distanceToNextNonEmptyRow(
|
|
|
108
112
|
data: any[],
|
|
109
113
|
start: number,
|
|
110
114
|
direction: LoadDirection,
|
|
111
|
-
limit: number
|
|
115
|
+
limit: number,
|
|
112
116
|
): number {
|
|
113
117
|
let i = start;
|
|
114
118
|
while (i < data.length && i > 0 && limit > 0) {
|
|
@@ -122,22 +126,36 @@ function distanceToNextNonEmptyRow(
|
|
|
122
126
|
}
|
|
123
127
|
|
|
124
128
|
interface QueryConfig {
|
|
125
|
-
columns?: string;
|
|
129
|
+
columns?: string | string[];
|
|
126
130
|
count?: "exact" | "estimated";
|
|
127
131
|
limit?: number;
|
|
128
132
|
offset?: number;
|
|
129
133
|
order?: { key: string; ascending: boolean };
|
|
130
134
|
after?: any;
|
|
135
|
+
filter?: (
|
|
136
|
+
query: PostgrestFilterBuilder<any, any, any>,
|
|
137
|
+
) => PostgrestFilterBuilder<any, any, any>;
|
|
131
138
|
}
|
|
132
139
|
|
|
133
140
|
function buildQuery<T>(
|
|
134
141
|
client: PostgrestQueryBuilder<T, any>,
|
|
135
|
-
config: QueryConfig
|
|
142
|
+
config: QueryConfig,
|
|
136
143
|
) {
|
|
137
144
|
const { columns = "*", count } = config;
|
|
138
145
|
const opts = { count };
|
|
139
146
|
|
|
140
|
-
let
|
|
147
|
+
let cols: string;
|
|
148
|
+
if (Array.isArray(columns)) {
|
|
149
|
+
cols = columns.join(", ");
|
|
150
|
+
} else {
|
|
151
|
+
cols = columns ?? "*";
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
let query = client.select(cols, opts);
|
|
155
|
+
|
|
156
|
+
if (config.filter) {
|
|
157
|
+
query = config.filter(query);
|
|
158
|
+
}
|
|
141
159
|
|
|
142
160
|
if (config.order != null) {
|
|
143
161
|
query = query.order(config.order.key, {
|
|
@@ -163,7 +181,7 @@ function _loadMoreData<T>(
|
|
|
163
181
|
client: PostgrestQueryBuilder<T, any>,
|
|
164
182
|
config: QueryConfig & { chunkSize: number },
|
|
165
183
|
state: LazyLoaderState<T>,
|
|
166
|
-
dispatch: any
|
|
184
|
+
dispatch: any,
|
|
167
185
|
) {
|
|
168
186
|
const rowIndex = indexOfFirstNullInRegion(state.data, state.visibleRegion);
|
|
169
187
|
if (state.loading || rowIndex == null) {
|
|
@@ -217,12 +235,15 @@ const loadMoreData = debounce(_loadMoreData, 100);
|
|
|
217
235
|
type LazyLoaderOptions = Omit<QueryConfig, "count" | "offset" | "limit"> & {
|
|
218
236
|
chunkSize?: number;
|
|
219
237
|
sortKey?: string;
|
|
238
|
+
filter?: (
|
|
239
|
+
query: PostgrestFilterBuilder<any, any, any>,
|
|
240
|
+
) => PostgrestFilterBuilder<any, any, any>;
|
|
220
241
|
};
|
|
221
242
|
|
|
222
243
|
export function usePostgRESTLazyLoader(
|
|
223
244
|
endpoint: string,
|
|
224
245
|
table: string,
|
|
225
|
-
config: LazyLoaderOptions = {}
|
|
246
|
+
config: LazyLoaderOptions = {},
|
|
226
247
|
) {
|
|
227
248
|
const initialState: LazyLoaderState<any> = {
|
|
228
249
|
data: [],
|
|
@@ -247,14 +268,25 @@ export function usePostgRESTLazyLoader(
|
|
|
247
268
|
state.visibleRegion.rowIndexEnd,
|
|
248
269
|
]);
|
|
249
270
|
|
|
271
|
+
// Reference to hold onto the scroll position
|
|
272
|
+
const ref = useRef(null);
|
|
273
|
+
|
|
250
274
|
const onScroll = useCallback(
|
|
251
275
|
debounce((visibleCells: RowRegion) => {
|
|
276
|
+
if (
|
|
277
|
+
visibleCells.rowIndexEnd == ref.current?.rowIndexEnd &&
|
|
278
|
+
visibleCells.rowIndexStart == ref.current?.rowIndexStart
|
|
279
|
+
) {
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
console.log("Visible cells changed", visibleCells);
|
|
252
283
|
dispatch({
|
|
253
284
|
type: "set-visible",
|
|
254
285
|
region: visibleCells,
|
|
255
286
|
});
|
|
287
|
+
ref.current = visibleCells;
|
|
256
288
|
}, 500),
|
|
257
|
-
[dispatch]
|
|
289
|
+
[dispatch],
|
|
258
290
|
);
|
|
259
291
|
|
|
260
292
|
return {
|
|
@@ -269,14 +301,14 @@ export function usePostgRESTLazyLoader(
|
|
|
269
301
|
function getRowIndexToLoadFrom<T>(
|
|
270
302
|
data: (T | null)[],
|
|
271
303
|
visibleRegion: RowRegion,
|
|
272
|
-
chunkSize: number
|
|
304
|
+
chunkSize: number,
|
|
273
305
|
) {
|
|
274
306
|
return indexOfFirstNullInRegion(data, visibleRegion);
|
|
275
307
|
}
|
|
276
308
|
|
|
277
309
|
function indexOfFirstNullInRegion(
|
|
278
310
|
data: any[],
|
|
279
|
-
region: RowRegion
|
|
311
|
+
region: RowRegion,
|
|
280
312
|
): number | null {
|
|
281
313
|
for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {
|
|
282
314
|
if (data[i] == null) {
|
|
@@ -1,30 +1,53 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Toaster, HotkeysProvider } from "@blueprintjs/core";
|
|
2
2
|
import hyper from "@macrostrat/hyper";
|
|
3
3
|
import styles from "./main.module.sass";
|
|
4
|
-
import { DataSheet, ColorCell } from "../core"; //getRowsToDelete
|
|
5
|
-
import { LithologyTag } from "
|
|
4
|
+
import { DataSheet, ColorCell, getRowsToDelete } from "../core"; //getRowsToDelete
|
|
5
|
+
import { LithologyTag, Tag, TagSize } from "@macrostrat/data-components";
|
|
6
6
|
import { usePostgRESTLazyLoader } from "./data-loaders";
|
|
7
7
|
import { Spinner } from "@blueprintjs/core";
|
|
8
8
|
|
|
9
9
|
export * from "./data-loaders";
|
|
10
|
-
import { useCallback
|
|
11
|
-
import {
|
|
10
|
+
import { useCallback } from "react";
|
|
11
|
+
import {
|
|
12
|
+
ErrorBoundary,
|
|
13
|
+
ToasterContext,
|
|
14
|
+
useToaster,
|
|
15
|
+
} from "@macrostrat/ui-components";
|
|
12
16
|
import { Spec } from "immutability-helper";
|
|
13
17
|
import { DataSheetProviderProps } from "../provider";
|
|
18
|
+
import { PostgrestFilterBuilder } from "@supabase/postgrest-js";
|
|
19
|
+
import type {
|
|
20
|
+
GenericFunction,
|
|
21
|
+
GenericTable,
|
|
22
|
+
GenericView,
|
|
23
|
+
} from "@supabase/postgrest-js/dist/cjs/types";
|
|
14
24
|
|
|
15
25
|
const h = hyper.styled(styles);
|
|
16
26
|
|
|
17
|
-
|
|
27
|
+
export type GenericSchema = {
|
|
28
|
+
Tables: Record<string, GenericTable>;
|
|
29
|
+
Views: Record<string, GenericView>;
|
|
30
|
+
Functions: Record<string, GenericFunction>;
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
interface PostgRESTTableViewProps<T extends object>
|
|
34
|
+
extends DataSheetProviderProps<T> {
|
|
18
35
|
endpoint: string;
|
|
19
36
|
table: string;
|
|
20
37
|
columnOptions?: any;
|
|
21
38
|
order?: any;
|
|
22
39
|
columns?: string;
|
|
23
40
|
editable?: boolean;
|
|
41
|
+
filter(
|
|
42
|
+
query: PostgrestFilterBuilder<T, any, any>,
|
|
43
|
+
): PostgrestFilterBuilder<T, any, any>;
|
|
24
44
|
}
|
|
25
45
|
|
|
26
46
|
export function PostgRESTTableView<T>(props: PostgRESTTableViewProps<T>) {
|
|
27
|
-
return h(
|
|
47
|
+
return h(
|
|
48
|
+
ErrorBoundary,
|
|
49
|
+
h(HotkeysProvider, h(ToasterContext, h(_PostgRESTTableView, props))),
|
|
50
|
+
);
|
|
28
51
|
}
|
|
29
52
|
|
|
30
53
|
const successResponses = [200, 201];
|
|
@@ -36,6 +59,8 @@ function _PostgRESTTableView<T>({
|
|
|
36
59
|
order,
|
|
37
60
|
columns,
|
|
38
61
|
editable = false,
|
|
62
|
+
filter,
|
|
63
|
+
identityKey = "id",
|
|
39
64
|
...rest
|
|
40
65
|
}: PostgRESTTableViewProps<T>) {
|
|
41
66
|
const { data, onScroll, dispatch, client } = usePostgRESTLazyLoader(
|
|
@@ -44,37 +69,25 @@ function _PostgRESTTableView<T>({
|
|
|
44
69
|
{
|
|
45
70
|
order,
|
|
46
71
|
columns,
|
|
47
|
-
|
|
72
|
+
filter,
|
|
73
|
+
},
|
|
48
74
|
);
|
|
49
75
|
|
|
50
|
-
const
|
|
76
|
+
const toaster = useToaster();
|
|
51
77
|
|
|
52
78
|
const finishResponse = useCallback(
|
|
53
79
|
(promisedResult, changes) => {
|
|
54
|
-
promisedResult
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
let err = new Error(res.error.message);
|
|
59
|
-
err["status"] = res.status;
|
|
60
|
-
throw err;
|
|
61
|
-
}
|
|
62
|
-
|
|
80
|
+
wrapWithErrorHandling(toaster, promisedResult).then((res) => {
|
|
81
|
+
if (res == null) {
|
|
82
|
+
throw new Error("Could not complete action");
|
|
83
|
+
} else {
|
|
63
84
|
// Merge new data with old data
|
|
85
|
+
console.log("Updating data", changes);
|
|
64
86
|
dispatch({ type: "update-data", changes });
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
const status = err["status"];
|
|
68
|
-
toasterRef.current?.show({
|
|
69
|
-
message: h([
|
|
70
|
-
h.if(status != null)([h("code", status), " "]),
|
|
71
|
-
err.message,
|
|
72
|
-
]),
|
|
73
|
-
intent: "danger",
|
|
74
|
-
});
|
|
75
|
-
});
|
|
87
|
+
}
|
|
88
|
+
});
|
|
76
89
|
},
|
|
77
|
-
[dispatch]
|
|
90
|
+
[dispatch, toaster],
|
|
78
91
|
);
|
|
79
92
|
|
|
80
93
|
if (data == null) {
|
|
@@ -82,7 +95,6 @@ function _PostgRESTTableView<T>({
|
|
|
82
95
|
}
|
|
83
96
|
|
|
84
97
|
return h("div.data-sheet-outer", [
|
|
85
|
-
h(OverlayToaster, { usePortal: false, ref: toasterRef }),
|
|
86
98
|
h(DataSheet, {
|
|
87
99
|
...rest,
|
|
88
100
|
data,
|
|
@@ -92,13 +104,15 @@ function _PostgRESTTableView<T>({
|
|
|
92
104
|
onDeleteRows(selection) {
|
|
93
105
|
if (!editable) return;
|
|
94
106
|
|
|
95
|
-
const rowIndices =
|
|
107
|
+
const rowIndices = getRowsToDelete(selection);
|
|
96
108
|
|
|
97
|
-
const ids = rowIndices.map((i) => data[i]
|
|
109
|
+
const ids = rowIndices.map((i) => data[i][identityKey]);
|
|
98
110
|
|
|
99
111
|
dispatch({ type: "start-loading" });
|
|
100
112
|
|
|
101
|
-
|
|
113
|
+
let query = client.delete().in(identityKey, ids);
|
|
114
|
+
|
|
115
|
+
query = filter?.(query) ?? query;
|
|
102
116
|
|
|
103
117
|
finishResponse(query, { $delete: Array.from(rowIndices.keys()) });
|
|
104
118
|
},
|
|
@@ -118,7 +132,9 @@ function _PostgRESTTableView<T>({
|
|
|
118
132
|
dispatch({ type: "start-loading" });
|
|
119
133
|
|
|
120
134
|
// Save data
|
|
121
|
-
|
|
135
|
+
let query = client.upsert(updateRows, { defaultToNull: false });
|
|
136
|
+
|
|
137
|
+
query = filter?.(query) ?? query;
|
|
122
138
|
|
|
123
139
|
finishResponse(query, changes);
|
|
124
140
|
},
|
|
@@ -126,6 +142,52 @@ function _PostgRESTTableView<T>({
|
|
|
126
142
|
]);
|
|
127
143
|
}
|
|
128
144
|
|
|
145
|
+
export function notifyOnError(toaster: Toaster, error: any) {
|
|
146
|
+
console.error(error);
|
|
147
|
+
const { message, status, code, details } = error;
|
|
148
|
+
|
|
149
|
+
let errorDetails = null;
|
|
150
|
+
|
|
151
|
+
if (details != null) {
|
|
152
|
+
if (typeof details === "string") {
|
|
153
|
+
errorDetails = h("p.error-details", details);
|
|
154
|
+
} else {
|
|
155
|
+
errorDetails = h("div.error-details", [
|
|
156
|
+
h("h4", "Error details"),
|
|
157
|
+
h("pre", JSON.stringify(details, null, 2)),
|
|
158
|
+
]);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
toaster.show({
|
|
163
|
+
message: h([
|
|
164
|
+
h.if(status != null)([h("code.bp5-code", status), " "]),
|
|
165
|
+
h.if(code != null)([h("code.bp5-code", code), " "]),
|
|
166
|
+
message ?? "An error occurred",
|
|
167
|
+
errorDetails,
|
|
168
|
+
]),
|
|
169
|
+
intent: "danger",
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
export function wrapWithErrorHandling<T = any>(
|
|
174
|
+
toaster: Toaster,
|
|
175
|
+
fnPromise: Promise<T>,
|
|
176
|
+
): Promise<T | null> {
|
|
177
|
+
return fnPromise
|
|
178
|
+
.then((p) => {
|
|
179
|
+
if (p.error != null) {
|
|
180
|
+
// Rethrow error
|
|
181
|
+
throw p.error;
|
|
182
|
+
}
|
|
183
|
+
return p;
|
|
184
|
+
})
|
|
185
|
+
.catch((err) => {
|
|
186
|
+
notifyOnError(toaster, err);
|
|
187
|
+
return null;
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
|
|
129
191
|
export function LongTextViewer({ value, onChange }) {
|
|
130
192
|
return h("div.long-text", value);
|
|
131
193
|
}
|
|
@@ -135,9 +197,10 @@ export function IntervalCell({ value, children, ...rest }) {
|
|
|
135
197
|
}
|
|
136
198
|
|
|
137
199
|
export function lithologyRenderer(value) {
|
|
138
|
-
return h(
|
|
139
|
-
|
|
140
|
-
|
|
200
|
+
return h(
|
|
201
|
+
"span.tag-cell-content.liths",
|
|
202
|
+
value?.map((d) => h(LithologyTag, { data: d, key: d.id })),
|
|
203
|
+
);
|
|
141
204
|
}
|
|
142
205
|
|
|
143
206
|
export function ExpandedLithologies({ value, onChange }) {
|
|
@@ -153,20 +216,16 @@ export function ExpandedLithologies({ value, onChange }) {
|
|
|
153
216
|
h(
|
|
154
217
|
"td.basis-col",
|
|
155
218
|
d.basis_col?.map((d) => {
|
|
156
|
-
return h(Tag, {
|
|
219
|
+
return h(Tag, { size: TagSize.Small, key: d }, [
|
|
157
220
|
h("span.tag-header", "Column"),
|
|
158
221
|
" ",
|
|
159
222
|
h("code", d),
|
|
160
223
|
]);
|
|
161
|
-
})
|
|
224
|
+
}),
|
|
162
225
|
),
|
|
163
226
|
]);
|
|
164
|
-
})
|
|
227
|
+
}),
|
|
165
228
|
),
|
|
166
229
|
]),
|
|
167
230
|
]);
|
|
168
231
|
}
|
|
169
|
-
|
|
170
|
-
function addJoiner(arr) {
|
|
171
|
-
return arr?.reduce((acc, curr) => [acc, " ", curr]);
|
|
172
|
-
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
border-radius: 0.5em
|
|
6
6
|
|
|
7
7
|
.inline-lithology .lithology
|
|
8
|
-
line-height:
|
|
8
|
+
line-height: 1em
|
|
9
9
|
|
|
10
10
|
.basis-panel
|
|
11
11
|
:global(.bp5-tag)
|
|
@@ -41,12 +41,14 @@
|
|
|
41
41
|
.basis-col
|
|
42
42
|
max-width: 15em
|
|
43
43
|
|
|
44
|
-
.liths
|
|
45
|
-
|
|
46
|
-
min-height: 16px
|
|
44
|
+
.liths>*
|
|
45
|
+
margin-right: 0.5em
|
|
47
46
|
|
|
48
47
|
.data-sheet-outer
|
|
49
48
|
position: relative
|
|
50
49
|
flex: 1
|
|
51
50
|
display: flex
|
|
52
51
|
min-height: 0
|
|
52
|
+
|
|
53
|
+
.tag-cell-content
|
|
54
|
+
line-height: 1
|