bug fixes

Author: XingY

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

@@ -61,6 +61,7 @@ import {
     FILE_TYPE,
     FLAG_TYPE,
     INTEGER_TYPE,
+    MULTI_CHOICE_TYPE,
     ONTOLOGY_LOOKUP_TYPE,
     PARTICIPANT_TYPE,
     SAMPLE_TYPE,
@@ -371,6 +372,7 @@ describe('domain properties actions', () => {
             allowTextChoiceProperties: true,
             allowSampleSubjectProperties: true,
             allowCalculatedFields: true,
+            allowMultiChoiceProperties: true
         });
         const available = getAvailableTypes(domain);
         expect(available.contains(FLAG_TYPE)).toBeTruthy();
@@ -386,6 +388,7 @@ describe('domain properties actions', () => {
         expect(available.contains(SAMPLE_TYPE)).toBeTruthy();
         expect(available.contains(PARTICIPANT_TYPE)).toBeTruthy();
         expect(available.contains(CALCULATED_TYPE)).toBeFalsy();
+        expect(available.contains(MULTI_CHOICE_TYPE)).toBeTruthy();
     });
 
     test('getAvailableTypes, no optional allowed', () => {
@@ -399,6 +402,7 @@ describe('domain properties actions', () => {
             allowTextChoiceProperties: false,
             allowSampleSubjectProperties: false,
             allowCalculatedFields: false,
+            allowMultiChoiceProperties: false,
         });
         const available = getAvailableTypes(domain);
         expect(available.contains(FLAG_TYPE)).toBeFalsy();
@@ -414,6 +418,7 @@ describe('domain properties actions', () => {
         expect(available.contains(SAMPLE_TYPE)).toBeFalsy();
         expect(available.contains(PARTICIPANT_TYPE)).toBeFalsy();
         expect(available.contains(CALCULATED_TYPE)).toBeFalsy();
+        expect(available.contains(MULTI_CHOICE_TYPE)).toBeFalsy();
     });
 
     test('getAvailableTypes calculated fields, LKSM Starter', () => {

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

@@ -859,7 +859,8 @@ export function updateDataType(field: DomainField, value: any): DomainField {
 
     if (propType) {
         const dataType = propType.isLookup() ? field.lookupType : propType;
-
+        const wasTextChoice = field.isTextChoiceField() || field.isMultiChoiceField();
+        const isTextChoice = propType.isTextChoice() || propType.isMultiChoice();
         field = field.merge({
             dataType,
             conceptURI: dataType.conceptURI,
@@ -872,8 +873,8 @@ export function updateDataType(field: DomainField, value: any): DomainField {
             conceptLabelColumn: undefined,
             conceptImportColumn: undefined,
             scannable: undefined,
-            textChoiceValidator: undefined,
-            valueExpression: undefined,
+            textChoiceValidator: isTextChoice ? field.textChoiceValidator: undefined,
+            valueExpression: isTextChoice ? field.valueExpression: undefined,
         }) as DomainField;
 
         if (field.isNew()) {
@@ -886,13 +887,16 @@ export function updateDataType(field: DomainField, value: any): DomainField {
         if (field.isTextChoiceField() || field.isMultiChoiceField()) {
             // when changing a field to a Text Choice, add the default textChoiceValidator and
             // remove/reset all other propertyValidators and other text option settings
-            field = field.merge({
-                textChoiceValidator: DEFAULT_TEXT_CHOICE_VALIDATOR,
-                lookupValidator: undefined,
-                rangeValidators: [],
-                regexValidators: [],
-                scale: MAX_TEXT_LENGTH,
-            }) as DomainField;
+            if (!wasTextChoice) {
+                field = field.merge({
+                    textChoiceValidator: DEFAULT_TEXT_CHOICE_VALIDATOR,
+                    lookupValidator: undefined,
+                    rangeValidators: [],
+                    regexValidators: [],
+                    scale: MAX_TEXT_LENGTH,
+                    valueExpression: undefined,
+                }) as DomainField;
+            }
         } else if (field.isCalculatedField()) {
             field = field.merge({
                 importAliases: undefined,