@vuu-ui/vuu-table-extras 3.2.0 → 3.3.1

package/package.json

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

package/src/csv-upload/CsvUpload.js

@@ -48,8 +48,15 @@ const CsvUpload_CsvUpload = (props)=>{
                             /*#__PURE__*/ jsx("div", {
                                 children: "Your file contains errors"
                             }),
+                            /*#__PURE__*/ jsx("ul", {
+                                className: `${classBase}-errorList`,
+                                children: validation.errors.filter((e)=>e.column in validation.errorMap.fileErrors).map((error, i)=>/*#__PURE__*/ jsx("li", {
+                                        className: `${classBase}-errorItem`,
+                                        children: error.message
+                                    }, i))
+                            }),
                             /*#__PURE__*/ jsx("div", {
-                                children: " Please rectify and reupload"
+                                children: "Please rectify and reupload"
                             })
                         ]
                     }) : /*#__PURE__*/ jsx("div", {

package/src/csv-upload/data-upload-preview/DataUploadPreview.js

@@ -38,7 +38,7 @@ const DataUploadPreview_DataUploadPreview = ({ className, editSession, onClose,
         editSession,
         onClose
     });
-    const isRowSelectable = useCallback((dataRow)=>"deleteRow" !== dataRow.vuu_action, []);
+    const isRowSelectable = useCallback((dataRow)=>"deleteRow" !== dataRow.vuuAction, []);
     const config = useMemo(()=>{
         const columns = tableSchema.columns.map((column)=>"vuuMsg" === column.name ? {
                 ...column,
@@ -60,7 +60,7 @@ const DataUploadPreview_DataUploadPreview = ({ className, editSession, onClose,
         return {
             columns: columns.concat({
                 hidden: true,
-                name: "vuu_action"
+                name: "vuuAction"
             }, undoColumn),
             columnDefaultWidth: 150,
             rowClassNameGenerators: rowClassNameGenerators,

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

@@ -1,3 +1,4 @@
 const CSV_HEADER_ROW_NUMBER = 1;
 const CSV_FIRST_DATA_ROW_NUMBER = 2;
-export { CSV_FIRST_DATA_ROW_NUMBER, CSV_HEADER_ROW_NUMBER };
+const MAX_ROWS_IN_CSV = 10000;
+export { CSV_FIRST_DATA_ROW_NUMBER, CSV_HEADER_ROW_NUMBER, MAX_ROWS_IN_CSV };

package/src/csv-upload/parse/csv-schema-validation.js

@@ -1,7 +1,6 @@
 import { getTypedValue } from "@vuu-ui/vuu-utils";
 import { CsvValidationErrorEnum, addCsvFileError, addCsvRowError, createCsvErrorState } from "./csv-errors.js";
-import { CSV_FIRST_DATA_ROW_NUMBER } from "./csv-constants.js";
-const MAX_ROWS_IN_CSV = 25000;
+import { CSV_FIRST_DATA_ROW_NUMBER, MAX_ROWS_IN_CSV } from "./csv-constants.js";
 const validateCsvAgainstSchema = (parsed, tableSchema, options)=>{
     const schemaColumns = new Map(tableSchema.columns.map((col)=>[
             col.name,
@@ -11,7 +10,7 @@ const validateCsvAgainstSchema = (parsed, tableSchema, options)=>{
     const errorState = createCsvErrorState();
     if (!parsed.header.includes(tableSchema.key)) addCsvFileError(errorState, tableSchema.key, CsvValidationErrorEnum.MISSING_KEY_COLUMN, `CSV must include key column '${tableSchema.key}'.`);
     parsed.header.forEach((column)=>{
-        if (!schemaColumns.has(column)) addCsvFileError(errorState, column, CsvValidationErrorEnum.UNKNOWN_COLUMN, "Column is not present in table schema.", column);
+        if (!schemaColumns.has(column)) addCsvFileError(errorState, column, CsvValidationErrorEnum.UNKNOWN_COLUMN, `Column ${column} is not present in table schema.`, column);
     });
     if (parsed.rows.length > maxRows) addCsvFileError(errorState, "*", CsvValidationErrorEnum.MAX_ROWS_EXCEEDED, `CSV row count ${parsed.rows.length} exceeds maxRows ${maxRows}.`, String(parsed.rows.length));
     const typedRows = [];

package/src/csv-upload/useCsvUpload.js

@@ -5,13 +5,18 @@ 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", onImportSessionEnded, onImportSessionStarted, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions })=>{
+const useCsvUpload = ({ dataSource, importMode = "direct", onImportSessionEnded, onImportSessionStarted, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults })=>{
     const [validation, setValidation] = useState();
     const [sessionTable, setSessionTable] = useState();
     const [isProcessingFile, setIsProcessingFile] = useState(false);
     const [isImporting, setIsImporting] = useState(false);
-    const editSession = useMemo(()=>new EditSession(dataSource), [
-        dataSource
+    const editSession = useMemo(()=>new EditSession({
+            dataSource,
+            editSessionApi: "createSessionDataSource",
+            rowDefaults
+        }), [
+        dataSource,
+        rowDefaults
     ]);
     const ownsEditSessionRef = useRef(true);
     const operationIdRef = useRef(0);
@@ -85,9 +90,12 @@ const useCsvUpload = ({ dataSource, importMode = "direct", onImportSessionEnded,
         for (const { rowNum, rowData, vuuMsg } of allRows){
             if (operationId !== operationIdRef.current) return false;
             try {
-                const payload = {
+                const payload = vuuMsg ? {
+                    vuuRowNum: rowNum,
+                    vuuMsg
+                } : {
                     ...rowData,
-                    rowNum,
+                    vuuRowNum: rowNum,
                     vuuMsg
                 };
                 const result = await editSession.addRow(payload);
@@ -103,7 +111,7 @@ const useCsvUpload = ({ dataSource, importMode = "direct", onImportSessionEnded,
         editSession
     ]);
     const beginEditSession = useCallback(async ()=>{
-        const sessionDataSource = await editSession.begin("Empty");
+        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");

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

@@ -1,9 +1,9 @@
 import { type ReactNode } from "react";
-import type { DataSource } from "@vuu-ui/vuu-data-types";
-import type { EditSession } from "@vuu-ui/vuu-data-editing";
-import type { VuuTable } from "@vuu-ui/vuu-protocol-types";
+import type { RowDefaultDataItemValues, EditSession } from "@vuu-ui/vuu-data-editing";
 import type { CsvParseError, CsvParseOptions } from "./parse/csv-parse";
 import type { CsvValidationStructuredError } from "./parse/csv-schema-validation";
+import type { DataSource } from "@vuu-ui/vuu-data-types";
+import type { VuuTable } from "@vuu-ui/vuu-protocol-types";
 import type { CsvUploadTableData } from "./parse/csv-upload-utils";
 export type CsvUploadImportedResult = {
     tableData: CsvUploadTableData;
@@ -51,5 +51,6 @@ export interface CsvUploadProps {
     open?: boolean;
     parseOptions?: CsvParseOptions;
     importMode?: "direct" | "preview";
+    rowDefaults?: RowDefaultDataItemValues;
 }
 export declare const CsvUpload: (props: CsvUploadProps) => import("react/jsx-runtime").JSX.Element;

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

@@ -1,2 +1,3 @@
 export declare const CSV_HEADER_ROW_NUMBER = 1;
 export declare const CSV_FIRST_DATA_ROW_NUMBER = 2;
+export declare const MAX_ROWS_IN_CSV = 10000;

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

@@ -1,4 +1,5 @@
 import type { DataSource, TableSchema } from "@vuu-ui/vuu-data-types";
+import { type RowDefaultDataItemValues } from "@vuu-ui/vuu-data-editing";
 import { type CsvParseOptions } from "./parse/csv-parse";
 import { type CsvValidationResult } from "./parse/csv-schema-validation";
 import type { CsvUploadErrorResult, CsvUploadImportedResult, CsvUploadPreviewResult, CsvUploadSessionEndResult, CsvUploadSessionTable } from "./CsvUpload";
@@ -13,6 +14,8 @@ export interface CsvUploadHookProps {
     onPreview?: (result: CsvUploadPreviewResult) => void;
     onProcessingStarted?: () => void;
     parseOptions?: CsvParseOptions;
+    /** Default column values applied to every addRow call. Pass a stable reference — a new object triggers EditSession recreation. */
+    rowDefaults?: RowDefaultDataItemValues;
 }
 export type UseCsvUploadReturn = {
     canImport: boolean;
@@ -26,4 +29,4 @@ export type UseCsvUploadReturn = {
     schema: TableSchema | undefined;
     validation: CsvValidationResult | undefined;
 };
-export declare const useCsvUpload: ({ dataSource, importMode, onImportSessionEnded, onImportSessionStarted, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, }: CsvUploadHookProps) => UseCsvUploadReturn;
+export declare const useCsvUpload: ({ dataSource, importMode, onImportSessionEnded, onImportSessionStarted, onError, onImported, onPreview, onProcessingStarted, maxRows, parseOptions, rowDefaults, }: CsvUploadHookProps) => UseCsvUploadReturn;