Only support copy for query templates (#8899)

* only support copy for query templates Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * Changeset file for PR #8899 created/updated * clear selected query on tab change; keep button disabled when query is not selected Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> --------- Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
opensearch-project · Nov 20, 2024 · a107509 · a107509
1 parent d3f539c
commit a107509
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 25 deletions.
diff --git a/changelogs/fragments/8899.yml b/changelogs/fragments/8899.yml
@@ -0,0 +1,2 @@
+fix:
+- Only support copy action for query templates ([#8899](/~https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8899))
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
@@ -21,15 +21,18 @@ import {
   EuiTablePagination,
   EuiTitle,
   Pager,
+  copyToClipboard,
 } from '@elastic/eui';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { i18n } from '@osd/i18n';
+import { NotificationsStart } from 'opensearch-dashboards/public';
 import { SavedQuery, SavedQueryService } from '../../query';
 import { SavedQueryCard } from './saved_query_card';
 import { getQueryService } from '../../services';
 
 export interface OpenSavedQueryFlyoutProps {
   savedQueryService: SavedQueryService;
+  notifications?: NotificationsStart;
   onClose: () => void;
   onQueryOpen: (query: SavedQuery) => void;
   handleQueryDelete: (query: SavedQuery) => Promise<void>;
@@ -44,13 +47,21 @@ interface SavedQuerySearchableItem {
   savedQuery: SavedQuery;
 }
 
+enum OPEN_QUERY_TAB_ID {
+  SAVED_QUERIES = 'saved-queries',
+  QUERY_TEMPLATES = 'query-templates',
+}
+
 export function OpenSavedQueryFlyout({
   savedQueryService,
+  notifications,
   onClose,
   onQueryOpen,
   handleQueryDelete,
 }: OpenSavedQueryFlyoutProps) {
-  const [selectedTabId, setSelectedTabId] = useState<string>('mutable-saved-queries');
+  const [selectedTabId, setSelectedTabId] = useState<OPEN_QUERY_TAB_ID>(
+    OPEN_QUERY_TAB_ID.SAVED_QUERIES
+  );
   const [savedQueries, setSavedQueries] = useState<SavedQuery[]>([]);
   const [hasTemplateQueries, setHasTemplateQueries] = useState(false);
   const [itemsPerPage, setItemsPerPage] = useState(10);
@@ -85,13 +96,13 @@ export function OpenSavedQueryFlyout({
       }
 
       // Set queries based on the current tab
-      if (currentTabIdRef.current === 'mutable-saved-queries') {
+      if (currentTabIdRef.current === OPEN_QUERY_TAB_ID.SAVED_QUERIES) {
         const allQueries = await savedQueryService.getAllSavedQueries();
         const mutableSavedQueries = allQueries.filter((q) => !q.attributes.isTemplate);
-        if (currentTabIdRef.current === 'mutable-saved-queries') {
+        if (currentTabIdRef.current === OPEN_QUERY_TAB_ID.SAVED_QUERIES) {
           setSavedQueries(mutableSavedQueries);
         }
-      } else if (currentTabIdRef.current === 'template-saved-queries') {
+      } else if (currentTabIdRef.current === OPEN_QUERY_TAB_ID.QUERY_TEMPLATES) {
         setSavedQueries(templateQueries);
       }
     } catch (e) {
@@ -111,6 +122,7 @@ export function OpenSavedQueryFlyout({
     fetchAllSavedQueriesForSelectedTab();
     setSearchQuery(EuiSearchBar.Query.MATCH_ALL);
     updatePageIndex(0);
+    setSelectedQuery(undefined);
   }, [selectedTabId, fetchAllSavedQueriesForSelectedTab, updatePageIndex]);
 
   useEffect(() => {
@@ -261,20 +273,51 @@ export function OpenSavedQueryFlyout({
 
   const tabs = [
     {
-      id: 'mutable-saved-queries',
+      id: OPEN_QUERY_TAB_ID.SAVED_QUERIES,
       name: 'Saved queries',
       content: flyoutBodyContent,
     },
   ];
 
   if (hasTemplateQueries) {
     tabs.push({
-      id: 'template-saved-queries',
+      id: OPEN_QUERY_TAB_ID.QUERY_TEMPLATES,
       name: 'Templates',
       content: flyoutBodyContent,
     });
   }
 
+  const onQueryAction = useCallback(() => {
+    if (!selectedQuery) {
+      return;
+    }
+
+    if (selectedQuery?.attributes.isTemplate) {
+      copyToClipboard(selectedQuery.attributes.query.query as string);
+      notifications?.toasts.addSuccess({
+        title: i18n.translate('data.openSavedQueryFlyout.queryCopied.title', {
+          defaultMessage: 'Query copied',
+        }),
+        text: i18n.translate('data.openSavedQueryFlyout.queryCopied.text', {
+          defaultMessage: 'Paste the query in the editor to modify and run.',
+        }),
+      });
+    } else {
+      onQueryOpen({
+        ...selectedQuery,
+        attributes: {
+          ...selectedQuery.attributes,
+          query: {
+            ...selectedQuery.attributes.query,
+            dataset: queryStringManager.getQuery().dataset,
+          },
+        },
+      });
+    }
+
+    onClose();
+  }, [onClose, onQueryOpen, notifications, selectedQuery, queryStringManager]);
+
   return (
     <EuiFlyout onClose={onClose}>
       <EuiFlyoutHeader hasBorder>
@@ -287,8 +330,8 @@ export function OpenSavedQueryFlyout({
           tabs={tabs}
           initialSelectedTab={tabs[0]}
           onTabClick={(tab) => {
-            setSelectedTabId(tab.id);
-            currentTabIdRef.current = tab.id;
+            setSelectedTabId(tab.id as OPEN_QUERY_TAB_ID);
+            currentTabIdRef.current = tab.id as OPEN_QUERY_TAB_ID;
           }}
         />
       </EuiFlyoutBody>
@@ -303,23 +346,10 @@ export function OpenSavedQueryFlyout({
             <EuiButton
               disabled={!selectedQuery}
               fill
-              onClick={() => {
-                if (selectedQuery) {
-                  onQueryOpen({
-                    ...selectedQuery,
-                    attributes: {
-                      ...selectedQuery.attributes,
-                      query: {
-                        ...selectedQuery.attributes.query,
-                        dataset: queryStringManager.getQuery().dataset,
-                      },
-                    },
-                  });
-                  onClose();
-                }
-              }}
+              onClick={onQueryAction}
+              data-testid="open-query-action-button"
             >
-              Open query
+              {selectedTabId === OPEN_QUERY_TAB_ID.SAVED_QUERIES ? 'Open' : 'Copy'} query
             </EuiButton>
           </EuiFlexItem>
         </EuiFlexGroup>

diff --git a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx b/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx
@@ -89,7 +89,7 @@ export function SavedQueryManagementComponent({
   const [activePage, setActivePage] = useState(0);
   const cancelPendingListingRequest = useRef<() => void>(() => {});
   const {
-    services: { overlays },
+    services: { overlays, notifications },
   } = useOpenSearchDashboards();
 
   useEffect(() => {
@@ -253,6 +253,7 @@ export function SavedQueryManagementComponent({
               toMountPoint(
                 <OpenSavedQueryFlyout
                   savedQueryService={savedQueryService}
+                  notifications={notifications}
                   onClose={() => openSavedQueryFlyout?.close().then()}
                   onQueryOpen={onLoad}
                   handleQueryDelete={handleDelete}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fix:
		- Only support copy action for query templates ([#8899](/~https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8899))