Merge branch '7.8' of github.com:gchq/stroom

Author: stroomdev66

CHANGELOG.md

@@ -13,6 +13,21 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 ~~~
 
 
+* Issue **#4855** : Fix Plan B session state range.
+
+* Improve log message when proxy HTTP forwarding fails. Now includes the time taken and the bytes sent.
+
+* Issue **#4858** : Fix Plan B query field error.
+
+* Issue **#4859** : Fix query on open for embedded queries.
+
+* Issue **#4861** : Allow embedded queries to have a set page size.
+
+* Issue **#4748** : Add user group icon to API key page.
+
+* Issue **#4806** : Add filter/group/sort indicators to hidden field menu items.
+
+
 ## [v7.9-beta.8] - 2025-04-09
 
 * Uplift BCrypt lib to 0.4.3.

replay_pid79302.log

@@ -307,7 +307,7 @@ public List<UserDependency> getUserDependencies(final UserRef userRef) {
                     return new UserDependency(userRef, details, executionSchedule.getOwningDoc());
                 })
 //                    .filter(userDependency ->
-//                            GwtNullSafe.getOrElse(
+//                            NullSafe.getOrElse(
 //                                    userDependency.getDocRef(),
 //                                    docRef -> securityContext.hasDocumentPermission(docRef, DocumentPermission.VIEW),
 //                                    true))

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AbstractScheduledQueryExecutor.java

@@ -287,7 +287,7 @@
     /* Visualisations */
     --vis__background-color: var(--dashboard-panel__background-color);
     --vis-axis__color: rgba(0,0,0,0.54);
-    --vis- GwtNullSafe: rgba(0,0,0,0.87);
+    --vis-text__color: rgba(0,0,0,0.87);
     --vis-text__color--faint: rgba(0,0,0,0.12);
     --vis-icon__color: rgba(0,0,0,0.6);
     --vis-icon__color--hover: rgba(0,0,0,0.87);

stroom-app/src/main/resources/ui/css/theme-root.css

@@ -163,11 +163,11 @@ public void render(final Context context, final T value, final SafeHtmlBuilder s
                     menuItems.get(0) instanceof final MenuItem menuItem &&
                     menuItem.getCommand() != null) {
                     // Single item with a command so no menu popup needed
-                    sb.append(template.divWithToolTip(NullSafe
-                            .getOrElse(menuItem.getText(), SafeHtml::asString, ""), icon));
+                    final SafeHtml tooltip = NullSafe.getOrElse(menuItem, MenuItem::getTooltip, menuItem.getText());
+                    sb.append(template.divWithTitle(tooltip.asString(), icon));
                 } else {
                     // Build the menu popup
-                    sb.append(template.divWithToolTip("Actions...", icon));
+                    sb.append(template.divWithTitle("Actions...", icon));
                 }
 
                 sb.appendHtmlConstant("</div>");
@@ -192,6 +192,6 @@ interface Template extends SafeHtmlTemplates {
         SafeHtml div(String className, SafeHtml content);
 
         @Template("<div title=\"{0}\">{1}</div>")
-        SafeHtml divWithToolTip(String title, SafeHtml content);
+        SafeHtml divWithTitle(String title, SafeHtml content);
     }
 }

stroom-core-client-widget/src/main/java/stroom/cell/info/client/HoverActionMenuCell.java

