@splunk/visualizations 25.4.0 → 25.6.0

package/Area.js

@@ -87,7 +87,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 158);
+/******/ 	return __webpack_require__(__webpack_require__.s = 165);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -209,7 +209,7 @@ var React = __webpack_require__(1);
 
 var styled_components_1 = __webpack_require__(4);
 
-var SizeAwareWrapper_1 = __webpack_require__(20);
+var SizeAwareWrapper_1 = __webpack_require__(21);
 
 var style_1 = __webpack_require__(15);
 
@@ -270,7 +270,7 @@ var withFixedSizeContainer = function withFixedSizeContainer(Viz) {
 
     return React.createElement(FixSizeItem, {
       "data-test": "fix-size-item",
-      "data-splunk-visualization-version": "25.4.0 - 6a8a433b8",
+      "data-splunk-visualization-version": "25.6.0 - f5eb3abf9",
       width: width,
       height: height,
       backgroundColor: backgroundColor
@@ -336,6 +336,12 @@ module.exports = require("@splunk/visualizations-shared/schemaUtils");
 
 /***/ }),
 /* 17 */
+/***/ (function(module, exports) {
+
+module.exports = require("@babel/runtime/helpers/slicedToArray");
+
+/***/ }),
+/* 18 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -571,51 +577,58 @@ var insertLayout = function insertLayout(layout, index) {
 exports.insertLayout = insertLayout;
 
 /***/ }),
-/* 18 */,
-/* 19 */
+/* 19 */,
+/* 20 */
 /***/ (function(module, exports) {
 
 module.exports = require("@babel/runtime/helpers/createClass");
 
 /***/ }),
-/* 20 */
+/* 21 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/SizeAwareWrapper");
 
 /***/ }),
-/* 21 */
+/* 22 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/themes/pick");
 
 /***/ }),
-/* 22 */,
-/* 23 */
+/* 23 */,
+/* 24 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualization-context/TimezoneContext");
 
 /***/ }),
-/* 24 */
+/* 25 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/propUtils");
 
 /***/ }),
-/* 25 */
+/* 26 */
+/***/ (function(module, exports) {
+
+module.exports = require("@splunk/visualization-context/FeatureFlagContext");
+
+/***/ }),
+/* 27 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/hocUtils");
 
 /***/ }),
-/* 26 */
+/* 28 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/JSONSchemaUtils");
 
 /***/ }),
-/* 27 */
+/* 29 */,
+/* 30 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -706,7 +719,13 @@ IconPlaceholder.defaultProps = {
 exports.default = FixedSizeContainer_1.default(IconPlaceholder);
 
 /***/ }),
-/* 28 */
+/* 31 */
+/***/ (function(module, exports) {
+
+module.exports = require("@splunk/ui-utils/id");
+
+/***/ }),
+/* 32 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -723,7 +742,7 @@ var T = __webpack_require__(0);
 
 var lodash_1 = __webpack_require__(3);
 
-var DataSource_1 = __webpack_require__(39);
+var DataSource_1 = __webpack_require__(43);
 
 exports.SortParamsPropTypes = T.shape({
   currentSortKey: T.string,
@@ -776,7 +795,7 @@ var getSortingParams = function getSortingParams(_ref) {
 exports.getSortingParams = getSortingParams;
 
 /***/ }),
-/* 29 */
+/* 33 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -840,8 +859,7 @@ var getPaginationParams = function getPaginationParams(_ref) {
 exports.getPaginationParams = getPaginationParams;
 
 /***/ }),
-/* 30 */,
-/* 31 */
+/* 34 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -869,12 +887,14 @@ var VizCategory;
 })(VizCategory = exports.VizCategory || (exports.VizCategory = {}));
 
 /***/ }),
