More constants for field names

Author: labkey-jeckels

elispotassay/src/org/labkey/elispot/query/ElispotRunDataTable.java

@@ -170,7 +170,7 @@ public List<FieldKey> getDefaultVisibleColumns()
         FieldKey runPropFieldKey = FieldKey.fromParts("Run");
         fieldKeys.add(FieldKey.fromParts(runPropFieldKey, FieldKey.fromString("ProtocolName")));
         fieldKeys.add(FieldKey.fromParts(runPropFieldKey, FieldKey.fromString("PlateReader")));
-        fieldKeys.add(FieldKey.fromParts(runPropFieldKey,  FieldKey.fromString("Batch"), FieldKey.fromString("TargetStudy")));
+        fieldKeys.add(FieldKey.fromParts(runPropFieldKey,  FieldKey.fromString("Batch"), FieldKey.fromString(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME)));
         return fieldKeys;
     }
 

flow/src/org/labkey/flow/controllers/executescript/confirmRunsToImport.jsp

@@ -30,6 +30,7 @@
 <%@ page import="java.util.LinkedHashMap" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.Set" %>
+<%@ page import="org.labkey.api.assay.AbstractAssayProvider" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
     JspView<ImportRunsForm> me = HttpView.currentView();
@@ -86,8 +87,8 @@
                 to look up specimen information from the target study's specimen repository.
             </p>
             <p class="labkey-indented">
-                <label for="TargetStudy">Optionally, choose a target study folder:</label><br>
-                <select id="TargetStudy" name="TargetStudy">
+                <label for="<%= h(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME)%>">Optionally, choose a target study folder:</label><br>
+                <select id="<%= h(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME)%>" name="<%= h(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME)%>">
                     <labkey:options value="<%=unsafe(form.getTargetStudy())%>" map="<%=targetStudies%>"/>
                 </select>
             </p>

flow/src/org/labkey/flow/controllers/executescript/importAnalysisChooseAnalysis.jsp

@@ -36,6 +36,7 @@
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.Set" %>
+<%@ page import="org.labkey.api.assay.AbstractAssayProvider" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%
@@ -233,7 +234,7 @@ if (form.getKeywordDir() != null && form.getKeywordDir().length > 0 && StudyPubl
         <div style="padding-left: 2em; padding-bottom: 1em;">
             <br>
             Choose a target study folder:<br>
-            <%=select().name("TargetStudy").className(null).addOptions(targetStudies).selected(unsafe(form.getTargetStudy())).onChange("document.getElementById('studyChanged').value = true;")
+            <%=select().name(<%= h(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME)%>).className(null).addOptions(targetStudies).selected(unsafe(form.getTargetStudy())).onChange("document.getElementById('studyChanged').value = true;")
             %>
             <br><br>
         </div>

flow/src/org/labkey/flow/controllers/executescript/importAnalysisConfirm.jsp

@@ -42,6 +42,7 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.Set" %>
 <%@ page import="static org.labkey.flow.controllers.executescript.AnalysisScriptController.BACK_BUTTON_ACTION" %>
+<%@ page import="org.labkey.api.assay.AbstractAssayProvider" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
     ImportAnalysisForm form = (ImportAnalysisForm)getModelBean();
@@ -93,7 +94,7 @@
 <input type="hidden" name="existingAnalysisId" id="existingAnalysisId" value="<%=form.getExistingAnalysisId()%>">
 <% } %>
 
-<input type="hidden" name="TargetStudy" id="TargetStudy" value="<%=h(form.getTargetStudy())%>">
+<input type="hidden" name="<%= h(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME)%>" id="<%= h(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME)%>" value="<%=h(form.getTargetStudy())%>">
 
 <p>You are about to import the analysis from the workspace with the following settings:</p>
 <%

flow/src/org/labkey/flow/data/FlowProperty.java

@@ -16,6 +16,7 @@
 
 package org.labkey.flow.data;
 
+import org.labkey.api.assay.AbstractAssayProvider;
 import org.labkey.api.exp.PropertyType;
 import org.labkey.api.exp.property.SystemProperty;
 
@@ -35,7 +36,7 @@ abstract public class FlowProperty
     static public final SystemProperty AnalysisEngine = new SystemProperty(PROPERTY_BASE + "AnalysisEngine", PropertyType.STRING);
 
     // Property on FlowRun ExpRun object: container id of target study
-    static public final SystemProperty TargetStudy = new SystemProperty(PROPERTY_BASE + "TargetStudy", PropertyType.STRING);
+    static public final SystemProperty TargetStudy = new SystemProperty(PROPERTY_BASE + AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME, PropertyType.STRING);
 
     // Property on FlowFCSFile ExpData object: true when the FlowFCSFile was created from an external analysis (extracted from FlowJo workspace or analysis archive)
     //static public final SystemProperty ExtraKeywordsFCSFile = new SystemProperty(PROPERTY_BASE + "ExtraKeywordsFCSFile", PropertyType.BOOLEAN);

flow/src/org/labkey/flow/query/FCSFileCoalescingColumn.java

@@ -16,6 +16,7 @@
 package org.labkey.flow.query;
 
 import org.jetbrains.annotations.Nullable;
+import org.labkey.api.assay.AbstractAssayProvider;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.JdbcType;
 import org.labkey.api.data.SQLFragment;
@@ -74,7 +75,7 @@ public FCSFileCoalescingColumn(TableInfo parent, FieldKey key, JdbcType type, @N
                 _dateFieldKeys = Pair.of(dateFieldKey, FlowSchema.rewriteAsOriginalFCSFile(dateFieldKey));
         }
 
