@splunk/visualizations 24.7.0 → 25.0.1

package/Column.config.js

@@ -87,7 +87,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 42);
+/******/ 	return __webpack_require__(__webpack_require__.s = 41);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -103,6 +103,8 @@ module.exports = require("@splunk/ui-utils/i18n");
 "use strict";
 
 
+var _toConsumableArray = __webpack_require__(2);
+
 var _defineProperty = __webpack_require__(6);
 
 var __rest = this && this.__rest || function (s, e) {
@@ -121,13 +123,13 @@ var __rest = this && this.__rest || function (s, e) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.generatePrecisionValues = exports.getInitialPreset = exports.isDynamicOption = exports.enhanceOptionsSchemaWithDynamicOptions = exports.enhanceConfig = void 0;
+exports.insertLayout = exports.uncollapseEditorConfig = exports.generatePrecisionValues = exports.getInitialPreset = exports.isDynamicOption = exports.enhanceOptionsSchemaWithDynamicOptions = exports.enhanceConfig = void 0;
 
-var lodash_1 = __webpack_require__(4);
+var lodash_1 = __webpack_require__(5);
 
-var schemaUtils_1 = __webpack_require__(3);
+var schemaUtils_1 = __webpack_require__(4);
 
-var VizBehavior_1 = __webpack_require__(2);
+var VizBehavior_1 = __webpack_require__(3);
 
 var dynamicOptionsDSLType = {
   type: 'string',
@@ -196,8 +198,10 @@ function enhanceOptionsSchemaWithDynamicOptions(optionsSchema) {
 exports.enhanceOptionsSchemaWithDynamicOptions = enhanceOptionsSchemaWithDynamicOptions;
 /**
  * Helper function to enhance a Visualization Config as needed based on behaviors specified in supports block
+ * this function also collapse all editor panels
  * @param vizConfig a Visualization Config
  * @returns an enhanced Visualization Config containing updated config entries based on behaviors it supports
+ * and containing `open: false` for all editor panels in editorConfig
  */
 
 function enhanceConfig(vizConfig) {
@@ -207,10 +211,33 @@ function enhanceConfig(vizConfig) {
     enhancedConfig.optionsSchema = enhanceOptionsSchemaWithDynamicOptions(vizConfig.optionsSchema);
   }
 
+  enhancedConfig.editorConfig = vizConfig.editorConfig.map(function (config) {
+    return Object.assign(Object.assign({}, config), {
+      open: false
+    });
+  });
   return enhancedConfig;
 }
 
 exports.enhanceConfig = enhanceConfig;
+/**
+ * Helper function to uncollapse all editor panels by adding `open: true` to the editorConfig
+ * Created for editor unit tests
+ * @param vizConfig a Visualization Config
+ * @returns a Visualization Config containing `open: true` for all editor panels in editorConfig
+ */
+
+function uncollapseEditorConfig(vizConfig) {
+  var editorPanelUncollapsedConfig = vizConfig;
+  editorPanelUncollapsedConfig.editorConfig = vizConfig.editorConfig.map(function (config) {
+    return Object.assign(Object.assign({}, config), {
+      open: true
+    });
+  });
+  return editorPanelUncollapsedConfig;
+}
+
+exports.uncollapseEditorConfig = uncollapseEditorConfig;
 
 function isDynamicOption(option) {
   return option && typeof option === 'string' && option.trim().startsWith('>') || false;
@@ -286,9 +313,33 @@ function generatePrecisionValues(numPrecisionValues) {
 }
 
 exports.generatePrecisionValues = generatePrecisionValues;
+/**
+ * insert layout in layout array, return a new layout array instead of updating the original
+ *
+ * @param {EditorLayoutConfig[][]} layout - editor layout
+ * @param {Number} index - the index to insert layout item(s)
+ * @param {EditorLayoutConfig[][]} layoutItems - the item(s) to insert
+ * @returns {EditorLayoutConfig[][]} new editor layout with insertion
+ */
+
+var insertLayout = function insertLayout(layout, index) {
+  for (var _len = arguments.length, layoutItems = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+    layoutItems[_key - 2] = arguments[_key];
+  }
+
+  return [].concat(_toConsumableArray(layout.slice(0, index)), layoutItems, _toConsumableArray(layout.slice(index)));
+};
+
+exports.insertLayout = insertLayout;
 
 /***/ }),
 /* 2 */
+/***/ (function(module, exports) {
+
+module.exports = require("@babel/runtime/helpers/toConsumableArray");
+
+/***/ }),
+/* 3 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -325,19 +376,25 @@ var VizBehavior;
 })(VizBehavior = exports.VizBehavior || (exports.VizBehavior = {}));
 
 /***/ }),
-/* 3 */
+/* 4 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/schemaUtils");
 
 /***/ }),
-/* 4 */
+/* 5 */
 /***/ (function(module, exports) {
 
 module.exports = require("lodash");
 
 /***/ }),
-/* 5 */
+/* 6 */
+/***/ (function(module, exports) {
+
+module.exports = require("@babel/runtime/helpers/defineProperty");
+
+/***/ }),
+/* 7 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -364,18 +421,6 @@ var VizCategory;
   VizCategory["SPATIAL"] = "Spatial";
 })(VizCategory = exports.VizCategory || (exports.VizCategory = {}));
 
-/***/ }),
-/* 6 */
-/***/ (function(module, exports) {
-
-module.exports = require("@babel/runtime/helpers/defineProperty");
-
-/***/ }),
-/* 7 */
-/***/ (function(module, exports) {
-
-module.exports = require("@splunk/visualization-icons/placeholders");
-
 /***/ }),
 /* 8 */
 /***/ (function(module, exports) {
@@ -392,16 +437,22 @@ module.exports = require("@splunk/themes/variables");
 /* 10 */
 /***/ (function(module, exports) {
 
-module.exports = require("@splunk/visualization-icons");
+module.exports = require("@splunk/visualization-icons/placeholders");
 
 /***/ }),
 /* 11 */
 /***/ (function(module, exports) {
 
-module.exports = require("@splunk/visualization-color-palettes");
+module.exports = require("@splunk/visualization-icons");
 
 /***/ }),
 /* 12 */
+/***/ (function(module, exports) {
+
+module.exports = require("@splunk/visualization-color-palettes");
+
+/***/ }),
+/* 13 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -431,35 +482,161 @@ var background = function background(_ref) {
 exports.default = background;
 
 /***/ }),
