From bd18082f5a68c45f9f40856cc09dcd18ce9d27af Mon Sep 17 00:00:00 2001
From: mikebender <mikebender@deephaven.io>
Date: Wed, 17 Jul 2024 14:31:22 -0400
Subject: [PATCH] Add descriptor metadata

- Fixes some issues on Enterprise where query or session information was dropped
---
 packages/dashboard-core-plugins/src/ChartPanelPlugin.tsx     | 3 ++-
 packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/dashboard-core-plugins/src/ChartPanelPlugin.tsx b/packages/dashboard-core-plugins/src/ChartPanelPlugin.tsx
index 5c9b51dfe..92d9e8751 100644
--- a/packages/dashboard-core-plugins/src/ChartPanelPlugin.tsx
+++ b/packages/dashboard-core-plugins/src/ChartPanelPlugin.tsx
@@ -75,6 +75,7 @@ async function createChartModel(
 
     if (metadata.type === dh.VariableType.FIGURE) {
       const descriptor = {
+        ...metadata,
         name: figureName,
         type: dh.VariableType.FIGURE,
       };
@@ -86,8 +87,8 @@ async function createChartModel(
     return ChartModelFactory.makeModel(dh, settings, figure);
   }
 
-  // TODO #1940: This won't work on Enterprise. We will need to refactor how ChartBuilder works.
   const descriptor = {
+    ...metadata,
     name: tableName,
     type: dh.VariableType.TABLE,
   };
diff --git a/packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx b/packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx
index 9f762d831..a16cdd780 100644
--- a/packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx
+++ b/packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx
@@ -729,7 +729,7 @@ export class IrisGridPanel extends PureComponent<
     this.setState(
       () => null,
       () => {
-        const { glEventHub, inputFilters } = this.props;
+        const { glEventHub, inputFilters, metadata } = this.props;
         const table = this.getTableName();
         const { panelState } = this.state;
         const sourcePanelId = LayoutUtils.getIdFromPanel(this);
@@ -743,6 +743,7 @@ export class IrisGridPanel extends PureComponent<
         }
         glEventHub.emit(IrisGridEvent.CREATE_CHART, {
           metadata: {
+            ...metadata,
             settings,
             sourcePanelId,
             table,