@vuu-ui/vuu-table-extras 3.3.12 → 3.3.13

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.12",
+  "version": "3.3.13",
   "author": "heswell",
   "main": "./src/index.js",
   "license": "Apache-2.0",
@@ -11,19 +11,19 @@
     "lezer-generate:column": "lezer-generator --output ./src/column-expression-input/column-language-parser/generated/column-parser.js ./src/column-expression-input/column-language-parser/grammar/column.grammar"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-filter-types": "3.3.12",
-    "@vuu-ui/vuu-protocol-types": "3.3.12"
+    "@vuu-ui/vuu-filter-types": "3.3.13",
+    "@vuu-ui/vuu-protocol-types": "3.3.13"
   },
   "dependencies": {
-    "@vuu-ui/vuu-codemirror": "3.3.12",
-    "@vuu-ui/vuu-data-editing": "3.3.12",
-    "@vuu-ui/vuu-data-react": "3.3.12",
-    "@vuu-ui/vuu-data-types": "3.3.12",
-    "@vuu-ui/vuu-table-types": "3.3.12",
-    "@vuu-ui/vuu-popups": "3.3.12",
-    "@vuu-ui/vuu-table": "3.3.12",
-    "@vuu-ui/vuu-utils": "3.3.12",
-    "@vuu-ui/vuu-ui-controls": "3.3.12",
+    "@vuu-ui/vuu-codemirror": "3.3.13",
+    "@vuu-ui/vuu-data-editing": "3.3.13",
+    "@vuu-ui/vuu-data-react": "3.3.13",
+    "@vuu-ui/vuu-data-types": "3.3.13",
+    "@vuu-ui/vuu-table-types": "3.3.13",
+    "@vuu-ui/vuu-popups": "3.3.13",
+    "@vuu-ui/vuu-table": "3.3.13",
+    "@vuu-ui/vuu-utils": "3.3.13",
+    "@vuu-ui/vuu-ui-controls": "3.3.13",
     "@lezer/lr": "1.4.2",
     "@salt-ds/core": "1.54.1",
     "@salt-ds/lab": "1.0.0-alpha.83",

package/src/csv-upload/useCsvUpload.js

@@ -5,7 +5,7 @@ import { parseCsv } from "./parse/csv-parse.js";
 import { validateCsvAgainstSchema } from "./parse/csv-schema-validation.js";
 import { buildRowErrorMessage, createUploadError, hasFileParseErrors, isCsvParseError, mergeValidationWithParseErrors, toErrorMessage } from "./parse/csv-upload-utils.js";
 import { CSV_FIRST_DATA_ROW_NUMBER } from "./parse/csv-constants.js";
-const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importTable, onImportSessionEnded, onImportSessionStarted, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults, validators })=>{
+const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importTable, onImportSessionEnded, onImportSessionReady, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults, validators })=>{
     const { getServerAPI } = useData();
     const [validation, setValidation] = useState();
     const [sessionTable, setSessionTable] = useState();
@@ -187,11 +187,9 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         const sessionVuuTable = sessionDataSource?.table;
         if (void 0 === sessionDataSource || void 0 === sessionVuuTable || !isSessionTable(sessionVuuTable)) throw Error("CsvUpload createSessionDataSource returned no session datasource.");
         setActiveSessionDataSource(sessionDataSource);
-        onImportSessionStarted?.(sessionDataSource);
         return sessionDataSource;
     }, [
         editSession,
-        onImportSessionStarted,
         setActiveSessionDataSource
     ]);
     const closePendingEditSession = useCallback(async (save)=>{
@@ -259,10 +257,11 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         const mergedValidation = mergeValidationWithParseErrors(schemaValidation, parsedCsv.error);
         setValidation(mergedValidation);
         if (mergedValidation.rows.length > 0) try {
-            await beginEditSession();
+            const sessionDataSource = await beginEditSession();
             if (operationId !== operationIdRef.current) return;
             const rowsAdded = await addAllRows(mergedValidation, operationId);
             if (!rowsAdded) return;
+            onImportSessionReady?.(sessionDataSource);
         } catch (error) {
             if (void 0 !== sessionDataSourceRef.current) await endEditSessionAndNotify(false, "failed");
             else try {
@@ -290,7 +289,8 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         table,
         endEditSessionAndNotify,
         schema,
-        validators
+        validators,
+        onImportSessionReady
     ]);
     const handleFiles = useCallback(async (files)=>{
         const file = files[0];

package/types/csv-upload/CsvUpload.d.ts

@@ -46,7 +46,7 @@ export interface CsvUploadProps {
     importSchema?: TableSchema;
     /** Expected import table, used to validate the session table returned by the server. */
     importTable?: VuuTable;
-    onImportSessionStarted?: (dataSource: DataSource) => void;
+    onImportSessionReady?: (dataSource: DataSource) => void;
     onImportSessionEnded?: (result: CsvUploadSessionEndResult) => void;
     onError?: (result: CsvUploadErrorResult | undefined) => void;
     onImported?: (result: CsvUploadImportedResult) => void;

package/types/csv-upload/useCsvUpload.d.ts

@@ -17,7 +17,7 @@ export interface CsvUploadHookProps {
     importTable?: VuuTable;
     maxRows?: number;
     onImportSessionEnded?: (result: CsvUploadSessionEndResult) => void;
-    onImportSessionStarted?: (dataSource: DataSource) => void;
+    onImportSessionReady?: (dataSource: DataSource) => void;
     onError?: (result: CsvUploadErrorResult | undefined) => void;
     onImported?: (result: CsvUploadImportedResult) => void;
     onPreview?: (result: CsvUploadPreviewResult) => void;
@@ -40,4 +40,4 @@ export type UseCsvUploadReturn = {
     validation: CsvValidationResult | undefined;
     error: CsvUploadErrorResult | undefined;
 };
-export declare const useCsvUpload: ({ dataSource, importMode, importSchema, importTable, onImportSessionEnded, onImportSessionStarted, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults, validators, }: CsvUploadHookProps) => UseCsvUploadReturn;
+export declare const useCsvUpload: ({ dataSource, importMode, importSchema, importTable, onImportSessionEnded, onImportSessionReady, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults, validators, }: CsvUploadHookProps) => UseCsvUploadReturn;