From a0388ab879c0b3334e573f65e5d5c91fe63c994e Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 19 Feb 2024 16:52:26 -0800 Subject: [PATCH] Switch a few URLs to path-first --- .../pipeline/SequenceAlignmentJob.java | 2 +- .../query/SequenceAnalysisUserSchema.java | 2 +- .../test/tests/external/labModules/JBrowseTest.java | 13 ++++--------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceAlignmentJob.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceAlignmentJob.java index a46cff3f6..8c77fb5fe 100644 --- a/SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceAlignmentJob.java +++ b/SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceAlignmentJob.java @@ -132,7 +132,7 @@ public ReferenceGenome getTargetGenome() public static void register() throws CloneNotSupportedException { FileAnalysisTaskPipelineSettings settings = new FileAnalysisTaskPipelineSettings(NAME); - settings.setAnalyzeURL("/sequenceAnalysis/sequenceAnalysis.view?"); + settings.setAnalyzeURL("/sequenceAnalysis-sequenceAnalysis.view"); settings.setDescription("Initiate analyses such as alignment or SNP calling on sequence data."); settings.setProtocolName("Sequence Analysis"); settings.setProtocolFactoryName("sequenceAnalysis"); diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java index ae17fef6f..33fbd6395 100644 --- a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java +++ b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java @@ -404,7 +404,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep ExprColumn newCol = new ExprColumn(ret, "jobIds", sql, JdbcType.VARCHAR, sourceTable.getColumn("rowid")); newCol.setLabel("Job(s)"); - newCol.setDisplayColumnFactory(new PipelineDisplayColumnFactory("/pipeline-status/details.view?rowId=")); + newCol.setDisplayColumnFactory(new PipelineDisplayColumnFactory("/pipeline-status-details.view?rowId=")); ret.addColumn(newCol); } diff --git a/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java b/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java index 57006b138..82a8098c4 100644 --- a/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java +++ b/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java @@ -40,14 +40,11 @@ import org.labkey.test.util.Ext4Helper; import org.labkey.test.util.PasswordUtil; import org.labkey.test.util.PortalHelper; -import org.labkey.test.util.ext4cmp.Ext4CmpRef; import org.labkey.test.util.ext4cmp.Ext4ComboRef; import org.labkey.test.util.ext4cmp.Ext4FieldRef; -import org.labkey.test.util.ext4cmp.Ext4GridRef; import org.labkey.test.util.external.labModules.LabModuleHelper; import org.openqa.selenium.By; import org.openqa.selenium.Keys; -import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.Color; @@ -56,8 +53,6 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import java.util.stream.Collector; -import java.util.stream.Collectors; /** * Created by bimber on 1/20/2015. @@ -400,7 +395,7 @@ private void testSampleFiltersFromUrl() private void testNoSession() { - beginAt("/" + getProjectName() + "/jbrowse-jbrowse.view?"); + beginAt("/" + getProjectName() + "/jbrowse-jbrowse.view"); waitForElement(Locator.tagWithText("p", "Error - no session provided.")); } @@ -1228,12 +1223,12 @@ private void testOutputFileProcessing() throws Exception waitAndClickAndWait(Ext4Helper.Locators.ext4ButtonEnabled("OK")); waitForPipelineJobsToComplete(existingPipelineJobs + 1, "Recreating Resources", false); - beginAt("/project/" + getProjectName() + "/begin.view"); + beginAt("/" + getProjectName() + "/project-begin.view"); _helper.clickNavPanelItemAndWait("JBrowse Sessions:", 1); waitAndClickAndWait(Locator.tagWithText("a", "View In JBrowse")); waitForElement(Locator.tagWithText("div", "TestGenome1")); - beginAt("/project/" + getProjectName() + "/begin.view"); + beginAt("/" + getProjectName() + "/project-begin.view"); _helper.clickNavPanelItemAndWait("JBrowse Sessions:", 1); dr = DataRegionTable.DataRegion(getDriver()).find(); dr.clickRowDetails(0); @@ -1265,7 +1260,7 @@ private void testOutputFileProcessing() throws Exception Assert.assertNotNull("Missing session ID on URL", sessionId); // Now ensure default tracks appear: - beginAt("/project/" + getProjectName() + "/begin.view"); + beginAt("/" + getProjectName() + "/project-begin.view"); _helper.clickNavPanelItemAndWait("JBrowse Sessions:", 1); waitAndClickAndWait(Locator.tagWithText("a", "View In JBrowse")); waitForElement(Locator.tagWithText("div", "TestGenome1"));