jest tests

Author: XingY

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

@@ -564,6 +564,12 @@ describe('PropDescType', () => {
         expect(acceptablePropertyType(DATETIME_TYPE, TIME_RANGE_URI)).toBeFalsy();
         expect(acceptablePropertyType(DATE_TYPE, TIME_RANGE_URI)).toBeFalsy();
         expect(acceptablePropertyType(TIME_TYPE, DATE_RANGE_URI)).toBeFalsy();
+
+        // GitHub Issue 951: multiline text cannot convert to text choice
+        expect(acceptablePropertyType(TEXT_CHOICE_TYPE, MULTILINE_RANGE_URI)).toBeFalsy();
+        // but multiline text can still convert to other string types
+        expect(acceptablePropertyType(TEXT_TYPE, MULTILINE_RANGE_URI)).toBeTruthy();
+        expect(acceptablePropertyType(MULTILINE_TYPE, MULTILINE_RANGE_URI)).toBeTruthy();
     });
 });
 

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

@@ -3,7 +3,7 @@ import { List, Map } from 'immutable';
 import { QueryInfo } from '../../../public/QueryInfo';
 import { QueryColumn, QueryLookup } from '../../../public/QueryColumn';
 
-import { DATE_RANGE_URI, NON_NEGATIVE_NUMBER_CONCEPT_URI } from '../domainproperties/constants';
+import { DATE_RANGE_URI, MULTI_CHOICE_RANGE_URI, NON_NEGATIVE_NUMBER_CONCEPT_URI } from '../domainproperties/constants';
 
 import sampleSetQueryInfoJSON from '../../../test/data/sampleSetAllFieldTypes-getQueryDetails.json';
 
@@ -390,6 +390,77 @@ describe('getValidatedEditableGridValue', () => {
         });
     });
 
