Color palette selection

src/fixtures/mock_ui_state.js

@@ -0,0 +1,15 @@
+define(function (require) {
+  var _ = require('lodash');
+  var keys = {};
+  return {
+    get: function (path, def) {
+      return keys[path] == null ? def : keys[path];
+    },
+    set: function (path, val) {
+      keys[path] = val;
+      return val;
+    },
+    on: _.noop,
+    off: _.noop
+  }
+})

src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html

@@ -5,10 +5,4 @@
       Show Tooltip
     </label>
   </div>
-  <div class="vis-option-item">
-    <label>
-      <input type="checkbox" ng-model="vis.params.addLegend">
-      Show Legend
-    </label>
-  </div>
 </div>

src/plugins/kibana/public/discover/controllers/discover.js

@@ -110,6 +110,8 @@ define(function (require) {
     }
 
     var $state = $scope.state = new AppState(getStateDefaults());
+    $scope.uiState = $state.makeStateful('uiState');
+
     function getStateDefaults() {
       return {
         query: $scope.searchSource.get('query') || '',

src/plugins/kibana/public/discover/index.html

@@ -176,7 +176,7 @@ <h2>Searching</h2>
 
               </header>
 
-              <visualize ng-if="vis && rows.length != 0" vis="vis" es-resp="mergedEsResp" search-source="searchSource"></visualize>
+              <visualize ng-if="vis && rows.length != 0" vis="vis" ui-state="uiState" es-resp="mergedEsResp" search-source="searchSource"></visualize>
             </div>
 
             <div class="discover-table" fixed-scroll>

src/plugins/table_vis/public/__tests__/_table_vis.js

@@ -30,7 +30,8 @@ describe('Integration', function () {
 
     $rootScope.vis = vis;
     $rootScope.esResponse = esResponse;
-    $el = $('<visualize vis="vis" es-resp="esResponse">');
+    $rootScope.uiState = require('fixtures/mock_ui_state');
+    $el = $('<visualize vis="vis" es-resp="esResponse" ui-state="uiState">');
     $compile($el)($rootScope);
     $rootScope.$apply();
 

src/ui/public/Vis/Renderbot.js

@@ -9,9 +9,10 @@ define(function (require) {
      * @param {Vis} vis - the vis object that contains all configuration data required to render the vis
      * @param {jQuery<DOMElement>} $el - a jQuery wrapped element to render into
      */
-    function Renderbot(vis, $el) {
+    function Renderbot(vis, $el, uiState) {
       this.vis = vis;
       this.$el = $el;
+      this.uiState = uiState;
     }
 
     /**

src/ui/public/Vis/__tests__/_Renderbot.js

@@ -15,12 +15,14 @@ describe('renderbot', function () {
     var vis;
     var $el;
     var renderbot;
+    var uiState;
 
     beforeEach(init);
     beforeEach(function () {
       vis = { hello: 'world' };
       $el = 'element';
-      renderbot = new Renderbot(vis, $el);
+      uiState = {};
+      renderbot = new Renderbot(vis, $el, uiState);
     });
 
     it('should have expected methods', function () {

src/ui/public/filter_bar/filter_bar_click_handler.js

@@ -2,21 +2,11 @@ define(function (require) {
   var _ = require('lodash');
   var dedupFilters = require('./lib/dedupFilters');
   var uniqFilters = require('./lib/uniqFilters');
-
-  // given an object or array of objects, return the value of the passed param
-  // if the param is missing, return undefined
-  function findByParam(values, param) {
-    if (_.isArray(values)) { // point series chart
-      var index = _.findIndex(values, param);
-      if (index === -1) return;
-      return values[index][param];
-    }
-    return values[param]; // pie chart
-  }
+  var findByParam = require('ui/utils/find_by_param');
 
   return function (Notifier) {
     return function ($state) {
-      return function (event) {
+      return function (event, simulate) {
         var notify = new Notifier({
           location: 'Filter bar'
         });
@@ -58,9 +48,20 @@ define(function (require) {
 
           if (!filters.length) return;
 
+          if (event.negate) {
+            _.each(filters, function (filter) {
+              filter.meta = filter.meta || {};
+              filter.meta.negate = true;
+            });
+          }
+
           filters = dedupFilters($state.filters, uniqFilters(filters));
           // We need to add a bunch of filter deduping here.
-          $state.$newFilters = filters;
+          if (!simulate) {
+            $state.$newFilters = filters;
+          }
+
+          return filters;
         }
       };
     };

src/ui/public/template_vis_type/TemplateRenderbot.js

@@ -4,8 +4,8 @@ define(function (require) {
     var Renderbot = Private(require('ui/Vis/Renderbot'));
 
     _.class(TemplateRenderbot).inherits(Renderbot);
-    function TemplateRenderbot(vis, $el) {
-      TemplateRenderbot.Super.call(this, vis, $el);
+    function TemplateRenderbot(vis, $el, uiState) {
+      TemplateRenderbot.Super.call(this, vis, $el, uiState);
 
       this.$scope = $rootScope.$new();
       this.$scope.vis = vis;

src/ui/public/template_vis_type/TemplateVisType.js

@@ -14,8 +14,8 @@ define(function (require) {
       }
     }
 
-    TemplateVisType.prototype.createRenderbot = function (vis, $el) {
-      return new TemplateRenderbot(vis, $el);
+    TemplateVisType.prototype.createRenderbot = function (vis, $el, uiState) {
+      return new TemplateRenderbot(vis, $el, uiState);
     };
 
     return TemplateVisType;

src/ui/public/utils/find_by_param.js

@@ -0,0 +1,13 @@
+define(function (require) {
+  var _ = require('lodash');
+  // given an object or array of objects, return the value of the passed param
+  // if the param is missing, return undefined
+  return function findByParam(values, param) {
+    if (_.isArray(values)) { // point series chart
+      var index = _.findIndex(values, param);
+      if (index === -1) return;
+      return values[index][param];
+    }
+    return values[param]; // pie chart
+  };
+});

src/ui/public/vislib/__tests__/components/color.js

@@ -30,7 +30,7 @@ describe('Vislib Color Module Test Suite', function () {
       seedColors = Private(require('ui/vislib/components/color/seed_colors'));
       getColors = Private(require('ui/vislib/components/color/color'));
       mappedColors = Private(require('ui/vislib/components/color/mapped_colors'));
-      color = getColors(arr);
+      color = getColors(arr, {});
     }));
 
     afterEach(ngMock.inject((config) => {
@@ -110,6 +110,11 @@ describe('Vislib Color Module Test Suite', function () {
     it('should return the value from the mapped colors', function () {
       expect(color(arr[1])).to.be(mappedColors.get(arr[1]));
     });
+
+    it('should return the value from the specified color mapping overrides', function () {
+      const colorFn = getColors(arr, {good: 'red'});
+      expect(colorFn('good')).to.be('red');
+    });
   });
 
   describe('Seed Colors', function () {

src/ui/public/vislib/__tests__/lib/axis_title.js

@@ -8,6 +8,7 @@ var expect = require('expect.js');
 describe('Vislib AxisTitle Class Test Suite', function () {
   var AxisTitle;
   var Data;
+  var PersistedState;
   var axisTitle;
   var el;
   var dataObj;
@@ -76,6 +77,7 @@ describe('Vislib AxisTitle Class Test Suite', function () {
   beforeEach(ngMock.inject(function (Private) {
     AxisTitle = Private(require('ui/vislib/lib/axis_title'));
     Data = Private(require('ui/vislib/lib/data'));
+    PersistedState = Private(require('ui/persisted_state/persisted_state'));
 
     el = d3.select('body').append('div')
       .attr('class', 'vis-wrapper');
@@ -91,7 +93,7 @@ describe('Vislib AxisTitle Class Test Suite', function () {
       .style('width', '20px');
 
 
-    dataObj = new Data(data, {});
+    dataObj = new Data(data, {}, new PersistedState());
     xTitle = dataObj.get('xAxisLabel');
     yTitle = dataObj.get('yAxisLabel');
     axisTitle = new AxisTitle($('.vis-wrapper')[0], xTitle, yTitle);

src/ui/public/vislib/__tests__/lib/chart_title.js

@@ -8,6 +8,7 @@ var expect = require('expect.js');
 describe('Vislib ChartTitle Class Test Suite', function () {
   var ChartTitle;
   var Data;
+  var persistedState;
   var chartTitle;
   var el;
   var dataObj;
@@ -74,6 +75,7 @@ describe('Vislib ChartTitle Class Test Suite', function () {
   beforeEach(ngMock.inject(function (Private) {
     ChartTitle = Private(require('ui/vislib/lib/chart_title'));
     Data = Private(require('ui/vislib/lib/data'));
+    persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
 
     el = d3.select('body').append('div')
       .attr('class', 'vis-wrapper')
@@ -83,7 +85,7 @@ describe('Vislib ChartTitle Class Test Suite', function () {
       .attr('class', 'chart-title')
       .style('height', '20px');
 
-    dataObj = new Data(data, {});
+    dataObj = new Data(data, {}, persistedState);
     chartTitle = new ChartTitle($('.vis-wrapper')[0], 'rows');
   }));
 

src/ui/public/vislib/__tests__/lib/data.js

@@ -101,10 +101,12 @@ var colsData = {
 
 describe('Vislib Data Class Test Suite', function () {
   var Data;
+  var persistedState;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     Data = Private(require('ui/vislib/lib/data'));
+    persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
   }));
 
   describe('Data Class (main)', function () {
@@ -113,7 +115,7 @@ describe('Vislib Data Class Test Suite', function () {
     });
 
     it('should return an object', function () {
-      var rowIn = new Data(rowsData, {});
+      var rowIn = new Data(rowsData, {}, persistedState);
       expect(_.isObject(rowIn)).to.be(true);
     });
 
@@ -128,7 +130,7 @@ describe('Vislib Data Class Test Suite', function () {
         ],
         'yAxisLabel': 'customLabel'
       };
-      var modifiedData = new Data(seriesDataWithoutLabelInSeries, {});
+      var modifiedData = new Data(seriesDataWithoutLabelInSeries, {}, persistedState);
       expect(modifiedData.data.series[0].label).to.be('customLabel');
     });
 
@@ -158,7 +160,7 @@ describe('Vislib Data Class Test Suite', function () {
         ],
       };
 
-      var modifiedData = new Data(seriesDataWithoutLabelInRow, {});
+      var modifiedData = new Data(seriesDataWithoutLabelInRow, {}, persistedState);
       expect(modifiedData.data.rows[0].series[0].label).to.be('customLabel');
       expect(modifiedData.data.rows[1].series[0].label).to.be('customLabel');
     });
@@ -190,7 +192,7 @@ describe('Vislib Data Class Test Suite', function () {
         'yAxisLabel': 'customLabel'
       };
 
-      var modifiedData = new Data(seriesDataWithoutLabelInRow, {});
+      var modifiedData = new Data(seriesDataWithoutLabelInRow, {}, persistedState);
       expect(modifiedData.data.columns[0].series[0].label).to.be('customLabel');
       expect(modifiedData.data.columns[1].series[0].label).to.be('customLabel');
     });
@@ -210,7 +212,7 @@ describe('Vislib Data Class Test Suite', function () {
     };
 
     beforeEach(function () {
-      data = new Data(pieData, {});
+      data = new Data(pieData, {}, persistedState);
     });
 
     it('should remove zero values', function () {
@@ -228,9 +230,9 @@ describe('Vislib Data Class Test Suite', function () {
     var colOut;
 
     beforeEach(function () {
-      serIn = new Data(seriesData, {});
-      rowIn = new Data(rowsData, {});
-      colIn = new Data(colsData, {});
+      serIn = new Data(seriesData, {}, persistedState);
+      rowIn = new Data(rowsData, {}, persistedState);
+      colIn = new Data(colsData, {}, persistedState);
       serOut = serIn.flatten();
       rowOut = rowIn.flatten();
       colOut = colIn.flatten();
@@ -246,7 +248,7 @@ describe('Vislib Data Class Test Suite', function () {
 
     function testLength(inputData) {
       return function () {
-        var data = new Data(inputData, {});
+        var data = new Data(inputData, {}, persistedState);
         var len = _.reduce(data.chartData(), function (sum, chart) {
           return sum + chart.series.reduce(function (sum, series) {
             return sum + series.values.length;
@@ -267,9 +269,9 @@ describe('Vislib Data Class Test Suite', function () {
     var minValueStacked = 15;
 
     beforeEach(function () {
-      visData = new Data(dataSeries, {});
-      visDataNeg = new Data(dataSeriesNeg, {});
-      visDataStacked = new Data(dataStacked, { type: 'histogram' });
+      visData = new Data(dataSeries, {}, persistedState);
+      visDataNeg = new Data(dataSeriesNeg, {}, persistedState);
+      visDataStacked = new Data(dataStacked, { type: 'histogram' }, persistedState);
     });
 
     // The first value in the time series is less than the min date in the
@@ -304,9 +306,9 @@ describe('Vislib Data Class Test Suite', function () {
     var maxValueStacked = 115;
 
     beforeEach(function () {
-      visData = new Data(dataSeries, {});
-      visDataNeg = new Data(dataSeriesNeg, {});
-      visDataStacked = new Data(dataStacked, { type: 'histogram' });
+      visData = new Data(dataSeries, {}, persistedState);
+      visDataNeg = new Data(dataSeriesNeg, {}, persistedState);
+      visDataStacked = new Data(dataStacked, { type: 'histogram' }, persistedState);
     });
 
     // The first value in the time series is less than the min date in the
@@ -372,7 +374,7 @@ describe('Vislib Data Class Test Suite', function () {
     };
 
     beforeEach(function () {
-      data = new Data(geohashGridData, {});
+      data = new Data(geohashGridData, {}, persistedState);
     });
 
     describe('getVisData', function () {
@@ -393,7 +395,7 @@ describe('Vislib Data Class Test Suite', function () {
 
   describe('null value check', function () {
     it('should return false', function () {
-      var data = new Data(rowsData, {});
+      var data = new Data(rowsData, {}, persistedState);
       expect(data.hasNullValues()).to.be(false);
     });
 
@@ -409,7 +411,7 @@ describe('Vislib Data Class Test Suite', function () {
         ]
       });
 
-      var data = new Data(nullRowData, {});
+      var data = new Data(nullRowData, {}, persistedState);
       expect(data.hasNullValues()).to.be(true);
     });
   });