-/* 32 */
+/* 35 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
+var _slicedToArray = __webpack_require__(17);
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -883,44 +903,51 @@ var React = __webpack_require__(1);
 
 var lodash_1 = __webpack_require__(3);
 
-var getSettingsFromThemedProps_1 = __webpack_require__(33);
+var getSettingsFromThemedProps_1 = __webpack_require__(36);
 
-var Options_1 = __webpack_require__(34);
+var Options_1 = __webpack_require__(37);
 
-var SanitizeProps_1 = __webpack_require__(35);
+var SanitizeProps_1 = __webpack_require__(38);
 
-var TimezoneContext_1 = __webpack_require__(23);
+var TimezoneContext_1 = __webpack_require__(24);
 
-var moment_1 = __webpack_require__(36);
+var moment_1 = __webpack_require__(39);
+
+var FeatureFlagContext_1 = __webpack_require__(26);
 
 var styled_components_1 = __webpack_require__(4);
 
-var hocUtils_1 = __webpack_require__(25);
+var hocUtils_1 = __webpack_require__(27);
+
+var JSONSchemaUtils_1 = __webpack_require__(28);
 
-var JSONSchemaUtils_1 = __webpack_require__(26);
+var async_dynamic_options_evaluator_1 = __webpack_require__(40);
 
-var SplunkVisualization_1 = __webpack_require__(37);
+var id_1 = __webpack_require__(31);
+
+var SplunkVisualization_1 = __webpack_require__(41);
 
 var VizBehavior_1 = __webpack_require__(6);
 
-var getSorting_1 = __webpack_require__(28);
+var getSorting_1 = __webpack_require__(32);
+
+var getPagination_1 = __webpack_require__(33);
 
-var getPagination_1 = __webpack_require__(29);
+var useDeepMemo_1 = __webpack_require__(44);
 
-var useDeepMemo_1 = __webpack_require__(40);
+var MissingPropsMessage_1 = __webpack_require__(45);
 
-var MissingPropsMessage_1 = __webpack_require__(41);
+var withEditModeCover_1 = __webpack_require__(46);
 
-var withEditModeCover_1 = __webpack_require__(42);
+var withPlaceholder_1 = __webpack_require__(47);
 
-var withPlaceholder_1 = __webpack_require__(43);
+var UUID = id_1.createGUID();
 /**
  * hoc that wraps a pure react visualization in a Dashboard visualization
  * @param {DashboardVizOpts} opts
  * @returns {HOC}
  */
 
