Skip to content

Fix paths for devtools move #3213

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
Sep 25, 2026
Merged

Fix paths for devtools move #3213

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
26 changes: 15 additions & 11 deletions modules/devtools/src/org/labkey/devtools/ToolsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,23 +584,25 @@ public ModelAndView getView(Object o, BindException errors) throws IOException
return new SimpleErrorView(errors);
}

// LABKEY_ROOT/repos/labkey/server
File serverDir = new File(sourcePath).getParentFile().getParentFile().getParentFile();
List<ControllerActionId> actionIds = new LinkedList<>();

// As of now, these are the only classes that specify crawler actions
for (String path : List.of(
sourcePath + "/../../clientModules/adjudication/test/src/org/labkey/test/tests/adjudication/AdjudicationAbstractBaseTest.java",
sourcePath + "/../../ehrModules/ehr/test/src/org/labkey/test/tests/ehr/ComplianceTrainingTest.java",
sourcePath + "/../../limsModules/biologics/test/src/org/labkey/test/tests/biologics/BiologicsReportTest.java",
sourcePath + "/../study/test/src/org/labkey/test/tests/study",
sourcePath + "/../../../testAutomation/src/org/labkey/test/stress/HarConverter.java",
sourcePath + "/../../../testAutomation/src/org/labkey/test/util/Crawler.java"
"modules/clientModules/adjudication/test/src/org/labkey/test/tests/adjudication/AdjudicationAbstractBaseTest.java",
"modules/ehrModules/ehr/test/src/org/labkey/test/tests/ehr/ComplianceTrainingTest.java",
"modules/limsModules/biologics/test/src/org/labkey/test/tests/biologics/BiologicsReportTest.java",
"modules/platform/study/test/src/org/labkey/test/tests/study",
"testAutomation/src/org/labkey/test/stress/HarConverter.java",
"testAutomation/src/org/labkey/test/util/Crawler.java"
))
{
File file = new File(path);
File file = FileUtil.appendPath(serverDir, new org.labkey.api.util.Path(path));
if (!file.exists())
{
errors.reject(ERROR_MSG, FileUtil.getAbsoluteCaseSensitiveFile(file).getAbsolutePath() + ": path not found!");
return new SimpleErrorView(errors);
continue;
}
addActionIds(actionIds, file);
}
Expand Down Expand Up @@ -634,8 +636,6 @@ public ModelAndView getView(Object o, BindException errors) throws IOException
.append("The following " + (missingModuleActions.size() > 1 ? "actions' controllers" : "action's controller") + " could not be resolved to a module running in this deployment:")
.unsafeAppend("<br><br>\n");
missingModuleActions.forEach(id -> builder.append(id.toString()).unsafeAppend("<br>\n"));
builder.unsafeAppend("<br>\n");
builder.append("The associated module(s) might not support " + DbScope.getLabKeyScope().getDatabaseProductName() + ".");
builder.unsafeAppend("<br><br>\n");
}

Expand All @@ -650,7 +650,7 @@ public ModelAndView getView(Object o, BindException errors) throws IOException
return new HtmlView(builder);
}

private void addActionIds(List<ControllerActionId> actionIds, File file) throws IOException
private void addActionIds(List<ControllerActionId> actionIds, File file)
{
if (file.isDirectory())
{
Expand All @@ -676,6 +676,10 @@ private void addActionIds(List<ControllerActionId> actionIds, File file) throws
actionIds.add(new ControllerActionId(matcher.group(1), matcher.group(2)));
}
}
catch (IOException e)
{
throw new RuntimeException(e);
}
}
}

Expand Down
Loading