@macrostrat/data-sheet 4.0.0-dev2 → 4.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.
Files changed (212) hide show
  1. package/CHANGELOG.md +66 -0
  2. package/README.md +44 -0
  3. package/dist/actions/builtin.cjs +36 -5
  4. package/dist/actions/builtin.cjs.map +1 -1
  5. package/dist/actions/builtin.d.ts +3 -2
  6. package/dist/actions/builtin.js +36 -5
  7. package/dist/actions/builtin.js.map +1 -1
  8. package/dist/actions/column-controls.cjs +149 -0
  9. package/dist/actions/column-controls.cjs.map +1 -0
  10. package/dist/actions/column-controls.d.ts +11 -0
  11. package/dist/actions/column-controls.js +147 -0
  12. package/dist/actions/column-controls.js.map +1 -0
  13. package/dist/actions/column-filter.cjs +68 -0
  14. package/dist/actions/column-filter.cjs.map +1 -0
  15. package/dist/actions/column-filter.d.ts +11 -0
  16. package/dist/actions/column-filter.js +66 -0
  17. package/dist/actions/column-filter.js.map +1 -0
  18. package/dist/actions/edit-actions.cjs +42 -0
  19. package/dist/actions/edit-actions.cjs.map +1 -0
  20. package/dist/actions/edit-actions.d.ts +14 -0
  21. package/dist/actions/edit-actions.js +42 -0
  22. package/dist/actions/edit-actions.js.map +1 -0
  23. package/dist/actions/filters.cjs +39 -23
  24. package/dist/actions/filters.cjs.map +1 -1
  25. package/dist/actions/filters.d.ts +6 -3
  26. package/dist/actions/filters.js +41 -25
  27. package/dist/actions/filters.js.map +1 -1
  28. package/dist/actions/index.d.ts +4 -0
  29. package/dist/actions/selection.cjs +39 -30
  30. package/dist/actions/selection.cjs.map +1 -1
  31. package/dist/actions/selection.d.ts +3 -7
  32. package/dist/actions/selection.js +39 -30
  33. package/dist/actions/selection.js.map +1 -1
  34. package/dist/actions/table-controls.cjs +41 -0
  35. package/dist/actions/table-controls.cjs.map +1 -0
  36. package/dist/actions/table-controls.d.ts +4 -0
  37. package/dist/actions/table-controls.js +39 -0
  38. package/dist/actions/table-controls.js.map +1 -0
  39. package/dist/actions/toolbar.cjs +69 -10
  40. package/dist/actions/toolbar.cjs.map +1 -1
  41. package/dist/actions/toolbar.d.ts +9 -6
  42. package/dist/actions/toolbar.js +69 -10
  43. package/dist/actions/toolbar.js.map +1 -1
  44. package/dist/actions/toolbar.module.sass.cjs +12 -7
  45. package/dist/actions/toolbar.module.sass.cjs.map +1 -1
  46. package/dist/actions/toolbar.module.sass.js +12 -7
  47. package/dist/actions/toolbar.module.sass.js.map +1 -1
  48. package/dist/actions/types.d.ts +49 -4
  49. package/dist/cell-renderer.cjs +150 -14
  50. package/dist/cell-renderer.cjs.map +1 -1
  51. package/dist/cell-renderer.d.ts +1 -1
  52. package/dist/cell-renderer.js +151 -15
  53. package/dist/cell-renderer.js.map +1 -1
  54. package/dist/components/cell-detail.cjs +24 -0
  55. package/dist/components/cell-detail.cjs.map +1 -0
  56. package/dist/components/cell-detail.d.ts +12 -0
  57. package/dist/components/cell-detail.js +24 -0
  58. package/dist/components/cell-detail.js.map +1 -0
  59. package/dist/components/editor-popup.cjs +28 -24
  60. package/dist/components/editor-popup.cjs.map +1 -1
  61. package/dist/components/editor-popup.js +29 -25
  62. package/dist/components/editor-popup.js.map +1 -1
  63. package/dist/components/index.d.ts +2 -2
  64. package/dist/components/text-areas.cjs +51 -7
  65. package/dist/components/text-areas.cjs.map +1 -1
  66. package/dist/components/text-areas.d.ts +4 -1
  67. package/dist/components/text-areas.js +51 -7
  68. package/dist/components/text-areas.js.map +1 -1
  69. package/dist/components/view-info.cjs +46 -9
  70. package/dist/components/view-info.cjs.map +1 -1
  71. package/dist/components/view-info.d.ts +5 -1
  72. package/dist/components/view-info.js +47 -10
  73. package/dist/components/view-info.js.map +1 -1
  74. package/dist/core.cjs +167 -73
  75. package/dist/core.cjs.map +1 -1
  76. package/dist/core.d.ts +53 -6
  77. package/dist/core.js +169 -75
  78. package/dist/core.js.map +1 -1
  79. package/dist/data-sheet.css +72 -123
  80. package/dist/filters/operators.cjs +91 -0
  81. package/dist/filters/operators.cjs.map +1 -0
  82. package/dist/filters/operators.d.ts +17 -0
  83. package/dist/filters/operators.js +91 -0
  84. package/dist/filters/operators.js.map +1 -0
  85. package/dist/index.cjs +38 -10
  86. package/dist/index.cjs.map +1 -1
  87. package/dist/index.d.ts +2 -0
  88. package/dist/index.js +44 -16
  89. package/dist/index.js.map +1 -1
  90. package/dist/main.module.sass.cjs +13 -12
  91. package/dist/main.module.sass.cjs.map +1 -1
  92. package/dist/main.module.sass.js +13 -12
  93. package/dist/main.module.sass.js.map +1 -1
  94. package/dist/postgrest-table/data-loaders.cjs +255 -146
  95. package/dist/postgrest-table/data-loaders.cjs.map +1 -1
  96. package/dist/postgrest-table/data-loaders.d.ts +144 -46
  97. package/dist/postgrest-table/data-loaders.js +259 -150
  98. package/dist/postgrest-table/data-loaders.js.map +1 -1
  99. package/dist/postgrest-table/index.cjs +58 -169
  100. package/dist/postgrest-table/index.cjs.map +1 -1
  101. package/dist/postgrest-table/index.d.ts +5 -2
  102. package/dist/postgrest-table/index.js +63 -174
  103. package/dist/postgrest-table/index.js.map +1 -1
  104. package/dist/postgrest-table/loading-utils.cjs +0 -4
  105. package/dist/postgrest-table/loading-utils.cjs.map +1 -1
  106. package/dist/postgrest-table/loading-utils.js +1 -5
  107. package/dist/postgrest-table/loading-utils.js.map +1 -1
  108. package/dist/postgrest-table/main.module.sass.cjs +14 -13
  109. package/dist/postgrest-table/main.module.sass.cjs.map +1 -1
  110. package/dist/postgrest-table/main.module.sass.js +14 -13
  111. package/dist/postgrest-table/main.module.sass.js.map +1 -1
  112. package/dist/provider.cjs +68 -11
  113. package/dist/provider.cjs.map +1 -1
  114. package/dist/provider.d.ts +25 -0
  115. package/dist/provider.js +68 -11
  116. package/dist/provider.js.map +1 -1
  117. package/dist/renderers/column-header-cell.cjs +95 -75
  118. package/dist/renderers/column-header-cell.cjs.map +1 -1
  119. package/dist/renderers/column-header-cell.d.ts +3 -18
  120. package/dist/renderers/column-header-cell.js +98 -78
  121. package/dist/renderers/column-header-cell.js.map +1 -1
  122. package/dist/renderers/index.d.ts +0 -1
  123. package/dist/types.cjs +2 -0
  124. package/dist/types.cjs.map +1 -1
  125. package/dist/types.d.ts +84 -1
  126. package/dist/types.js +2 -0
  127. package/dist/types.js.map +1 -1
  128. package/dist/utils/column-spec.cjs.map +1 -1
  129. package/dist/utils/column-spec.d.ts +101 -1
  130. package/dist/utils/column-spec.js.map +1 -1
  131. package/dist/utils/debug-overlay.cjs +24 -0
  132. package/dist/utils/debug-overlay.cjs.map +1 -0
  133. package/dist/utils/debug-overlay.d.ts +4 -0
  134. package/dist/utils/debug-overlay.js +24 -0
  135. package/dist/utils/debug-overlay.js.map +1 -0
  136. package/dist/utils/index.cjs.map +1 -1
  137. package/dist/utils/index.d.ts +2 -0
  138. package/dist/utils/index.js.map +1 -1
  139. package/dist/utils/key-handling.cjs +52 -6
  140. package/dist/utils/key-handling.cjs.map +1 -1
  141. package/dist/utils/key-handling.js +52 -6
  142. package/dist/utils/key-handling.js.map +1 -1
  143. package/dist/utils/validation.cjs +41 -0
  144. package/dist/utils/validation.cjs.map +1 -0
  145. package/dist/utils/validation.d.ts +26 -0
  146. package/dist/utils/validation.js +41 -0
  147. package/dist/utils/validation.js.map +1 -0
  148. package/dist/zustand-store.cjs +119 -61
  149. package/dist/zustand-store.cjs.map +1 -1
  150. package/dist/zustand-store.js +121 -63
  151. package/dist/zustand-store.js.map +1 -1
  152. package/package.json +6 -6
  153. package/src/actions/builtin.ts +62 -7
  154. package/src/actions/column-controls.ts +185 -0
  155. package/src/actions/column-filter.ts +104 -0
  156. package/src/actions/edit-actions.ts +67 -0
  157. package/src/actions/filters.ts +54 -28
  158. package/src/actions/index.ts +4 -0
  159. package/src/actions/selection.ts +59 -52
  160. package/src/actions/table-controls.ts +46 -0
  161. package/src/actions/toolbar.module.sass +22 -2
  162. package/src/actions/toolbar.ts +113 -16
  163. package/src/actions/types.ts +49 -4
  164. package/src/cell-renderer.ts +211 -16
  165. package/src/components/cell-detail.ts +30 -0
  166. package/src/components/editor-popup.ts +39 -25
  167. package/src/components/index.ts +2 -2
  168. package/src/components/text-areas.ts +80 -16
  169. package/src/components/view-info.ts +63 -4
  170. package/src/core.ts +321 -103
  171. package/src/filters/operators.ts +127 -0
  172. package/src/index.ts +2 -0
  173. package/src/main.module.sass +6 -0
  174. package/src/postgrest-table/data-loaders.ts +459 -209
  175. package/src/postgrest-table/index.ts +81 -254
  176. package/src/postgrest-table/main.module.sass +11 -0
  177. package/src/provider.ts +109 -12
  178. package/src/renderers/column-header-cell.ts +60 -272
  179. package/src/renderers/index.ts +0 -1
  180. package/src/types.ts +76 -2
  181. package/src/utils/column-spec.ts +112 -1
  182. package/src/utils/debug-overlay.ts +22 -0
  183. package/src/utils/index.ts +2 -0
  184. package/src/utils/key-handling.ts +70 -6
  185. package/src/utils/validation.ts +72 -0
  186. package/src/zustand-store.ts +167 -60
  187. package/dist/components/actions.cjs +0 -12
  188. package/dist/components/actions.cjs.map +0 -1
  189. package/dist/components/actions.d.ts +0 -2
  190. package/dist/components/actions.js +0 -12
  191. package/dist/components/actions.js.map +0 -1
  192. package/dist/components/actions.module.sass.cjs +0 -12
  193. package/dist/components/actions.module.sass.cjs.map +0 -1
  194. package/dist/components/actions.module.sass.js +0 -11
  195. package/dist/components/actions.module.sass.js.map +0 -1
  196. package/dist/postgrest-table/lazy-loader-table.cjs +0 -27
  197. package/dist/postgrest-table/lazy-loader-table.cjs.map +0 -1
  198. package/dist/postgrest-table/lazy-loader-table.d.ts +0 -3
  199. package/dist/postgrest-table/lazy-loader-table.js +0 -27
  200. package/dist/postgrest-table/lazy-loader-table.js.map +0 -1
  201. package/dist/renderers/column-header-cell-postgrest.cjs +0 -216
  202. package/dist/renderers/column-header-cell-postgrest.cjs.map +0 -1
  203. package/dist/renderers/column-header-cell-postgrest.d.ts +0 -13
  204. package/dist/renderers/column-header-cell-postgrest.js +0 -216
  205. package/dist/renderers/column-header-cell-postgrest.js.map +0 -1
  206. package/dist/renderers/column-header-cell-postgrest.module.sass.cjs +0 -23
  207. package/dist/renderers/column-header-cell-postgrest.module.sass.cjs.map +0 -1
  208. package/dist/renderers/column-header-cell-postgrest.module.sass.js +0 -22
  209. package/dist/renderers/column-header-cell-postgrest.module.sass.js.map +0 -1
  210. package/src/components/actions.ts +0 -9
  211. package/src/postgrest-table/lazy-loader-table.ts +0 -25
  212. package/src/renderers/column-header-cell-postgrest.ts +0 -282