-
 var withDashboardViz = function withDashboardViz(opts) {
   var ReactViz = opts.ReactViz,
       vizConfig = opts.vizConfig,
@@ -980,28 +1007,76 @@ var withDashboardViz = function withDashboardViz(opts) {
 
     var evaluatedOptions = {}; // evaluatedOptions need to be initialized as an empty object
 
+    var _React$useState = React.useState({}),
+        _React$useState2 = _slicedToArray(_React$useState, 2),
+        evaluatedOptionsAsync = _React$useState2[0],
+        setEvaluatedOptionsAsync = _React$useState2[1]; // evaluatedOptions need to be initialized as an empty object
+
+
+    var featureFlagContext = React.useContext(FeatureFlagContext_1.default);
+
+    var _React$useState3 = React.useState("".concat(vizConfig.name, " - ").concat(UUID)),
+        _React$useState4 = _slicedToArray(_React$useState3, 1),
+        visualizationID = _React$useState4[0];
+
+    var _React$useState5 = React.useState(Boolean(featureFlagContext && featureFlagContext['visualizations.useWebWorkersForDSL'] && typeof Worker !== 'undefined')),
+        _React$useState6 = _slicedToArray(_React$useState5, 2),
+        useAsyncEvaluatedOptions = _React$useState6[0],
+        setUseAsyncEvaluatedOptions = _React$useState6[1];
+
     evaluatedOptions = useDeepMemo_1.useDeepMemo(function () {
       try {
-        return Options_1.Options.evaluate({
-          context: lodash_1.defaultsDeep({}, context, vizConfig.defaultContext),
-          options: hocUtils_1.deepMergeWithArrayPrimitiveOverrides({}, options, defaultOptions)
-        }, dataSources, themeFunc);
+        if (useAsyncEvaluatedOptions) {
+          var optionsToEvaluate = {
+            context: lodash_1.defaultsDeep({}, context, vizConfig.defaultContext),
+            options: hocUtils_1.deepMergeWithArrayPrimitiveOverrides({}, options, defaultOptions)
+          };
+          var asyncDynamicOptionsEvaluatorParams = {
+            visualizationID: visualizationID,
+            props: props,
+            options: optionsToEvaluate,
+            dataSources: dataSources,
+            theme: vizConfig.themes
+          };
+          async_dynamic_options_evaluator_1.default.evaluate(asyncDynamicOptionsEvaluatorParams).then(function (results) {
+            setEvaluatedOptionsAsync(results.results);
+          }).catch(function (e) {
+            // eslint-disable-next-line no-console
+            console.error("unexpected error evaluating options - async: ".concat(e.message));
+            setUseAsyncEvaluatedOptions(false);
+          });
+        } else {
+          return Options_1.Options.evaluate({
+            context: lodash_1.defaultsDeep({}, context, vizConfig.defaultContext),
+            options: hocUtils_1.deepMergeWithArrayPrimitiveOverrides({}, options, defaultOptions)
+          }, dataSources, themeFunc);
+        }
       } catch (e) {
         // eslint-disable-next-line no-console
-        console.error("unexpected error evaluating options:  + ".concat(e.message));
+        console.error("unexpected error evaluating options: ".concat(e.message));
         return {};
       }
-    }, [currentThemeFamily, currentThemeColorScheme, currentThemeDensity, options, context, dataSources, serializedTimezone]); // useEffect hook needs to be initialized before any early returns
+
+      return {};
+    }, [currentThemeFamily, currentThemeColorScheme, currentThemeDensity, options, context, dataSources, serializedTimezone, useAsyncEvaluatedOptions]);
+    var evaluatedOptionsToUse = !useAsyncEvaluatedOptions ? evaluatedOptions : evaluatedOptionsAsync; // useEffect hook needs to be initialized before any early returns
     // this is in accordance with the order of hook calls being the same on each render https://reactjs.org/docs/hooks-rules.html#explanation
 
     React.useEffect(function () {
-      onComputedProps(evaluatedOptions);
-    }); // present warning message if any required props are missing
+      onComputedProps(evaluatedOptionsToUse);
+    });
+    React.useEffect(function () {
+      return function () {
+        if (useAsyncEvaluatedOptions) {
+          async_dynamic_options_evaluator_1.default.reset(visualizationID);
+        }
+      }; // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []); // present warning message if any required props are missing
 
     var _vizConfig$requiredPr = vizConfig.requiredProps,
         requiredProps = _vizConfig$requiredPr === void 0 ? [] : _vizConfig$requiredPr,
         supports = vizConfig.supports;
-    var missing = MissingPropsMessage_1.missingKeys(requiredProps, evaluatedOptions);
+    var missing = MissingPropsMessage_1.missingKeys(requiredProps, evaluatedOptionsToUse);
 
     if (missing.length > 0 && supports.includes(VizBehavior_1.VizBehavior.PLACEHOLDER)) {
       return React.createElement(MissingPropsMessage_1.default, {
@@ -1028,7 +1103,7 @@ var withDashboardViz = function withDashboardViz(opts) {
 
         if (Array.isArray(payloadKeys) && payloadKeys.length) {
           payloadKeys.forEach(function (p) {
-            payload[p] = evaluatedOptions[p];
+            payload[p] = evaluatedOptionsToUse[p];
           });
         }
 
@@ -1047,7 +1122,7 @@ var withDashboardViz = function withDashboardViz(opts) {
     } // compute pure viz props which are not from options
 
 
-    var computedVizProps = computeVizProps(Object.assign(Object.assign(Object.assign(Object.assign({}, props), evaluatedOptions), eventCallbackProps), {
+    var computedVizProps = computeVizProps(Object.assign(Object.assign(Object.assign(Object.assign({}, props), evaluatedOptionsToUse), eventCallbackProps), {
       themeFunc: themeFunc
     }));
     /**
@@ -1067,7 +1142,7 @@ var withDashboardViz = function withDashboardViz(opts) {
 
     var dataSourceMetadata = {};
     var OptionKey = 'paginateDataSourceKey';
-    var paginateDataSourceKey = lodash_1.has(evaluatedOptions, OptionKey) && evaluatedOptions[OptionKey] || 'primary';
+    var paginateDataSourceKey = lodash_1.has(evaluatedOptionsToUse, OptionKey) && evaluatedOptionsToUse[OptionKey] || 'primary';
 
     if (vizConfig.supports.indexOf(VizBehavior_1.VizBehavior.PAGE_AND_SORT) > -1 && lodash_1.has(dataSources, paginateDataSourceKey)) {
       var requestParams = lodash_1.get(dataSources, [paginateDataSourceKey, 'requestParams'], {});
@@ -1097,7 +1172,7 @@ var withDashboardViz = function withDashboardViz(opts) {
       mode: mode,
       width: width,
       height: height
-    }, evaluatedOptions, computedVizProps, eventCallbackProps, dataSourceMetadata));
+    }, evaluatedOptionsToUse, computedVizProps, eventCallbackProps, dataSourceMetadata));
   };
 
   DashboardViz.propTypes = Object.assign(Object.assign({}, SplunkVisualization_1.default.propTypes), ReactViz.propTypes);
@@ -1114,31 +1189,37 @@ var withDashboardViz = function withDashboardViz(opts) {
 exports.default = withDashboardViz;
 
 /***/ }),
-/* 33 */
+/* 36 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/themes/getSettingsFromThemedProps");
 
 /***/ }),
-/* 34 */
+/* 37 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualization-encoding/Options");
 
 /***/ }),
-/* 35 */
+/* 38 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/SanitizeProps");
 
 /***/ }),
-/* 36 */
+/* 39 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/moment");
 
 /***/ }),
