LabKey · labkey-adam · Jan 8, 2025 · Jan 10, 2025 · Jan 10, 2025
diff --git a/api/gwtsrc/org/labkey/api/gwt/client/model/GWTDomain.java b/api/gwtsrc/org/labkey/api/gwt/client/model/GWTDomain.java
@@ -69,7 +69,8 @@ public class GWTDomain<FieldType extends GWTPropertyDescriptor> implements IsSer
     @Getter @Setter private String queryName = null;
     @Getter @Setter private String templateDescription = null; // null if no template
     @Getter @Setter private String instructions = null;
-    @Getter @Setter private boolean supportsPhiLevel = false;
+    @Getter @Setter private boolean phiLevelEnabled = false;
+    @Getter @Setter private String phiLevelDisabledReason = null;
 
     public GWTDomain()
     {
@@ -99,7 +100,8 @@ public GWTDomain(GWTDomain<FieldType> src)
         this.defaultValueOptions = src.defaultValueOptions;
         this.defaultValuesURL = src.defaultValuesURL;
         this.provisioned = src.provisioned;
-        this.supportsPhiLevel = src.supportsPhiLevel;
+        this.phiLevelEnabled = src.phiLevelEnabled;
+        this.phiLevelDisabledReason = src.phiLevelDisabledReason;
 
         if (src.indices != null)
         {

diff --git a/api/src/org/labkey/api/data/Results.java b/api/src/org/labkey/api/data/Results.java
@@ -32,8 +32,6 @@
 /**
  * A {@link java.sql.ResultSet} with additional metadata to make it easier to use. Understands the mapping of a
  * {@link org.labkey.api.query.FieldKey} that was part of the query to its value in the result set.
- * User: matthewb
- * Date: Nov 18, 2010
  */
 public interface Results extends ResultSet, TableResultSet
 {
@@ -43,11 +41,9 @@ public interface Results extends ResultSet, TableResultSet
     @NotNull
     Map<FieldKey, ColumnInfo> getFieldMap();
 
-    @NotNull
-    public Map<FieldKey, Integer> getFieldIndexMap();
+    @NotNull Map<FieldKey, Integer> getFieldIndexMap();
 
-    @NotNull
-    public Map<FieldKey, Object> getFieldKeyRowMap();
+    @NotNull Map<FieldKey, Object> getFieldKeyRowMap();
 
     @Nullable
     ResultSet getResultSet();

diff --git a/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java b/api/src/org/labkey/api/exp/api/SampleTypeDomainKind.java
@@ -23,7 +23,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.collections.CaseInsensitiveHashSet;
-import org.labkey.api.compliance.ComplianceService;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerFilter;
 import org.labkey.api.data.ContainerManager;
@@ -61,7 +60,6 @@
 import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.security.permissions.DesignSampleTypePermission;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.Pair;
 import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.NotFoundException;
@@ -667,12 +665,6 @@ public boolean hasNullValues(Domain domain, DomainProperty prop)
         return false;
     }
 
-    @Override
-    public boolean supportsPhiLevel()
-    {
-        return ComplianceService.get().isComplianceSupported();
-    }
-
     @Override
     public boolean supportsNamingPattern()
     {

diff --git a/api/src/org/labkey/api/exp/list/ListDefinition.java b/api/src/org/labkey/api/exp/list/ListDefinition.java
@@ -378,4 +378,7 @@ default boolean isPicklist()
 
     boolean getFileAttachmentIndex();
     void setFileAttachmentIndex(boolean index);
+
+    boolean getMultiFolder();
+    void setMultiFolder(boolean multiFolder);
 }
diff --git a/api/src/org/labkey/api/exp/property/DomainKind.java b/api/src/org/labkey/api/exp/property/DomainKind.java
@@ -406,11 +406,16 @@ public boolean isUserCreatedType()
         return true;
     }
 
-    public boolean supportsPhiLevel()
+    public boolean supportsPhiLevel(Domain domain)
     {
         return false;
     }
 
+    public String getPhiLevelUnsupportedReason(Domain domain)
+    {
+        return "This table type does not support PHI annotations";
+    }
+
     public boolean supportsNamingPattern()
     {
         return false;

diff --git a/api/src/org/labkey/api/exp/property/DomainUtil.java b/api/src/org/labkey/api/exp/property/DomainUtil.java
@@ -91,6 +91,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -121,9 +122,8 @@ public static String getFormattedDefaultValue(User user, DomainProperty property
     {
         if (defaultValue == null || (defaultValue instanceof String && StringUtils.isBlank((String)defaultValue)))
             return "[none]";
-        if (defaultValue instanceof Date)
+        if (defaultValue instanceof Date defaultDate)
         {
-            Date defaultDate = (Date) defaultValue;
             if (property.getFormat() != null)
                 return DateUtil.formatDateTime(defaultDate, property.getFormat());
             else
@@ -143,7 +143,7 @@ else if (AbstractAssayProvider.PARTICIPANT_VISIT_RESOLVER_PROPERTY_NAME.equalsIg
             }
             catch (Exception e)
             {
-                LogManager.getLogger(DomainUtil.class).debug("Failed to parse JSON for default value. It may predate JSON encoding for thaw list.", e);
+                LOG.debug("Failed to parse JSON for default value. It may predate JSON encoding for thaw list.", e);
                 // And then fall through below to return defaultValue.toString();
             }
         }
@@ -215,10 +215,7 @@ private static boolean isValidPdLookup(User user, Container c, GWTPropertyDescri
             tableNames = new CaseInsensitiveHashSet(schema.getTableNames());
         }
 
-        if (tableNames.contains(p.getLookupQuery()))
-            return true;
-
-        return false;
+        return tableNames.contains(p.getLookupQuery());
     }
 
     @Nullable
@@ -447,7 +444,8 @@ private static GWTDomain<GWTPropertyDescriptor> getDomain(Domain dd)
             gwtDomain.setAllowCalculatedFields(kind.allowCalculatedFields());
             gwtDomain.setShowDefaultValueSettings(kind.showDefaultValueSettings());
             gwtDomain.setInstructions(kind.getDomainEditorInstructions());
-            gwtDomain.setSupportsPhiLevel(kind.supportsPhiLevel());
+            gwtDomain.setPhiLevelEnabled(kind.supportsPhiLevel(dd));
+            gwtDomain.setPhiLevelDisabledReason(kind.getPhiLevelUnsupportedReason(dd));
         }
         return gwtDomain;
     }
@@ -878,17 +876,27 @@ public static ValidationException updateDomainDescriptor(GWTDomain<? extends GWT
             if (!StringUtils.isEmpty(pd.getPropertyURI()))
                 propertyUrisInUse.add(pd.getPropertyURI());
 
+        boolean supportsPhi = kind.supportsPhiLevel(d);
+        List<String> badPhiFields = new LinkedList<>();
+
         // now add properties
         for (GWTPropertyDescriptor pd : update.getFields())
         {
             addProperty(d, pd, defaultValues, propertyUrisInUse, validationException);
+            if (!supportsPhi && !PHI.NotPHI.name().equals(pd.getPHI()))
+                badPhiFields.add(pd.getName());
         }
 
+        if (!badPhiFields.isEmpty())
+            validationException.addError(new SimpleValidationError(kind.getPhiLevelUnsupportedReason(d) + " but the " +
+                StringUtilsLabKey.joinWithConjunction(badPhiFields, "and") + " field" +
+                (badPhiFields.size() == 1 ? " has" : "s have") + " a PHI level set"));
+
         try
         {
             if (validationException.getErrors().isEmpty())
             {
-                // Reorder the properties based on what we got from GWT
+                // Reorder the properties based on what the client sent
                 Map<String, DomainProperty> dps = new HashMap<>();
                 for (DomainProperty dp : d.getProperties())
                 {
@@ -1199,7 +1207,7 @@ private static List<Map<String, Object>> updatePropertyValidators(DomainProperty
 
             if (v.getExtraProperties() != null && v.getExtraProperties().containsKey("valueUpdates"))
             {
-                if (v.getExtraProperties().get("valueUpdates").size() > 0)
+                if (!v.getExtraProperties().get("valueUpdates").isEmpty())
                     valueUpdates.add(v.getExtraProperties().get("valueUpdates"));
             }
         }
@@ -1296,7 +1304,6 @@ private static void updateTextChoiceValueRows(Domain domain, User user, String p
         }
     }
 
-    @SuppressWarnings("unchecked")
     private static void _copyValidator(IPropertyValidator pv, GWTPropertyValidator gpv)
     {
         if (pv != null && gpv != null)
@@ -1343,7 +1350,7 @@ public static ValidationException validateProperties(@Nullable Domain domain, @N
 
             String name = field.getName();
 
-            if (null == name || name.trim().length() == 0)
+            if (null == name || name.trim().isEmpty())
             {
                 exception.addError(new SimpleValidationError(getDomainErrorMessage(updates,"Please provide a name for each field.")));
                 continue;

diff --git a/api/src/org/labkey/api/settings/SiteSettingsProperties.java b/api/src/org/labkey/api/settings/SiteSettingsProperties.java
@@ -1,8 +1,6 @@
 package org.labkey.api.settings;
 
 import org.apache.logging.log4j.Logger;
-import org.labkey.api.security.AuthenticationManager;
-import org.labkey.api.security.UserManager;
 import org.labkey.api.util.ExceptionReportingLevel;
 import org.labkey.api.util.SafeToRenderEnum;
 import org.labkey.api.util.UsageReportingLevel;

diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -54,7 +54,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "6.8.0",
+    "@labkey/components": "6.11.3-fb-multifolder.0",
     "@labkey/themes": "1.4.0"
   },
   "devDependencies": {

diff --git a/core/src/client/QueryMetadataEditor/QueryMetadataEditor.tsx b/core/src/client/QueryMetadataEditor/QueryMetadataEditor.tsx
@@ -373,7 +373,6 @@ class QueryMetadataEditor extends PureComponent<any, Partial<IAppState>> {
                             hideRequired: true,
                             isDragDisabled: true,
                             hideValidators: true,
-                            phiLevelDisabled: true,
                             hideAddFieldsButton: true,
                             hideTextOptions: true,
                             disableMvEnabled: true,

diff --git a/experiment/resources/schemas/dbscripts/postgresql/exp-25.000-25.001.sql b/experiment/resources/schemas/dbscripts/postgresql/exp-25.000-25.001.sql
@@ -0,0 +1 @@
+ALTER TABLE exp.List ADD MultiFolder BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/experiment/resources/schemas/dbscripts/sqlserver/exp-25.000-25.001.sql b/experiment/resources/schemas/dbscripts/sqlserver/exp-25.000-25.001.sql
@@ -0,0 +1 @@
+ALTER TABLE exp.List ADD MultiFolder BIT NOT NULL DEFAULT 0;
diff --git a/experiment/resources/schemas/exp.xml b/experiment/resources/schemas/exp.xml
@@ -248,6 +248,7 @@
           <column columnName="EachItemBodySetting" />
           <column columnName="EachItemBodyTemplate"/>
           <column columnName="FileAttachmentIndex"/>
+          <column columnName="MultiFolder"/>
       </columns>
   </table>
   <table tableName="Material" tableDbType="TABLE">

diff --git a/experiment/src/org/labkey/experiment/ExperimentModule.java b/experiment/src/org/labkey/experiment/ExperimentModule.java
@@ -182,7 +182,7 @@ public String getName()
     @Override
     public Double getSchemaVersion()
     {
-        return 25.000;
+        return 25.001;
     }
 
     @Nullable
@@ -824,7 +824,7 @@ public Collection<String> getSummary(Container c)
         Collection<String> list = new LinkedList<>();
         int runGroupCount = ExperimentService.get().getExperiments(c, null, false, true).size();
         if (runGroupCount > 0)
-            list.add("" + runGroupCount + " Run Group" + (runGroupCount > 1 ? "s" : ""));
+            list.add(runGroupCount + " Run Group" + (runGroupCount > 1 ? "s" : ""));
 
         User user = HttpView.currentContext().getUser();
 

diff --git a/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java b/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
@@ -21,7 +21,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.collections.CaseInsensitiveHashSet;
-import org.labkey.api.compliance.ComplianceService;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerFilter;
 import org.labkey.api.data.DbSchema;
@@ -481,12 +480,6 @@ public boolean allowCalculatedFields()
         return true;
     }
 
-    @Override
-    public boolean supportsPhiLevel()
-    {
-        return ComplianceService.get().isComplianceSupported();
-    }
-
     @Override
     public boolean supportsNamingPattern()
     {

diff --git a/experiment/src/org/labkey/experiment/controllers/property/PropertyController.java b/experiment/src/org/labkey/experiment/controllers/property/PropertyController.java
@@ -503,7 +503,7 @@ public Object execute(DomainApiForm form, BindException errors)
 
     @Marshal(Marshaller.Jackson)
     @RequiresPermission(ReadPermission.class) //Real permissions will be enforced later on by the DomainKind
-    public class SaveDomainAction extends MutatingApiAction<DomainApiForm>
+    public static class SaveDomainAction extends MutatingApiAction<DomainApiForm>
     {
         //Keeping both request and response object mappers to avoid serialization/deserialization issues
         //as not sure if request object mapper is needed

diff --git a/filecontent/src/org/labkey/filecontent/FilePropertiesDomainKind.java b/filecontent/src/org/labkey/filecontent/FilePropertiesDomainKind.java
@@ -34,11 +34,6 @@
 import java.util.List;
 import java.util.Set;
 
-/**
- * User: klum
- * Date: May 4, 2010
- * Time: 4:24:36 PM
- */
 public class FilePropertiesDomainKind extends BaseAbstractDomainKind
 {
     private static final List<String> RESERVED_FIELDS = Collections.unmodifiableList(Arrays.asList(
@@ -125,7 +120,7 @@ public DefaultValueType getDefaultDefaultType(Domain domain)
     }
 
     @Override
-    public boolean supportsPhiLevel()
+    public boolean supportsPhiLevel(Domain domain)
     {
         return ComplianceService.get().isComplianceSupported();
     }

diff --git a/list/schemas/lists.xsd b/list/schemas/lists.xsd
@@ -2,7 +2,7 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns="http://labkey.org/list/xml"
             targetNamespace="http://labkey.org/list/xml"
-            elementFormDefault="qualified" attributeFormDefault="unqualified">
+            elementFormDefault="qualified">
 
     <xsd:annotation>
         <xsd:documentation xml:lang="en">Describes the list settings, list-specific properties beyond those included in tableInfo.xsd.
@@ -12,31 +12,32 @@
 
     <xsd:element name="lists">
         <xsd:complexType>
-            <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+            <xsd:sequence maxOccurs="unbounded">
                 <xsd:element name="list">
                     <xsd:complexType>
                         <xsd:attribute name="name" type="xsd:string" use="required"/>
-                        <xsd:attribute name="id" type="xsd:int" use="optional"/>
-                        <xsd:attribute name="discussions" type="xsd:int" default="0" use="optional"/>
-                        <xsd:attribute name="allowDelete" type="xsd:boolean" default="true" use="optional"/>
-                        <xsd:attribute name="allowUpload" type="xsd:boolean" default="true" use="optional"/>
-                        <xsd:attribute name="allowExport" type="xsd:boolean" default="true" use="optional"/>
+                        <xsd:attribute name="id" type="xsd:int"/>
+                        <xsd:attribute name="discussions" type="xsd:int" default="0"/>
+                        <xsd:attribute name="allowDelete" type="xsd:boolean" default="true"/>
+                        <xsd:attribute name="allowUpload" type="xsd:boolean" default="true"/>
+                        <xsd:attribute name="allowExport" type="xsd:boolean" default="true"/>
 
-                        <xsd:attribute name="eachItemIndex" type="xsd:boolean" default="false" use="optional"/>
-                        <xsd:attribute name="eachItemTitleSetting" type="xsd:int" default="0" use="optional"/>
-                        <xsd:attribute name="eachItemTitleTemplate" type="xsd:string" use="optional"/>
-                        <xsd:attribute name="eachItemBodySetting" type="xsd:int" default="0" use="optional"/>
-                        <xsd:attribute name="eachItemBodyTemplate" type="xsd:string" use="optional"/>
+                        <xsd:attribute name="eachItemIndex" type="xsd:boolean" default="false"/>
+                        <xsd:attribute name="eachItemTitleSetting" type="xsd:int" default="0"/>
+                        <xsd:attribute name="eachItemTitleTemplate" type="xsd:string"/>
+                        <xsd:attribute name="eachItemBodySetting" type="xsd:int" default="0"/>
+                        <xsd:attribute name="eachItemBodyTemplate" type="xsd:string"/>
 
-                        <xsd:attribute name="entireListIndex" type="xsd:boolean" default="false" use="optional"/>
-                        <xsd:attribute name="entireListIndexSetting" type="xsd:int" default="0" use="optional"/>
-                        <xsd:attribute name="entireListTitleSetting" type="xsd:int" default="0" use="optional"/>
-                        <xsd:attribute name="entireListTitleTemplate" type="xsd:string" use="optional"/>
-                        <xsd:attribute name="entireListBodySetting" type="xsd:int" default="0" use="optional"/>
-                        <xsd:attribute name="entireListBodyTemplate" type="xsd:string" use="optional"/>
+                        <xsd:attribute name="entireListIndex" type="xsd:boolean" default="false"/>
+                        <xsd:attribute name="entireListIndexSetting" type="xsd:int" default="0"/>
+                        <xsd:attribute name="entireListTitleSetting" type="xsd:int" default="0"/>
+                        <xsd:attribute name="entireListTitleTemplate" type="xsd:string"/>
+                        <xsd:attribute name="entireListBodySetting" type="xsd:int" default="0"/>
+                        <xsd:attribute name="entireListBodyTemplate" type="xsd:string"/>
 
-                        <xsd:attribute name="fileAttachmentIndex" type="xsd:boolean" default="false" use="optional" />
-                        <xsd:attribute name="category" type="xsd:string" use="optional" />
+                        <xsd:attribute name="fileAttachmentIndex" type="xsd:boolean" default="false"/>
+                        <xsd:attribute name="category" type="xsd:string"/>
+                        <xsd:attribute name="multiFolder" type="xsd:boolean" default="false"/>
                     </xsd:complexType>
                 </xsd:element>
             </xsd:sequence>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE exp.List ADD MultiFolder BOOLEAN NOT NULL DEFAULT FALSE;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE exp.List ADD MultiFolder BIT NOT NULL DEFAULT 0;