Merge pull request #100 from LabKey/fb_merge_21.11_to_develop

bbimber · web-flow · commit 1277f7814f88 · 2021-12-16T15:57:05.000-08:00
Merge discvr-21.11 to develop
diff --git a/LDK/resources/web/LDK/LDKApi.lib.xml b/LDK/resources/web/LDK/LDKApi.lib.xml
@@ -47,6 +47,7 @@
     <dependencies>
         <dependency path="clientapi"/>
         <dependency path="clientapi_core"/>
+        <dependency path="Ext4"/>
         <dependency path="Ext4ClientApi"/>
         <dependency path="ux/CheckCombo/CheckCombo.js"/>
         <dependency path="ux/CheckCombo/CheckCombo.css"/>
diff --git a/LDK/src/org/labkey/ldk/query/BuiltInColumnsCustomizer.java b/LDK/src/org/labkey/ldk/query/BuiltInColumnsCustomizer.java
@@ -1,9 +1,9 @@
 package org.labkey.ldk.query;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.labkey.api.data.BaseColumnInfo;
+import org.apache.logging.log4j.Logger;
 import org.labkey.api.data.ColumnInfo;
+import org.labkey.api.data.MutableColumnInfo;
 import org.labkey.api.data.TableCustomizer;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.gwt.client.FacetingBehaviorType;