-        FieldKey targetStudyFieldKey = relativeFromFCSFile ? FieldKey.fromParts("Run", "TargetStudy") : FieldKey.fromParts("FCSFile", "Run", "TargetStudy");
+        FieldKey targetStudyFieldKey = relativeFromFCSFile ? FieldKey.fromParts("Run", AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME) : FieldKey.fromParts("FCSFile", "Run", "TargetStudy");
         _targetStudyFieldKeys = Pair.of(targetStudyFieldKey, FlowSchema.rewriteAsOriginalFCSFile(targetStudyFieldKey));
     }
 

luminex/test/src/org/labkey/test/components/luminex/importwizard/BatchPropertiesWebPart.java

@@ -17,6 +17,7 @@
 
 import org.labkey.test.Locator;
 import org.labkey.test.components.WebPartPanel;
+import org.labkey.test.components.assay.AssayConstants;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
@@ -67,6 +68,6 @@ public class Elements extends WebPartPanel<?>.ElementCache
 
     public static class Locators
     {
-        protected static final Locator sampleInfoRadio = Locator.radioButtonByNameAndValue("ParticipantVisitResolver", "SampleInfo");
+        protected static final Locator sampleInfoRadio = Locator.radioButtonByNameAndValue(AssayConstants.PARTICIPANT_VISIT_RESOLVER_FIELD_NAME, "SampleInfo");
     }
 }

luminex/test/src/org/labkey/test/tests/luminex/LuminexMultipleCurvesTest.java

@@ -145,7 +145,7 @@ private void reImportData(Map<String, WellRole[]> wellRoleMap)
         goToTestAssayHome();
         click(Locator.linkContainingText(MULTIPLE_CURVE_ASSAY_RUN_NAME));
             clickButtonContainingText("Re-import run");
-            checkCheckbox(Locator.radioButtonByNameAndValue("ParticipantVisitResolver", "SampleInfo"));
+            checkCheckbox(Locator.radioButtonByNameAndValue(AssayConstants.PARTICIPANT_VISIT_RESOLVER_FIELD_NAME, "SampleInfo"));
             clickButtonContainingText("Next");
             setFormElement(AssayConstants.ASSAY_NAME_FIELD_LOCATOR, MULTIPLE_CURVE_ASSAY_RUN_NAME);
             clickButtonContainingText("Next");

luminex/test/src/org/labkey/test/tests/luminex/LuminexUploadAndLinkTest.java

@@ -88,8 +88,8 @@ public void testUploadAndLink()
         // Upload another run using a thaw list pasted in as a TSV
         clickButton("Import Data");
         assertEquals(TEST_ASSAY_LUM_SET_PROP_SPECIES2, getFormElement(SPECIES_LOCATOR));
-        checkCheckbox(Locator.radioButtonByNameAndValue("ParticipantVisitResolver", "Lookup"));
-        checkCheckbox(Locator.radioButtonByNameAndValue("ThawListType", "Text"));
+        checkCheckbox(Locator.radioButtonByNameAndValue(AssayConstants.PARTICIPANT_VISIT_RESOLVER_FIELD_NAME, "Lookup"));
+        checkCheckbox(Locator.radioButtonByNameAndValue(AssayConstants.THAW_LIST_TYPE_FIELD_NAME, "Text"));
         setFormElement(Locator.id("ThawListTextArea"), "Index\tSpecimenID\tParticipantID\tVisitID\n" +
                 "1\tSpecimenID1\tParticipantID1\t1.1\n" +
                 "2\tSpecimenID2\tParticipantID2\t1.2\n" +
@@ -163,10 +163,10 @@ public void testUploadAndLink()
         // Upload another run using a thaw list that pointed at the list we uploaded earlier
         clickButton("Import Data");
         assertEquals(TEST_ASSAY_LUM_SET_PROP_SPECIES2, getFormElement(SPECIES_LOCATOR));
-        assertRadioButtonSelected(Locator.radioButtonByNameAndValue("ParticipantVisitResolver", "Lookup"));
-        assertRadioButtonSelected(Locator.radioButtonByNameAndValue("ThawListType", "Text"));
+        assertRadioButtonSelected(Locator.radioButtonByNameAndValue(AssayConstants.PARTICIPANT_VISIT_RESOLVER_FIELD_NAME, "Lookup"));
+        assertRadioButtonSelected(Locator.radioButtonByNameAndValue(AssayConstants.THAW_LIST_TYPE_FIELD_NAME, "Text"));
 
-        checkCheckbox(Locator.radioButtonByNameAndValue("ThawListType", "List"));
+        checkCheckbox(Locator.radioButtonByNameAndValue(AssayConstants.THAW_LIST_TYPE_FIELD_NAME, "List"));
         waitForElement(Locator.css(".schema-loaded-marker"));
         _ext4Helper.selectComboBoxItem(Locator.id("thawListSchemaName"), "lists");
         waitForElement(Locator.css(".query-loaded-marker"));

viability/src/org/labkey/viability/ViabilityAssaySchema.java

@@ -362,7 +362,7 @@ public TableInfo getLookupTableInfo()
 
         private MutableColumnInfo createTargetStudyCol()
         {
-            var col = wrapColumn(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME, getRealTable().getColumn("TargetStudy"));
+            var col = wrapColumn(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME, getRealTable().getColumn(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME));
             fixupRenderers(col, col);
             col.setUserEditable(false);
             col.setReadOnly(true);