Merge pull request #4162 from gchq/gh-4159_vis_params

#4159 Fix StroomQL vis params

Author: stroomdev66

Diff for: stroom-app/src/test/java/stroom/search/TestVisualisationTokenConsumer.java

@@ -61,10 +61,9 @@ void testVis() {
                 eval count = count()
                 group by EventTime
                 select EventTime, count
-                show LineChart (x = EventTime, y = count)
+                show LineChart (x = EventTime, y = count, interpolationMode = "basis-open", maxValues = 500)
                 """;
 
-
         SearchRequest searchRequest = new SearchRequest(
                 null,
                 null,
@@ -80,5 +79,4 @@ show LineChart (x = EventTime, y = count)
 
 
     }
-
 }

Diff for: stroom-dashboard/stroom-dashboard-impl/src/main/java/stroom/dashboard/impl/visualisation/VisualisationTokenConsumerImpl.java

@@ -184,7 +184,7 @@ private Map<String, String> getVisParameters(final List<AbstractToken> children,
         for (int i = 0; i < children.size(); i++) {
             AbstractToken t = children.get(i);
             String controlId;
-            String columnName;
+            String controlValue;
 
             // Get param name.
             if (!TokenType.isString(t)) {
@@ -221,18 +221,25 @@ private Map<String, String> getVisParameters(final List<AbstractToken> children,
             i++;
             if (i < children.size()) {
                 t = children.get(i);
-                if (!TokenType.isString(t)) {
-                    throw new TokenException(t, "Expected column name");
+                if (TokenType.STRING.equals(t.getTokenType()) || TokenType.PARAM.equals(t.getTokenType())) {
+                    final String columnName = t.getUnescapedText();
+
+                    // Validate the column name.
+                    final Column column = columnMap.get(columnName);
+                    if (column == null) {
+                        throw new TokenException(t, "Unable to find selected column: " + columnName);
+                    }
+
+                    controlValue = columnName;
+
+                } else if (TokenType.isString(t) || TokenType.NUMBER.equals(t.getTokenType())) {
+                    controlValue = t.getUnescapedText();
+
+                } else {
+                    throw new TokenException(t, "Expected column name or value");
                 }
-                columnName = t.getUnescapedText();
             } else {
-                throw new TokenException(t, "Expected column name");
-            }
-
-            // Validate the column name.
-            final Column column = columnMap.get(columnName);
-            if (column == null) {
-                throw new TokenException(t, "Unable to find selected column: " + columnName);
+                throw new TokenException(t, "Expected column name or value");
             }
 
             // Strip comma if there is one.
@@ -244,8 +251,8 @@ private Map<String, String> getVisParameters(final List<AbstractToken> children,
                 }
             }
 
-            if (controlId != null && columnName != null) {
-                params.put(controlId, columnName);
+            if (controlId != null && controlValue != null) {
+                params.put(controlId, controlValue);
             }
         }
         return params;

Diff for: unreleased_changes/20240314_164759_770__4159.md

@@ -0,0 +1,24 @@
+* Issue **#4159** : Fix StroomQL vis params.
+
+
+```sh
+# ********************************************************************************
+# Issue title: sQL show, how to pass strings as params
+# Issue link:  https://github.com/gchq/stroom/issues/4159
+# ********************************************************************************
+
+# ONLY the top line will be included as a change entry in the CHANGELOG.
+# The entry should be in GitHub flavour markdown and should be written on a SINGLE
+# line with no hard breaks. You can have multiple change files for a single GitHub issue.
+# The  entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
+# 'Fixed nasty bug'.
+#
+# Examples of acceptable entries are:
+#
+#
+# * Issue **123** : Fix bug with an associated GitHub issue in this repository
+#
+# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
+#
+# * Fix bug with no associated GitHub issue.
+```