Skip to content

Commit 96a3439

Browse files
Prevent popup widget from wrapping to next line (#7673)
#### Rationale Protein name display looks better when the popup widget isn't wrapped to the next line in a table cell. #### Changes - Inject a non-breaking space to ensure no inopportune wrapping #### Tasks 📍 - [x] Claude Code Review - [x] Manual Testing @labkey-tchad - Create a Panorama folder (subtype: Experiment) - Import MRMer.zip (https://github.com/LabKey/targetedms/blob/develop/test/sampledata/TargetedMS/MRMer.zip) - Click the Peptide Groups link in the runs grid - Check that the protein name and down-arrow render without wrapping - [x] Verify Safari - [x] Verify Firefox - [x] Verify Chrome - ~Test Automation~ <img width="1085" height="355" alt="image" src="https://github.com/user-attachments/assets/a1642c62-49fc-4925-8ce7-789e9cc6c39a" />
1 parent f2f8cf5 commit 96a3439

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

api/src/org/labkey/api/action/QueryViewAction.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.labkey.api.action;
1818

19+
import org.jetbrains.annotations.NotNull;
1920
import org.jetbrains.annotations.Nullable;
2021
import org.labkey.api.data.ColumnHeaderType;
2122
import org.labkey.api.data.ExcelWriter;
@@ -135,7 +136,9 @@ protected ModelAndView getHtmlView(Form form, BindException errors) throws Excep
135136
/**
136137
* Correctly configures the QueryView to use the QueryViewAction for export purposes
137138
* @param dataRegion null as a convenience when only a single QueryView is being used
139+
* @throws NotFoundException if passed a dataRegion name that doesn't exist
138140
*/
141+
@NotNull
139142
protected final ViewType createInitializedQueryView(Form form, BindException errors, boolean forExport, @Nullable String dataRegion) throws Exception
140143
{
141144
ViewType result = createQueryView(form, errors, forExport, dataRegion);
@@ -164,6 +167,7 @@ protected final ViewType createInitializedQueryView(Form form, BindException err
164167
* Create the specially configured query view.
165168
* @param dataRegion null as a convenience when only a single QueryView is being used
166169
*/
170+
@Nullable
167171
protected abstract ViewType createQueryView(Form form, BindException errors, boolean forExport, @Nullable String dataRegion) throws Exception;
168172

169173
public static class QueryExportForm extends QueryForm

api/src/org/labkey/api/data/AJAXDetailsDisplayColumn.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.labkey.api.util.ContainerContext;
2424
import org.labkey.api.util.DOM;
2525
import org.labkey.api.util.GUID;
26+
import org.labkey.api.util.HtmlString;
2627
import org.labkey.api.util.JavaScriptFragment;
2728
import org.labkey.api.util.StringExpression;
2829
import org.labkey.api.view.ActionURL;
@@ -38,6 +39,7 @@
3839

3940
import static org.labkey.api.util.DOM.SPAN;
4041
import static org.labkey.api.util.DOM.id;
42+
import static org.labkey.api.util.DOM.Attribute.style;
4143

4244
/**
4345
* Uses LABKEY.Ext.CalloutTip to provide additional details, summoned via AJAX
@@ -106,7 +108,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
106108
props.put("target", divId);
107109

108110
SPAN(
109-
id(divId),
111+
id(divId).at(style, "display:inline-flex;flex-wrap:nowrap"),
110112
(DOM.Renderable) ret -> {
111113
super.renderGridCellContents(ctx, out);
112114
return ret;

0 commit comments

Comments
 (0)