-/* 37 */
+/* 40 */
+/***/ (function(module, exports) {
+
+module.exports = require("@splunk/async-dynamic-options-evaluator");
+
+/***/ }),
+/* 41 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1156,7 +1237,7 @@ var T = __webpack_require__(0);
 
 var lodash_1 = __webpack_require__(3);
 
-var VizActionHandler_1 = __webpack_require__(38); // this is identical to the initial height and width we use in BaseVisualization in dashboard-visualizations
+var VizActionHandler_1 = __webpack_require__(42); // this is identical to the initial height and width we use in BaseVisualization in dashboard-visualizations
 
 
 exports.INITIAL_WIDTH = 250;
@@ -1289,7 +1370,7 @@ SplunkVisualization.defaultProps = {
 exports.default = SplunkVisualization;
 
 /***/ }),
-/* 38 */
+/* 42 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1297,7 +1378,7 @@ exports.default = SplunkVisualization;
 
 var _classCallCheck = __webpack_require__(11);
 
-var _createClass = __webpack_require__(19);
+var _createClass = __webpack_require__(20);
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -1326,7 +1407,7 @@ var DefaultVizActionHandler = /*#__PURE__*/function () {
 exports.DefaultVizActionHandler = DefaultVizActionHandler;
 
 /***/ }),
-/* 39 */
+/* 43 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1339,7 +1420,7 @@ exports.validSortDirs = void 0;
 exports.validSortDirs = ['asc', 'desc', 'none'];
 
 /***/ }),
-/* 40 */
+/* 44 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1384,7 +1465,7 @@ var useDeepMemo = function useDeepMemo(fn, dependencies) {
 exports.useDeepMemo = useDeepMemo;
 
 /***/ }),
-/* 41 */
+/* 45 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1464,7 +1545,7 @@ exports.MissingPropsMessage.defaultProps = {
 exports.default = FixedSizeContainer_1.default(exports.MissingPropsMessage);
 
 /***/ }),
-/* 42 */
+/* 46 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1485,7 +1566,7 @@ var Cover = styled_components_1.default.div.withConfig({
   componentId: "sc-1gsbnxb-0"
 })(["position:absolute;left:0;right:0;top:0;bottom:0;"]);
 var Blocker = styled_components_1.default.div.attrs({
-  'data-splunk-visualization-version': "25.4.0 - 6a8a433b8"
+  'data-splunk-visualization-version': "25.6.0 - f5eb3abf9"
 }).withConfig({
   displayName: "withEditModeCover__Blocker",
   componentId: "sc-1gsbnxb-1"
@@ -1516,7 +1597,7 @@ var withEditModeCover = function withEditModeCover(Visualization, disableEditMod
 exports.default = withEditModeCover;
 
 /***/ }),
