@qrvey/utils 1.5.0-1 → 1.5.0-4

package/dist/cjs/charts/adapters/endpointDataGet.js

@@ -0,0 +1,444 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSummariesBody = exports.setDateGroup = exports.getLayerBody = exports.getRefenceBodyU = exports.getTrendBody = exports.getRefenceBody = exports.getAggFiltersResults = exports.getSmallMultipleBody = exports.getComboBody = exports.getCategoryBody = exports.getValidSortingType = exports.getPivotBody = exports.getDrilldownId = void 0;
+const columns_1 = require("../../columns");
+const filters_1 = require("../../filters");
+const general_1 = require("../../general");
+const endpointDataValidators_1 = require("./endpointDataValidators");
+function getDrilldownId(ctx, data) {
+    return !ctx.config.isFromAN
+        ? ctx.config.id || data.chartid || data.chart_id
+        : data.chartid || data.chart_id;
+}
+exports.getDrilldownId = getDrilldownId;
+function getPivotBody(layer, body) {
+    const value = (0, general_1._get)(layer, "value");
+    const pivot = (0, general_1._get)(layer, "pivot", (0, general_1._get)(layer, "multiserie.serie"));
+    const type = (0, general_1._get)(layer, "type", "");
+    let obj;
+    if ((type === "HEATMAP_CHART" || !(0, general_1._get)(body, "isDrillDown")) && pivot) {
+        const uSorting = (0, general_1._get)(pivot, "sorting");
+        const sorting = (0, general_1._get)(body, "globalSettings.sortX", {});
+        let pSortOption = {
+            sortBy: uSorting || getValidSortingType(body) === "Label"
+                ? "CATEGORY"
+                : "VALUE",
+            sortDirection: ((uSorting && uSorting.order) ||
+                sorting.order ||
+                "ASC").toUpperCase(),
+        };
+        /** TODO: Remove line on  implement universal sorting on Heatmap */
+        pSortOption =
+            value && value.calculation
+                ? { sortBy: "CATEGORY", sortDirection: "ASC" }
+                : pSortOption;
+        const maxDataPoints = pivot.type !== "DATE"
+            ? (0, general_1._get)(layer, "multiserie.maxDataPoints")
+                ? (0, general_1._get)(layer, "multiserie.maxNumDataPoints", 50)
+                : undefined
+            : 50;
+        obj = {
+            linkid: pivot.linkid,
+            maxDataPoints: maxDataPoints,
+            property: pivot.property,
+            qrveyid: pivot.qrveyid || body.qrveyid,
+            questionid: pivot.id || pivot.bucketId,
+            sortOption: pSortOption,
+            type: pivot.type,
+        };
+        setDateGroup(pivot, pivot, obj);
+    }
+    return obj;
+}
+exports.getPivotBody = getPivotBody;
+function getValidSortingType(body) {
+    const sorting = (0, general_1._get)(body, "globalSettings.sortX", {});
+    const type = (0, general_1._get)(body, "layerList[0].type");
+    const notAllowValue = type === "HEATMAP_CHART" && (0, general_1._get)(body, "layerList[0].pivot");
+    return !sorting.type || sorting.type == "Label" || notAllowValue
+        ? "Label"
+        : "Value";
+}
+exports.getValidSortingType = getValidSortingType;
+function getCategoryBody(layer, body) {
+    var _a;
+    const maxDataPoints = (0, general_1._get)(body, "globalSettings.maxNumDataPoints");
+    const category = (0, general_1._get)(layer, "category");
+    if (category && category.bucketId)
+        category.id = category.bucketId;
+    const categoryId = category ? category.id : null;
+    const sorting = (0, general_1._get)(body, "globalSettings.sortX", {});
+    const pSortOption = {
+        sortBy: ((_a = sorting === null || sorting === void 0 ? void 0 : sorting.column) === null || _a === void 0 ? void 0 : _a.isHidden)
+            ? "VALUE"
+            : getValidSortingType(body) === "Label"
+                ? "CATEGORY"
+                : "VALUE",
+        sortDirection: (sorting.order || "ASC").toUpperCase(),
+        order: getSortOrder(sorting, category, body),
+    };
+    let obj;
+    if (categoryId) {
+        obj = {
+            questionid: category.id,
+            linkid: category.linkid,
+            maxDataPoints,
+            property: category.property,
+            qrveyid: category.qrveyid || body.qrveyid,
+            type: category.type || body.type,
+            sortOption: (0, columns_1.isNumericalColumn)(category) &&
+                (0, general_1._get)(category, "scaleType.value") === "CONTINUOUS"
+                ? undefined
+                : pSortOption,
+        };
+        setDateGroup(category, body, obj);
+    }
+    return obj;
+}
+exports.getCategoryBody = getCategoryBody;
+function getComboBody(layer, body, filters, newModel = false) {
+    const obj = {};
+    try {
+        const category = getCategoryBody((0, general_1._get)(body, "layerList[0]"), body);
+        const pSmallMultiple = getSmallMultipleBody(body.layerList.find((ly) => (0, general_1._get)(ly, "combopt.label") === "SMALL_MULTIPLES"), body);
+        if (newModel) {
+            obj.dimensions = [];
+            if (pSmallMultiple)
+                obj.dimensions.push(pSmallMultiple);
+            obj.dimensions.push(category);
+        }
+        else {
+            obj.category = category;
+        }
+        obj.summaries = getSummariesBody(layer, body);
+        obj.aggFilters = getAggFiltersResults(filters, obj.summaries);
+    }
+    catch (error) {
+        console.error(error);
+    }
+    return obj;
+}
+exports.getComboBody = getComboBody;
+function getSmallMultipleBody(layer, body) {
+    if (!layer)
+        return null;
+    const category = (0, general_1._get)(layer, "smallMultiplesColumn");
+    const maxDataPoints = !(0, endpointDataValidators_1.isColumnDate)(category)
+        ? (0, general_1._get)(layer, "visualization.maxMultiplePanels", undefined)
+        : undefined;
+    if (category && category.bucketId)
+        category.id = category.bucketId;
+    const categoryId = category ? category.id : null;
+    let obj;
+    if (categoryId) {
+        obj = {
+            questionid: category.id,
+            linkid: category.linkid,
+            maxDataPoints: maxDataPoints,
+            property: category.property,
+            qrveyid: category.qrveyid || body.qrveyid,
+            type: category.type || body.type,
+        };
+        if ((0, columns_1.isNumericalColumn)(category))
+            obj.numberAsRange = true;
+        setDateGroup(category, category, obj);
+    }
+    return obj;
+}
+exports.getSmallMultipleBody = getSmallMultipleBody;
+function getAggFiltersResults(logics = [], summaries = []) {
+    function concatAggFilters(aggFilters, operator = filters_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(logicsData = []) {
+        return logicsData.reduce((expressions, logic) => {
+            logic.filters.forEach((filter) => {
+                expressions = expressions.concat(filter.expressions[0].expressions);
+            });
+            return expressions;
+        }, []);
+    }
+    function getAggregateFilters(logicsData = []) {
+        logicsData = (0, general_1.cloneDeep)(logicsData);
+        const aggregateLogics = logicsData.reduce((newLogics, logic) => {
+            if (!logic)
+                return newLogics;
+            // if ([FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes(logic.scope)) {
+            logic.filters.forEach((filter, index) => {
+                const expressions = (0, general_1._get)(filter, "expressions[0].expressions");
+                if (!(0, general_1.isEmpty)(expressions)) {
+                    const aggregateFilters = filter.expressions[0].expressions.filter((expression) => !(0, general_1.isEmpty)(expression.uiExtras.column.aggregate));
+                    logic.filters[index].expressions[0].expressions = aggregateFilters;
+                    if (!filter.expressions[0].expressions.length)
+                        logic.filters[index] = undefined;
+                }
+            });
+            logic.filters = logic.filters.filter((filter) => filter);
+            if (logic.filters.length)
+                newLogics.push(logic);
+            //}
+            return newLogics;
+        }, []);
+        return aggregateLogics;
+    }
+    const aggregateFilters = getAggregateFilters(logics);
+    const aggFilters = aggregateFilters
+        .map((aggFilter) => {
+        const expressions = getExpressionsInLogic([aggFilter]);
+        return (expressions &&
+            expressions.length && {
+            operator: filters_1.FILTER_OPERATOR.OR,
+            expressions: expressions
+                .map((expression) => {
+                const summaryIndex = summaries.findIndex((summary) => expression.questionid === summary.questionid &&
+                    expression.qrveyid === summary.qrveyid &&
+                    expression.linkid === summary.linkid &&
+                    (0, general_1._get)(expression.uiExtras.column, "aggregate") ===
+                        summary.aggregate);
+                if (summaryIndex > -1 ||
+                    expression.questionType === columns_1.COLUMN.AGGREGATED_FORMULA) {
+                    return {
+                        enabled: expression.enabled,
+                        summaryIndex,
+                        validationType: expression.validationType,
+                        value: expression.value,
+                    };
+                }
+                return;
+            })
+                .filter(Boolean),
+        });
+    })
+        .filter((aggFilter) => aggFilter && aggFilter.expressions && aggFilter.expressions.length);
+    return aggFilters && concatAggFilters(aggFilters);
+}
+exports.getAggFiltersResults = getAggFiltersResults;
+function getRefenceBody(layer) {
+    let obj;
+    try {
+        obj = {
+            type: "REFERENCE_LINE",
+            referenceType: layer.valuetype,
+            referenceValue: layer.value,
+            valueId: (0, general_1._get)(layer, "axis.id"),
+            aggregate: (0, general_1._get)(layer, "aggregate.label"),
+            value: {
+                questionid: (0, general_1._get)(layer, "axis.id"),
+                qrveyid: (0, general_1._get)(layer, "axis.qrveyid"),
+                linkid: (0, general_1._get)(layer, "axis.linkid"),
+                property: (0, general_1._get)(layer, "axis.property"),
+                type: (0, general_1._get)(layer, "axis.type", (0, general_1._get)(layer, "axis.label")),
+            },
+        };
+    }
+    catch (e) {
+        console.error(e);
+    }
+    return obj;
+}
+exports.getRefenceBody = getRefenceBody;
+function getTrendBody(layer) {
+    let obj;
+    try {
+        obj = {
+            type: "TREND_LINE",
+            trendType: layer.trendtype.label,
+        };
+    }
+    catch (e) {
+        console.error(e);
+    }
+    return obj;
+}
+exports.getTrendBody = getTrendBody;
+function getRefenceBodyU(layer, body) {
+    let obj;
+    const layerType = layer.valuetype === "Fixed";
+    const pSmallMultiple = getSmallMultipleBody(body.layerList.find((ly) => (0, general_1._get)(ly, "combopt.label") === "SMALL_MULTIPLES"), body);
+    if (!layerType) {
+        obj = {
+            summaries: [
+                {
+                    aggregate: (0, general_1._get)(layer, "aggregate.label"),
+                    linkid: (0, general_1._get)(layer, "axis.linkid"),
+                    property: (0, general_1._get)(layer, "axis.property"),
+                    qrveyid: (0, general_1._get)(layer, "axis.qrveyid") || body.qrveyid,
+                    questionid: (0, general_1._get)(layer, "axis.id"),
+                    type: (0, general_1._get)(layer, "axis.type", (0, general_1._get)(layer, "axis.label")),
+                },
+            ],
+        };
+        if (pSmallMultiple)
+            obj.dimensions = [pSmallMultiple];
+    }
+    else {
+        obj = { type: "REFERENCE_LINE" };
+    }
+    return obj;
+}
+exports.getRefenceBodyU = getRefenceBodyU;
+function getLayerBody(layer, dateGroup, qrveyid) {
+    let obj;
+    try {
+        if ((0, general_1._get)(layer, "mapType.label") == "DOT")
+            obj = {};
+        // eslint-disable-next-line no-extra-boolean-cast
+        else if (!!~["BOXWHISKER_CHART", "WORD_CLOUD"].indexOf(layer.type)) {
+            obj = {
+                valueId: (0, general_1._get)(layer, "value.id"),
+                aggregate: (0, general_1._get)(layer, "aggregate.label"),
+            };
+        }
+        else {
+            obj = {
+                valueId: layer.value.id,
+                aggregate: layer.aggregate.label,
+            };
+        }
+        obj.type =
+            layer.type || (0, general_1._get)(layer, "layer.label", (0, general_1._get)(layer, "combopt.label"));
+        obj.property = layer.property;
+        if (layer.value)
+            obj.value = {
+                questionid: layer.value.id,
+                type: layer.value.type,
+                qrveyid: layer.value.qrveyid,
+                linkid: layer.value.linkid,
+                property: layer.value.property,
+            };
+        if (layer.mapType)
+            obj.mapType = layer.mapType.label;
+        if (layer.multiserie && layer.multiserie.serie) {
+            if (layer.multiserie.serie.type === "BUCKET") {
+                obj.multiValueId = layer.multiserie.serie.bucketId; //required
+                obj.multiValueType = "BUCKET";
+            }
+            else {
+                obj.multiValueId = layer.multiserie.serie.id; //required
+                obj.multiValueType = undefined;
+            }
+            obj.isMulti = true;
+            obj.multiValueAxis = {
+                questionid: layer.multiserie.serie.id,
+                groupType: (0, general_1._get)(layer, "multiserie.type"),
+                questionType: (0, general_1._get)(layer, "multiserie.serie.type"),
+                type: (0, general_1._get)(layer, "multiserie.serie.type"),
+                groupValue: (0, general_1._get)(layer, "multiserie.dateGroup.label"),
+                property: (0, general_1._get)(layer, "multiserie.serie.property"),
+                qrveyid: (0, general_1._get)(layer, "multiserie.serie.qrveyid"),
+                linkid: (0, general_1._get)(layer, "multiserie.serie.linkid"),
+            };
+            if ((0, general_1._get)(layer, "multiserie.maxDataPoints", false))
+                obj.multiValueAxis.maxDataPoints = (0, general_1._get)(layer, "multiserie.maxNumDataPoints", 50);
+        }
+        if (dateGroup && dateGroup.label) {
+            obj.groupType = "DATE";
+            obj.groupValue = dateGroup.label;
+        }
+        if (layer.pivot) {
+            obj.pivot = {};
+            obj.pivot.qrveyid = (0, general_1._get)(layer, "pivot.qrveyid", qrveyid);
+            obj.pivot.linkid = (0, general_1._get)(layer, "pivot.linkid");
+            obj.pivot.groupType = (0, general_1._get)(layer, "pivot.type");
+            obj.pivot.type = (0, general_1._get)(layer, "pivot.type");
+            const labelBucketId = (0, general_1._get)(layer, "pivot.bucketId", null);
+            if (labelBucketId !== null) {
+                obj.pivot.labelBucketId = labelBucketId;
+            }
+            else {
+                obj.pivot.questionid = (0, general_1._get)(layer, "pivot.id");
+            }
+            obj.pivot.groupValue = (0, general_1._get)(layer, "pivot.dateGroup.label");
+            obj.pivot.property = (0, general_1._get)(layer, "pivot.property");
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+    return obj;
+}
+exports.getLayerBody = getLayerBody;
+function getSortOrder(sorting = {}, category = {}, body = {}) {
+    var _a;
+    const order = (sorting.order || "ASC").toUpperCase();
+    const column = sorting.column || {};
+    const aggregate = (_a = body.globalSettings) === null || _a === void 0 ? void 0 : _a.sortAggregation;
+    return column.isHidden
+        ? [
+            {
+                hidden: true,
+                type: column.type,
+                sortDirection: order,
+                questionid: column.id,
+                qrveyid: column.qrveyid,
+                aggregate: aggregate === null || aggregate === void 0 ? void 0 : aggregate.label,
+                property: column.property || category.property,
+            },
+        ]
+        : [
+            {
+                summaryIndex: 0,
+                sortDirection: order,
+            },
+        ];
+}
+function setDateGroup(column, body, obj) {
+    if ((0, endpointDataValidators_1.isColumnDate)(column) && !(0, general_1.isEmpty)((0, general_1._get)(body, "dateGroup.label"))) {
+        obj["groupType"] = columns_1.COLUMN.DATE;
+        obj["groupValue"] = body.dateGroup.label;
+        if ((0, general_1._get)(body, "dateGroup.datePart", false)) {
+            obj["maxDataPoints"] = obj["maxDataPoints"] || 60;
+        }
+    }
+}
+exports.setDateGroup = setDateGroup;
+function getSummariesBody(layer, body) {
+    let value = (0, general_1._get)(layer, "value");
+    let aggregate = (0, general_1._get)(layer, "aggregate");
+    if (layer.type === "WORD_CLOUD" && !value)
+        value = (0, general_1._get)(layer, "category");
+    if (layer.type === "WORD_CLOUD" && !aggregate)
+        aggregate = { label: "COUNT", text: "Count" };
+    let obj;
+    if (layer.type === "MINMAX_CHART" && value) {
+        const min = aggregateGenerator("MIN", value.linkid, value.property, value.qrveyid || body.qrveyid, value.id, value.type);
+        const max = aggregateGenerator("MAX", value.linkid, value.property, value.qrveyid || body.qrveyid, value.id, value.type);
+        obj = [min, max];
+        if (body.globalSettings.average)
+            obj.push(aggregateGenerator("AVG", value.linkid, value.property, value.qrveyid || body.qrveyid, value.id, value.type));
+    }
+    else if (value) {
+        obj = [
+            {
+                aggregate: aggregate && aggregate.label,
+                linkid: value.linkid,
+                property: value.property,
+                qrveyid: value.qrveyid || body.qrveyid,
+                questionid: value.id,
+                type: value.type,
+            },
+        ];
+        if (value.calculation)
+            obj[0].calculations = value.calculation;
+    }
+    return obj;
+}
+exports.getSummariesBody = getSummariesBody;
+function aggregateGenerator(aggregate, linkid, property, qrveyid, questionid, type) {
+    return {
+        type,
+        linkid,
+        qrveyid,
+        property,
+        questionid,
+        aggregate: aggregate !== null && aggregate !== void 0 ? aggregate : "SUM",
+    };
+}

package/dist/cjs/charts/adapters/endpointDataValidators.d.ts

@@ -0,0 +1,4 @@
+export declare function isNotValid(mainLayer: any): boolean;
+export declare function validChartTypeWithEndPoint(chartType: any): boolean;
+export declare function hasMinorVersion(version: any, current: any): boolean;
+export declare function isColumnDate(column: any): boolean;

package/dist/cjs/charts/adapters/endpointDataValidators.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isColumnDate = exports.hasMinorVersion = exports.validChartTypeWithEndPoint = exports.isNotValid = void 0;
+const columns_1 = require("../../columns");
+const constants_1 = require("../../constants");
+function isNotValid(mainLayer) {
+    if (!mainLayer)
+        return;
+    const chartType = mainLayer.type;
+    switch (chartType) {
+        case constants_1.CHART_TYPE.GEO_CHART:
+            if (mainLayer.mapType && mainLayer.mapType.label === "DOT")
+                return !mainLayer.category;
+            break;
+        case constants_1.CHART_TYPE.WORD_CLOUD:
+            return !mainLayer.category;
+        case constants_1.CHART_TYPE.BOXWHISKER_CHART:
+            return !mainLayer.value;
+        case constants_1.CHART_TYPE.MINMAX_CHART:
+            return !mainLayer.value;
+        case constants_1.CHART_TYPE.TABLE_CHART:
+        case constants_1.CHART_TYPE.CROSSTAB_CHART:
+        case constants_1.CHART_TYPE.EXPANDABLE_TABLE_CHART:
+            return true;
+    }
+    return (!mainLayer.category ||
+        !mainLayer.value ||
+        (chartType !== "SYMBOL_CHART" && !mainLayer.aggregate));
+}
+exports.isNotValid = isNotValid;
+function validChartTypeWithEndPoint(chartType) {
+    return [
+        constants_1.CHART_TYPE.BAR_CHART,
+        constants_1.CHART_TYPE.LINE_CHART,
+        constants_1.CHART_TYPE.MINMAX_CHART,
+        constants_1.CHART_TYPE.SYMBOL_CHART,
+        constants_1.CHART_TYPE.PIE_CHART,
+        constants_1.CHART_TYPE.HEATMAP_CHART,
+        constants_1.CHART_TYPE.WORD_CLOUD,
+        constants_1.CHART_TYPE.FUNNEL_CHART,
+    ].includes(chartType);
+}
+exports.validChartTypeWithEndPoint = validChartTypeWithEndPoint;
+function hasMinorVersion(version, current) {
+    const splitVersion = (v) => v.split(".").map((t) => parseInt(t));
+    const currentVersion = splitVersion(current);
+    const chartVersion = splitVersion(version);
+    if (chartVersion[0] < currentVersion[0])
+        return true;
+    else if (chartVersion[1] < currentVersion[1])
+        return true;
+    return false;
+}
+exports.hasMinorVersion = hasMinorVersion;
+function isColumnDate(column) {
+    if (column == null)
+        return;
+    return (column.type === columns_1.COLUMN.DATE ||
+        (column.type === columns_1.COLUMN.FORMULA && column.formulaType === "date"));
+}
+exports.isColumnDate = isColumnDate;

package/dist/cjs/charts/adapters/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./endpointDataValidators";
+export * from "./endpointDataGet";
+export * from "./endpointData";

package/dist/cjs/charts/adapters/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./endpointDataValidators"), exports);
+__exportStar(require("./endpointDataGet"), exports);
+__exportStar(require("./endpointData"), exports);

package/dist/cjs/charts/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./constants/index";
 export * from "./interfaces/index";
+export * from "./adapters/index";

package/dist/cjs/charts/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./constants/index"), exports);
 __exportStar(require("./interfaces/index"), exports);
+__exportStar(require("./adapters/index"), exports);

package/dist/cjs/column_format/helpers/defineTableChartFormat.js

@@ -10,6 +10,7 @@ const TABLE_TYPE_1 = require("../constants/TABLE_TYPE");
 const columnTypeByChart_1 = require("./columnTypeByChart");
 const CALCULATION_LABEL_1 = require("../../qrvey/constants/CALCULATION_LABEL");
 const DATEGROUP_UNSUPPORT_FORMAT_1 = require("../constants/DATEGROUP_UNSUPPORT_FORMAT");
+const DURATION_PARTS_LIST_1 = require("../constants/DURATION_PARTS_LIST");
 /**
  * It returns the format of a column based on the column type, the chart type, and the chart settings
  * @param {IChartColumn} column - IChartColumn
@@ -60,17 +61,25 @@ const defineTableChartFormat = (column, settings) => {
         case COLUMN_1.COLUMN.NUMERIC:
         case COLUMN_1.COLUMN.RATING:
         case COLUMN_1.COLUMN.SLIDEBAR: {
-            if (selectedFormat)
-                return selectedFormat;
-            if ((calculation === null || calculation === void 0 ? void 0 : calculation.value) === CALCULATION_LABEL_1.CALCULATION_LABEL.PDIFF)
-                return defaultPercentage;
-            if (hasDefaultFormat) {
-                if ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE_1.AGGREGATE.COUNT ||
-                    (aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE_1.AGGREGATE.DISTINCTCOUNT)
-                    return defaultNumeric;
-                return defaultFormat || defaultNumeric;
+            let output;
+            if (selectedFormat && selectedFormat.format !== "Default") {
+                output = selectedFormat;
             }
-            return;
+            else if ((calculation === null || calculation === void 0 ? void 0 : calculation.value) === CALCULATION_LABEL_1.CALCULATION_LABEL.PDIFF) {
+                output = defaultPercentage;
+            }
+            else if (isGroupedTable &&
+                ((aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE_1.AGGREGATE.COUNT ||
+                    (aggregate === null || aggregate === void 0 ? void 0 : aggregate.label) === AGGREGATE_1.AGGREGATE.DISTINCTCOUNT)) {
+                output = defaultNumeric;
+            }
+            else {
+                output = defaultFormat || defaultNumeric;
+            }
+            if (DURATION_PARTS_LIST_1.DURATION_PARTS_LIST.includes(output === null || output === void 0 ? void 0 : output.format)) {
+                output = Object.assign(Object.assign({}, output), { template: output.format, format: "Duration" });
+            }
+            return output;
         }
     }
 };

package/dist/cjs/constants/Charts.Const.d.ts

@@ -1,5 +1,6 @@
 export declare enum CHART_TYPE {
     BAR_CHART = "BAR_CHART",
+    FUNNEL_CHART = "FUNNEL_CHART",
     BAR_CHART_MS = "BAR_CHART_MS",
     EXPANDABLE_TABLE_CHART = "EXPANDABLE_TABLE_CHART",
     SYMBOL_CHART = "SYMBOL_CHART",

package/dist/cjs/constants/Charts.Const.js

@@ -4,6 +4,7 @@ exports.CHART_DIMENSION = exports.CHART_TYPE = void 0;
 var CHART_TYPE;
 (function (CHART_TYPE) {
     CHART_TYPE["BAR_CHART"] = "BAR_CHART";
+    CHART_TYPE["FUNNEL_CHART"] = "FUNNEL_CHART";
     CHART_TYPE["BAR_CHART_MS"] = "BAR_CHART_MS";
     CHART_TYPE["EXPANDABLE_TABLE_CHART"] = "EXPANDABLE_TABLE_CHART";
     CHART_TYPE["SYMBOL_CHART"] = "SYMBOL_CHART";

package/dist/cjs/dates/constants/DATETIME_COLUMN_FORMAT.js

@@ -8,4 +8,5 @@ exports.DATETIME_COLUMN_FORMAT = [
     "MM/DD/YYYY HH24:MI:SS",
     "DD/MM/YYYY HH24:MI:SS",
     "YYYY-MM-DD HH24:MI:SS",
+    "YYYY-MM-DD HH:mm:ss",
 ];

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

@@ -12,7 +12,7 @@ const isEmpty_1 = require("../../general/mix/isEmpty");
  * @returns {IFFilterTokens[]} An array of tokens that represents the filters object
  */
 function getTokensFromFilters(filters, options) {
-    var _a, _b;
+    var _a, _b, _c;
     const tokens = [];
     const i18nService = options.i18nService;
     const settings = {
@@ -48,16 +48,21 @@ function getTokensFromFilters(filters, options) {
                 });
             }
             for (const [index, filter] of Object.entries(database.filters)) {
-                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled))
+                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled)) {
+                    if (((_a = tokens[tokens.length - 1]) === null || _a === void 0 ? void 0 : _a.type) ===
+                        FILTER_TOKENS_STRUCTURE_TYPE_1.FILTER_TOKENS_STRUCTURE_TYPE.LOGICAL_OPERATOR) {
+                        tokens.pop();
+                    }
                     continue;
+                }
                 const values = (0, getUIValues_1.getUIValues)(filter, settings);
                 if (!thereIsFiltersWithValues)
                     thereIsFiltersWithValues = true;
                 let columnLabel = filter.column.label;
