@macrostrat/data-sheet 2.0.2 → 2.1.1

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