From 9a66844fd6a9589ae98407666066c18ecb1f402e Mon Sep 17 00:00:00 2001 From: vagisha Date: Tue, 27 Jan 2026 09:21:04 -0800 Subject: [PATCH] Fix broken chromatogram and peptide details links on the Passport Details page. --- .../view/passport/beforeAfterReport.jsp | 3 --- webapp/passport/js/beforeAfter/protein.js | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/org/labkey/targetedms/view/passport/beforeAfterReport.jsp b/src/org/labkey/targetedms/view/passport/beforeAfterReport.jsp index c8010e10d..2a171a629 100644 --- a/src/org/labkey/targetedms/view/passport/beforeAfterReport.jsp +++ b/src/org/labkey/targetedms/view/passport/beforeAfterReport.jsp @@ -2,7 +2,6 @@ <%@ page import="org.labkey.api.view.HttpView" %> <%@ page import="org.labkey.api.view.JspView" %> <%@ page import="org.labkey.api.view.template.ClientDependencies" %> -<%@ page import="org.labkey.targetedms.TargetedMSController" %> <%@ page import="org.labkey.targetedms.model.passport.IPeptide" %> <%@ page import="org.labkey.targetedms.model.passport.IProtein" %> <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %> @@ -52,8 +51,6 @@ document.addEventListener("DOMContentLoaded", function() { protein.initialize(); }); - var chromatogramUrl = "<%=h(urlFor(TargetedMSController.PrecursorChromatogramChartAction.class))%>"; - var showPeptideUrl = "<%=h(urlFor(TargetedMSController.ShowPeptideAction.class))%>"; diff --git a/webapp/passport/js/beforeAfter/protein.js b/webapp/passport/js/beforeAfter/protein.js index a58100c6e..5a085dd64 100644 --- a/webapp/passport/js/beforeAfter/protein.js +++ b/webapp/passport/js/beforeAfter/protein.js @@ -155,7 +155,16 @@ protein = if (chromatogram) { parentElement.empty(); parentElement.show(); - LABKEY.targetedms.SVGChart.requestAndRenderSVG(chromatogramUrl + "id=" + chromatogram + "&syncY=true&syncX=false&chartWidth=250&chartHeight=400", parentElement[0], $('#seriesLegend')[0]) + const chromatogramUrl = LABKEY.ActionURL.buildURL("targetedms", "precursorChromatogramChart", + LABKEY.ActionURL.getContainer(), + { + id: chromatogram, + syncY: true, + syncX: false, + chartWidth: 250, + chartHeight: 400 + }); + LABKEY.targetedms.SVGChart.requestAndRenderSVG(chromatogramUrl, parentElement[0], $('#seriesLegend')[0]); return true; } else { @@ -193,7 +202,9 @@ protein = } // sets panorama peptide link - $('#selectedPeptideLink').attr("href", showPeptideUrl + "id=" + protein.selectedPeptide.PeptideId); + const showPeptideUrl = LABKEY.ActionURL.buildURL("targetedms", "showPeptide", LABKEY.ActionURL.getContainer(), {id: protein.selectedPeptide.PeptideId}); + $('#selectedPeptideLink').attr("href", showPeptideUrl); + // sets basic peptide info (Seq, location, length, etc.. $('#peptideinfo').empty(); var value = protein.selectedPeptide["Before Incubation"] ? protein.selectedPeptide["Before Incubation"] : protein.selectedPeptide["Total Area"];