-/* 43 */
+/* 47 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1532,7 +1613,7 @@ var colorUtils_1 = __webpack_require__(12);
 
 var variables_1 = __webpack_require__(9);
 
-var IconPlaceholder_1 = __webpack_require__(27);
+var IconPlaceholder_1 = __webpack_require__(30);
 
 var VizBehavior_1 = __webpack_require__(6);
 
@@ -1580,28 +1661,27 @@ var withPlaceholder = function withPlaceholder(Visualization) {
 exports.default = withPlaceholder;
 
 /***/ }),
-/* 44 */
+/* 48 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualization-icons/placeholders");
 
 /***/ }),
-/* 45 */,
-/* 46 */
+/* 49 */,
+/* 50 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualization-color-palettes");
 
 /***/ }),
-/* 47 */
+/* 51 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualization-icons");
 
 /***/ }),
-/* 48 */,
-/* 49 */,
-/* 50 */
+/* 52 */,
+/* 53 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1631,8 +1711,8 @@ var background = function background(_ref) {
 exports.default = background;
 
 /***/ }),
-/* 51 */,
-/* 52 */
+/* 54 */,
+/* 55 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1853,15 +1933,15 @@ var constructFieldsAndColumns = function constructFieldsAndColumns(_ref2) {
 exports.constructFieldsAndColumns = constructFieldsAndColumns;
 
 /***/ }),
-/* 53 */
+/* 56 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/charting-bundle");
 
 /***/ }),
-/* 54 */,
-/* 55 */,
-/* 56 */
+/* 57 */,
+/* 58 */,
+/* 59 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1877,7 +1957,7 @@ var lodash_1 = __webpack_require__(3);
 
 var i18n_1 = __webpack_require__(2);
 
-var visualization_color_palettes_1 = __webpack_require__(46);
+var visualization_color_palettes_1 = __webpack_require__(50);
 
 var react_1 = __webpack_require__(1);
 
@@ -1885,14 +1965,14 @@ var React = __webpack_require__(1);
 
 var T = __webpack_require__(0);
 
-var react_event_listener_1 = __webpack_require__(57);
+var react_event_listener_1 = __webpack_require__(60);
 
-__webpack_require__(58); // fixme, @splunk/charting should be refactor to use locale & timezone instead of i18n functions
+__webpack_require__(61); // fixme, @splunk/charting should be refactor to use locale & timezone instead of i18n functions
 
 
-var charting_bundle_1 = __webpack_require__(53);
+var charting_bundle_1 = __webpack_require__(56);
 
-var TimezoneContext_1 = __webpack_require__(23);
+var TimezoneContext_1 = __webpack_require__(24);
 
 var style_1 = __webpack_require__(15);
 
@@ -1900,11 +1980,11 @@ var styled_components_1 = __webpack_require__(4);
 
 var Message_1 = __webpack_require__(10);
 
-var useSplunkTheme_1 = __webpack_require__(59);
+var useSplunkTheme_1 = __webpack_require__(62);
 
-var themeUtils_1 = __webpack_require__(60);
+var themeUtils_1 = __webpack_require__(63);
 
-var ChartingApi_1 = __webpack_require__(61);
+var ChartingApi_1 = __webpack_require__(64);
 
 exports.NO_INPLACE_PROPS = ['chart', 'chart.orientation', 'layout.splitSeries', 'chart.style', 'legend.placement'];
 
@@ -2283,31 +2363,31 @@ var withEmptyChartMessage = function withEmptyChartMessage(Chart) {
 exports.default = withEmptyChartMessage(Charting);
 
 /***/ }),
-/* 57 */
+/* 60 */
 /***/ (function(module, exports) {
 
 module.exports = require("react-event-listener");
 
 /***/ }),
-/* 58 */
+/* 61 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/i18n");
 
 /***/ }),
-/* 59 */
+/* 62 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/themes/useSplunkTheme");
 
 /***/ }),
-/* 60 */
+/* 63 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/themeUtils");
 
 /***/ }),
-/* 61 */
+/* 64 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -2315,7 +2395,7 @@ module.exports = require("@splunk/visualizations-shared/themeUtils");
 
 var _classCallCheck = __webpack_require__(11);
 
-var _createClass = __webpack_require__(19);
+var _createClass = __webpack_require__(20);
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -2375,14 +2455,14 @@ var ChartingApiFunctional = /*#__PURE__*/function () {
 exports.ChartingApiFunctional = ChartingApiFunctional;
 
 /***/ }),
