Use papaParse, support multi-line paste

Author: XingY

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.23.3-fb-parseComma.0",
+  "version": "7.23.3-fb-parseComma.1",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [

packages/components/package.json

@@ -70,8 +70,8 @@ import {
     makeCommaSeparatedString,
     parseScientificInt,
     quoteValueWithDelimiters,
-    splitMultiValueForImport,
     setIsTestEnv,
+    splitMultiValueForImport,
     uncapitalizeFirstChar,
     valueIsEmpty,
     withTransformedKeys,
@@ -1539,7 +1539,6 @@ export {
     MAX_EDITABLE_GRID_ROWS,
     MAX_SELECTION_ACTION_ROWS,
     MEASUREMENT_UNITS,
-    UNITS_KIND,
     MemberType,
     MenuDivider,
     MenuHeader,
@@ -1725,6 +1724,7 @@ export {
     UnidentifiedPill,
     UNIQUE_ID_FIND_FIELD,
     UnitModel,
+    UNITS_KIND,
     updateCellKeySampleIdMap,
     updateCellValuesForSampleIds,
     updateColumnLookup,

packages/components/src/index.ts

@@ -1143,20 +1143,9 @@ describe('insertPastedData', () => {
             selectedColIdx: 0,
             selectedRowIdx: 2,
         });
-        const changes = await validateAndInsertPastedData(
-            em,
-            '"line1\nline2"',
-            undefined,
-            true,
-            true,
-            undefined,
-            true
-        );
+        const changes = await validateAndInsertPastedData(em, '"line1\nline2"', undefined, true, true, undefined, true);
         const cellValues = changes.cellValues;
-        expect(cellValues.get(genCellKey(fkOne, 2))).toEqual(
-            List([
-                { display: 'line1\nline2', raw: 'line1\nline2' }
-            ]));
+        expect(cellValues.get(genCellKey(fkOne, 2))).toEqual(List([{ display: 'line1\nline2', raw: 'line1\nline2' }]));
 
         const cellMessages = changes.cellMessages;
         expect(cellMessages.get(genCellKey(fkOne, 2))).toBeUndefined();
@@ -1311,7 +1300,7 @@ describe('insertPastedData', () => {
         expect(changes.cellValues.get(genCellKey(mvtc, 0))).toEqual(
             List([
                 { display: 'A', raw: 'A' },
-                { display: 'B', raw: 'B' }
+                { display: 'B', raw: 'B' },
             ])
         );
         expect(changes.cellMessages.get(genCellKey(mvtc, 0))).toBeUndefined();

packages/components/src/internal/components/editable/actions.test.ts

@@ -1437,14 +1437,13 @@ function parsePaste(value: string): ParsePastePayload {
         }
 
         rows.forEach(row => {
-            const columns : List<string> = List(row)
+            const columns: List<string> = List(row);
             if (numCols < columns.size) {
                 numCols = columns.size;
             }
             data = data.push(columns);
         });
-    }
-    else {
+    } else {
         // fall back to line by line processing without parsing, to preserver quotes
         value.split('\n').forEach(rv => {
             const columns = List(rv.split('\t'));
@@ -1455,7 +1454,6 @@ function parsePaste(value: string): ParsePastePayload {
         });
     }
 
-
     // Normalize the number columns in each row in case a user pasted rows with different numbers of columns in them
     data = data
         .map(columns => {
@@ -1752,12 +1750,11 @@ export function pasteEvent(
 function getCellCopyValue(valueDescriptors: List<ValueDescriptor>): string {
     if (valueDescriptors && valueDescriptors.size > 0) {
         const values = [];
-        valueDescriptors.forEach((vd) => {
+        valueDescriptors.forEach(vd => {
             values.push(vd.display !== undefined ? vd.display.toString().trim() : '');
         });
 
-        if (values.length > 0)
-            return joinMultiValueForExport(values);
+        if (values.length > 0) return joinMultiValueForExport(values);
     }
 
     return '';

packages/components/src/internal/components/editable/actions.ts

@@ -129,8 +129,10 @@ export function formatSavedResults(
 
     const { key, orderedModels } = result;
     const models = fromJS(result.models[key]);
-    const orderedResults = orderedModels[key]
-        .reduce((ordered, k) => ordered.set(k, models.get(k)), OrderedMap<string, any>());
+    const orderedResults = orderedModels[key].reduce(
+        (ordered, k) => ordered.set(k, models.get(k)),
+        OrderedMap<string, any>()
+    );
 
     return formatResults(model, orderedResults, token);
 }

packages/components/src/internal/components/forms/model.ts

@@ -46,8 +46,8 @@ import {
     isNonNegativeInteger,
     isQuotedWithDelimiters,
     isSameWithStringCompare,
-    isSimpleQuotedMultiLine,
     isSetEqual,
+    isSimpleQuotedMultiLine,
     joinMultiValueForExport,
     makeCommaSeparatedString,
     parseCsvString,

packages/components/src/internal/util/utils.test.ts

@@ -764,13 +764,11 @@ export function isSimpleQuotedMultiLine(value: any): boolean {
         return false;
     }
 
-    if (!NEWLINE_CHARS.find(char => value.indexOf(char) > -1))
-        return false;
+    if (!NEWLINE_CHARS.find(char => value.indexOf(char) > -1)) return false;
 
     const strVal = value + '';
     if (strVal.length <= 2) return false; // need at least 2 characters to be quoted with something in between
-    if (!strVal.startsWith('"') || !strVal.endsWith('"'))
-        return false
+    if (!strVal.startsWith('"') || !strVal.endsWith('"')) return false;
 
     const innerValue = strVal.substring(1, strVal.length - 1);
     return innerValue.indexOf('"') === -1;
@@ -780,13 +778,19 @@ export function joinMultiValueForExport(values: string[]): string {
     return Papa.unparse([values], { delimiter: ',' });
 }
 
-const processParsedResults = (results, removeEmpty: boolean = true, trimSpace?: boolean): string[] => {
-    return results.data[0]?.map(value => (trimSpace && Utils.isString(value) ? value.trim() : value))
-        .filter(value_ => removeEmpty ? value_ !== '' : true)
-}
+const processParsedResults = (results, removeEmpty = true, trimSpace?: boolean): string[] => {
+    return results.data[0]
+        ?.map(value => (trimSpace && Utils.isString(value) ? value.trim() : value))
+        .filter(value_ => (removeEmpty ? value_ !== '' : true));
+};
 // Port of Java PageFlowUtil.splitStringToValuesForImport — Google Sheets-compatible CSV parsing
 // for multi-value (multi-select) column values. Fixed comma delimiter, double-quote quoting.
-export function splitMultiValueForImport(str: string, delimiter: string = ',', removeEmpty: boolean = true, trimSpace?: boolean): string[] {
+export function splitMultiValueForImport(
+    str: string,
+    delimiter = ',',
+    removeEmpty = true,
+    trimSpace?: boolean
+): string[] {
     if (str === null) return null;
     if (str === undefined) return undefined;
     if (!str) {