@vuu-ui/vuu-table-extras 3.5.4 → 3.5.5

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.4",
+  "version": "3.5.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.5.4",
-    "@vuu-ui/vuu-protocol-types": "3.5.4"
+    "@vuu-ui/vuu-filter-types": "3.5.5",
+    "@vuu-ui/vuu-protocol-types": "3.5.5"
   },
   "dependencies": {
-    "@vuu-ui/vuu-codemirror": "3.5.4",
-    "@vuu-ui/vuu-data-editing": "3.5.4",
-    "@vuu-ui/vuu-data-react": "3.5.4",
-    "@vuu-ui/vuu-data-types": "3.5.4",
-    "@vuu-ui/vuu-table-types": "3.5.4",
-    "@vuu-ui/vuu-popups": "3.5.4",
-    "@vuu-ui/vuu-table": "3.5.4",
-    "@vuu-ui/vuu-utils": "3.5.4",
-    "@vuu-ui/vuu-ui-controls": "3.5.4",
+    "@vuu-ui/vuu-codemirror": "3.5.5",
+    "@vuu-ui/vuu-data-editing": "3.5.5",
+    "@vuu-ui/vuu-data-react": "3.5.5",
+    "@vuu-ui/vuu-data-types": "3.5.5",
+    "@vuu-ui/vuu-table-types": "3.5.5",
+    "@vuu-ui/vuu-popups": "3.5.5",
+    "@vuu-ui/vuu-table": "3.5.5",
+    "@vuu-ui/vuu-utils": "3.5.5",
+    "@vuu-ui/vuu-ui-controls": "3.5.5",
     "@lezer/lr": "1.4.2",
     "@salt-ds/core": "1.54.1",
     "@salt-ds/lab": "1.0.0-alpha.83",

package/src/csv-upload/parse/csv-upload-utils.js

@@ -60,15 +60,18 @@ const getInlineRowErrorMessage = (result)=>{
     if (isRecord(result) && "data" in result && isRecord(result.data)) {
         const data = result.data;
         const msg = data.vuuMsg ?? data.msg;
-        if ("string" == typeof msg && "" !== msg.trim()) return msg;
+        if ("string" == typeof msg && "" !== msg.trim()) return msg.trim();
     }
 };
 const getRowVuuMsgError = (row, vuuMsgDataIndex, vuuRowNumDataIndex)=>{
     if (-1 === vuuMsgDataIndex) return;
     const msg = Array.isArray(row) ? row[vuuMsgDataIndex] : row?.vuuMsg;
     if ("string" == typeof msg && "" !== msg.trim()) {
-        const rowNum = -1 !== vuuRowNumDataIndex && void 0 !== row[vuuRowNumDataIndex] ? row[vuuRowNumDataIndex] : Number(row[metadataKeys.IDX]) + CSV_FIRST_DATA_ROW_NUMBER;
-        return `Row ${rowNum}: ${msg}`;
+        const rowNum = -1 !== vuuRowNumDataIndex && void 0 !== row[vuuRowNumDataIndex] ? Number(row[vuuRowNumDataIndex]) : Number(row[metadataKeys.IDX]) + CSV_FIRST_DATA_ROW_NUMBER;
+        return {
+            rowNum,
+            message: msg.trim()
+        };
     }
 };
 const waitForSessionErrors = (isRemote, sessionErrors, receivedRowKeys, expectedRowCount, listeners, timeoutMs = 500)=>{

package/src/csv-upload/session/useImportSession.js

@@ -174,7 +174,10 @@ const useImportSession = ({ dataSource, sessionOverrides, rowDefaults, processin
                 if (isRpcError(result)) throw Error(result.errorMessage);
                 if ("string" == typeof result) throw Error(result);
                 const inlineMsg = getInlineRowErrorMessage(result);
-                if (inlineMsg) rpcErrors.push(`${0 === rowNum ? "Header" : `Row ${rowNum}`}: ${inlineMsg}`);
+                if (inlineMsg) sessionErrorsRef.current.set(rowNum, {
+                    rowNum,
+                    message: inlineMsg
+                });
             } catch (error) {
                 rpcErrors.push(`${0 === rowNum ? "Header" : `Row ${rowNum}`}: ${toErrorMessage(error)}`);
             }

package/src/csv-upload/useCsvUpload.js

@@ -1,8 +1,8 @@
 import { Range, isSessionTable } from "@vuu-ui/vuu-utils";
 import { useCallback, useMemo, useRef, useState } from "react";
 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 { CsvValidationErrorEnum, validateCsvAgainstSchema } from "./parse/csv-schema-validation.js";
+import { createUploadError, hasFileParseErrors, isCsvParseError, mergeValidationWithParseErrors, toErrorMessage } from "./parse/csv-upload-utils.js";
 import { useImportSchema } from "./session/useImportSchema.js";
 import { useImportSession } from "./session/useImportSession.js";
 const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importTable, onImportSessionEnded, onImportSessionReady, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults, validators })=>{
@@ -95,7 +95,22 @@ const useCsvUpload = ({ dataSource, importMode = "direct", importSchema, importT
             sessionDataSource.range = Range(0, expectedRowCount);
             const sessionErrors = await checkSessionTableErrors(sessionDataSource, expectedRowCount);
             if (operationId !== operationIdRef.current) return;
-            if (sessionErrors.length > 0) throw Error(buildRowErrorMessage("Import failed", sessionErrors));
+            if (sessionErrors.length > 0) {
+                const serverValidationErrors = sessionErrors.map(({ rowNum, message })=>({
+                        rowNum,
+                        column: "*",
+                        message,
+                        value: "",
+                        errorEnum: CsvValidationErrorEnum.CUSTOM_VALIDATION
+                    }));
+                setValidation((prev)=>prev ? {
+                        ...prev,
+                        errors: [
+                            ...prev.errors,
+                            ...serverValidationErrors
+                        ]
+                    } : void 0);
+            }
             onImportSessionReady?.(sessionDataSource);
         } catch (error) {
             if (void 0 !== sessionDataSourceRef.current) await endEditSessionAndNotify(false, "failed");

package/types/csv-upload/parse/csv-upload-utils.d.ts

@@ -20,7 +20,11 @@ export type RpcBatchResult = {
     results: unknown[];
 };
 export declare const executeBatchRpcCalls: <T>(items: T[], executor: (item: T) => Promise<unknown>, errorFormatter: (item: T, error: string) => string) => Promise<RpcBatchResult>;
+export type SessionRowError = {
+    rowNum: number;
+    message: string;
+};
 export type SessionRowUpdateListener = () => void;
 export declare const getInlineRowErrorMessage: (result: unknown) => string | undefined;
-export declare const getRowVuuMsgError: (row: DataSourceRow, vuuMsgDataIndex: number, vuuRowNumDataIndex: number) => string | undefined;
-export declare const waitForSessionErrors: (isRemote: boolean, sessionErrors: Map<string | number, string>, receivedRowKeys: Set<string | number>, expectedRowCount: number, listeners: Set<SessionRowUpdateListener>, timeoutMs?: number) => Promise<string[]>;
+export declare const getRowVuuMsgError: (row: DataSourceRow, vuuMsgDataIndex: number, vuuRowNumDataIndex: number) => SessionRowError | undefined;
+export declare const waitForSessionErrors: (isRemote: boolean, sessionErrors: Map<string | number, SessionRowError>, receivedRowKeys: Set<string | number>, expectedRowCount: number, listeners: Set<SessionRowUpdateListener>, timeoutMs?: number) => Promise<SessionRowError[]>;

package/types/csv-upload/session/useImportSession.d.ts

@@ -2,6 +2,7 @@ import type { DataSource, SessionDataSourceOverrides } from "@vuu-ui/vuu-data-ty
 import { EditSession, type RowDefaultDataItemValues } from "@vuu-ui/vuu-data-editing";
 import { type RefObject } from "react";
 import type { CsvValidationResult } from "../parse/csv-schema-validation";
+import { type SessionRowError } from "../parse/csv-upload-utils";
 import type { CsvUploadSessionEndReason, CsvUploadSessionEndResult, CsvUploadSessionTable } from "../CsvUpload";
 export interface UseImportSessionProps {
     dataSource: DataSource;
@@ -13,7 +14,7 @@ export interface UseImportSessionProps {
 export interface UseImportSessionReturn {
     addAllRows: (mergedValidation: CsvValidationResult, isCancelled: () => boolean) => Promise<number | false>;
     beginEditSession: () => Promise<DataSource>;
-    checkSessionTableErrors: (sessionDs: DataSource, expectedRowCount: number) => Promise<string[]>;
+    checkSessionTableErrors: (sessionDs: DataSource, expectedRowCount: number) => Promise<SessionRowError[]>;
     closePendingEditSession: (save: boolean) => Promise<void>;
     editSession: EditSession;
     endEditSessionAndNotify: (save: boolean, reason: CsvUploadSessionEndReason) => Promise<void>;