@qrvey/utils 1.3.0-18 → 1.3.0-19

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/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/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/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/services/Filters.api.js

@@ -32,6 +32,7 @@ const areStaticColumnValues_1 = require("../../qrvey/helpers/areStaticColumnValu
 const getValuesFromDataset_1 = require("../helpers/common/getValuesFromDataset");
 const getFiltersByDatasetsColumns_1 = require("../helpers/common/getFiltersByDatasetsColumns");
 const getDatasetByColumn_1 = require("../../qrvey/helpers/getDatasetByColumn");
+const getLogicByDatasets_1 = require("../helpers/backend/getLogicByDatasets");
 class FiltersApi {
     constructor(cfg) {
         this.setConfig(cfg);
@@ -107,7 +108,7 @@ class FiltersApi {
         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) {

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/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/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/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/services/Filters.api.js

@@ -26,6 +26,7 @@ import { areStaticColumnValues } from '../../qrvey/helpers/areStaticColumnValues
 import { getValuesFromDataset } from '../helpers/common/getValuesFromDataset';
 import { getFiltersByDatasetsColumns } from '../helpers/common/getFiltersByDatasetsColumns';
 import { getDatasetByColumn } from '../../qrvey/helpers/getDatasetByColumn';
+import { getLogicByDatasets } from '../helpers/backend/getLogicByDatasets';
 export class FiltersApi {
     constructor(cfg) {
         this.setConfig(cfg);
@@ -101,7 +102,7 @@ export class FiltersApi {
         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) {

package/package.json

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

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/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/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/index.ts

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

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

@@ -28,6 +28,7 @@ import { IFFiltersGetData } from '../interfaces/functions/IFFiltersGetData';
 import { getFiltersByDatasetsColumns } from '../helpers/common/getFiltersByDatasetsColumns';
 import { IFUData } from '../interfaces/ui/IFUData';
 import { getDatasetByColumn } from '../../qrvey/helpers/getDatasetByColumn';
+import { getLogicByDatasets } from '../helpers/backend/getLogicByDatasets';
 
 
 interface IFilterApiConfig extends IFilterConfig {
@@ -117,7 +118,7 @@ export class FiltersApi {
   
     return [
       ...hierarchyLogic,
-      ...buildUserFilters(config.userFilters) || [],
+      ...getLogicByDatasets(buildUserFilters(config.userFilters), isEmpty(dataset) ? [] : [dataset.qrveyid]) || [],
     ];
   }
   

package/test/filters/backend/getLogicByDatasetsColumns.test.js

@@ -0,0 +1,312 @@
+// const { buildUserFilters, getLogicByDatasetsColumns  } = require('../../../dist/cjs');
+
+// // 1- Buen questionid y qrveyid
+// const userFilters = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe2",
+//             qrveyid: "mSdv9Qjm5",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 2 - Buen questionid sin qrveyid
+//   const userFilters2 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe2",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 3 - Buen questionid con mal qrveyid
+//   const userFilters3 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe2",
+//             qrveyid: "mSdv9Qjm55",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 4 - Mal questionid con buen qrveyid
+//   const userFilters4 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe22",
+//             qrveyid: "mSdv9Qjm5",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 5 - Mal questionid sin qrveyid
+//   const userFilters5 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe22",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 6 - Mal questionid con mal qrveyid
+//   const userFilters6 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//                       questionid: "OTCK9KZe22",
+//             qrveyid: "mSdv9Qjm55",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 7 - Sin questionid con buen qrveyid
+//   const userFilters7 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//             qrveyid: "mSdv9Qjm5",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 8 - Sin questionid y sin qrveyid
+//   const userFilters8 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   // 9 - Sin questionid con mal qrveyid
+//   const userFilters9 = {
+//     filters: [
+//       {
+//         operator: "AND",
+//         expressions: [
+//           {
+//             qrveyid: "mSdv9Qjm55",
+//             validationType: "BETWEEN",
+//             value: [
+//               {
+//                 lte: "15",
+//                 gte: "10"
+//               },
+//               {
+//                 lte: "30",
+//                 gte: "20"
+//               }
+//             ]
+//           }
+//         ]
+//       }
+//     ]
+//   };
+  
+//   const datasets = [
+//       {
+//           "qrveyid": "mSdv9Qjm5",
+//           "label": "SQL SELECT ALL - NewView   SELECT ALL",
+//           "options": [
+//               {
+//                   "id": "OTCK9KZe2",
+//                   "label": "id",
+//                   "outputFormat": {
+//                       "format": "Numeric",
+//                       "numericType": "INTEGER",
+//                       "type": "NUMERIC",
+//                       "decimals": "0"
+//                   },
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "NUMERIC"
+//               },
+//               {
+//                   "id": "pL4N25I67",
+//                   "label": "date_1",
+//                   "outputFormat": {
+//                       "type": "DATE",
+//                       "format": "MM/DD/YYYY"
+//                   },
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "DATE"
+//               },
+//               {
+//                   "id": "VvHNwFfjQ",
+//                   "label": "date_2_dt",
+//                   "outputFormat": {
+//                       "type": "DATE",
+//                       "format": "MM/DD/YYYY"
+//                   },
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "DATE"
+//               },
+//               {
+//                   "id": "Em6zxp2Ch",
+//                   "label": "country",
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "TEXT_LABEL"
+//               },
+//               {
+//                   "id": "J6Oq48t8F",
+//                   "label": "epoch",
+//                   "outputFormat": {
+//                       "type": "DATE",
+//                       "format": "MM/DD/YYYY"
+//                   },
+//                   "qrveyid": "mSdv9Qjm5",
+//                   "type": "DATE"
+//               }
+//           ]
+//       }
+//   ];
+  
+//   console.log('1 - Buen questionid y buen qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters), datasets);
+//   console.log('2 - Buen questionid sin qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters2), datasets);
+//   console.log('3 - Buen questionid con mal qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters3), datasets);
+//   console.log('4 - Mal questionid con buen qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters4), datasets);
+//   console.log('5 - Mal questionid sin qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters5), datasets);
+//   console.log('6 - Mal questionid y mal qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters6), datasets);
+//   console.log('7 - Sin questionid con buen qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters7), datasets);
+//   console.log('8 - Sin questionid y sin qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters8), datasets);
+//   console.log('9 - Sin questionid con mal qrveyid');
+//   getLogicByDatasetsColumns(buildUserFilters(userFilters9), datasets);
+
+
+describe('Dummy test', function () {
+	test('Dummy test #1', function () {
+		expect([]).toEqual([]);
+	});
+});