Issue 53306: Some LKS forms don't distinguish between fields properly

api/src/org/labkey/api/assay/actions/UploadWizardAction.java

@@ -769,9 +769,9 @@ protected void addHiddenRunProperties(FormType newRunForm, InsertView insertView
     public static String getInputName(DomainProperty property, String disambiguationId)
     {
         if (disambiguationId != null)
-            return ColumnInfo.propNameFromName(disambiguationId + "_" + property.getName());
+            return disambiguationId + "_" + property.getName();
         else
-            return ColumnInfo.propNameFromName(property.getName());
+            return property.getName();
     }
 
     public static String getInputName(DomainProperty property)
@@ -783,7 +783,7 @@ protected void addHiddenProperties(Map<DomainProperty, String> properties, Inser
     {
         for (Map.Entry<DomainProperty, String> entry : properties.entrySet())
         {
-            String name = ColumnInfo.propNameFromName(entry.getKey().getName());
+            String name = entry.getKey().getName();
             String value = entry.getValue();
             insertView.getDataRegion().addHiddenFormField(name, value);
         }
@@ -940,7 +940,7 @@ public void validateStep(FormType form, Errors errors)
             {
                 validatePostedProperties(getViewContext(), form.getBatchProperties(), errors);
 
-                if (ThawListResolverType.NAME.equals(form.getRequest().getParameter("participantVisitResolver")))
+                if (ThawListResolverType.NAME.equals(form.getRequest().getParameter(AbstractAssayProvider.PARTICIPANT_VISIT_RESOLVER_PROPERTY_NAME)))
                     ThawListResolverType.validationHelper(form, errors);
 
             }

api/src/org/labkey/api/data/AbstractTableInfo.java

@@ -693,7 +693,7 @@ protected ColumnInfo resolveColumn(String name)
         {
             if (null != col)        // #19358
             {
-                String propName = col.getPropertyName();
+                String propName = BaseColumnInfo.propNameFromName(col.getName());
                 if (null != propName && propName.equalsIgnoreCase(name))
                     return col;
             }

api/src/org/labkey/api/data/AbstractWrappedColumnInfo.java

@@ -215,12 +215,6 @@ public boolean isShouldLog()
         return delegate.isShouldLog();
     }
 
-    @Override
-    public String getPropertyName()
-    {
-        return delegate.getPropertyName();
-    }
-
     @Override
     public boolean isVersionColumn()
     {

api/src/org/labkey/api/data/BaseColumnInfo.java

@@ -86,8 +86,6 @@ public class BaseColumnInfo extends ColumnRenderPropertiesImpl implements Mutabl
 
     @NotNull
     private FieldKey _fieldKey;
-    // _propertyName is computed from getName();
-    private String _propertyName = null;
     private DatabaseIdentifier _alias;
     private String _sqlTypeName;
     private JdbcType _jdbcType = null;
@@ -253,7 +251,6 @@ public void setName(@NotNull String name)
         FieldKey newFieldKey = new FieldKey(null, name);
         assert !_lockName || 0 == _fieldKey.compareTo(newFieldKey);
         _fieldKey = newFieldKey;
-        _propertyName = null;
     }
 
 
@@ -272,7 +269,6 @@ public void setFieldKey(@NotNull FieldKey key)
     {
         checkLocked();
         _fieldKey = Objects.requireNonNull(key);
-        _propertyName = null;
     }
 
 
@@ -887,16 +883,6 @@ public void setShouldLog(boolean shouldLog)
         _shouldLog = shouldLog;
     }
 
-    @Override
-    public String getPropertyName()
-    {
-        // this is surprisingly expensive, cache it!
-        if (null == _propertyName)
-            _propertyName = propNameFromName(getName());
-        return _propertyName;
-    }
-
-
     /**
      * Version column can be used for optimistic concurrency.
      * for now we assume that this column is never updated
@@ -1727,7 +1713,7 @@ public static Collection<BaseColumnInfo> createFromDatabaseMetaData(String schem
                     col._label = reader.getLabel();
                     col._description = reader.getDescription();
 
-                    if (NON_EDITABLE_COL_NAMES.contains(col.getPropertyName()))
+                    if (NON_EDITABLE_COL_NAMES.contains(col.getName()))
                         col.setUserEditable(false);
 
                     colMap.put(col.getName(), col);

api/src/org/labkey/api/data/ColumnInfo.java

@@ -216,8 +216,6 @@ static int findColumn(ResultSet rs, String name)
 
     boolean isShouldLog();
 
-    String getPropertyName();
-
     /**
      * Version column can be used for optimistic concurrency.
      * for now we assume that this column is never updated

api/src/org/labkey/api/data/DisplayColumn.java

@@ -329,7 +329,7 @@ public Object getJsonValue(RenderContext ctx)
     public String getName()
     {
         if (null != getColumnInfo())
-            return getColumnInfo().getPropertyName();
+            return getColumnInfo().getName();
         else
             return super.getName();
     }

api/src/org/labkey/api/data/DisplayColumnGroup.java

@@ -91,7 +91,7 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
 
     private String getGroupFormFieldName(RenderContext ctx)
     {
-        return ColumnInfo.propNameFromName(getColumns().get(0).getFormFieldName(ctx));
+        return getColumns().get(0).getFormFieldName(ctx);
     }
 
     public void writeCopyableJavaScript(RenderContext ctx, Writer out) throws IOException

api/src/org/labkey/api/data/Table.java

@@ -1189,7 +1189,7 @@ public static void ensureRequiredColumns(TableInfo table, Map<FieldKey, ColumnIn
         {
             if (cols.containsKey(column.getFieldKey()))
                 continue;
-            if (requiredColumns.contains(column.getFieldKey()) || requiredColumns.contains(new FieldKey(null,column.getAlias().getId())) || requiredColumns.contains(new FieldKey(null,column.getPropertyName())))
+            if (requiredColumns.contains(column.getFieldKey()) || requiredColumns.contains(new FieldKey(null,column.getAlias().getId())) || requiredColumns.contains(new FieldKey(null,column.getName())))
                 cols.put(column.getFieldKey(), column);
             else if (column.isKeyField())
                 cols.put(column.getFieldKey(), column);

api/src/org/labkey/api/data/TableViewForm.java

@@ -781,7 +781,7 @@ public void forceReselect()
 
     public String getFormFieldName(@NotNull ColumnInfo column)
     {
-        return column.getPropertyName();
+        return column.getName();
     }
 
     public String getMultiPartFormFieldName(@NotNull ColumnInfo column)

api/src/org/labkey/api/data/TableWrapperDynaClass.java

@@ -38,7 +38,7 @@ private TableWrapperDynaClass(TableInfo tinfo)
         List<ColumnInfo> cols = tinfo.getColumns();
         Map<String, Class<?>> propMap = new CaseInsensitiveHashMap<>();
         for (ColumnInfo col : cols)
-            propMap.put(col.getPropertyName(), col.getJavaClass());
+            propMap.put(col.getName(), col.getJavaClass());
 
         init(tinfo.getName(), propMap);
     }

api/src/org/labkey/api/exp/SamplePropertyHelper.java

@@ -130,7 +130,7 @@ public void addSampleColumns(InsertView view, User user)
         }
     }
 
-    public void addSampleColumns(InsertView view, User user, @Nullable AssayRunUploadForm defaultValueContext, boolean errorReshow) throws ExperimentException
+    public void addSampleColumns(InsertView view, User user, @Nullable AssayRunUploadForm<?> defaultValueContext, boolean errorReshow) throws ExperimentException
     {
         DataRegion region = view.getDataRegion();
         List<String> sampleNames = getSampleNames();
@@ -215,10 +215,9 @@ public Map<String, Map<DomainProperty, String>> getPostedPropertyValues(HttpServ
             for (DomainProperty sampleProperty : _domainProperties)
             {
                 String name = UploadWizardAction.getInputName(sampleProperty, sampleName);
-                String inputName = ColumnInfo.propNameFromName(name);
                 // handle the hidden input field prefixed with FIELD_MARKER for checkboxes
-                String value = request.getParameter(inputName);
-                if (value == null && request.getParameter(SpringActionController.FIELD_MARKER + inputName) != null)
+                String value = request.getParameter(name);
+                if (value == null && request.getParameter(SpringActionController.FIELD_MARKER + name) != null)
                     value = "0";
                 values.put(sampleProperty, value);
             }

api/src/org/labkey/api/reports/report/ScriptReport.java

@@ -25,6 +25,7 @@
 import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.BooleanFormat;
 import org.labkey.api.data.ColumnHeaderType;
+import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
@@ -220,7 +221,7 @@ protected List<String> outputColumnNames(Results r)
             ArrayList<String> ret = new ArrayList<>(count);
             for (int col = 1; col <= count; col++)
             {
-                String alias = r.getColumn(col).getPropertyName();
+                String alias = ColumnInfo.propNameFromName(r.getColumn(col).getName());
                 if (!aliases.add(alias))
                 {
                     int i;

api/src/org/labkey/api/view/template/PageConfig.java

@@ -103,10 +103,10 @@ public enum TrueFalse
 
     private record EventHandler(String id, String selector, @NotNull String event, @NotNull String handler) {
         public EventHandler {
-            assert (null==id) != (null==selector) : "exactly one of id or selector must be non-null";
-            assert !StringUtils.containsWhitespace(id) : "id should not contain any whitespace";
-            assert !StringUtils.containsWhitespace(event) : "event name should not contain any whitespace";
-            assert !event.startsWith("on") : "event name should not include the 'on' prefix";
+            assert (null==id) != (null==selector) : "exactly one of id or selector must be non-null '" + id + "', '" + selector + "'";
+            assert !StringUtils.containsWhitespace(id) : "id should not contain any whitespace. '" + id + "'";
+            assert !StringUtils.containsWhitespace(event) : "event name should not contain any whitespace. '" + event + "'";
+            assert !event.startsWith("on") : "event name should not include the 'on' prefix. '" + event + "'";
         }
 
         public String getKey()

assay/api-src/org/labkey/api/assay/plate/PlateSampleFilePropertyHelper.java

@@ -302,7 +302,7 @@ protected Object getValue(Map<String, Object> row, DomainProperty property)
     private static final String PRIMARY_PREV_UPLOAD_PATH = "PreviouslyUploadedFilePaths";
 
     @Override
-    public void addSampleColumns(InsertView view, User user, final AssayRunUploadForm defaultValueContext, final boolean errorReshow)
+    public void addSampleColumns(InsertView view, User user, final AssayRunUploadForm<?> defaultValueContext, final boolean errorReshow)
     {
         final File reshowFile;
         if (errorReshow)

assay/src/org/labkey/assay/AssayIntegrationTestCase.jsp

@@ -620,7 +620,7 @@
         );
 
         // create a run
-        var run = assayImportFile(c, user, provider, assayProtocol, createAssayDataFile(fileContents), false, Map.of("runExpMaterialsLookup", runSample1.getName()));
+        var run = assayImportFile(c, user, provider, assayProtocol, createAssayDataFile(fileContents), false, Map.of("RunExpMaterialsLookup", runSample1.getName()));
 
         // Verify pre-conditions
         assertEquals(4, run.getMaterialInputs().size());
@@ -636,8 +636,8 @@
         // Act
         // Replace "RunExpMaterialsLookup" lookup runSample1 -> runSample2
         var errors = new BatchValidationException();
-        var updatedRunRow = CaseInsensitiveHashMap.of("RowId", run.getRowId(), "RunExpMaterialsLookup", runSample2.getRowId());
-        runsTable.getUpdateService().updateRows(user, c, List.of((Map) updatedRunRow), null, errors, null, null);
+        Map<String, Object> updatedRunRow = CaseInsensitiveHashMap.of("RowId", run.getRowId(), "RunExpMaterialsLookup", runSample2.getRowId());
+        runsTable.getUpdateService().updateRows(user, c, List.of(updatedRunRow), null, errors, null, null);
         if (errors.hasErrors())
             throw errors;
 

assay/src/org/labkey/assay/actions/SetDefaultValuesAssayAction.java

@@ -225,7 +225,7 @@ protected void decodePropertyValues(Map<String, Object> formDefaults, String pro
     @Override
     public void validateCommand(AssayDomainIdForm target, Errors errors)
     {
-        if (ThawListResolverType.NAME.equals(target.getRequest().getParameter("participantVisitResolver")))
+        if (ThawListResolverType.NAME.equals(target.getRequest().getParameter("ParticipantVisitResolver")))
             ThawListResolverType.validationHelper(target, errors);
     }
 }

assay/test/src/org/labkey/test/tests/assay/AssayReimportIndexTest.java

@@ -72,7 +72,7 @@ public void testIndexLatestAssayRun()
         clickButton("Import Data");
         clickButton("Next");
         AssayImportPage importPage = new AssayImportPage(getDriver());
-        importPage.setNamedInputText("name", firstRun);
+        importPage.setNamedInputText("Name", firstRun);
         importPage.setNamedTextAreaValue("TextAreaDataCollector.textArea", firstRunData);
         importPage.clickSaveAndFinish();
         SearchAdminAPIHelper.waitForIndexer();
@@ -91,7 +91,7 @@ public void testIndexLatestAssayRun()
         clickButton("Re-import run");
         clickButton("Next");
         AssayImportPage importPage2 = new AssayImportPage(getDriver());
-        importPage2.setNamedInputText("name", secondRun);
+        importPage2.setNamedInputText("Name", secondRun);
         importPage2.setNamedTextAreaValue("TextAreaDataCollector.textArea", secondRunData);
         importPage2.clickSaveAndFinish();
         SearchAdminAPIHelper.waitForIndexer();

experiment/src/org/labkey/experiment/summarizeMaterialInputs.jsp

@@ -74,7 +74,7 @@
                             DisplayColumnGroup group = groups.get(propEntry.getKey());
                             if (group != null && group.isCopyable())
                             {
-                                String propName = group.getColumns().get(i).getColumnInfo().getPropertyName();
+                                String propName = group.getColumns().get(i).getColumnInfo().getName();
                                 String propValue = String.valueOf(propEntry.getValue());
                                 handler.append("summarize_setProperty(" + q(propName) + "," + q(propValue) + ");\n");
                             }

experiment/test/src/org/labkey/test/tests/experiment/ProvenanceAssayHelper.java

@@ -14,6 +14,7 @@
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.TestFileUtils;
+import org.labkey.test.components.assay.AssayConstants;
 import org.labkey.test.pages.ReactAssayDesignerPage;
 import org.labkey.test.params.FieldDefinition;
 import org.labkey.test.params.experiment.SampleTypeDefinition;
@@ -82,9 +83,9 @@ protected void populateAssay(String assayName, String runName, String runData)
         waitForElement(Locator.tagWithName("select", "targetStudy"));
         clickAndWait(Locator.lkButton("Next"));
 
-        setFormElement(Locator.name("name"), runName);
-        click(Locator.xpath("//input[@value='textAreaDataProvider']"));
-        setFormElement(Locator.id("TextAreaDataCollector.textArea"), runData);
+        setFormElement(AssayConstants.ASSAY_NAME_FIELD_LOCATOR, runName);
+        click(AssayConstants.TEXT_AREA_DATA_PROVIDER_LOCATOR);
+        setFormElement(AssayConstants.TEXT_AREA_DATA_COLLECTOR_LOCATOR, runData);
         clickAndWait(Locator.lkButton("Save and Finish"));
     }
 

list/src/org/labkey/list/model/ListQueryUpdateService.java

@@ -370,7 +370,7 @@ protected Map<String, Object> updateRow(User user, Container container, Map<Stri
                     // Remove prior attachment -- only includes columns which are modified in this update
                     for (ColumnInfo col : modifiedAttachmentColumns)
                     {
-                        Object value = oldRow.get(col.getPropertyName());
+                        Object value = oldRow.get(col.getName());
                         if (null != value)
                         {
                             AttachmentService.get().deleteAttachment(new ListItemAttachmentParent(entityId, _list.getContainer()), value.toString(), user);

mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java

@@ -44,7 +44,7 @@ public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
         List<User> list = MothershipManager.get().getAssignedToList(_container);
 
         new SelectBuilder()
-            .name(getColumnInfo().getPropertyName())
+            .name(getColumnInfo().getName())
             .addOption("")
             .addOptions(
                 list.stream()

study/test/src/org/labkey/test/tests/experiment/ExpSchemaPropagateFilterTest.java

@@ -238,15 +238,15 @@ private void createAssays()
 
         // Re-import the assay.
         assayRunFile = TestFileUtils.getSampleData("/assay/" + ASSAY_NAME_PARENT +"_Reimport.tsv");
-        reImportAssayRun(null, ASSAY_NAME_PARENT, ASSAY_RUN_PARENT, Map.of("name", ASSAY_REIMPORT_RUN_PARENT), assayRunFile);
+        reImportAssayRun(null, ASSAY_NAME_PARENT, ASSAY_RUN_PARENT, Map.of("Name", ASSAY_REIMPORT_RUN_PARENT), assayRunFile);
 
         assayFile = TestFileUtils.getSampleData("/assay/" + ASSAY_NAME_SUBFOLDER + ".xar.xml");
         assayRunFile = TestFileUtils.getSampleData("/assay/" + ASSAY_NAME_SUBFOLDER + ".tsv");
-        createAssayAndPopulate(SUB_FOLDER_A, ASSAY_NAME_SUBFOLDER, assayFile, Map.of("name", ASSAY_RUN_SUBFOLDER), assayRunFile);
+        createAssayAndPopulate(SUB_FOLDER_A, ASSAY_NAME_SUBFOLDER, assayFile, Map.of("Name", ASSAY_RUN_SUBFOLDER), assayRunFile);
 
         // Re-import the assay.
         assayRunFile = TestFileUtils.getSampleData("/assay/" + ASSAY_NAME_SUBFOLDER +"_Reimport.tsv");
-        reImportAssayRun(SUB_FOLDER_A, ASSAY_NAME_SUBFOLDER, ASSAY_RUN_SUBFOLDER, Map.of("name", ASSAY_REIMPORT_RUN_SUBFOLDER), assayRunFile);
+        reImportAssayRun(SUB_FOLDER_A, ASSAY_NAME_SUBFOLDER, ASSAY_RUN_SUBFOLDER, Map.of("Name", ASSAY_REIMPORT_RUN_SUBFOLDER), assayRunFile);
 
     }
 

study/test/src/org/labkey/test/tests/search/SearchTest.java

@@ -451,9 +451,9 @@ private void addSearchableIssues()
         goToModule("Issues");
         File file = TestFileUtils.getSampleData("fileTypes/tsv_sample.tsv");
         issuesHelper.addIssue(ISSUE_TITLE, _userHelper.getDisplayNameForEmail(USER1),
-                Maps.of("type", "UFO",
-                        "area", "Area51",
-                        "priority", "1",
+                Maps.of("Type", "UFO",
+                        "Area", "Area51",
+                        "Priority", "1",
                         "comment", ISSUE_BODY),
                 file);