Skip to content
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

Test fixes related to MS2 GWT deletion work #6329

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Test fixes related to MS2 GWT deletion work #6329

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
9 changes: 2 additions & 7 deletions api/src/org/labkey/api/pipeline/PipelineProtocolFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.xmlbeans.XmlOptions;
import org.fhcrc.cpas.pipeline.protocol.xml.PipelineProtocolPropsDocument;
import org.labkey.api.data.Container;
import org.labkey.api.util.FileUtil;
import org.labkey.api.util.NetworkDrive;

Expand Down Expand Up @@ -64,11 +63,7 @@ public static File locateProtocolRootDir(File rootDir, File systemDir)

public T load(PipeRoot root, String name, boolean archived) throws IOException
{
return load(getProtocolFile(root, name, archived), root.getContainer());
}

protected T load(Path file, Container container) throws IOException
{
Path file = getProtocolFile(root, name, archived);
try
{
Map<String, String> mapNS = new HashMap<>();
Expand Down Expand Up @@ -164,7 +159,7 @@ public String[] getProtocolNames(PipeRoot root, Path dirData, boolean archived)
}
}

String[] vals = setNames.toArray(new String[setNames.size()]);
String[] vals = setNames.toArray(new String[0]);
Arrays.sort(vals, String.CASE_INSENSITIVE_ORDER);
return vals;
}
Expand Down
2 changes: 1 addition & 1 deletion pipeline/src/org/labkey/pipeline/api/PipelineServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ public PathAnalysisProperties getFileAnalysisProperties(Container c, String task
if (pr == null || !pr.isValid())
throw new NotFoundException();

Path dirData = pr.getRootNioPath();
Path dirData = null;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the thing that fixes the test and makes the archived protocol not show in the drop down

if (path != null)
{
dirData = pr.resolveToNioPath(path);
Expand Down