jest

Author: XingY

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

@@ -1170,12 +1170,18 @@ describe('EditorModel', () => {
                         raw: 123,
                     },
                 ]),
+                [genCellKey(sampleColFk, 2)]: List<ValueDescriptor>([
+                    {
+                        display: 'Sample,321',
+                        raw: 321,
+                    },
+                ]),
             });
             const editorModel = modifyEm({
                 cellValues: basicEditorModel.cellValues.merge(cellValues),
                 columnMap: basicEditorModel.columnMap.set(sampleColFk, sampleColumn),
                 orderedColumns: basicEditorModel.orderedColumns.push(sampleColFk),
-                rowCount: 2,
+                rowCount: 3,
             });
             expect(editorModel.getRowValue(1, false).get('SampleID')).toBe(123);
             expect(editorModel.getRowValue(1, false).get('SampleID/Name')).toBe(undefined);
@@ -1184,6 +1190,50 @@ describe('EditorModel', () => {
             expect(editorModel.getRowValue(1, false, () => true).get('SampleID')).toBe(123);
             expect(editorModel.getRowValue(1, false, () => true).get('SampleID/Name')).toBe('Sample-123');
         });
+        test('include string list lookup display value', () => {
+            const lookColumn = new QueryColumn({
+                caption: 'List Look',
+                fieldKey: 'ListLook',
+                fieldKeyArray: ['ListLook'],
+                jsonType: 'string',
+                name: 'ListLook',
+                shownInInsertView: true,
+                shownInUpdateView: true,
+                required: true,
+                userEditable: true,
+                lookup: {
+                    schemaName: 'lists',
+                    queryName: 'Location',
+                    displayColumn: 'Path',
+                    keyColumn: 'Path',
+                },
+            });
+            const colFk = lookColumn.fieldKey.toLowerCase();
+            const cellValues = fromJS({
+                [genCellKey(colFk, 0)]: List<ValueDescriptor>([{ display: undefined, raw: undefined }]),
+                [genCellKey(colFk, 1)]: List<ValueDescriptor>([
+                    {
+                        display: 'Building 123',
+                        raw: 'Building 123',
+                    },
+                ]),
+                [genCellKey(colFk, 2)]: List<ValueDescriptor>([
+                    {
+                        display: 'Building, 321',
+                        raw: 'Building, 321',
+                    },
+                ]),
+            });
+            const editorModel = modifyEm({
+                cellValues: basicEditorModel.cellValues.merge(cellValues),
+                columnMap: basicEditorModel.columnMap.set(colFk, lookColumn),
+                orderedColumns: basicEditorModel.orderedColumns.push(colFk),
+                rowCount: 3,
+            });
+            expect(editorModel.getRowValue(0).get('ListLook')).toBe(undefined);
+            expect(editorModel.getRowValue(1).get('ListLook')).toBe('Building 123');
+            expect(editorModel.getRowValue(2).get('ListLook')).toBe('Building, 321');
+        });
     });
 
     describe('utils', () => {

packages/components/src/internal/query/api.test.ts

@@ -138,23 +138,26 @@ describe('api', () => {
     });
 
     describe('quoteValueColumnWithDelimiters', () => {
-        const results: ISelectRowsResult = {
-            key: 'test',
-            models: {
-                test: {
-                    1: { Name: { value: 'one', url: 'http://one/test', randomProperty: 123 } },
-                    2: { Name: { value: 'with, comma', url: 'http://with, comma/test' } },
-                    4: { Name: { value: 'with "quotes", and comma' } },
-                    3: { NoName: { value: 'nonesuch', url: 'http://with, comma/test' } },
-                    5: { Name: { value: ', comma first', displayValue: ',', url: 'http://with, comma/test' } },
+        function getResults(): ISelectRowsResult {
+            return {
+                key: 'test',
+                models: {
+                    test: {
+                        1: { Name: { value: 'one', url: 'http://one/test', randomProperty: 123 } },
+                        2: { Name: { value: 'with, comma', url: 'http://with, comma/test' } },
+                        4: { Name: { value: 'with "quotes", and comma' } },
+                        3: { NoName: { value: 'nonesuch', url: 'http://with, comma/test' } },
+                        5: { Name: { value: ', comma first', displayValue: ',', url: 'http://with, comma/test' } },
+                    },
                 },
-            },
-            orderedModels: List([1, 2, 3, 4, 5]),
-            queries: {},
-            rowCount: 5,
-        };
-        test('encode', () => {
-            expect(quoteValueColumnWithDelimiters(results, 'Name', ',')).toStrictEqual({
+                orderedModels: List([1, 2, 3, 4, 5]),
+                queries: {},
+                rowCount: 5,
+            };
+        }
+
+        test('encode (multiple=true by default)', () => {
+            expect(quoteValueColumnWithDelimiters(getResults(), 'Name', ',')).toStrictEqual({
                 key: 'test',
                 models: {
                     test: {
@@ -181,6 +184,24 @@ describe('api', () => {
                 rowCount: 5,
             });
         });
+
+        test('no encode when multiple=false', () => {
+            expect(quoteValueColumnWithDelimiters(getResults(), 'Name', ',', false)).toStrictEqual({
+                key: 'test',
+                models: {
+                    test: {
+                        1: { Name: { value: 'one', url: 'http://one/test', displayValue: 'one', randomProperty: 123 } },
+                        2: { Name: { value: 'with, comma', url: 'http://with, comma/test', displayValue: 'with, comma' } },
+                        4: { Name: { value: 'with "quotes", and comma', displayValue: 'with "quotes", and comma' } },
+                        3: { NoName: { value: 'nonesuch', url: 'http://with, comma/test' } },
+                        5: { Name: { value: ', comma first', displayValue: ',', url: 'http://with, comma/test' } },
+                    },
+                },
+                orderedModels: List([1, 2, 3, 4, 5]),
+                queries: {},
+                rowCount: 5,
+            });
+        });
     });
 
     test('splitRowsByContainer', () => {