@@ -31,11 +31,11 @@ public void customize(TableInfo table)
     {
         for (ColumnInfo col : table.getColumns())
         {
-            COL_ENUM.processColumn( (BaseColumnInfo)col );
+            COL_ENUM.processColumn( (MutableColumnInfo)col );
 
             if (_disableFacetingForNumericCols && col.isNumericType() && col.getFk() == null)
             {
-                ((BaseColumnInfo)col).setFacetingBehaviorType(FacetingBehaviorType.ALWAYS_OFF);
+                ((MutableColumnInfo)col).setFacetingBehaviorType(FacetingBehaviorType.ALWAYS_OFF);
             }
         }
 
@@ -46,7 +46,7 @@ private enum COL_ENUM
     {
         created(Timestamp.class){
             @Override
-            public void customizeColumn(BaseColumnInfo col)
+            public void customizeColumn(MutableColumnInfo col)
             {
                 setNonEditable(col);
                 col.setHidden(true);
@@ -56,7 +56,7 @@ public void customizeColumn(BaseColumnInfo col)
         },
         createdby(Integer.class){
             @Override
-            public void customizeColumn(BaseColumnInfo col)
+            public void customizeColumn(MutableColumnInfo col)
             {
                 setNonEditable(col);
                 col.setHidden(true);
@@ -66,7 +66,7 @@ public void customizeColumn(BaseColumnInfo col)
         },
         modified(Timestamp.class){
             @Override
-            public void customizeColumn(BaseColumnInfo col)
+            public void customizeColumn(MutableColumnInfo col)
             {
                 setNonEditable(col);
                 col.setHidden(true);
@@ -76,7 +76,7 @@ public void customizeColumn(BaseColumnInfo col)
         },
         modifiedby(Integer.class){
             @Override
-            public void customizeColumn(BaseColumnInfo col)
+            public void customizeColumn(MutableColumnInfo col)
             {
                 setNonEditable(col);
                 col.setHidden(true);
@@ -86,23 +86,23 @@ public void customizeColumn(BaseColumnInfo col)
         },
         container(String.class){
             @Override
-            public void customizeColumn(BaseColumnInfo col)
+            public void customizeColumn(MutableColumnInfo col)
             {
                 setNonEditable(col);
                 col.setLabel("Folder");
             }
         },
         rowid(Integer.class){
             @Override
-            public void customizeColumn(BaseColumnInfo col)
+            public void customizeColumn(MutableColumnInfo col)
             {
                 setNonEditable(col);
                 col.setAutoIncrement(true);
             }
         },
         entityid(String.class){
             @Override
-            public void customizeColumn(BaseColumnInfo col)
+            public void customizeColumn(MutableColumnInfo col)
             {
                 setNonEditable(col);
                 col.setShownInDetailsView(false);
@@ -111,7 +111,7 @@ public void customizeColumn(BaseColumnInfo col)
         },
         objectid(String.class){
             @Override
-            public void customizeColumn(BaseColumnInfo col)
+            public void customizeColumn(MutableColumnInfo col)
             {
                 setNonEditable(col);
                 col.setShownInDetailsView(false);
@@ -125,16 +125,16 @@ public void customizeColumn(BaseColumnInfo col)
             this.dataType = dataType;
         }
 
-        private static void setNonEditable(BaseColumnInfo col)
+        private static void setNonEditable(MutableColumnInfo col)
         {
             col.setUserEditable(false);
             col.setShownInInsertView(false);
             col.setShownInUpdateView(false);
         }
 
-        abstract public void customizeColumn(BaseColumnInfo col);
+        abstract public void customizeColumn(MutableColumnInfo col);
 
-        public static void processColumn(BaseColumnInfo col)
+        public static void processColumn(MutableColumnInfo col)
         {
             for (COL_ENUM colEnum : COL_ENUM.values())
             {
diff --git a/LDK/src/org/labkey/ldk/query/ColumnOrderCustomizer.java b/LDK/src/org/labkey/ldk/query/ColumnOrderCustomizer.java
@@ -1,8 +1,8 @@
 package org.labkey.ldk.query;
 
 import org.labkey.api.data.AbstractTableInfo;
-import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.ColumnInfo;
+import org.labkey.api.data.MutableColumnInfo;
 import org.labkey.api.data.TableCustomizer;
 import org.labkey.api.data.TableInfo;
 
@@ -70,7 +70,7 @@ public boolean isReorderCandidate(ColumnInfo col)
         });
 
         for (ColumnInfo c : columns)
-            table.addColumn( (BaseColumnInfo)c );
+            table.addColumn( (MutableColumnInfo) c );
     }
 
     public void setDefaultVisible(AbstractTableInfo table)
diff --git a/laboratory/src/org/labkey/laboratory/query/AssayRunTemplatesCustomizer.java b/laboratory/src/org/labkey/laboratory/query/AssayRunTemplatesCustomizer.java
@@ -1,11 +1,11 @@
 package org.labkey.laboratory.query;
 
 import org.labkey.api.data.AbstractTableInfo;
-import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.DisplayColumn;
 import org.labkey.api.data.DisplayColumnFactory;
 import org.labkey.api.data.JdbcType;
+import org.labkey.api.data.MutableColumnInfo;
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.TableCustomizer;
 import org.labkey.api.data.TableInfo;
@@ -78,7 +78,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
 
             for (ColumnInfo ci : newCols)
             {
-                ati.addColumn( (BaseColumnInfo) ci);
+                ati.addColumn( (MutableColumnInfo) ci);
             }
         }
 
diff --git a/laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java b/laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java
@@ -3,11 +3,10 @@
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.AbstractTableInfo;
-import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerFilter;
@@ -302,7 +301,7 @@ public TableInfo getLookupTableInfo()
                                 // get forWrite==true because we modify this table
                                 TableInfo ti = ((UserSchema)getSchema()).getTable(_tableName, getLookupContainerFilter(), true, true);
 
-                                ((BaseColumnInfo)ti.getColumn(qd.getTargetColumn())).setKeyField(true);
+                                ((MutableColumnInfo)ti.getColumn(qd.getTargetColumn())).setKeyField(true);
 
                                 Set<ColumnInfo> birthCols = new HashSet<>();
                                 Set<ColumnInfo> deathCols = new HashSet<>();
@@ -398,7 +397,7 @@ public TableInfo getLookupTableInfo()
 
                 if (ti != null)
                 {
-                    BaseColumnInfo col = (BaseColumnInfo)ti.getColumn(pkColRawName);
+                    MutableColumnInfo col = (MutableColumnInfo)ti.getColumn(pkColRawName);
                     col.setKeyField(true);
                     col.setHidden(true);
                 }
@@ -467,12 +466,12 @@ public TableInfo getLookupTableInfo()
 
                 if (ti != null)
                 {
-                    BaseColumnInfo col = (BaseColumnInfo)ti.getColumn(pkColRawName);
+                    MutableColumnInfo col = (MutableColumnInfo)ti.getColumn(pkColRawName);
                     col.setKeyField(true);
                     col.setHidden(true);
 
-                    ((BaseColumnInfo)ti.getColumn("projects")).setLabel("Overlapping Groups");
-                    ((BaseColumnInfo)ti.getColumn("groups")).setLabel("Overlapping Sub-groups");
+                    ((MutableColumnInfo)ti.getColumn("projects")).setLabel("Overlapping Groups");
+                    ((MutableColumnInfo)ti.getColumn("groups")).setLabel("Overlapping Sub-groups");
                 }
 
                 return ti;
@@ -514,11 +513,11 @@ public TableInfo getLookupTableInfo()
 
                 if (ti != null)
                 {
-                    BaseColumnInfo col = (BaseColumnInfo)ti.getColumn(pkColRawName);
+                    MutableColumnInfo col = (MutableColumnInfo)ti.getColumn(pkColRawName);
                     col.setKeyField(true);
                     col.setHidden(true);
 
-                    ((BaseColumnInfo)ti.getColumn("lastStartDate")).setLabel("Most Recent Start Date");
+                    ((MutableColumnInfo)ti.getColumn("lastStartDate")).setLabel("Most Recent Start Date");
                 }
 
                 return ti;
@@ -577,12 +576,12 @@ public TableInfo getLookupTableInfo()
 
                 if (ti != null)
                 {
-                    BaseColumnInfo col = (BaseColumnInfo) ti.getColumn(pkColRawName);
+                    MutableColumnInfo col = (MutableColumnInfo) ti.getColumn(pkColRawName);
                     col.setKeyField(true);
                     col.setHidden(true);
 
-                    ((BaseColumnInfo)ti.getColumn("projects")).setLabel("All Groups/Projects");
-                    ((BaseColumnInfo)ti.getColumn("groups")).setLabel("All Sub-Groups");
+                    ((MutableColumnInfo)ti.getColumn("projects")).setLabel("All Groups/Projects");
+                    ((MutableColumnInfo)ti.getColumn("groups")).setLabel("All Sub-Groups");
                 }
 
                 return ti;
@@ -624,11 +623,11 @@ public TableInfo getLookupTableInfo()
 
                 if (ti != null)
                 {
-                    BaseColumnInfo col = (BaseColumnInfo) ti.getColumn(pkColRawName);
+                    MutableColumnInfo col = (MutableColumnInfo) ti.getColumn(pkColRawName);
                     col.setKeyField(true);
                     col.setHidden(true);
 
-                    ((BaseColumnInfo)ti.getColumn("lastStartDate")).setLabel("Most Recent Start Date");
+                    ((MutableColumnInfo)ti.getColumn("lastStartDate")).setLabel("Most Recent Start Date");
                 }
 
                 return ti;
@@ -808,7 +807,7 @@ public TableInfo getLookupTableInfo()
 
                 if (ti != null)
                 {
-                    BaseColumnInfo col = (BaseColumnInfo)ti.getColumn(pkColRawName);
+                    MutableColumnInfo col = (MutableColumnInfo)ti.getColumn(pkColRawName);
                     col.setKeyField(true);
                     col.setHidden(true);
                 }
diff --git a/laboratory/src/org/labkey/laboratory/query/SamplesCustomizer.java b/laboratory/src/org/labkey/laboratory/query/SamplesCustomizer.java
@@ -1,9 +1,9 @@
 package org.labkey.laboratory.query;
 
 import org.labkey.api.data.AbstractTableInfo;
-import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.JdbcType;
+import org.labkey.api.data.MutableColumnInfo;
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.TableCustomizer;
 import org.labkey.api.data.TableInfo;
@@ -62,7 +62,7 @@ private void appendAmountColumn(AbstractTableInfo ti)
             int idx = columns.indexOf(quantity);
             columns.add(idx + 1, col);
             for (ColumnInfo c : columns)
-                ti.addColumn( (BaseColumnInfo)c );
+                ti.addColumn( (MutableColumnInfo)c );
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`package org.labkey.ldk.query;`
`2`	`2`
`3`		`-import org.apache.logging.log4j.Logger;`
`4`	`3`	`import org.apache.logging.log4j.LogManager;`
`5`		`-import org.labkey.api.data.BaseColumnInfo;`
	`4`	`+import org.apache.logging.log4j.Logger;`
`6`	`5`	`import org.labkey.api.data.ColumnInfo;`
	`6`	`+import org.labkey.api.data.MutableColumnInfo;`
`7`	`7`	`import org.labkey.api.data.TableCustomizer;`
`8`	`8`	`import org.labkey.api.data.TableInfo;`
`9`	`9`	`import org.labkey.api.gwt.client.FacetingBehaviorType;`
`@@ -31,11 +31,11 @@ public void customize(TableInfo table)`
`31`	`31`	`{`
`32`	`32`	`for (ColumnInfo col : table.getColumns())`
`33`	`33`	`{`
`34`		`- COL_ENUM.processColumn( (BaseColumnInfo)col );`
	`34`	`+ COL_ENUM.processColumn( (MutableColumnInfo)col );`
`35`	`35`
`36`	`36`	`if (_disableFacetingForNumericCols && col.isNumericType() && col.getFk() == null)`
`37`	`37`	`{`
`38`		`- ((BaseColumnInfo)col).setFacetingBehaviorType(FacetingBehaviorType.ALWAYS_OFF);`
	`38`	`+ ((MutableColumnInfo)col).setFacetingBehaviorType(FacetingBehaviorType.ALWAYS_OFF);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`@@ -46,7 +46,7 @@ private enum COL_ENUM`
`46`	`46`	`{`
`47`	`47`	`created(Timestamp.class){`
`48`	`48`	`@Override`
`49`		`- public void customizeColumn(BaseColumnInfo col)`
	`49`	`+ public void customizeColumn(MutableColumnInfo col)`
`50`	`50`	`{`
`51`	`51`	`setNonEditable(col);`
`52`	`52`	`col.setHidden(true);`
`@@ -56,7 +56,7 @@ public void customizeColumn(BaseColumnInfo col)`
`56`	`56`	`},`
`57`	`57`	`createdby(Integer.class){`
`58`	`58`	`@Override`
`59`		`- public void customizeColumn(BaseColumnInfo col)`
	`59`	`+ public void customizeColumn(MutableColumnInfo col)`
`60`	`60`	`{`
`61`	`61`	`setNonEditable(col);`
`62`	`62`	`col.setHidden(true);`
`@@ -66,7 +66,7 @@ public void customizeColumn(BaseColumnInfo col)`
`66`	`66`	`},`
`67`	`67`	`modified(Timestamp.class){`
`68`	`68`	`@Override`
`69`		`- public void customizeColumn(BaseColumnInfo col)`
	`69`	`+ public void customizeColumn(MutableColumnInfo col)`
`70`	`70`	`{`
`71`	`71`	`setNonEditable(col);`
`72`	`72`	`col.setHidden(true);`
`@@ -76,7 +76,7 @@ public void customizeColumn(BaseColumnInfo col)`
`76`	`76`	`},`
`77`	`77`	`modifiedby(Integer.class){`
`78`	`78`	`@Override`
`79`		`- public void customizeColumn(BaseColumnInfo col)`
	`79`	`+ public void customizeColumn(MutableColumnInfo col)`
`80`	`80`	`{`
`81`	`81`	`setNonEditable(col);`
`82`	`82`	`col.setHidden(true);`
`@@ -86,23 +86,23 @@ public void customizeColumn(BaseColumnInfo col)`
`86`	`86`	`},`
`87`	`87`	`container(String.class){`
`88`	`88`	`@Override`
`89`		`- public void customizeColumn(BaseColumnInfo col)`
	`89`	`+ public void customizeColumn(MutableColumnInfo col)`
`90`	`90`	`{`
`91`	`91`	`setNonEditable(col);`
`92`	`92`	`col.setLabel("Folder");`
`93`	`93`	`}`
`94`	`94`	`},`
`95`	`95`	`rowid(Integer.class){`
`96`	`96`	`@Override`
`97`		`- public void customizeColumn(BaseColumnInfo col)`
	`97`	`+ public void customizeColumn(MutableColumnInfo col)`
`98`	`98`	`{`
`99`	`99`	`setNonEditable(col);`
`100`	`100`	`col.setAutoIncrement(true);`
`101`	`101`	`}`
`102`	`102`	`},`
`103`	`103`	`entityid(String.class){`
`104`	`104`	`@Override`
`105`		`- public void customizeColumn(BaseColumnInfo col)`
	`105`	`+ public void customizeColumn(MutableColumnInfo col)`
`106`	`106`	`{`
`107`	`107`	`setNonEditable(col);`
`108`	`108`	`col.setShownInDetailsView(false);`
`@@ -111,7 +111,7 @@ public void customizeColumn(BaseColumnInfo col)`
`111`	`111`	`},`
`112`	`112`	`objectid(String.class){`
`113`	`113`	`@Override`
`114`		`- public void customizeColumn(BaseColumnInfo col)`
	`114`	`+ public void customizeColumn(MutableColumnInfo col)`
`115`	`115`	`{`
`116`	`116`	`setNonEditable(col);`
`117`	`117`	`col.setShownInDetailsView(false);`
`@@ -125,16 +125,16 @@ public void customizeColumn(BaseColumnInfo col)`
`125`	`125`	`this.dataType = dataType;`
`126`	`126`	`}`
`127`	`127`
`128`		`- private static void setNonEditable(BaseColumnInfo col)`
	`128`	`+ private static void setNonEditable(MutableColumnInfo col)`
`129`	`129`	`{`
`130`	`130`	`col.setUserEditable(false);`
`131`	`131`	`col.setShownInInsertView(false);`
`132`	`132`	`col.setShownInUpdateView(false);`
`133`	`133`	`}`
`134`	`134`
`135`		`- abstract public void customizeColumn(BaseColumnInfo col);`
	`135`	`+ abstract public void customizeColumn(MutableColumnInfo col);`
`136`	`136`
`137`		`- public static void processColumn(BaseColumnInfo col)`
	`137`	`+ public static void processColumn(MutableColumnInfo col)`
`138`	`138`	`{`
`139`	`139`	`for (COL_ENUM colEnum : COL_ENUM.values())`
`140`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`package org.labkey.laboratory.query;`
`2`	`2`
`3`	`3`	`import org.labkey.api.data.AbstractTableInfo;`
`4`		`-import org.labkey.api.data.BaseColumnInfo;`
`5`	`4`	`import org.labkey.api.data.ColumnInfo;`
`6`	`5`	`import org.labkey.api.data.DisplayColumn;`
`7`	`6`	`import org.labkey.api.data.DisplayColumnFactory;`
`8`	`7`	`import org.labkey.api.data.JdbcType;`
	`8`	`+import org.labkey.api.data.MutableColumnInfo;`
`9`	`9`	`import org.labkey.api.data.SQLFragment;`
`10`	`10`	`import org.labkey.api.data.TableCustomizer;`
`11`	`11`	`import org.labkey.api.data.TableInfo;`
`@@ -78,7 +78,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)`
`78`	`78`
`79`	`79`	`for (ColumnInfo ci : newCols)`
`80`	`80`	`{`
`81`		`- ati.addColumn( (BaseColumnInfo) ci);`
	`81`	`+ ati.addColumn( (MutableColumnInfo) ci);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`