@splunk/visualizations 24.3.2 → 24.3.3

package/ChoroplethSvg.js

@@ -360,7 +360,7 @@ var _typeof = __webpack_require__(20);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.deepMergeWithArrayOverrides = exports.extendStaticWrapperProps = void 0;
+exports.findClosestMatchFromDefaultList = exports.deepMergeWithArrayPrimitiveOverrides = exports.extendStaticWrapperProps = void 0;
 
 var lodash_1 = __webpack_require__(2);
 /**
@@ -386,17 +386,19 @@ var extendStaticWrapperProps = function extendStaticWrapperProps(_ref) {
 exports.extendStaticWrapperProps = extendStaticWrapperProps;
 /**
  * helper to deeply merge objects while preserving arrays in earlier source objects
- * deeply nested primitive keys are merged similarly to lodash's defaultsDeep, while keys with arrays will be preserved if already present in the resultant merged object
- * this prevents default arrays from appending values to user-defined arrays (this occurs if the default array is longer than the user-defined one)
+ * deeply nested primitive keys are merged similarly to lodash's defaultsDeep, while keys with arrays of primitives will be preserved if already present in the resultant merged object
+ * this prevents default arrays of primitives from appending values to user-defined arrays (this occurs if the default array is longer than the user-defined one).
+ * Array of objects gets merged with the defaults, where the defaults can be an array of objects. Closest matching default object from the defaults list based on key - value pair
+ * will be used for merging defaults for each object in the array. If no closest match found, first object in default array list used for merging.
  *
- * @method deepMergeWithArrayOverrides
+ * @method deepMergeWithArrayPrimitiveOverrides
  * @param {Object} initial - target object to merge values into
  * @param {Object[]} sources - other default options to be merged into the resultant object if no explicit value is provided, with earlier args taking precedence over later ones
  *
  * @returns {Object}
  */
 
-var deepMergeWithArrayOverrides = function deepMergeWithArrayOverrides(initial) {
+var deepMergeWithArrayPrimitiveOverrides = function deepMergeWithArrayPrimitiveOverrides(initial) {
   var clone = lodash_1.cloneDeep(initial);
 
   for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -407,18 +409,72 @@ var deepMergeWithArrayOverrides = function deepMergeWithArrayOverrides(initial)
     Object.keys(sourceToApply).forEach(function (sourceKey) {
       if (!Object.prototype.hasOwnProperty.call(clone, sourceKey)) {
         clone[sourceKey] = lodash_1.cloneDeep(sourceToApply[sourceKey]);
-      } // object merging excluding arrays
-
+      }
 
       if (clone[sourceKey] && _typeof(clone[sourceKey]) === 'object' && !Array.isArray(clone[sourceKey]) && _typeof(sourceToApply[sourceKey]) === 'object') {
-        clone[sourceKey] = exports.deepMergeWithArrayOverrides(clone[sourceKey], sourceToApply[sourceKey]);
+        clone[sourceKey] = exports.deepMergeWithArrayPrimitiveOverrides(clone[sourceKey], sourceToApply[sourceKey]);
+      } else if (Array.isArray(clone[sourceKey]) && _typeof(clone[sourceKey][0]) === 'object' && !Array.isArray(clone[sourceKey][0])) {
+        // If option is an array of objects
+        for (var i = 0; i < clone[sourceKey].length; i += 1) {
+          if (_typeof(clone[sourceKey][i]) === 'object') {
+            var closestMatchIdx = exports.findClosestMatchFromDefaultList(sourceToApply[sourceKey], clone[sourceKey][i]);
+
+            if (closestMatchIdx > -1) {
+              clone[sourceKey][i] = exports.deepMergeWithArrayPrimitiveOverrides(clone[sourceKey][i], sourceToApply[sourceKey][closestMatchIdx]);
+            }
+          }
+        }
       }
     });
   });
   return clone;
 };
 