-/* 13 */,
-/* 14 */
+/* 14 */,
+/* 15 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
+var _toConsumableArray = __webpack_require__(2);
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.AxesChartDataConfigAreaColumnLine = exports.AxesChartDataConfigBubble = exports.AxesChartDataConfigScatter = exports.AxesChartDataConfigBar = void 0;
 
 var i18n_1 = __webpack_require__(0);
 
-var axes = {
-  label: i18n_1._('Axes'),
+var configUtils_1 = __webpack_require__(1);
+
+var AxesChartDataConfig = {
+  label: i18n_1._('Data configurations'),
   layout: [[{
-    label: i18n_1._('X Axis title'),
-    option: 'xAxisTitleText',
-    editor: 'editor.text'
+    label: i18n_1._('X'),
+    option: 'x',
+    editor: 'editor.columnSelector',
+    editorProps: {
+      dataSourceKey: 'primary'
+    }
   }], [{
-    label: i18n_1._('Y Axis title'),
-    option: 'yAxisTitleText',
-    editor: 'editor.text'
+    label: i18n_1._('Y'),
+    option: 'y',
+    editor: 'editor.columnMultiSelector',
+    editorProps: {
+      dataSourceKey: 'primary'
+    }
+  }], [{
+    label: i18n_1._('Result limit'),
+    option: 'resultLimit',
+    editor: 'editor.number',
+    editorProps: {
+      dataSourceKey: 'primary'
+    }
   }]]
 };
-exports.default = axes;
+exports.AxesChartDataConfigBar = {
+  label: AxesChartDataConfig.label,
+  // insert Y2 after Y
+  layout: configUtils_1.insertLayout(AxesChartDataConfig.layout, 2, [{
+    label: i18n_1._('Y2'),
+    option: 'y2',
+    editor: 'editor.columnMultiSelector',
+    editorProps: {
+      dataSourceKey: 'primary'
+    }
+  }])
+};
+exports.AxesChartDataConfigScatter = {
+  label: AxesChartDataConfig.label,
+  // layout: insert Category after Y
+  layout: configUtils_1.insertLayout(AxesChartDataConfig.layout, 2, [{
+    label: i18n_1._('Category'),
+    option: 'category',
+    editor: 'editor.columnSelector',
+    editorProps: {
+      dataSourceKey: 'primary'
+    }
+  }])
+};
+exports.AxesChartDataConfigBubble = {
+  label: exports.AxesChartDataConfigScatter.label,
+  // layout: insert Size after Category
+  layout: configUtils_1.insertLayout(exports.AxesChartDataConfigScatter.layout, 3, [{
+    label: i18n_1._('Size'),
+    option: 'size',
+    editor: 'editor.columnSelector',
+    editorProps: {
+      dataSourceKey: 'primary'
+    }
+  }])
+};
+exports.AxesChartDataConfigAreaColumnLine = {
+  label: exports.AxesChartDataConfigBar.label,
+  layout: [].concat(_toConsumableArray(exports.AxesChartDataConfigBar.layout), [[{
+    label: i18n_1._('Annotation x'),
+    option: 'annotationX',
+    editor: 'editor.columnSelector',
+    editorProps: {
+      dataSourceKey: 'annotation'
+    }
+  }], [{
+    label: i18n_1._('Annotation labels'),
+    option: 'annotationLabel',
+    editor: 'editor.columnSelector',
+    editorProps: {
+      dataSourceKey: 'annotation'
+    }
+  }]])
+};
+exports.default = AxesChartDataConfig;
 
 /***/ }),
