Skip to content

Migrate WebPartView.renderView() to HtmlWriter #1078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 2 commits into from
Jun 10, 2025
Merged

Migrate WebPartView.renderView() to HtmlWriter #1078

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5149008
Migrate WebPartView.renderView() to HtmlWriter
labkey-adam Jun 5, 2025
d4cb808
Fix rendering of chromatogram grid
labkey-jeckels Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 45 additions & 19 deletions src/org/labkey/targetedms/TargetedMSController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
import org.labkey.api.util.ConfigurationException;
import org.labkey.api.util.ContainerContext;
import org.labkey.api.util.DOM;
import org.labkey.api.util.DOM.Renderable;
import org.labkey.api.util.DateUtil;
import org.labkey.api.util.FileUtil;
import org.labkey.api.util.HelpTopic;
Expand Down Expand Up @@ -174,6 +175,7 @@
import org.labkey.api.view.WebPartView;
import org.labkey.api.view.template.ClientDependency;
import org.labkey.api.view.template.PageConfig;
import org.labkey.api.writer.HtmlWriter;
import org.labkey.targetedms.chart.ChromatogramChartMakerFactory;
import org.labkey.targetedms.chart.ComparisonChartMaker;
import org.labkey.targetedms.chromlib.ChromatogramLibraryUtils;
Expand Down Expand Up @@ -276,7 +278,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
Expand Down Expand Up @@ -313,8 +314,10 @@
import static org.labkey.api.util.DOM.A;
import static org.labkey.api.util.DOM.Attribute.height;
import static org.labkey.api.util.DOM.Attribute.href;
import static org.labkey.api.util.DOM.Attribute.id;
import static org.labkey.api.util.DOM.Attribute.method;
import static org.labkey.api.util.DOM.Attribute.src;
import static org.labkey.api.util.DOM.Attribute.style;
import static org.labkey.api.util.DOM.Attribute.width;
import static org.labkey.api.util.DOM.DIV;
import static org.labkey.api.util.DOM.SPAN;
Expand Down Expand Up @@ -5022,19 +5025,32 @@ public ModelAndView getView(IdForm form, BindException errors)
VBox result = new VBox();

// Summary for this sample file
DOM.Renderable renderable = DOM.TABLE(cl("lk-fields-table"),
TR(TD(cl("labkey-form-label"), "Sample Identifier"),
TD(materialURL == null ? sampleRow.get(SampleFileTable.SAMPLE_FIELD_KEY) : A(at(href, materialURL), _sampleFile.getSampleName()))),
TR(TD(cl("labkey-form-label"), "File Path"),
TD(_sampleFile.getFilePath())),
TR(TD(cl("labkey-form-label"), "Acquired Time"),
TD(DateUtil.formatDateTime(getContainer(), _sampleFile.getAcquiredTime()))),
TR(TD(cl("labkey-form-label"), "Modified Time"),
TD(DateUtil.formatDateTime(getContainer(), _sampleFile.getModifiedTime()))),
TR(TD(cl("labkey-form-label"), "Instrument Serial Number"),
TD(_sampleFile.getInstrumentSerialNumber())),
TR(TD(cl("labkey-form-label"), "Replicate Name"),
TD(replicate.getName()))
Renderable renderable = DOM.TABLE(
cl("lk-fields-table"),
TR(
TD(cl("labkey-form-label"), "Sample Identifier"),
TD(materialURL == null ? sampleRow.get(SampleFileTable.SAMPLE_FIELD_KEY) : A(at(href, materialURL), _sampleFile.getSampleName()))
),
TR(
TD(cl("labkey-form-label"), "File Path"),
TD(_sampleFile.getFilePath())
),
TR(
TD(cl("labkey-form-label"), "Acquired Time"),
TD(DateUtil.formatDateTime(getContainer(), _sampleFile.getAcquiredTime()))
),
TR(
TD(cl("labkey-form-label"), "Modified Time"),
TD(DateUtil.formatDateTime(getContainer(), _sampleFile.getModifiedTime()))
),
TR(
TD(cl("labkey-form-label"), "Instrument Serial Number"),
TD(_sampleFile.getInstrumentSerialNumber())
),
TR(
TD(cl("labkey-form-label"), "Replicate Name"),
TD(replicate.getName())
)
);

HtmlView summaryView = new HtmlView(renderable);
Expand Down Expand Up @@ -5168,12 +5184,22 @@ public ModelAndView getView(final ProteinForm form, BindException errors)
ChromatogramGridView chromatogramView = new ChromatogramGridView(chromatogramRegion, errors)
{
@Override
public void renderView(RenderContext model, PrintWriter out) throws IOException
public void renderView(RenderContext model, HtmlWriter out)
{
out.write("<div style=\"display: inline-block\">\n");
out.write("<div id=\"groupChromatogramLegend\"></div>\n");
super.renderView(model, out);
out.write("</div>\n");
DIV(at(style, "display: inline-block"),
DIV(at(id, "groupChromatogramLegend")),
(Renderable) ret -> {
try
{
super.renderView(model, out);
}
catch (IOException e)
{
throw new RuntimeException(e);
}
return ret;
}
).appendTo(out);
}
};

Expand Down