@qrvey/filters 0.2.1 → 0.2.3

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/filters](https://bitbucket.org/qrvey/qrvey_filters/wiki/Home) *0.2.1*
+# [@qrvey/filters](https://bitbucket.org/qrvey/qrvey_filters/wiki/Home) *0.2.3*
 
 > Helpers and logic for Filtering Data in Qrvey app
 

package/dist/cjs/classes/FilterAdapter.js

@@ -27,7 +27,7 @@ class FilterAdapter {
         return (0, filter_adapt_legacy_helpers_1.filterToLegacyVisual)(this._filters, this.datasets, this.interactiveTable);
     }
     filterToLogic() {
-        return (0, filter_adapt_logic_helpers_1.filterToLogic)(this._filters);
+        return (0, filter_adapt_logic_helpers_1.filterToLogic)(this._filters, this.datasets);
     }
     filterToVisual() {
         return (0, filter_adapt_helpers_1.filterToVisual)(this._filters, this.datasets, this.interactiveTable);

package/dist/cjs/classes/FilterResources.js

@@ -90,6 +90,22 @@ class FilterResources {
     static getHierarchyScopes() {
         return filter_scopes_resources_1.FILTER_SCOPES;
     }
+    static getScopeIdentifiers(filters) {
+        if (!Array.isArray(filters) || (0, utils_1.isEmpty)(filters))
+            return [];
+        const seen = new Map();
+        for (const filter of filters) {
+            const key = `${filter.scope}|${filter.scopeId ?? ""}`;
+            if (!seen.has(key)) {
+                seen.set(key, {
+                    datasetId: filter.datasetId,
+                    scope: filter.scope,
+                    scopeId: filter.scopeId,
+                });
+            }
+        }
+        return Array.from(seen.values());
+    }
     static getFiltersByTimezone(filters, timezone) {
         if ((0, utils_1.isEmpty)(filters) || !Array.isArray(filters))
             return [];

package/dist/cjs/helpers/filter-adapt.helpers.js

@@ -97,7 +97,9 @@ function buildFilter(filter, dataset) {
         collapsed: filter.collapsed ?? filters_resources_1.DEFAULT_FILTER.collapsed,
         datasetLabel: dataset?.label ?? filter_visual_resources_1.DEFAULT_UI_FILTER.datasetLabel,
         columnLabel: columnInfo?.label ?? filter_visual_resources_1.DEFAULT_UI_FILTER.columnLabel,
-        formulaType: columnInfo?.formulaType,
+        formulaType: columnInfo?.formulaType ||
+            filter.formulaType ||
+            filter_visual_resources_1.DEFAULT_UI_FILTER.formulaType,
         icon: filter.icon ?? filter_visual_resources_1.DEFAULT_UI_FILTER.icon,
         iconTooltip: filter.iconTooltip ?? filter_visual_resources_1.DEFAULT_UI_FILTER.iconTooltip,
     };

package/dist/cjs/helpers/filter-adapt.logic.helpers.js

@@ -13,10 +13,10 @@ const filter_logic_resources_1 = require("../resources/filter-logic.resources");
 const filter_operators_resources_1 = require("../resources/filter-operators.resources");
 const filter_validators_resources_1 = require("../resources/filter-validators.resources");
 const filters_resources_1 = require("../resources/filters.resources");
-function filterToLogic(filters) {
+function filterToLogic(filters, datasets = []) {
     if ((0, utils_1.isEmpty)(filters))
         return [];
-    const visual = (0, filter_adapt_helpers_1.filterToVisual)(filters);
+    const visual = (0, filter_adapt_helpers_1.filterToVisual)(filters, datasets);
     return visualToLogic(visual);
 }
 function visualToLogic(visual) {

package/dist/classes/FilterAdapter.js

@@ -24,7 +24,7 @@ export class FilterAdapter {
         return filterToLegacyVisual(this._filters, this.datasets, this.interactiveTable);
     }
     filterToLogic() {
-        return filterToLogic(this._filters);
+        return filterToLogic(this._filters, this.datasets);
     }
     filterToVisual() {
         return filterToVisual(this._filters, this.datasets, this.interactiveTable);

package/dist/classes/FilterResources.d.ts

@@ -1,7 +1,7 @@
 import { IColumnVsFormulaType, IDTimezone } from "@qrvey/utils";
 import { IFilterGroupingInfoByColumnTypeSettings, IFilterGroupingInfoByFilterSettings, IFilterGroupingInfoListByColumnSettings } from "../resources/filter-functions.resources";
 import { IFilterGrouping, IFilterGroupingInfo } from "../resources/filter-grouping.resources";
-import { IFilterScope } from "../resources/filter-scopes.resources";
+import { IFilterScope, IFilterScopeIdentifier } from "../resources/filter-scopes.resources";
 import { IFilterValidator, IFilterValidatorInfo } from "../resources/filter-validators.resources";
 import { IFilter } from "../resources/filters.resources";
 export declare class FilterResources {
@@ -16,6 +16,7 @@ export declare class FilterResources {
     static getGroupings(): IFilterGrouping[];
     static getGroupingsInfoList(): IFilterGroupingInfo[];
     static getHierarchyScopes(): IFilterScope[];
+    static getScopeIdentifiers(filters: IFilter[]): IFilterScopeIdentifier[];
     static getFiltersByTimezone(filters: IFilter[], timezone: IDTimezone): IFilter[];
     static getValidatorInfo(validator: IFilterValidator): IFilterValidatorInfo;
     static getValidatorInfoList(): IFilterValidatorInfo[];

package/dist/classes/FilterResources.js

@@ -87,6 +87,22 @@ export class FilterResources {
     static getHierarchyScopes() {
         return FILTER_SCOPES;
     }
+    static getScopeIdentifiers(filters) {
+        if (!Array.isArray(filters) || isEmpty(filters))
+            return [];
+        const seen = new Map();
+        for (const filter of filters) {
+            const key = `${filter.scope}|${filter.scopeId ?? ""}`;
+            if (!seen.has(key)) {
+                seen.set(key, {
+                    datasetId: filter.datasetId,
+                    scope: filter.scope,
+                    scopeId: filter.scopeId,
+                });
+            }
+        }
+        return Array.from(seen.values());
+    }
     static getFiltersByTimezone(filters, timezone) {
         if (isEmpty(filters) || !Array.isArray(filters))
             return [];

package/dist/helpers/filter-adapt.helpers.js

@@ -93,7 +93,9 @@ function buildFilter(filter, dataset) {
         collapsed: filter.collapsed ?? DEFAULT_FILTER.collapsed,
         datasetLabel: dataset?.label ?? DEFAULT_UI_FILTER.datasetLabel,
         columnLabel: columnInfo?.label ?? DEFAULT_UI_FILTER.columnLabel,
-        formulaType: columnInfo?.formulaType,
+        formulaType: columnInfo?.formulaType ||
+            filter.formulaType ||
+            DEFAULT_UI_FILTER.formulaType,
         icon: filter.icon ?? DEFAULT_UI_FILTER.icon,
         iconTooltip: filter.iconTooltip ?? DEFAULT_UI_FILTER.iconTooltip,
     };

package/dist/helpers/filter-adapt.logic.helpers.d.ts

@@ -1,7 +1,8 @@
+import { IDataset } from "@qrvey/utils";
 import { IFilterLogic, IFilterLogicExpression, IFilterLogicExpressionValue } from "../resources/filter-logic.resources";
 import { IFilterUI, IFilterVisual } from "../resources/filter-visual.resources";
 import { IFilter } from "../resources/filters.resources";
-export declare function filterToLogic(filters: IFilter[]): IFilterLogic[];
+export declare function filterToLogic(filters: IFilter[], datasets?: IDataset[]): IFilterLogic[];
 export declare function visualToLogic(visual: IFilterVisual): IFilterLogic[];
 export declare function buildLogicExpression(filter: IFilterUI): IFilterLogicExpression;
 export declare function getFilterLogicValues(filter: IFilterUI): IFilterLogicExpressionValue[];

package/dist/helpers/filter-adapt.logic.helpers.js

@@ -7,10 +7,10 @@ import { FILTER_LOGIC_VALIDATOR, } from "../resources/filter-logic.resources";
 import { FILTER_OPERATOR, } from "../resources/filter-operators.resources";
 import { FILTER_LOGIC_VALIDATOR_BY_VALIDATOR, FILTER_VALIDATOR, } from "../resources/filter-validators.resources";
 import { FILTER_TYPE } from "../resources/filters.resources";
-export function filterToLogic(filters) {
+export function filterToLogic(filters, datasets = []) {
     if (isEmpty(filters))
         return [];
-    const visual = filterToVisual(filters);
+    const visual = filterToVisual(filters, datasets);
     return visualToLogic(visual);
 }
 export function visualToLogic(visual) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/filters",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Helpers and logic for Filtering Data in Qrvey app",
   "main": "dist/cjs/index.js",
   "module": "dist/index.js",