@qrvey/utils 1.16.1-5 → 1.16.1-7

package/dist/charts/interfaces/IChartV2.d.ts

@@ -72,7 +72,7 @@ export interface VisualizationTableMenu {
     filtering: boolean;
     column_resizing: boolean;
     column_arrangement: boolean;
-    grouping_column_update: boolean;
+    columnGrouping: boolean;
     column_update: boolean;
     change_aggregation: boolean;
 }

package/dist/cjs/charts/interfaces/IChartV2.d.ts

@@ -72,7 +72,7 @@ export interface VisualizationTableMenu {
     filtering: boolean;
     column_resizing: boolean;
     column_arrangement: boolean;
-    grouping_column_update: boolean;
+    columnGrouping: boolean;
     column_update: boolean;
     change_aggregation: boolean;
 }

package/dist/cjs/filters/helpers/OLD_getAggFilters.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAggFilters = void 0;
-const COLUMN_1 = require("../../columns/constants/COLUMN");
 const isEmpty_1 = require("../../general/mix/isEmpty");
-const objectCopy_1 = require("../../general/object/objectCopy");
 const get_1 = require("../../general/object/get");
-const FILTER_OPERATOR_1 = require("../constants/common/FILTER_OPERATOR");
+const objectCopy_1 = require("../../general/object/objectCopy");
+const traverseTree_1 = require("../../general/object/traverseTree");
+const adapters_1 = require("../adapters");
 /**
  * @deprecated soon
  * @param logics
@@ -14,33 +14,26 @@ const FILTER_OPERATOR_1 = require("../constants/common/FILTER_OPERATOR");
  */
 function getAggFilters(logics = [], summaries = []) {
     const aggregateFilters = getAggregateFilters(logics);
-    const aggFilters = aggregateFilters
-        .map((aggFilter) => {
-        const expressions = getExpressionsInLogic([aggFilter]);
-        return (expressions &&
-            expressions.length && {
-            operator: FILTER_OPERATOR_1.FILTER_OPERATOR.OR,
-            expressions: expressions
-                .map((expression) => {
-                const summaryIndex = summaries.findIndex((summary) => expression.questionid === summary.questionid &&
-                    expression.qrveyid === summary.qrveyid &&
-                    (0, get_1._get)(expression.uiExtras.column, "aggregate") ===
-                        summary.aggregate);
-                if (summaryIndex > -1 ||
-                    expression.questionType === COLUMN_1.COLUMN.AGGREGATED_FORMULA) {
-                    return {
-                        enabled: expression.enabled,
-                        summaryIndex,
-                        validationType: expression.validationType,
-                        value: expression.value,
-                    };
-                }
-            })
-                .filter(Boolean),
-        });
-    })
-        .filter((aggFilter) => aggFilter && aggFilter.expressions && aggFilter.expressions.length);
-    return aggFilters && concatAggFilters(aggFilters);
+    const logic = (0, objectCopy_1.objectCopy)((0, adapters_1.FDToLogic)((0, adapters_1.adaptFilterData)({ logic: aggregateFilters })));
+    if ((0, isEmpty_1.isEmpty)(logic) || (0, isEmpty_1.isEmpty)(logic[0].filters))
+        return;
+    (0, traverseTree_1.traverseTree)({
+        root: logic[0].filters,
+        getChildren: (node) => node.expressions,
+        isLeaf: (node) => !("operator" in node),
+        onLeaf: (expression) => {
+            const { enabled, validationType, value } = expression;
+            const summaryIndex = getIndexByExpression(expression, summaries);
+            Object.keys(expression).forEach((key) => {
+                delete expression[key];
+            });
+            expression.enabled = enabled;
+            expression.summaryIndex = summaryIndex;
+            expression.validationType = validationType;
+            expression.value = value;
+        },
+    });
+    return logic[0].filters[0];
 }
 exports.getAggFilters = getAggFilters;
 /**
@@ -69,23 +62,13 @@ function getAggregateFilters(logics = []) {
         return newLogics;
     }, []);
 }
-function concatAggFilters(aggFilters, operator = FILTER_OPERATOR_1.FILTER_OPERATOR.AND) {
-    const expressions = aggFilters.filter(Boolean);
-    if (!expressions.length)
-        return undefined;
-    else if (expressions.length === 1)
-        return expressions[0];
-    return {
-        operator,
-        expressions: aggFilters.filter(Boolean),
-    };
-}
-function getExpressionsInLogic(logics = []) {
-    return logics.reduce((expressions, logic) => {
-        let _expressions = expressions;
-        logic.filters.forEach((filter) => {
-            _expressions = _expressions.concat(filter.expressions[0].expressions);
-        });
-        return _expressions;
-    }, []);
+/**
+ * Finds the index of a summary that matches the given filter expression based on question ID and Qrvey ID.
+ * @param expression The filter expression to match
+ * @param summaries The list of summaries to search
+ * @returns The index of the matching summary, or -1 if not found
+ */
+function getIndexByExpression(expression, summaries = []) {
+    return summaries.findIndex((summary) => expression.questionid === summary.questionid &&
+        expression.qrveyid === summary.qrveyid);
 }

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