-/* 62 */
+/* 65 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/simpleXMLOptions");
 
 /***/ }),
-/* 63 */,
-/* 64 */
+/* 66 */,
+/* 67 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -2397,7 +2477,7 @@ exports.AxesChartDataConfigAreaColumnLine = exports.AxesChartDataConfigBubble =
 
 var i18n_1 = __webpack_require__(2);
 
-var configUtils_1 = __webpack_require__(17);
+var configUtils_1 = __webpack_require__(18);
 
 var AxesChartDataConfig = {
   label: i18n_1._('Data configurations'),
@@ -2406,7 +2486,9 @@ var AxesChartDataConfig = {
     option: 'x',
     editor: 'editor.columnSelector',
     editorProps: {
-      dataSourceKey: 'primary'
+      dataSourceKey: 'primary',
+      supportsDSL: true,
+      expectedDataPrimitive: ['series']
     }
   }], [{
     label: i18n_1._('Y'),
@@ -2414,7 +2496,9 @@ var AxesChartDataConfig = {
     editor: 'editor.columnMultiSelector',
     editorProps: {
       dataSourceKey: 'primary',
-      filterByTypes: ['number']
+      filterByTypes: ['number'],
+      supportsDSL: true,
+      expectedDataPrimitive: ['series', 'frame']
     }
   }], [{
     label: i18n_1._('Result limit'),
@@ -2434,7 +2518,9 @@ exports.AxesChartDataConfigBar = {
     editor: 'editor.columnMultiSelector',
     editorProps: {
       dataSourceKey: 'primary',
-      filterByTypes: ['number']
+      filterByTypes: ['number'],
+      supportsDSL: true,
+      expectedDataPrimitive: ['series', 'frame']
     }
   }])
 };
@@ -2445,7 +2531,9 @@ exports.AxesChartDataConfigScatter = {
     option: 'x',
     editor: 'editor.columnSelector',
     editorProps: {
-      dataSourceKey: 'primary'
+      dataSourceKey: 'primary',
+      supportsDSL: true,
+      expectedDataPrimitive: ['series']
     }
   }], [{
     label: i18n_1._('Y'),
@@ -2453,14 +2541,18 @@ exports.AxesChartDataConfigScatter = {
     editor: 'editor.columnSelector',
     editorProps: {
       dataSourceKey: 'primary',
-      filterByTypes: ['number']
+      filterByTypes: ['number'],
+      supportsDSL: true,
+      expectedDataPrimitive: ['series']
     }
   }], [{
     label: i18n_1._('Category'),
     option: 'category',
     editor: 'editor.columnSelector',
     editorProps: {
-      dataSourceKey: 'primary'
+      dataSourceKey: 'primary',
+      supportsDSL: true,
+      expectedDataPrimitive: ['series']
     }
   }], [{
     label: i18n_1._('Result limit'),
@@ -2479,7 +2571,9 @@ exports.AxesChartDataConfigBubble = {
     option: 'size',
     editor: 'editor.columnSelector',
     editorProps: {
-      dataSourceKey: 'primary'
+      dataSourceKey: 'primary',
+      supportsDSL: true,
+      expectedDataPrimitive: ['series']
     }
   }])
 };
@@ -2490,21 +2584,25 @@ exports.AxesChartDataConfigAreaColumnLine = {
     option: 'annotationX',
     editor: 'editor.columnSelector',
     editorProps: {
-      dataSourceKey: 'annotation'
+      dataSourceKey: 'annotation',
+      supportsDSL: true,
+      expectedDataPrimitive: ['series']
     }
   }], [{
     label: i18n_1._('Annotation labels'),
     option: 'annotationLabel',
     editor: 'editor.columnSelector',
     editorProps: {
-      dataSourceKey: 'annotation'
+      dataSourceKey: 'annotation',
+      supportsDSL: true,
+      expectedDataPrimitive: ['series']
     }
   }]])
 };
 exports.default = AxesChartDataConfig;
 
 /***/ }),
