Skip to content

Add list of containers a module is active in #7287

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-klum merged 7 commits into from
Dec 24, 2025
Merged

Add list of containers a module is active in #7287

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1473d35
checkpoint
labkey-klum Dec 11, 2025
fa9d7cc
expose view
labkey-klum Dec 11, 2025
510ad96
in memory module list
labkey-klum Dec 13, 2025
f170af8
Merge branch 'develop' into fb_module_folders
labkey-klum Dec 19, 2025
077120e
Use java solution
labkey-klum Dec 20, 2025
15603d7
Revert whitespace changes.
labkey-klum Dec 23, 2025
ddb8183
Merge branch 'develop' into fb_module_folders
labkey-klum Dec 24, 2025
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
31 changes: 30 additions & 1 deletion core/src/org/labkey/core/query/ModulesTableInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@
import org.jetbrains.annotations.NotNull;
import org.labkey.api.data.BaseColumnInfo;
import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.data.CoreSchema;
import org.labkey.api.data.DisplayColumn;
import org.labkey.api.data.DisplayColumnDecorator;
import org.labkey.api.data.DisplayColumnFactory;
import org.labkey.api.data.ExpandableTextDisplayColumnFactory;
import org.labkey.api.data.JdbcType;
import org.labkey.api.data.RenderContext;
import org.labkey.api.data.SQLFragment;
Expand All @@ -36,7 +39,11 @@
import org.labkey.api.util.StringExpressionFactory;
import org.labkey.api.writer.HtmlWriter;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* User: kevink
Expand Down Expand Up @@ -94,6 +101,7 @@ public void addColumns()
var licenseCol = addTextColumn("License");
licenseCol.setURL(StringExpressionFactory.createURL("${LicenseURL}"));
licenseCol.setURLTargetWindow("_blank");
addTextColumn("ActiveFolders").setDisplayColumnFactory(new ExpandableTextDisplayColumnFactory());
addTextColumn("LicenseURL").setHidden(true);
addTextColumn("VcsRevision");
addTextColumn("VcsURL");
Expand All @@ -109,7 +117,8 @@ public void addColumns()
FieldKey.fromParts("SchemaVersion"),
FieldKey.fromParts("Label"),
FieldKey.fromParts("Organization"),
FieldKey.fromParts("License")
FieldKey.fromParts("License"),
FieldKey.fromParts("ActiveFolders")
));
}

Expand Down Expand Up @@ -182,6 +191,8 @@ public SQLFragment getFromSQL(String alias)
cte.append("SELECT * FROM (\n");
cte.append("VALUES ");
String sep = "";

Map<Module, List<String>> moduleContainers = getContainersForModule();
for (Module module : ModuleLoader.getInstance().getModules())
{
cte.append(sep);
Expand All @@ -203,6 +214,7 @@ public SQLFragment getFromSQL(String alias)
appendStringLiteral(h, cte,",",module.getSourcePath());
appendStringLiteral(h, cte,",",StringUtils.join(module.getModuleDependenciesAsSet(), ", "));
appendStringLiteral(h, cte,",",module.getSupportedDatabasesSet().toString());
appendStringLiteral(h, cte,",", StringUtils.join(moduleContainers.getOrDefault(module, Collections.emptyList()), "\n"));
cte.append(")");
}
cte.append(") AS T (");
Expand All @@ -219,6 +231,7 @@ public SQLFragment getFromSQL(String alias)
cte.append(",VcsRevision, VcsURL");
cte.append(",SourcePath");
cte.append(",Dependencies, SupportedDatabases");
cte.append(",ActiveFolders");
cte.append(")\n");

String tableName = getSqlDialect().truncate(alias + "$m", 0);
Expand All @@ -239,6 +252,22 @@ public SQLFragment getFromSQL(String alias)
return ret;
}

private Map<Module, List<String>> getContainersForModule()
{
Map<Module, List<String>> moduleFolders = new HashMap<>();

for (Container container : ContainerManager.getAllChildren(ContainerManager.getRoot()))
{
if (container != null)
container.getActiveModules().forEach(m -> moduleFolders.computeIfAbsent(m, k -> new ArrayList<>()).add(container.getPath()));
}

for (List<String> folders : moduleFolders.values())
Collections.sort(folders);

return moduleFolders;
}

// Format SchemaVersion column using the standard ModuleContext formatting rules: force three-decimal places for >= 20.000,
// otherwise suppress trailing zeroes. Also, right align the values in the grid.
private static class SchemaVersionDisplayColumnFactory implements DisplayColumnFactory
Expand Down