@qrvey/utils 1.4.4 → 1.5.0-1

package/dist/filters/adapters/logicToFlatUI.js

@@ -61,7 +61,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
     }
 }
 function getFilterByExpression(expression, scopeItem) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const uiExtras = expression.uiExtras;
     const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL
         ? _get(scopeItem, "uiExtras.scopeid")
@@ -75,25 +75,23 @@ function getFilterByExpression(expression, scopeItem) {
         column: {
             id: (_a = uiExtras.column) === null || _a === void 0 ? void 0 : _a.id,
             formulaType: (_b = uiExtras.column) === null || _b === void 0 ? void 0 : _b.formulaType,
-            linkid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.linkid,
-            linked: (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.linked,
-            qrveyid: (_e = uiExtras.column) === null || _e === void 0 ? void 0 : _e.qrveyid,
-            aggregate: ((_g = (_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate) === null || _g === void 0 ? void 0 : _g.label) ||
-                ((_h = uiExtras.column) === null || _h === void 0 ? void 0 : _h.aggregate),
-            calculation: ((_k = (_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation) === null || _k === void 0 ? void 0 : _k.value) ||
-                ((_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.calculation),
+            qrveyid: (_c = uiExtras.column) === null || _c === void 0 ? void 0 : _c.qrveyid,
+            aggregate: ((_e = (_d = uiExtras.column) === null || _d === void 0 ? void 0 : _d.aggregate) === null || _e === void 0 ? void 0 : _e.label) ||
+                ((_f = uiExtras.column) === null || _f === void 0 ? void 0 : _f.aggregate),
+            calculation: ((_h = (_g = uiExtras.column) === null || _g === void 0 ? void 0 : _g.calculation) === null || _h === void 0 ? void 0 : _h.value) ||
+                ((_j = uiExtras.column) === null || _j === void 0 ? void 0 : _j.calculation),
             label: _get(uiExtras.column, "text") || _get(uiExtras.column, "label"),
             property: uiExtras.column.property,
             sorting: uiExtras.column.sorting,
-            outputFormat: (_m = uiExtras.column) === null || _m === void 0 ? void 0 : _m.outputFormat,
-            type: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.type,
+            outputFormat: (_k = uiExtras.column) === null || _k === void 0 ? void 0 : _k.outputFormat,
+            type: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.type,
         },
         dateSection: uiExtras.dateSection,
         displayed: true,
         enabled: uiExtras.enabled,
         extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
             scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
-                collapsed: (_p = scopeItem.uiExtras) === null || _p === void 0 ? void 0 : _p.collapsed,
+                collapsed: (_m = scopeItem.uiExtras) === null || _m === void 0 ? void 0 : _m.collapsed,
                 enabled: scopeItem.enabled,
                 displayed: true,
                 scope: scopeItem.scope,
@@ -102,10 +100,9 @@ function getFilterByExpression(expression, scopeItem) {
                 collapsed: false,
                 enabled: true,
                 displayed: true,
-                qrveyid: (_q = uiExtras.column) === null || _q === void 0 ? void 0 : _q.qrveyid,
+                qrveyid: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.qrveyid,
                 label: _get(uiExtras.column, "dataset.name") ||
                     _get(uiExtras.column, "label"),
-                linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
             } }),
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,
@@ -145,7 +142,6 @@ function getFilter(filters, filter, getIndex = false) {
     const validator = (f) => f.validator === filter.validator &&
         f.column.id === filter.column.id &&
         f.column.qrveyid === filter.column.qrveyid &&
-        f.column.linkid === filter.column.linkid &&
         _get(f.column, "aggregate.label") ===
             _get(filter.column, "aggregate.label") &&
         f.extras.scope === filter.scope &&

package/dist/filters/adapters/transformFilters.js

@@ -388,7 +388,6 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
         const expressionItem = {
             enabled: oldFiltersItem.enabled,
             property: property,
-            linkid: oldFiltersItem.dataset.linkid,
             qrveyid: oldFiltersItem.dataset.qrveyid,
             questionid: oldFiltersItem.qid,
             formulaType: formulaType,
@@ -398,14 +397,11 @@ function getExpressions(oldFiltersItem, validations, scopeLabel, scopeid, sectio
             uiExtras: {
                 column: {
                     dataset: {
-                        linkid: oldFiltersItem.dataset.linkid,
                         qrveyid: oldFiltersItem.dataset.qrveyid,
                         name: oldFiltersItem.dataset.name,
                     },
                     formulaType: formulaType,
                     id: oldFiltersItem.qid,
-                    linked: oldFiltersItem.linked,
-                    linkid: oldFiltersItem.dataset.linkid,
                     qrveyid: oldFiltersItem.dataset.qrveyid,
                     text: oldFiltersItem.text,
                     type: questionType,

package/dist/filters/constants/common/FILTER_TOKENS_STRUCTURE_TYPE.d.ts

@@ -0,0 +1,8 @@
+export declare enum FILTER_TOKENS_STRUCTURE_TYPE {
+    SCOPE = "SCOPE",
+    DATABASE_NAME = "DATABASE_NAME",
+    COLUMN_NAME = "COLUMN_NAME",
+    VALIDATOR = "VALIDATOR",
+    VALUE = "VALUE",
+    LOGICAL_OPERATOR = "LOGICAL_OPERATOR"
+}

package/dist/filters/constants/common/FILTER_TOKENS_STRUCTURE_TYPE.js

@@ -0,0 +1,9 @@
+export var FILTER_TOKENS_STRUCTURE_TYPE;
+(function (FILTER_TOKENS_STRUCTURE_TYPE) {
+    FILTER_TOKENS_STRUCTURE_TYPE["SCOPE"] = "SCOPE";
+    FILTER_TOKENS_STRUCTURE_TYPE["DATABASE_NAME"] = "DATABASE_NAME";
+    FILTER_TOKENS_STRUCTURE_TYPE["COLUMN_NAME"] = "COLUMN_NAME";
+    FILTER_TOKENS_STRUCTURE_TYPE["VALIDATOR"] = "VALIDATOR";
+    FILTER_TOKENS_STRUCTURE_TYPE["VALUE"] = "VALUE";
+    FILTER_TOKENS_STRUCTURE_TYPE["LOGICAL_OPERATOR"] = "LOGICAL_OPERATOR";
+})(FILTER_TOKENS_STRUCTURE_TYPE || (FILTER_TOKENS_STRUCTURE_TYPE = {}));

package/dist/filters/constants/common/index.d.ts

@@ -17,3 +17,4 @@ export * from "./FILTER_VALIDATOR_BY_TYPE";
 export * from "./FILTER_VALIDATOR_INFO";
 export * from "./FILTER_VALIDATOR_LABEL";
 export * from "./FILTER_VALIDATOR";
+export * from "./FILTER_TOKENS_STRUCTURE_TYPE";

package/dist/filters/constants/common/index.js

@@ -17,3 +17,4 @@ export * from "./FILTER_VALIDATOR_BY_TYPE";
 export * from "./FILTER_VALIDATOR_INFO";
 export * from "./FILTER_VALIDATOR_LABEL";
 export * from "./FILTER_VALIDATOR";
+export * from "./FILTER_TOKENS_STRUCTURE_TYPE";

package/dist/filters/helpers/OLD_getAggFilters.js

@@ -21,7 +21,6 @@ export function getAggFilters(logics = [], summaries = []) {
                 .map((expression) => {
                 const summaryIndex = summaries.findIndex((summary) => expression.questionid === summary.questionid &&
                     expression.qrveyid === summary.qrveyid &&
-                    expression.linkid === summary.linkid &&
                     _get(expression.uiExtras.column, "aggregate") ===
                         summary.aggregate);
                 if (summaryIndex > -1 ||

package/dist/filters/helpers/common/excludeFiltersByParams.js

@@ -75,7 +75,7 @@ function resolveDatasetConditions(dataset, params) {
         dataset.filters.length > 0);
 }
 function resolveFilterConditions(filter, params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     return ((params.enableds == null || params.enableds !== filter.enabled) &&
         (isEmpty(params.dateSection) ||
             params.dateSection !== filter.dateSection) &&
@@ -85,7 +85,6 @@ function resolveFilterConditions(filter, params) {
         (isEmpty(params.column) ||
             (((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) !== filter.column.id &&
                 ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) !== filter.column.qrveyid &&
-                ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) !== filter.column.linkid &&
-                ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate) !== filter.column.aggregate)) &&
-        ((_e = filter.values) === null || _e === void 0 ? void 0 : _e.length) > 0);
+                ((_c = params.column) === null || _c === void 0 ? void 0 : _c.aggregate) !== filter.column.aggregate)) &&
+        ((_d = filter.values) === null || _d === void 0 ? void 0 : _d.length) > 0);
 }

package/dist/filters/helpers/common/mergeFilters.js

@@ -67,7 +67,6 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
         const dataset2Index = datasets2.findIndex((dataset2) => resolveDatasetConditions(dataset2, {
             qrveyid: dataset1.qrveyid,
-            linkid: dataset1.linkid,
         }));
         if (dataset2Index > -1) {
             dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });

package/dist/filters/helpers/common/resolveDatasetConditions.js

@@ -18,9 +18,5 @@ export function resolveDatasetConditions(dataset, params, letPassUndefinedProper
             (letPassUndefinedProperties && dataset.qrveyid == null) ||
             (letPassUndefinedParams && isEmpty(params.qrveyid)) ||
             params.qrveyid === dataset.qrveyid) &&
-        (!_hasProperty(params, "linkid") ||
-            (letPassUndefinedProperties && dataset.linkid == null) ||
-            (letPassUndefinedParams && isEmpty(params.linkid)) ||
-            params.linkid === dataset.linkid) &&
         dataset.filters.length > 0);
 }

package/dist/filters/helpers/common/resolveFilterConditions.js

@@ -9,7 +9,7 @@ import { _hasProperty } from "../../../general/object/hasProperty";
  * @returns true: the condition is satisfied
  */
 export function resolveFilterConditions(filter, params, letPassUndefinedProperties = false, letPassUndefinedParams = true) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f;
     return ((!_hasProperty(params, "enableds") ||
         !_hasProperty(params.enableds, "filters") ||
         (letPassUndefinedProperties && filter.enabled == null) ||
@@ -38,8 +38,6 @@ export function resolveFilterConditions(filter, params, letPassUndefinedProperti
                 ((_b = params.column) === null || _b === void 0 ? void 0 : _b.id) === filter.column.id) &&
                 ((letPassUndefinedParams && isEmpty((_c = params.column) === null || _c === void 0 ? void 0 : _c.qrveyid)) ||
                     ((_d = params.column) === null || _d === void 0 ? void 0 : _d.qrveyid) === filter.column.qrveyid) &&
-                ((letPassUndefinedParams && isEmpty((_e = params.column) === null || _e === void 0 ? void 0 : _e.linkid)) ||
-                    ((_f = params.column) === null || _f === void 0 ? void 0 : _f.linkid) === filter.column.linkid) &&
-                ((letPassUndefinedParams && isEmpty((_g = params.column) === null || _g === void 0 ? void 0 : _g.aggregate)) ||
-                    ((_h = params.column) === null || _h === void 0 ? void 0 : _h.aggregate) === filter.column.aggregate))));
+                ((letPassUndefinedParams && isEmpty((_e = params.column) === null || _e === void 0 ? void 0 : _e.aggregate)) ||
+                    ((_f = params.column) === null || _f === void 0 ? void 0 : _f.aggregate) === filter.column.aggregate))));
 }

