PropertyType.MULTI_CHOICE

api/src/org/labkey/api/data/ColumnInfo.java

@@ -31,7 +31,6 @@
 import org.labkey.api.util.StringExpression;
 import org.labkey.data.xml.ColumnType;
 
-import java.beans.Introspector;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -56,6 +55,10 @@ else if (colInfo.getPropertyType() == PropertyType.ATTACHMENT)
             {
                 return new AttachmentDisplayColumn(colInfo);
             }
+            if (JdbcType.ARRAY == colInfo.getJdbcType() && PropertyType.MULTI_CHOICE == colInfo.getPropertyType())
+            {
+                return new MultiChoice.DisplayColumn(colInfo);
+            }
 
             DataColumn dataColumn = new DataColumn(colInfo);
             if (colInfo.getPropertyType() == PropertyType.MULTI_LINE)

api/src/org/labkey/api/data/ColumnRenderProperties.java

@@ -35,6 +35,7 @@
 import java.math.BigDecimal;
 import java.text.DecimalFormatSymbols;
 import java.util.Date;
+import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
 
@@ -168,8 +169,9 @@ else if (java.sql.Date.class.isAssignableFrom(javaClass))
             return "Date";
         else if (Date.class.isAssignableFrom(javaClass))
             return "Date and Time";
-        else
-            return "Other";
+        else if (List.class.isAssignableFrom(javaClass) || javaClass.isArray())
+            return "Array";
+        return "Other";
     }
 
     /** Don't return TYPEs just real java objects */
@@ -381,18 +383,20 @@ static Function<Object,Object> getDefaultConvertFn(ColumnRenderProperties col)
         final var defaultUnit = col.getDisplayUnit();
         final @NotNull var jdbcType = col.getJdbcType();
 
-        if (null == defaultUnit)
+        if (null != defaultUnit)
+            return defaultUnit::convert;
+
+        if (PropertyType.MULTI_CHOICE == col.getPropertyType())
+            return MultiChoice.Converter.getInstance();
+
+        return (value) ->
         {
-            return (value) ->
-            {
-                // quick check for unnecessary conversion
-                if (value == null || javaClass == value.getClass())
-                    return value;
-                if (value instanceof CharSequence)
-                    ConvertUtils.convert(value.toString(), javaClass);
-                return jdbcType.convert(value);
-            };
-        }
-        return defaultUnit::convert;
+            // quick check for unnecessary conversion
+            if (value == null || javaClass == value.getClass())
+                return value;
+            if (value instanceof CharSequence)
+                return ConvertUtils.convert(value.toString(), javaClass);
+            return jdbcType.convert(value);
+        };
     }
 }

api/src/org/labkey/api/data/ColumnRenderPropertiesImpl.java

