@vuu-ui/vuu-table-extras 3.3.4 → 3.3.5

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.4",
+  "version": "3.3.5",
   "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.4",
-    "@vuu-ui/vuu-protocol-types": "3.3.4"
+    "@vuu-ui/vuu-filter-types": "3.3.5",
+    "@vuu-ui/vuu-protocol-types": "3.3.5"
   },
   "dependencies": {
-    "@vuu-ui/vuu-codemirror": "3.3.4",
-    "@vuu-ui/vuu-data-editing": "3.3.4",
-    "@vuu-ui/vuu-data-react": "3.3.4",
-    "@vuu-ui/vuu-data-types": "3.3.4",
-    "@vuu-ui/vuu-table-types": "3.3.4",
-    "@vuu-ui/vuu-popups": "3.3.4",
-    "@vuu-ui/vuu-table": "3.3.4",
-    "@vuu-ui/vuu-utils": "3.3.4",
-    "@vuu-ui/vuu-ui-controls": "3.3.4",
+    "@vuu-ui/vuu-codemirror": "3.3.5",
+    "@vuu-ui/vuu-data-editing": "3.3.5",
+    "@vuu-ui/vuu-data-react": "3.3.5",
+    "@vuu-ui/vuu-data-types": "3.3.5",
+    "@vuu-ui/vuu-table-types": "3.3.5",
+    "@vuu-ui/vuu-popups": "3.3.5",
+    "@vuu-ui/vuu-table": "3.3.5",
+    "@vuu-ui/vuu-utils": "3.3.5",
+    "@vuu-ui/vuu-ui-controls": "3.3.5",
     "@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

@@ -1,5 +1,5 @@
 import { EditSession } from "@vuu-ui/vuu-data-editing";
-import { isRpcError, isSessionTable, useData } from "@vuu-ui/vuu-utils";
+import { Range, isRpcError, isSessionTable, useData } from "@vuu-ui/vuu-utils";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { parseCsv } from "./parse/csv-parse.js";
 import { validateCsvAgainstSchema } from "./parse/csv-schema-validation.js";
@@ -43,16 +43,31 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         resolvedImportSchema,
         importTable
     ]);
-    const importDataSource = useMemo(()=>{
-        if (!sessionOverrides) return dataSource;
-        return {
+    const importDataSource = useMemo(()=>({
             tableSchema: dataSource.tableSchema,
             createSessionDataSource: async (copyOption, sessionType)=>{
                 if (!dataSource.createSessionDataSource) throw Error("[useCsvUpload] dataSource does not support createSessionDataSource");
-                return dataSource.createSessionDataSource(copyOption, sessionType, sessionOverrides);
+                const sessionDs = await dataSource.createSessionDataSource(copyOption, sessionType, sessionOverrides);
+                if (!sessionDs) throw Error("[useCsvUpload] Failed to create session datasource");
+                if (!sessionDs.columns.includes("vuuMsg")) sessionDs.columns = sessionDs.columns.concat("vuuMsg");
+                if (sessionDs.isRemote) return new Promise((resolve, reject)=>{
+                    const handleSubscribed = ()=>{
+                        sessionDs.removeListener("subscribed", handleSubscribed);
+                        resolve(sessionDs);
+                    };
+                    sessionDs.on("subscribed", handleSubscribed);
+                    try {
+                        sessionDs.subscribe({
+                            range: Range(0, 0)
+                        }, ()=>{});
+                    } catch (err) {
+                        sessionDs.removeListener("subscribed", handleSubscribed);
+                        reject(err);
+                    }
+                });
+                return sessionDs;
             }
-        };
-    }, [
+        }), [
         dataSource,
         sessionOverrides
     ]);
@@ -95,8 +110,12 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         if (!sessionDataSource) throw Error("CsvUpload has no active edit session.");
         if (!sessionDataSource.endEditSession) throw Error("CsvUpload requires the session datasource to support endEditSession.");
         const currentSessionTable = sessionDataSource.table;
-        await editSession.end(save);
-        setActiveSessionDataSource(void 0);
+        try {
+            await editSession.end(save);
+        } finally{
+            if ("unsubscribed" !== sessionDataSource.status) sessionDataSource.unsubscribe();
+            setActiveSessionDataSource(void 0);
+        }
         onImportSessionEnded?.({
             reason,
             sessionTable: currentSessionTable && isSessionTable(currentSessionTable) ? currentSessionTable : void 0
@@ -160,7 +179,6 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
         const sessionDataSource = await editSession.begin("Empty", "import");
         const sessionVuuTable = sessionDataSource?.table;
         if (void 0 === sessionDataSource || void 0 === sessionVuuTable || !isSessionTable(sessionVuuTable)) throw Error("CsvUpload createSessionDataSource returned no session datasource.");
-        if (!sessionDataSource.columns.includes("vuuMsg")) sessionDataSource.columns = sessionDataSource.columns.concat("vuuMsg");
         setActiveSessionDataSource(sessionDataSource);
         onImportSessionStarted?.(sessionDataSource);
         return sessionDataSource;

package/types/column-picker/ColumnModel.d.ts

@@ -62,7 +62,7 @@ export declare class ColumnModel extends EventEmitter<ColumnEvents> {
     set searchPattern(pattern: string);
     get searchPattern(): string;
     get selectedColumns(): readonly ColumnDescriptor[];
-    setSelectedColumns(selectedColumns: ColumnDescriptor[], source: ColumnChangeSource, changeDescriptor?: SelectedColumnChangeDescriptor): void;
+    setSelectedColumns(selectedColumns: readonly ColumnDescriptor[], source: ColumnChangeSource, changeDescriptor?: SelectedColumnChangeDescriptor): void;
     getColumn(name: string): ColumnDescriptor;
     addItemToSelectedColumns(name: string, source: ColumnChangeSource): void;
     removeItemFromSelectedColumns(name: string, source: ColumnChangeSource): void;