-exports.deepMergeWithArrayOverrides = deepMergeWithArrayOverrides;
+exports.deepMergeWithArrayPrimitiveOverrides = deepMergeWithArrayPrimitiveOverrides;
+/**
+ *  Finds the closest matching object from the list, which has the max same key value pairs.
+ *  Returns the index of match if found, or -1
+ *  For eg :-
+   const list = [{
+        type: "marker",
+        lat: "value1"
+    }, {
+        type: "bubble",
+        size: "value2"
+    }];
+
+    const obj = {
+        type: 'bubble'
+    };
+
+    findClosestMatch(list, obj) -> returns index 1.
+ */
+
+var findClosestMatchFromDefaultList = function findClosestMatchFromDefaultList(searchList, inputObj) {
+  if (!Array.isArray(searchList) || searchList.length === 0) {
+    return -1;
+  }
+
+  var keys = Object.keys(inputObj);
+  var maxMatchCnt = 0;
+  var maxMatchIdx = 0;
+  searchList.forEach(function (item, idx) {
+    var matchCnt = 0;
+    keys.forEach(function (key) {
+      if (item[key] === inputObj[key]) {
+        matchCnt += 1;
+      }
+    });
+
+    if (Math.max(maxMatchCnt, matchCnt) > maxMatchCnt) {
+      maxMatchCnt = matchCnt;
+      maxMatchIdx = idx;
+    }
+  });
+  return maxMatchIdx;
+};
+
+exports.findClosestMatchFromDefaultList = findClosestMatchFromDefaultList;
 
 /***/ }),
 /* 8 */
@@ -520,7 +576,7 @@ var withFixedSizeContainer = function withFixedSizeContainer(Viz) {
 
     return React.createElement(FixSizeItem, {
       "data-test": "fix-size-item",
-      "data-splunk-visualization-version": "24.3.2 - 1cf892b72",
+      "data-splunk-visualization-version": "24.3.3 - 8d441d88c",
       width: width,
       height: height,
       backgroundColor: backgroundColor
@@ -603,7 +659,7 @@ var T = __webpack_require__(0);
 
 var lodash_1 = __webpack_require__(2);
 
-var DataSource_1 = __webpack_require__(33);
+var DataSource_1 = __webpack_require__(34);
 
 exports.SortParamsPropTypes = T.shape({
   currentSortKey: T.string,
@@ -726,6 +782,39 @@ exports.getPaginationParams = getPaginationParams;
 "use strict";
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.pickFieldFromJSONSchema = void 0;
+
+var lodash_1 = __webpack_require__(2);
+
+var pickFieldFromJSONSchema = function pickFieldFromJSONSchema(optionsSchema) {
+  var fieldName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'default';
+  return Object.keys(optionsSchema).reduce(function (accum, k) {
+    if (lodash_1.has(optionsSchema[k], fieldName)) {
+      accum[k] = optionsSchema[k][fieldName];
+    } else if (lodash_1.get(optionsSchema, [k, 'type']) === 'object' && lodash_1.has(optionsSchema[k], 'properties')) {
+      var nestedSchema = exports.pickFieldFromJSONSchema(optionsSchema[k].properties, fieldName);
+
+      if (!lodash_1.isEmpty(nestedSchema)) {
+        accum[k] = nestedSchema;
+      }
+    }
+
+    return accum;
+  }, {});
+};
+
+exports.pickFieldFromJSONSchema = pickFieldFromJSONSchema;
+
+/***/ }),
+/* 26 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -808,7 +897,7 @@ IconPlaceholder.defaultProps = {
 exports.default = FixedSizeContainer_1.default(IconPlaceholder);
 
 /***/ }),
-/* 26 */
+/* 27 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -836,7 +925,7 @@ var VizCategory;
 })(VizCategory = exports.VizCategory || (exports.VizCategory = {}));
 
 /***/ }),