-/* 65 */
+/* 68 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -2516,11 +2614,11 @@ Object.defineProperty(exports, "__esModule", {
 
 var i18n_1 = __webpack_require__(2);
 
-var pick_1 = __webpack_require__(21);
+var pick_1 = __webpack_require__(22);
 
 var variables_1 = __webpack_require__(9);
 
-var BackgroundColor_1 = __webpack_require__(50);
+var BackgroundColor_1 = __webpack_require__(53);
 
 var themes = {
   defaultBackgroundColor: function defaultBackgroundColor(props) {
@@ -2550,7 +2648,7 @@ var AxesChartColorAndStyle = {
 exports.default = AxesChartColorAndStyle;
 
 /***/ }),
-/* 66 */
+/* 69 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -2614,7 +2712,7 @@ var AxesChartLegend = {
 exports.default = AxesChartLegend;
 
 /***/ }),
-/* 67 */
+/* 70 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -2629,7 +2727,7 @@ exports.AxesChartXGridAndLabelsBubbleScatter = exports.AxesChartXGridAndLabelsCo
 
 var i18n_1 = __webpack_require__(2);
 
-var configUtils_1 = __webpack_require__(17);
+var configUtils_1 = __webpack_require__(18);
 
 exports.AxesChartXGridAndLabelsCommon = {
   label: i18n_1._('X-axis grid and labels'),
@@ -2902,7 +3000,7 @@ exports.AxesChartXGridAndLabelsBubbleScatter = {
 exports.default = AxesChartXGridAndLabels;
 
 /***/ }),
-/* 68 */
+/* 71 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -3064,14 +3162,14 @@ var AxesChartYGridAndLabels = {
 exports.default = AxesChartYGridAndLabels;
 
 /***/ }),
-/* 69 */,
-/* 70 */,
-/* 71 */,
 /* 72 */,
 /* 73 */,
 /* 74 */,
 /* 75 */,
-/* 76 */
+/* 76 */,
+/* 77 */,
+/* 78 */,
+/* 79 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -3088,7 +3186,7 @@ var i18n_1 = __webpack_require__(2);
 
 var lodash_1 = __webpack_require__(3);
 
-var configUtils_1 = __webpack_require__(17);
+var configUtils_1 = __webpack_require__(18);
 
 exports.AxesChartDataDisplayLine = {
   label: i18n_1._('Data display'),
@@ -3209,7 +3307,7 @@ exports.AxesChartDataDisplayColumn = {
 exports.default = AxesChartDataDisplay;
 
 /***/ }),
-/* 77 */
+/* 80 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -3383,9 +3481,6 @@ var axesChartY2GridAndLabels = {
 exports.default = axesChartY2GridAndLabels;
 
 /***/ }),
-/* 78 */,
-/* 79 */,
-/* 80 */,
 /* 81 */,
 /* 82 */,
 /* 83 */,
@@ -3431,7 +3526,13 @@ exports.default = axesChartY2GridAndLabels;
 /* 123 */,
 /* 124 */,
 /* 125 */,
-/* 126 */
+/* 126 */,
+/* 127 */,
+/* 128 */,
+/* 129 */,
+/* 130 */,
+/* 131 */,
+/* 132 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -3459,21 +3560,21 @@ var lodash_1 = __webpack_require__(3); // Charting imports i18n which needs to b
 // eslint-disable-next-line import/order
 
 
-var Charting_1 = __webpack_require__(56);
+var Charting_1 = __webpack_require__(59);
 
-var charting_bundle_1 = __webpack_require__(53);
+var charting_bundle_1 = __webpack_require__(56);
 
-var simpleXMLOptions_1 = __webpack_require__(62);
+var simpleXMLOptions_1 = __webpack_require__(65);
 
-var config_1 = __webpack_require__(159);
+var config_1 = __webpack_require__(166);
 
 exports.config = config_1.default;
 
-var withDashboardViz_1 = __webpack_require__(32);
+var withDashboardViz_1 = __webpack_require__(35);
 
-var areaUtils_1 = __webpack_require__(160);
+var areaUtils_1 = __webpack_require__(167);
 
-var chartingUtils_1 = __webpack_require__(52);
+var chartingUtils_1 = __webpack_require__(55);
 
 var validOptions = Object.keys(config_1.default.optionsSchema);
 
@@ -3547,12 +3648,6 @@ exports.themes = themes;
 exports.default = Area;
 
 /***/ }),