package/dist/filters/helpers/filtersTokensToString.d.ts

@@ -0,0 +1,7 @@
+import { IFFilterTokens } from "../interfaces/IFFilterTokens";
+/**
+ * It takes an array of tokens and returns a string
+ * @param {IFFilterTokens[]} tokens - IFFilterTokens[] - the tokens to convert to a string
+ * @returns A string
+ */
+export declare function filtersTokensToString(tokens: IFFilterTokens[]): string;

package/dist/filters/helpers/filtersTokensToString.js

@@ -0,0 +1,16 @@
+import { FILTER_TOKENS_STRUCTURE_TYPE } from "../constants/common/FILTER_TOKENS_STRUCTURE_TYPE";
+/**
+ * It takes an array of tokens and returns a string
+ * @param {IFFilterTokens[]} tokens - IFFilterTokens[] - the tokens to convert to a string
+ * @returns A string
+ */
+export function filtersTokensToString(tokens) {
+    let str = "";
+    for (const token of tokens) {
+        if (token.type === FILTER_TOKENS_STRUCTURE_TYPE.SCOPE) {
+            str += `\n`;
+        }
+        str += `${token.token} `;
+    }
+    return str.trim();
+}

package/dist/filters/helpers/getTokensFromFilters.d.ts

@@ -0,0 +1,10 @@
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFTokensFromFiltersSettings } from "../interfaces/IFTokensFromFiltersSettings";
+import { IFFilterTokens } from "../interfaces/IFFilterTokens";
+/**
+ * It takes a filter object and returns an array of tokens that represent the filter
+ * @param {IFUData} filters - The filters object.
+ * @param {IFTokensFromFiltersSettings} options - IFTokensFromFiltersSettings
+ * @returns {IFFilterTokens[]} An array of tokens that represents the filters object
+ */
+export declare function getTokensFromFilters(filters: IFUData, options: IFTokensFromFiltersSettings): IFFilterTokens[];

