remove angular dependencies in SavedObjectClient

src/core_plugins/kibana/public/dashboard/dashboard_app.js

@@ -47,7 +47,6 @@ import * as filterActions from 'ui/doc_table/actions/filter';
 import { FilterManagerProvider } from 'ui/filter_manager';
 import { EmbeddableFactoriesRegistryProvider } from 'ui/embeddable/embeddable_factories_registry';
 import { DashboardPanelActionsRegistryProvider } from 'ui/dashboard_panel_actions/dashboard_panel_actions_registry';
-import { SavedObjectsClientProvider } from 'ui/saved_objects';
 import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
 import { timefilter } from 'ui/timefilter';
 
@@ -86,7 +85,6 @@ app.directive('dashboardApp', function ($injector) {
 
       panelActionsStore.initializeFromRegistry(panelActionsRegistry);
 
-      const savedObjectsClient = Private(SavedObjectsClientProvider);
       const visTypes = Private(VisTypesRegistryProvider);
       $scope.getEmbeddableFactory = panelType => embeddableFactories.byName[panelType];
 
@@ -391,7 +389,7 @@ app.directive('dashboardApp', function ($injector) {
         const isLabsEnabled = config.get('visualize:enableLabs');
         const listingLimit = config.get('savedObjects:listingLimit');
 
-        showAddPanel(savedObjectsClient, dashboardStateManager.addNewPanel, addNewVis, listingLimit, isLabsEnabled, visTypes);
+        showAddPanel(chrome.getSavedObjectsClient(), dashboardStateManager.addNewPanel, addNewVis, listingLimit, isLabsEnabled, visTypes);
       };
       updateViewMode(dashboardStateManager.getViewMode());
 

src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js

@@ -18,14 +18,14 @@
  */
 
 import React from 'react';
+import chrome from 'ui/chrome';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { SavedObjectsClientProvider } from 'ui/saved_objects';
 import { FetchFieldsProvider } from '../lib/fetch_fields';
 import { extractIndexPatterns } from '../lib/extract_index_patterns';
 
 function ReactEditorControllerProvider(Private, config) {
   const fetchFields = Private(FetchFieldsProvider);
-  const savedObjectsClient = Private(SavedObjectsClientProvider);
+  const savedObjectsClient = chrome.getSavedObjectsClient();
 
   class ReactEditorController {
     constructor(el, savedObj) {

src/ui/public/chrome/api/saved_object_client.js

@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectsClient } from '../../saved_objects';
+
+export function initSavedObjectClient(chrome) {
+  const savedObjectClient = new SavedObjectsClient();
+
+  chrome.getSavedObjectsClient = function () {
+    return savedObjectClient;
+  };
+}

src/ui/public/chrome/chrome.js

@@ -44,6 +44,7 @@ import translationsApi from './api/translations';
 import { initChromeXsrfApi } from './api/xsrf';
 import { initUiSettingsApi } from './api/ui_settings';
 import { initLoadingCountApi } from './api/loading_count';
+import { initSavedObjectClient } from './api/saved_object_client';
 
 export const chrome = {};
 const internals = _.defaults(
@@ -62,6 +63,7 @@ const internals = _.defaults(
 );
 
 initUiSettingsApi(chrome);
+initSavedObjectClient(chrome);
 appsApi(chrome, internals);
 initChromeXsrfApi(chrome, internals);
 initChromeNavApi(chrome, internals);

src/ui/public/courier/saved_object/__tests__/saved_object.js

@@ -81,6 +81,10 @@ describe('Saved Object', function () {
     return savedObject.init();
   }
 
+  const mock409FetchError = {
+    res: { status: 409 }
+  };
+
   beforeEach(ngMock.module(
     'kibana',
     StubIndexPatternsApiClientModule,
@@ -104,15 +108,15 @@ describe('Saved Object', function () {
     describe('with confirmOverwrite', function () {
       function stubConfirmOverwrite() {
         window.confirm = sinon.stub().returns(true);
-        sinon.stub(esDataStub, 'create').returns(BluebirdPromise.reject({ status: 409 }));
+        sinon.stub(esDataStub, 'create').returns(BluebirdPromise.reject(mock409FetchError));
       }
 
       describe('when true', function () {
         it('requests confirmation and updates on yes response', function () {
           stubESResponse(getMockedDocResponse('myId'));
           return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
             const createStub = sinon.stub(savedObjectsClientStub, 'create');
-            createStub.onFirstCall().returns(BluebirdPromise.reject({ statusCode: 409 }));
+            createStub.onFirstCall().returns(BluebirdPromise.reject(mock409FetchError));
             createStub.onSecondCall().returns(BluebirdPromise.resolve({ id: 'myId' }));
 
             stubConfirmOverwrite();
@@ -135,7 +139,7 @@ describe('Saved Object', function () {
           return createInitializedSavedObject({ type: 'dashboard', id: 'HI' }).then(savedObject => {
             window.confirm = sinon.stub().returns(false);
 
-            sinon.stub(savedObjectsClientStub, 'create').returns(BluebirdPromise.reject({ statusCode: 409 }));
+            sinon.stub(savedObjectsClientStub, 'create').returns(BluebirdPromise.reject(mock409FetchError));
 
             savedObject.lastSavedTitle = 'original title';
             savedObject.title = 'new title';
@@ -154,7 +158,7 @@ describe('Saved Object', function () {
           return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
             stubConfirmOverwrite();
 
-            sinon.stub(savedObjectsClientStub, 'create').returns(BluebirdPromise.reject({ statusCode: 409 }));
+            sinon.stub(savedObjectsClientStub, 'create').returns(BluebirdPromise.reject(mock409FetchError));
 
             return savedObject.save({ confirmOverwrite: true })
               .then(() => {

src/ui/public/courier/saved_object/saved_object.js

@@ -291,7 +291,7 @@ export function SavedObjectProvider(Promise, Private, Notifier, confirmModalProm
       return savedObjectsClient.create(esType, source, { id: this.id })
         .catch(err => {
           // record exists, confirm overwriting
-          if (_.get(err, 'statusCode') === 409) {
+          if (_.get(err, 'res.status') === 409) {
             const confirmMessage = `Are you sure you want to overwrite ${this.title}?`;
 
             return confirmModalPromise(confirmMessage, { confirmButtonText: `Overwrite ${this.getDisplayName()}` })

src/ui/public/error_auto_create_index/error_auto_create_index.js

@@ -20,28 +20,20 @@
 import { get } from 'lodash';
 
 import uiRoutes from '../routes';
-import { KbnUrlProvider } from '../url';
 
 import './error_auto_create_index.less';
 import template from './error_auto_create_index.html';
 
 uiRoutes
   .when('/error/action.auto_create_index', { template });
 
-export function ErrorAutoCreateIndexProvider(Private, Promise) {
-  const kbnUrl = Private(KbnUrlProvider);
-
-  return new (class ErrorAutoCreateIndex {
-    test(error) {
-      return (
-        error.statusCode === 503 &&
-        get(error, 'body.code') === 'ES_AUTO_CREATE_INDEX_ERROR'
-      );
-    }
+export function isAutoCreateIndexError(error) {
+  return (
+    get(error, 'res.status') === 503 &&
+    get(error, 'body.code') === 'ES_AUTO_CREATE_INDEX_ERROR'
+  );
+}
 
-    takeover() {
-      kbnUrl.change('/error/action.auto_create_index');
-      return Promise.halt();
-    }
-  });
+export function showAutoCreateIndexErrorPage() {
+  window.location.hash = '/error/action.auto_create_index';
 }

src/ui/public/error_auto_create_index/error_auto_create_index.test.js

@@ -0,0 +1,109 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+jest.mock('../chrome', () => ({
+  addBasePath: path => `myBase/${path}`,
+}));
+jest.mock('../metadata', () => ({
+  metadata: {
+    version: 'my-version',
+  },
+}));
+
+import fetchMock from 'fetch-mock';
+import { kfetch } from 'ui/kfetch';
+import { isAutoCreateIndexError } from './error_auto_create_index';
+
+describe('isAutoCreateIndexError correctly handles FetchError thrown by kfetch', () => {
+  describe('404', () => {
+    beforeEach(() => {
+      fetchMock.post({
+        matcher: '*',
+        response: {
+          status: 404,
+        },
+      });
+    });
+    afterEach(() => fetchMock.restore());
+
+    test('should return false', async () => {
+      let gotError = false;
+      try {
+        await kfetch({ method: 'POST', pathname: 'my/path' });
+      } catch (fetchError) {
+        gotError = true;
+        expect(isAutoCreateIndexError(fetchError)).toBe(false);
+      }
+
+      expect(gotError).toBe(true);
+    });
+  });
+
+  describe('503 error that is not ES_AUTO_CREATE_INDEX_ERROR', () => {
+    beforeEach(() => {
+      fetchMock.post({
+        matcher: '*',
+        response: {
+          status: 503,
+        },
+      });
+    });
+    afterEach(() => fetchMock.restore());
+
+    test('should return false', async () => {
+      let gotError = false;
+      try {
+        await kfetch({ method: 'POST', pathname: 'my/path' });
+      } catch (fetchError) {
+        gotError = true;
+        expect(isAutoCreateIndexError(fetchError)).toBe(false);
+      }
+
+      expect(gotError).toBe(true);
+    });
+  });
+
+  describe('503 error that is ES_AUTO_CREATE_INDEX_ERROR', () => {
+    beforeEach(() => {
+      fetchMock.post({
+        matcher: '*',
+        response: {
+          body: {
+            code: 'ES_AUTO_CREATE_INDEX_ERROR'
+          },
+          status: 503,
+        },
+      });
+    });
+    afterEach(() => fetchMock.restore());
+
+    test('should return true', async () => {
+      let gotError = false;
+      try {
+        await kfetch({ method: 'POST', pathname: 'my/path' });
+      } catch (fetchError) {
+        gotError = true;
+        expect(isAutoCreateIndexError(fetchError)).toBe(true);
+      }
+
+      expect(gotError).toBe(true);
+    });
+  });
+});
+

src/ui/public/error_auto_create_index/index.js

@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { ErrorAutoCreateIndexProvider } from './error_auto_create_index';
+export { isAutoCreateIndexError, showAutoCreateIndexErrorPage } from './error_auto_create_index';

src/ui/public/kfetch/index.js

@@ -24,9 +24,10 @@ import { metadata } from '../metadata';
 import { merge } from 'lodash';
 
 class FetchError extends Error {
-  constructor(res) {
+  constructor(res, body) {
     super(res.statusText);
     this.res = res;
+    this.body = body;
     Error.captureStackTrace(this, FetchError);
   }
 }
@@ -59,7 +60,13 @@ export async function kfetch(fetchOptions, kibanaOptions) {
   const res = await fetch(fullUrl, combinedFetchOptions);
 
   if (!res.ok) {
-    throw new FetchError(res);
+    let body;
+    try {
+      body = await res.json();
+    } catch (err) {
+      // ignore error, may not be able to get body for response that is not ok
+    }
+    throw new FetchError(res, body);
   }
 
   return res.json();