Refinements to customizer code, and many new SIV-related ETLs

(cherry picked from commit 8883e9d)

Author: bbimber

Studies/src/org/labkey/studies/query/StudiesTableCustomizer.java

@@ -1,10 +1,13 @@
 package org.labkey.studies.query;
 
+import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.logging.log4j.Logger;
+import org.labkey.api.collections.CaseInsensitiveKeyedHashSetValuedMap;
 import org.labkey.api.data.AbstractTableInfo;
 import org.labkey.api.data.TableCustomizer;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.ldk.LDKService;
+import org.labkey.api.study.DatasetTable;
 import org.labkey.api.util.logging.LogHelper;
 
 public class StudiesTableCustomizer implements TableCustomizer
@@ -14,7 +17,23 @@ public class StudiesTableCustomizer implements TableCustomizer
     @Override
     public void customize(TableInfo tableInfo)
     {
-        LDKService.get().getDefaultTableCustomizer().customize(tableInfo);
+        MultiValuedMap<String, String> props = new CaseInsensitiveKeyedHashSetValuedMap<>();
+        if (tableInfo.getPkColumnNames().size() > 1)
+        {
+            if (tableInfo.getPkColumnNames().contains("objectId"))
+            {
+                props.put("primaryKeyField", "objectId");
+            }
+            else if (tableInfo instanceof DatasetTable ds)
+            {
+                if (ds.getDataset().isDemographicData())
+                {
+                    props.put("primaryKeyField", ds.getDataset().getStudy().getSubjectColumnName());
+                }
+            }
+        }
+
+        LDKService.get().getDefaultTableCustomizer(props).customize(tableInfo);
         if (tableInfo instanceof AbstractTableInfo ati)
         {
             doCustomize(ati);

Studies/src/org/labkey/studies/query/StudiesUserSchema.java

@@ -161,7 +161,6 @@ private TableInfo createStudyDesignTable(String name, ContainerFilter cf, boolea
         ret.addPermissionMapping(InsertPermission.class, StudiesDataAdminPermission.class);
         ret.addPermissionMapping(UpdatePermission.class, StudiesDataAdminPermission.class);
         ret.addPermissionMapping(DeletePermission.class, StudiesDataAdminPermission.class);
-        ret.addPermissionMapping(ReadPermission.class, StudiesDataAdminPermission.class);
 
         if (addTriggers)
         {