@@ -1,16 +1,23 @@
1
- import { InputGroup, Tag as Tag$1, Button } from "@blueprintjs/core";
1
+ import { InputGroup } from "@blueprintjs/core";
2
2
  import h from "./main.module.sass.js";
3
- import { DataSheet, getRowsToDelete } from "../core.js";
3
+ import { DataSheet } from "../core.js";
4
4
  import { LithologyTag, Tag, TagSize } from "@macrostrat/data-components";
5
- import { standardizeFilter, usePostgRESTLazyLoader } from "./data-loaders.js";
6
- import { applyColumnFilters, useScrollHandler, useTestLazyLoader, viewInfoAtom } from "./data-loaders.js";
7
- import { useState, useCallback, useMemo } from "react";
8
- import { ErrorBoundary, ToasterContext, useToaster } from "@macrostrat/ui-components";
5
+ import { dataRefreshTokenAtom, createPostgRESTProvider } from "./data-loaders.js";
6
+ import { applyColumnFilters, chunkPageAtom, compareRowsBySorts, createLocalProvider, createPostgRESTFetchChunk, standardizeFilter, tableFooterAtom, useDataLoader, useScrollHandler, viewInfoAtom } from "./data-loaders.js";
7
+ import { useCallback, useMemo, useRef, useEffect } from "react";
8
+ import { ErrorBoundary, ToasterContext } from "@macrostrat/ui-components";
9
9
  import { atom } from "jotai";
10
10
  import { ctx, columnSpecAtom } from "../provider.js";
11
- import { RegionCardinality } from "@blueprintjs/table";
11
+ import { ALL_CARDINALITIES } from "../actions/edit-actions.js";
12
12
  import { ColorCell } from "../components/colors.js";