-/* 127 */,
-/* 128 */,
-/* 129 */,
-/* 130 */,
-/* 131 */,
-/* 132 */,
 /* 133 */,
 /* 134 */,
 /* 135 */,
@@ -3578,7 +3673,14 @@ exports.default = Area;
 /* 155 */,
 /* 156 */,
 /* 157 */,
-/* 158 */
+/* 158 */,
+/* 159 */,
+/* 160 */,
+/* 161 */,
+/* 162 */,
+/* 163 */,
+/* 164 */,
+/* 165 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -3608,9 +3710,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-__exportStar(__webpack_require__(126), exports);
+__exportStar(__webpack_require__(132), exports);
 
-var Area_1 = __webpack_require__(126);
+var Area_1 = __webpack_require__(132);
 
 Object.defineProperty(exports, "default", {
   enumerable: true,
@@ -3620,7 +3722,7 @@ Object.defineProperty(exports, "default", {
 });
 
 /***/ }),
-/* 159 */
+/* 166 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -3632,39 +3734,39 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var visualization_icons_1 = __webpack_require__(47);
+var visualization_icons_1 = __webpack_require__(51);
 
-var placeholders_1 = __webpack_require__(44);
+var placeholders_1 = __webpack_require__(48);
 
 var schemaUtils_1 = __webpack_require__(16);
 
-var visualization_color_palettes_1 = __webpack_require__(46);
+var visualization_color_palettes_1 = __webpack_require__(50);
 
 var i18n_1 = __webpack_require__(2);
 
-var pick_1 = __webpack_require__(21);
+var pick_1 = __webpack_require__(22);
 
 var variables_1 = __webpack_require__(9);
 
 var VizBehavior_1 = __webpack_require__(6);
 
-var VizCategory_1 = __webpack_require__(31);
+var VizCategory_1 = __webpack_require__(34);
 
-var configUtils_1 = __webpack_require__(17);
+var configUtils_1 = __webpack_require__(18);
 
-var AxesChartDataConfig_1 = __webpack_require__(64);
+var AxesChartDataConfig_1 = __webpack_require__(67);
 
-var AxesChartDataDisplay_1 = __webpack_require__(76);
+var AxesChartDataDisplay_1 = __webpack_require__(79);
 
-var AxesChartColorAndStyle_1 = __webpack_require__(65);
+var AxesChartColorAndStyle_1 = __webpack_require__(68);
 
-var AxesChartLegend_1 = __webpack_require__(66);
+var AxesChartLegend_1 = __webpack_require__(69);
 
-var AxesChartXGridAndLabels_1 = __webpack_require__(67);
+var AxesChartXGridAndLabels_1 = __webpack_require__(70);
 
-var AxesChartYGridAndLabels_1 = __webpack_require__(68);
+var AxesChartYGridAndLabels_1 = __webpack_require__(71);
 
-var AxesChartY2GridAndLabels_1 = __webpack_require__(77);
+var AxesChartY2GridAndLabels_1 = __webpack_require__(80);
 
 var dataContract = {
   requiredDataSources: [{
@@ -4143,7 +4245,9 @@ var editorConfig = [AxesChartDataConfig_1.AxesChartDataConfigAreaColumnLine, Axe
     option: 'annotationColor',
     editor: 'editor.columnSelector',
     editorProps: {
-      dataSourceKey: 'annotation'
+      dataSourceKey: 'annotation',
+      supportsDSL: true,
+      expectedDataPrimitive: ['series']
     }
   }]])
 }, {
@@ -4266,7 +4370,7 @@ var config = {
 exports.default = configUtils_1.enhanceConfig(config);
 
 /***/ }),
-/* 160 */
+/* 167 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -4279,9 +4383,9 @@ exports.convertToAreaSCProperties = exports.mapToOldKey = exports.convertToStrin
 
 var lodash_1 = __webpack_require__(3);
 
-var propUtils_1 = __webpack_require__(24);
+var propUtils_1 = __webpack_require__(25);
 
-var chartingUtils_1 = __webpack_require__(52); // map for key names which are either new or not present in SimpleXML options mapping
+var chartingUtils_1 = __webpack_require__(55); // map for key names which are either new or not present in SimpleXML options mapping
 
 
 var areaOptionsSCMapping = {