-/* 27 */
+/* 28 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -850,15 +939,15 @@ var React = __webpack_require__(1);
 
 var lodash_1 = __webpack_require__(2);
 
-var getSettingsFromThemedProps_1 = __webpack_require__(28);
+var getSettingsFromThemedProps_1 = __webpack_require__(29);
 
-var Options_1 = __webpack_require__(29);
+var Options_1 = __webpack_require__(30);
 
-var SanitizeProps_1 = __webpack_require__(30);
+var SanitizeProps_1 = __webpack_require__(31);
 
 var styled_components_1 = __webpack_require__(4);
 
-var SplunkVisualization_1 = __webpack_require__(31);
+var SplunkVisualization_1 = __webpack_require__(32);
 
 var VizBehavior_1 = __webpack_require__(5);
 
@@ -866,9 +955,9 @@ var getSorting_1 = __webpack_require__(23);
 
 var getPagination_1 = __webpack_require__(24);
 
-var useDeepMemo_1 = __webpack_require__(34);
+var useDeepMemo_1 = __webpack_require__(35);
 
-var JSONSchemaUtils_1 = __webpack_require__(35);
+var JSONSchemaUtils_1 = __webpack_require__(25);
 
 var MissingPropsMessage_1 = __webpack_require__(36);
 
@@ -930,7 +1019,7 @@ var withDashboardViz = function withDashboardViz(opts) {
       try {
         return Options_1.Options.evaluate({
           context: lodash_1.defaultsDeep({}, context, vizConfig.defaultContext),
-          options: hocUtils_1.deepMergeWithArrayOverrides({}, options, defaultOptions)
+          options: hocUtils_1.deepMergeWithArrayPrimitiveOverrides({}, options, defaultOptions)
         }, dataSources, themeFunc);
       } catch (e) {
         // eslint-disable-next-line no-console
@@ -1060,25 +1149,25 @@ var withDashboardViz = function withDashboardViz(opts) {
 exports.default = withDashboardViz;
 
 /***/ }),
-/* 28 */
+/* 29 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/themes/getSettingsFromThemedProps");
 
 /***/ }),
-/* 29 */
+/* 30 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualization-encoding/Options");
 
 /***/ }),
-/* 30 */
+/* 31 */
 /***/ (function(module, exports) {
 
 module.exports = require("@splunk/visualizations-shared/SanitizeProps");
 
 /***/ }),
-/* 31 */
+/* 32 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1096,7 +1185,7 @@ var T = __webpack_require__(0);
 
 var lodash_1 = __webpack_require__(2);
 
-var VizActionHandler_1 = __webpack_require__(32); // this is identical to the initial height and width we use in BaseVisualization in dashboard-visualizations
+var VizActionHandler_1 = __webpack_require__(33); // this is identical to the initial height and width we use in BaseVisualization in dashboard-visualizations
 
 
 exports.INITIAL_WIDTH = 250;
@@ -1229,7 +1318,7 @@ SplunkVisualization.defaultProps = {
 exports.default = SplunkVisualization;
 
 /***/ }),
-/* 32 */
+/* 33 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1266,7 +1355,7 @@ var DefaultVizActionHandler = /*#__PURE__*/function () {
 exports.DefaultVizActionHandler = DefaultVizActionHandler;
 
 /***/ }),
-/* 33 */
+/* 34 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1279,7 +1368,7 @@ exports.validSortDirs = void 0;
 exports.validSortDirs = ['asc', 'desc', 'none'];
 
 /***/ }),
