Skip to content

Add the list of webparts for the container. #7318

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 2 commits into from
Jan 12, 2026
+28 −32
Merged

Add the list of webparts for the container. #7318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3924354
Add the list of webparts for the container. Remove redundant function…
labkey-klum Jan 8, 2026
2ea5d2b
Disallow sorting/filtering on ActiveModules
labkey-jeckels Jan 12, 2026
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
30 changes: 27 additions & 3 deletions api/src/org/labkey/api/data/ContainerTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.labkey.api.data;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.apache.logging.log4j.LogManager;
import org.jetbrains.annotations.NotNull;
Expand All @@ -39,6 +38,7 @@
import org.labkey.api.util.Path;
import org.labkey.api.util.SimpleNamedObject;
import org.labkey.api.view.ActionURL;
import org.labkey.api.view.Portal;
import org.labkey.api.webdav.WebdavResource;
import org.labkey.api.webdav.WebdavService;

Expand Down Expand Up @@ -174,14 +174,23 @@ private void init(ActionURL url)
var title = getMutableColumn("Title");
title.setURL(detailsURL);

// everything except activeModules and webParts
setDefaultVisibleColumns(getDefaultVisibleColumns());

var activeModules = new AliasedColumn("ActiveModules", getColumn("RowId"));
activeModules.setDisplayColumnFactory(ActiveModulesDisplayColumn::new);
activeModules.setReadOnly(true);
activeModules.setHidden(true);
addColumn(activeModules);

SQLFragment webpartNamesSQL = new SQLFragment("(SELECT ")
.append(getSqlDialect().getGroupConcat(new SQLFragment("PWP.name"), true, true, ", "))
.append(" FROM ").append(Portal.getTableInfoPortalWebParts(), "PWP")
.append(" WHERE PWP.container = " + ExprColumn.STR_TABLE_ALIAS + ".entityId)");
ExprColumn webpartColumn = new ExprColumn(this, "WebParts", webpartNamesSQL, JdbcType.VARCHAR);
webpartColumn.setReadOnly(true);
Copy link
Contributor

@labkey-jeckels labkey-jeckels Jan 8, 2026

Choose a reason for hiding this comment

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

Is this needed? I hope ExprColumns are considered read only by default

Copy link
Contributor Author

@labkey-klum labkey-klum Jan 8, 2026

Choose a reason for hiding this comment

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

probably not, it just affect how the column metadata is reported in the table summary view.

addColumn(webpartColumn);

setTitleColumn("DisplayName");

setImportURL(LINK_DISABLER);
}

Expand All @@ -205,6 +214,21 @@ private static class ActiveModulesDisplayColumn extends AbstractValueTransformin
public ActiveModulesDisplayColumn(ColumnInfo rowIdCol)
{
super(rowIdCol, String.class);
// VARCHAR rendering
_textAlign = "left";
_nowrap = false;
}

@Override
public boolean isSortable()
{
return false;
}

@Override
public boolean isFilterable()
{
return false;
}

@Override
Expand Down
30 changes: 1 addition & 29 deletions 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,13 +19,10 @@
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 @@ -39,11 +36,7 @@
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 @@ -101,7 +94,6 @@ public void addColumns()
var licenseCol = addTextColumn("License");
licenseCol.setURL(StringExpressionFactory.createURL("${LicenseURL}"));
licenseCol.setURLTarget("_blank");
addTextColumn("ActiveFolders").setDisplayColumnFactory(new ExpandableTextDisplayColumnFactory());
addTextColumn("LicenseURL").setHidden(true);
addTextColumn("VcsRevision");
addTextColumn("VcsURL");
Expand All @@ -117,8 +109,7 @@ public void addColumns()
FieldKey.fromParts("SchemaVersion"),
FieldKey.fromParts("Label"),
FieldKey.fromParts("Organization"),
FieldKey.fromParts("License"),
FieldKey.fromParts("ActiveFolders")
FieldKey.fromParts("License")
));
}

Expand Down Expand Up @@ -192,7 +183,6 @@ public SQLFragment getFromSQL(String alias)
cte.append("VALUES ");
String sep = "";

Map<Module, List<String>> moduleContainers = getContainersForModule();
for (Module module : ModuleLoader.getInstance().getModules())
{
cte.append(sep);
Expand All @@ -214,7 +204,6 @@ 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 @@ -231,7 +220,6 @@ 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 @@ -252,22 +240,6 @@ 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