From 4d59a6cf2ea47abf0cfef95406bcd20daf074f88 Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Thu, 14 May 2020 04:09:52 -0700
Subject: [PATCH] fixing error on index patterns

---
 .../index_patterns/index_patterns/_pattern_cache.ts |  2 +-
 .../index_patterns/index_pattern.test.ts            |  3 +++
 .../index_patterns/index_patterns/index_pattern.ts  | 13 +++++++------
 .../public/lib/resolve_saved_objects.ts             | 10 +++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/plugins/data/public/index_patterns/index_patterns/_pattern_cache.ts b/src/plugins/data/public/index_patterns/index_patterns/_pattern_cache.ts
index eb6c69b4143160..a3653bb529fa38 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/_pattern_cache.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/_pattern_cache.ts
@@ -19,7 +19,7 @@
 
 import { IndexPattern } from './index_pattern';
 
-interface PatternCache {
+export interface PatternCache {
   get: (id: string) => IndexPattern;
   set: (id: string, value: IndexPattern) => IndexPattern;
   clear: (id: string) => void;
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
index 305aa8575e4d78..a25dacd706c03a 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
@@ -85,6 +85,9 @@ const savedObjectsClient = {
 
 const patternCache = {
   clear: jest.fn(),
+  get: jest.fn(),
+  set: jest.fn(),
+  clearAll: jest.fn(),
 };
 
 const config = {
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts
index f8fdb4aa297cf0..c5167cbabb3085 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts
@@ -39,6 +39,7 @@ import { flattenHitWrapper } from './flatten_hit';
 import { IIndexPatternsApiClient } from './index_patterns_api_client';
 import { getNotifications, getFieldFormats } from '../../services';
 import { TypeMeta } from './types';
+import { PatternCache } from './_pattern_cache';
 
 const MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS = 3;
 const type = 'index-pattern';
@@ -60,7 +61,7 @@ export class IndexPattern implements IIndexPattern {
 
   private version: string | undefined;
   private savedObjectsClient: SavedObjectsClientContract;
-  private patternCache: any;
+  private patternCache: PatternCache;
   private getConfig: any;
   private sourceFilters?: [];
   private originalBody: { [key: string]: any } = {};
@@ -95,7 +96,7 @@ export class IndexPattern implements IIndexPattern {
     getConfig: any,
     savedObjectsClient: SavedObjectsClientContract,
     apiClient: IIndexPatternsApiClient,
-    patternCache: any
+    patternCache: PatternCache
   ) {
     this.id = id;
     this.savedObjectsClient = savedObjectsClient;
@@ -423,8 +424,8 @@ export class IndexPattern implements IIndexPattern {
             this.id,
             this.getConfig,
             this.savedObjectsClient,
-            this.patternCache,
-            this.fieldsFetcher
+            this.apiClient,
+            this.patternCache
           );
           return samePattern.init().then(() => {
             // What keys changed from now and what the server returned
@@ -467,7 +468,7 @@ export class IndexPattern implements IIndexPattern {
             this.version = samePattern.version;
 
             // Clear cache
-            this.patternCache.clear(this.id);
+            this.patternCache.clear(this.id!);
 
             // Try the save again
             return this.save(saveAttempts);
@@ -523,8 +524,8 @@ export class IndexPattern implements IIndexPattern {
   }
 
   destroy() {
-    this.patternCache.clear(this.id);
     if (this.id) {
+      this.patternCache.clear(this.id);
       return this.savedObjectsClient.delete(type, this.id);
     }
   }
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
index c3916f2b0970b8..bcd5db915d527b 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
@@ -27,6 +27,7 @@ import {
   IIndexPattern,
   injectSearchSourceReferences,
 } from '../../../data/public';
+import { FailedImport } from './process_import_response';
 
 type SavedObjectsRawDoc = Record<string, any>;
 
@@ -265,11 +266,6 @@ export async function resolveSavedSearches(
   return importCount;
 }
 
-interface FailedDoc {
-  obj: Record<string, any>;
-  error: Error;
-}
-
 export async function resolveSavedObjects(
   savedObjects: SavedObjectsRawDoc[],
   overwriteAll: boolean,
@@ -282,7 +278,7 @@ export async function resolveSavedObjects(
   // Keep track of how many we actually import because the user
   // can cancel an override
   let importedObjectCount = 0;
-  const failedImports: FailedDoc[] = [];
+  const failedImports: FailedImport[] = [];
   // Start with the index patterns since everything is dependent on them
   await awaitEachItemInParallel(docTypes.indexPatterns, async indexPatternDoc => {
     try {
@@ -296,7 +292,7 @@ export async function resolveSavedObjects(
         importedObjectCount++;
       }
     } catch (error) {
-      failedImports.push({ obj: indexPatternDoc, error });
+      failedImports.push({ obj: indexPatternDoc as any, error });
     }
   });