Fix running recent query button (opensearch-project#8252) (opensearch…

…-project#8280) * Fix click on recent query switching language * change to use uuid as identifier * Changeset file for PR opensearch-project#8252 created/updated --------- (cherry picked from commit 2f36eaf) Signed-off-by: abbyhu2000 <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
SuZhou-Joe · Oct 3, 2024 · 13d59c8 · 13d59c8
1 parent 6902000
commit 13d59c8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/changelogs/fragments/8252.yml b/changelogs/fragments/8252.yml
@@ -0,0 +1,2 @@
+fix:
+- Run recent query button work properly ([#8252](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8252))
diff --git a/src/plugins/data/public/query/query_string/language_service/lib/recent_query.tsx b/src/plugins/data/public/query/query_string/language_service/lib/recent_query.tsx
@@ -51,7 +51,10 @@ export function RecentQueriesTable({
           icon: 'play',
           type: 'icon',
           onClick: (item: RecentQueryTableItem) => {
-            onClickRecentQuery(recentQueries[item.id].query, recentQueries[item.id].timeRange);
+            onClickRecentQuery(
+              recentQueries.find((recentQuery) => recentQuery.id === item.id)?.query!,
+              recentQueries.find((recentQuery) => recentQuery.id === item.id)?.timeRange
+            );
           },
           'data-test-subj': 'action-run',
         },
@@ -76,8 +79,8 @@ export function RecentQueriesTable({
   const recentQueryItems: RecentQueryTableItem[] = recentQueries
     .filter((item, idx) => idx < MAX_RECENT_QUERY_SIZE)
     .filter((item) => item.query.language === currentLanguage)
-    .map((query, idx) => ({
-      id: idx,
+    .map((query) => ({
+      id: query.id,
       query: query.query.query,
       timeRange: query.timeRange,
       time: moment(query.time).format('MMM D, YYYY HH:mm:ss'),

diff --git a/src/plugins/data/public/query/query_string/language_service/types.ts b/src/plugins/data/public/query/query_string/language_service/types.ts
@@ -13,6 +13,7 @@ import {
 import { EditorInstance } from '../../../ui/query_editor/editors';
 
 export interface RecentQueryItem {
+  id: number;
   query: Query;
   time: number;
   timeRange?: TimeRange;

diff --git a/src/plugins/data/public/query/query_string/query_history.ts b/src/plugins/data/public/query/query_string/query_history.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import uuid from 'uuid';
 import { BehaviorSubject } from 'rxjs';
 import { DataStorage } from '../../../common';
 import { Query, TimeRange } from '../..';
@@ -61,6 +62,7 @@ export class QueryHistory {
       time: timestamp,
       query,
       dateRange,
+      id: uuid.v4(),
     };
     this.storage.set(newKey, newItem);