Skip to content

QueryView: remove NavTree identifiers #7143

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-nicka merged 1 commit into from
Oct 24, 2025
Merged

QueryView: remove NavTree identifiers #7143

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
28 changes: 2 additions & 26 deletions api/src/org/labkey/api/query/QueryView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.net.URISyntaxException;
import java.sql.ResultSet;
import java.sql.SQLException;
Expand Down Expand Up @@ -433,24 +432,18 @@ public void setVisible(boolean visible)

private void populateMenu()
{
NavTree menu = getNavTree();
String label = getCaption();
menu.setId(getDataRegionName() + ".Menu." + label);

if (getQueryDef() != null)
{
NavTree editQueryItem;
if (getQueryDef().isSqlEditable() && getQueryDef().canEdit(getUser()))
editQueryItem = new NavTree("Edit Source", getSchema().urlFor(QueryAction.sourceQuery, getQueryDef()));
else
editQueryItem = new NavTree("View Definition", getSchema().urlFor(QueryAction.schemaBrowser, getQueryDef()));
editQueryItem.setId(getDataRegionName() + ":Query:EditSource");
addMenuItem(editQueryItem);

if (getQueryDef().isMetadataEditable() && getQueryDef().canEditMetadata(getUser()))
{
NavTree editMetadataItem = new NavTree("Edit Metadata", getSchema().urlFor(QueryAction.metadataQuery, getQueryDef()));
editMetadataItem.setId(getDataRegionName() + ":Query:EditMetadata");
addMenuItem(editMetadataItem);
}
}
Expand All @@ -466,7 +459,6 @@ private void populateMenu()
{
String name = query.getName();
NavTree item = new NavTree(name, target.clone().replaceParameter(param(QueryParam.queryName), name));
item.setId(getDataRegionName() + ":" + label + ":" + name);
// Intentionally don't set the description so we can avoid having to instantiate all of the TableInfos,
// which can be expensive for some schemas
if (name.equals(current))
Expand Down Expand Up @@ -1123,7 +1115,6 @@ public ActionButton createInsertMenuButton(ActionURL overrideInsertUrl, ActionUR
if (urlInsert != null)
{
NavTree insertNew = new NavTree(getInsertButtonText(getInsertButtonText(INSERT_ROW_TEXT)), urlInsert);
insertNew.setId(getBaseMenuId() + ":Insert:InsertNew");
button.addMenuItem(insertNew);
hasInsertNewOption = true;
}
Expand All @@ -1135,7 +1126,6 @@ public ActionButton createInsertMenuButton(ActionURL overrideInsertUrl, ActionUR
if (urlImport != null && urlImport != AbstractTableInfo.LINK_DISABLER_ACTION_URL)
{
NavTree importData = new NavTree(getInsertButtonText(IMPORT_BULK_DATA_TEXT), urlImport);
importData.setId(getBaseMenuId() + ":Insert:Import");
button.addMenuItem(importData);
hasImportDataOption = true;
}
Expand Down Expand Up @@ -1491,7 +1481,6 @@ public MenuButton createViewButton(ReportService.ItemFilter filter)
button.setTooltip("Grid views");
button.setIconCls("table");
NavTree menu = button.getNavTree();
menu.setId(getBaseMenuId() + ".Menu.GridViews");

if (getSettings().isAllowCustomizeView())
addCustomizeViewItems(button);
Expand All @@ -1514,7 +1503,6 @@ protected MenuButton createReportButton()
{
MenuButton button = new MenuButton("Reports");
NavTree menu = button.getNavTree();
menu.setId(getBaseMenuId() + ".Menu.Reports");

if (!getQueryDef().isTemporary() && _report == null)
{
Expand All @@ -1539,7 +1527,6 @@ protected MenuButton createReportButton()
if (viewItemFilter.accept(designer.getReportType(), designer.getLabel()))
{
NavTree item = new NavTree("Create " + designer.getLabel(), designer.getDesignerURL());
item.setId(getBaseMenuId() + ":Reports:Create:" + designer.getLabel());
item.setImageSrc(designer.getIconURL());
item.setImageCls(designer.getIconCls());

Expand Down Expand Up @@ -1581,7 +1568,6 @@ private MenuButton createChartButton()
for (ReportService.DesignerInfo designer : reportDesigners)
{
NavTree item = new NavTree("Create " + designer.getLabel(), designer.getDesignerURL());
item.setId(getBaseMenuId() + ":Charts:Create" + designer.getLabel());
item.setImageSrc(designer.getIconURL());
item.setImageCls(designer.getIconCls());
button.addMenuItem(item);
Expand Down Expand Up @@ -1719,19 +1705,17 @@ protected void addFilterItems(MenuButton button)
item.setSelected(true);
}
item.setScript(DataRegion.getJavaScriptObjectReference(getDataRegionName()) + ".clearSelected({quiet: true});");
item.setId(getBaseMenuId() + ":GridViews:" + label);
button.addMenuItem(item);
}

TableInfo t = getTable();
if (t instanceof UnionTable)
if (t instanceof UnionTable ut)
{
t = ((UnionTable) t).getComponentTable(); // check against a component table
t = ut.getComponentTable(); // check against a component table
}
if (null != t && t.supportsContainerFilter() && !getAllowableContainerFilterTypes().isEmpty())
{
NavTree containerFilterItem = new NavTree("Folder Filter");
containerFilterItem.setId(getBaseMenuId() + ":GridViews:Folder Filter");
button.addMenuItem(containerFilterItem);

ContainerFilter selectedFilter = getContainerFilter();
Expand All @@ -1745,8 +1729,6 @@ protected void addFilterItems(MenuButton button)
url.replaceParameter(propName, filterType.name());
NavTree filterItem = new NavTree(filterType.toString(), url);

filterItem.setId(getBaseMenuId() + ":GridViews:Folder Filter:" + filterType);

if (selectedFilterType == filterType)
{
filterItem.setSelected(true);
Expand Down Expand Up @@ -1815,7 +1797,6 @@ protected void addGridViews(MenuButton menu, URLHelper target, String currentVie

item = new NavTree(label, (ActionURL) null);
item.setScript(getChangeViewScript(""));
item.setId(getBaseMenuId() + ":GridViews:default");
if ("".equals(currentView))
item.setStrong(true);
}
Expand All @@ -1825,7 +1806,6 @@ protected void addGridViews(MenuButton menu, URLHelper target, String currentVie

item = new NavTree(label, (ActionURL) null);
item.setScript(getChangeViewScript(name));
item.setId(getBaseMenuId() + ":GridViews:grid-" + PageFlowUtil.filter(name));
if (name.equals(currentView))
item.setStrong(true);
}
Expand Down Expand Up @@ -1929,7 +1909,6 @@ protected void addReportViews(MenuButton menu)
{
String reportId = report.getDescriptor().getReportId().toString();
NavTree item = new NavTree(report.getDescriptor().getReportName(), (ActionURL) null);
item.setId(getBaseMenuId() + ":Reports:" + PageFlowUtil.filter(report.getDescriptor().getReportName()));
if (report.getDescriptor().getReportId().equals(getSettings().getReportId()))
item.setStrong(true);
item.setImageSrc(ReportUtil.getIconUrl(getContainer(), report));
Expand Down Expand Up @@ -2012,7 +1991,6 @@ public void addCustomizeViewItems(MenuButton button)
urlTableInfo.addParameter(QueryParam.queryName.toString(), getQueryDef().getName());

NavTree customizeView = new NavTree("Customize Grid");
customizeView.setId(getBaseMenuId() + ":GridViews:Customize Grid");
customizeView.setScript(DataRegion.getJavaScriptObjectReference(getDataRegionName()) + ".toggleShowCustomizeView();");
customizeView.setImageCls("fa fa-pencil");
button.addMenuItem(customizeView);
Expand All @@ -2024,7 +2002,6 @@ public void addCustomizeViewItems(MenuButton button)
if (provider != null)
{
NavTree item = button.addMenuItem("Edit Snapshot", provider.getEditSnapshotURL(getSettings(), getViewContext()));
item.setId(getBaseMenuId() + ":GridViews:Edit Snapshot");
}
}
}
Expand All @@ -2036,7 +2013,6 @@ public void addManageViewItems(MenuButton button, Map<String, String> params)
url.addParameter(entry.getKey(), entry.getValue());

NavTree item = button.addMenuItem("Manage Views", url);
item.setId(getBaseMenuId() + ":GridViews:Manage Views");
item.setImageCls("fa fa-cog");
}

Expand Down
4 changes: 1 addition & 3 deletions study/src/org/labkey/study/query/DatasetQueryView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,6 @@ private MenuButton createQCStateButton()
// Apply appropriate grid filter-url to each QC dropdown option href
ActionURL urlHelper = getQCStateFilteredURL(getViewContext().cloneActionURL(), set.getLabel(), dataRegionName, getContainer());
NavTree setItem = new NavTree(set.getLabel(), urlHelper);
setItem.setId("QCState:" + set.getLabel());

// When QC State Column gets filtered, detect the change and update QC State dropdown selection accordingly
String selectedQCLabel = selectedQCStateLabelFromUrl(getViewContext().getActionURL(), getDataRegionName(), set.getLabel(), publicQCUrlFilterValue, privateQCUrlFilterValue);
Expand All @@ -604,9 +603,8 @@ private MenuButton createQCStateButton()
}
ActionURL updateAction = new ActionURL(StudyController.UpdateQCStateAction.class, getContainer());
updateAction.addReturnUrl(getViewContext().getActionURL());
NavTree updateItem = button.addMenuItem("Update state of selected rows", "if (verifySelected(" + DataRegion.getJavaScriptObjectReference(getDataRegionName()) + ".form, \"" +
button.addMenuItem("Update state of selected rows", "if (verifySelected(" + DataRegion.getJavaScriptObjectReference(getDataRegionName()) + ".form, \"" +
updateAction.getLocalURIString() + "\", \"post\", \"rows\")) " + DataRegion.getJavaScriptObjectReference(getDataRegionName()) + ".form.submit()");
updateItem.setId("QCState:updateSelected");
}

if (getContainer().hasPermission(getUser(), AdminPermission.class))
Expand Down