-/* 15 */
+/* 16 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var i18n_1 = __webpack_require__(0);
+
+var pick_1 = __webpack_require__(8);
+
+var variables_1 = __webpack_require__(9);
+
+var BackgroundColor_1 = __webpack_require__(13);
+
+var themes = {
+  defaultBackgroundColor: function defaultBackgroundColor(props) {
+    return pick_1.default({
+      enterprise: {
+        dark: variables_1.default.black(props),
+        light: variables_1.default.backgroundColor(props)
+      },
+      prisma: variables_1.default.backgroundColorSidebar(props)
+    })(props);
+  }
+};
+var AxesChartColorAndStyle = {
+  label: i18n_1._('Color and style'),
+  layout: [BackgroundColor_1.default({
+    themes: themes
+  }) // Add SeriesColorsEditor when SCP-55658 is done e.g.
+  // [
+  //     {
+  //         label: _('Series colors'),
+  //         option: 'seriesColors',
+  //         editor: 'editor.seriesColors',
+  //     },
+  // ],
+  // Add SeriesColorsByFieldEditor here when SCP-55687 is done, e.g.
+  // [
+  //     {
+  //         label: _('Series colors by field name'),
+  //         option: 'seriesColorsByField',
+  //         editor: 'editor.seriesColorsByField',
+  //     },
+  // ],
+  ]
+};
+exports.default = AxesChartColorAndStyle;
+
+/***/ }),
+/* 17 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -471,10 +648,10 @@ Object.defineProperty(exports, "__esModule", {
 
 var i18n_1 = __webpack_require__(0);
 
-var legend = {
+var AxesChartLegend = {
   label: i18n_1._('Legend'),
   layout: [[{
-    label: i18n_1._('Position'),
+    label: i18n_1._('Legend display'),
     option: 'legendDisplay',
     editor: 'editor.select',
     editorProps: {
@@ -496,7 +673,7 @@ var legend = {
       }]
     }
   }], [{
-    label: i18n_1._('Truncation'),
+    label: i18n_1._('Legend truncation'),
     option: 'legendTruncation',
     editor: 'editor.radioBar',
     editorProps: {
@@ -513,34 +690,775 @@ var legend = {
         label: i18n_1._('Off'),
         value: 'ellipsisOff'
       }]
+    },
+    showEditor: function showEditor(_ref) {
+      var options = _ref.options;
+      return options.legendDisplay === 'left' || options.legendDisplay === 'right' || options.legendDisplay === 'top' || options.legendDisplay === 'bottom' || options.legendDisplay === undefined;
+    }
+  }]]
+};
+exports.default = AxesChartLegend;
+
+/***/ }),
+/* 18 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _toConsumableArray = __webpack_require__(2);
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AxesChartXGridAndLabelsBubbleScatter = exports.AxesChartXGridAndLabelsCommon = void 0;
+
+var i18n_1 = __webpack_require__(0);
+
+var configUtils_1 = __webpack_require__(1);
+
+exports.AxesChartXGridAndLabelsCommon = {
+  label: i18n_1._('X-axis grid and labels'),
+  layout: [[{
+    label: i18n_1._('Axis title'),
+    option: 'xAxisTitleVisibility',
+    editor: 'editor.toggle'
+  }], [{
+    label: i18n_1._('Axis title text'),
+    option: 'xAxisTitleText',
+    editor: 'editor.text',
+    showEditor: function showEditor(_ref) {
+      var options = _ref.options;
+      return options.xAxisTitleVisibility === 'show' || options.xAxisTitleVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Label visibility'),
+    option: 'xAxisLabelVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }]]
+};
+var AxesChartXGridAndLabels = {
+  label: exports.AxesChartXGridAndLabelsCommon.label,
+  layout: [].concat(_toConsumableArray(exports.AxesChartXGridAndLabelsCommon.layout), [[{
+    label: i18n_1._('Label rotation'),
+    option: 'xAxisLabelRotation',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('-90'),
+        value: -90
+      }, {
+        label: i18n_1._('-45'),
+        value: -45
+      }, {
+        label: i18n_1._('0'),
+        value: 0
+      }, {
+        label: i18n_1._('45'),
+        value: 45
+      }, {
+        label: i18n_1._('90'),
+        value: 90
+      }]
+    },
+    showEditor: function showEditor(_ref2) {
+      var options = _ref2.options;
+      return options.xAxisLabelVisibility === 'show' || options.xAxisLabelVisibility === 'auto' || options.xAxisLabelVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Number of time label parts'),
+    option: 'xAxisMaxLabelParts',
+    editor: 'editor.number',
+    editorProps: {
+      min: 1,
+      max: 3
+    },
+    showEditor: function showEditor(_ref3) {
+      var options = _ref3.options;
+      return options.xAxisLabelVisibility === 'show' || options.xAxisLabelVisibility === 'auto' || options.xAxisLabelVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Axis line visibility'),
+    option: 'xAxisLineVisibility',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Major gridlines'),
+    option: 'showXMajorGridLines',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Major tick visibility'),
+    option: 'xAxisMajorTickVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Major tick size (px)'),
+    option: 'xAxisMajorTickSize',
+    editor: 'editor.slider',
+    editorProps: {
+      min: 0,
+      max: 10,
+      step: 1
+    },
+    showEditor: function showEditor(_ref4) {
+      var options = _ref4.options;
+      return options.xAxisMajorTickVisibility === 'show' || options.xAxisMajorTickVisibility === 'auto' || options.xAxisMajorTickVisibility === undefined;
+    }
+  }]])
+};
+exports.AxesChartXGridAndLabelsBubbleScatter = {
+  label: exports.AxesChartXGridAndLabelsCommon.label,
+  layout: [].concat(_toConsumableArray(configUtils_1.insertLayout(exports.AxesChartXGridAndLabelsCommon.layout, 2, [{
+    label: i18n_1._('Axis scale'),
+    option: 'xAxisScale',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Linear'),
+        value: 'linear'
+      }, {
+        label: i18n_1._('Log'),
+        value: 'log'
+      }]
+    }
+  }])), [[{
+    label: i18n_1._('Label rotation'),
+    option: 'xAxisLabelRotation',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('-90'),
+        value: -90
+      }, {
+        label: i18n_1._('-45'),
+        value: -45
+      }, {
+        label: i18n_1._('0'),
+        value: 0
+      }, {
+        label: i18n_1._('45'),
+        value: 45
+      }, {
+        label: i18n_1._('90'),
+        value: 90
+      }]
+    },
+    showEditor: function showEditor(_ref5) {
+      var options = _ref5.options;
+      return options.xAxisLabelVisibility === 'show' || options.xAxisLabelVisibility === 'auto' || options.xAxisLabelVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Round axis labels'),
+    option: 'showRoundedXAxisLabels',
+    editor: 'editor.checkbox',
+    showEditor: function showEditor(_ref6) {
+      var options = _ref6.options;
+      return options.xAxisLabelVisibility === 'show' || options.xAxisLabelVisibility === 'auto' || options.xAxisLabelVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('SI prefix abbreviation for labels'),
+    option: 'xAxisAbbreviation',
+    editor: 'editor.checkbox',
+    showEditor: function showEditor(_ref7) {
+      var options = _ref7.options;
+      return options.xAxisLabelVisibility === 'show' || options.xAxisLabelVisibility === 'auto' || options.xAxisLabelVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Include zero'),
+    option: 'showXAxisWithZero',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Extend to whole grid'),
+    option: 'showXAxisExtendedRange',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Minimum axis value'),
+    option: 'xAxisMin',
+    editor: 'editor.number'
+  }, {
+    label: i18n_1._('Maximum axis value'),
+    option: 'xAxisMax',
+    editor: 'editor.number'
+  }], [{
+    label: i18n_1._('Axis line visibility'),
+    option: 'xAxisLineVisibility',
+    editor: 'editor.checkbox'
+  }], // this option is disabled for bubble and scatter
+  // [
+  //     {
+  //         label: _('Major gridlines'),
+  //         option: 'showXMajorGridLines',
+  //         editor: 'editor.checkbox',
+  //     },
+  // ],
+  [{
+    label: i18n_1._('Major tick visibility'),
+    option: 'xAxisMajorTickVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Major tick size (px)'),
+    option: 'xAxisMajorTickSize',
+    editor: 'editor.slider',
+    editorProps: {
+      min: 0,
+      max: 10,
+      step: 1
+    },
+    showEditor: function showEditor(_ref8) {
+      var options = _ref8.options;
+      return options.xAxisMajorTickVisibility === 'show' || options.xAxisMajorTickVisibility === 'auto' || options.xAxisMajorTickVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Major tick interval spacing'),
+    option: 'xAxisMajorTickInterval',
+    editor: 'editor.number',
+    showEditor: function showEditor(_ref9) {
+      var options = _ref9.options;
+      return options.xAxisMajorTickVisibility === 'show' || options.xAxisMajorTickVisibility === 'auto' || options.xAxisMajorTickVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Minor gridlines'),
+    option: 'showXMinorGridLines',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Minor tick visibility'),
+    option: 'xAxisMinorTickVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Minor tick size (px)'),
+    option: 'xAxisMinorTickSize',
+    editor: 'editor.slider',
+    editorProps: {
+      min: 0,
+      max: 10,
+      step: 1
+    },
+    showEditor: function showEditor(_ref10) {
+      var options = _ref10.options;
+      return options.xAxisMinorTickVisibility === 'show' || options.xAxisMinorTickVisibility === 'auto' || options.xAxisMinorTickVisibility === undefined;
+    }
+  }]])
+};
+exports.default = AxesChartXGridAndLabels;
+
+/***/ }),
+/* 19 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var i18n_1 = __webpack_require__(0);
+
+var AxesChartYGridAndLabels = {
+  label: i18n_1._('Y-axis grid and labels'),
+  layout: [[{
+    label: i18n_1._('Axis title'),
+    option: 'yAxisTitleVisibility',
+    editor: 'editor.toggle'
+  }], [{
+    label: i18n_1._('Axis title text'),
+    option: 'yAxisTitleText',
+    editor: 'editor.text',
+    showEditor: function showEditor(_ref) {
+      var options = _ref.options;
+      return options.yAxisTitleVisibility === 'show' || options.yAxisTitleVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Scale'),
+    option: 'yAxisScale',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Linear'),
+        value: 'linear'
+      }, {
+        label: i18n_1._('Log'),
+        value: 'log'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Label visibility'),
+    option: 'yAxisLabelVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('SI prefix abbreviation for labels'),
+    option: 'yAxisAbbreviation',
+    editor: 'editor.checkbox',
+    showEditor: function showEditor(_ref2) {
+      var options = _ref2.options;
+      return options.yAxisLabelVisibility === 'show' || options.yAxisLabelVisibility === 'auto' || options.yAxisLabelVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Include zero'),
+    option: 'showYAxisWithZero',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Extend to whole grid'),
+    option: 'showYAxisExtendedRange',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Minimum axis value'),
+    option: 'yAxisMin',
+    editor: 'editor.number'
+  }, {
+    label: i18n_1._('Maximum axis value'),
+    option: 'yAxisMax',
+    editor: 'editor.number'
+  }], [{
+    label: i18n_1._('Axis line visibility'),
+    option: 'yAxisLineVisibility',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Major gridlines'),
+    option: 'showYMajorGridLines',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Major tick visibility'),
+    option: 'yAxisMajorTickVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Major tick size (px)'),
+    option: 'yAxisMajorTickSize',
+    editor: 'editor.slider',
+    editorProps: {
+      min: 0,
+      max: 10,
+      step: 1
+    },
+    showEditor: function showEditor(_ref3) {
+      var options = _ref3.options;
+      return options.yAxisMajorTickVisibility === 'show' || options.yAxisMajorTickVisibility === 'auto' || options.yAxisMajorTickVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Major tick interval spacing'),
+    option: 'yAxisMajorTickInterval',
+    editor: 'editor.number',
+    showEditor: function showEditor(_ref4) {
+      var options = _ref4.options;
+      return options.yAxisMajorTickVisibility === 'show' || options.yAxisMajorTickVisibility === 'auto' || options.yAxisMajorTickVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Minor gridlines'),
+    option: 'showYMinorGridLines',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Minor tick visibility'),
+    option: 'yAxisMinorTickVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Minor tick size (px)'),
+    option: 'yAxisMinorTickSize',
+    editor: 'editor.slider',
+    editorProps: {
+      min: 0,
+      max: 10,
+      step: 1
+    },
+    showEditor: function showEditor(_ref5) {
+      var options = _ref5.options;
+      return options.yAxisMinorTickVisibility === 'show' || options.yAxisMinorTickVisibility === 'auto' || options.yAxisMinorTickVisibility === undefined;
     }
   }]]
 };
-exports.default = legend;
+exports.default = AxesChartYGridAndLabels;
 
 /***/ }),