-/* 34 */
+/* 35 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -1323,39 +1412,6 @@ var useDeepMemo = function useDeepMemo(fn, dependencies) {
 
 exports.useDeepMemo = useDeepMemo;
 
-/***/ }),
-/* 35 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.pickFieldFromJSONSchema = void 0;
-
-var lodash_1 = __webpack_require__(2);
-
-var pickFieldFromJSONSchema = function pickFieldFromJSONSchema(optionsSchema) {
-  var fieldName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'default';
-  return Object.keys(optionsSchema).reduce(function (accum, k) {
-    if (lodash_1.has(optionsSchema[k], fieldName)) {
-      accum[k] = optionsSchema[k][fieldName];
-    } else if (lodash_1.get(optionsSchema, [k, 'type']) === 'object' && lodash_1.has(optionsSchema[k], 'properties')) {
-      var nestedSchema = exports.pickFieldFromJSONSchema(optionsSchema[k].properties, fieldName);
-
-      if (!lodash_1.isEmpty(nestedSchema)) {
-        accum[k] = nestedSchema;
-      }
-    }
-
-    return accum;
-  }, {});
-};
-
-exports.pickFieldFromJSONSchema = pickFieldFromJSONSchema;
-
 /***/ }),
 /* 36 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1458,7 +1514,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': "24.3.2 - 1cf892b72"
+  'data-splunk-visualization-version': "24.3.3 - 8d441d88c"
 }).withConfig({
   displayName: "withEditModeCover__Blocker",
   componentId: "sc-1gsbnxb-1"
@@ -1503,7 +1559,7 @@ var React = __webpack_require__(1);
 
 var colorUtils_1 = __webpack_require__(11);
 
-var IconPlaceholder_1 = __webpack_require__(25);
+var IconPlaceholder_1 = __webpack_require__(26);
 
 var VizBehavior_1 = __webpack_require__(5);
 
@@ -1918,7 +1974,7 @@ var FileDownloader_1 = __webpack_require__(150);
 
 var Downloader_1 = __webpack_require__(151);
 
-var withDashboardViz_1 = __webpack_require__(27);
+var withDashboardViz_1 = __webpack_require__(28);
 
 var PureChoroplethSvg_1 = __webpack_require__(152);
 
@@ -1926,7 +1982,7 @@ var SvgChoroplethDynamic_1 = __webpack_require__(114);
 
 var config_1 = __webpack_require__(157);
 
-var IconPlaceholder_1 = __webpack_require__(25);
+var IconPlaceholder_1 = __webpack_require__(26);
 
 exports.config = config_1.default;
 exports.PureChoroplethSvg = PureChoroplethSvg_1.default; // todo: need remove when deleting @splunk/react-visualizations package
@@ -2382,6 +2438,21 @@ var SvgMutator = /*#__PURE__*/function () {
       var xpath = jexl.evalSync(xpathExpr, context);
       return XPath.evaluate(xpath, doc, resolver, XPathResult.ANY_TYPE, null);
     }
+  }, {
+    key: "getTitle",
+    value: function getTitle(data, i) {
+      var title = '';
+
+      if (data.featureIDs && data.featureIDs[i]) {
+        title += "name: ".concat(data.featureIDs[i]);
+      }
+
+      if (data.values && data.values[i] !== undefined) {
+        title += "\nvalue: ".concat(data.values[i]);
+      }
+
+      return title;
+    }
     /**
      * At this point we have identified an SVG attribute Node that we wish to mutate. That node is passed in here along
      * with the data binding and the data. We have already used the dataBinding's xpath (that is how we found the
@@ -2421,17 +2492,15 @@ var SvgMutator = /*#__PURE__*/function () {
       n.value = computed; // So you may ask...why do we set BOTH the nodeValue and the Attr value. The nodeValue seems to be the one that "shows up" as reflecting the change. We use nodeValue down in addSubtree. Yet XMLSerializer will only see the changes from Attr.value. So what the heck, we use BOTH
       // we also add data-* attributes to the node and a title that behaves like a hover
 
-      var title = '';
       var parent = n.ownerElement;
-
-      if (data.values && data.values[i]) {
-        parent.setAttribute('data-value', data.values[i]);
-        title += "name: ".concat(data.values[i]);
-      }
+      var title = SvgMutator.getTitle(data, i);
 
       if (data.featureIDs && data.featureIDs[i]) {
         parent.setAttribute('data-name', data.featureIDs[i]);
-        title += "\nvalue: ".concat(data.featureIDs[i]);
+      }
+
+      if (data.values && data.values[i] !== undefined) {
+        parent.setAttribute('data-value', data.values[i]);
       }
 
       if (title !== '') {
@@ -2582,7 +2651,7 @@ var VizBehavior_1 = __webpack_require__(5);
 
 var configUtils_1 = __webpack_require__(6);
 
-var VizCategory_1 = __webpack_require__(26);
+var VizCategory_1 = __webpack_require__(27);
 
 var StaticBackgroundColorEditor_1 = __webpack_require__(68);