add support for ES 6.1.1

ChangeLog

@@ -1,3 +1,5 @@
+* Wed Jan 31 2018 Ulrich Schwickerath <schwicke> -0.3
+ - add support for 6.1.1
 * Mon Aug 28 2017 Ulrich Schwickerath <schwicke> -0.2
  - Tagging for ES 5.5.2
 * Tue May 23 2017 Pablo Saiz <pablo.saiz> -0.1

index.js

@@ -1,9 +1,7 @@
-module.exports = function(kibana) {
-	return new kibana.Plugin({
-		uiExports: {
-			visTypes: ['plugins/relational_filter/relational_filter']
-		}
-	});
-
+export default function(kibana) {
+    return new kibana.Plugin({
+	uiExports: {
+	    visTypes: ['plugins/relational_filter/relational_filter']
+	}
+    });
 }
-

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "relational_filter",
-	"version": "5.6.4",
+	"version": "6.1.1",
         "description": "Visualization with the possibility to create filters based on relations between different documents" 
 }
 

public/relationalFilterController.js

@@ -1,7 +1,8 @@
-// Create an Angular module for this plugin
 import { uiModules } from 'ui/modules';
+
+// Create an Angular module for this plugin
 var module = require('ui/modules').get('relational_filter');
-import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
+import { FilterBarQueryFilterProvider }  from 'ui/filter_bar/query_filter';
 
 module.controller('relationalFilterController', function($scope, Private) {
 
@@ -45,12 +46,13 @@ module.controller('relationalFilterController', function($scope, Private) {
         console.log("Creating the filter");
         const newFilters = [];
         let filter;
-        let alias, field, internal_query;
+        let alias, field, internal_query, a, b;
         alias = $scope.vis.aggs.bySchemaName['filterDisplay'][0]['params']['field']['name'].replace(".keyword", "");
         field = $scope.vis.aggs.bySchemaName['filterValue'][0]['params']['field']['name'];
         console.log(field);
         console.log(tag);
         console.log($scope.vis.params.emptyValue);
+        console.log("AM I HERE???");
 
         filter = {'meta':{'type':'query'}};
         filter[alias] = tag.label;
@@ -81,7 +83,10 @@ module.controller('relationalFilterController', function($scope, Private) {
 
         newFilters.push(filter);
 
-        return queryFilter.addFilters(newFilters);
+        a = queryFilter.addFilters(newFilters);
+        b = queryFilter.listFilters();
+        console.log("ADDED THE FILTER");
+        return a;
 
     };
 
@@ -130,6 +135,7 @@ module.controller('relationalFilterController', function($scope, Private) {
         console.log("Ready to add a filter");
         console.log(tag);
         $scope.create_filter(tag);
+        console.log("FILTER ADDED!!!");
     };
 
 
@@ -162,5 +168,5 @@ module.controller('relationalFilterController', function($scope, Private) {
         //        console.log($scope.filter_entries);
 
     });
-
+    $scope.renderComplete();
 });

public/relational_filter.js

@@ -1,63 +1,58 @@
 require('plugins/relational_filter/relationalFilterController');
 
-import { TemplateVisTypeProvider } from 'ui/template_vis_type/template_vis_type';
+//import { VisController } from './vis_controller';
+import { CATEGORY } from 'ui/vis/vis_category';
+import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
-import { VisSchemasProvider } from 'ui/vis/schemas';
-import { uiModules } from 'ui/modules';
-
-
+import { VisSchemasProvider } from 'ui/vis/editors/default/schemas';
 import optionsTemplate from 'plugins/relational_filter/filter_options.html';
-
-
-
-
+import visTemplate from 'plugins/relational_filter/relational_filter.html';
 
 // The provider function, which must return our new visualization type
-function RelationalFilterProvider(Private) {
-    const TemplateVisType = Private(TemplateVisTypeProvider);
-    // Include the Schemas class, which will be used to define schemas
-    var Schemas = Private(VisSchemasProvider);
-
-    // Describe our visualization
-    return new TemplateVisType({
-	name: 'trRelationalFilter', // The internal id of the visualization (must be unique)
-	title: 'Relational Filter', // The title of the visualization, shown to the user
-	description: 'Visualization for filtering based on different document types ', // The description of this vis
-	icon: 'fa-cloud', // The font awesome icon of this visualization
-	template: require('plugins/relational_filter/relational_filter.html'), // The template, that will be rendered for this visualization
-        params: {
-           editor: optionsTemplate,
-           defaults: {
-             outputFormat: 'table',
-             filterTypes: []
-           }
-       },
-
-	// Define the aggregation your visualization accepts
-
-	schemas: new Schemas([
-	    {
-		group: 'buckets',
-		name: 'filterDisplay',
-		title: 'Filter Display',
-		min: 1,
-		max: 1,
-		aggFilter: ['terms'],
-                type: 'string',
+//function RelationalFilterProvider(Private) {
+const RelationalFilterProvider = (Private) => {
+    const VisFactory = Private(VisFactoryProvider);
+    const Schemas = Private(VisSchemasProvider);
+    return  VisFactory.createAngularVisualization({
+	name: 'trRelationalFilter',
+	title: 'Relational Filter',
+	icon: 'fa-cloud',
+	description: 'Kibana Relational Filter',
+	category: CATEGORY.OTHER,
+	visConfig: {
+	    template: visTemplate,
+	    defaults: {
+		outputFormat: 'table',
+		filterTypes: []
+	    }
+	},
+//	requestHandler: 'none',
+	responseHandler: 'none',
+	editorConfig: {
+	    optionsTemplate: optionsTemplate,
+	    schemas: new Schemas([
+		{
+		    group: 'buckets',
+		    name: 'filterDisplay',
+		    title: 'Filter Display',
+		    min: 1,
+		    max: 1,
+		    aggFilter: ['terms'],
+		    type: 'string',
 		},
-
-            {
-                group: 'buckets',
-                name: 'filterValue',
-                title: 'Filter Value',
-                min: 1,
-                max: 1,
-                aggFilter: [ 'terms'],
-                type: 'string'
-                },
-
-	    ])
-	});
+		{
+		    group: 'buckets',
+		    name: 'filterValue',
+		    title: 'Filter Value',
+		    min: 1,
+		    max: 1,
+		    aggFilter: [ 'terms'],
+		    type: 'string',
+		},
+	    ]),   
+	}
+    });
 }
 
+// Define the aggregation your visualization accepts
 VisTypesRegistryProvider.register(RelationalFilterProvider);