-                if ((_a = filter === null || filter === void 0 ? void 0 : filter.column) === null || _a === void 0 ? void 0 : _a.aggregate) {
+                if ((_b = filter === null || filter === void 0 ? void 0 : filter.column) === null || _b === void 0 ? void 0 : _b.aggregate) {
                     columnLabel +=
                         " (" +
-                            i18nService.translate(`common.aggregate_labels.${(_b = filter === null || filter === void 0 ? void 0 : filter.column) === null || _b === void 0 ? void 0 : _b.aggregate.toLowerCase()}`) +
+                            i18nService.translate(`common.aggregate_labels.${(_c = filter === null || filter === void 0 ? void 0 : filter.column) === null || _c === void 0 ? void 0 : _c.aggregate.toLowerCase()}`) +
                             ")";
                 }
                 tokens.push({

package/dist/cjs/globalization/interfaces/II18nResource.d.ts

@@ -11,6 +11,7 @@ import { II18nBucketBuilder } from "./bucket_builder/II18nBucketBuilder";
 import { II18nCrossTabs } from "./cross_tabs";
 import { II18nChartBuilder } from ".";
 import { II18nStyleThemes } from "./style_themes/II18nStyleThemes";
+import { II18nTabularView } from './tabular_view/II18nTabularView';
 export interface II18nResource {
     bucket_builder?: II18nBucketBuilder;
     chart_builder?: II18nChartBuilder;
@@ -25,4 +26,5 @@ export interface II18nResource {
     panel?: II18nPanel;
     style_themes?: II18nStyleThemes;
     table_charts?: II18nTableCharts;
+    tabular_view?: II18nTabularView;
 }

package/dist/cjs/globalization/interfaces/chart_builder/II18nChartBuilderFormatValues.d.ts

@@ -14,4 +14,5 @@ export interface II18nChartBuilderFormatValues {
     custom: string;
     date_format: string;
     value_format: string;
+    duration: string;
 }