#3998 Clear visualisations when no data is returned rather than showing no data

Author: stroomdev66

content-packs.yml

@@ -96,7 +96,7 @@
       name: "stroom-visualisations-dev",
       uri : "https://github.com/gchq/stroom-visualisations-dev.git",
       branch: "7.2",
-      commit: "04425fcc11d334c5861aa84b5fed6c174343808a"
+      commit: "d95c1588bc13a697a818bffea6ed213239a1f993"
     }
   } ]
 }

stroom-core-client/src/main/java/stroom/dashboard/client/vis/VisPresenter.java

@@ -85,6 +85,22 @@ public class VisPresenter extends AbstractComponentPresenter<VisPresenter.VisVie
     public static final ComponentType TYPE = new ComponentType(4, "vis", "Visualisation", ComponentUse.PANEL);
     private static final long UPDATE_INTERVAL = 2000;
 
+
+    private static final JavaScriptObject EMPTY_DATA;
+
+    static {
+        final JSONObject dataObject = JSONUtil.getObject(JSONUtil.parse(
+                "{" +
+                        "\"values\": []," +
+                        "\"min\": []," +
+                        "\"max\": []," +
+                        "\"sum\": []," +
+                        "\"types\": []," +
+                        "\"sortDirections\": []" +
+                        "}"));
+        EMPTY_DATA = dataObject.getJavaScriptObject();
+    }
+
     private final VisFunctionCache visFunctionCache;
     private final ScriptCache scriptCache;
     private final RestFactory restFactory;
@@ -292,7 +308,7 @@ public void reset() {
     public void startSearch() {
         nextUpdate = 0;
         currentSettings = null;
-        currentData = null;
+        currentData = EMPTY_DATA;
         lastData = null;
 
         if (!searching) {
@@ -406,7 +422,7 @@ private void setDataInternal(final Result componentResult) {
     }
 
     private JavaScriptObject getJSONData(final VisResult visResult) {
-        JavaScriptObject data = null;
+        JavaScriptObject data = EMPTY_DATA;
 
         // Turn JSON result text into an object.
         final JSONObject dataObject = JSONUtil.getObject(JSONUtil.parse(visResult.getJsonData()));
@@ -509,19 +525,19 @@ public void onChange(final VisFunction function) {
                         visFrame.setVisType(function.getFunctionName(), getClassName(currentPreferences.getTheme()));
                     }
 
-                    if (currentData != null) {
-                        update();
-                        currentError = null;
-                    }
+                    currentError = null;
+                    update();
 
                 } catch (final RuntimeException e) {
                     currentError = e.getMessage();
                 }
             } else if (LoadStatus.FAILURE.equals(function.getStatus())) {
                 // Try and clear the current visualisation.
                 try {
-                    // getView().clear();
+                    currentData = EMPTY_DATA;
                     currentError = null;
+
+                    update();
                 } catch (final RuntimeException e) {
                     // Ignore.
                 }
@@ -574,13 +590,6 @@ private void updateStatusMessage() {
                     case LOADED:
                         if (currentError != null) {
                             getView().showMessage(currentError);
-                        } else if (currentData == null) {
-                            if (searching) {
-                                getView().hideMessage();
-                                //getView().showMessage("Waiting for data...");
-                            } else {
-                                getView().showMessage("No data");
-                            }
                         } else {
                             getView().hideMessage();
                         }

stroom-core-shared/src/main/java/stroom/content/ContentPacks.java

@@ -17,7 +17,7 @@ public class ContentPacks {
             new GitRepo("stroom-visualisations-dev",
                     "https://github.com/gchq/stroom-visualisations-dev.git",
                     "7.2",
-                    "04425fcc11d334c5861aa84b5fed6c174343808a");
+                    "d95c1588bc13a697a818bffea6ed213239a1f993");
 
     public static final ContentPack CORE_XML_SCHEMAS_PACK = createStandardContentPack("core-xml-schemas");
 

unreleased_changes/20240322_151526_304__3998.md

@@ -0,0 +1,24 @@
+* Issue **#3998** : Clear visualisations when no data is returned rather than showing `no data`.
+
+
+```sh
+# ********************************************************************************
+# Issue title: When a vis gets no data after previously getting data it should update vis to clear it
+# Issue link:  https://github.com/gchq/stroom/issues/3998
+# ********************************************************************************
+
+# 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.
+```