remove unneeded changes, disable additional error check

elastic · Sep 19, 2021 · f82d2bd · f82d2bd
1 parent 0e07d02
commit f82d2bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/src/plugins/data/common/data_views/data_views/data_views.ts b/src/plugins/data/common/data_views/data_views/data_views.ts
@@ -420,21 +420,6 @@ export class DataViewsService {
       DATA_VIEW_SAVED_OBJECT_TYPE,
       id
     );
-    /*
-    let savedObject: SavedObject<DataViewAttributes>;
-    try {
-      savedObject = await this.savedObjectsClient.get<DataViewAttributes>(
-        DATA_VIEW_SAVED_OBJECT_TYPE,
-        id
-      );
-    } catch (e) {
-      throw new SavedObjectNotFound(
-        DATA_VIEW_SAVED_OBJECT_TYPE,
-        id,
-        'management/kibana/indexPatterns'
-      );
-    }
-    */
 
     if (!savedObject.version) {
       throw new SavedObjectNotFound(

diff --git a/src/plugins/data/server/data_views/routes/update_index_pattern.ts b/src/plugins/data/server/data_views/routes/update_index_pattern.ts
@@ -145,6 +145,7 @@ export const registerUpdateIndexPatternRoute = (
         if (changeCount < 1) {
           throw new Error('Index pattern change set is empty.');
         }
+
         await indexPatternsService.updateSavedObject(indexPattern);
 
         if (doRefreshFields && refresh_fields) {

diff --git a/src/plugins/data/server/data_views/routes/util/handle_errors.ts b/src/plugins/data/server/data_views/routes/util/handle_errors.ts
@@ -8,7 +8,7 @@
 
 import type { RequestHandler, RouteMethod, RequestHandlerContext } from 'src/core/server';
 import { ErrorIndexPatternNotFound } from '../../error';
-import { SavedObjectNotFound } from '../../../../../kibana_utils/common';
+// import { SavedObjectNotFound } from '../../../../../kibana_utils/common';
 
 interface ErrorResponseBody {
   message: string;
@@ -52,9 +52,8 @@ export const handleErrors = <
       }
 
       const is404 =
-        (error as ErrorIndexPatternNotFound).is404 ||
-        (error as any)?.output?.statusCode === 404 ||
-        error instanceof SavedObjectNotFound;
+        (error as ErrorIndexPatternNotFound).is404 || (error as any)?.output?.statusCode === 404;
+      // || error instanceof SavedObjectNotFound;
 
       if (is404) {
         return response.notFound({