+    test('multi-choice column with valid values', () => {
+        const multiChoiceCol = new QueryColumn({
+            jsonType: 'string',
+            rangeURI: MULTI_CHOICE_RANGE_URI,
+            validValues: ['alpha', 'beta', 'gamma'],
+        });
+
+        const validArray = [{ display: 'alpha' }, { display: 'beta' }];
+        expect(getValidatedEditableGridValue(validArray, multiChoiceCol)).toStrictEqual({
+            message: undefined,
+            value: validArray,
+        });
+    });
+
+    test('multi-choice column with invalid choice', () => {
+        const multiChoiceCol = new QueryColumn({
+            jsonType: 'string',
+            rangeURI: MULTI_CHOICE_RANGE_URI,
+            validValues: ['alpha', 'beta', 'gamma'],
+        });
+
+        const invalidArray = [{ display: 'alpha' }, { display: 'invalid' }];
+        expect(getValidatedEditableGridValue(invalidArray, multiChoiceCol)).toStrictEqual({
+            message: { message: "'invalid' is not a valid choice" },
+            value: invalidArray,
+        });
+    });
+
+    test('multi-choice column with duplicate choice', () => {
+        const multiChoiceCol = new QueryColumn({
+            jsonType: 'string',
+            rangeURI: MULTI_CHOICE_RANGE_URI,
+            validValues: ['alpha', 'beta', 'gamma'],
+        });
+
+        const invalidArray = [{ display: 'alpha' }, { display: 'alpha' }];
+        expect(getValidatedEditableGridValue(invalidArray, multiChoiceCol)).toStrictEqual({
+            message: { message: "Duplicate values not allowed: alpha." },
+            value: invalidArray,
+        });
+    });
+
+    test('multi-choice column exceeding 10 items', () => {
+        const multiChoiceCol = new QueryColumn({
+            jsonType: 'string',
+            rangeURI: MULTI_CHOICE_RANGE_URI,
+            validValues: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k'],
+        });
+
+        const tooMany = Array.from({ length: 11 }, (_, i) => ({ display: String.fromCharCode(97 + i) }));
+        expect(getValidatedEditableGridValue(tooMany, multiChoiceCol)).toStrictEqual({
+            message: { message: 'Too many values. Maximum allowed is 10.' },
+            value: tooMany,
+        });
+    });
+
+    test('multi-choice column with exactly 10 items is valid', () => {
+        const values = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'];
+        const multiChoiceCol = new QueryColumn({
+            jsonType: 'string',
+            rangeURI: MULTI_CHOICE_RANGE_URI,
+            validValues: values,
+        });
+
+        const tenItems = values.map(v => ({ display: v }));
+        expect(getValidatedEditableGridValue(tenItems, multiChoiceCol)).toStrictEqual({
+            message: undefined,
+            value: tenItems,
+        });
+    });
+
     test('required column', () => {
         const requiredCol = new QueryColumn({ jsonType: 'string', required: true, caption: 'ReqCol' });
 

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

@@ -30,7 +30,7 @@ interface ValidatedValue {
 export const getValidatedEditableGridValue = (origValue: any, col: QueryColumn): ValidatedValue => {
     // col ?? {} so it's safe to destructure
     const { caption, isDateOnlyColumn, jsonType, required, scale, validValues } = col ?? {};
-    const isMultiChoice = col.isMultiChoice;
+    const isMultiChoice = col?.isMultiChoice;
     const isDateTimeType = jsonType === 'date';
     const isDateType = isDateTimeType && isDateOnlyColumn;
     let message;
@@ -57,8 +57,14 @@ export const getValidatedEditableGridValue = (origValue: any, col: QueryColumn):
             message = 'Too many values. Maximum allowed is 10.';
         }
         else if (validValues) {
+            const seen = new Set();
             origValue.forEach(val => {
                 const trimmed = val.display?.toString().trim();
+                if (seen.has(trimmed)) {
+                    message = `Duplicate values not allowed: ${trimmed}.`
+                    return false;
+                }
+                seen.add(trimmed);
                 if (validValues.indexOf(trimmed) === -1) {
                     message = `'${trimmed}' is not a valid choice`;
                     return false;

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

@@ -1,6 +1,6 @@
 import { Map } from 'immutable';
 
-import { extractEntityTypeOptionFromRow, getChosenParentData, sampleGenCellKey } from './actions';
+import { extractEntityTypeOptionFromRow, getChosenParentData, getIdentifyingFieldDisplayValue, sampleGenCellKey } from './actions';
 import { EntityDataType, EntityIdCreationModel } from './models';
 import { DataClassDataType, SampleTypeDataType } from './constants';
 
@@ -86,3 +86,33 @@ describe('sampleGenCellKey', () => {
         expect(sampleGenCellKey(null, 'Ancestors/Sources/Study', 1)).toBe('ancestors/sources/study&&1');
     });
 });
+
+describe('getIdentifyingFieldDisplayValue', () => {
+    test('returns formattedValue when available', () => {
+        expect(getIdentifyingFieldDisplayValue({ formattedValue: 'formatted', displayValue: 'display', value: 'raw' })).toBe('formatted');
+    });
+
+    test('falls back to displayValue when formattedValue is undefined', () => {
+        expect(getIdentifyingFieldDisplayValue({ displayValue: 'display', value: 'raw' })).toBe('display');
+    });
+
+    test('falls back to value when formattedValue and displayValue are undefined', () => {
+        expect(getIdentifyingFieldDisplayValue({ value: 'raw' })).toBe('raw');
+    });
+
+    test('joins array values with comma and space', () => {
+        expect(getIdentifyingFieldDisplayValue({ value: ['a', 'b', 'c'] })).toBe('a, b, c');
+    });
+
+    test('joins array formattedValue with comma and space', () => {
+        expect(getIdentifyingFieldDisplayValue({ formattedValue: ['x', 'y'] })).toBe('x, y');
+    });
+
+    test('returns single string value as-is', () => {
+        expect(getIdentifyingFieldDisplayValue({ value: 'single' })).toBe('single');
+    });
+
+    test('handles single-element array', () => {
+        expect(getIdentifyingFieldDisplayValue({ value: ['only'] })).toBe('only');
+    });
+});