catchign right code

Signed-off-by: abbyhu2000 <[email protected]>
abbyhu2000 · Aug 29, 2024 · c4f9ded · c4f9ded
1 parent 4dc2f7e
commit c4f9ded
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/src/plugins/data/common/data_frames/types.ts b/src/plugins/data/common/data_frames/types.ts
@@ -105,6 +105,11 @@ export interface IDataFrameResponse extends SearchResponse<any> {
   took: number;
 }
 
+export interface IDataFrameResponseError {
+  status: number;
+  message: string;
+}
+
 export interface IDataFrameError extends IDataFrameResponse {
   error: Error;
 }
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
@@ -226,7 +226,9 @@ export const useSearch = (services: DiscoverViewServices) => {
         rows: [],
       });
 
-      data.search.showError(error as Error);
+      console.log('error', error.body);
+
+      data.search.showError((error.body || error) as Error);
     } finally {
       initalSearchComplete.current = true;
     }

diff --git a/src/plugins/query_enhancements/public/search/ppl_search_interceptor.ts b/src/plugins/query_enhancements/public/search/ppl_search_interceptor.ts
@@ -4,8 +4,7 @@
  */
 
 import { trimEnd } from 'lodash';
-import { Observable, throwError } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 import { formatTimePickerDate, Query } from '../../../data/common';
 import {
   DataPublicPluginStart,
@@ -52,11 +51,7 @@ export class PPLSearchInterceptor extends SearchInterceptor {
 
     const query = this.buildQuery();
 
-    return fetch(context, query, this.getAggConfig(searchRequest, query)).pipe(
-      catchError((error) => {
-        return throwError(error);
-      })
-    );
+    return fetch(context, query, this.getAggConfig(searchRequest, query));
   }
 
   public search(request: IOpenSearchDashboardsSearchRequest, options: ISearchOptions) {

diff --git a/src/plugins/query_enhancements/server/routes/index.ts b/src/plugins/query_enhancements/server/routes/index.ts
@@ -15,6 +15,7 @@ import { ISearchStrategy } from '../../../data/server';
 import { API, SEARCH_STRATEGY } from '../../common';
 import { registerQueryAssistRoutes } from './query_assist';
 import { registerDataSourceConnectionsRoutes } from './data_source_connection';
+import { instance } from '../../../console/public/application/contexts/editor_context/editor_registry';
 
 /**
  * Defines a route for a specific search strategy.
@@ -85,10 +86,9 @@ function defineRoute(
         );
         return res.ok({ body: { ...queryRes } });
       } catch (err) {
-        logger.error(err);
         return res.custom({
-          statusCode: err.status ?? 500,
-          body: err,
+          statusCode: err.name,
+          body: err.message,
         });
       }
     }

diff --git a/src/plugins/query_enhancements/server/search/ppl_search_strategy.ts b/src/plugins/query_enhancements/server/search/ppl_search_strategy.ts
@@ -10,6 +10,7 @@ import {
   DATA_FRAME_TYPES,
   IDataFrameError,
   IDataFrameResponse,
+  IDataFrameResponseError,
   IDataFrameWithAggs,
   IOpenSearchDashboardsSearchRequest,
   Query,
@@ -41,7 +42,9 @@ export const pplSearchStrategyProvider = (
         const rawResponse: any = await pplFacet.describeQuery(context, request);
 
         if (!rawResponse.success) {
-          throw new Error(rawResponse.data.body);
+          const error = new Error(rawResponse.data.body);
+          error.name = rawResponse.data.status;
+          throw error;
         }
 
         const dataFrame = createDataFrame({
@@ -75,7 +78,7 @@ export const pplSearchStrategyProvider = (
           took: rawResponse.took,
         } as IDataFrameResponse;
       } catch (e) {
-        logger.error(`pplSearchStrategy: ${e.message}`);
+        logger.error(`pplSearchStrategy: ${e}`);
         if (usage) usage.trackError();
         throw e;
       }