use currently selected data source when no source attached to saved q…

…uery Signed-off-by: Amardeepsingh Siglani <[email protected]>
opensearch-project · Nov 16, 2024 · c7d1e77 · c7d1e77
1 parent ab4e6e8
commit c7d1e77
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/plugins/data/public/ui/saved_query_flyouts/open_saved_query_flyout.tsx b/src/plugins/data/public/ui/saved_query_flyouts/open_saved_query_flyout.tsx
@@ -302,7 +302,9 @@ export function OpenSavedQueryFlyout({
                 if (selectedQuery) {
                   if (
                     // Template queries are not associated with data sources. Apply data source from current query
-                    selectedQuery.attributes.isTemplate
+                    selectedQuery.attributes.isTemplate ||
+                    // Associating a saved query with a data source is optional. If no data source is present, keep the current source.
+                    !selectedQuery.attributes.query.dataset?.dataSource
                   ) {
                     const updatedQuery: Query = {
                       ...queryStringManager?.getQuery(),