Support v6 mappings for saved objects import/export

src/core_plugins/kibana/public/management/sections/objects/_objects.js

@@ -1,5 +1,5 @@
 import { saveAs } from '@spalger/filesaver';
-import { extend, find, flattenDeep, pluck, sortBy } from 'lodash';
+import { find, flattenDeep, pluck, sortBy } from 'lodash';
 import angular from 'angular';
 import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
 import objectIndexHTML from 'plugins/kibana/management/sections/objects/_objects.html';
@@ -137,9 +137,9 @@ uiModules.get('apps/management')
       $scope.exportAll = () => Promise
         .map($scope.services, service => service.service
           .scanAll('')
-          .then(result => result.hits.map(hit => extend(hit, { type: service.type })))
+          .then(result => result.hits)
         )
-        .then(results => retrieveAndExportDocs(flattenDeep(results)))
+        .then(results => saveToFile(flattenDeep(results)))
         .catch(error => notify.error(error));
 
       function retrieveAndExportDocs(objs) {

src/core_plugins/kibana/public/management/sections/objects/_view.js

@@ -6,6 +6,7 @@ import objectViewHTML from 'plugins/kibana/management/sections/objects/_view.htm
 import uiRoutes from 'ui/routes';
 import { uiModules } from 'ui/modules';
 import { castEsToKbnFieldTypeName } from '../../../../../../utils';
+import { SavedObjectsClientProvider } from 'ui/saved_objects';
 
 uiRoutes
 .when('/management/kibana/objects/:service/:id', {
@@ -16,10 +17,11 @@ uiModules.get('apps/management')
 .directive('kbnManagementObjectsView', function (kbnIndex, Notifier, confirmModal) {
   return {
     restrict: 'E',
-    controller: function ($scope, $injector, $routeParams, $location, $window, $rootScope, esAdmin) {
+    controller: function ($scope, $injector, $routeParams, $location, $window, $rootScope, Private) {
       const notify = new Notifier({ location: 'SavedObject view' });
       const serviceObj = savedObjectManagementRegistry.get($routeParams.service);
       const service = $injector.get(serviceObj.service);
+      const savedObjectsClient = Private(SavedObjectsClientProvider);
 
       /**
        * Creates a field definition and pushes it to the memo stack. This function
@@ -103,16 +105,12 @@ uiModules.get('apps/management')
 
       $scope.title = service.type;
 
-      esAdmin.get({
-        index: kbnIndex,
-        type: service.type,
-        id: $routeParams.id
-      })
+      savedObjectsClient.get(service.type, $routeParams.id)
       .then(function (obj) {
         $scope.obj = obj;
-        $scope.link = service.urlFor(obj._id);
+        $scope.link = service.urlFor(obj.id);
 
-        const fields =  _.reduce(obj._source, createField, []);
+        const fields =  _.reduce(obj.attributes, createField, []);
         if (service.Class) readObjectClass(fields, service.Class);
 
         // sorts twice since we want numerical sort to prioritize over name,
@@ -170,11 +168,7 @@ uiModules.get('apps/management')
        */
       $scope.delete = function () {
         function doDelete() {
-          esAdmin.delete({
-            index: kbnIndex,
-            type: service.type,
-            id: $routeParams.id
-          })
+          savedObjectsClient.delete(service.type, $routeParams.id)
             .then(function () {
               return redirectHandler('deleted');
             })
@@ -207,32 +201,22 @@ uiModules.get('apps/management')
           _.set(source, field.name, value);
         });
 
-        esAdmin.index({
-          index: kbnIndex,
-          type: service.type,
-          id: $routeParams.id,
-          body: source
-        })
+        savedObjectsClient.update(service.type, $routeParams.id, source)
         .then(function () {
           return redirectHandler('updated');
         })
         .catch(notify.fatal);
       };
 
       function redirectHandler(action) {
-        return esAdmin.indices.refresh({
-          index: kbnIndex
-        })
-        .then(function () {
-          const msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object';
+        const msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object';
 
-          $location.path('/management/kibana/objects').search({
-            _a: rison.encode({
-              tab: serviceObj.title
-            })
-          });
-          notify.info(msg);
+        $location.path('/management/kibana/objects').search({
+          _a: rison.encode({
+            tab: serviceObj.title
+          })
         });
+        notify.info(msg);
       }
     }
   };

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

@@ -39,7 +39,7 @@ function isErrorNonFatal(error) {
   return error.message === OVERWRITE_REJECTED || error.message === SAVE_DUPLICATE_REJECTED;
 }
 
-export function SavedObjectProvider(esAdmin, kbnIndex, Promise, Private, Notifier, confirmModalPromise, indexPatterns) {
+export function SavedObjectProvider(Promise, Private, Notifier, confirmModalPromise, indexPatterns) {
   const savedObjectsClient = Private(SavedObjectsClientProvider);
   const SearchSource = Private(SearchSourceProvider);
   const mappingSetup = Private(MappingSetupProvider);
@@ -53,7 +53,6 @@ export function SavedObjectProvider(esAdmin, kbnIndex, Promise, Private, Notifie
 
     // type name for this object, used as the ES-type
     const esType = config.type;
-    this.index = kbnIndex;
 
     this.getDisplayName = function () {
       return esType;

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

@@ -64,21 +64,11 @@ export class SavedObjectLoader {
     return source;
   }
 
-  /**
-   * Updates hit._source to contain an id and url field, and returns the updated
-   * source object.
-   * @param hit
-   * @returns {hit._source} The modified hit._source object, with an id and url field.
-   */
-  mapHits(hit) {
-    return this.mapHitSource(hit._source, hit._id);
-  }
-
   scanAll(queryString, pageSize = 1000) {
     return this.scanner.scanAndMap(queryString, {
       pageSize,
       docCount: Infinity
-    }, (hit) => this.mapHits(hit));
+    });
   }
 
   /**

src/ui/public/utils/__tests__/scanner.js

@@ -42,7 +42,16 @@ describe('Scanner', function () {
     let scroll;
     let scanner;
     const mockSearch = { '_scroll_id':'abc','took':1,'timed_out':false,'_shards':{ 'total':1,'successful':1,'failed':0 },'hits':{ 'total':2,'max_score':0.0,'hits':[] } }; // eslint-disable-line max-len
-    const mockScroll = { 'took':1,'timed_out':false,'_shards':{ 'total':1,'successful':1,'failed':0 },'hits':{ 'total':2,'max_score':0.0,'hits':['one', 'two'] } }; // eslint-disable-line max-len
+    const hits = [{
+      _id: 'one',
+      _type: 'config',
+      _source: { title: 'First title' }
+    }, {
+      _id: 'two',
+      _type: 'config',
+      _source: { title: 'Second title' }
+    }];
+    const mockScroll = { 'took':1,'timed_out':false,'_shards':{ 'total':1,'successful':1,'failed':0 },'hits':{ 'total':2,'max_score':0.0,'hits':hits } }; // eslint-disable-line max-len
 
     beforeEach(function () {
       scanner = new Scanner(es, {
@@ -75,7 +84,7 @@ describe('Scanner', function () {
 
     it('should map results if a function is provided', function () {
       return scanner.scanAndMap(null, null, function (hit) {
-        return hit.toUpperCase();
+        return hit._id.toUpperCase();
       })
       .then(function (response) {
         expect(response.hits[0]).to.be('ONE');
@@ -85,7 +94,7 @@ describe('Scanner', function () {
 
     it('should only return the requested number of documents', function () {
       return scanner.scanAndMap(null, { docCount: 1 }, function (hit) {
-        return hit.toUpperCase();
+        return hit._id.toUpperCase();
       })
       .then(function (response) {
         expect(response.hits[0]).to.be('ONE');

src/ui/public/utils/scanner.js

@@ -11,8 +11,9 @@ export const Scanner = function (client, { index, type } = {}) {
 };
 
 Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
+  const bool = { must: [], filter: [] };
+
   let scrollId;
-  let body;
   const allResults = {
     hits: [],
     total: 0
@@ -22,18 +23,37 @@ Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
     docCount: 1000
   });
 
+  if (this.type) {
+    bool.filter.push({
+      bool: {
+        should: [
+          {
+            term: {
+              _type: this.type
+            }
+          },
+          {
+            term: {
+              type: this.type
+            }
+          }
+        ]
+      }
+    });
+  }
+
   if (searchString) {
-    body = {
-      query: {
-        simple_query_string: {
-          query: searchString + '*',
-          fields: ['title^3', 'description'],
-          default_operator: 'AND'
-        }
+    bool.must.push({
+      simple_query_string: {
+        query: searchString + '*',
+        fields: ['title^3', 'description'],
+        default_operator: 'AND'
       }
-    };
+    });
   } else {
-    body = { query: { match_all: {} } };
+    bool.must.push({
+      match_all: {}
+    });
   }
 
   return new Promise((resolve, reject) => {
@@ -48,6 +68,22 @@ Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
 
       let hits = response.hits.hits
       .slice(0, allResults.total - allResults.hits.length);
+
+      hits = hits.map(hit => {
+        if (hit._type === 'doc') {
+          return {
+            _id: hit._id.replace(`${this.type}:`, ''),
+            _type: this.type,
+            _source: hit._source[this.type],
+            _meta: {
+              savedObjectVersion: 2
+            }
+          };
+        }
+
+        return _.pick(hit, ['_id', '_type', '_source']);
+      });
+
       if (mapFn) hits = hits.map(mapFn);
 
       allResults.hits =  allResults.hits.concat(hits);
@@ -64,12 +100,10 @@ Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
 
     this.client.search({
       index: this.index,
-      type: this.type,
       size: opts.pageSize,
-      body,
+      body: { query: { bool } },
       scroll: '1m',
       sort: '_doc',
     }, getMoreUntilDone);
   });
 };
-