@vuu-ui/vuu-table-extras 3.3.15 → 3.3.17

package/package.json

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

@@ -13,7 +13,7 @@ var csv_errors_CsvValidationErrorEnum = /*#__PURE__*/ function(CsvValidationErro
     CsvValidationErrorEnum["MISSING_KEY_COLUMN"] = "MISSING_KEY_COLUMN";
     CsvValidationErrorEnum["UNKNOWN_COLUMN"] = "UNKNOWN_COLUMN";
     CsvValidationErrorEnum["MAX_ROWS_EXCEEDED"] = "MAX_ROWS_EXCEEDED";
-    CsvValidationErrorEnum["EMPTY_NON_STRING_VALUE"] = "EMPTY_NON_STRING_VALUE";
+    CsvValidationErrorEnum["REQUIRED_FIELD_MISSING"] = "REQUIRED_FIELD_MISSING";
     CsvValidationErrorEnum["TYPE_MISMATCH"] = "TYPE_MISMATCH";
     CsvValidationErrorEnum["CUSTOM_VALIDATION"] = "CUSTOM_VALIDATION";
     return CsvValidationErrorEnum;

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

@@ -41,7 +41,7 @@ const getFriendlyErrorMessage = (errMessage, rawValue, toType)=>{
 const validateCsvAgainstSchema = (parsed, tableSchema, options)=>{
     const schemaColumns = new Map(tableSchema.columns.map((col)=>[
             col.name,
-            col.serverDataType
+            col
         ]));
     const maxRows = options?.maxRows ?? MAX_ROWS_IN_CSV;
     const errorState = createCsvErrorState();
@@ -60,8 +60,13 @@ const validateCsvAgainstSchema = (parsed, tableSchema, options)=>{
         }, {});
         parsed.header.forEach((columnName, columnIndex)=>{
             const rawValue = rowValues[columnIndex] ?? "";
-            const schemaType = schemaColumns.get(columnName);
-            if (0 === rawValue.length && "string" !== schemaType) return void addCsvRowError(errorState, rowNum, columnName, CsvValidationErrorEnum.EMPTY_NON_STRING_VALUE, "This field is required and cannot be left blank", rawValue);
+            const schemaColumn = schemaColumns.get(columnName);
+            const schemaType = schemaColumn?.serverDataType;
+            const isRequired = schemaColumn?.required === true;
+            if (0 === rawValue.length) {
+                if (isRequired) addCsvRowError(errorState, rowNum, columnName, CsvValidationErrorEnum.REQUIRED_FIELD_MISSING, "This field is required and cannot be left blank", rawValue);
+                return;
+            }
             let value;
             const toType = schemaType ?? "string";
             try {

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

@@ -11,7 +11,7 @@ export declare enum CsvValidationErrorEnum {
     MISSING_KEY_COLUMN = "MISSING_KEY_COLUMN",
     UNKNOWN_COLUMN = "UNKNOWN_COLUMN",
     MAX_ROWS_EXCEEDED = "MAX_ROWS_EXCEEDED",
-    EMPTY_NON_STRING_VALUE = "EMPTY_NON_STRING_VALUE",
+    REQUIRED_FIELD_MISSING = "REQUIRED_FIELD_MISSING",
     TYPE_MISMATCH = "TYPE_MISMATCH",
     CUSTOM_VALIDATION = "CUSTOM_VALIDATION"
 }

package/types/csv-upload/parse/csv-schema-validation.d.ts

@@ -1,8 +1,14 @@
-import type { TableSchema } from "@vuu-ui/vuu-data-types";
+import type { TableSchema, SchemaColumn } from "@vuu-ui/vuu-data-types";
 import type { VuuRowDataItemType } from "@vuu-ui/vuu-protocol-types";
 import type { CsvValidationError, CsvValidationErrorMap, CsvParseError } from "./csv-errors";
 import type { CsvParseResult } from "./csv-parse";
 export { CsvValidationErrorEnum, type CsvValidationError, type CsvValidationErrorMap, type CsvValidationErrorType, type CsvValidationStructuredError, } from "./csv-errors";
+export interface ImportSchemaColumn extends SchemaColumn {
+    required?: boolean;
+}
+export interface ImportTableSchema extends Omit<TableSchema, "columns"> {
+    readonly columns: readonly ImportSchemaColumn[];
+}
 export type CsvColumnValidator = (value: string, columnName: string, row: Record<string, string>) => boolean | string;
 export type CsvValidationResult = {
     columns: string[];
@@ -15,4 +21,4 @@ export type CsvValidationOptions = {
     maxRows?: number;
     validators?: Record<string, CsvColumnValidator>;
 };
-export declare const validateCsvAgainstSchema: (parsed: CsvParseResult, tableSchema: TableSchema, options?: CsvValidationOptions) => CsvValidationResult;
+export declare const validateCsvAgainstSchema: (parsed: CsvParseResult, tableSchema: TableSchema | ImportTableSchema, options?: CsvValidationOptions) => CsvValidationResult;