package/dist/filters/helpers/getTokensFromFilters.js

@@ -0,0 +1,107 @@
+import { getUIValues } from "./ui/getUIValues";
+import { getFilterPropertyLabel } from "./ui/getFilterPropertyLabel";
+import { FILTER_TOKENS_STRUCTURE_TYPE } from "../constants/common/FILTER_TOKENS_STRUCTURE_TYPE";
+import { isEmpty } from "../../general/mix/isEmpty";
+/**
+ * It takes a filter object and returns an array of tokens that represent the filter
+ * @param {IFUData} filters - The filters object.
+ * @param {IFTokensFromFiltersSettings} options - IFTokensFromFiltersSettings
+ * @returns {IFFilterTokens[]} An array of tokens that represents the filters object
+ */
+export function getTokensFromFilters(filters, options) {
+    var _a, _b;
+    const tokens = [];
+    const i18nService = options.i18nService;
+    const settings = {
+        translate: i18nService.translate.bind(i18nService),
+    };
+    const getValue = (valueItem) => {
+        var _a;
+        if (valueItem.value) {
+            return ((_a = valueItem.displayed) !== null && _a !== void 0 ? _a : true) ? valueItem.value : "";
+        }
+        else if (valueItem.imageUrl) {
+            return `(${i18nService.translate("filter.value_container.no_label")})`;
+        }
+        return "";
+    };
+    for (const scope of filters.scopes) {
+        if (scope.datasets.length === 0)
+            continue;
+        if (options.showScope) {
+            tokens.push({
+                token: i18nService.translate(`filter.scope_title.${scope.scope.toLowerCase()}`) + ":",
+                type: FILTER_TOKENS_STRUCTURE_TYPE.SCOPE,
+            });
+        }
+        let thereIsFiltersWithValues = false;
+        for (const database of scope.datasets) {
+            if (database.filters.length === 0)
+                continue;
+            if (options.showDatabaseName) {
+                tokens.push({
+                    token: database.label + ":",
+                    type: FILTER_TOKENS_STRUCTURE_TYPE.DATABASE_NAME,
+                });
+            }
+            for (const [index, filter] of Object.entries(database.filters)) {
+                if (!(filter === null || filter === void 0 ? void 0 : filter.enabled))
+                    continue;
+                const values = 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) {
+                    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()}`) +
+                            ")";
+                }
+                tokens.push({
+                    token: columnLabel + ":",
+                    type: FILTER_TOKENS_STRUCTURE_TYPE.COLUMN_NAME,
+                });
+                const property = getFilterPropertyLabel(filter, settings.translate);
+                tokens.push({
+                    token: i18nService.translate(`filter.validators.${filter.validator.toLowerCase()}_label`) + (property ? ` (${property})` : ""),
+                    type: FILTER_TOKENS_STRUCTURE_TYPE.VALIDATOR,
+                });
+                let uiValue = values
+                    .map(getValue)
+                    .filter((value) => !isEmpty(value))
+                    .join(", ");
+                if (filter.selectAll) {
+                    if (isEmpty(uiValue)) {
+                        uiValue = i18nService.translate("filter_panel.card_all_selected");
+                    }
+                    else {
+                        uiValue = `${i18nService.translate("filter_panel.card_all_except")} ${uiValue}`;
+                    }
+                }
+                else {
+                    if (isEmpty(uiValue)) {
+                        uiValue = i18nService.translate("filter_panel.card_none_selected");
+                    }
+                }
+                tokens.push({
+                    token: uiValue,
+                    type: FILTER_TOKENS_STRUCTURE_TYPE.VALUE,
+                });
+                if (index === (database.filters.length - 1).toString(10)) {
+                    continue;
+                }
+                tokens.push({
+                    token: i18nService.translate(`filter.operators.${filter.operator.toLowerCase()}`),
+                    type: FILTER_TOKENS_STRUCTURE_TYPE.LOGICAL_OPERATOR,
+                });
+            }
+            if (!thereIsFiltersWithValues && options.showDatabaseName) {
+                tokens.pop();
+            }
+        }
+        if (!thereIsFiltersWithValues && options.showScope) {
+            tokens.pop();
+        }
+    }
+    return tokens;
+}

package/dist/filters/helpers/getVerboseFilter.d.ts

@@ -0,0 +1,9 @@
+import { IFUData } from "../interfaces/ui/IFUData";
+import { IFTokensFromFiltersSettings } from "../interfaces/IFTokensFromFiltersSettings";
+/**
+ * It takes a set of filters and returns a string that describes the filters
+ * @param {IFUData} filters - The filters object that you want to convert to a string.
+ * @param {IFTokensFromFiltersSettings} options - IFTokensFromFiltersSettings
+ * @returns A string
+ */
+export declare function getVerboseFilter(filters: IFUData, options: IFTokensFromFiltersSettings): string;

package/dist/filters/helpers/getVerboseFilter.js

@@ -0,0 +1,12 @@
+import { getTokensFromFilters } from "./getTokensFromFilters";
+import { filtersTokensToString } from "./filtersTokensToString";
+/**
+ * It takes a set of filters and returns a string that describes the filters
+ * @param {IFUData} filters - The filters object that you want to convert to a string.
+ * @param {IFTokensFromFiltersSettings} options - IFTokensFromFiltersSettings
+ * @returns A string
+ */
+export function getVerboseFilter(filters, options) {
+    const tokensFromFilters = getTokensFromFilters(filters, options);
+    return filtersTokensToString(tokensFromFilters);
+}

package/dist/filters/helpers/index.d.ts

@@ -6,4 +6,7 @@ export * from "./applyHierarchyForAggFilters";
 export * from "./getAvailableScopes";
 export * from "./getAvailableScopesIDsByConfig";
 export * from "./getScopesByHierarchy";
+export * from "./getTokensFromFilters";
+export * from "./filtersTokensToString";
+export * from "./getVerboseFilter";
 export * from "./OLD_getAggFilters";

package/dist/filters/helpers/index.js

@@ -6,4 +6,7 @@ export * from "./applyHierarchyForAggFilters";
 export * from "./getAvailableScopes";
 export * from "./getAvailableScopesIDsByConfig";
 export * from "./getScopesByHierarchy";
+export * from "./getTokensFromFilters";
+export * from "./filtersTokensToString";
+export * from "./getVerboseFilter";
 export * from "./OLD_getAggFilters";

package/dist/filters/helpers/ui/getUpdatedUIFilters.js

@@ -11,15 +11,14 @@ export function getUpdatedUIFilters(data, datasets = []) {
         return data;
     let updatedScopes = data.scopes.map((scopes) => {
         scopes.datasets = scopes.datasets.map((dataset) => {
-            const datasetInfo = datasets.find((dInfo) => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
+            const datasetInfo = datasets.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
             if (!isEmpty(datasetInfo))
                 dataset.label = datasetInfo.label;
             dataset.filters = dataset.filters.map((filter) => {
                 let columnInfo;
                 if (!isEmpty(datasetInfo))
                     columnInfo = datasetInfo.options.find((cInfo) => cInfo.id === filter.column.id &&
-                        cInfo.qrveyid === filter.column.qrveyid &&
-                        cInfo.linkid === filter.column.linkid);
+                        cInfo.qrveyid === filter.column.qrveyid);
                 if (!isEmpty(columnInfo)) {
                     filter.column.formulaType = columnInfo.formulaType;
                     filter.column.geogroup = columnInfo.geogroup;

package/dist/filters/helpers/ui/resolveUIFlatFilterByParams.js

@@ -6,12 +6,11 @@ import { isEmpty } from "../../../general/mix/isEmpty";
  * @returns true: the conditions are satisfied.
  */
 export function resolveUIFlatFilterByParams(filter, params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     return ((isEmpty(params.column) ||
         (filter.column.id === ((_a = params.column) === null || _a === void 0 ? void 0 : _a.id) &&
             filter.column.qrveyid === ((_b = params.column) === null || _b === void 0 ? void 0 : _b.qrveyid) &&
-            filter.column.linkid === ((_c = params.column) === null || _c === void 0 ? void 0 : _c.linkid) &&
-            filter.column.aggregate === ((_d = params.column) === null || _d === void 0 ? void 0 : _d.aggregate))) &&
+            filter.column.aggregate === ((_c = params.column) === null || _c === void 0 ? void 0 : _c.aggregate))) &&
         (isEmpty(params.scope) || filter.extras.scope === params.scope) &&
         (isEmpty(params.scopeid) || filter.extras.scopeid === params.scopeid) &&
         (isEmpty(params.panelid) || filter.extras.panelid === params.panelid) &&

package/dist/filters/interfaces/IFFilterTokens.d.ts

@@ -0,0 +1,5 @@
+import { FILTER_TOKENS_STRUCTURE_TYPE } from "../constants/common/FILTER_TOKENS_STRUCTURE_TYPE";
+export interface IFFilterTokens {
+    token: string;
+    type: FILTER_TOKENS_STRUCTURE_TYPE;
+}

package/dist/filters/interfaces/IFFilterTokens.js

@@ -0,0 +1 @@
+export {};

package/dist/filters/interfaces/IFTokensFromFiltersSettings.d.ts

@@ -0,0 +1,7 @@
+import { I18nService } from "../../globalization/service/i18nextBuilder";
+export interface IFTokensFromFiltersSettings {
+    showScope?: boolean;
+    showDatabaseName?: boolean;
+    showChartName?: boolean;
+    i18nService: I18nService;
+}

package/dist/filters/interfaces/IFTokensFromFiltersSettings.js

@@ -0,0 +1 @@
+export {};

package/dist/filters/interfaces/OLD_IFilterExpression.d.ts

@@ -9,7 +9,6 @@ export interface OLD_IFilterExpression {
     expressions?: OLD_IFilterExpression[];
     formulaType?: string;
     groupValue?: IFProperty;
-    linkid?: string;
     operator?: IFOperator;
     property?: IFProperty;
     qrveyid?: string;

package/dist/filters/interfaces/common/IFSDataset.d.ts

@@ -8,5 +8,4 @@ export interface IFSDataset {
     displayed: boolean;
     filters: IFSFilter[];
     qrveyid: string;
-    linkid?: string;
 }

package/dist/filters/interfaces/common/IFSParamsToGetFilter.d.ts

@@ -13,7 +13,6 @@ export interface IFSParamsToGetFilter {
     dateSection?: IFDateSection;
     enableds?: IFSParamsToGetFilterEnableds;
     chart?: IFUChartSettings;
-    linkid?: string;
     panelid?: string;
     property?: IFProperty;
     qrveyid?: string;

package/dist/filters/interfaces/index.d.ts

@@ -30,6 +30,8 @@ export * from "./IFStructureType";
 export * from "./IFValidator";
 export * from "./IFValidatorInfo";
 export * from "./IFValue";
+export * from "./IFTokensFromFiltersSettings";
+export * from "./IFFilterTokens";
 export * from "./OLD_IFilterData";
 export * from "./OLD_IFilterDetail";
 export * from "./OLD_IFilterExpression";

package/dist/filters/interfaces/index.js

@@ -30,6 +30,8 @@ export * from "./IFStructureType";
 export * from "./IFValidator";
 export * from "./IFValidatorInfo";
 export * from "./IFValue";
+export * from "./IFTokensFromFiltersSettings";
+export * from "./IFFilterTokens";
 export * from "./OLD_IFilterData";
 export * from "./OLD_IFilterDetail";
 export * from "./OLD_IFilterExpression";

package/dist/filters/services/UChartApi.js

@@ -83,7 +83,6 @@ export default class UChartApi {
                     {
                         questionid: column.id,
                         qrveyid: column.qrveyid,
-                        // linkid: column.linkid,
                         maxDataPoints: this._getMaxDataPoints(column, chartSettings),
                         type: column.type,
                         formulaType: column.type === "FORMULA" ? column.formulaType : undefined,
@@ -261,7 +260,7 @@ export default class UChartApi {
         let searchLogic;
         if (!isEmpty(uFilter.values)) {
             searchLogic = flatUIToOldLogic([
-                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
+                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign({}, uFilter.column) }),
             ]);
         }
         return searchLogic;

package/dist/filters/services/UChartPaginationApi.js

@@ -301,7 +301,7 @@ export default class UChartPaginationApi {
         let searchLogic;
         if (!isEmpty(uFilter.values)) {
             searchLogic = flatUIToOldLogic([
-                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
+                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign({}, uFilter.column) }),
             ]);
         }
         return searchLogic;

package/dist/format/definition.d.ts

@@ -18,7 +18,8 @@ export declare const enum LOCALE_FORMATS {
     CURRENCY = "Currency",
     PERCENTAGE = "Percentage",
     SCIENTIFIC = "Scientific",
-    ABBREVIATED = "Abbreviated"
+    ABBREVIATED = "Abbreviated",
+    DURATION = "Duration"
 }
 export declare const enum LOCALE_STYLES {
     DECIMAL = "decimal",

package/dist/format/format.js

@@ -8,6 +8,7 @@ import { COLUMN } from "../columns/constants/COLUMN";
 import { FORMULA } from "../formulas/constants/FORMULA";
 import { formatWithLocale } from "./localization";
 import { isObject } from "../general/object/isObject";
+import { DURATION_PARTS_LIST } from "../column_format/constants/DURATION_PARTS_LIST";
 dayjs.extend(advancedFormat); // Add support to advanced formats https://day.js.org/docs/en/plugin/advanced-format
 /**
  * Apply to the given date format to a date value
@@ -105,7 +106,9 @@ export const addFormat = (value, outputFormat = "None", config) => {
                     : outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format);
         case "NUMERIC": {
             const parse = parseFloat(value);
-            const withLocale = outputFormat !== "None" && (config === null || config === void 0 ? void 0 : config.lang);
+            const withLocale = (outputFormat !== "None" && (config === null || config === void 0 ? void 0 : config.lang)) ||
+                (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Duration" ||
+                DURATION_PARTS_LIST.includes[outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format];
             return isNaN(parse)
                 ? value
                 : withLocale

package/dist/format/localization.js

@@ -1,6 +1,7 @@
 import { DATETIME_COLUMN_FORMAT } from "../dates/constants/DATETIME_COLUMN_FORMAT";
 import { isEmpty } from "../general/mix/isEmpty";
 import { currencyISO, LANG_DEFAULT, CURRENCY_DEFAULT, DATETIME_OPTIONS, } from "./definition";
+import { DurationFormatter } from "./duration/durationFormatter";
 export const getLang = (locale) => {
     if (!locale)
         return;
@@ -55,10 +56,20 @@ function formatLocaleNumber(value, outputFormat, config) {
     const langOpts = options || getLocaleOptions(outputFormat);
     const valueToFormat = (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Percentage" /* LOCALE_FORMATS.PERCENTAGE */ ? value / 100 : value;
     try {
-        const key = lang + JSON.stringify(langOpts);
+        const key = (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) +
+            lang +
+            JSON.stringify(langOpts) +
+            ((outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.template) ? outputFormat.template : "");
         let formatter = NUMBER_FORMAT_CACHE[key];
         if (!formatter) {
-            formatter = new Intl.NumberFormat([lang, LANG_DEFAULT], langOpts);
+            const intlNumberFormat = new Intl.NumberFormat([lang, LANG_DEFAULT], langOpts);
+            formatter =
+                (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Duration" /* LOCALE_FORMATS.DURATION */
+                    ? new DurationFormatter({
+                        template: outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.template,
+                        intlNumberFormat,
+                    })
+                    : intlNumberFormat;
             NUMBER_FORMAT_CACHE[key] = formatter;
         }
         return formatter.format(valueToFormat);
@@ -107,6 +118,11 @@ function getLocaleOptions(outputFormat) {
                 maximumFractionDigits: decimals,
                 minimumFractionDigits: decimals,
             };
+        case "Duration" /* LOCALE_FORMATS.DURATION */:
+            return {
+                maximumFractionDigits: 0,
+                minimumFractionDigits: 0,
+            };
         default:
             return {
                 style: "decimal" /* LOCALE_STYLES.DECIMAL */,

package/dist/globalization/interfaces/chart_builder/II18nChartBuilderTableStyleOptions.d.ts

@@ -8,7 +8,11 @@ export interface II18nChartBuilderTableStyleOptions {
     typeface: string;
     weight: string;
     weight_bold: string;
+    weight_black: string;
+    weight_light: string;
+    weight_medium: string;
     weight_normal: string;
+    weight_thin: string;
     size: string;
     font_color: string;
     bg_color: string;

package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER_COMPARISION_OPTIONS.js

@@ -22,6 +22,6 @@ export const I18N_CHART_BUILDER_COMPARISION_OPTIONS = {
         time_period: "Time Period",
         type_change: "% Change",
         type_difference: "Difference",
-        does_not_apply: "N/A"
+        does_not_apply: "N/A",
     },
 };

package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.js

@@ -200,7 +200,11 @@ export const I18N_CHART_BUILDER_STYLE_OPTIONS = {
         typeface: "Typeface",
         weight: "Weight",
         weight_bold: "Bold",
-        weight_normal: "normal",
+        weight_black: "Black",
+        weight_light: "Light",
+        weight_medium: "Medium",
+        weight_normal: "Normal",
+        weight_thin: "Thin",
         size: "Size",
         font_color: "Font Color",
         bg_color: "BG Color",