13
- import { renderPostgRESTColumnHeaderCell, OPERATOR_LABELS } from "../renderers/column-header-cell-postgrest.js";
13
+ const fullTextSearchAction = {
14
+ id: "full-text-search",
15
+ name: "Search",
16
+ icon: "search",
17
+ targets: ALL_CARDINALITIES,
18
+ requiresEditable: false,
19
+ render: () => h(SearchAction)
20
+ };
14
21
  function PostgRESTTableView(props) {
15
22
  return h(
16
23
  ErrorBoundary,
@@ -51,27 +58,19 @@ function _PostgRESTTableView({
51
58
  columns,
52
59
  editable = false,
53
60
  enableFullTableSearch = false,
54
- dataSheetActions,
61
+ actions,
55
62
  identityKey = null,
63
+ filter: userFilter,
56
64
  ...rest
57
65
  }) {
58
66
  ctx.useSync(enableFullTextSearchAtom, enableFullTableSearch);
59
- const [columnSorts, setColumnSorts] = useState([]);
60
- const [columnFilters, setColumnFilters] = useState(
61
- []
62
- );
63
- const ftsFilter = buildFilter(ctx.useValue(fullTextSearchFilterConfigAtom));
64
- let filters = columnFilters.map(standardizeFilter);
65
- if (ftsFilter != null) {
66
- filters.push(ftsFilter);
67
- }
67
+ const ftsConfig = ctx.useValue(fullTextSearchFilterConfigAtom);
68
68
  const _order = [];
69
69
  if (typeof order === "object" && "key" in order) {
70
70
  _order.push(order);
71
71
  } else if (Array.isArray(order)) {
72
72
  _order.push(...order);
73
73
  }
74
- _order.push(...columnSorts);
75
74
  let _identityKey = identityKey;
76
75
  if (_identityKey == null) {
77
76
  if (_order.length == 0) {
@@ -80,119 +79,47 @@ function _PostgRESTTableView({
80
79
  _identityKey = _order[0].key;
81
80
  }
82
81
  }
83
- const { data, dispatch: dispatch2, getClient: getClient2 } = usePostgRESTLazyLoader(
84
- endpoint,
85
- table,
86
- {
87
- order: _order,
88
- columns,
89
- filters,
90
- identityKey: _identityKey
91
- }
92
- );
93
- const toaster = useToaster();
94
- const finishResponse = useCallback(
95
- (promisedResult, changes) => {
96
- wrapWithErrorHandling(toaster, promisedResult).then((res) => {
97
- if (res == null) {
98
- throw new Error("Could not complete action");
99
- } else {
100
- console.log("Updating data", changes);
101
- dispatch2({ type: "update-data", changes });
102
- }
103
- });
82
+ const bumpRefresh = ctx.useSet(dataRefreshTokenAtom);
83
+ const baseFilter = useCallback(
84
+ (q) => {
85
+ let query = q;
86
+ if (userFilter != null) query = userFilter(query);
87
+ const ff = buildFilter(ftsConfig);
88
+ if (ff != null) query = ff.apply(query);
89
+ return query;
104
90
  },
105
- [dispatch2, toaster]
91
+ [userFilter, ftsConfig]
106
92
  );
107
- const columnHeaderActions = useMemo(
108
- () => ({
109
- onSetSort(key, ascending) {
110
- if (ascending == null) {
111
- setColumnSorts([]);
112
- } else {
113
- setColumnSorts([{ key, ascending }]);
114
- }
115
- },
116
- onSetFilter(key, operator, value) {
117
- setColumnFilters((prev) => {
118
- const without = prev.filter((f) => f.key !== key);
119
- if (operator == null || value === "") return without;
120
- return [...without, { key, operator, value }];
121
- });
122
- },
123
- onClearColumn(key) {
124
- setColumnSorts((prev) => prev.filter((s) => s.key !== key));
125
- setColumnFilters((prev) => prev.filter((f) => f.key !== key));
126
- }
93
+ const orderKey = JSON.stringify(_order);
94
+ const provider = useMemo(
95
+ () => createPostgRESTProvider({
96
+ endpoint,
97
+ table,
98
+ columns,
99
+ identityKey: _identityKey,
100
+ baseOrder: _order,
101
+ baseFilter
127
102
  }),
128
- []
129
- );
130
- const columnHeaderCellRenderer = useCallback(
131
- (props) => {
132
- const { col, colIndex } = props;
133
- const activeSort = columnSorts.find((s) => s.key === col.key);
134
- const activeFilter = columnFilters.find((f) => f.key === col.key);
135
- return renderPostgRESTColumnHeaderCell({
136
- col,
137
- activeSort,
138
- activeFilter,
139
- actions: columnHeaderActions
140
- });
141
- },
142
- [columnSorts, columnFilters, columnHeaderActions]
143
- );
144
- const hasActiveFilters = columnFilters.length > 0;
145
- const hasActiveSort = columnSorts.length > 0;
146
- return h(
147
- DataSheet,
148
- {
149
- ...rest,
150
- dataSheetActions: enableFullTableSearch ? h(SearchAction) : dataSheetActions,
151
- columnSpecOptions: columnOptions,
152
- editable,
153
- columnHeaderCellRenderer,
154
- onDeleteRows(selection) {
155
- if (!editable) return;
156
- const rowIndices = getRowsToDelete(selection);
157
- const ids = rowIndices.map((i) => data[i][identityKey]);
158
- dispatch2({ type: "start-loading" });
159
- const client = getClient2();
160
- let query = client.delete().in(identityKey, ids);
161
- finishResponse(query, { $delete: Array.from(rowIndices.keys()) });
162
- },
163
- onSaveData(updates, data2) {
164
- if (!editable) return;
165
- let changes = {};
166
- let updateRows = [];
167
- for (let [key, update] of Object.entries(updates)) {
168
- const value = { ...data2[key], ...update };
169
- updateRows.push(value);
170
- changes[key] = { $set: value };
171
- }
172
- dispatch2({ type: "start-loading" });
173
- const client = getClient2();
174
- let query = client.upsert(updateRows, { defaultToNull: false });
175
- finishResponse(query, changes);
176
- }
177
- },
178
- [
179
- h.if(hasActiveFilters || hasActiveSort)(ServerFilterBar, {
180
- columnSorts,
181
- columnFilters,
182
- onClearFilter(key) {
183
- columnHeaderActions.onClearColumn(key);
184
- },
185
- onClearAll() {
186
- setColumnSorts([]);
187
- setColumnFilters([]);
188
- }
189
- })
190
- ]
103
+ // eslint-disable-next-line react-hooks/exhaustive-deps
104
+ [endpoint, table, columns, _identityKey, orderKey, baseFilter]
191
105
  );
106
+ const firstRun = useRef(true);
107
+ useEffect(() => {
108
+ if (firstRun.current) {
109
+ firstRun.current = false;
110
+ return;
111
+ }
112
+ bumpRefresh((v) => v + 1);
113
+ }, [ftsConfig]);
114
+ const mergedActions = enableFullTableSearch ? [fullTextSearchAction, ...actions ?? []] : actions;
115
+ return h(DataSheet, {
116
+ ...rest,
117
+ provider,
118
+ actions: mergedActions,
119
+ columnSpecOptions: columnOptions,
120
+ editable
121
+ });
192
122
  }
193
- ({
194
- targets: [RegionCardinality.FULL_TABLE]
195
- });
196
123
  function notifyOnError(toaster, error) {
197
124
  console.error(error);
198
125
  const { message, status, code, details } = error;
@@ -278,51 +205,6 @@ function SearchAction() {
278
205
  }
279
206
  });
280
207
  }
281
- function ServerFilterBar({
282
- columnSorts,
283
- columnFilters,
284
- onClearFilter,
285
- onClearAll
286
- }) {
287
- return h("div.server-filter-bar", [
288
- columnSorts.map(
289
- (s) => h(
290
- Tag$1,
291
- {
292
- key: `sort-${s.key}`,
293
- icon: s.ascending ? "sort-asc" : "sort-desc",
294
- intent: "primary",
295
- onRemove: () => onClearFilter(s.key),
296
- minimal: true
297
- },
298
- `${s.key}: ${s.ascending ? "A→Z" : "Z→A"}`
299
- )
300
- ),
301
- columnFilters.map(
302
- (f) => h(
303
- Tag$1,
304
- {
305
- key: `filter-${f.key}`,
306
- icon: "filter",
307
- intent: "warning",
308
- onRemove: () => onClearFilter(f.key),
309
- minimal: true
310
- },
311
- `${f.key} ${OPERATOR_LABELS[f.operator] ?? f.operator} ${f.value}`
312
- )
313
- ),
314
- h(
315
- Button,
316
- {
317
- minimal: true,
318
- small: true,
319
- icon: "cross",
320
- onClick: onClearAll
321
- },
322
- "Clear all"
323
- )
324
- ]);
325
- }
326
208
  export {
327
209
  ExpandedLithologies,
328
210
  IntervalCell,
@@ -330,12 +212,19 @@ export {
330
212
  PostgRESTTableView,
331
213
  SearchAction,
332
214
  applyColumnFilters,
215
+ chunkPageAtom,
216
+ compareRowsBySorts,
217
+ createLocalProvider,
218
+ createPostgRESTFetchChunk,
219
+ createPostgRESTProvider,
220
+ dataRefreshTokenAtom,
221
+ fullTextSearchAction,
333
222
  lithologyRenderer,
334
223
  notifyOnError,
335
224
  standardizeFilter,
336
- usePostgRESTLazyLoader,
225
+ tableFooterAtom,
226
+ useDataLoader,
337
227
  useScrollHandler,
338
- useTestLazyLoader,
339
228
  viewInfoAtom,
340
229
  wrapWithErrorHandling
341
230
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":["../../src/postgrest-table/index.ts"],"sourcesContent":["import {\n Button,\n InputGroup,\n OverlayToaster,\n Tag as BPTag,\n} from \"@blueprintjs/core\";\nimport h from \"./main.module.sass\";\nimport { DataSheet, getRowsToDelete } from \"../core\";\nimport { LithologyTag, Tag, TagSize } from \"@macrostrat/data-components\";\nimport {\n ColumnSortEntry,\n PostgrestColumnFilter,\n PostgrestFilter,\n PostgrestFilterOperator,\n PostgrestOrder,\n standardizeFilter,\n usePostgRESTLazyLoader,\n} from \"./data-loaders\";\nimport { useCallback, useMemo, useState } from \"react\";\nimport {\n ErrorBoundary,\n ToasterContext,\n useToaster,\n} from \"@macrostrat/ui-components\";\nimport { Spec } from \"immutability-helper\";\nimport { PostgrestFilterBuilder } from \"@supabase/postgrest-js\";\nimport { ColorCell, InfoBar } from \"../components\";\nimport { DataSheetProviderProps } from \"../types.ts\";\nimport {\n type ColumnHeaderActions,\n ColumnHeaderRendererProps,\n OPERATOR_LABELS,\n renderPostgRESTColumnHeaderCell,\n} from \"../renderers\";\nimport { atom } from \"jotai\";\nimport { columnSpecAtom, ctx } from \"../provider.ts\";\nimport { TableAction } from \"../actions\";\nimport { RegionCardinality } from \"@blueprintjs/table\";\n\nexport * from \"./data-loaders\";\nexport * from \"./lazy-loader-table\";\n\ninterface PostgRESTTableViewProps<\n T extends object,\n> extends DataSheetProviderProps<T> {\n endpoint: string;\n table: string;\n columnOptions?: any;\n order?: PostgrestOrder<T> | PostgrestOrder<any>[];\n columns?: string;\n editable?: boolean;\n identityKey?: string;\n enableFullTableSearch?: boolean;\n dataSheetActions?: any;\n filter(\n query: PostgrestFilterBuilder<T, any, any, any>,\n ): PostgrestFilterBuilder<T, any, any, any>;\n}\n\nexport function PostgRESTTableView<T>(props: PostgRESTTableViewProps<T>) {\n return h(\n ErrorBoundary,\n h(ctx.Provider, h(ToasterContext, h(_PostgRESTTableView, props))),\n );\n}\n\nconst successResponses = [200, 201];\n\nconst enableFullTextSearchAtom = atom(false);\n\nconst fullTextSearchInputAtom = atom(\"\");\n\ninterface FtsFilterConfig {\n text: string;\n columns: string[];\n}\n\nconst fullTextSearchFilterConfigAtom = atom<FtsFilterConfig | null>((get) => {\n const enable = get(enableFullTextSearchAtom);\n const searchText = get(fullTextSearchInputAtom).toLowerCase();\n console.log(\"Full text search\", enable, searchText);\n if (!enable || searchText.length < 3) return null;\n const columnSpec = get(columnSpecAtom);\n\n const columns = columnSpec\n .filter((d) => d.dataType == \"text\")\n .map((d) => d.key);\n\n return {\n text: searchText,\n columns,\n } as FtsFilterConfig;\n});\n\nfunction buildFilter(cfg: FtsFilterConfig | null): PostgrestFilter | null {\n if (cfg == null) return null;\n return {\n type: \"filter\",\n id: `fts-${cfg.text}`,\n apply(res) {\n const _filters = cfg.columns.map((d) => `${d}.ilike.*${cfg.text}*`);\n const filters = _filters.join(\",\");\n return res.or(filters);\n },\n };\n}\n\nfunction _PostgRESTTableView<T>({\n endpoint,\n table,\n columnOptions,\n order,\n columns,\n editable = false,\n enableFullTableSearch = false,\n dataSheetActions,\n identityKey = null,\n ...rest\n}: PostgRESTTableViewProps<T>) {\n // Boundary of Jotai store\n ctx.useSync(enableFullTextSearchAtom, enableFullTableSearch);\n\n // Server-side column sort/filter state\n const [columnSorts, setColumnSorts] = useState<ColumnSortEntry[]>([]);\n const [columnFilters, setColumnFilters] = useState<PostgrestColumnFilter[]>(\n [],\n );\n\n /** TODO: remove \"full-text search\" from filter options */\n const ftsFilter = buildFilter(ctx.useValue(fullTextSearchFilterConfigAtom));\n let filters = columnFilters.map(standardizeFilter);\n if (ftsFilter != null) {\n filters.push(ftsFilter);\n }\n\n const _order = [];\n if (typeof order === \"object\" && \"key\" in order) {\n _order.push(order);\n } else if (Array.isArray(order)) {\n _order.push(...order);\n }\n _order.push(...columnSorts);\n\n // Infer identity key\n let _identityKey = identityKey;\n if (_identityKey == null) {\n if (_order.length == 0) {\n throw \"Must specify identity key or order by column\";\n } else {\n _identityKey = _order[0].key;\n }\n }\n\n const { data, dispatch, getClient } = usePostgRESTLazyLoader(\n endpoint,\n table,\n {\n order: _order,\n columns,\n filters,\n identityKey: _identityKey,\n },\n );\n\n const toaster = useToaster();\n\n const finishResponse = useCallback(\n (promisedResult, changes) => {\n wrapWithErrorHandling(toaster, promisedResult).then((res) => {\n if (res == null) {\n throw new Error(\"Could not complete action\");\n } else {\n // Merge new data with old data\n console.log(\"Updating data\", changes);\n dispatch({ type: \"update-data\", changes });\n }\n });\n },\n [dispatch, toaster],\n );\n\n // Column header actions for sort/filter\n const columnHeaderActions: ColumnHeaderActions = useMemo(\n () => ({\n onSetSort(key: string, ascending: boolean | null) {\n // Single-column sort: replace any existing sort\n if (ascending == null) {\n setColumnSorts([]);\n } else {\n setColumnSorts([{ key, ascending }]);\n }\n },\n onSetFilter(\n key: string,\n operator: PostgrestFilterOperator | null,\n value: string,\n ) {\n setColumnFilters((prev) => {\n const without = prev.filter((f) => f.key !== key);\n if (operator == null || value === \"\") return without;\n return [...without, { key, operator, value }];\n });\n },\n onClearColumn(key: string) {\n setColumnSorts((prev) => prev.filter((s) => s.key !== key));\n setColumnFilters((prev) => prev.filter((f) => f.key !== key));\n },\n }),\n [],\n );\n\n // Column header cell renderer using sort/filter state\n const columnHeaderCellRenderer = useCallback(\n (props: ColumnHeaderRendererProps) => {\n const { col, colIndex } = props;\n const activeSort = columnSorts.find((s) => s.key === col.key);\n const activeFilter = columnFilters.find((f) => f.key === col.key);\n return renderPostgRESTColumnHeaderCell({\n col,\n colIndex,\n activeSort,\n activeFilter,\n actions: columnHeaderActions,\n });\n },\n [columnSorts, columnFilters, columnHeaderActions],\n );\n\n const hasActiveFilters = columnFilters.length > 0;\n const hasActiveSort = columnSorts.length > 0;\n\n return h(\n DataSheet,\n {\n ...rest,\n dataSheetActions: enableFullTableSearch\n ? h(SearchAction)\n : dataSheetActions,\n columnSpecOptions: columnOptions,\n editable,\n columnHeaderCellRenderer,\n onDeleteRows(selection) {\n if (!editable) return;\n\n const rowIndices = getRowsToDelete(selection);\n\n const ids = rowIndices.map((i) => data[i][identityKey]);\n\n dispatch({ type: \"start-loading\" });\n\n const client = getClient();\n let query = client.delete().in(identityKey, ids);\n finishResponse(query, { $delete: Array.from(rowIndices.keys()) });\n },\n onSaveData(updates, data) {\n if (!editable) return;\n\n // Augment updates with primary key\n\n let changes: Spec<any[]> = {};\n let updateRows: any[] = [];\n for (let [key, update] of Object.entries(updates)) {\n const value = { ...data[key], ...update };\n updateRows.push(value);\n changes[key] = { $set: value };\n }\n\n dispatch({ type: \"start-loading\" });\n const client = getClient();\n // Save data\n let query = client.upsert(updateRows, { defaultToNull: false });\n finishResponse(query, changes);\n },\n },\n [\n h.if(hasActiveFilters || hasActiveSort)(ServerFilterBar, {\n columnSorts,\n columnFilters,\n onClearFilter(key: string) {\n columnHeaderActions.onClearColumn(key);\n },\n onClearAll() {\n setColumnSorts([]);\n setColumnFilters([]);\n },\n }),\n ],\n );\n}\n\nconst saveDataAction: TableAction = {\n id: \"save-data\",\n name: \"Save changes\",\n icon: \"floppy-disk\",\n intent: \"success\",\n requiresEditable: true,\n targets: [RegionCardinality.FULL_TABLE],\n async run(ctx) {\n const data = ctx.data;\n const updates = ctx.updatedData;\n\n let changes: Spec<any[]> = {};\n let updateRows: any[] = [];\n for (let [key, update] of Object.entries(updates)) {\n const value = { ...data[key], ...update };\n updateRows.push(value);\n changes[key] = { $set: value };\n }\n\n dispatch({ type: \"start-loading\" });\n const client = getClient();\n // Save data\n let query = client.upsert(updateRows, { defaultToNull: false });\n },\n};\n\nexport function notifyOnError(toaster: OverlayToaster, error: any) {\n console.error(error);\n const { message, status, code, details } = error;\n\n let errorDetails = null;\n\n if (details != null) {\n if (typeof details === \"string\") {\n errorDetails = h(\"p.error-details\", details);\n } else {\n errorDetails = h(\"div.error-details\", [\n h(\"h4\", \"Error details\"),\n h(\"pre\", JSON.stringify(details, null, 2)),\n ]);\n }\n }\n\n toaster.show({\n message: h([\n h.if(status != null)([h(\"code.bp6-code\", status), \" \"]),\n h.if(code != null)([h(\"code.bp6-code\", code), \" \"]),\n message ?? \"An error occurred\",\n errorDetails,\n ]),\n intent: \"danger\",\n });\n}\n\ninterface PromiseResult {\n error?: Error;\n}\n\nexport async function wrapWithErrorHandling<T extends PromiseResult>(\n toaster: OverlayToaster,\n fnPromise: Promise<T>,\n): Promise<T | null> {\n try {\n const p = await fnPromise;\n if (p.error != null) {\n // Rethrow error\n throw p.error;\n }\n return p;\n } catch (err) {\n notifyOnError(toaster, err);\n return null;\n }\n}\n\nexport function LongTextViewer({ value, onChange }) {\n return h(\"div.long-text\", value);\n}\n\nexport function IntervalCell({ value, children, ...rest }) {\n return h(ColorCell, { value: value?.color, ...rest }, value?.name);\n}\n\nexport function lithologyRenderer(value) {\n return h(\n \"span.tag-cell-content.liths\",\n value?.map((d) => h(LithologyTag, { data: d, key: d.id })),\n );\n}\n\nexport function ExpandedLithologies({ value, onChange }) {\n if (value == null) return h(\"div.basis-panel\", \"No lithologies\");\n return h(\"div.basis-panel\", [\n h(\"table\", [\n h(\"thead\", h(\"tr\", [h(\"th\", \"Lithology\"), h(\"th\", \"Source\")])),\n h(\n \"tbody\",\n value.map((d) => {\n return h(\"tr\", { key: d.id }, [\n h(\"td\", h(LithologyTag, { data: d })),\n h(\n \"td.basis-col\",\n d.basis_col?.map((d) => {\n return h(Tag, {\n size: TagSize.Small,\n key: d,\n name: h([h(\"span.tag-header\", \"Column\"), \" \", h(\"code\", d)]),\n });\n }),\n ),\n ]);\n }),\n ),\n ]),\n ]);\n}\n\nexport function SearchAction() {\n const [input, setInput] = ctx.use(fullTextSearchInputAtom);\n return h(InputGroup, {\n type: \"search\",\n placeholder: \"Search table...\",\n value: input,\n onChange(event) {\n setInput(event.target.value);\n },\n });\n}\n\n/** Bar showing active server-side sort and filter state as removable tags. */\nfunction ServerFilterBar({\n columnSorts,\n columnFilters,\n onClearFilter,\n onClearAll,\n}: {\n columnSorts: ColumnSortEntry[];\n columnFilters: PostgrestColumnFilter[];\n onClearFilter: (key: string) => void;\n onClearAll: () => void;\n}) {\n return h(\"div.server-filter-bar\", [\n columnSorts.map((s) =>\n h(\n BPTag,\n {\n key: `sort-${s.key}`,\n icon: s.ascending ? \"sort-asc\" : \"sort-desc\",\n intent: \"primary\",\n onRemove: () => onClearFilter(s.key),\n minimal: true,\n },\n `${s.key}: ${s.ascending ? \"A→Z\" : \"Z→A\"}`,\n ),\n ),\n columnFilters.map((f) =>\n h(\n BPTag,\n {\n key: `filter-${f.key}`,\n icon: \"filter\",\n intent: \"warning\",\n onRemove: () => onClearFilter(f.key),\n minimal: true,\n },\n `${f.key} ${OPERATOR_LABELS[f.operator] ?? f.operator} ${f.value}`,\n ),\n ),\n h(\n Button,\n {\n minimal: true,\n small: true,\n icon: \"cross\",\n onClick: onClearAll,\n },\n \"Clear all\",\n ),\n ]);\n}\n"],"names":["dispatch","getClient","data","d","BPTag"],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sources":["../../src/postgrest-table/index.ts"],"sourcesContent":["import { InputGroup, OverlayToaster } from \"@blueprintjs/core\";\nimport h from \"./main.module.sass\";\nimport { DataSheet } from \"../core\";\nimport { LithologyTag, Tag, TagSize } from \"@macrostrat/data-components\";\nimport {\n createPostgRESTProvider,\n dataRefreshTokenAtom,\n PostgrestFilter,\n PostgrestOrder,\n} from \"./data-loaders\";\nimport { useCallback, useEffect, useMemo, useRef } from \"react\";\nimport { ErrorBoundary, ToasterContext } from \"@macrostrat/ui-components\";\nimport { PostgrestFilterBuilder } from \"@supabase/postgrest-js\";\nimport { ColorCell } from \"../components\";\nimport { DataSheetProviderProps } from \"../types.ts\";\nimport { atom } from \"jotai\";\nimport { columnSpecAtom, ctx } from \"../provider.ts\";\nimport { ALL_CARDINALITIES, TableAction } from \"../actions\";\n\nexport * from \"./data-loaders\";\n\n/** Full-text search across the table's text columns, expressed as a\n * table-scoped action (rendered in the standard toolbar, not bespoke chrome). */\nexport const fullTextSearchAction: TableAction = {\n id: \"full-text-search\",\n name: \"Search\",\n icon: \"search\",\n targets: ALL_CARDINALITIES,\n requiresEditable: false,\n render: () => h(SearchAction),\n};\n\ninterface PostgRESTTableViewProps<\n T extends object,\n> extends DataSheetProviderProps<T> {\n endpoint: string;\n table: string;\n columnOptions?: any;\n order?: PostgrestOrder<T> | PostgrestOrder<any>[];\n columns?: string;\n editable?: boolean;\n identityKey?: string;\n enableFullTableSearch?: boolean;\n actions?: TableAction<T>[];\n filter(\n query: PostgrestFilterBuilder<T, any, any, any>,\n ): PostgrestFilterBuilder<T, any, any, any>;\n}\n\nexport function PostgRESTTableView<T>(props: PostgRESTTableViewProps<T>) {\n return h(\n ErrorBoundary,\n h(ctx.Provider, h(ToasterContext, h(_PostgRESTTableView, props))),\n );\n}\n\nconst successResponses = [200, 201];\n\nconst enableFullTextSearchAtom = atom(false);\n\nconst fullTextSearchInputAtom = atom(\"\");\n\ninterface FtsFilterConfig {\n text: string;\n columns: string[];\n}\n\nconst fullTextSearchFilterConfigAtom = atom<FtsFilterConfig | null>((get) => {\n const enable = get(enableFullTextSearchAtom);\n const searchText = get(fullTextSearchInputAtom).toLowerCase();\n console.log(\"Full text search\", enable, searchText);\n if (!enable || searchText.length < 3) return null;\n const columnSpec = get(columnSpecAtom);\n\n const columns = columnSpec\n .filter((d) => d.dataType == \"text\")\n .map((d) => d.key);\n\n return {\n text: searchText,\n columns,\n } as FtsFilterConfig;\n});\n\nfunction buildFilter(cfg: FtsFilterConfig | null): PostgrestFilter | null {\n if (cfg == null) return null;\n return {\n type: \"filter\",\n id: `fts-${cfg.text}`,\n apply(res) {\n const _filters = cfg.columns.map((d) => `${d}.ilike.*${cfg.text}*`);\n const filters = _filters.join(\",\");\n return res.or(filters);\n },\n };\n}\n\nfunction _PostgRESTTableView<T>({\n endpoint,\n table,\n columnOptions,\n order,\n columns,\n editable = false,\n enableFullTableSearch = false,\n actions,\n identityKey = null,\n filter: userFilter,\n ...rest\n}: PostgRESTTableViewProps<T>) {\n // Boundary of Jotai store\n ctx.useSync(enableFullTextSearchAtom, enableFullTableSearch);\n\n const ftsConfig = ctx.useValue(fullTextSearchFilterConfigAtom);\n\n // Base ordering from the `order` prop (active column sorts are added by the\n // fetchChunk from the shared store, per-column identity appended last).\n const _order: PostgrestOrder<any>[] = [];\n if (typeof order === \"object\" && \"key\" in order) {\n _order.push(order as PostgrestOrder<any>);\n } else if (Array.isArray(order)) {\n _order.push(...order);\n }\n\n // Infer identity key from the order prop when not given explicitly.\n let _identityKey = identityKey;\n if (_identityKey == null) {\n if (_order.length == 0) {\n throw \"Must specify identity key or order by column\";\n } else {\n _identityKey = _order[0].key;\n }\n }\n\n const bumpRefresh = ctx.useSet(dataRefreshTokenAtom);\n\n // Base query transform: the `filter` prop + full-text search. Column filters\n // come from the shared store (as operator `columnFilter`s) via the loader's\n // `params.filters`, so they aren't applied here.\n const baseFilter = useCallback(\n (q: PostgrestFilterBuilder<any, any, any, any>) => {\n let query = q;\n if (userFilter != null) query = userFilter(query as any) as any;\n const ff = buildFilter(ftsConfig);\n if (ff != null) query = ff.apply(query);\n return query;\n },\n [userFilter, ftsConfig],\n );\n\n // The whole read+persist contract as one `TableDataProvider`, passed to the\n // DataSheet `provider` prop: `fetchData` (keyset-paginated, threading store\n // sorts/filters), `identity`, and `saveRows`/`deleteRows` (upsert/delete).\n // Save (batch) and delete both flow through it — no `onSave`/`onDeleteRows`.\n const orderKey = JSON.stringify(_order);\n const provider = useMemo(\n () =>\n createPostgRESTProvider({\n endpoint,\n table,\n columns,\n identityKey: _identityKey!,\n baseOrder: _order,\n baseFilter,\n }),\n // eslint-disable-next-line react-hooks/exhaustive-deps\n [endpoint, table, columns, _identityKey, orderKey, baseFilter],\n );\n\n // Full-text search re-runs the query; the loader re-fetches on store\n // sort/filter changes on its own, so only FTS needs a nudge here.\n const firstRun = useRef(true);\n useEffect(() => {\n if (firstRun.current) {\n firstRun.current = false;\n return;\n }\n bumpRefresh((v) => v + 1);\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [ftsConfig]);\n\n // Full-text search joins the standard actions toolbar (no bespoke chrome).\n const mergedActions = enableFullTableSearch\n ? [fullTextSearchAction, ...(actions ?? [])]\n : actions;\n\n return h(DataSheet, {\n ...rest,\n provider,\n actions: mergedActions,\n columnSpecOptions: columnOptions,\n editable,\n });\n}\n\nexport function notifyOnError(toaster: OverlayToaster, error: any) {\n console.error(error);\n const { message, status, code, details } = error;\n\n let errorDetails = null;\n\n if (details != null) {\n if (typeof details === \"string\") {\n errorDetails = h(\"p.error-details\", details);\n } else {\n errorDetails = h(\"div.error-details\", [\n h(\"h4\", \"Error details\"),\n h(\"pre\", JSON.stringify(details, null, 2)),\n ]);\n }\n }\n\n toaster.show({\n message: h([\n h.if(status != null)([h(\"code.bp6-code\", status), \" \"]),\n h.if(code != null)([h(\"code.bp6-code\", code), \" \"]),\n message ?? \"An error occurred\",\n errorDetails,\n ]),\n intent: \"danger\",\n });\n}\n\ninterface PromiseResult {\n error?: Error;\n}\n\nexport async function wrapWithErrorHandling<T extends PromiseResult>(\n toaster: OverlayToaster,\n fnPromise: Promise<T>,\n): Promise<T | null> {\n try {\n const p = await fnPromise;\n if (p.error != null) {\n // Rethrow error\n throw p.error;\n }\n return p;\n } catch (err) {\n notifyOnError(toaster, err);\n return null;\n }\n}\n\nexport function LongTextViewer({ value, onChange }) {\n return h(\"div.long-text\", value);\n}\n\nexport function IntervalCell({ value, children, ...rest }) {\n return h(ColorCell, { value: value?.color, ...rest }, value?.name);\n}\n\nexport function lithologyRenderer(value) {\n return h(\n \"span.tag-cell-content.liths\",\n value?.map((d) => h(LithologyTag, { data: d, key: d.id })),\n );\n}\n\nexport function ExpandedLithologies({ value, onChange }) {\n if (value == null) return h(\"div.basis-panel\", \"No lithologies\");\n return h(\"div.basis-panel\", [\n h(\"table\", [\n h(\"thead\", h(\"tr\", [h(\"th\", \"Lithology\"), h(\"th\", \"Source\")])),\n h(\n \"tbody\",\n value.map((d) => {\n return h(\"tr\", { key: d.id }, [\n h(\"td\", h(LithologyTag, { data: d })),\n h(\n \"td.basis-col\",\n d.basis_col?.map((d) => {\n return h(Tag, {\n size: TagSize.Small,\n key: d,\n name: h([h(\"span.tag-header\", \"Column\"), \" \", h(\"code\", d)]),\n });\n }),\n ),\n ]);\n }),\n ),\n ]),\n ]);\n}\n\nexport function SearchAction() {\n const [input, setInput] = ctx.use(fullTextSearchInputAtom);\n return h(InputGroup, {\n type: \"search\",\n placeholder: \"Search table...\",\n value: input,\n onChange(event) {\n setInput(event.target.value);\n },\n });\n}\n"],"names":["d"],"mappings":"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"}
@@ -8,9 +8,5 @@ function adjustArraySize(arr, newSize) {
8
8
  }
9
9
  return [...arr, ...Array(newSize - arr.length).fill(null)];
10
10
  }
11
- async function sleep(ms) {
12
- return new Promise((resolve) => setTimeout(resolve, ms));
13
- }
14
11
  exports.adjustArraySize = adjustArraySize;
15
- exports.sleep = sleep;
16
12
  //# sourceMappingURL=loading-utils.cjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"loading-utils.cjs","sources":["../../src/postgrest-table/loading-utils.ts"],"sourcesContent":["export function adjustArraySize<T>(arr: T[], newSize: number) {\n if (newSize == null || arr.length === newSize) {\n return arr;\n } else if (arr.length > newSize) {\n // Trim the array\n arr = arr.slice(0, newSize);\n }\n return [...arr, ...Array(newSize - arr.length).fill(null)];\n}\n\nexport interface RowRegion {\n rowIndexStart: number;\n rowIndexEnd: number;\n}\n\nenum LoadDirection {\n \"up\",\n \"down\",\n}\n\nexport function overlapsNulls(data: any[], region: RowRegion) {\n for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {\n if (data[i] == null) {\n return true;\n }\n }\n return false;\n}\n\nexport function distanceToNextNonEmptyRow(\n data: any[],\n start: number,\n direction: LoadDirection,\n limit: number,\n): number {\n let i = start;\n while (i < data.length && i > 0 && limit > 0) {\n if (data[i] != null) {\n return i;\n }\n i += direction === LoadDirection.down ? 1 : -1;\n limit -= 1;\n }\n return i;\n}\n\nexport async function sleep(ms: number) {\n return new Promise((resolve) => setTimeout(resolve, ms));\n}\n"],"names":[],"mappings":";;AAAO,SAAS,gBAAmB,KAAU,SAAiB;AAC5D,MAAI,WAAW,QAAQ,IAAI,WAAW,SAAS;AAC7C,WAAO;AAAA,EACT,WAAW,IAAI,SAAS,SAAS;AAE/B,UAAM,IAAI,MAAM,GAAG,OAAO;AAAA,EAC5B;AACA,SAAO,CAAC,GAAG,KAAK,GAAG,MAAM,UAAU,IAAI,MAAM,EAAE,KAAK,IAAI,CAAC;AAC3D;AAsCA,eAAsB,MAAM,IAAY;AACtC,SAAO,IAAI,QAAQ,CAAC,YAAY,WAAW,SAAS,EAAE,CAAC;AACzD;;;"}
1
+ {"version":3,"file":"loading-utils.cjs","sources":["../../src/postgrest-table/loading-utils.ts"],"sourcesContent":["export function adjustArraySize<T>(arr: T[], newSize: number) {\n if (newSize == null || arr.length === newSize) {\n return arr;\n } else if (arr.length > newSize) {\n // Trim the array\n arr = arr.slice(0, newSize);\n }\n return [...arr, ...Array(newSize - arr.length).fill(null)];\n}\n\nexport interface RowRegion {\n rowIndexStart: number;\n rowIndexEnd: number;\n}\n\nenum LoadDirection {\n \"up\",\n \"down\",\n}\n\nexport function overlapsNulls(data: any[], region: RowRegion) {\n for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {\n if (data[i] == null) {\n return true;\n }\n }\n return false;\n}\n\nexport function distanceToNextNonEmptyRow(\n data: any[],\n start: number,\n direction: LoadDirection,\n limit: number,\n): number {\n let i = start;\n while (i < data.length && i > 0 && limit > 0) {\n if (data[i] != null) {\n return i;\n }\n i += direction === LoadDirection.down ? 1 : -1;\n limit -= 1;\n }\n return i;\n}\n\nexport async function sleep(ms: number) {\n return new Promise((resolve) => setTimeout(resolve, ms));\n}\n"],"names":[],"mappings":";;AAAO,SAAS,gBAAmB,KAAU,SAAiB;AAC5D,MAAI,WAAW,QAAQ,IAAI,WAAW,SAAS;AAC7C,WAAO;AAAA,EACT,WAAW,IAAI,SAAS,SAAS;AAE/B,UAAM,IAAI,MAAM,GAAG,OAAO;AAAA,EAC5B;AACA,SAAO,CAAC,GAAG,KAAK,GAAG,MAAM,UAAU,IAAI,MAAM,EAAE,KAAK,IAAI,CAAC;AAC3D;;"}
@@ -6,11 +6,7 @@ function adjustArraySize(arr, newSize) {
6
6
  }
7
7
  return [...arr, ...Array(newSize - arr.length).fill(null)];
8
8
  }
9
- async function sleep(ms) {
10
- return new Promise((resolve) => setTimeout(resolve, ms));
11
- }
12
9
  export {
13
- adjustArraySize,
14
- sleep
10
+ adjustArraySize
15
11
  };
16
12
  //# sourceMappingURL=loading-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"loading-utils.js","sources":["../../src/postgrest-table/loading-utils.ts"],"sourcesContent":["export function adjustArraySize<T>(arr: T[], newSize: number) {\n if (newSize == null || arr.length === newSize) {\n return arr;\n } else if (arr.length > newSize) {\n // Trim the array\n arr = arr.slice(0, newSize);\n }\n return [...arr, ...Array(newSize - arr.length).fill(null)];\n}\n\nexport interface RowRegion {\n rowIndexStart: number;\n rowIndexEnd: number;\n}\n\nenum LoadDirection {\n \"up\",\n \"down\",\n}\n\nexport function overlapsNulls(data: any[], region: RowRegion) {\n for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {\n if (data[i] == null) {\n return true;\n }\n }\n return false;\n}\n\nexport function distanceToNextNonEmptyRow(\n data: any[],\n start: number,\n direction: LoadDirection,\n limit: number,\n): number {\n let i = start;\n while (i < data.length && i > 0 && limit > 0) {\n if (data[i] != null) {\n return i;\n }\n i += direction === LoadDirection.down ? 1 : -1;\n limit -= 1;\n }\n return i;\n}\n\nexport async function sleep(ms: number) {\n return new Promise((resolve) => setTimeout(resolve, ms));\n}\n"],"names":[],"mappings":"AAAO,SAAS,gBAAmB,KAAU,SAAiB;AAC5D,MAAI,WAAW,QAAQ,IAAI,WAAW,SAAS;AAC7C,WAAO;AAAA,EACT,WAAW,IAAI,SAAS,SAAS;AAE/B,UAAM,IAAI,MAAM,GAAG,OAAO;AAAA,EAC5B;AACA,SAAO,CAAC,GAAG,KAAK,GAAG,MAAM,UAAU,IAAI,MAAM,EAAE,KAAK,IAAI,CAAC;AAC3D;AAsCA,eAAsB,MAAM,IAAY;AACtC,SAAO,IAAI,QAAQ,CAAC,YAAY,WAAW,SAAS,EAAE,CAAC;AACzD;"}
1
+ {"version":3,"file":"loading-utils.js","sources":["../../src/postgrest-table/loading-utils.ts"],"sourcesContent":["export function adjustArraySize<T>(arr: T[], newSize: number) {\n if (newSize == null || arr.length === newSize) {\n return arr;\n } else if (arr.length > newSize) {\n // Trim the array\n arr = arr.slice(0, newSize);\n }\n return [...arr, ...Array(newSize - arr.length).fill(null)];\n}\n\nexport interface RowRegion {\n rowIndexStart: number;\n rowIndexEnd: number;\n}\n\nenum LoadDirection {\n \"up\",\n \"down\",\n}\n\nexport function overlapsNulls(data: any[], region: RowRegion) {\n for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {\n if (data[i] == null) {\n return true;\n }\n }\n return false;\n}\n\nexport function distanceToNextNonEmptyRow(\n data: any[],\n start: number,\n direction: LoadDirection,\n limit: number,\n): number {\n let i = start;\n while (i < data.length && i > 0 && limit > 0) {\n if (data[i] != null) {\n return i;\n }\n i += direction === LoadDirection.down ? 1 : -1;\n limit -= 1;\n }\n return i;\n}\n\nexport async function sleep(ms: number) {\n return new Promise((resolve) => setTimeout(resolve, ms));\n}\n"],"names":[],"mappings":"AAAO,SAAS,gBAAmB,KAAU,SAAiB;AAC5D,MAAI,WAAW,QAAQ,IAAI,WAAW,SAAS;AAC7C,WAAO;AAAA,EACT,WAAW,IAAI,SAAS,SAAS;AAE/B,UAAM,IAAI,MAAM,GAAG,OAAO;AAAA,EAC5B;AACA,SAAO,CAAC,GAAG,KAAK,GAAG,MAAM,UAAU,IAAI,MAAM,EAAE,KAAK,IAAI,CAAC;AAC3D;"}
@@ -3,24 +3,25 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
3
3
  const h$1 = require("@macrostrat/hyper");
4
4
  const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
5
5
  const h__default = /* @__PURE__ */ _interopDefault(h$1);
6
- const lithology = "_lithology_1w24u_1";
7
- const description = "_description_1w24u_34";
8
- const liths = "_liths_1w24u_49";
9
- const toolbar = "_toolbar_1w24u_61";
6
+ const lithology = "_lithology_xp6ib_1";
7
+ const description = "_description_xp6ib_34";
8
+ const liths = "_liths_xp6ib_49";
9
+ const toolbar = "_toolbar_xp6ib_61";
10
10
  const styles = {
11
11
  lithology,
12
- "inline-lithology": "_inline-lithology_1w24u_8",
13
- "basis-panel": "_basis-panel_1w24u_12",
14
- "long-text": "_long-text_1w24u_26",
12
+ "inline-lithology": "_inline-lithology_xp6ib_8",
13
+ "basis-panel": "_basis-panel_xp6ib_12",
14
+ "long-text": "_long-text_xp6ib_26",
15
15
  description,
16
- "tag-header": "_tag-header_1w24u_38",
17
- "basis-col": "_basis-col_1w24u_45",
16
+ "tag-header": "_tag-header_xp6ib_38",
17
+ "basis-col": "_basis-col_xp6ib_45",
18
18
  liths,
19
- "data-sheet-outer": "_data-sheet-outer_1w24u_53",
19
+ "data-sheet-outer": "_data-sheet-outer_xp6ib_53",
20
20
  toolbar,
21
- "info-bar": "_info-bar_1w24u_61",
22
- "server-filter-bar": "_server-filter-bar_1w24u_61",
23
- "tag-cell-content": "_tag-cell-content_1w24u_73"
21
+ "info-bar": "_info-bar_xp6ib_61",
22
+ "server-filter-bar": "_server-filter-bar_xp6ib_61",
23
+ "load-progress": "_load-progress_xp6ib_73",
24
+ "tag-cell-content": "_tag-cell-content_xp6ib_85"
24
25
  };
25
26
  let h = h__default.default.styled(styles);
26
27
  Object.assign(h, styles);
@@ -1 +1 @@
1
- {"version":3,"file":"main.module.sass.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"main.module.sass.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
@@ -1,22 +1,23 @@
1
1
  import h$1 from "@macrostrat/hyper";
2
- const lithology = "_lithology_1w24u_1";
3
- const description = "_description_1w24u_34";
4
- const liths = "_liths_1w24u_49";
5
- const toolbar = "_toolbar_1w24u_61";
2
+ const lithology = "_lithology_xp6ib_1";
3
+ const description = "_description_xp6ib_34";
4
+ const liths = "_liths_xp6ib_49";
5
+ const toolbar = "_toolbar_xp6ib_61";
6
6
  const styles = {
7
7
  lithology,
8
- "inline-lithology": "_inline-lithology_1w24u_8",
9
- "basis-panel": "_basis-panel_1w24u_12",
10
- "long-text": "_long-text_1w24u_26",
8
+ "inline-lithology": "_inline-lithology_xp6ib_8",
9
+ "basis-panel": "_basis-panel_xp6ib_12",
10
+ "long-text": "_long-text_xp6ib_26",
11
11
  description,
12
- "tag-header": "_tag-header_1w24u_38",
13
- "basis-col": "_basis-col_1w24u_45",
12
+ "tag-header": "_tag-header_xp6ib_38",
13
+ "basis-col": "_basis-col_xp6ib_45",
14
14
  liths,
15
- "data-sheet-outer": "_data-sheet-outer_1w24u_53",
15
+ "data-sheet-outer": "_data-sheet-outer_xp6ib_53",
16
16
  toolbar,
17
- "info-bar": "_info-bar_1w24u_61",
18
- "server-filter-bar": "_server-filter-bar_1w24u_61",
19
- "tag-cell-content": "_tag-cell-content_1w24u_73"
17
+ "info-bar": "_info-bar_xp6ib_61",
18
+ "server-filter-bar": "_server-filter-bar_xp6ib_61",
19
+ "load-progress": "_load-progress_xp6ib_73",
20
+ "tag-cell-content": "_tag-cell-content_xp6ib_85"
20
21
  };
21
22
  let h = h$1.styled(styles);
22
23
  Object.assign(h, styles);
@@ -1 +1 @@
1
- {"version":3,"file":"main.module.sass.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"main.module.sass.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;"}
package/dist/provider.cjs CHANGED
@@ -4,6 +4,7 @@ const react = require("react");
4
4
  const h = require("@macrostrat/hyper");
5
5
  const zustand = require("zustand");
6
6
  const dataComponents = require("@macrostrat/data-components");
7
+ const types = require("./types.cjs");
7
8
  const zustandStore = require("./zustand-store.cjs");
8
9
  const jotaiZustand = require("jotai-zustand");
9
10
  const notifications = require("./notifications.cjs");
@@ -105,22 +106,78 @@ const tableDataAtom = jotai.atom(
105
106
  },
106
107
  (get, set, newData) => {
107
108
  set(storeAtom, (state) => {
108
- console.log("Updating table data", newData);
109
+ let next = { ...state, data: newData };
109
110
  if (state.data.length == 0 && newData.length > 0 && state.columnSpec.length == 0) {
110
- console.log("Generating column spec from data");
111
- return {
112
- ...state,
113
- columnSpec: columnSpec.generateColumnSpec(newData, state.columnSpecOptions),
114
- data: newData
115
- };
111
+ next.columnSpec = columnSpec.generateColumnSpec(newData, state.columnSpecOptions);
116
112
  }
117
- return {
118
- ...state,
119
- data: newData
120
- };
113
+ if (!state.controlledOverlay) {
114
+ const remap = remapOverlayByIdentity(state, newData);
115
+ next.data = remap.data;
116
+ next.updatedData = remap.updatedData;
117
+ next.rowStatus = remap.rowStatus;
118
+ next.pendingOverlayById = remap.pending;
119
+ }
120
+ return next;
121
121
  });
122
122
  }
123
123
  );
124
+ function overlayIdentity(state, row) {
125
+ if (row == null) return void 0;
126
+ const added = row[types.DS_ROW_ID];
127
+ if (added != null) return added;
128
+ return state.identity(row);
129
+ }
130
+ function remapOverlayByIdentity(state, newData) {
131
+ const { data: oldData, updatedData, rowStatus } = state;
132
+ const byId = new Map(state.pendingOverlayById);
133
+ const n = Math.max(
134
+ oldData.length,
135
+ updatedData?.length ?? 0,
136
+ rowStatus?.length ?? 0
137
+ );
138
+ for (let i = 0; i < n; i++) {
139
+ const row = oldData[i];
140
+ if (row == null) continue;
141
+ const id = overlayIdentity(state, row);
142
+ if (id == null) continue;
143
+ const edit = updatedData?.[i];
144
+ const status = rowStatus?.[i];
145
+ if (edit != null || status != null) byId.set(id, { edit, status });
146
+ }
147
+ const resultData = newData.slice();
148
+ const nextUpdated = [];
149
+ const nextStatus = [];
150
+ const attached = /* @__PURE__ */ new Set();
151
+ for (let j = 0; j < resultData.length; j++) {
152
+ const row = resultData[j];
153
+ if (row == null) continue;
154
+ const id = overlayIdentity(state, row);
155
+ if (id == null) continue;
156
+ const entry = byId.get(id);
157
+ if (entry == null) continue;
158
+ if (entry.edit != null) nextUpdated[j] = entry.edit;
159
+ if (entry.status != null) nextStatus[j] = entry.status;
160
+ attached.add(id);
161
+ }
162
+ const pending = /* @__PURE__ */ new Map();
163
+ for (const [id, entry] of byId) {
164
+ if (attached.has(id)) continue;
165
+ if (entry.status === types.TableElementStatus.ADDED) {
166
+ const idx = resultData.length;
167
+ resultData.push(entry.edit ?? {});
168
+ nextUpdated[idx] = entry.edit;
169
+ nextStatus[idx] = entry.status;
170
+ } else {
171
+ pending.set(id, entry);
172
+ }
173
+ }
174
+ return {
175
+ data: resultData,
176
+ updatedData: nextUpdated,
177
+ rowStatus: nextStatus,
178
+ pending
179
+ };
180
+ }
124
181
  exports.DataSheetProvider = DataSheetProvider;
125
182
  exports.DataSheetProviderInner = DataSheetProviderInner;
126
183
  exports.columnSpecAtom = columnSpecAtom;