@qrvey/utils 1.3.0-7 → 1.3.0

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

@@ -16,6 +16,7 @@ const columnTypeByChart_1 = require("./columnTypeByChart");
 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' };
@@ -23,7 +24,7 @@ const defineXYChartFormat = (column, settings) => {
     const columnType = (0, columnTypeByChart_1.columnTypeByChart)(column, shelfType, CHART_GROUP_1.CHART_GROUPS.XY);
     const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT_1.DATEGROUP_UNSUPPORT_FORMAT.some(gp => gp === (dateGroup === null || dateGroup === void 0 ? void 0 : dateGroup.label));
     const isUsedAsNumericColumn = type !== columnType;
-    const hasDefaultFormat = ((0, __1.isEmpty)(selectedFormat) && (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.format) === defaultText) || ((selectedFormat === null || selectedFormat === void 0 ? void 0 : selectedFormat.format) === defaultText);
+    const hasDefaultFormat = (0, __1.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 __1.COLUMN.YES_NO:
         case __1.COLUMN.PHONE:
@@ -41,7 +42,7 @@ const defineXYChartFormat = (column, settings) => {
                 return STRING_FORMAT_1.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;
@@ -62,7 +63,7 @@ const defineXYChartFormat = (column, settings) => {
             }
             else {
                 if (withoutFormat === true) {
-                    return defaultFormat;
+                    return columnDefaultFormat;
                 }
                 else if (hasDefaultFormat) {
                     return Object.assign({}, outputFormat);

package/dist/cjs/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/cjs/columns/helpers/{getDatasetColumnyDatasets.js → getDatasetColumnByDatasets.js}

@@ -3,10 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatasetColumnByDatasets = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
 const getDatasetColumn_1 = require("./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
+ */
 function getDatasetColumnByDatasets(column, datasets) {
     if ((0, isEmpty_1.isEmpty)(column) || (0, isEmpty_1.isEmpty)(datasets))
         return;
-    const dataset = datasets.find(dataset => dataset.qrveyid === column.qrveyid);
+    const dataset = datasets.find(_dataset => _dataset.qrveyid === column.qrveyid);
     return (0, getDatasetColumn_1.getDatasetColumn)(column, dataset);
 }
 exports.getDatasetColumnByDatasets = getDatasetColumnByDatasets;

package/dist/cjs/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/cjs/columns/helpers/index.js

@@ -15,9 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./getColumnsLabel"), exports);
-__exportStar(require("./getDatasetByColumn"), exports);
 __exportStar(require("./getDatasetColumn"), exports);
-__exportStar(require("./getDatasetColumnyDatasets"), exports);
+__exportStar(require("./getDatasetColumnByDatasets"), exports);
 __exportStar(require("./getModelColumn"), exports);
 __exportStar(require("./isComplexColumn"), exports);
 __exportStar(require("./isDateColumn"), exports);

package/dist/cjs/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/cjs/dates/adapters/index.js

@@ -14,6 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./dateToHms"), exports);
+__exportStar(require("./dateToMdyDate"), exports);
+__exportStar(require("./dateToMonthYear"), exports);
+__exportStar(require("./dateToQuarterYear"), exports);
+__exportStar(require("./dateToWeekYear"), exports);
+__exportStar(require("./dateToYear"), exports);
 __exportStar(require("./mdyDateToDate"), exports);
 __exportStar(require("./monthYearToDate"), exports);
 __exportStar(require("./quarterYearToDate"), exports);

package/dist/cjs/filters/adapters/FDToLogic.js

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

package/dist/cjs/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/cjs/filters/helpers/backend/getLogicByDatasets.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogicByDatasets = void 0;
+const general_1 = require("../../../general");
+const isEmpty_1 = require("../../../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
+ */
+function getLogicByDatasets(logic, datasets = [], settings) {
+    if ((0, isEmpty_1.isEmpty)(logic))
+        return;
+    if ((0, isEmpty_1.isEmpty)(datasets))
+        return logic;
+    settings = getGetLogicByDatasetsSettings(settings);
+    return logic.map(_l => (Object.assign(Object.assign({}, _l), { filters: (0, general_1.filterNestedTree)(_l.filters, 'expressions', (expression) => {
+            const dataset = datasets.find(_data => _data === expression.qrveyid);
+            return (settings.letPassUndefinedProperties.qrveyid && !(0, general_1._hasProperty)(expression, 'qrveyid')) || !(0, isEmpty_1.isEmpty)(dataset);
+        }) })));
+}
+exports.getLogicByDatasets = getLogicByDatasets;
+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/cjs/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/cjs/filters/helpers/backend/getLogicByDatasetsColumns.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogicByDatasetsColumns = void 0;
+const filterNestedTree_1 = require("../../../general/array/filterNestedTree");
+const isEmpty_1 = require("../../../general/mix/isEmpty");
+const hasProperty_1 = require("../../../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
+ */
+function getLogicByDatasetsColumns(logic, datasets = [], settings) {
+    if ((0, isEmpty_1.isEmpty)(logic))
+        return;
+    if ((0, isEmpty_1.isEmpty)(datasets))
+        return logic;
+    settings = getGetLogicByDatasetsSettings(settings);
+    return logic.map(_l => (Object.assign(Object.assign({}, _l), { filters: (0, filterNestedTree_1.filterNestedTree)(_l.filters, 'expressions', (expression) => {
+            const letQrveyidPass = settings.letPassUndefinedProperties.qrveyid || (0, hasProperty_1._hasProperty)(expression, 'qrveyid');
+            let letQuestionidPass = settings.letPassUndefinedProperties.questionid || (0, hasProperty_1._hasProperty)(expression, 'questionid');
+            const dataset = letQrveyidPass ? datasets.find(_data => _data.qrveyid === expression.qrveyid) : undefined;
+            if (!(0, isEmpty_1.isEmpty)(dataset)) {
+                const column = letQuestionidPass ? (dataset.options || []).find(option => option.id === expression.questionid) : undefined;
+                letQuestionidPass = letQuestionidPass || !(0, isEmpty_1.isEmpty)(column);
+            }
+            return (letQrveyidPass && !(0, isEmpty_1.isEmpty)(dataset)) && letQuestionidPass;
+        }) })));
+}
+exports.getLogicByDatasetsColumns = getLogicByDatasetsColumns;
+/**
+ * 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/cjs/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/cjs/filters/helpers/backend/index.js

@@ -22,6 +22,8 @@ __exportStar(require("./getBackendGroupValue"), exports);
 __exportStar(require("./getBackendProperty"), exports);
 __exportStar(require("./getBackendValidator"), exports);
 __exportStar(require("./getBackendValues"), exports);
+__exportStar(require("./getLogicByDatasets"), exports);
+__exportStar(require("./getLogicByDatasetsColumns"), exports);
 __exportStar(require("./getLogicByScopes"), exports);
 __exportStar(require("./getLogicByScopesHierarchy"), exports);
 // export * from './hasDatasetRelatedFilters';

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

@@ -31,7 +31,7 @@ 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/cjs/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/cjs/filters/helpers/common/getFiltersByDatasetsColumns.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFiltersByDatasetsColumns = void 0;
+const isEmpty_1 = require("../../../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
+ */
+function getFiltersByDatasetsColumns(data, datasets = []) {
+    if ((0, isEmpty_1.isEmpty)(data) || (0, isEmpty_1.isEmpty)(data.scopes))
+        return;
+    if ((0, isEmpty_1.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 (!(0, isEmpty_1.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 (!(0, isEmpty_1.isEmpty)(column)) {
+                                return Object.assign({}, filter);
+                            }
+                        }).filter(Boolean) });
+                }
+            }).filter(dataset => !(0, isEmpty_1.isEmpty)(dataset) && dataset.filters.length > 0) }))).filter(scope => !(0, isEmpty_1.isEmpty)(scope) && scope.datasets.length > 0) });
+    if (!(0, isEmpty_1.isEmpty)(newData) && newData.scopes.length > 0) {
+        return newData;
+    }
+}
+exports.getFiltersByDatasetsColumns = getFiltersByDatasetsColumns;

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