@@ -0,0 +1,16 @@
+/**
+ * Traverses a tree structure and allows modification of nodes and leaves via callback functions.
+ * @param options The options for traversing and modifying the tree.
+ * @param options.root The root node of the tree.
+ * @param options.getChildren Function to get the children of a node.
+ * @param options.isLeaf Function to determine if a node is a leaf.
+ * @param options.onLeaf Callback function to be called on each leaf node.
+ * @param options.onNode Callback function to be called on each non-leaf node.
+ */
+export declare function traverseTree<TNode, TLeaf extends TNode = TNode>(options: {
+    root: TNode | readonly TNode[];
+    getChildren: (node: TNode) => readonly TNode[] | undefined;
+    isLeaf?: (node: TNode) => node is TLeaf;
+    onLeaf?: (leaf: TLeaf, parent: TNode | null) => void;
+    onNode?: (node: TNode, parent: TNode | null) => void;
+}): void;

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

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.traverseTree = void 0;
+/**
+ * Traverses a tree structure and allows modification of nodes and leaves via callback functions.
+ * @param options The options for traversing and modifying the tree.
+ * @param options.root The root node of the tree.
+ * @param options.getChildren Function to get the children of a node.
+ * @param options.isLeaf Function to determine if a node is a leaf.
+ * @param options.onLeaf Callback function to be called on each leaf node.
+ * @param options.onNode Callback function to be called on each non-leaf node.
+ */
+function traverseTree(options) {
+    const { root, getChildren, isLeaf, onLeaf, onNode } = options;
+    /**
+     * Recursively walks the tree, calling the appropriate callbacks for nodes and leaves.
+     * @param node The current node being processed.
+     * @param parent The parent of the current node, or null if it's the root.
+     */
+    function walk(node, parent) {
+        onNode === null || onNode === void 0 ? void 0 : onNode(node, parent);
+        if (isLeaf === null || isLeaf === void 0 ? void 0 : isLeaf(node)) {
+            onLeaf === null || onLeaf === void 0 ? void 0 : onLeaf(node, parent);
+            return;
+        }
+        const children = getChildren(node);
+        if (!children)
+            return;
+        for (const child of children) {
+            walk(child, node);
+        }
+    }
+    const roots = Array.isArray(root) ? root : [root];
+    for (const r of roots)
+        walk(r, null);
+}
+exports.traverseTree = traverseTree;

package/dist/filters/helpers/OLD_getAggFilters.js

@@ -1,8 +1,8 @@
-import { COLUMN } from "../../columns/constants/COLUMN";
 import { isEmpty } from "../../general/mix/isEmpty";
-import { objectCopy } from "../../general/object/objectCopy";
 import { _get } from "../../general/object/get";
