address comments

Signed-off-by: abbyhu2000 <[email protected]>
opensearch-project · Sep 4, 2024 · 430b2a7 · 430b2a7
1 parent d752f25
commit 430b2a7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/src/plugins/data/public/query/query_string/language_service/lib/query_result.tsx b/src/plugins/data/public/query/query_string/language_service/lib/query_result.tsx
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { i18n } from '@osd/i18n';
+
 import './_recent_query.scss';
 import { EuiButtonEmpty, EuiPopover, EuiText, EuiPopoverTitle } from '@elastic/eui';
 
@@ -25,7 +27,7 @@ export interface QueryStatus {
     };
     statusCode?: number;
   };
-  time?: number;
+  elapsedMs?: number;
 }
 
 export function QueryResult(props: { queryStatus: QueryStatus }) {
@@ -38,7 +40,9 @@ export function QueryResult(props: { queryStatus: QueryStatus }) {
     return (
       <EuiButtonEmpty iconSide="left" iconType={'checkInCircleEmpty'} size="xs" onClick={() => {}}>
         <EuiText size="xs" color="subdued">
-          {props.queryStatus.time ? `Completed in ${props.queryStatus.time} ms` : 'Completed'}
+          {props.queryStatus.elapsedMs
+            ? `Completed in ${props.queryStatus.elapsedMs} ms`
+            : 'Completed'}
         </EuiText>
       </EuiButtonEmpty>
     );
@@ -65,12 +69,21 @@ export function QueryResult(props: { queryStatus: QueryStatus }) {
       <EuiPopoverTitle>ERRORS</EuiPopoverTitle>
       <div style={{ width: '250px' }}>
         <EuiText size="s">
-          <strong>Reasons: </strong>
+          <strong>
+            {i18n.translate('data.query.languageService.queryResults.reasons', {
+              defaultMessage: `Reasons:`,
+            })}
+          </strong>
           {props.queryStatus.body.error.reason}
         </EuiText>
         <EuiText size="s">
           <p>
-            <strong>Details:</strong> {props.queryStatus.body.error.details}
+            <strong>
+              {i18n.translate('data.query.languageService.queryResults.details', {
+                defaultMessage: `Details:`,
+              })}
+            </strong>{' '}
+            {props.queryStatus.body.error.details}
           </p>
         </EuiText>
       </div>

diff --git a/src/plugins/data/public/ui/types.ts b/src/plugins/data/public/ui/types.ts
@@ -22,5 +22,4 @@ export interface IUiStart {
   IndexPatternSelect: React.ComponentType<IndexPatternSelectProps>;
   SearchBar: React.ComponentType<StatefulSearchBarProps>;
   SuggestionsComponent: React.ComponentType<SuggestionsComponentProps>;
-  setQueryStatus: (status: QueryStatus) => void;
 }
diff --git a/src/plugins/data/public/ui/ui_service.ts b/src/plugins/data/public/ui/ui_service.ts
@@ -27,7 +27,6 @@ export interface UiServiceStartDependencies {
 
 export class UiService implements Plugin<IUiSetup, IUiStart> {
   enhancementsConfig: ConfigSchema['enhancements'];
-  private queryStatus$ = new BehaviorSubject<QueryStatus>({ status: ResultStatus.READY });
 
   constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
     const { enhancements } = initializerContext.config.get<ConfigSchema>();
@@ -40,10 +39,6 @@ export class UiService implements Plugin<IUiSetup, IUiStart> {
   }
 
   public start(core: CoreStart, { dataServices, storage }: UiServiceStartDependencies): IUiStart {
-    const setQueryStatus = (status: QueryStatus) => {
-      this.queryStatus$.next(status);
-    };
-
     const SearchBar = createSearchBar({
       core,
       data: dataServices,
@@ -54,7 +49,6 @@ export class UiService implements Plugin<IUiSetup, IUiStart> {
       IndexPatternSelect: createIndexPatternSelect(core.savedObjects.client),
       SearchBar,
       SuggestionsComponent,
-      setQueryStatus,
     };
   }
 

diff --git a/src/plugins/discover/public/application/view_components/utils/use_search.ts b/src/plugins/discover/public/application/view_components/utils/use_search.ts
@@ -59,7 +59,7 @@ export interface SearchData {
       };
       statusCode?: number;
     };
-    time?: number;
+    elapsedMs?: number;
   };
 }
 
@@ -160,7 +160,7 @@ export const useSearch = (services: DiscoverViewServices) => {
 
     dataset = searchSource.getField('index');
 
-    let queryTime;
+    let elapsedMs;
 
     try {
       // Only show loading indicator if we are fetching when the rows are empty
@@ -193,7 +193,7 @@ export const useSearch = (services: DiscoverViewServices) => {
         .ok({ json: fetchResp });
       const hits = fetchResp.hits.total as number;
       const rows = fetchResp.hits.hits;
-      queryTime = inspectorRequest.getTime();
+      elapsedMs = inspectorRequest.getTime();
       let bucketInterval = {};
       let chartData;
       for (const row of rows) {
@@ -231,7 +231,7 @@ export const useSearch = (services: DiscoverViewServices) => {
             ? searchSource.getDataFrame()?.name
             : indexPattern?.title,
         queryStatus: {
-          time: queryTime,
+          elapsedMs,
         },
       });
     } catch (error) {
@@ -259,7 +259,7 @@ export const useSearch = (services: DiscoverViewServices) => {
         status: ResultStatus.ERROR,
         queryStatus: {
           body: errorBody,
-          time: queryTime,
+          elapsedMs,
         },
       });
     } finally {

diff --git a/src/plugins/query_enhancements/server/search/ppl_search_strategy.ts b/src/plugins/query_enhancements/server/search/ppl_search_strategy.ts
@@ -72,7 +72,7 @@ export const pplSearchStrategyProvider = (
           took: rawResponse.took,
         } as IDataFrameResponse;
       } catch (e) {
-        logger.error(`pplSearchStrategy: ${e}`);
+        logger.error(`pplSearchStrategy: ${e.message}`);
         if (usage) usage.trackError();
         throw e;
       }