Skip to content

Commit 6af5412

Browse files
labkey-jeckelslabkey-jeckels
committed
Eliminate ColumnInfo.propNameFromName()
1 parent 187c6d8 commit 6af5412

7 files changed

Lines changed: 45 additions & 39 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ if (form.getKeywordDir() != null && form.getKeywordDir().length > 0 && StudyPubl
234234
<div style="padding-left: 2em; padding-bottom: 1em;">
235235
<br>
236236
Choose a target study folder:<br>
237-
<%=select().name(<%= h(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME)%>).className(null).addOptions(targetStudies).selected(unsafe(form.getTargetStudy())).onChange("document.getElementById('studyChanged').value = true;")
237+
<%=select().name(AbstractAssayProvider.TARGET_STUDY_PROPERTY_NAME).className(null).addOptions(targetStudies).selected(unsafe(form.getTargetStudy())).onChange("document.getElementById('studyChanged').value = true;")
238238
%>
239239
<br><br>
240240
</div>

‎flow/src/org/labkey/flow/reports/FilterFlowReport.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ void addScriptProlog(ViewContext context, StringBuffer sb)
197197
private String oldLegalName(FieldKey fkey)
198198
{
199199
String r = AliasManager.makeLegalName(StringUtils.join(fkey.getParts(), "_"), FlowManager.get().getSchema().getSqlDialect(), false);
200-
return ColumnInfo.propNameFromName(r).toLowerCase();
200+
return ColumnInfo.legalNameFromName(r).toLowerCase();
201201
}
202202

203203
protected void convertDateColumn(CachedResultSet rs, String fromCol, String toCol) throws SQLException

‎luminex/src/org/labkey/luminex/LuminexRunUploadForm.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public List<Titration> getTitrations() throws ExperimentException
268268
titration.setName(titrationName);
269269
for (Titration.Type type : Titration.Type.values())
270270
{
271-
String propertyName = LuminexUploadWizardAction.getTitrationTypeCheckboxName(type, titration);
271+
String propertyName = LuminexUploadWizardAction.getTitrationTypeCheckboxNameAndId(type, titration);
272272
if (getViewContext().getRequest().getParameter(propertyName) != null)
273273
{
274274
String hiddenValue = getViewContext().getRequest().getParameter(propertyName);
@@ -293,7 +293,7 @@ public List<SinglePointControl> getSinglePointControls() throws ExperimentExcept
293293
{
294294
SinglePointControl singlePointControl = new SinglePointControl();
295295
singlePointControl.setName(singlePointControlName);
296-
String propertyName = LuminexUploadWizardAction.getSinglePointControlCheckboxName(singlePointControlName);
296+
String propertyName = LuminexUploadWizardAction.getSinglePointControlCheckboxNameAndId(singlePointControlName);
297297
if (StringUtils.isNotBlank(getViewContext().getRequest().getParameter(propertyName)))
298298
{
299299
result.add(singlePointControl);

‎luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import org.labkey.api.view.JspView;
6161
import org.labkey.api.view.VBox;
6262
import org.labkey.api.view.ViewServlet;
63+
import org.labkey.api.view.template.PageConfig;
6364
import org.labkey.api.writer.HtmlWriter;
6465
import org.labkey.luminex.model.Analyte;
6566
import org.labkey.luminex.model.SinglePointControl;
@@ -324,7 +325,7 @@ else if (analyteDefaultValue != null)
324325
}
325326

326327
Titration existingTitration = existingTitrations.get(titrationEntry.getKey());
327-
String propertyName = getTitrationTypeCheckboxName(Titration.Type.standard, titrationEntry.getValue());
328+
String propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.standard, titrationEntry.getValue());
328329
// If we have an existing titration as a baseline from the run we're replacing, use its value
329330
String defVal = existingTitration == null ? defaultWellRoleValues.get(propertyName) : Boolean.toString(existingTitration.isStandard());
330331

@@ -359,7 +360,7 @@ else if (titrationEntry.getValue().isStandard())
359360

360361
if (!titrationEntry.getValue().isUnknown())
361362
{
362-
propertyName = getTitrationTypeCheckboxName(Titration.Type.standard, titrationEntry.getValue());
363+
propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.standard, titrationEntry.getValue());
363364
// If we have an existing titration as a baseline from the run we're replacing, use its value
364365
defVal = existingTitration == null ? defaultWellRoleValues.get(propertyName) : Boolean.toString(existingTitration.isStandard());
365366
value = setInitialTitrationInput(errorReshow, propertyName, defVal, titrationEntry.getValue().isStandard()) ? "true" : "";
@@ -369,21 +370,21 @@ else if (titrationEntry.getValue().isStandard())
369370
value = toShowStandardCheckboxColumn(errorReshow, standardTitrations, titrationEntry.getValue()) ? "true" : "";
370371
view.getDataRegion().addHiddenFormField(getShowStandardCheckboxColumnName(titrationEntry.getValue()), value);
371372

372-
propertyName = getTitrationTypeCheckboxName(Titration.Type.qccontrol, titrationEntry.getValue());
373+
propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.qccontrol, titrationEntry.getValue());
373374
// If we have an existing titration as a baseline from the run we're replacing, use its value
374375
defVal = existingTitration == null ? defaultWellRoleValues.get(propertyName) : Boolean.toString(existingTitration.isQcControl());
375376
value = setInitialTitrationInput(errorReshow, propertyName, defVal, titrationEntry.getValue().isQcControl()) ? "true" : "";
376377
view.getDataRegion().addHiddenFormField(propertyName, value);
377378

378-
propertyName = getTitrationTypeCheckboxName(Titration.Type.othercontrol, titrationEntry.getValue());
379+
propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.othercontrol, titrationEntry.getValue());
379380
// If we have an existing titration as a baseline from the run we're replacing, use its value
380381
defVal = existingTitration == null ? defaultWellRoleValues.get(propertyName) : Boolean.toString(existingTitration.isOtherControl());
381382
value = setInitialTitrationInput(errorReshow, propertyName, defVal, titrationEntry.getValue().isOtherControl()) ? "true" : "";
382383
view.getDataRegion().addHiddenFormField(propertyName, value);
383384
}
384385
else
385386
{
386-
propertyName = getTitrationTypeCheckboxName(Titration.Type.unknown, titrationEntry.getValue());
387+
propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.unknown, titrationEntry.getValue());
387388
// If we have an existing titration as a baseline from the run we're replacing, use its value
388389
defVal = existingTitration == null ? defaultWellRoleValues.get(propertyName) : Boolean.toString(existingTitration.isUnknown());
389390
value = setInitialTitrationInput(errorReshow, propertyName, defVal, titrationEntry.getValue().isUnknown()) ? "true" : "";
@@ -400,7 +401,7 @@ else if (titrationEntry.getValue().isStandard())
400401