-/* 16 */,
-/* 17 */,
-/* 18 */,
-/* 19 */,
 /* 20 */
-/***/ (function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _toConsumableArray = __webpack_require__(2);
 
-module.exports = require("@splunk/react-icons/BarBeside");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AxesChartDataDisplayColumn = exports.AxesChartDataDisplayBar = exports.AxesChartDataDisplayLine = void 0;
+
+var i18n_1 = __webpack_require__(0);
+
+var lodash_1 = __webpack_require__(5);
+
+var configUtils_1 = __webpack_require__(1);
+
+exports.AxesChartDataDisplayLine = {
+  label: i18n_1._('Data display'),
+  layout: [[{
+    label: i18n_1._('Null value display'),
+    option: 'nullValueDisplay',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Gaps'),
+        value: 'gaps'
+      }, {
+        label: i18n_1._('Zero'),
+        value: 'zero'
+      }, {
+        label: i18n_1._('Connect'),
+        value: 'connect'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Data value display'),
+    option: 'dataValuesDisplay',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Off'),
+        value: 'off'
+      }, {
+        label: i18n_1._('All'),
+        value: 'all'
+      }, {
+        label: i18n_1._('Min/Max'),
+        value: 'minmax'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Overlay fields'),
+    option: 'overlayFields',
+    editor: 'editor.columnMultiSelector',
+    editorProps: {
+      dataSourceKey: 'primary'
+    }
+  }], [{
+    label: i18n_1._('Split series'),
+    option: 'showSplitSeries',
+    editor: 'editor.toggle'
+  }], [{
+    label: i18n_1._('Independent y-axis for split series'),
+    option: 'showIndependentYRanges',
+    editor: 'editor.checkbox',
+    showEditor: function showEditor(_ref) {
+      var options = _ref.options;
+      return options.showSplitSeries;
+    }
+  }]]
+};
+var AxesChartDataDisplay = {
+  label: exports.AxesChartDataDisplayLine.label,
+  layout: [[{
+    label: i18n_1._('Stack mode'),
+    option: 'stackMode',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Not stacked'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Stacked'),
+        value: 'stacked'
+      }, {
+        label: i18n_1._('Stacked 100%'),
+        value: 'stacked100'
+      }]
+    }
+  }]].concat(_toConsumableArray(exports.AxesChartDataDisplayLine.layout))
+};
+exports.AxesChartDataDisplayBar = {
+  label: exports.AxesChartDataDisplayLine.label,
+  layout: [[{
+    label: i18n_1._('Stack mode'),
+    option: 'stackMode',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Not stacked'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Stacked'),
+        value: 'stacked'
+      }, {
+        label: i18n_1._('Stacked 100%'),
+        value: 'stacked100'
+      }]
+    }
+  }]].concat(_toConsumableArray(lodash_1.drop(exports.AxesChartDataDisplayLine.layout)))
+};
+exports.AxesChartDataDisplayColumn = {
+  label: exports.AxesChartDataDisplayBar.label,
+  layout: [].concat(_toConsumableArray(configUtils_1.insertLayout(exports.AxesChartDataDisplayBar.layout, 2, [{
+    label: i18n_1._('Show tooltip on hover'),
+    option: 'showTooltip',
+    editor: 'editor.checkbox'
+  }])), [[{
+    label: i18n_1._('Column grouping mode'),
+    option: 'columnGrouping',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Overlay'),
+        value: 'overlay'
+      }]
+    }
+  }]])
+};
+exports.default = AxesChartDataDisplay;
 
 /***/ }),
 /* 21 */
