@qrvey/utils 1.3.0-7 → 1.3.0

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

@@ -12,6 +12,16 @@ export const 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/globalization/labels/style_themes/I18N_STYLE_THEMES.js

@@ -40,6 +40,7 @@ export const 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/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/qrvey/helpers/getDatasetByColumn.js

@@ -0,0 +1,12 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+/**
+ * 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 function getDatasetByColumn(column, datasets = []) {
+    if (isEmpty(column) || isEmpty(datasets))
+        return;
+    return datasets.find(dataset => dataset.qrveyid === column.qrveyid);
+}

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

@@ -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/services/adapters/BBranchesMapToUIBranchesMap.adapter.js

@@ -8,9 +8,9 @@ import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
 export function BBranchesMapToUIBranchesMap(branchesMap) {
     if (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: BColumnsToUIColumns(branch.questions.data)
         }))
     }));

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

@@ -1,22 +1,23 @@
+import { getAttribute } from "../../general/object/getAttribute";
 export function BColumnsToUIColumns(columns = [], dataset) {
     return columns.map(column => ({
         answers: column.answers,
-        bucketid: column.bucketId,
+        bucketid: getAttribute(column, 'bucket_id'),
         expressionCategory: column.activeCat,
         expressionNegative: column.negative,
         expressionPositive: column.positive,
         expressionWords: column.words,
-        formulaid: column.formulaId,
+        formulaid: 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: getAttribute(dataset, 'link_id') || getAttribute(column, 'link_id'),
         outputFormat: column.outputFormat,
         property: column.property,
-        qrveyid: (dataset === null || dataset === void 0 ? void 0 : dataset.qrveyid) || column.qrveyid,
+        qrveyid: getAttribute(dataset, 'qrvey_id') || getAttribute(column, 'qrvey_id'),
         slidebarValue: column.sliderVal,
         lookupValue: column.value,
         type: column.type,

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

@@ -1,9 +1,10 @@
+import { getAttribute } from "../../general/object/getAttribute";
 import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
 export function BDatasetsToUIDatasets(datasets = []) {
     return datasets.map(dataset => ({
-        qrveyid: dataset.qrveyid,
+        qrveyid: getAttribute(dataset, 'qrvey_id'),
         label: dataset.name,
-        linkid: dataset.linkid,
+        linkid: getAttribute(dataset, 'link_id'),
         options: BColumnsToUIColumns(dataset.options, dataset),
     }));
 }

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

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

package/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  preset: 'ts-jest',
+  // preset: 'ts-jest',
   testEnvironment: 'node',
   verbose: true,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.3.0-7",
+  "version": "1.3.0",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
@@ -11,6 +11,7 @@
     "compodoc:server": "./node_modules/.bin/compodoc -p ./tsconfig.doc.json -s --port=4400",
     "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
     "lint-dev": "eslint src --debug --ext .ts,.tsx",
+    "pipeline": "npm run build-clean && npm run lint && npm run test",
     "publishing-old": "node ./scripts/prepare-publish && np",
     "publishing-prerelease-old": "node ./scripts/prepare-publish && np --any-branch --tag=$npm_config_tag",
     "publishing-beta-1": "node ./scripts/publishing --np-new-version=$npm_config_np_new_version --np-any-branch=$npm_config_np_any_branch --np-tag=$npm_config_np_tag",
@@ -22,13 +23,13 @@
   "license": "MIT",
   "devDependencies": {
     "@compodoc/compodoc": "1.1.19",
-    "@types/jest": "27.5.0",
+    "@types/jest": "27.5.1",
     "@typescript-eslint/eslint-plugin": "5.22.0",
     "@typescript-eslint/parser": "5.22.0",
     "eslint": "8.14.0",
-    "jest": "27.5.1",
+    "jest": "28.1.0",
     "np": "7.6.1",
-    "ts-jest": "27.1.4",
+    "ts-jest": "28.0.2",
     "typedoc": "0.22.15",
     "typescript": "4.6.4"
   },

package/src/column_format/helpers/defineXYChartFormat.ts

@@ -17,6 +17,7 @@ import { columnTypeByChart } from "./columnTypeByChart";
 export const defineXYChartFormat = (column: IChartColumn, settings: IColumnFormatSettings) : IColumnFormatReturnType => {
     const { aggregate, type, defaultFormat, outputFormat, selectedFormat, dateGroup } = column;
     const { shelfType, withoutFormat } = settings;
+    const columnDefaultFormat = defaultFormat || outputFormat;
 
     //Defaults
     const defaultText = 'Default';
@@ -27,9 +28,7 @@ export const defineXYChartFormat = (column: IChartColumn, settings: IColumnForma
 
     const noFormatSupported = DATEGROUP_UNSUPPORT_FORMAT.some(gp => gp === dateGroup?.label);
     const isUsedAsNumericColumn = type !== columnType;
-
-
-    const hasDefaultFormat = (isEmpty(selectedFormat) && outputFormat?.format === defaultText) || (selectedFormat?.format === defaultText);
+    const hasDefaultFormat = isEmpty(selectedFormat) || (outputFormat?.format === defaultText) || (selectedFormat?.format === defaultText);
 
 
     switch(columnType) {
@@ -49,7 +48,7 @@ export const defineXYChartFormat = (column: IChartColumn, settings: IColumnForma
                 return STRING_FORMAT.NONE;
             }
             else if(hasDefaultFormat) {
-                return { ...defaultFormat, format: defaultText, originalFormat: { ...outputFormat } };
+                return { ...columnDefaultFormat, format: defaultText, originalFormat: { ...outputFormat } };
             }
             else {
                 return selectedFormat;
@@ -69,7 +68,7 @@ export const defineXYChartFormat = (column: IChartColumn, settings: IColumnForma
                 else return outputFormat;
             } else {
                 if(withoutFormat === true) {
-                    return defaultFormat;
+                    return columnDefaultFormat;
                 }
                 else if(hasDefaultFormat) {
                     return { ...outputFormat };

package/src/columns/helpers/{getDatasetColumnyDatasets.ts → getDatasetColumnByDatasets.ts}

@@ -3,9 +3,17 @@ import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumn } from "../interfaces/IColumn";
 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: Partial<IColumn>, datasets: IDataset[]): IColumn {
     if (isEmpty(column) || isEmpty(datasets)) return;
 
-    const dataset = datasets.find(dataset => dataset.qrveyid === column.qrveyid);
+    const dataset = datasets.find(_dataset => _dataset.qrveyid === column.qrveyid);
     return getDatasetColumn(column, dataset);
 }

package/src/columns/helpers/index.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/src/dates/adapters/index.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/src/filters/adapters/FDToLogic.ts

@@ -33,8 +33,9 @@ export function FDToLogic(filterData: IFSData): IFBLogic[] {
  * @returns a filter logic array
  */
 function getLogicBodyFromFD21(filterData: IFSData): IFBLogic[] {
-    let logics = [];
-    logics = filterData.scopes.reduce((logics: IFBLogic[], scope: IFSScope) => {
+    if (isEmpty(filterData)) return [];
+
+    return filterData.scopes.reduce((logics: IFBLogic[], scope: IFSScope) => {
         const logic: IFBLogic = buildLogic(scope);
         let filters: IFBFilter[] = [];
         if (scope.datasets.length > 0) {
@@ -45,9 +46,8 @@ function getLogicBodyFromFD21(filterData: IFSData): IFBLogic[] {
         }
         logics.push({ ...logic, filters });
         return logics;
-        }, [] as IFBLogic[]);
-    return logics;
-  }
+    }, [] as IFBLogic[]);
+}
 
 function buildLogic(scopeSection: IFSScope): IFBLogic {
     return {

package/src/filters/helpers/backend/getLogicByDatasets.ts

@@ -0,0 +1,37 @@
+import { filterNestedTree, _hasProperty } from "../../../general";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { IFBExpression } from "../../interfaces/backend/IFBExpression";
+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 function getLogicByDatasets(logic: IFBLogic[], datasets: string[] = [], settings?: IFFGetLogicByDatasets): IFBLogic[] {
+    if (isEmpty(logic)) return;
+    if (isEmpty(datasets)) return logic;
+
+    settings = getGetLogicByDatasetsSettings(settings);
+
+    return logic.map(_l => ({
+        ..._l,
+        filters: filterNestedTree(_l.filters, 'expressions', (expression: IFBExpression) => {
+            const dataset = datasets.find(_data => _data === expression.qrveyid);
+            return (settings.letPassUndefinedProperties.qrveyid && !_hasProperty(expression, 'qrveyid')) || !isEmpty(dataset);
+        })
+    }));
+}
+
+function getGetLogicByDatasetsSettings(settings?: IFFGetLogicByDatasets): IFFGetLogicByDatasets {
+    return {
+        filterEmptyArrays: settings?.filterEmptyArrays ?? true,
+        letPassUndefinedProperties: {
+            qrveyid: settings?.letPassUndefinedProperties?.qrveyid ?? true
+        }
+    };
+}

package/src/filters/helpers/backend/getLogicByDatasetsColumns.ts

@@ -0,0 +1,52 @@
+import { filterNestedTree } from "../../../general/array/filterNestedTree";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { _hasProperty } from "../../../general/object/hasProperty";
+import { IDataset } from "../../../qrvey/interfaces/IDataset";
+import { IFBExpression } from "../../interfaces/backend/IFBExpression";
+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 function getLogicByDatasetsColumns(logic: IFBLogic[], datasets: IDataset[] = [], settings?: IFFGetLogicByDatasetsColumns): IFBLogic[] {
+    if (isEmpty(logic)) return;
+    if (isEmpty(datasets)) return logic;
+
+    settings = getGetLogicByDatasetsSettings(settings);
+
+    return logic.map(_l => ({
+        ..._l,
+        filters: filterNestedTree(_l.filters, 'expressions', (expression: IFBExpression) => {
+            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?: IFFGetLogicByDatasetsColumns): IFFGetLogicByDatasetsColumns {
+    return {
+        filterEmptyArrays: settings?.filterEmptyArrays ?? true,
+        letPassUndefinedProperties: {
+            qrveyid: settings?.letPassUndefinedProperties?.qrveyid ?? true,
+            questionid: settings?.letPassUndefinedProperties?.questionid ?? true
+        }
+    };
+}

package/src/filters/helpers/backend/index.ts

@@ -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/src/filters/helpers/common/excludeFiltersByParams.ts

@@ -45,7 +45,7 @@ export function excludeFiltersByParams(filterData: IFSData | IFUData, params: IF
                         values: (filter.values || []).map((value: IFValue) => {
                           if (Array.isArray(value) && value.length > 0) {
                             const rankingValues = value as IFSValueRanking[];
-                            rankingValues.map(rValue => {
+                            return rankingValues.map(rValue => {
                               if (params.enableds == null || params.enableds === rValue.enabled) return rValue;
                             }).filter(Boolean);
                           } else {

package/src/filters/helpers/common/getFiltersByDatasetsColumns.ts

@@ -0,0 +1,40 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+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 function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[] = []): IFUData {
+    if (isEmpty(data) || isEmpty(data.scopes)) return;
+    if (isEmpty(datasets)) return data;
+
+    const newData = {
+        ...data,
+        scopes: data.scopes.map(scope => ({
+            ...scope,
+            datasets: scope.datasets.map(filterDataset => {
+                const dataset = datasets.find(_data => _data.qrveyid === filterDataset.qrveyid);
+                if (!isEmpty(dataset)) {
+                    return {
+                        ...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 { ...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/src/filters/helpers/common/index.ts

@@ -8,6 +8,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/src/filters/helpers/getAvailableScopes.ts

@@ -17,13 +17,13 @@ export function getAvailableScopes(config: IFSAvailableScope): IFSScopeID[] {
     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 }];
-    } else {
-        if (config.defaultid) scopes = [...scopes, { label: FILTER_SCOPE.DEFAULT, id: config.defaultid }];
+        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 }];
     }
     return scopes;
 }

package/src/filters/interfaces/backend/IFBExpression.ts

@@ -8,6 +8,7 @@ import { IFProperty } from "../IFProperty";
 export interface IFBExpression {
     enabled?: boolean; // True: The filter expression is applied; False: The filter expression is not applied.
     groupValue?: IFProperty; // Date grouping for Date column filters
+    qrveyid?: string; // The Qrvey ID used in the expression
     questionid?: string; // The Question/Column ID
     questionType?: string; // The type of the Question/Column. Require if it is FORMULA OR BUCKET, otherwise is optional.
     property?: IFProperty; // Properties for Complex Data types

package/src/filters/interfaces/common/IFSAvailableScope.ts

@@ -10,6 +10,7 @@ export interface IFSAvailableScope {
     qrveyid?: string; // Qrvey ID
     tabid?: string; // Tab ID
     pageid?: string; // Page ID
+    panelid?: string; // The ID for Panel Filters
     defaultid?: string; // Default ID
     predefinedScopes?: IFSScopeID[]; // Predefined Scopes 
 }

package/src/filters/interfaces/functions/IFFGetLogicByDatasets.ts

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

package/src/filters/interfaces/functions/IFFGetLogicByDatasetsColumns.ts

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

package/src/filters/interfaces/functions/IFFiltersGetData.ts

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

package/src/filters/interfaces/functions/index.ts

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

package/src/filters/interfaces/index.ts

@@ -16,6 +16,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';
 

package/src/filters/services/Filters.api.ts

@@ -25,6 +25,10 @@ import { IFUFlattenedFilter } from '../interfaces/ui/IFUFlattenedFilter';
 import { areStaticColumnValues } from '../../qrvey/helpers/areStaticColumnValues';
 import { getValuesFromDataset } from '../helpers/common/getValuesFromDataset';
 import { IFFiltersGetData } from '../interfaces/functions/IFFiltersGetData';
+import { IFUData } from '../interfaces/ui/IFUData';
+import { getDatasetByColumn } from '../../qrvey/helpers/getDatasetByColumn';
+import { getLogicByDatasets } from '../helpers/backend/getLogicByDatasets';
+import { getFiltersByParams } from '../helpers/common/getFiltersByParams';
 
 
 interface IFilterApiConfig extends IFilterConfig {
@@ -74,7 +78,7 @@ export class FiltersApi {
         column: config.filter?.column,
         property: config.filter?.property,
         lookupDisplay: config.filter?.lookupDisplayIndex,
-        dataset: config.dataset,
+        dataset: getDatasetByColumn(config.filter?.column, config.datasets),
         value: config.valueText,
       });
     } else {
@@ -106,13 +110,15 @@ export class FiltersApi {
   private getLogic(config: IFSGetDataValues) {
     const scopes = this.getAvailableScopeIds(config);
     let filterData = getFiltersByVisibility(config.filterData, scopes);
+    const dataset = config.datasets.find(d => d.qrveyid === config.filter?.column.qrveyid);
+    filterData = getFiltersByParams(filterData, { qrveyid: dataset.qrveyid }, { letPassUndefinedProperties: { filter: true }, filterEmptyArrays: { filter: false } }) as IFUData;
     filterData = excludeFiltersByAggregateColumn(filterData);
     const logics = FDToLogic(filterData);
     const hierarchyLogic = getLogicByScopesHierarchy(logics, scopes, config.filter?.extras.scope);
   
     return [
       ...hierarchyLogic,
-      ...buildUserFilters(config.userFilters) || [],
+      ...getLogicByDatasets(buildUserFilters(config.userFilters), isEmpty(dataset) ? [] : [dataset.qrveyid]) || [],
     ];
   }
   
@@ -132,8 +138,10 @@ export class FiltersApi {
   private getAvailableScopeIds(config: IFFiltersGetData): IFSScopeID[] {
     return getAvailableScopes({
         ...getAvailableScopesIDsByConfig(config),
+        panelid: FILTER_SCOPE.CHART === config.filter?.extras.scope ? config.filter?.extras.scopeid : undefined,
+        scopeid: config.filter?.extras.scopeid,
         qrveyid: config.filter?.column?.qrveyid,
-        defaultid: [FILTER_SCOPE.DEFAULT, FILTER_SCOPE.CHART].includes(config.filter?.extras.scope) && config.filter?.column?.qrveyid,
+        defaultid: config.filter?.column?.qrveyid,
         scope: undefined,
         predefinedScopes: [
           { label: FILTER_SCOPE.DATA, id: config.filter?.column?.qrveyid }

package/src/globalization/helpers/getI18nDateGroupLabel.ts

@@ -30,7 +30,7 @@ function getI18nMonthLabel(label: string, translate?: II18nServiceTranslate): st
 
 function getI18nYearMonthLabel(label: string, translate?: II18nServiceTranslate): string {
     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');
     }
     return label;

package/src/globalization/interfaces/chart_builder/II18nChartBuilderStyleOptions.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/src/globalization/interfaces/style_themes/II18nStyleThemesTheme.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/src/globalization/labels/chart_builder/I18N_CHART_BUILDER_LAYER_OPTIONS.ts

@@ -12,7 +12,7 @@ export const I18N_CHART_BUILDER_LAYER_OPTIONS: Pick<II18nChartBuilder, LayerOpti
         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'