#4523 Embed queries in dashboards

gchq · Oct 9, 2024 · d766484 · d766484
1 parent d9435d2
commit d766484
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 21 deletions.
diff --git a/stroom-app/src/main/resources/ui/noauth/swagger/stroom.json b/stroom-app/src/main/resources/ui/noauth/swagger/stroom.json
@@ -12204,6 +12204,17 @@
         },
         "required" : [ "expression" ]
       },
+      "ColumnRef" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "name" : {
+            "type" : "string"
+          }
+        }
+      },
       "CompletionItem" : {
         "type" : "object",
         "discriminator" : {
@@ -20852,28 +20863,28 @@
           "type" : "object",
           "properties" : {
             "colFromField" : {
-              "$ref" : "#/components/schemas/Column"
+              "$ref" : "#/components/schemas/ColumnRef"
             },
             "colToField" : {
-              "$ref" : "#/components/schemas/Column"
+              "$ref" : "#/components/schemas/ColumnRef"
             },
             "lineFromField" : {
-              "$ref" : "#/components/schemas/Column"
+              "$ref" : "#/components/schemas/ColumnRef"
             },
             "lineToField" : {
-              "$ref" : "#/components/schemas/Column"
+              "$ref" : "#/components/schemas/ColumnRef"
             },
             "modelVersion" : {
               "type" : "string"
             },
             "partNoField" : {
-              "$ref" : "#/components/schemas/Column"
+              "$ref" : "#/components/schemas/ColumnRef"
             },
             "pipeline" : {
               "$ref" : "#/components/schemas/DocRef"
             },
             "recordNoField" : {
-              "$ref" : "#/components/schemas/Column"
+              "$ref" : "#/components/schemas/ColumnRef"
             },
             "showAsHtml" : {
               "type" : "boolean"
@@ -20882,7 +20893,7 @@
               "type" : "boolean"
             },
             "streamIdField" : {
-              "$ref" : "#/components/schemas/Column"
+              "$ref" : "#/components/schemas/ColumnRef"
             },
             "tableId" : {
               "type" : "string"

diff --git a/stroom-app/src/main/resources/ui/noauth/swagger/stroom.yaml b/stroom-app/src/main/resources/ui/noauth/swagger/stroom.yaml
@@ -8384,6 +8384,13 @@ components:
           $ref: '#/components/schemas/Sort'
       required:
       - expression
+    ColumnRef:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
     CompletionItem:
       type: object
       discriminator:
@@ -16037,27 +16044,27 @@ components:
       - type: object
         properties:
           colFromField:
-            $ref: '#/components/schemas/Column'
+            $ref: '#/components/schemas/ColumnRef'
           colToField:
-            $ref: '#/components/schemas/Column'
+            $ref: '#/components/schemas/ColumnRef'
           lineFromField:
-            $ref: '#/components/schemas/Column'
+            $ref: '#/components/schemas/ColumnRef'
           lineToField:
-            $ref: '#/components/schemas/Column'
+            $ref: '#/components/schemas/ColumnRef'
           modelVersion:
             type: string
           partNoField:
-            $ref: '#/components/schemas/Column'
+            $ref: '#/components/schemas/ColumnRef'
           pipeline:
             $ref: '#/components/schemas/DocRef'
           recordNoField:
-            $ref: '#/components/schemas/Column'
+            $ref: '#/components/schemas/ColumnRef'
           showAsHtml:
             type: boolean
           showStepping:
             type: boolean
           streamIdField:
-            $ref: '#/components/schemas/Column'
+            $ref: '#/components/schemas/ColumnRef'
           tableId:
             type: string
     TextConverterDoc:

diff --git a/.../main/java/stroom/dashboard/client/embeddedquery/BasicEmbeddedQuerySettingsPresenter.java b/.../main/java/stroom/dashboard/client/embeddedquery/BasicEmbeddedQuerySettingsPresenter.java
@@ -131,7 +131,8 @@ public boolean isDirty(final ComponentConfig componentConfig) {
             return true;
         }
 
-        final EmbeddedQueryComponentSettings oldSettings = (EmbeddedQueryComponentSettings) componentConfig.getSettings();
+        final EmbeddedQueryComponentSettings oldSettings =
+                (EmbeddedQueryComponentSettings) componentConfig.getSettings();
         final EmbeddedQueryComponentSettings newSettings = writeSettings(oldSettings);
 
         final boolean equal = Objects.equals(oldSettings.getQueryRef(), newSettings.getQueryRef()) &&

diff --git a/...re-client/src/main/java/stroom/dashboard/client/embeddedquery/EmbeddedQueryPresenter.java b/...re-client/src/main/java/stroom/dashboard/client/embeddedquery/EmbeddedQueryPresenter.java
@@ -24,8 +24,8 @@
 import stroom.dashboard.client.main.DashboardContext;
 import stroom.dashboard.client.main.Queryable;
 import stroom.dashboard.client.query.QueryInfo;
-import stroom.dashboard.client.table.HasComponentSelection;
 import stroom.dashboard.client.table.ComponentSelection;
+import stroom.dashboard.client.table.HasComponentSelection;
 import stroom.dashboard.client.vis.VisSelectionModel;
 import stroom.dashboard.shared.Automate;
 import stroom.dashboard.shared.ComponentConfig;

diff --git a/stroom-core-client/src/main/java/stroom/dashboard/client/query/QueryPresenter.java b/stroom-core-client/src/main/java/stroom/dashboard/client/query/QueryPresenter.java
@@ -28,8 +28,8 @@
 import stroom.dashboard.client.main.IndexLoader;
 import stroom.dashboard.client.main.Queryable;
 import stroom.dashboard.client.main.SearchModel;
-import stroom.dashboard.client.table.HasComponentSelection;
 import stroom.dashboard.client.table.ComponentSelection;
+import stroom.dashboard.client.table.HasComponentSelection;
 import stroom.dashboard.shared.Automate;
 import stroom.dashboard.shared.ComponentConfig;
 import stroom.dashboard.shared.ComponentSelectionHandler;

diff --git a/stroom-core-client/src/main/java/stroom/dashboard/client/vis/VisPresenter.java b/stroom-core-client/src/main/java/stroom/dashboard/client/vis/VisPresenter.java
@@ -24,8 +24,8 @@
 import stroom.dashboard.client.main.ResultComponent;
 import stroom.dashboard.client.main.SearchModel;
 import stroom.dashboard.client.query.QueryPresenter;
-import stroom.dashboard.client.table.HasComponentSelection;
 import stroom.dashboard.client.table.ComponentSelection;
+import stroom.dashboard.client.table.HasComponentSelection;
 import stroom.dashboard.client.table.TablePresenter;
 import stroom.dashboard.shared.ComponentConfig;
 import stroom.dashboard.shared.ComponentResultRequest;

diff --git a/...om-core-client/src/main/java/stroom/query/client/presenter/QueryResultTablePresenter.java b/...om-core-client/src/main/java/stroom/query/client/presenter/QueryResultTablePresenter.java
@@ -19,9 +19,9 @@
 import stroom.alert.client.event.ConfirmEvent;
 import stroom.cell.expander.client.ExpanderCell;
 import stroom.core.client.LocationManager;
+import stroom.dashboard.client.table.ComponentSelection;
 import stroom.dashboard.client.table.DownloadPresenter;
 import stroom.dashboard.client.table.HasComponentSelection;
-import stroom.dashboard.client.table.ComponentSelection;
 import stroom.data.grid.client.DataGridSelectionEventManager;
 import stroom.data.grid.client.MyDataGrid;
 import stroom.data.grid.client.PagerView;

diff --git a/stroom-core-client/src/main/java/stroom/query/client/presenter/QueryResultVisPresenter.java b/stroom-core-client/src/main/java/stroom/query/client/presenter/QueryResultVisPresenter.java
@@ -16,9 +16,8 @@
 
 package stroom.query.client.presenter;
 
-import stroom.dashboard.client.main.Components;
-import stroom.dashboard.client.table.HasComponentSelection;
 import stroom.dashboard.client.table.ComponentSelection;
+import stroom.dashboard.client.table.HasComponentSelection;
 import stroom.dashboard.client.vis.VisFrame;
 import stroom.dashboard.client.vis.VisSelectionModel;
 import stroom.data.pager.client.RefreshButton;