Remove legacy GWT study design support

viscstudies/src/org/labkey/viscstudies/StudyDesignTable.java

@@ -0,0 +1,29 @@
+package org.labkey.viscstudies;
+
+import org.labkey.api.data.ColumnInfo;
+import org.labkey.api.data.ContainerFilter;
+import org.labkey.api.data.ContainerForeignKey;
+import org.labkey.api.data.DbSchema;
+import org.labkey.api.data.DbSchemaType;
+import org.labkey.api.query.FilteredTable;
+
+import static org.labkey.viscstudies.ViscStudySchema.STUDY_DESIGN_TABLE_NAME;
+
+public class StudyDesignTable extends FilteredTable<ViscStudySchema>
+{
+    public StudyDesignTable(ViscStudySchema schema, ContainerFilter cf)
+    {
+        super(DbSchema.get("study", DbSchemaType.Module).getTable(STUDY_DESIGN_TABLE_NAME), schema, null);
+        setName(STUDY_DESIGN_TABLE_NAME);
+        for (ColumnInfo baseColumn : _rootTable.getColumns())
+        {
+            String name = baseColumn.getName();
+
+            var colInfo = addWrapColumn(baseColumn);
+            if ("Container".equalsIgnoreCase(name) || "_ts".equalsIgnoreCase(name))
+                colInfo.setHidden(true);
+        }
+
+        getMutableColumn("Container").setFk(new ContainerForeignKey(schema));
+    }
+}

viscstudies/src/org/labkey/viscstudies/StudyDesignVersionTable.java

@@ -0,0 +1,29 @@
+package org.labkey.viscstudies;
+
+import org.labkey.api.data.ColumnInfo;
+import org.labkey.api.data.ContainerFilter;
+import org.labkey.api.data.ContainerForeignKey;
+import org.labkey.api.data.DbSchema;
+import org.labkey.api.data.DbSchemaType;
+import org.labkey.api.query.FilteredTable;
+
+import static org.labkey.viscstudies.ViscStudySchema.STUDY_DESIGN_VERSION_TABLE_NAME;
+
+public class StudyDesignVersionTable extends FilteredTable<ViscStudySchema>
+{
+    public StudyDesignVersionTable(ViscStudySchema schema, ContainerFilter cf)
+    {
+        super(DbSchema.get("study", DbSchemaType.Module).getTable(STUDY_DESIGN_VERSION_TABLE_NAME), schema, null);
+        setName(STUDY_DESIGN_VERSION_TABLE_NAME);
+        for (ColumnInfo baseColumn : _rootTable.getColumns())
+        {
+            String name = baseColumn.getName();
+
+            var colInfo = addWrapColumn(baseColumn);
+            if ("Container".equalsIgnoreCase(name) || "_ts".equalsIgnoreCase(name))
+                colInfo.setHidden(true);
+        }
+
+        getMutableColumn("Container").setFk(new ContainerForeignKey(schema));
+    }
+}

viscstudies/src/org/labkey/viscstudies/ViscStudiesModule.java

@@ -46,8 +46,6 @@ protected Collection<WebPartFactory> createWebPartFactories()
     @Override
     protected void init()
     {
-        addController("viscstudies", ViscStudiesController.class);
-
         DefaultSchema.registerProvider(ViscStudySchema.NAME, new DefaultSchema.SchemaProvider(this)
         {
             @Override

viscstudies/src/org/labkey/viscstudies/ViscStudyFolderTabs.java

@@ -21,7 +21,6 @@
 import org.labkey.api.portal.ProjectUrls;
 import org.labkey.api.security.User;
 import org.labkey.api.security.permissions.AdminPermission;
-import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.study.Study;
 import org.labkey.api.study.StudyService;
 import org.labkey.api.study.StudyUrls;
@@ -56,30 +55,6 @@ public boolean isVisible(Container c, User user)
         }
 
         protected abstract String getPanelName();
-
-        @Override
-        public ActionURL getURL(Container container, User user)
-        {
-            if (container.hasPermission(user, ReadPermission.class) && showGWTStudyDesigner(container, user) && getPanelName() != null)
-            {
-                ActionURL actionURL = new ActionURL("study-designer", "designer", container);
-                actionURL.addParameter("panel", getPanelName());
-                return actionURL;
-            }
-            else
-                return super.getURL(container, user);
-        }
-
-        public boolean showGWTStudyDesigner(Container c, User user)
-        {
-            // Issue 21092: show deprecated GWT study designer if we have a non-empty XML study design and no data in the study design hard tables
-            Study study = StudyService.get().getStudy(c);
-            return study != null
-                    && study.hasGWTStudyDesign(c, user)
-                    && study.getStudyProducts(user, null).isEmpty()
-                    && study.getStudyTreatments(user).isEmpty()
-                    && study.getAssaySpecimenConfigs().isEmpty();
-        }
     }
 
     public static class OverviewPage extends FolderTab

viscstudies/src/org/labkey/viscstudies/ViscStudySchema.java

@@ -23,7 +23,6 @@
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
 
-import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -34,6 +33,8 @@ public class ViscStudySchema extends UserSchema
 {
     public static final String NAME = "viscstudies";
     public static final String STUDY_TABLE_NAME = "studies";
+    public static final String STUDY_DESIGN_TABLE_NAME = "StudyDesign";
+    public static final String STUDY_DESIGN_VERSION_TABLE_NAME = "StudyDesignVersion";
 
     public ViscStudySchema(User user, Container container)
     {
@@ -56,12 +57,20 @@ public TableInfo createTable(String name, ContainerFilter cf)
             }
             return new ProjectStudiesTable(this, studyTable);
         }
+        if (STUDY_DESIGN_TABLE_NAME.equalsIgnoreCase(name))
+        {
+            return new StudyDesignTable(this, cf);
+        }
+        if (STUDY_DESIGN_VERSION_TABLE_NAME.equalsIgnoreCase(name))
+        {
+            return new StudyDesignVersionTable(this, cf);
+        }
         return null;
     }
 
     @Override
     public Set<String> getTableNames()
     {
-        return Collections.singleton(STUDY_TABLE_NAME);
+        return Set.of(STUDY_TABLE_NAME, STUDY_DESIGN_TABLE_NAME, STUDY_DESIGN_VERSION_TABLE_NAME);
     }
 }