@@ -22,6 +22,7 @@ __exportStar(require("./getFilterColumnLabel"), exports);
 __exportStar(require("./getFilterid"), exports);
 __exportStar(require("./getFilterLabel"), exports);
 __exportStar(require("./getFiltersByAggregateColumn"), exports);
+__exportStar(require("./getFiltersByDatasetsColumns"), exports);
 __exportStar(require("./getFiltersByParams"), exports);
 __exportStar(require("./getFiltersByScopes"), exports);
 __exportStar(require("./getFiltersByScopesIds"), exports);

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

@@ -17,18 +17,18 @@ function getAvailableScopes(config) {
     if (!(0, isEmpty_1.isEmpty)(config.predefinedScopes))
         scopes = config.predefinedScopes;
     scopes = [...scopes, { label: FILTER_SCOPE_1.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_1.FILTER_SCOPE.PAGE, id: config.pageid }];
         if (config.tabid)
             scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.TAB, id: config.tabid }];
         if (config.defaultid)
             scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid }];
-        scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.CHART, id: config.tabid || config.pageid }];
+        if (config.panelid || config.tabid || config.pageid)
+            scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.CHART, id: config.panelid || config.tabid || config.pageid }];
     }
-    else {
-        if (config.defaultid)
-            scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid }];
+    else if (config.defaultid) {
+        scopes = [...scopes, { label: FILTER_SCOPE_1.FILTER_SCOPE.DEFAULT, id: config.defaultid }];
     }
     return scopes;
 }

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

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

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

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

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

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

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

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

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

