Fix saving index pattern when there is a conflict (#21947) (#22025)

elastic · Aug 15, 2018 · 524cd5c · 524cd5c
1 parent bb2ec20
commit 524cd5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.test.js b/src/ui/public/index_patterns/__tests__/_index_pattern.test.js
@@ -99,7 +99,9 @@ jest.mock('../../saved_objects', () => {
       update: async (type, id, body, { version }) => {
         if (object._version !== version) {
           throw {
-            statusCode: 409
+            res: {
+              status: 409
+            }
           };
         }
 
@@ -157,6 +159,6 @@ describe('IndexPattern', () => {
       result = err;
     }
 
-    expect(result.statusCode).toBe(409);
+    expect(result.res.status).toBe(409);
   });
 });
diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js
@@ -451,7 +451,7 @@ export function IndexPatternProvider(Private, config, Promise, confirmModalPromi
           setVersion(this, _version);
         })
         .catch(err => {
-          if (err.statusCode === 409 && saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS) {
+          if (_.get(err, 'res.status') === 409 && saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS) {
             const samePattern = new IndexPattern(this.id);
             return samePattern.init()
               .then(() => {