@qrvey/utils 1.4.4 → 1.5.0-1

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

@@ -22,4 +22,7 @@ __exportStar(require("./applyHierarchyForAggFilters"), exports);
 __exportStar(require("./getAvailableScopes"), exports);
 __exportStar(require("./getAvailableScopesIDsByConfig"), exports);
 __exportStar(require("./getScopesByHierarchy"), exports);
+__exportStar(require("./getTokensFromFilters"), exports);
+__exportStar(require("./filtersTokensToString"), exports);
+__exportStar(require("./getVerboseFilter"), exports);
 __exportStar(require("./OLD_getAggFilters"), exports);

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

@@ -14,15 +14,14 @@ 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 (!(0, isEmpty_1.isEmpty)(datasetInfo))
                 dataset.label = datasetInfo.label;
             dataset.filters = dataset.filters.map((filter) => {
                 let columnInfo;
                 if (!(0, isEmpty_1.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 (!(0, isEmpty_1.isEmpty)(columnInfo)) {
                     filter.column.formulaType = columnInfo.formulaType;
                     filter.column.geogroup = columnInfo.geogroup;

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

@@ -9,12 +9,11 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
  * @returns true: the conditions are satisfied.
  */
 function resolveUIFlatFilterByParams(filter, params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     return (((0, isEmpty_1.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))) &&
         ((0, isEmpty_1.isEmpty)(params.scope) || filter.extras.scope === params.scope) &&
         ((0, isEmpty_1.isEmpty)(params.scopeid) || filter.extras.scopeid === params.scopeid) &&
         ((0, isEmpty_1.isEmpty)(params.panelid) || filter.extras.panelid === params.panelid) &&

package/dist/cjs/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/cjs/filters/interfaces/IFFilterTokens.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/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/cjs/filters/interfaces/IFTokensFromFiltersSettings.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/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/cjs/filters/interfaces/common/IFSDataset.d.ts

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

package/dist/cjs/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/cjs/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/cjs/filters/interfaces/index.js

@@ -46,6 +46,8 @@ __exportStar(require("./IFStructureType"), exports);
 __exportStar(require("./IFValidator"), exports);
 __exportStar(require("./IFValidatorInfo"), exports);
 __exportStar(require("./IFValue"), exports);
+__exportStar(require("./IFTokensFromFiltersSettings"), exports);
+__exportStar(require("./IFFilterTokens"), exports);
 __exportStar(require("./OLD_IFilterData"), exports);
 __exportStar(require("./OLD_IFilterDetail"), exports);
 __exportStar(require("./OLD_IFilterExpression"), exports);

package/dist/cjs/filters/services/UChartApi.js

@@ -88,7 +88,6 @@ 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,
@@ -266,7 +265,7 @@ class UChartApi {
         let searchLogic;
         if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
             searchLogic = (0, flatUIToOldLogic_1.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/cjs/filters/services/UChartPaginationApi.js

@@ -306,7 +306,7 @@ class UChartPaginationApi {
         let searchLogic;
         if (!(0, isEmpty_1.isEmpty)(uFilter.values)) {
             searchLogic = (0, flatUIToOldLogic_1.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/cjs/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/cjs/format/format.js

@@ -14,6 +14,7 @@ const COLUMN_1 = require("../columns/constants/COLUMN");
 const FORMULA_1 = require("../formulas/constants/FORMULA");
 const localization_1 = require("./localization");
 const isObject_1 = require("../general/object/isObject");
+const DURATION_PARTS_LIST_1 = require("../column_format/constants/DURATION_PARTS_LIST");
 dayjs_1.default.extend(advancedFormat_1.default); // Add support to advanced formats https://day.js.org/docs/en/plugin/advanced-format
 /**
  * Apply to the given date format to a date value
@@ -114,7 +115,9 @@ 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_1.DURATION_PARTS_LIST.includes[outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format];
             return isNaN(parse)
                 ? value
                 : withLocale

package/dist/cjs/format/localization.js

@@ -4,6 +4,7 @@ exports.formatWithLocale = exports.chooseLang = exports.getLang = void 0;
 const DATETIME_COLUMN_FORMAT_1 = require("../dates/constants/DATETIME_COLUMN_FORMAT");
 const isEmpty_1 = require("../general/mix/isEmpty");
 const definition_1 = require("./definition");
+const durationFormatter_1 = require("./duration/durationFormatter");
 const getLang = (locale) => {
     if (!locale)
         return;
@@ -61,10 +62,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, definition_1.LANG_DEFAULT], langOpts);
+            const intlNumberFormat = new Intl.NumberFormat([lang, definition_1.LANG_DEFAULT], langOpts);
+            formatter =
+                (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === "Duration" /* LOCALE_FORMATS.DURATION */
+                    ? new durationFormatter_1.DurationFormatter({
+                        template: outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.template,
+                        intlNumberFormat,
+                    })
+                    : intlNumberFormat;
             NUMBER_FORMAT_CACHE[key] = formatter;
         }
         return formatter.format(valueToFormat);
@@ -113,6 +124,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/cjs/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/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_COMPARISION_OPTIONS.js

@@ -25,6 +25,6 @@ exports.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/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_STYLE_OPTIONS.js

@@ -203,7 +203,11 @@ exports.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",

package/dist/cjs/globalization/service/i18nextBuilder.d.ts

@@ -1,8 +1,10 @@
+import { i18n } from "i18next";
 import { II18nResource } from "../interfaces/II18nResource";
 import { II18nServiceTranslateOption } from "../interfaces/II18nServiceTranslateOption";
 export declare class I18nServiceBuilder {
     static buildI18n(i18nDefault: II18nResource, i18nResource: II18nResource): Promise<I18nService>;
     private static _initI18n;
+    static getI18nInstance(i18nDefault: II18nResource, i18nResource: II18nResource, _i18next?: i18n): Promise<i18n>;
     static setTranslations(i18nDefault: any, i18nResource: II18nResource): II18nResource;
 }
 /**
@@ -17,3 +19,8 @@ export declare abstract class I18nService {
      */
     abstract translate(key: string, options?: II18nServiceTranslateOption): string;
 }
+export declare class I18nServiceConcrete extends I18nService {
+    _i18next: any;
+    constructor(i18nInstance: any);
+    translate(key: string, options?: II18nServiceTranslateOption): any;
+}

package/dist/cjs/globalization/service/i18nextBuilder.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.I18nService = exports.I18nServiceBuilder = void 0;
+exports.I18nServiceConcrete = exports.I18nService = exports.I18nServiceBuilder = void 0;
 const i18next_1 = __importDefault(require("i18next"));
 const mergeDeep_1 = require("../../general/object/mergeDeep");
 class I18nServiceBuilder {
@@ -22,23 +22,33 @@ class I18nServiceBuilder {
     static _initI18n(i18nDefault, i18nResource) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!i18next_1.default.isInitialized) {
-                yield i18next_1.default.init({
-                    lng: "en",
-                    debug: false,
-                    nsSeparator: false,
-                    keySeparator: ".",
-                    fallbackLng: false,
-                    defaultNS: "translation",
-                    resources: {
-                        en: {
-                            translation: this.setTranslations(i18nDefault, i18nResource),
-                        },
-                    },
-                });
+                yield this.getI18nInstance(i18nDefault, i18nResource, i18next_1.default);
             }
             return new I18nServiceConcrete(i18next_1.default);
         });
     }
+    static getI18nInstance(i18nDefault, i18nResource, _i18next) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let __i18next = _i18next;
+            if (!__i18next) {
+                __i18next = i18next_1.default.createInstance();
+            }
+            yield __i18next.init({
+                lng: "en",
+                debug: false,
+                nsSeparator: false,
+                keySeparator: ".",
+                fallbackLng: false,
+                defaultNS: "translation",
+                resources: {
+                    en: {
+                        translation: this.setTranslations(i18nDefault, i18nResource),
+                    },
+                },
+            });
+            return __i18next;
+        });
+    }
     static setTranslations(i18nDefault, i18nResource) {
         return (0, mergeDeep_1.mergeDeep)(i18nResource, i18nDefault, { mergeExistingValues: false });
     }
@@ -59,3 +69,4 @@ class I18nServiceConcrete extends I18nService {
         return this._i18next.t(`${key}`, options);
     }
 }
+exports.I18nServiceConcrete = I18nServiceConcrete;

package/dist/cjs/interfaces/format/IFormatOutputFormat.Interface.d.ts

@@ -4,4 +4,5 @@ export interface IFormatOutputFormat extends IFormatDefaultFormat {
     currency?: IFormatCurrency;
     backup_currency?: IFormatCurrency;
     originalFormat?: IFormatOutputFormat;
+    template?: string;
 }

package/dist/cjs/services/adapters/BColumnsToUIColumns.adapter.js

@@ -16,8 +16,6 @@ function BColumnsToUIColumns(columns = [], dataset) {
         id: column.id,
         imageUploadOption: column.imageUploadOption,
         label: column.text,
-        linked: column.linked,
-        linkid: (0, getAttribute_1.getAttribute)(dataset, "link_id") || (0, getAttribute_1.getAttribute)(column, "link_id"),
         outputFormat: column.outputFormat,
         property: column.property,
         qrveyid: (0, getAttribute_1.getAttribute)(dataset, "qrvey_id") || (0, getAttribute_1.getAttribute)(column, "qrvey_id"),

package/dist/cjs/services/adapters/BDatasetsToUIDatasets.adapter.js

@@ -7,7 +7,6 @@ function BDatasetsToUIDatasets(datasets = []) {
     return datasets.map((dataset) => ({
         qrveyid: (0, getAttribute_1.getAttribute)(dataset, "qrvey_id"),
         label: dataset.name,
-        linkid: (0, getAttribute_1.getAttribute)(dataset, "link_id"),
         options: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(dataset.options, dataset),
     }));
 }

package/dist/cjs/services/helpers/getDefaultQuestionListOptionsAttributes.js

@@ -7,8 +7,6 @@ function getDefaultQuestionListOptionsAttributes() {
         "text",
         "type",
         "property",
-        "linked",
-        "linkid",
         "qrveyid",
         "bucketId",
         "formulaId",

package/dist/column_format/constants/DURATION_PARTS_LIST.d.ts

@@ -0,0 +1 @@
+export declare const DURATION_PARTS_LIST: string[];

package/dist/column_format/constants/DURATION_PARTS_LIST.js

@@ -0,0 +1,9 @@
+export const DURATION_PARTS_LIST = [
+    "D[d] HH[h] mm[m] ss[s]",
+    "HH:mm:ss",
+    "HH:mm",
+    "HH",
+    "mm",
+    "ss",
+    "SSS",
+];

package/dist/column_format/constants/index.d.ts

@@ -4,3 +4,4 @@ export * from "./DATEGROUP_WITHOUT_FORMAT";
 export * from "./SHELF_TYPE";
 export * from "./STRING_FORMAT";
 export * from "./TABLE_TYPE";
+export * from "./DURATION_PARTS_LIST";

package/dist/column_format/constants/index.js

@@ -4,3 +4,4 @@ export * from "./DATEGROUP_WITHOUT_FORMAT";
 export * from "./SHELF_TYPE";
 export * from "./STRING_FORMAT";
 export * from "./TABLE_TYPE";
+export * from "./DURATION_PARTS_LIST";

package/dist/column_format/helpers/defineXYChartFormat.js

@@ -4,6 +4,7 @@ import { isEmpty } from "../../general/mix/isEmpty";
 import { CALCULATION_LABEL } from "../../qrvey/constants/CALCULATION_LABEL";
 import { CHART_GROUPS } from "../constants/CHART_GROUP";
 import { DATEGROUP_UNSUPPORT_FORMAT } from "../constants/DATEGROUP_UNSUPPORT_FORMAT";
+import { DURATION_PARTS_LIST } from "../constants/DURATION_PARTS_LIST";
 import { STRING_FORMAT } from "../constants/STRING_FORMAT";
 import { columnTypeByChart } from "./columnTypeByChart";
 /**
@@ -34,6 +35,8 @@ export const defineXYChartFormat = (column, settings) => {
     const hasDefaultFormat = isEmpty(selectedFormat) ||
         (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText ||
         (selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText;
+    const newOutputFormat = DURATION_PARTS_LIST.includes(outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format)
+        ? Object.assign(Object.assign({}, outputFormat), { template: outputFormat.format, format: "Duration" }) : outputFormat;
     switch (columnType) {
         case COLUMN.YES_NO:
         case COLUMN.PHONE:
@@ -79,7 +82,7 @@ export const defineXYChartFormat = (column, settings) => {
                     return columnDefaultFormat;
                 }
                 else if (hasDefaultFormat) {
-                    return Object.assign({}, outputFormat);
+                    return Object.assign({}, newOutputFormat);
                 }
                 else
                     return selectedFormat;

package/dist/columns/interfaces/IColumn.d.ts

@@ -18,7 +18,6 @@ export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId
     expressionWords?: IBColumnAnswerExpressionWord[];
     formulaid?: string;
     label?: string;
-    linkid?: string;
     lookupValue?: IBColumnAnswerLookupValueValue;
     property?: IColumnPropertyType;
     slidebarValue?: number;

package/dist/filters/adapters/FDToFlatUI.js

@@ -36,13 +36,11 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
             scope.datasets.forEach((dataset) => {
                 if (dataset.filters.length > 0) {
                     dataset.filters.forEach((filter) => {
-                        const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid &&
-                            dInfo.linkid === dataset.linkid);
+                        const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
                         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);
                         const info = !isEmpty(filter.extras.info)
                             ? {
                                 icon: filter.extras.info.icon,
@@ -59,8 +57,6 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                                 aggregate: filter.column.aggregate,
                                 calculation: filter.column.calculation,
                                 label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
-                                linkid: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid,
-                                linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
                                 outputFormat: _get(datasetInfo, "outputFormat"),
                                 type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
                             },
@@ -80,7 +76,6 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
                                     label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label,
-                                    linkid: dataset.linkid,
                                 } }),
                             filterid: filter.filterid,
                             lookupDisplayIndex: filter.lookupDisplayIndex,

package/dist/filters/adapters/FDToUI.js

@@ -38,13 +38,12 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION.ANYWHERE, enabled = true
         scopes: [],
     };
     ufData.scopes = scopes.map((scope) => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map((dataset) => {
-            const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
+            const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
             return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label, 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);
                     const property = adaptDateGroupingProperty(filter.property);
                     return Object.assign(Object.assign({}, filter), { column: {
                             aggregate: filter.column.aggregate,
@@ -52,8 +51,6 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION.ANYWHERE, enabled = true
                             formulaType: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.formulaType,
                             id: filter.column.id,
                             label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
-                            linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
-                            linkid: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
                             outputFormat: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.outputFormat,
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,

package/dist/filters/adapters/UIToFD.js

@@ -38,7 +38,6 @@ function UI21ToFD(uFilterData, version) {
                     delete filter.column.outputFormat;
                     delete filter.column.sorting;
                     delete filter.column.uniqueid;
-                    delete filter.column.linked;
                 });
             });
             scopes.push(scope);

package/dist/filters/adapters/UIToFlatUI.js

@@ -34,13 +34,11 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
             scope.datasets.forEach((dataset) => {
                 if (dataset.filters.length > 0) {
                     dataset.filters.forEach((filter) => {
-                        const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid &&
-                            dInfo.linkid === dataset.linkid);
+                        const datasetInfo = datasetsInfo.find((dInfo) => dInfo.qrveyid === dataset.qrveyid);
                         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);
                         const info = !isEmpty(filter.extras.info)
                             ? {
                                 icon: filter.extras.info.icon,
@@ -57,8 +55,6 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                                 aggregate: filter.column.aggregate,
                                 calculation: filter.column.calculation,
                                 label: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label) || filter.column.label,
-                                linkid: filter.column.linkid,
-                                linked: filter.column.linked,
                                 outputFormat: filter.column.outputFormat,
                                 type: filter.column.type,
                             },
@@ -78,7 +74,6 @@ function UI21ToFlatUI(scopes = [], datasetsInfo = []) {
                                     enabled: dataset.enabled,
                                     displayed: dataset.enabled,
                                     label: dataset.label,
-                                    linkid: dataset.linkid,
                                 } }),
                             filterid: filter.filterid,
                             lookupDisplayIndex: filter.lookupDisplayIndex,

package/dist/filters/adapters/UIToOldLogic.js

@@ -71,7 +71,6 @@ function buildExpressions(filterSection, scope, dataset) {
             enabled: filter.enabled,
             formulaType: filter.column.formulaType,
             groupValue: getBackendGroupValue(filter),
-            linkid: filter.column.linkid,
             property: getBackendProperty(filter),
             qrveyid: filter.column.qrveyid,
             questionType: filter.column.type,
@@ -111,8 +110,6 @@ const getFilterDetail = (filter, scope, dataset) => {
             aggregate: filter.column.aggregate,
             calculation: filter.column.calculation,
             formulaType: filter.column.formulaType,
-            linked: undefined,
-            linkid: filter.column.linkid,
             outputFormat: filter.column.outputFormat,
             property: filter.column.property,
             sorting: filter.column.sorting,

package/dist/filters/adapters/flatUIToFD.js

@@ -73,7 +73,6 @@ function buildDataset(uFilter) {
         enabled: uFilter.extras.dataset.enabled,
         displayed: uFilter.extras.dataset.displayed,
         filters: undefined,
-        linkid: uFilter.extras.dataset.linkid,
     };
 }
 /**

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -49,7 +49,6 @@ const flatUIToOldFilterDetail = (uFilters = []) => {
                 calculation: filter.column.calculation,
                 formulaType: filter.column.formulaType,
                 linked: undefined,
-                linkid: filter.column.linkid,
                 outputFormat: filter.column.outputFormat,
                 property: filter.column.property,
                 sorting: filter.column.sorting,
@@ -141,7 +140,6 @@ function getRegularExpression(props) {
     const uiValue = getUIValuess(props);
     const expression = {
         groupValue: getBackendGroupValue(props),
-        linkid: props.column.linkid,
         property: getBackendProperty(props),
         qrveyid: props.column.qrveyid,
         questionid: props.column.id,

package/dist/filters/adapters/flatUIToUI.js

@@ -37,7 +37,6 @@ function buildScopes(uFilters) {
             : -1;
         const lastUiFilterIndex = datasetIndex > -1
             ? getLastIndexFromArray(scopes[scopeIndex].datasets[datasetIndex].filters, (uf) => uf.column.id === uiFilter.column.id &&
-                uf.column.linkid === uFilter.column.linkid &&
                 uf.column.qrveyid === uFilter.column.qrveyid)
             : -1;
         if (scopeIndex === -1) {
@@ -84,7 +83,6 @@ function buildDataset(uFilter) {
         displayed: uFilter.extras.dataset.displayed,
         filters: undefined,
         label: uFilter.extras.dataset.label,
-        linkid: uFilter.extras.dataset.linkid,
     };
 }
 /**
@@ -108,8 +106,6 @@ function buildFilter(uFilter) {
             formulaType: uFilter.column.formulaType,
             id: uFilter.column.id,
             label: uFilter.column.label,
-            linked: uFilter.column.linked,
-            linkid: uFilter.column.linkid,
             outputFormat: uFilter.column.outputFormat,
             property: uFilter.column.property,
             qrveyid: uFilter.column.qrveyid,