npm - @qrvey/utils - Versions diffs - 1.4.2 → 1.4.5 - Mend

@qrvey/utils 1.4.2 → 1.4.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (60) hide show

package/README.md CHANGED Viewed

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.4.2*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.4.5*
 > Helper, Utils for all Qrvey Projects

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

@@ -45,11 +45,11 @@ const defineTableChartFormat = (column, settings) => {
         case COLUMN_1.COLUMN.TEXT_LABEL:
             return STRING_FORMAT_1.STRING_FORMAT.NONE;
         case COLUMN_1.COLUMN.DATE: {
-            if (selectedFormat)
-                return selectedFormat;
             if (noFormatSupported) {
                 return STRING_FORMAT_1.STRING_FORMAT.NONE;
             }
+            if (selectedFormat)
+                return selectedFormat;
             if (hasDefaultFormat) {
                 const columnDefaultFormat = defaultFormat ||
                     outputFormat || { type: "DATE", format: "MM/DD/YYYY" };

package/dist/cjs/columns/interfaces/IColumn.d.ts CHANGED Viewed

@@ -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/cjs/filters/adapters/FDToFlatUI.js CHANGED Viewed

@@ -40,13 +40,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 (!(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);
                         const info = !(0, isEmpty_1.isEmpty)(filter.extras.info)
                             ? {
                                 icon: filter.extras.info.icon,
@@ -63,8 +61,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: (0, get_1._get)(datasetInfo, "outputFormat"),
                                 type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,
                             },
@@ -84,7 +80,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/cjs/filters/adapters/FDToUI.js CHANGED Viewed

@@ -42,13 +42,12 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHER
         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 (!(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);
                     const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(filter.property);
                     return Object.assign(Object.assign({}, filter), { column: {
                             aggregate: filter.column.aggregate,
@@ -56,8 +55,6 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHER
                             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/cjs/filters/adapters/UIToFD.js CHANGED Viewed

@@ -42,7 +42,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/cjs/filters/adapters/UIToFlatUI.js CHANGED Viewed

@@ -38,13 +38,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 (!(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);
                         const info = !(0, isEmpty_1.isEmpty)(filter.extras.info)
                             ? {
                                 icon: filter.extras.info.icon,
@@ -61,8 +59,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,
                             },
@@ -82,7 +78,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/cjs/filters/adapters/UIToOldLogic.js CHANGED Viewed

@@ -75,7 +75,6 @@ function buildExpressions(filterSection, scope, dataset) {
             enabled: filter.enabled,
             formulaType: filter.column.formulaType,
             groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(filter),
-            linkid: filter.column.linkid,
             property: (0, getBackendProperty_1.getBackendProperty)(filter),
             qrveyid: filter.column.qrveyid,
             questionType: filter.column.type,
@@ -115,8 +114,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/cjs/filters/adapters/flatUIToFD.js CHANGED Viewed

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

package/dist/cjs/filters/adapters/flatUIToOldLogic.js CHANGED Viewed

@@ -53,7 +53,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,
@@ -147,7 +146,6 @@ function getRegularExpression(props) {
     const uiValue = getUIValuess(props);
     const expression = {
         groupValue: (0, getBackendGroupValue_1.getBackendGroupValue)(props),
-        linkid: props.column.linkid,
         property: (0, getBackendProperty_1.getBackendProperty)(props),
         qrveyid: props.column.qrveyid,
         questionid: props.column.id,

package/dist/cjs/filters/adapters/flatUIToUI.js CHANGED Viewed

@@ -41,7 +41,6 @@ function buildScopes(uFilters) {
             : -1;
         const lastUiFilterIndex = datasetIndex > -1
             ? (0, getLastIndexFromArray_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) {
@@ -88,7 +87,6 @@ function buildDataset(uFilter) {
         displayed: uFilter.extras.dataset.displayed,
         filters: undefined,
         label: uFilter.extras.dataset.label,
-        linkid: uFilter.extras.dataset.linkid,
     };
 }
 /**
@@ -112,8 +110,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,

package/dist/cjs/filters/adapters/logicToFlatUI.js CHANGED Viewed

@@ -65,7 +65,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_1.FILTER_SCOPE.GLOBAL
         ? (0, get_1._get)(scopeItem, "uiExtras.scopeid")
@@ -79,25 +79,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: (0, get_1._get)(uiExtras.column, "text") || (0, get_1._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,
@@ -106,10 +104,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: (0, get_1._get)(uiExtras.column, "dataset.name") ||
                     (0, get_1._get)(uiExtras.column, "label"),
-                linkid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.linkid,
             } }),
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,
@@ -149,7 +146,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 &&
         (0, get_1._get)(f.column, "aggregate.label") ===
             (0, get_1._get)(filter.column, "aggregate.label") &&
         f.extras.scope === filter.scope &&

package/dist/cjs/filters/adapters/transformFilters.js CHANGED Viewed

@@ -392,7 +392,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,
@@ -402,14 +401,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/cjs/filters/helpers/OLD_getAggFilters.js CHANGED Viewed

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

package/dist/cjs/filters/helpers/common/excludeFiltersByParams.js CHANGED Viewed

@@ -79,7 +79,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) &&
         ((0, isEmpty_1.isEmpty)(params.dateSection) ||
             params.dateSection !== filter.dateSection) &&
@@ -89,7 +89,6 @@ function resolveFilterConditions(filter, params) {
         ((0, isEmpty_1.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/cjs/filters/helpers/common/mergeFilters.js CHANGED Viewed

@@ -71,7 +71,6 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
         const dataset2Index = datasets2.findIndex((dataset2) => (0, resolveDatasetConditions_1.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/cjs/filters/helpers/common/resolveDatasetConditions.js CHANGED Viewed

@@ -21,10 +21,6 @@ function resolveDatasetConditions(dataset, params, letPassUndefinedProperties =
             (letPassUndefinedProperties && dataset.qrveyid == null) ||
             (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.qrveyid)) ||
             params.qrveyid === dataset.qrveyid) &&
-        (!(0, hasProperty_1._hasProperty)(params, "linkid") ||
-            (letPassUndefinedProperties && dataset.linkid == null) ||
-            (letPassUndefinedParams && (0, isEmpty_1.isEmpty)(params.linkid)) ||
-            params.linkid === dataset.linkid) &&
         dataset.filters.length > 0);
 }
 exports.resolveDatasetConditions = resolveDatasetConditions;

package/dist/cjs/filters/helpers/common/resolveFilterConditions.js CHANGED Viewed

@@ -12,7 +12,7 @@ const hasProperty_1 = require("../../../general/object/hasProperty");
  * @returns true: the condition is satisfied
  */
 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 ((!(0, hasProperty_1._hasProperty)(params, "enableds") ||
         !(0, hasProperty_1._hasProperty)(params.enableds, "filters") ||
         (letPassUndefinedProperties && filter.enabled == null) ||
@@ -41,9 +41,7 @@ function resolveFilterConditions(filter, params, letPassUndefinedProperties = fa
                 ((_b = params.column) === null || _b === void 0 ? void 0 : _b.id) === filter.column.id) &&
                 ((letPassUndefinedParams && (0, isEmpty_1.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 && (0, isEmpty_1.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 && (0, isEmpty_1.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 && (0, isEmpty_1.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))));
 }
 exports.resolveFilterConditions = resolveFilterConditions;

package/dist/cjs/filters/helpers/ui/getQrveyIdsByUIFilters.js CHANGED Viewed

@@ -9,7 +9,7 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
  */
 function getQrveyIdsByUIFilters(uiFilter) {
     const qrveyids = [];
-    if ((0, isEmpty_1.isEmpty)(uiFilter))
+    if ((0, isEmpty_1.isEmpty)(uiFilter) || (0, isEmpty_1.isEmpty)(uiFilter.scopes))
         return qrveyids;
     uiFilter.scopes.forEach((scope) => {
         if (!(0, isEmpty_1.isEmpty)(scope.datasets)) {

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

@@ -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 CHANGED Viewed

@@ -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/OLD_IFilterExpression.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

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

package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilter.d.ts CHANGED Viewed

@@ -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/services/UChartApi.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/general/object/removeUndefinedDeep.js CHANGED Viewed

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeUndefinedDeep = void 0;
-const isEmpty_1 = require("../mix/isEmpty");
 const cloneDeep_1 = require("./cloneDeep");
 const isObject_1 = require("./isObject");
 /**
@@ -15,7 +14,7 @@ function removeUndefinedDeep(obj) {
         if ((0, isObject_1.isObject)(_obj[key]) || Array.isArray(_obj[key])) {
             _obj[key] = removeUndefinedDeep(_obj[key]);
         }
-        else if ((0, isEmpty_1.isEmpty)(obj[key])) {
+        else if (obj[key] == null) {
             delete _obj[key];
         }
     });

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

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

package/dist/column_format/helpers/defineTableChartFormat.js CHANGED Viewed

@@ -42,11 +42,11 @@ export const defineTableChartFormat = (column, settings) => {
         case COLUMN.TEXT_LABEL:
             return STRING_FORMAT.NONE;
         case COLUMN.DATE: {
-            if (selectedFormat)
-                return selectedFormat;
             if (noFormatSupported) {
                 return STRING_FORMAT.NONE;
             }
+            if (selectedFormat)
+                return selectedFormat;
             if (hasDefaultFormat) {
                 const columnDefaultFormat = defaultFormat ||
                     outputFormat || { type: "DATE", format: "MM/DD/YYYY" };

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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,

package/dist/filters/adapters/logicToFlatUI.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/helpers/OLD_getAggFilters.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/ui/getQrveyIdsByUIFilters.js CHANGED Viewed

@@ -6,7 +6,7 @@ import { isEmpty } from "../../../general/mix/isEmpty";
  */
 export function getQrveyIdsByUIFilters(uiFilter) {
     const qrveyids = [];
-    if (isEmpty(uiFilter))
+    if (isEmpty(uiFilter) || isEmpty(uiFilter.scopes))
         return qrveyids;
     uiFilter.scopes.forEach((scope) => {
         if (!isEmpty(scope.datasets)) {

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

@@ -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 CHANGED Viewed

@@ -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/OLD_IFilterExpression.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

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

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

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

package/dist/filters/services/UChartApi.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/general/object/removeUndefinedDeep.js CHANGED Viewed

@@ -1,4 +1,3 @@
-import { isEmpty } from "../mix/isEmpty";
 import { cloneDeep } from "./cloneDeep";
 import { isObject } from "./isObject";
 /**
@@ -12,7 +11,7 @@ export function removeUndefinedDeep(obj) {
         if (isObject(_obj[key]) || Array.isArray(_obj[key])) {
             _obj[key] = removeUndefinedDeep(_obj[key]);
         }
-        else if (isEmpty(obj[key])) {
+        else if (obj[key] == null) {
             delete _obj[key];
         }
     });

package/dist/services/adapters/BColumnsToUIColumns.adapter.js CHANGED Viewed

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

package/dist/services/adapters/BDatasetsToUIDatasets.adapter.js CHANGED Viewed

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

package/dist/services/helpers/getDefaultQuestionListOptionsAttributes.js CHANGED Viewed

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

package/package.json CHANGED Viewed

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