401402
boolean existingSinglePointControl = existingSinglePointControls.contains(singlePointControl);
402403

403-
propertyName = getSinglePointControlCheckboxName(singlePointControl);
404+
propertyName = getSinglePointControlCheckboxNameAndId(singlePointControl);
404405
// If we have an existing singlePointControl as a baseline from the run we're replacing, use its value
405406
defVal = existingSinglePointControl ? "true" : defaultWellRoleValues.get(propertyName);
406407
value = setInitialSinglePointControlInput(errorReshow, propertyName, defVal) ? "true" : "";
@@ -431,9 +432,9 @@ else if (titrationEntry.getValue().isStandard())
431432
@Override
432433
public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
433434
{
434-
String titrationCellName = PageFlowUtil.filter(getTitrationColumnCellName(titrationEntry.getValue().getName()));
435-
// Use propName because ids can't have spaces
436-
String groupName = ColumnInfo.propNameFromName(getColumns().get(0).getFormFieldName(ctx));
435+
String titrationCellName = PageFlowUtil.filter(getTitrationColumnCellNameAndId(titrationEntry.getValue().getName()));
436+
// DOM ids and JS function names can't have spaces
437+
String groupName = PageConfig.makeIdFromName(getColumns().get(0).getFormFieldName(ctx));
437438
String id = groupName + "CheckBox";
438439

439440
TD(
@@ -454,7 +455,8 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
454455
@Override
455456
public void writeCopyableJavaScript(RenderContext ctx, Writer out) throws IOException
456457
{
457-
String groupName = ColumnInfo.propNameFromName(getColumns().get(0).getFormFieldName(ctx));
458+
// DOM ids and JS function names can't have spaces
459+
String groupName = PageConfig.makeIdFromName(getColumns().get(0).getFormFieldName(ctx));
458460
out.write("function " + groupName + "Updated() {\n");
459461
out.write(" if (document.getElementById('" + groupName + "CheckBox') != null && document.getElementById('" + groupName + "CheckBox').checked) {\n");
460462
out.write(" var v = document.getElementsByName('" + getColumns().get(0).getFormFieldName(ctx) + "')[0].checked;\n");
@@ -551,7 +553,7 @@ private JspView<LuminexRunUploadForm> addExclusionWarning(LuminexRunUploadForm f
551553

552554
private String getShowStandardCheckboxColumnName(Titration standard)
553555
{
554-
String titrationCheckboxName = getTitrationTypeCheckboxName(Titration.Type.standard, standard);
556+
String titrationCheckboxName = getTitrationTypeCheckboxNameAndId(Titration.Type.standard, standard);
555557
return titrationCheckboxName + "_showcol";
556558
}
557559

@@ -692,19 +694,22 @@ protected RunStepHandler getRunStepHandler()
692694
return new LuminexRunStepHandler();
693695
}
694696

695-
public static String getTitrationTypeCheckboxName(Titration.Type type, Titration titration)
697+
public static String getTitrationTypeCheckboxNameAndId(Titration.Type type, Titration titration)
696698
{
697-
return ColumnInfo.propNameFromName("_titrationRole_" + type + "_" + titration.getName());
699+
// DOM ids and JS function names can't have spaces
700+
return PageConfig.makeIdFromName("_titrationRole_" + type + "_" + titration.getName());
698701
}
699702

700-
public static String getSinglePointControlCheckboxName(String singlePointControl)
703+
public static String getSinglePointControlCheckboxNameAndId(String singlePointControl)
701704
{
702-
return ColumnInfo.propNameFromName("_singlePointControl_" + singlePointControl);
705+
// DOM ids and JS function names can't have spaces
706+
return PageConfig.makeIdFromName("_singlePointControl_" + singlePointControl);
703707
}
704708

705-
public static String getTitrationColumnCellName(String titrationName)
709+
public static String getTitrationColumnCellNameAndId(String titrationName)
706710
{
707-
return ColumnInfo.propNameFromName("_titrationcell_" + titrationName);
711+
// DOM ids and JS function names can't have spaces
712+
return PageConfig.makeIdFromName("_titrationcell_" + titrationName);
708713
}
709714

710715
protected class LuminexRunStepHandler extends RunStepHandler
@@ -807,21 +812,21 @@ public boolean executeStep(LuminexRunUploadForm form, BindException errors) thro
807812
// add the name/value pairs for the titration well role definition section
808813
if (!titrationEntry.getValue().isUnknown())
809814
{
810-
propertyName = getTitrationTypeCheckboxName(Titration.Type.standard, titrationEntry.getValue());
815+
propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.standard, titrationEntry.getValue());
811816
value = getViewContext().getRequest().getParameter(propertyName).equals("true");
812817
defaultWellRoleValues.put(propertyName, Boolean.toString(value));
813818

814-
propertyName = getTitrationTypeCheckboxName(Titration.Type.qccontrol, titrationEntry.getValue());
819+
propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.qccontrol, titrationEntry.getValue());
815820
value = getViewContext().getRequest().getParameter(propertyName).equals("true");
816821
defaultWellRoleValues.put(propertyName, Boolean.toString(value));
817822

818-
propertyName = getTitrationTypeCheckboxName(Titration.Type.othercontrol, titrationEntry.getValue());
823+
propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.othercontrol, titrationEntry.getValue());
819824
value = getViewContext().getRequest().getParameter(propertyName).equals("true");
820825
defaultWellRoleValues.put(propertyName, Boolean.toString(value));
821826
}
822827
else
823828
{
824-
propertyName = getTitrationTypeCheckboxName(Titration.Type.unknown, titrationEntry.getValue());
829+
propertyName = getTitrationTypeCheckboxNameAndId(Titration.Type.unknown, titrationEntry.getValue());
825830
value = getViewContext().getRequest().getParameter(propertyName).equals("true");
826831
defaultWellRoleValues.put(propertyName, Boolean.toString(value));
827832
}
@@ -846,7 +851,7 @@ public boolean executeStep(LuminexRunUploadForm form, BindException errors) thro
846851
for (String singlePointControl : form.getParser().getSinglePointControls())
847852
{
848853
// add the name/value pairs for the singlePointControl well role definition section
849-
String propertyName = getSinglePointControlCheckboxName(singlePointControl);
854+
String propertyName = getSinglePointControlCheckboxNameAndId(singlePointControl);
850855
boolean value = getViewContext().getRequest().getParameter(propertyName).equals("true");
851856
defaultWellRoleValues.put(propertyName, Boolean.toString(value));
852857
}

