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

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

@@ -677,7 +677,7 @@ protected ModelAndView getRunPropertiesView(FormType newRunForm, boolean errorRe
 
         if (!newRunForm.getBatchProperties().isEmpty())
         {
-            JspView<AssayRunUploadForm> batchPropsView = new JspView<>("/org/labkey/assay/view/newUploadBatchProperties.jsp", newRunForm);
+            JspView<AssayRunUploadForm<?>> batchPropsView = new JspView<>("/org/labkey/assay/view/newUploadBatchProperties.jsp", newRunForm);
             batchPropsView.setTitle("Batch Properties");
             vbox.addView(batchPropsView);
         }
@@ -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/assay/pipeline/AssayRunAsyncContext.java

@@ -18,6 +18,7 @@
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.labkey.api.assay.AbstractAssayProvider;
 import org.labkey.api.assay.AssayProvider;
 import org.labkey.api.assay.AssayRunUploadContext;
 import org.labkey.api.assay.AssayService;
@@ -206,7 +207,7 @@ public void logProperties(Logger logger)
         {
             if(entry.getValue() == null)
                 valueText = "[Blank]";
-            else if(entry.getKey().getName().equals("TargetStudy"))
+            else if(entry.getKey().getName().equals(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME))
                 valueText = ContainerManager.getForId(getTargetStudy()).getName();
             else
                 valueText = entry.getValue();

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

@@ -74,6 +74,7 @@
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.ViewContext;
+import org.labkey.api.view.template.PageConfig;
 import org.labkey.data.xml.AuditType;
 import org.labkey.data.xml.ColumnType;
 import org.labkey.data.xml.FilterGroupType;
@@ -693,7 +694,8 @@ protected ColumnInfo resolveColumn(String name)
         {
             if (null != col)        // #19358
             {
-                String propName = col.getPropertyName();
+                // Keep backwards compatible with historic value
+                String propName = PageConfig.makeIdFromName(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

@@ -56,7 +56,6 @@
 import org.labkey.data.xml.DbSequenceType;
 import org.labkey.data.xml.PropertiesType;
 
-import java.beans.Introspector;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.sql.ResultSet;
@@ -86,8 +85,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 +250,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 +268,6 @@ public void setFieldKey(@NotNull FieldKey key)
     {
         checkLocked();
         _fieldKey = Objects.requireNonNull(key);
-        _propertyName = null;
     }
 
 
@@ -887,16 +882,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
@@ -1401,6 +1386,7 @@ else if (Character.isUpperCase(c) && Character.isLowerCase(chars[i - 1]))
         return buf.toString();
     }
 
+    /** @return a version of the supplied name that is considered a valid Java identifier */
 
     public static String legalNameFromName(String name)
     {
@@ -1431,19 +1417,6 @@ public static String legalNameFromName(String name)
         return buf.toString();
     }
 
-
-    public static String propNameFromName(String name)
-    {
-        if (name == null)
-            return null;
-
-        if (name.isEmpty())
-            return null;
-
-        return Introspector.decapitalize(legalNameFromName(name));
-    }
-
-
     // TODO why is there here? and not something like RequestHelper or PageFlowUtil
     public static boolean booleanFromString(String str)
     {
@@ -1657,12 +1630,6 @@ public Set<FieldKey> getSuggestedColumns()
         {
             return null;
         }
-
-        @Override
-        public boolean isShowAsPublicDependency()
-        {
-            return false;
-        }
     }
 
     @Override
@@ -1727,7 +1694,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

@@ -31,6 +31,7 @@
 import org.labkey.api.util.StringExpression;
 import org.labkey.data.xml.ColumnType;
 
+import java.beans.Introspector;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -216,8 +217,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
@@ -383,12 +382,7 @@ static String labelFromName(String name)
     {
         return BaseColumnInfo.labelFromName(name);
     }
-
-    static String propNameFromName(String name)
-    {
-        return BaseColumnInfo.propNameFromName(name);
-    }
-
+
     static String legalNameFromName(String name)
     {
         return BaseColumnInfo.legalNameFromName(name);

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

@@ -19,6 +19,7 @@
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.HttpView;
+import org.labkey.api.view.template.PageConfig;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.io.IOException;
@@ -89,9 +90,10 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
         ).appendTo(out);
     }
 
+    /** Use propName because DOM ids and function names can't have spaces */
     private String getGroupFormFieldName(RenderContext ctx)
     {
-        return ColumnInfo.propNameFromName(getColumns().get(0).getFormFieldName(ctx));
+        return PageConfig.makeIdFromName(getColumns().get(0).getFormFieldName(ctx));
     }
 
     public void writeCopyableJavaScript(RenderContext ctx, Writer out) throws IOException

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

@@ -17,6 +17,7 @@
 
 import org.labkey.api.collections.CaseInsensitiveHashMap;
 import org.labkey.api.exp.MvColumn;
+import org.labkey.api.view.template.PageConfig;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -64,10 +65,10 @@ public static <T extends ImportAliasable> Map<String, T> createImportMap(List<T>
             {
                 m.put(property.getPropertyURI(), property);
             }
-            // Then propName variant of name
+            // Then propName variant of name, kept for backwards compatibility
             for (T property : reversedProperties)
             {
-                m.put(BaseColumnInfo.propNameFromName(property.getName()), property);
+                m.put(PageConfig.makeIdFromName(property.getName()), property);
             }
             // Then aliases
             for (T property : reversedProperties)

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

@@ -480,7 +480,7 @@ else if (_validateRequired && null != _tinfo)
                     Container container = fk.getLookupContainer() != null ? fk.getLookupContainer() : getContainer();
                     try
                     {
-                        Object remappedValue = cache.remap(SchemaKey.fromParts(fk.getLookupSchemaName()), fk.getLookupTableName(), getUser(), container, ContainerFilter.Type.CurrentPlusProjectAndShared, str);
+                        Object remappedValue = cache.remap(fk.getLookupSchemaKey(), fk.getLookupTableName(), getUser(), container, ContainerFilter.Type.CurrentPlusProjectAndShared, str);
                         if (remappedValue != null)
                         {
                             values.put(propName, remappedValue);
@@ -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/defaults/SetDefaultValuesAction.java

@@ -273,7 +273,7 @@ public HttpView getView(FormType domainIdForm, boolean reshow, BindException err
                 if (entry.getValue() != null)
                 {
                     String stringValue = entry.getValue().toString();
-                    decodePropertyValues(formDefaults, ColumnInfo.propNameFromName(entry.getKey().getName()), stringValue);
+                    decodePropertyValues(formDefaults, entry.getKey().getName(), stringValue);
                 }
             }
             view.setInitialValues(formDefaults);
@@ -408,7 +408,7 @@ public boolean handlePost(FormType domainIdForm, BindException errors) throws Ex
         Map<DomainProperty, Object> values = new HashMap<>();
         for (DomainProperty property : domain.getProperties())
         {
-            String propName = ColumnInfo.propNameFromName(property.getName());
+            String propName = property.getName();
             String value = encodePropertyValues(domainIdForm, propName);
             PropertyType type = property.getPropertyDescriptor().getPropertyType();
             if (value != null && !value.isEmpty())

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/query/UserIdForeignKey.java

@@ -53,11 +53,23 @@ public UserIdForeignKey(UserSchema userSchema)
     public TableInfo getLookupTableInfo()
     {
         TableInfo tinfoUsersData = CoreSchema.getInstance().getTableInfoUsersData();
-        FilteredTable ret = new FilteredTable<>(tinfoUsersData, _userSchema);
+        FilteredTable<?> ret = new FilteredTable<>(tinfoUsersData, _userSchema);
         ret.addWrapColumn(tinfoUsersData.getColumn("UserId"));
         ret.addColumn(ret.wrapColumn("DisplayName", tinfoUsersData.getColumn("DisplayName")));
         ret.setTitleColumn("DisplayName");
         ret.setPublic(false);
         return ret;
     }
+
+    @Override
+    public SchemaKey getLookupSchemaKey()
+    {
+        return SchemaKey.fromParts("core");
+    }
+
+    @Override
+    public String getLookupTableName()
+    {
+        return "Users";
+    }
 }

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

@@ -65,6 +65,7 @@
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.VBox;
 import org.labkey.api.view.ViewContext;
+import org.labkey.api.view.template.PageConfig;
 import org.labkey.api.writer.ContainerUser;
 import org.labkey.vfs.FileLike;
 import org.labkey.vfs.FileSystemLike;
@@ -408,7 +409,8 @@ protected List<String> outputColumnNames(Results r)
                     continue;
                 }
 
-                alias = ColumnInfo.propNameFromName(name).toLowerCase();
+                // Stay consistent with previous script-friendly identifier now used primarily for DOM ids
+                alias = PageConfig.makeIdFromName(name).toLowerCase();
 
                 if (!aliases.add(alias))
                 {
@@ -433,7 +435,8 @@ protected List<String> outputColumnNames(Results r)
     private String oldLegalName(FieldKey fkey, @NotNull SqlDialect dialect)
     {
         String r = AliasManager.makeLegalName(StringUtils.join(fkey.getParts(),"_"), dialect, false);
-        return ColumnInfo.propNameFromName(r).toLowerCase();
+        // Stay consistent with previous script-friendly identifier
+        return ColumnInfo.legalNameFromName(r).toLowerCase();
     }
 
     /**