-/***/ (function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = require("@splunk/react-icons/BarStacked");
+"use strict";
 
-/***/ }),
-/* 22 */
-/***/ (function(module, exports) {
 
-module.exports = require("@splunk/react-icons/BarStacked100");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var i18n_1 = __webpack_require__(0);
+
+var axesChartY2GridAndLabels = {
+  label: i18n_1._('Y2-axis grid and labels'),
+  layout: [[{
+    label: i18n_1._('Axis title'),
+    option: 'y2AxisTitleVisibility',
+    editor: 'editor.toggle'
+  }], [{
+    label: i18n_1._('Axis title text'),
+    option: 'y2AxisTitleText',
+    editor: 'editor.text',
+    showEditor: function showEditor(_ref) {
+      var options = _ref.options;
+      return options.y2AxisTitleVisibility === 'show' || options.y2AxisTitleVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Show overlays on the y2-axis'),
+    option: 'showOverlayY2Axis',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Scale'),
+    option: 'y2AxisScale',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Linear'),
+        value: 'linear'
+      }, {
+        label: i18n_1._('Log'),
+        value: 'log'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Label visibility'),
+    option: 'y2AxisLabelVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Round axis labels'),
+    option: 'showRoundedY2AxisLabels',
+    editor: 'editor.checkbox',
+    showEditor: function showEditor(_ref2) {
+      var options = _ref2.options;
+      return options.y2AxisLabelVisibility === 'show' || options.y2AxisLabelVisibility === 'auto' || options.y2AxisLabelVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('SI prefix abbreviation for labels'),
+    option: 'y2AxisAbbreviation',
+    editor: 'editor.checkbox',
+    showEditor: function showEditor(_ref3) {
+      var options = _ref3.options;
+      return options.y2AxisLabelVisibility === 'show' || options.y2AxisLabelVisibility === 'auto' || options.y2AxisLabelVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Include zero'),
+    option: 'showY2AxisWithZero',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Minimum axis value'),
+    option: 'y2AxisMin',
+    editor: 'editor.number'
+  }, {
+    label: i18n_1._('Maximum axis value'),
+    option: 'y2AxisMax',
+    editor: 'editor.number'
+  }], [{
+    label: i18n_1._('Axis line visibility'),
+    option: 'y2AxisLineVisibility',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Major gridlines'),
+    option: 'showY2MajorGridLines',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Major tick visibility'),
+    option: 'y2AxisMajorTickVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Major tick size (px)'),
+    option: 'y2AxisMajorTickSize',
+    editor: 'editor.slider',
+    editorProps: {
+      min: 0,
+      max: 10,
+      step: 1
+    },
+    showEditor: function showEditor(_ref4) {
+      var options = _ref4.options;
+      return options.y2AxisMajorTickVisibility === 'show' || options.y2AxisMajorTickVisibility === 'auto' || options.y2AxisMajorTickVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Major tick interval spacing'),
+    option: 'y2AxisMajorTickInterval',
+    editor: 'editor.number',
+    showEditor: function showEditor(_ref5) {
+      var options = _ref5.options;
+      return options.y2AxisMajorTickVisibility === 'show' || options.y2AxisMajorTickVisibility === 'auto' || options.y2AxisMajorTickVisibility === undefined;
+    }
+  }], [{
+    label: i18n_1._('Minor gridlines'),
+    option: 'showY2MinorGridLines',
+    editor: 'editor.checkbox'
+  }], [{
+    label: i18n_1._('Minor tick visibility'),
+    option: 'y2AxisMinorTickVisibility',
+    editor: 'editor.radioBar',
+    editorProps: {
+      values: [{
+        label: i18n_1._('Auto'),
+        value: 'auto'
+      }, {
+        label: i18n_1._('Show'),
+        value: 'show'
+      }, {
+        label: i18n_1._('Hide'),
+        value: 'hide'
+      }]
+    }
+  }], [{
+    label: i18n_1._('Minor tick size (px)'),
+    option: 'y2AxisMinorTickSize',
+    editor: 'editor.slider',
+    editorProps: {
+      min: 0,
+      max: 10,
+      step: 1
+    },
+    showEditor: function showEditor(_ref6) {
+      var options = _ref6.options;
+      return options.y2AxisMinorTickVisibility === 'show' || options.y2AxisMinorTickVisibility === 'auto' || options.y2AxisMinorTickVisibility === undefined;
+    }
+  }]]
+};
+exports.default = axesChartY2GridAndLabels;
 
 /***/ }),
+/* 22 */,
 /* 23 */,
 /* 24 */,
 /* 25 */,
@@ -559,61 +1477,62 @@ module.exports = require("@splunk/react-icons/BarStacked100");
 /* 38 */,
 /* 39 */,
 /* 40 */,
-/* 41 */,
-/* 42 */
+/* 41 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
+var _toConsumableArray = __webpack_require__(2);
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.optionsSchema = void 0;
 
-var visualization_icons_1 = __webpack_require__(10);
+var visualization_icons_1 = __webpack_require__(11);
 
-var placeholders_1 = __webpack_require__(7);
+var placeholders_1 = __webpack_require__(10);
 
-var schemaUtils_1 = __webpack_require__(3);
+var schemaUtils_1 = __webpack_require__(4);
 
 var i18n_1 = __webpack_require__(0);
 
-var BarBeside_1 = __webpack_require__(20);
-
-var BarStacked_1 = __webpack_require__(21);
-
-var BarStacked100_1 = __webpack_require__(22);
-
 var pick_1 = __webpack_require__(8);
 
 var variables_1 = __webpack_require__(9);
 
-var visualization_color_palettes_1 = __webpack_require__(11);
+var visualization_color_palettes_1 = __webpack_require__(12);
 
-var VizBehavior_1 = __webpack_require__(2);
+var VizBehavior_1 = __webpack_require__(3);
 
-var VizCategory_1 = __webpack_require__(5);
+var VizCategory_1 = __webpack_require__(7);
 
 var configUtils_1 = __webpack_require__(1);
 
-var Axes_1 = __webpack_require__(14);
+var AxesChartDataConfig_1 = __webpack_require__(15);
+
+var AxesChartDataDisplay_1 = __webpack_require__(20);
+
+var AxesChartColorAndStyle_1 = __webpack_require__(16);
 
-var Legend_1 = __webpack_require__(15);
+var AxesChartLegend_1 = __webpack_require__(17);
 
-var BackgroundColor_1 = __webpack_require__(12);
+var AxesChartXGridAndLabels_1 = __webpack_require__(18);
+
+var AxesChartYGridAndLabels_1 = __webpack_require__(19);
+
+var AxesChartY2GridAndLabels_1 = __webpack_require__(21);
 
 var dataContract = {
   requiredDataSources: [{
     name: 'primary',
     description: 'DataSource that powers the visualization'
   }],
-  optionalDataSources: [// Note: SCP-14090 disable ui for optional datasources. We may need to add it back later
-    // {
-    //     name: 'annotation',
-    //     description: 'DataSource that populate event annotations',
-    // },
-  ],
+  optionalDataSources: [{
+    name: 'annotation',
+    description: 'DataSource that populates event annotations'
+  }],
   initialRequestParams: {
     primary: {
       offset: 0,
@@ -633,7 +1552,7 @@ var defaultContext = {};
 exports.optionsSchema = {
   x: {
     default: '> primary | seriesByIndex(0)',
-    description: 'Specify the dataSource applied to the x-axis.',
+    description: 'Specify a data source to apply to the x-axis.',
     type: 'array',
     items: {
       type: ['string', 'number']
@@ -641,14 +1560,14 @@ exports.optionsSchema = {
   },
   y: {
     default: '> primary | frameBySeriesIndexRange(1)',
-    description: 'Specify the dataSource applied to the y-axis.',
+    description: 'Specify a data source to apply to the y-axis.',
     type: 'array',
     items: {
       type: ['string', 'number']
     }
   },
   y2: {
-    description: 'Specify the dataSource applied to the y2-axis',
+    description: 'Specify a data source to apply to the second y-axis',
     type: 'array',
     items: {
       type: ['string', 'number']
@@ -656,38 +1575,38 @@ exports.optionsSchema = {
   },
   xField: {
     default: '> x | getField()',
-    description: 'Specify the field that should be mapped to the x-axis.',
+    description: 'Specify a field to map to the x-axis.',
     type: 'string'
   },
   yFields: {
     default: '> y | getField()',
-    description: 'Specify the field that should be mapped to the y-axis.',
+    description: 'Specify a field to map to the y-axis.',
     type: 'string'
   },
   y2Fields: {
     default: '> y2 | getField()',
-    description: 'Specify field(s) that should be mapped to a second y-axis.',
+    description: 'Specify one or more fields to map to a second y-axis.',
     type: ['array', 'string'],
     items: {
       type: 'string'
     }
   },
   annotationColor: {
-    description: "Specify the annotation colors. You may use a dataSource to apply the color. For example, [\u201C#FF0000\u201D, \u201C#0000FF\", \u201C#008000\u201D].",
+    description: "Specify the annotation colors. For example, [\u201C#FF0000\u201D, \u201C#0000FF\", \u201C#008000\u201D]. You can use a data source or hexadecimal code to apply the color.",
     type: 'array',
     items: {
       type: 'string'
     }
   },
   annotationLabel: {
-    description: "Specify a list of labels used for the annotations. You may use a dataSource to apply the labels. For example, [\u201Chouston, we have a problem\u201D, \u201Cjust close the jira\u201D, \u201Clooking good now\u201D].",
+    description: "Specify a list of labels to use for annotations. For example, [\u201CSales\u201D, \u201CRevenue\u201D, \u201COrders\u201D].You can use a data source to apply the labels. ",
     type: 'array',
     items: {
       type: 'string'
     }
   },
   annotationX: {
-    description: 'Specify the dataSource field applied to the event annotation on the x-axis.',
+    description: 'Specify a data source field to apply to the event annotation on the x-axis.',
     type: 'array',
     items: {
       type: ['string', 'number']
@@ -695,24 +1614,24 @@ exports.optionsSchema = {
   },
   backgroundColor: {
     default: '> themes.defaultBackgroundColor',
-    description: 'Specify the color for the background. You may use a dataSource to apply the color. The default for enterprise light is "#ffffff". The default for enterprise dark is "#000000". The default for prisma dark is "#0b0c0e".',
+    description: 'Specify the color to use for the background. You can use a data source or a hexadecimal code to apply the color.',
     pattern: schemaUtils_1.COLOR_OR_TOKEN_PATTERN,
     type: 'string'
   },
   dataValuesDisplay: {
-    description: 'Specify whether chart should display no labels, all labels, or only the min and max labels.',
+    description: 'Specify the labels to display. Enter "all" to show labels for all data points, "off" to show no labels, or "minmax" to show high and low values.',
     type: 'string',
     pattern: schemaUtils_1.getPattern(['off', 'all', 'minmax']),
     default: 'off'
   },
   columnGrouping: {
     default: 'auto',
-    description: 'Specify the column grouping mode. If chart.stackMode is defined it will override grouping behavior.',
+    description: 'Specify a column grouping mode. If chart.stackMode is defined, it overrides grouping mode settings.',
     pattern: schemaUtils_1.getPattern(['auto', 'overlay']),
     type: 'string'
   },
   columnSpacing: {
-    description: 'Specifies, in pixels, the spacing between columns in a column chart.',
+    description: 'Specifies the spacing (px) between columns in a column chart.',
     type: 'number'
   },
   legendDisplay: {
@@ -722,7 +1641,7 @@ exports.optionsSchema = {
     default: 'right'
   },
   legendLabels: {
-    description: "Specify a list of labels to pre-populate the legend. For example, [\"percent\", \"count\"].",
+    description: "Specify a list of labels to populate the legend in advance. For example, [\"percent\", \"count\"].",
     type: 'array',
     items: {
       type: 'string'
@@ -736,28 +1655,28 @@ exports.optionsSchema = {
   },
   lineWidth: {
     default: 2,
-    description: 'Specify the line width, in pixels, for chart overlay.',
+    description: 'Specify the line width (px) for chart overlay.',
     type: 'number'
   },
   resultLimit: {
     default: 50000,
-    description: 'Specify the number of data points rendered in a chart.',
+    description: 'Specify the number of data points to render in a chart.',
     type: 'number'
   },
   seriesColors: {
     default: visualization_color_palettes_1.VIZ_CATEGORICAL,
-    description: 'Specify the colors used for a series. For example, ["#FF0000", "#0000FF", "#008000"].',
+    description: 'Specify the colors to use in a series. For example, ["#FF0000", "#0000FF", "#008000"].',
     type: 'array',
     items: {
       type: 'string'
     }
   },
   seriesColorsByField: {
-    description: 'Specify the colors used for specific fields in a series. For example, {“count”: “#008000”, “percent”: “#FFA500”}.',
+    description: 'Specify the colors to use for specific fields in a series. For example, {“count”: “#008000”, “percent”: “#FFA500”}.',
     type: 'object'
   },
   seriesSpacing: {
-    description: 'Specify, in pixels, the spacing between clustered series in column and bar charts.',
+    description: 'Specify the spacing (px) between clustered series in column and bar charts.',
     type: 'number'
   },
   stackMode: {
@@ -772,52 +1691,52 @@ exports.optionsSchema = {
     default: false
   },
   showSplitSeries: {
-    description: 'Set to "true" to split a multi-series chart into separate charts that are stacked from top to bottom; one for each series.',
+    description: 'Specify whether to split a multi-series chart into separate charts that are stacked from top to bottom; uses one chart for each series.',
     type: 'boolean',
     default: false
   },
   showTooltip: {
-    description: 'Specify whether a tooltip should be visible on hover',
+    description: 'Specify whether to make a tooltip visible on hover',
     type: 'boolean',
     default: true
   },
   showXMajorGridLines: {
-    description: 'Specify whether major grid lines are visible on the x-axis.',
+    description: 'Specify whether to show major grid lines on the x-axis.',
     type: 'boolean',
     default: false
   },
   showYMajorGridLines: {
-    description: 'Specify whether major grid lines are visible on the y-axis.',
+    description: 'Specify whether to show major grid lines on the y-axis.',
     type: 'boolean',
     default: true
   },
   showY2MajorGridLines: {
-    description: 'Specify whether major grid lines are visible on the y2-axis.',
+    description: 'Specify whether to show major grid lines on the second y-axis.',
     type: 'boolean',
     default: false
   },
   showYMinorGridLines: {
-    description: 'Specify whether minor grid lines are visible on the y-axis.',
+    description: 'Specify whether to show minor grid lines on the y-axis.',
     type: 'boolean',
     default: false
   },
   showY2MinorGridLines: {
-    description: 'Specify whether minor grid lines are visible on y2-axis.',
+    description: 'Specify whether to show minor grid lines on the second y-axis.',
     type: 'boolean',
     default: false
   },
   showYAxisExtendedRange: {
-    description: 'Specify whether the y-axis should be extended to include whole major tick marks.',
+    description: 'Specify whether to extend the y-axis to include whole major tick marks.',
     type: 'boolean',
     default: true
   },
   showYAxisWithZero: {
-    description: 'Specify whether the y-axis range includes zero.',
+    description: 'Specify whether to include zero in the y-axis range.',
     type: 'boolean',
     default: false
   },
   showY2AxisWithZero: {
-    description: 'Specify whether the y2-axis range includes zero.',
+    description: 'Specify whether to include zero in the second y-axis range.',
     type: 'boolean',
     default: false
   },
@@ -828,98 +1747,101 @@ exports.optionsSchema = {
     default: 0
   },
   xAxisLabelVisibility: {
-    description: 'Specify whether to show or hide labels on the x-axis.',
+    description: 'Specify whether to show labels on the x-axis.',
     pattern: schemaUtils_1.getPattern(['auto', 'show', 'hide']),
     type: 'string',
     default: 'auto'
   },
   yAxisLabelVisibility: {
     default: 'auto',
-    description: 'Specify whether to show or hide labels on the y-axis.',
+    description: 'Specify whether to show labels on the y-axis.',
     pattern: schemaUtils_1.getPattern(['auto', 'show', 'hide']),
     type: 'string'
   },
   y2AxisLabelVisibility: {
     default: 'auto',
-    description: 'Specify whether to show or hide labels on the y2-axis.',
+    description: 'Specify whether to show labels on the second y-axis.',
     pattern: schemaUtils_1.getPattern(['auto', 'show', 'hide']),
     type: 'string'
   },
   xAxisLineVisibility: {
     default: 'hide',
-    description: 'Specify whether to show or hide the x-axis line.',
+    description: 'Specify whether to show the x-axis line.',
+    enum: ['hide', 'show'],
     pattern: schemaUtils_1.getPattern(['show', 'hide']),
     type: 'string'
   },
   yAxisLineVisibility: {
     default: 'hide',
-    description: 'Specify whether to show or hide the y-axis line.',
+    description: 'Specify whether to show the y-axis line.',
+    enum: ['hide', 'show'],
     pattern: schemaUtils_1.getPattern(['show', 'hide']),
     type: 'string'
   },
   y2AxisLineVisibility: {
     default: 'hide',
-    description: 'Specify whether to show or hide the y2-axis line.',
+    description: 'Specify whether to show the second y-axis line.',
+    enum: ['hide', 'show'],
     pattern: schemaUtils_1.getPattern(['show', 'hide']),
     type: 'string'
   },
   xAxisMajorTickSize: {
-    description: 'Specify the size, in pixels, of major tick marks on the x-axis.',
+    description: 'Specify the size (px) of major tick marks on the x-axis.',
     type: 'number',
     default: 6
   },
   yAxisMajorTickSize: {
     default: 6,
-    description: 'Specify the size, in pixels, of major tick marks on the y-axis.',
+    description: 'Specify the size (px) of major tick marks on the y-axis.',
     type: 'number'
   },
   y2AxisMajorTickSize: {
     default: 6,
-    description: 'Specify the size, in pixels, of major tick marks on the y2-axis.',
+    description: 'Specify the size (px) of major tick marks on the second y-axis.',
     type: 'number'
   },
   yAxisMinorTickSize: {
     default: 6,
-    description: 'Specify the size, in pixels, of minor tick marks on the y-axis.',
+    description: 'Specify the size (px) of minor tick marks on the y-axis.',
     type: 'number'
   },
   y2AxisMinorTickSize: {
     default: 6,
-    description: 'Specify the size, in pixels, of minor tick marks on the y2-axis.',
+    description: 'Specify the size (px) of minor tick marks on the second y-axis.',
     type: 'number'
   },
   xAxisMajorTickVisibility: {
     default: 'auto',
-    description: 'Specify whether to show or hide major tick marks on the x-axis.',
+    description: 'Specify whether to show major tick marks on the x-axis.',
     pattern: schemaUtils_1.getPattern(['auto', 'show', 'hide']),
     type: 'string'
   },
   yAxisMajorTickVisibility: {
     default: 'auto',
-    description: 'Specify whether to show or hide major tick marks on the y-axis.',
+    description: 'Specify whether to show major tick marks on the y-axis.',
     pattern: schemaUtils_1.getPattern(['auto', 'show', 'hide']),
     type: 'string'
   },
   y2AxisMajorTickVisibility: {
     default: 'auto',
-    description: 'Specify whether to show or hide major tick marks on the y2-axis.',
+    description: 'Specify whether to show  major tick marks on the second y-axis.',
     pattern: schemaUtils_1.getPattern(['auto', 'show', 'hide']),
     type: 'string'
   },
   yAxisMinorTickVisibility: {
     default: 'auto',
-    description: 'Specify whether to show or hide minor tick marks on the y-axis.',
+    description: 'Specify whether to show minor tick marks on the y-axis.',
     pattern: schemaUtils_1.getPattern(['auto', 'show', 'hide']),
     type: 'string'
   },
   y2AxisMinorTickVisibility: {
     default: 'auto',
-    description: 'Specify whether to show or hide minor tick marks on the y2-axis.',
+    description: 'Specify whether to show minor tick marks on the second y-axis.',
     pattern: schemaUtils_1.getPattern(['auto', 'show', 'hide']),
     type: 'string'
   },
   xAxisMaxLabelParts: {
-    description: 'Specify the maximum number of time-parts that a tick label will have (the 3 possible parts are year, month, time).',
+    description: 'Specify the maximum number of time-parts for a tick label. The 3 possible parts are year, month, and time).',
     type: 'number',
     default: 3,
     minimum: 1,
@@ -934,7 +1856,7 @@ exports.optionsSchema = {
   y2AxisScale: {
     type: 'string',
     pattern: schemaUtils_1.getPattern(['linear', 'log']),
-    description: 'Specify the type of scale that applies to a numerical y2-axis.',
+    description: 'Specify the type of scale that applies to a numerical second y-axis.',
     default: 'linear'
   },
   xAxisTitleText: {
@@ -946,36 +1868,41 @@ exports.optionsSchema = {
     type: 'string'
   },
   y2AxisTitleText: {
-    description: 'Specify the title of the y2-axis.',
+    description: 'Specify the title of the second y-axis.',
     type: 'string'
   },
   xAxisTitleVisibility: {
     default: 'show',
-    description: 'Specify whether to show or hide the title of the x-axis.',
+    description: 'Specify whether to show the title of the x-axis.',
+    enum: ['hide', 'show'],
     pattern: schemaUtils_1.getPattern(['show', 'hide']),
     type: 'string'
   },
   yAxisTitleVisibility: {
     default: 'show',
-    description: 'Specify whether to show or hide the title of the y-axis.',
+    description: 'Specify whether to show the title of the y-axis.',
+    enum: ['hide', 'show'],
     pattern: schemaUtils_1.getPattern(['show', 'hide']),
     type: 'string'
   },
   y2AxisTitleVisibility: {
     default: 'show',
-    description: 'Specify whether to show or hide the title of the y2-axis.',
+    description: 'Specify whether to show the title of the second y-axis.',
+    enum: ['hide', 'show'],
     pattern: schemaUtils_1.getPattern(['show', 'hide']),
     type: 'string'
   },
   yAxisAbbreviation: {
     default: 'auto',
-    description: 'Specify whether to abbreviate large y-axis values with the closest SI prefix.',
+    description: 'Specify whether to abbreviate large y-axis values with the closest International System of Units (SI) prefix.',
+    enum: ['auto', 'off'],
     pattern: schemaUtils_1.getPattern(['off', 'auto']),
     type: 'string'
   },
   y2AxisAbbreviation: {
     default: 'auto',
-    description: 'Specify whether to abbreviate large y2-axis values with the closest SI prefix.',
+    description: 'Specify whether to abbreviate large second y-axis values with the closest International System of Units (SI) prefix.',
+    enum: ['auto', 'off'],
     pattern: schemaUtils_1.getPattern(['off', 'auto']),
     type: 'string'
   },
@@ -986,31 +1913,31 @@ exports.optionsSchema = {
   },
   y2AxisMajorTickInterval: {
     default: 'auto',
-    description: 'Specify the spacing unit between major tick marks along the numeric y2-axis.',
+    description: 'Specify the spacing unit between major tick marks along the numeric second y-axis.',
     type: ['number', 'string']
   },
   yAxisMax: {
     type: ['string', 'number'],
-    description: 'Specify the maximum number for the visible y-axis range.',
+    description: 'Specify the largest value for the visible y-axis range.',
     default: 'auto'
   },
   y2AxisMax: {
     type: ['string', 'number'],
-    description: 'Specify the maximum number for the visible y2-axis range.',
+    description: 'Specify the largest value for the visible second y-axis range.',
     default: 'auto'
   },
   yAxisMin: {
     type: ['string', 'number'],
-    description: 'Specify the minimum number for the visible y-axis range.',
+    description: 'Specify the smallest value for the visible y-axis range.',
     default: 'auto'
   },
   y2AxisMin: {
     type: ['string', 'number'],
-    description: 'Specify the minimum number for the visible y2-axis range.',
+    description: 'Specify the smallest value for the visible second y-axis range.',
     default: 'auto'
   },
   overlayFields: {
-    description: 'Specify field(s) that should be differentiated on the chart and displayed as chart overlays.',
+    description: 'Specify one or more fields to differentiate on the chart and display as chart overlays.',
     type: ['array', 'string'],
     items: {
       type: 'string'
@@ -1018,12 +1945,12 @@ exports.optionsSchema = {
   },
   showOverlayY2Axis: {
     default: false,
-    description: 'Enable a y2-axis for chart overlays. All overlay fields will be mapped to a second y-axis.',
+    description: 'Enable a second y-axis for chart overlays. All overlay fields will map to a second y-axis.',
     type: 'boolean'
   },
   showRoundedY2AxisLabels: {
     default: true,
-    description: 'Specify whether to round y2-axis values to the nearest integer.',
+    description: 'Specify whether to round the second y-axis values to the nearest integer.',
     type: 'boolean'
   }
 };
@@ -1038,47 +1965,34 @@ var themes = {
     })(props);
   }
 };
-var editorConfig = [{
-  label: i18n_1._('General'),
-  layout: [BackgroundColor_1.default({
-    themes: themes
-  }), [{
-    label: i18n_1._('Stack Mode'),
-    option: 'stackMode',
-    editor: 'editor.radioBar',
+var editorConfig = [AxesChartDataConfig_1.AxesChartDataConfigAreaColumnLine, AxesChartDataDisplay_1.AxesChartDataDisplayColumn, {
+  label: AxesChartColorAndStyle_1.default.label,
+  layout: [].concat(_toConsumableArray(AxesChartColorAndStyle_1.default.layout), [[{
+    label: i18n_1._('Spacing between column series'),
+    option: 'seriesSpacing',
+    editor: 'editor.number'
+  }], [{
+    label: i18n_1._('Spacing between columns'),
+    option: 'columnSpacing',
+    editor: 'editor.number'
+  }], [{
+    label: i18n_1._('Line width (px)'),
+    option: 'lineWidth',
+    editor: 'editor.slider',
     editorProps: {
-      values: [{
-        icon: BarBeside_1.default,
-        label: i18n_1._('Not stacked'),
-        value: 'auto'
-      }, {
-        icon: BarStacked_1.default,
-        label: i18n_1._('Stacked'),
-        value: 'stacked'
-      }, {
-        icon: BarStacked100_1.default,
-        label: i18n_1._('Stacked 100%'),
-        value: 'stacked100'
-      }]
+      min: 0.5,
+      max: 8.0,
+      step: 0.5
     }
   }], [{
-    label: i18n_1._('Data Values Display'),
-    option: 'dataValuesDisplay',
-    editor: 'editor.radioBar',
+    label: i18n_1._('Annotation colors'),
+    option: 'annotationColor',
+    editor: 'editor.columnSelector',
     editorProps: {
-      values: [{
-        label: i18n_1._('Off'),
-        value: 'off'
-      }, {
-        label: i18n_1._('On'),
-        value: 'all'
-      }, {
-        label: i18n_1._('Min/Max'),
-        value: 'minmax'
-      }]
+      dataSourceKey: 'annotation'
     }
-  }]]
-}, Axes_1.default, Legend_1.default];
+  }]])
+}, AxesChartLegend_1.default, AxesChartXGridAndLabels_1.default, AxesChartYGridAndLabels_1.default, AxesChartY2GridAndLabels_1.default];
 /**
  * visualization configuration
  */