‎luminex/src/org/labkey/luminex/query/AnalytePropStandardsDisplayColumn.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ else if (defVal == null || defVal.equalsIgnoreCase("true"))
121121
@Override
122122
public DOM._Attributes getInputAttributes()
123123
{
124-
String titrationCellName = LuminexUploadWizardAction.getTitrationColumnCellName(_titration.getName());
124+
String titrationCellName = LuminexUploadWizardAction.getTitrationColumnCellNameAndId(_titration.getName());
125125

126126
return at(style, "display:" + (_hideCell ? "none" : "table-cell"), name, titrationCellName);
127127
}
128128

129129
@Override
130130
public void renderDetailsCaptionCell(RenderContext ctx, HtmlWriter out, @Nullable String cls)
131131
{
132-
String titrationCellName = LuminexUploadWizardAction.getTitrationColumnCellName(_titration.getName());
132+
String titrationCellName = LuminexUploadWizardAction.getTitrationColumnCellNameAndId(_titration.getName());
133133

134134
TD(
135135
cl(cls).at(style, "display:" + (_hideCell ? "none" : "table-cell") + ";").name(titrationCellName),

‎luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnGroup.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.labkey.api.util.DOM;
2323
import org.labkey.api.util.InputBuilder;
2424
import org.labkey.api.view.HttpView;
25+
import org.labkey.api.view.template.PageConfig;
2526
import org.labkey.api.writer.HtmlWriter;
2627
import org.labkey.luminex.LuminexDataHandler;
2728

@@ -44,8 +45,8 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
4445
{
4546
TD(
4647
isCopyable() ? (DOM.Renderable) ret -> {
47-
// Use propName because ids can't have spaces
48-
String inputName = ColumnInfo.propNameFromName(_inputName);
48+
// DOM ids and JS function names can't have spaces
49+
String inputName = PageConfig.makeIdFromName(_inputName);
4950
String id = inputName + "CheckBox";
5051
InputBuilder.checkbox().name(id).id(id).appendTo(out);
5152
StringBuilder onChange = new StringBuilder("b = this.checked;\n");

0 commit comments

Comments
 (0)