@@ -86,7 +86,7 @@ public Header<SafeHtml> build() {
 
             builder.appendHtmlConstant(">")
                     .append(headingText);
-//                if (GwtNullSafe.isBlankString(headingText)) {
+//                if (NullSafe.isBlankString(headingText)) {
 //                    builder.append(SafeHtmlUtils.EMPTY_SAFE_HTML);
 //                } else {
 //                    builder.appendEscaped(headingText);

stroom-core-client-widget/src/main/java/stroom/data/grid/client/HeadingBuilder.java

@@ -258,6 +258,11 @@ public void init(final SelectionListModel<T, I> model) {
         refresh(false, false);
     }
 
+    public void refresh() {
+        quickFilter.clear();
+        refresh(true, true);
+    }
+
     public void destroy() {
         if (model != null) {
             lastFilter = null;

stroom-core-client-widget/src/main/java/stroom/item/client/SelectionList.java

@@ -51,6 +51,10 @@ public void init(final SelectionListModel<T, I> model) {
         selectionList.init(model);
     }
 
+    public void refresh() {
+        selectionList.refresh();
+    }
+
     public MultiSelectionModel<I> getSelectionModel() {
         return selectionList.getSelectionModel();
     }

stroom-core-client-widget/src/main/java/stroom/item/client/SelectionPopup.java

@@ -155,7 +155,7 @@ public void setHelpText(final String helpText) {
 //        // This allows us to have hard coded help in the ui.xml but override it
 //        // using helpText, or set helpText back to null to use the hardcoded
 //        // ui.xml content
-//        if (GwtNullSafe.isBlankString(helpText) && helpHTML != null) {
+//        if (NullSafe.isBlankString(helpText) && helpHTML != null) {
 //            this.helpText = helpHTML.getHTML();
 //        }
         updateHelpButton();
@@ -212,19 +212,19 @@ private void updateHelpButton() {
 //        }
         updateLabelPanel();
 
-//        if (GwtNullSafe.isNonBlankString(plainHelpText)) {
+//        if (NullSafe.isNonBlankString(plainHelpText)) {
 //            haveHelpText = true;
 //            // Escape any html in there
 //            effectiveHelpText = SafeHtmlUtils.fromString(plainHelpText);
 //        }
 //
-//        if (GwtNullSafe.isBlankString(helpText) && helpHTML != null) {
+//        if (NullSafe.isBlankString(helpText) && helpHTML != null) {
 //            effectiveHelpText = SafeHtmlUtils.fromTrustedString(helpHTML.getHTML());
 //            haveHelpText = true;
 //        } else {
 //
 //        }
-//        if (!GwtNullSafe.isBlankString(getHelpText())) {
+//        if (!NullSafe.isBlankString(getHelpText())) {
 //            helpButton.setHelpContent(SafeHtmlUtils.fromSafeConstant(getHelpText()));
 //        } else {
 //            helpButton.setHelpContent(null);
@@ -282,7 +282,7 @@ private void addHelpHtml(final HelpHTML helpHTML) {
 
         updateHelpButton();
 //        // helpText trumps helpHTML
-//        if (GwtNullSafe.isBlankString(helpText)) {
+//        if (NullSafe.isBlankString(helpText)) {
 //            this.helpText = this.helpHTML.getHTML();
 //        }
     }

stroom-core-client-widget/src/main/java/stroom/widget/form/client/FormGroup.java

@@ -31,24 +31,22 @@ public class IconMenuItem extends MenuItem {
     private final SvgImage disabledIcon;
     private final IconColour iconColour;
     private final boolean highlight;
-    public final String tooltip;
 
     protected IconMenuItem(final int priority,
                            final SvgImage enabledIcon,
                            final SvgImage disabledIcon,
                            final IconColour iconColour,
                            final SafeHtml text,
+                           final SafeHtml tooltip,
                            final Action action,
                            final boolean enabled,
                            final Command command,
-                           final boolean highlight,
-                           final String tooltip) {
-        super(priority, text, action, enabled, command);
+                           final boolean highlight) {
+        super(priority, text, tooltip, action, enabled, command);
         this.enabledIcon = enabledIcon;
         this.disabledIcon = disabledIcon;
         this.iconColour = iconColour;
         this.highlight = highlight;
-        this.tooltip = tooltip;
     }
 
     public SvgImage getEnabledIcon() {
@@ -67,13 +65,6 @@ public boolean isHighlight() {
         return highlight;
     }
 
-    public String getTooltip() {
-        return NullSafe.string(tooltip);
-    }
-
-    // --------------------------------------------------------------------------------
-
-
     protected abstract static class AbstractBuilder<T extends IconMenuItem, B extends AbstractBuilder<T, ?>>
             extends MenuItem.AbstractBuilder<T, B> {
 
@@ -117,10 +108,6 @@ public B highlight(final boolean highlight) {
         public abstract T build();
     }
 
-
-    // --------------------------------------------------------------------------------
-
-
     public static class Builder
             extends AbstractBuilder<IconMenuItem, Builder> {
 
@@ -139,11 +126,11 @@ public IconMenuItem build() {
                     disabledIcon,
                     iconColour,
                     text,
+                    tooltip,
                     action,
                     enabled,
                     command,
-                    highlight,
-                    tooltip);
+                    highlight);
         }
     }
 }