@qrvey/utils 1.3.0-7 → 1.3.0

package/dist/cjs/qrvey/helpers/index.d.ts

@@ -1,6 +1,7 @@
 export * from './areStaticColumnValues';
 export * from './getCategorizableExpression';
 export * from './getDataAnswersByColumn';
+export * from './getDatasetByColumn';
 export * from './getDropdownAnswers';
 export * from './getExpressionAnswers';
 export * from './getImageAnswers';

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

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./areStaticColumnValues"), exports);
 __exportStar(require("./getCategorizableExpression"), exports);
 __exportStar(require("./getDataAnswersByColumn"), exports);
+__exportStar(require("./getDatasetByColumn"), exports);
 __exportStar(require("./getDropdownAnswers"), exports);
 __exportStar(require("./getExpressionAnswers"), exports);
 __exportStar(require("./getImageAnswers"), exports);

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

@@ -11,9 +11,9 @@ const BColumnsToUIColumns_adapter_1 = require("./BColumnsToUIColumns.adapter");
 function BBranchesMapToUIBranchesMap(branchesMap) {
     if ((0, isEmpty_1.isEmpty)(branchesMap))
         return [];
-    return branchesMap.map(branchesMap => ({
-        questionid: branchesMap.questionid,
-        branches: branchesMap.branches.map(branch => ({
+    return branchesMap.map(branchMap => ({
+        questionid: branchMap.questionid,
+        branches: branchMap.branches.map(branch => ({
             columns: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(branch.questions.data)
         }))
     }));

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

@@ -1,25 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BColumnsToUIColumns = void 0;
+const getAttribute_1 = require("../../general/object/getAttribute");
 function BColumnsToUIColumns(columns = [], dataset) {
     return columns.map(column => ({
         answers: column.answers,
-        bucketid: column.bucketId,
+        bucketid: (0, getAttribute_1.getAttribute)(column, 'bucket_id'),
         expressionCategory: column.activeCat,
         expressionNegative: column.negative,
         expressionPositive: column.positive,
         expressionWords: column.words,
-        formulaid: column.formulaId,
+        formulaid: (0, getAttribute_1.getAttribute)(column, 'formula_id'),
         formulaType: column.formulaType,
         geogroup: column.geogroup,
         id: column.id,
         imageUploadOption: column.imageUploadOption,
         label: column.text,
         linked: column.linked,
-        linkid: (dataset === null || dataset === void 0 ? void 0 : dataset.linkid) || column.linkid,
+        linkid: (0, getAttribute_1.getAttribute)(dataset, 'link_id') || (0, getAttribute_1.getAttribute)(column, 'link_id'),
         outputFormat: column.outputFormat,
         property: column.property,
-        qrveyid: (dataset === null || dataset === void 0 ? void 0 : dataset.qrveyid) || column.qrveyid,
+        qrveyid: (0, getAttribute_1.getAttribute)(dataset, 'qrvey_id') || (0, getAttribute_1.getAttribute)(column, 'qrvey_id'),
         slidebarValue: column.sliderVal,
         lookupValue: column.value,
         type: column.type,

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

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BDatasetsToUIDatasets = void 0;
+const getAttribute_1 = require("../../general/object/getAttribute");
 const BColumnsToUIColumns_adapter_1 = require("./BColumnsToUIColumns.adapter");
 function BDatasetsToUIDatasets(datasets = []) {
     return datasets.map(dataset => ({
-        qrveyid: dataset.qrveyid,
+        qrveyid: (0, getAttribute_1.getAttribute)(dataset, 'qrvey_id'),
         label: dataset.name,
-        linkid: dataset.linkid,
+        linkid: (0, getAttribute_1.getAttribute)(dataset, 'link_id'),
         options: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(dataset.options, dataset),
     }));
 }

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

@@ -12,7 +12,7 @@ function BModelToUIModel(model) {
         appid: model.appid,
         branchesMap: (0, BBranchesMapToUIBranchesMap_adapter_1.BBranchesMapToUIBranchesMap)(model.branchesMap),
         columnOrder: model.questionOrder,
-        columns: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(model.questions.data),
+        columns: (0, BColumnsToUIColumns_adapter_1.BColumnsToUIColumns)(model.questions.data, { qrveyid: model.qrveyid }),
         createDate: model.createDate,
         datalinkInfo: model.datalinkInfo,
         modifyDate: model.modifyDate,

package/dist/column_format/helpers/defineXYChartFormat.js

@@ -13,6 +13,7 @@ import { columnTypeByChart } from "./columnTypeByChart";
 export const defineXYChartFormat = (column, settings) => {
     const { aggregate, type, defaultFormat, outputFormat, selectedFormat, dateGroup } = column;
     const { shelfType, withoutFormat } = settings;
+    const columnDefaultFormat = defaultFormat || outputFormat;
     //Defaults
     const defaultText = 'Default';
     //const defaultNumeric = { type: 'NUMERIC', format: 'Numeric' };
@@ -20,7 +21,7 @@ export const defineXYChartFormat = (column, settings) => {
     const columnType = columnTypeByChart(column, shelfType, CHART_GROUPS.XY);
     const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some(gp => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
     const isUsedAsNumericColumn = type !== columnType;
-    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 hasDefaultFormat = isEmpty(selectedFormat) || ((outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText) || ((selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText);
     switch (columnType) {
         case COLUMN.YES_NO:
         case COLUMN.PHONE:
@@ -38,7 +39,7 @@ export const defineXYChartFormat = (column, settings) => {
                 return STRING_FORMAT.NONE;
             }
             else if (hasDefaultFormat) {
-                return Object.assign(Object.assign({}, defaultFormat), { format: defaultText, originalFormat: Object.assign({}, outputFormat) });
+                return Object.assign(Object.assign({}, columnDefaultFormat), { format: defaultText, originalFormat: Object.assign({}, outputFormat) });
             }
             else {
                 return selectedFormat;
@@ -59,7 +60,7 @@ export const defineXYChartFormat = (column, settings) => {
             }
             else {
                 if (withoutFormat === true) {
-                    return defaultFormat;
+                    return columnDefaultFormat;
                 }
                 else if (hasDefaultFormat) {
                     return Object.assign({}, outputFormat);

package/dist/columns/helpers/getDatasetColumnByDatasets.d.ts

@@ -0,0 +1,10 @@
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { IColumn } from "../interfaces/IColumn";
+/**
+ * Gets a column from a dataset.
+ * Recieves a partial column object and received a full column object from the Dataset
+ * @param column a partial column object
+ * @param datasets the datasets to look for the colun
+ * @returns the Column object
+ */
+export declare function getDatasetColumnByDatasets(column: Partial<IColumn>, datasets: IDataset[]): IColumn;

package/dist/columns/helpers/getDatasetColumnByDatasets.js

@@ -0,0 +1,15 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { getDatasetColumn } from "./getDatasetColumn";
+/**
+ * Gets a column from a dataset.
+ * Recieves a partial column object and received a full column object from the Dataset
+ * @param column a partial column object
+ * @param datasets the datasets to look for the colun
+ * @returns the Column object
+ */
+export function getDatasetColumnByDatasets(column, datasets) {
+    if (isEmpty(column) || isEmpty(datasets))
+        return;
+    const dataset = datasets.find(_dataset => _dataset.qrveyid === column.qrveyid);
+    return getDatasetColumn(column, dataset);
+}

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

@@ -1,7 +1,6 @@
 export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
 export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
+export * from './getDatasetColumnByDatasets';
 export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';

package/dist/columns/helpers/index.js

@@ -1,7 +1,6 @@
 export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
 export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
+export * from './getDatasetColumnByDatasets';
 export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';

package/dist/dates/adapters/index.d.ts

@@ -1,3 +1,9 @@
+export * from './dateToHms';
+export * from './dateToMdyDate';
+export * from './dateToMonthYear';
+export * from './dateToQuarterYear';
+export * from './dateToWeekYear';
+export * from './dateToYear';
 export * from './mdyDateToDate';
 export * from './monthYearToDate';
 export * from './quarterYearToDate';

package/dist/dates/adapters/index.js

@@ -1,3 +1,9 @@
+export * from './dateToHms';
+export * from './dateToMdyDate';
+export * from './dateToMonthYear';
+export * from './dateToQuarterYear';
+export * from './dateToWeekYear';
+export * from './dateToYear';
 export * from './mdyDateToDate';
 export * from './monthYearToDate';
 export * from './quarterYearToDate';

package/dist/filters/adapters/FDToLogic.js

@@ -25,8 +25,9 @@ export function FDToLogic(filterData) {
  * @returns a filter logic array
  */
 function getLogicBodyFromFD21(filterData) {
-    let logics = [];
-    logics = filterData.scopes.reduce((logics, scope) => {
+    if (isEmpty(filterData))
+        return [];
+    return filterData.scopes.reduce((logics, scope) => {
         const logic = buildLogic(scope);
         let filters = [];
         if (scope.datasets.length > 0) {
@@ -38,7 +39,6 @@ function getLogicBodyFromFD21(filterData) {
         logics.push(Object.assign(Object.assign({}, logic), { filters }));
         return logics;
     }, []);
-    return logics;
 }
 function buildLogic(scopeSection) {
     return {

package/dist/filters/helpers/backend/getLogicByDatasets.d.ts

@@ -0,0 +1,11 @@
+import { IFBLogic } from "../../interfaces/backend/IFBLogic";
+import { IFFGetLogicByDatasets } from "../../interfaces/functions/IFFGetLogicByDatasets";
+/**
+ * [TODO: Add filterEmptyArrays to the filterNestedTree filter condition. Firstly, that function should accept this argument]
+ * Filters the logic by a qrveyids array
+ * If an qrveyid is not provided in the expression the filter passes normally
+ * @param logic The logic of the filter
+ * @param datasets The collection of qrveyids
+ * @returns a new filtered logic
+ */
+export declare function getLogicByDatasets(logic: IFBLogic[], datasets?: string[], settings?: IFFGetLogicByDatasets): IFBLogic[];

package/dist/filters/helpers/backend/getLogicByDatasets.js

@@ -0,0 +1,30 @@
+import { filterNestedTree, _hasProperty } from "../../../general";
+import { isEmpty } from "../../../general/mix/isEmpty";
+/**
+ * [TODO: Add filterEmptyArrays to the filterNestedTree filter condition. Firstly, that function should accept this argument]
+ * Filters the logic by a qrveyids array
+ * If an qrveyid is not provided in the expression the filter passes normally
+ * @param logic The logic of the filter
+ * @param datasets The collection of qrveyids
+ * @returns a new filtered logic
+ */
+export function getLogicByDatasets(logic, datasets = [], settings) {
+    if (isEmpty(logic))
+        return;
+    if (isEmpty(datasets))
+        return logic;
+    settings = getGetLogicByDatasetsSettings(settings);
+    return logic.map(_l => (Object.assign(Object.assign({}, _l), { filters: filterNestedTree(_l.filters, 'expressions', (expression) => {
+            const dataset = datasets.find(_data => _data === expression.qrveyid);
+            return (settings.letPassUndefinedProperties.qrveyid && !_hasProperty(expression, 'qrveyid')) || !isEmpty(dataset);
+        }) })));
+}
+function getGetLogicByDatasetsSettings(settings) {
+    var _a, _b, _c;
+    return {
+        filterEmptyArrays: (_a = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) !== null && _a !== void 0 ? _a : true,
+        letPassUndefinedProperties: {
+            qrveyid: (_c = (_b = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _b === void 0 ? void 0 : _b.qrveyid) !== null && _c !== void 0 ? _c : true
+        }
+    };
+}

package/dist/filters/helpers/backend/getLogicByDatasetsColumns.d.ts

@@ -0,0 +1,12 @@
+import { IDataset } from "../../../qrvey/interfaces/IDataset";
+import { IFBLogic } from "../../interfaces/backend/IFBLogic";
+import { IFFGetLogicByDatasetsColumns } from "../../interfaces/functions/IFFGetLogicByDatasetsColumns";
+/**
+ * @todo MODULE NO READY
+ * Filters the logic by a datasets array
+ * If an qrveyid is not provided in the expression a the filter passes normally
+ * @param logic The logic of the filter
+ * @param datasets The collection of datasets
+ * @returns a new filtered logic
+ */
+export declare function getLogicByDatasetsColumns(logic: IFBLogic[], datasets?: IDataset[], settings?: IFFGetLogicByDatasetsColumns): IFBLogic[];

package/dist/filters/helpers/backend/getLogicByDatasetsColumns.js

@@ -0,0 +1,43 @@
+import { filterNestedTree } from "../../../general/array/filterNestedTree";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { _hasProperty } from "../../../general/object/hasProperty";
+/**
+ * @todo MODULE NO READY
+ * Filters the logic by a datasets array
+ * If an qrveyid is not provided in the expression a the filter passes normally
+ * @param logic The logic of the filter
+ * @param datasets The collection of datasets
+ * @returns a new filtered logic
+ */
+export function getLogicByDatasetsColumns(logic, datasets = [], settings) {
+    if (isEmpty(logic))
+        return;
+    if (isEmpty(datasets))
+        return logic;
+    settings = getGetLogicByDatasetsSettings(settings);
+    return logic.map(_l => (Object.assign(Object.assign({}, _l), { filters: filterNestedTree(_l.filters, 'expressions', (expression) => {
+            const letQrveyidPass = settings.letPassUndefinedProperties.qrveyid || _hasProperty(expression, 'qrveyid');
+            let letQuestionidPass = settings.letPassUndefinedProperties.questionid || _hasProperty(expression, 'questionid');
+            const dataset = letQrveyidPass ? datasets.find(_data => _data.qrveyid === expression.qrveyid) : undefined;
+            if (!isEmpty(dataset)) {
+                const column = letQuestionidPass ? (dataset.options || []).find(option => option.id === expression.questionid) : undefined;
+                letQuestionidPass = letQuestionidPass || !isEmpty(column);
+            }
+            return (letQrveyidPass && !isEmpty(dataset)) && letQuestionidPass;
+        }) })));
+}
+/**
+ * Gets the default settings for the getLogicByDatasetsColumn function
+ * @param settings the settings given by the implementer
+ * @returns an object with all properties set
+ */
+function getGetLogicByDatasetsSettings(settings) {
+    var _a, _b, _c, _d, _e;
+    return {
+        filterEmptyArrays: (_a = settings === null || settings === void 0 ? void 0 : settings.filterEmptyArrays) !== null && _a !== void 0 ? _a : true,
+        letPassUndefinedProperties: {
+            qrveyid: (_c = (_b = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _b === void 0 ? void 0 : _b.qrveyid) !== null && _c !== void 0 ? _c : true,
+            questionid: (_e = (_d = settings === null || settings === void 0 ? void 0 : settings.letPassUndefinedProperties) === null || _d === void 0 ? void 0 : _d.questionid) !== null && _e !== void 0 ? _e : true
+        }
+    };
+}

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

@@ -6,5 +6,7 @@ export * from './getBackendGroupValue';
 export * from './getBackendProperty';
 export * from './getBackendValidator';
 export * from './getBackendValues';
+export * from './getLogicByDatasets';
+export * from './getLogicByDatasetsColumns';
 export * from './getLogicByScopes';
 export * from './getLogicByScopesHierarchy';

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

@@ -6,6 +6,8 @@ export * from './getBackendGroupValue';
 export * from './getBackendProperty';
 export * from './getBackendValidator';
 export * from './getBackendValues';
+export * from './getLogicByDatasets';
+export * from './getLogicByDatasetsColumns';
 export * from './getLogicByScopes';
 export * from './getLogicByScopesHierarchy';
 // export * from './hasDatasetRelatedFilters';

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

@@ -28,7 +28,7 @@ export function excludeFiltersByParams(filterData, params) {
                                     return Object.assign(Object.assign({}, filter), { values: (filter.values || []).map((value) => {
                                             if (Array.isArray(value) && value.length > 0) {
                                                 const rankingValues = value;
-                                                rankingValues.map(rValue => {
+                                                return rankingValues.map(rValue => {
                                                     if (params.enableds == null || params.enableds === rValue.enabled)
                                                         return rValue;
                                                 }).filter(Boolean);

package/dist/filters/helpers/common/getFiltersByDatasetsColumns.d.ts

@@ -0,0 +1,10 @@
+import { IDataset } from "../../../qrvey/interfaces/IDataset";
+import { IFUData } from "../../interfaces/ui/IFUData";
+/**
+ * Filtering the filters by the columns of datasets.
+ * Module specially for CLS.
+ * @param data the filter data
+ * @param datasets the collection of datasets and their columns
+ * @returns A new filter data with the filtered filters by columns
+ */
+export declare function getFiltersByDatasetsColumns(data: IFUData, datasets?: IDataset[]): IFUData;

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

@@ -0,0 +1,28 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+/**
+ * Filtering the filters by the columns of datasets.
+ * Module specially for CLS.
+ * @param data the filter data
+ * @param datasets the collection of datasets and their columns
+ * @returns A new filter data with the filtered filters by columns
+ */
+export function getFiltersByDatasetsColumns(data, datasets = []) {
+    if (isEmpty(data) || isEmpty(data.scopes))
+        return;
+    if (isEmpty(datasets))
+        return data;
+    const newData = Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
+                const dataset = datasets.find(_data => _data.qrveyid === filterDataset.qrveyid);
+                if (!isEmpty(dataset)) {
+                    return Object.assign(Object.assign({}, filterDataset), { filters: filterDataset.filters.map(filter => {
+                            const column = (dataset.options || []).find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid);
+                            if (!isEmpty(column)) {
+                                return Object.assign({}, filter);
+                            }
+                        }).filter(Boolean) });
+                }
+            }).filter(dataset => !isEmpty(dataset) && dataset.filters.length > 0) }))).filter(scope => !isEmpty(scope) && scope.datasets.length > 0) });
+    if (!isEmpty(newData) && newData.scopes.length > 0) {
+        return newData;
+    }
+}

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

@@ -6,6 +6,7 @@ export * from './getFilterColumnLabel';
 export * from './getFilterid';
 export * from './getFilterLabel';
 export * from './getFiltersByAggregateColumn';
+export * from './getFiltersByDatasetsColumns';
 export * from './getFiltersByParams';
 export * from './getFiltersByScopes';
 export * from './getFiltersByScopesIds';

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

@@ -6,6 +6,7 @@ export * from './getFilterColumnLabel';
 export * from './getFilterid';
 export * from './getFilterLabel';
 export * from './getFiltersByAggregateColumn';
+export * from './getFiltersByDatasetsColumns';
 export * from './getFiltersByParams';
 export * from './getFiltersByScopes';
 export * from './getFiltersByScopesIds';

package/dist/filters/helpers/getAvailableScopes.js

@@ -14,18 +14,18 @@ export function getAvailableScopes(config) {
     if (!isEmpty(config.predefinedScopes))
         scopes = config.predefinedScopes;
     scopes = [...scopes, { label: FILTER_SCOPE.GLOBAL, id: undefined }];
-    if (config.tabid != null || config.pageid != null) {
+    if (config.tabid != null || config.pageid != null || config.panelid != null) {
         if (config.pageid)
             scopes = [...scopes, { label: FILTER_SCOPE.PAGE, id: config.pageid }];
         if (config.tabid)
             scopes = [...scopes, { label: FILTER_SCOPE.TAB, id: config.tabid }];
         if (config.defaultid)
             scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
-        scopes = [...scopes, { label: FILTER_SCOPE.CHART, id: config.tabid || config.pageid }];
+        if (config.panelid || config.tabid || config.pageid)
+            scopes = [...scopes, { label: FILTER_SCOPE.CHART, id: config.panelid || config.tabid || config.pageid }];
     }
-    else {
-        if (config.defaultid)
-            scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
+    else if (config.defaultid) {
+        scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
     }
     return scopes;
 }

package/dist/filters/interfaces/backend/IFBExpression.d.ts

@@ -7,6 +7,7 @@ import { IFProperty } from "../IFProperty";
 export interface IFBExpression {
     enabled?: boolean;
     groupValue?: IFProperty;
+    qrveyid?: string;
     questionid?: string;
     questionType?: string;
     property?: IFProperty;

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

@@ -9,6 +9,7 @@ export interface IFSAvailableScope {
     qrveyid?: string;
     tabid?: string;
     pageid?: string;
+    panelid?: string;
     defaultid?: string;
     predefinedScopes?: IFSScopeID[];
 }

package/dist/filters/interfaces/functions/IFFGetLogicByDatasets.d.ts

@@ -0,0 +1,6 @@
+export interface IFFGetLogicByDatasets {
+    letPassUndefinedProperties?: {
+        qrveyid?: boolean;
+    };
+    filterEmptyArrays?: boolean;
+}

package/dist/filters/interfaces/functions/IFFGetLogicByDatasets.js

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

package/dist/filters/interfaces/functions/IFFGetLogicByDatasetsColumns.d.ts

@@ -0,0 +1,7 @@
+export interface IFFGetLogicByDatasetsColumns {
+    letPassUndefinedProperties?: {
+        qrveyid?: boolean;
+        questionid?: boolean;
+    };
+    filterEmptyArrays?: boolean;
+}

package/dist/filters/interfaces/functions/IFFGetLogicByDatasetsColumns.js

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

package/dist/filters/interfaces/functions/IFFiltersGetData.d.ts

@@ -6,7 +6,7 @@ import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFUFlattenedFilter } from "../ui/IFUFlattenedFilter";
 export interface IFFiltersGetData {
     chartRequest?: IFUChartSettings;
-    dataset: IDataset;
+    datasets: IDataset[];
     filterData?: IFSData;
     filter: IFUFlattenedFilter;
     pageid?: string;

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

@@ -1,3 +1,5 @@
+export * from './IFFGetLogicByDatasets';
+export * from './IFFGetLogicByDatasetsColumns';
 export * from './IFFiltersGetData';
 export * from './IFFiltersGetValuesFromDataset';
 export * from './IFFiltersGetValuesFromModel';

package/dist/filters/interfaces/functions/index.js

@@ -1,3 +1,5 @@
+export * from './IFFGetLogicByDatasets';
+export * from './IFFGetLogicByDatasetsColumns';
 export * from './IFFiltersGetData';
 export * from './IFFiltersGetValuesFromDataset';
 export * from './IFFiltersGetValuesFromModel';

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

@@ -15,6 +15,7 @@
 export * from './backend/index';
 export * from './builder/index';
 export * from './common/index';
+export * from './functions/index';
 export * from './panel/index';
 export * from './ui/index';
 export * from './IFDateProperty';

package/dist/filters/interfaces/index.js

@@ -15,6 +15,7 @@
 export * from './backend/index';
 export * from './builder/index';
 export * from './common/index';
+export * from './functions/index';
 export * from './panel/index';
 export * from './ui/index';
 export * from './IFDateProperty';

package/dist/filters/services/Filters.api.js

@@ -24,6 +24,9 @@ import { isEmpty } from '../../general/mix/isEmpty';
 import { getModel } from '../../services/api/getModel.api';
 import { areStaticColumnValues } from '../../qrvey/helpers/areStaticColumnValues';
 import { getValuesFromDataset } from '../helpers/common/getValuesFromDataset';
+import { getDatasetByColumn } from '../../qrvey/helpers/getDatasetByColumn';
+import { getLogicByDatasets } from '../helpers/backend/getLogicByDatasets';
+import { getFiltersByParams } from '../helpers/common/getFiltersByParams';
 export class FiltersApi {
     constructor(cfg) {
         this.setConfig(cfg);
@@ -51,14 +54,14 @@ export class FiltersApi {
     //   return DataTokensApi.getAll(config);
     // }
     getData(config, resetApi = false) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         let promise;
         if (areStaticColumnValues((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) && isEmpty((_b = config.filter) === null || _b === void 0 ? void 0 : _b.column.aggregate)) {
             promise = getValuesFromDataset({
                 column: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.column,
                 property: (_d = config.filter) === null || _d === void 0 ? void 0 : _d.property,
                 lookupDisplay: (_e = config.filter) === null || _e === void 0 ? void 0 : _e.lookupDisplayIndex,
-                dataset: config.dataset,
+                dataset: getDatasetByColumn((_f = config.filter) === null || _f === void 0 ? void 0 : _f.column, config.datasets),
                 value: config.valueText,
             });
         }
@@ -92,12 +95,14 @@ export class FiltersApi {
         var _a;
         const scopes = this.getAvailableScopeIds(config);
         let filterData = getFiltersByVisibility(config.filterData, scopes);
+        const dataset = config.datasets.find(d => { var _a; return d.qrveyid === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column.qrveyid); });
+        filterData = getFiltersByParams(filterData, { qrveyid: dataset.qrveyid }, { letPassUndefinedProperties: { filter: true }, filterEmptyArrays: { filter: false } });
         filterData = excludeFiltersByAggregateColumn(filterData);
         const logics = FDToLogic(filterData);
         const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);
         return [
             ...hierarchyLogic,
-            ...buildUserFilters(config.userFilters) || [],
+            ...getLogicByDatasets(buildUserFilters(config.userFilters), isEmpty(dataset) ? [] : [dataset.qrveyid]) || [],
         ];
     }
     getFilter(config) {
@@ -113,9 +118,9 @@ export class FiltersApi {
     * @returns a collection of the pair Scopes and Scope IDs
     */
     getAvailableScopeIds(config) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        return getAvailableScopes(Object.assign(Object.assign({}, getAvailableScopesIDsByConfig(config)), { qrveyid: (_b = (_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) === null || _b === void 0 ? void 0 : _b.qrveyid, defaultid: [FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes((_c = config.filter) === null || _c === void 0 ? void 0 : _c.extras.scope) && ((_e = (_d = config.filter) === null || _d === void 0 ? void 0 : _d.column) === null || _e === void 0 ? void 0 : _e.qrveyid), scope: undefined, predefinedScopes: [
-                { label: FILTER_SCOPE.DATA, id: (_g = (_f = config.filter) === null || _f === void 0 ? void 0 : _f.column) === null || _g === void 0 ? void 0 : _g.qrveyid }
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        return getAvailableScopes(Object.assign(Object.assign({}, getAvailableScopesIDsByConfig(config)), { panelid: FILTER_SCOPE.CHART === ((_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope) ? (_b = config.filter) === null || _b === void 0 ? void 0 : _b.extras.scopeid : undefined, scopeid: (_c = config.filter) === null || _c === void 0 ? void 0 : _c.extras.scopeid, qrveyid: (_e = (_d = config.filter) === null || _d === void 0 ? void 0 : _d.column) === null || _e === void 0 ? void 0 : _e.qrveyid, defaultid: (_g = (_f = config.filter) === null || _f === void 0 ? void 0 : _f.column) === null || _g === void 0 ? void 0 : _g.qrveyid, scope: undefined, predefinedScopes: [
+                { label: FILTER_SCOPE.DATA, id: (_j = (_h = config.filter) === null || _h === void 0 ? void 0 : _h.column) === null || _j === void 0 ? void 0 : _j.qrveyid }
             ] }));
     }
     /**

package/dist/globalization/helpers/getI18nDateGroupLabel.js

@@ -25,7 +25,7 @@ function getI18nMonthLabel(label, translate) {
 }
 function getI18nYearMonthLabel(label, translate) {
     if (!isTokenLabel(label) && !isEmpty(translate)) {
-        const month = getI18nMonthPropertyByIndex(DATE_YEAR_MONTHS.findIndex(month => month === label));
+        const month = getI18nMonthPropertyByIndex(DATE_YEAR_MONTHS.findIndex(_month => _month === label));
         if (!isEmpty(month))
             label = translate('common.date_grouping.' + month + '_mmm');
     }

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

@@ -11,6 +11,16 @@ export interface II18nChartBuilderStyleOptions {
     chart_type_disabled_message: string;
     comparision_color: string;
     data_labels_check: string;
+    data_labels_clustering: string;
+    data_labels_format: string;
+    data_labels_position: string;
+    data_labels_position_inside: string;
+    data_labels_position_outside: string;
+    data_labels_show_as: string;
+    data_labels_show_as_category: string;
+    data_labels_show_as_percentage: string;
+    data_labels_show_as_placeholder: string;
+    data_labels_show_as_value: string;
     default_format_title: string;
     display_outliers_check: string;
     line_opacity: string;

package/dist/globalization/interfaces/style_themes/II18nStyleThemesTheme.d.ts

@@ -18,6 +18,7 @@ export interface II18nStyleThemesTheme {
     qrvey_theme: string;
     restore_to_default: string;
     save_theme: string;
+    show_header: string;
     show_title: string;
     table_header_styles: string;
     text_styles: string;

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

@@ -9,7 +9,7 @@ export const I18N_CHART_BUILDER_LAYER_OPTIONS = {
         type_logarithmic: 'Logarithmic',
         type_moving_average_trendline: 'Moving Average Trendline',
         type_polynomial: 'Polynomial',
-        type_standard_regression: 'Standar Regression',
+        type_standard_regression: 'Standard Regression',
         intercept: 'Intercept',
         slope: 'Slope',
         legend: 'Trend Line'