-import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
+import { objectCopy } from "../../general/object/objectCopy";
+import { traverseTree } from "../../general/object/traverseTree";
+import { adaptFilterData, FDToLogic } from "../adapters";
 /**
  * @deprecated soon
  * @param logics
@@ -11,33 +11,26 @@ import { FILTER_OPERATOR } from "../constants/common/FILTER_OPERATOR";
  */
 export function getAggFilters(logics = [], summaries = []) {
     const aggregateFilters = getAggregateFilters(logics);
-    const aggFilters = aggregateFilters
-        .map((aggFilter) => {
-        const expressions = getExpressionsInLogic([aggFilter]);
-        return (expressions &&
-            expressions.length && {
-            operator: FILTER_OPERATOR.OR,
-            expressions: expressions
-                .map((expression) => {
-                const summaryIndex = summaries.findIndex((summary) => expression.questionid === summary.questionid &&
-                    expression.qrveyid === summary.qrveyid &&
-                    _get(expression.uiExtras.column, "aggregate") ===
-                        summary.aggregate);
-                if (summaryIndex > -1 ||
-                    expression.questionType === COLUMN.AGGREGATED_FORMULA) {
-                    return {
-                        enabled: expression.enabled,
-                        summaryIndex,
-                        validationType: expression.validationType,
-                        value: expression.value,
-                    };
-                }
-            })
-                .filter(Boolean),
-        });
-    })
-        .filter((aggFilter) => aggFilter && aggFilter.expressions && aggFilter.expressions.length);
-    return aggFilters && concatAggFilters(aggFilters);
+    const logic = objectCopy(FDToLogic(adaptFilterData({ logic: aggregateFilters })));
+    if (isEmpty(logic) || isEmpty(logic[0].filters))
+        return;
+    traverseTree({
+        root: logic[0].filters,
+        getChildren: (node) => node.expressions,
+        isLeaf: (node) => !("operator" in node),
+        onLeaf: (expression) => {
+            const { enabled, validationType, value } = expression;
+            const summaryIndex = getIndexByExpression(expression, summaries);
+            Object.keys(expression).forEach((key) => {
+                delete expression[key];
+            });
+            expression.enabled = enabled;
+            expression.summaryIndex = summaryIndex;
+            expression.validationType = validationType;
+            expression.value = value;
+        },
+    });
+    return logic[0].filters[0];
 }
 /**
  * Filters and gets the filters used for aggregate values.
@@ -65,23 +58,13 @@ function getAggregateFilters(logics = []) {
         return newLogics;
     }, []);
 }
-function concatAggFilters(aggFilters, operator = FILTER_OPERATOR.AND) {
-    const expressions = aggFilters.filter(Boolean);
-    if (!expressions.length)
-        return undefined;
-    else if (expressions.length === 1)
-        return expressions[0];
-    return {
-        operator,
-        expressions: aggFilters.filter(Boolean),
-    };
-}
-function getExpressionsInLogic(logics = []) {
-    return logics.reduce((expressions, logic) => {
-        let _expressions = expressions;
-        logic.filters.forEach((filter) => {
-            _expressions = _expressions.concat(filter.expressions[0].expressions);
-        });
-        return _expressions;
-    }, []);
+/**
+ * Finds the index of a summary that matches the given filter expression based on question ID and Qrvey ID.
+ * @param expression The filter expression to match
+ * @param summaries The list of summaries to search
+ * @returns The index of the matching summary, or -1 if not found
+ */
+function getIndexByExpression(expression, summaries = []) {
+    return summaries.findIndex((summary) => expression.questionid === summary.questionid &&
+        expression.qrveyid === summary.qrveyid);
 }

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

@@ -0,0 +1,16 @@
+/**
+ * Traverses a tree structure and allows modification of nodes and leaves via callback functions.
+ * @param options The options for traversing and modifying the tree.
+ * @param options.root The root node of the tree.
+ * @param options.getChildren Function to get the children of a node.
+ * @param options.isLeaf Function to determine if a node is a leaf.
+ * @param options.onLeaf Callback function to be called on each leaf node.
+ * @param options.onNode Callback function to be called on each non-leaf node.
+ */
+export declare function traverseTree<TNode, TLeaf extends TNode = TNode>(options: {
+    root: TNode | readonly TNode[];
+    getChildren: (node: TNode) => readonly TNode[] | undefined;
+    isLeaf?: (node: TNode) => node is TLeaf;
+    onLeaf?: (leaf: TLeaf, parent: TNode | null) => void;
+    onNode?: (node: TNode, parent: TNode | null) => void;
+}): void;

package/dist/general/object/traverseTree.js

@@ -0,0 +1,33 @@
+/**
+ * Traverses a tree structure and allows modification of nodes and leaves via callback functions.
+ * @param options The options for traversing and modifying the tree.
+ * @param options.root The root node of the tree.
+ * @param options.getChildren Function to get the children of a node.
+ * @param options.isLeaf Function to determine if a node is a leaf.
+ * @param options.onLeaf Callback function to be called on each leaf node.
+ * @param options.onNode Callback function to be called on each non-leaf node.
+ */
+export function traverseTree(options) {
+    const { root, getChildren, isLeaf, onLeaf, onNode } = options;
+    /**
+     * Recursively walks the tree, calling the appropriate callbacks for nodes and leaves.
+     * @param node The current node being processed.
+     * @param parent The parent of the current node, or null if it's the root.
+     */
+    function walk(node, parent) {
+        onNode === null || onNode === void 0 ? void 0 : onNode(node, parent);
+        if (isLeaf === null || isLeaf === void 0 ? void 0 : isLeaf(node)) {
+            onLeaf === null || onLeaf === void 0 ? void 0 : onLeaf(node, parent);
+            return;
+        }
+        const children = getChildren(node);
+        if (!children)
+            return;
+        for (const child of children) {
+            walk(child, node);
+        }
+    }
+    const roots = Array.isArray(root) ? root : [root];
+    for (const r of roots)
+        walk(r, null);
+}

package/package.json

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