@qrvey/utils 1.10.0-5 → 1.10.0-7

package/dist/cjs/columns/helpers/isNumericalColumn.js

@@ -14,5 +14,7 @@ const NUMERICAL_COLUMNS_1 = require("../constants/NUMERICAL_COLUMNS");
 const isNumericalColumn = (column) => !(0, isEmpty_1.isEmpty)(column) &&
     (0, isObject_1.isObject)(column) &&
     (NUMERICAL_COLUMNS_1.NUMERICAL_COLUMNS.includes(column.type) ||
-        (column.type === COLUMN_1.COLUMN.FORMULA && column.formulaType === FORMULA_1.FORMULA.NUMBER));
+        (column.type === COLUMN_1.COLUMN.FORMULA && column.formulaType === FORMULA_1.FORMULA.NUMBER) ||
+        (column.type === COLUMN_1.COLUMN.AGGREGATED_FORMULA &&
+            column.formulaType === FORMULA_1.FORMULA.NUMBER));
 exports.isNumericalColumn = isNumericalColumn;

package/dist/cjs/general/object/mergeDeep.d.ts

@@ -2,7 +2,13 @@
  * Settings structure of the Merge Deep helper
  */
 interface IMergeDeepSettings {
+    /**
+     * Merging properties that exists in object 2 but not in object 1
+     */
     mergeMissingProperties?: boolean;
+    /**
+     * Merging values on matched object properties. If false, the object 1 values remains as equal.
+     */
     mergeExistingValues?: boolean;
 }
 /**

package/dist/cjs/general/object/mergeDeep.js

@@ -15,22 +15,23 @@ function mergeDeep(obj1, obj2, settings) {
     const defaultSettings = getParamsToMergeDeep(settings);
     if (!isValid(obj1, obj2))
         return (0, objectCopy_1.objectCopy)(obj1);
-    const result = {};
+    const result = Array.isArray(obj1) ? [] : {};
     for (const i in obj1) {
-        if (i != null && i in obj2 && (0, isObject_1.isObject)(obj1[i])) {
+        if ((0, isObject_1.isObject)(obj1[i]) || Array.isArray(obj1[i])) {
             result[i] = mergeDeep(obj1[i], obj2[i], defaultSettings);
         }
+        else if (i in obj2 && defaultSettings.mergeExistingValues) {
+            result[i] = obj2[i];
+        }
         else {
             result[i] = obj1[i];
         }
     }
-    for (const i in obj2) {
-        if (i != null &&
-            ((!(0, isObject_1.isObject)(obj2[i]) &&
-                i in result &&
-                defaultSettings.mergeExistingValues) ||
-                (!(i in result) && defaultSettings.mergeMissingProperties))) {
-            result[i] = obj2[i];
+    if (defaultSettings.mergeMissingProperties) {
+        for (const i in obj2) {
+            if (!(i in result)) {
+                result[i] = obj2[i];
+            }
         }
     }
     return result;
@@ -43,7 +44,8 @@ exports.mergeDeep = mergeDeep;
  * @returns true: they are valid; false: they are not
  */
 function isValid(obj1, obj2) {
-    return (0, isObject_1.isObject)(obj1) && (0, isObject_1.isObject)(obj2);
+    return (((0, isObject_1.isObject)(obj1) && (0, isObject_1.isObject)(obj2)) ||
+        (Array.isArray(obj1) && Array.isArray(obj2)));
 }
 /**
  * Validates and gets the settings with all set parameters.

package/dist/cjs/globalization/labels/panel/I18N_PANEL.js

@@ -18,7 +18,7 @@ exports.I18N_PANEL = {
         invalid_data_for_chart: "No valid data for this chart",
         longer_available_panel: "This panel is no longer available",
         long_text: "long-text",
-        max_buckets_limit: "The combination of data used in this chart exceeds the maximum number of data points that the system can return.<br><br>We recommend you try:<br>• Refining your data with <i>Max Data Points</i> or <i>Filters</i><br>• Using a <i>Date Grouping</i> that returns less data<br>• Using another chart visualization",
+        max_buckets_limit: "The combination of data used in this chart exceeds the maximum number of aggregation buckets allowed in a single response.<br><br>To fix this issue, try the following:<br>• <i>Filter</i> your data<br>• Apply a <i>Date Grouping</i> that returns less data<br>• Use another chart visualization",
         missing_column: "Missing Column.",
         missing_bucket_column: "Missing bucket column.",
         missing_formula_column: "Missing formula column.",

package/dist/columns/helpers/isNumericalColumn.js

@@ -11,4 +11,6 @@ import { NUMERICAL_COLUMNS } from "../constants/NUMERICAL_COLUMNS";
 export const isNumericalColumn = (column) => !isEmpty(column) &&
     isObject(column) &&
     (NUMERICAL_COLUMNS.includes(column.type) ||
-        (column.type === COLUMN.FORMULA && column.formulaType === FORMULA.NUMBER));
+        (column.type === COLUMN.FORMULA && column.formulaType === FORMULA.NUMBER) ||
+        (column.type === COLUMN.AGGREGATED_FORMULA &&
+            column.formulaType === FORMULA.NUMBER));

package/dist/general/object/mergeDeep.d.ts

@@ -2,7 +2,13 @@
  * Settings structure of the Merge Deep helper
  */
 interface IMergeDeepSettings {
+    /**
+     * Merging properties that exists in object 2 but not in object 1
+     */
     mergeMissingProperties?: boolean;
+    /**
+     * Merging values on matched object properties. If false, the object 1 values remains as equal.
+     */
     mergeExistingValues?: boolean;
 }
 /**

package/dist/general/object/mergeDeep.js

@@ -12,22 +12,23 @@ export function mergeDeep(obj1, obj2, settings) {
     const defaultSettings = getParamsToMergeDeep(settings);
     if (!isValid(obj1, obj2))
         return objectCopy(obj1);
-    const result = {};
+    const result = Array.isArray(obj1) ? [] : {};
     for (const i in obj1) {
-        if (i != null && i in obj2 && isObject(obj1[i])) {
+        if (isObject(obj1[i]) || Array.isArray(obj1[i])) {
             result[i] = mergeDeep(obj1[i], obj2[i], defaultSettings);
         }
+        else if (i in obj2 && defaultSettings.mergeExistingValues) {
+            result[i] = obj2[i];
+        }
         else {
             result[i] = obj1[i];
         }
     }
-    for (const i in obj2) {
-        if (i != null &&
-            ((!isObject(obj2[i]) &&
-                i in result &&
-                defaultSettings.mergeExistingValues) ||
-                (!(i in result) && defaultSettings.mergeMissingProperties))) {
-            result[i] = obj2[i];
+    if (defaultSettings.mergeMissingProperties) {
+        for (const i in obj2) {
+            if (!(i in result)) {
+                result[i] = obj2[i];
+            }
         }
     }
     return result;
@@ -39,7 +40,8 @@ export function mergeDeep(obj1, obj2, settings) {
  * @returns true: they are valid; false: they are not
  */
 function isValid(obj1, obj2) {
-    return isObject(obj1) && isObject(obj2);
+    return ((isObject(obj1) && isObject(obj2)) ||
+        (Array.isArray(obj1) && Array.isArray(obj2)));
 }
 /**
  * Validates and gets the settings with all set parameters.

package/dist/globalization/labels/panel/I18N_PANEL.js

@@ -15,7 +15,7 @@ export const I18N_PANEL = {
         invalid_data_for_chart: "No valid data for this chart",
         longer_available_panel: "This panel is no longer available",
         long_text: "long-text",
-        max_buckets_limit: "The combination of data used in this chart exceeds the maximum number of data points that the system can return.<br><br>We recommend you try:<br>• Refining your data with <i>Max Data Points</i> or <i>Filters</i><br>• Using a <i>Date Grouping</i> that returns less data<br>• Using another chart visualization",
+        max_buckets_limit: "The combination of data used in this chart exceeds the maximum number of aggregation buckets allowed in a single response.<br><br>To fix this issue, try the following:<br>• <i>Filter</i> your data<br>• Apply a <i>Date Grouping</i> that returns less data<br>• Use another chart visualization",
         missing_column: "Missing Column.",
         missing_bucket_column: "Missing bucket column.",
         missing_formula_column: "Missing formula column.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.10.0-5",
+  "version": "1.10.0-7",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",