@@ -14,6 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./IFFGetLogicByDatasets"), exports);
+__exportStar(require("./IFFGetLogicByDatasetsColumns"), exports);
 __exportStar(require("./IFFiltersGetData"), exports);
 __exportStar(require("./IFFiltersGetValuesFromDataset"), exports);
 __exportStar(require("./IFFiltersGetValuesFromModel"), exports);

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

@@ -31,6 +31,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./backend/index"), exports);
 __exportStar(require("./builder/index"), exports);
 __exportStar(require("./common/index"), exports);
+__exportStar(require("./functions/index"), exports);
 __exportStar(require("./panel/index"), exports);
 __exportStar(require("./ui/index"), exports);
 __exportStar(require("./IFDateProperty"), exports);

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

@@ -30,6 +30,9 @@ const isEmpty_1 = require("../../general/mix/isEmpty");
 const getModel_api_1 = require("../../services/api/getModel.api");
 const areStaticColumnValues_1 = require("../../qrvey/helpers/areStaticColumnValues");
 const getValuesFromDataset_1 = require("../helpers/common/getValuesFromDataset");
+const getDatasetByColumn_1 = require("../../qrvey/helpers/getDatasetByColumn");
+const getLogicByDatasets_1 = require("../helpers/backend/getLogicByDatasets");
+const getFiltersByParams_1 = require("../helpers/common/getFiltersByParams");
 class FiltersApi {
     constructor(cfg) {
         this.setConfig(cfg);
@@ -57,14 +60,14 @@ 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 ((0, areStaticColumnValues_1.areStaticColumnValues)((_a = config.filter) === null || _a === void 0 ? void 0 : _a.column) && (0, isEmpty_1.isEmpty)((_b = config.filter) === null || _b === void 0 ? void 0 : _b.column.aggregate)) {
             promise = (0, getValuesFromDataset_1.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: (0, getDatasetByColumn_1.getDatasetByColumn)((_f = config.filter) === null || _f === void 0 ? void 0 : _f.column, config.datasets),
                 value: config.valueText,
             });
         }
@@ -98,12 +101,14 @@ class FiltersApi {
         var _a;
         const scopes = this.getAvailableScopeIds(config);
         let filterData = (0, getFiltersByVisibility_1.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 = (0, getFiltersByParams_1.getFiltersByParams)(filterData, { qrveyid: dataset.qrveyid }, { letPassUndefinedProperties: { filter: true }, filterEmptyArrays: { filter: false } });
         filterData = (0, excludeFiltersByAggregateColumn_1.excludeFiltersByAggregateColumn)(filterData);
         const logics = (0, FDToLogic_1.FDToLogic)(filterData);
         const hierarchyLogic = (0, getLogicByScopesHierarchy_1.getLogicByScopesHierarchy)(logics, scopes, (_a = config.filter) === null || _a === void 0 ? void 0 : _a.extras.scope);
         return [
             ...hierarchyLogic,
-            ...(0, buildUserFilters_1.buildUserFilters)(config.userFilters) || [],
+            ...(0, getLogicByDatasets_1.getLogicByDatasets)((0, buildUserFilters_1.buildUserFilters)(config.userFilters), (0, isEmpty_1.isEmpty)(dataset) ? [] : [dataset.qrveyid]) || [],
         ];
     }
     getFilter(config) {
@@ -119,9 +124,9 @@ class FiltersApi {
     * @returns a collection of the pair Scopes and Scope IDs
     */
     getAvailableScopeIds(config) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        return (0, getAvailableScopes_1.getAvailableScopes)(Object.assign(Object.assign({}, (0, getAvailableScopesIDsByConfig_1.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_1.FILTER_SCOPE.DEFAULT, FILTER_SCOPE_1.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_1.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 (0, getAvailableScopes_1.getAvailableScopes)(Object.assign(Object.assign({}, (0, getAvailableScopesIDsByConfig_1.getAvailableScopesIDsByConfig)(config)), { panelid: FILTER_SCOPE_1.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_1.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/cjs/globalization/helpers/getI18nDateGroupLabel.js

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

package/dist/cjs/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/cjs/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/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_LAYER_OPTIONS.js

@@ -12,7 +12,7 @@ exports.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'

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

@@ -15,6 +15,16 @@ exports.I18N_CHART_BUILDER_STYLE_OPTIONS = {
         chart_type_disabled_message: '<i>Type</i> selection is disabled because stacked type configuration is in use.',
         comparision_color: 'Comparision Color',
         data_labels_check: 'Data Labels',
+        data_labels_clustering: '<i>Clustering</i> is inactive, enable it to use <i>{{text}}</i>.',
+        data_labels_format: '<i>% Difference</i> is active, disable it to set a different formatting.',
+        data_labels_position: 'Label Position',
+        data_labels_position_inside: 'Inside',
+        data_labels_position_outside: 'Outside',
+        data_labels_show_as: 'Show as',
+        data_labels_show_as_category: 'Category',
+        data_labels_show_as_percentage: 'Percentage',
+        data_labels_show_as_placeholder: 'Select Option',
+        data_labels_show_as_value: 'Value',
         default_format_title: 'Format',
         display_outliers_check: 'Display Outliers',
         line_opacity: 'Line Opacity',

package/dist/cjs/globalization/labels/style_themes/I18N_STYLE_THEMES.js

@@ -43,6 +43,7 @@ exports.I18N_STYLE_THEMES = {
         qrvey_theme: 'Qrvey Theme',
         restore_to_default: 'Restore to Default',
         save_theme: 'Save Theme',
+        show_header: 'Show Header',
         show_title: 'Show Title',
         table_header_styles: 'Table Header Styles',
         text_styles: 'Text Styles',

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

@@ -0,0 +1,9 @@
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IDataset } from "../interfaces/IDataset";
+/**
+ * Gets a dataset by a given partial column
+ * @param column the partial column
+ * @param datasets the collection of dataset to look for one.
+ * @returns the found dataset or undefined
+ */
+export declare function getDatasetByColumn(column: Partial<IColumn>, datasets?: IDataset[]): IDataset;

package/dist/cjs/{columns → qrvey}/helpers/getDatasetByColumn.js

@@ -2,9 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatasetByColumn = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
-function getDatasetByColumn(column, datasets) {
+/**
+ * Gets a dataset by a given partial column
+ * @param column the partial column
+ * @param datasets the collection of dataset to look for one.
+ * @returns the found dataset or undefined
+ */
+function getDatasetByColumn(column, datasets = []) {
     if ((0, isEmpty_1.isEmpty)(column) || (0, isEmpty_1.isEmpty)(datasets))
         return;
-    return datasets.find(dataset => dataset.qrveyid === column.qrveyid && dataset.linkid === column.linkid);
+    return datasets.find(dataset => dataset.qrveyid === column.qrveyid);
 }
 exports.getDatasetByColumn = getDatasetByColumn;