@@ -791,19 +791,22 @@ public Class<?> getJavaClass(boolean isNullable)
 
     public static Class<?> defaultJavaClass(ColumnRenderProperties col, boolean isNullable)
     {
-        Class<?> ret;
-        boolean isNumeric;
         PropertyType pt = col.getPropertyType();
+        JdbcType jdbcType = col.getJdbcType();
+        boolean isNumeric;
+        Class<?> ret;
+
         if (pt != null)
         {
-            ret = pt.getJavaType();
+            if (JdbcType.ARRAY == jdbcType && PropertyType.MULTI_CHOICE == pt)
+                return MultiChoice.Array.class;
             isNumeric = pt.getJdbcType().isNumeric();
+            ret = pt.getJavaType();
         }
         else
         {
-            JdbcType jdbcType = col.getJdbcType();
-            ret = jdbcType.getJavaClass(isNullable);
             isNumeric = jdbcType.isNumeric();
+            ret = jdbcType.getJavaClass(isNullable);
         }
         if (isNumeric)
         {

api/src/org/labkey/api/data/DataColumn.java

@@ -61,6 +61,8 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -710,7 +712,7 @@ else if (_inputType.equalsIgnoreCase("checkbox"))
             {
                 IPropertyValidator textChoiceValidator = PropertyService.get().getValidatorForColumn(_boundColumn, PropertyValidatorType.TextChoice);
                 if (textChoiceValidator != null)
-                    renderTextChoiceFormInput(out, formFieldName, value, strVal, disabledInput, textChoiceValidator);
+                    renderTextChoiceFormInput(out, formFieldName, value, List.of(strVal), disabledInput, textChoiceValidator);
                 else
                     renderTextFormInput(out, formFieldName, value, strVal, disabledInput);
             }
@@ -735,7 +737,8 @@ else if (_inputType.equalsIgnoreCase("checkbox"))
         return ctx.getForm() == null || col == null ? HtmlString.EMPTY_STRING : ctx.getErrors(col);
     }
 
-    private void renderSelectFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput, NamedObjectList entryList)
+
+    private void renderSelectFormInput(HtmlWriter out, String formFieldName, Object value, List<String> strValues, boolean disabledInput, NamedObjectList entryList)
     {
         SelectBuilder select = new SelectBuilder()
             .disabled(disabledInput)
@@ -747,12 +750,15 @@ private void renderSelectFormInput(HtmlWriter out, String formFieldName, Object
         // add empty option
         options.add(new OptionBuilder().build());
 
+        Set<String> selectedValues = strValues.isEmpty() ? Set.of() :
+                strValues.size()==1 ? (null == strValues.get(0) ? Set.of() : Set.of(strValues.get(0))) :
+                new HashSet<>(strValues);
         for (NamedObject entry : entryList)
         {
             String entryName = entry.getName();
             OptionBuilder option = new OptionBuilder()
-                .selected(isSelectInputSelected(entryName, value, strVal))
-                .value(entryName);
+                    .selected(selectedValues.contains(entryName))
+                    .value(entryName);
 
             if (null != entry.getObject())
                 option.label(getSelectInputDisplayValue(entry));
@@ -767,22 +773,18 @@ private void renderSelectFormInput(HtmlWriter out, String formFieldName, Object
             renderHiddenFormInput(out, formFieldName, value);
     }
 
-    private void renderTextChoiceFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput, IPropertyValidator textChoiceValidator)
+    protected void renderTextChoiceFormInput(HtmlWriter out, String formFieldName, Object value, List<String> strValues, boolean disabledInput, IPropertyValidator textChoiceValidator)
     {
-        NamedObjectList options = new NamedObjectList();
-        List<String> choices = PropertyService.get().getTextChoiceValidatorOptions(textChoiceValidator);
+        LinkedHashSet<String> choices = new LinkedHashSet<>(PropertyService.get().getTextChoiceValidatorOptions(textChoiceValidator));
 
         // if the already saved strVal is not in the current choice set, add it (as it seems wrong to remove a value that the user hasn't explicitly touched)
-        if (!StringUtils.isEmpty(strVal) && !choices.contains(strVal))
-        {
-            choices = new ArrayList<>(choices);
-            choices.add(strVal);
-        }
+        choices.addAll(strValues);
 
+        NamedObjectList options = new NamedObjectList();
         for (String choice : choices)
             options.put(new SimpleNamedObject(choice, choice));
 
-        renderSelectFormInput(out, formFieldName, value, strVal, disabledInput, options);
+        renderSelectFormInput(out, formFieldName, value, strValues, disabledInput, options);
     }
 
     protected void renderSelectFormInputFromFk(RenderContext ctx, HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput)
@@ -807,7 +809,7 @@ protected void renderSelectFormInputFromFk(RenderContext ctx, HtmlWriter out, St
         }
         else
         {
-            renderSelectFormInput(out, formFieldName, value, strVal, disabledInput, entryList);
+            renderSelectFormInput(out, formFieldName, value, List.of(Objects.toString(value)), disabledInput, entryList);
         }
     }
 

api/src/org/labkey/api/data/DisplayColumn.java

@@ -58,6 +58,7 @@
 import java.text.DecimalFormatSymbols;
 import java.text.Format;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -631,7 +632,11 @@ public String getJsonTypeName()
 
     public static String getJsonTypeName(Class<?> valueClass)
     {
-        if (String.class.isAssignableFrom(valueClass))
+        if (Map.class.isAssignableFrom(valueClass))
+            return "object";
+        else if (valueClass.isArray() || List.class.isAssignableFrom(valueClass))
+            return "array";
+        else if (String.class.isAssignableFrom(valueClass))
             return "string";
         else if (Boolean.class.isAssignableFrom(valueClass) || boolean.class.isAssignableFrom(valueClass))
             return "boolean";
@@ -1166,7 +1171,7 @@ protected Object getInputValue(RenderContext ctx)
                     val = viewForm.getAsString(formFieldName);
             }
             else if (ctx.getRow() != null)
-                val = col.getValue(ctx);
+                val = getValue(ctx);
         }
 
         return val;

api/src/org/labkey/api/data/JdbcType.java

@@ -30,6 +30,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
+import java.sql.Array;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
@@ -299,6 +300,8 @@ protected Collection<Integer> getSqlTypes()
         }
     },
 
+    ARRAY(Types.ARRAY, Array.class),
+
     NULL(Types.NULL, Object.class),
 
     OTHER(Types.OTHER, Object.class);
@@ -398,7 +401,6 @@ protected void addSqlTypes(Collection<Integer> sqlTypes)
     public static JdbcType valueOf(int type)
     {
         JdbcType jt = sqlTypeMap.get(type);
-
         return null != jt ? jt : OTHER;
     }