Skip to content

Switch a few URLs to path-first #271

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 1 commit into from
Feb 23, 2024
Merged

Switch a few URLs to path-first #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceAlignmentJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
13 changes: 4 additions & 9 deletions jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -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."));
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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"));
Expand Down