@qrvey/utils 1.3.0-9 → 1.3.2

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

@@ -1,11 +1,9 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
 import { FILTER_GROUPED_COLUMN_OPERATOR } from "../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR";
+import { getFilterid } from "./getFilterid";
 import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
-import { isInValidator } from "./isInValidator";
-import { isNullValidator } from "./isNullValidator";
-import { isRangeValidator } from "./isRangeValidator";
-import { isRegularValidator } from "./isRegularValidator";
+import { mergeValues } from "./mergeValues";
 import { resolveDatasetConditions } from "./resolveDatasetConditions";
 import { resolveFilterConditions } from "./resolveFilterConditions";
 import { resolveScopeConditions } from "./resolveScopeConditions";
@@ -13,7 +11,7 @@ import { resolveScopeConditions } from "./resolveScopeConditions";
  * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
  * @param filterData1 The target filter data
  * @param filterData2 the filter data to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter data structure
  */
 export function mergeFilters(filterData1, filterData2, settings) {
@@ -38,14 +36,14 @@ export function mergeFilters(filterData1, filterData2, settings) {
  * Gets a new scope structure array by merging two scope structures
  * @param scopes1 the target scope structure
  * @param scopes2 the scope to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new scope structure array
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
         const scope2Index = scopes2.findIndex(scope2 => resolveScopeConditions(scope2, { scope: scope1.scope, scopeid: scope1.scopeid }));
         if (scope2Index > -1) {
-            scope1 = Object.assign(Object.assign({}, scope1), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
+            scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
             scopes2.splice(scope2Index, 1);
         }
         scopes.push(scope1);
@@ -59,14 +57,14 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
  * Gets a new dataset structure array by merging two dataset structures
  * @param datasets1 the target dataset structure
  * @param datasets2 the dataset to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new dataset structure array
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
         const dataset2Index = datasets2.findIndex(dataset2 => resolveDatasetConditions(dataset2, { qrveyid: dataset1.qrveyid, linkid: dataset1.linkid }));
         if (dataset2Index > -1) {
-            dataset1 = Object.assign(Object.assign({}, dataset1), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
+            dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
             datasets2.splice(dataset2Index, 1);
         }
         datasets.push(dataset1);
@@ -80,19 +78,21 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
  * Gets a new filter structure array by merging two filter structures
  * @param filters1 the target filter structure
  * @param filters2 the filter to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter structure array
  */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
         const filter2Index = filters2.findIndex(filter2 => resolveFilterConditions(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
         if (filter2Index > -1) {
-            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings.overwriteValues) });
+            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings) });
+            filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
             filters2.splice(filter2Index, 1);
         }
         else {
             filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator ? FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator });
         }
+        filter1.filterid = getFilterid(filter1);
         filters.push(filter1);
         return filters;
     }, []);
@@ -101,52 +101,16 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
     return newFilters;
 }
 /**
- * Gets a new value structure array by merging two value structures
+ * Gets a new filter structure when the setting is configured
  * @param filter1 the target filter structure
  * @param filter2 the filter to be used to merge the values
- * @param overwrite Flag to overwrite or not the filter values
- * @returns a new value structure array
+ * @param settings configuration of the mergeFilter
+ * @returns a new filter structure with overwritted props
  */
-function mergeValues(filter1, filter2, overwrite = false) {
-    if (isEmpty(filter1) && isEmpty(filter2))
-        return [];
-    let newValues = [];
-    if (!overwrite) {
-        if (isInValidator(filter1.validator)) {
-            newValues = filter2.values.reduce((values, value2) => {
-                const value1Index = filter1.values.findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1.values);
-        }
-        else if (isRangeValidator(filter1.validator)) {
-            newValues = filter2.values.reduce((values, value2) => {
-                const value1Index = filter1.values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1.values);
-        }
-        else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
-            newValues = filter2.values.reduce((values, value2) => {
-                const value1Index = filter1.values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
-                if (value1Index === -1) {
-                    values.push(value2);
-                }
-                return values;
-            }, filter1.values);
-        }
-        else {
-            filter1.values = filter1.values.concat(filter2.values);
-            newValues = filter1.values;
-        }
-    }
-    else {
-        filter1.values = filter2.values;
-        newValues = filter1.values;
+function mergeFilterProps(filter1, filter2, settings) {
+    var _a, _b, _c;
+    if (settings.overwriteFilterProps) {
+        filter1 = Object.assign(Object.assign({}, filter1), { collapsed: (_a = filter2.collapsed) !== null && _a !== void 0 ? _a : filter1.collapsed, displayed: (_b = filter2.displayed) !== null && _b !== void 0 ? _b : filter1.displayed, dateSection: filter2.dateSection, extras: filter2.extras, enabled: (_c = filter2.enabled) !== null && _c !== void 0 ? _c : filter1.enabled, operator: filter2.operator || filter1.operator, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
     }
-    return newValues;
+    return filter1;
 }

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

@@ -0,0 +1,11 @@
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFFiltersMergeValues } from "../../interfaces/functions/IFFiltersMergeValues";
+import { IFValue } from "../../interfaces/IFValue";
+/**
+ * Gets a new value structure array by merging two value structures
+ * @param filter1 the target filter structure
+ * @param filter2 the filter to be used to merge the values
+ * @param settings configuration of the mergeFilter
+ * @returns a new value structure array
+ */
+export declare function mergeValues(filter1: IFSFilter, filter2: IFSFilter, settings?: IFFiltersMergeValues): IFValue[];

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

@@ -0,0 +1,91 @@
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { getMergeValuesSettings } from "./getMergeValuesSettings";
+import { isInValidator } from "./isInValidator";
+import { isNullValidator } from "./isNullValidator";
+import { isRangeValidator } from "./isRangeValidator";
+import { isRegularValidator } from "./isRegularValidator";
+/**
+ * Gets a new value structure array by merging two value structures
+ * @param filter1 the target filter structure
+ * @param filter2 the filter to be used to merge the values
+ * @param settings configuration of the mergeFilter
+ * @returns a new value structure array
+ */
+export function mergeValues(filter1, filter2, settings) {
+    if (isEmpty(filter1) && isEmpty(filter2))
+        return [];
+    settings = getMergeValuesSettings(settings);
+    let newValues = [];
+    let filter1Values = filter1.values || [];
+    const filter2Values = filter2.values || [];
+    if (settings.overwriteValues) {
+        filter1Values = filter2Values;
+        newValues = filter1Values;
+    }
+    else {
+        if (isInValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a, _b;
+                const value1Index = filter1Values.findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        anchor: value2.anchor,
+                        cursor: value2.cursor,
+                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
+                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        includeCurrent: value2.includeCurrent,
+                        isCalendarDate: value2.isCalendarDate,
+                        number: value2.number,
+                        unit: value2.unit,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else if (isRangeValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a, _b;
+                const value1Index = filter1Values.findIndex(value1 => value2.max === value1.max && value2.min === value1.min);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
+                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        max: value2.max,
+                        min: value2.min,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else if (isRegularValidator(filter1.validator) || isNullValidator(filter1.validator)) {
+            newValues = filter2Values.reduce((values, value2) => {
+                var _a, _b;
+                const value1Index = filter1Values.findIndex(value1 => value2.imageUrl === value1.imageUrl && value2.value === value1.value);
+                if (value1Index === -1) {
+                    values.push(value2);
+                }
+                else {
+                    values[value1Index] = {
+                        displayed: (_a = value2.displayed) !== null && _a !== void 0 ? _a : values[value1Index].displayed,
+                        enabled: (_b = value2.enabled) !== null && _b !== void 0 ? _b : values[value1Index].enabled,
+                        imageUrl: value2.imageUrl,
+                        value: value2.value,
+                        valueid: value2.valueid,
+                    };
+                }
+                return values;
+            }, filter1Values);
+        }
+        else {
+            filter1Values = filter1Values.concat(filter2Values);
+            newValues = filter1Values;
+        }
+    }
+    return newValues;
+}

package/dist/filters/helpers/getAggFiltersFromFilterData.d.ts

@@ -1,9 +1,10 @@
 import { IFBFilterAggregate } from "../interfaces/backend/IFBFilterAggregate";
 import { IFSData } from "../interfaces/common/IFSData";
 /**
- *
- * @param logics
- * @param summaries
- * @returns
+ * @todo FIX AGGREGATE FILTERS
+ * @private
+ * @param filterData
+ * @param _summaries
+ * @returns the aggFilters structure
  */
 export declare function getAggFiltersFromFilterData(filterData: IFSData, _summaries: any[]): IFBFilterAggregate;

package/dist/filters/helpers/getAggFiltersFromFilterData.js

@@ -1,12 +1,12 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { getFiltersByAggregateColumn } from "./common/getFiltersByAggregateColumn";
 /**
- *
- * @param logics
- * @param summaries
- * @returns
+ * @todo FIX AGGREGATE FILTERS
+ * @private
+ * @param filterData
+ * @param _summaries
+ * @returns the aggFilters structure
  */
-// [TODO: FILTERS - FIX AGGREGATE FILTERS]
 export function getAggFiltersFromFilterData(filterData, _summaries) {
     filterData = Object.assign({}, getFiltersByAggregateColumn(filterData));
     if (isEmpty(filterData))

package/dist/filters/helpers/getAvailableScopes.js

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

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

@@ -6,3 +6,4 @@ export * from './applyHierarchyForAggFilters';
 export * from './getAvailableScopes';
 export * from './getAvailableScopesIDsByConfig';
 export * from './getScopesByHierarchy';
+export * from './OLD_getAggFilters';

package/dist/filters/helpers/index.js

@@ -3,6 +3,8 @@ export * from './builder/index';
 export * from './common/index';
 export * from './ui/index';
 export * from './applyHierarchyForAggFilters';
+// export * from './getAggFiltersFromFilterData';
 export * from './getAvailableScopes';
 export * from './getAvailableScopesIDsByConfig';
 export * from './getScopesByHierarchy';
+export * from './OLD_getAggFilters';

package/dist/filters/helpers/ui/getUIFlatFilterByParams.js

@@ -1,6 +1,6 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
-import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
+import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
 /**
   * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object
   * The validation to filter the stored filter is depending on:

package/dist/filters/helpers/ui/getUIFlatFiltersByParams.js

@@ -1,6 +1,6 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
-import { resolveUIFlatFilterByParams } from "./resolveUIFlatFiltersByParams";
+import { resolveUIFlatFilterByParams } from "./resolveUIFlatFilterByParams";
 /**
    * Gets a filter from the given Flattened UI Filters by given params. Return a index of the array or an object
    * The validation to filter the stored filter is depending on:

package/dist/filters/helpers/ui/getUIValues.d.ts

@@ -2,9 +2,9 @@ import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFUValue } from "../../interfaces/ui/IFUValue";
 import { IFUUIValueSettings } from "../../interfaces/ui/IFUUIValueSettings";
 /**
- * Gets the UI Values from the filter object
- * @param filter The filter object
- * @param settings configuration for this function
+ * Gets the UI Values generated depending on the validator
+ * @param filter the filter structure
+ * @param settings a settings for this function
  * @returns an array of values
  */
 export declare function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): IFUValue[];

package/dist/filters/helpers/ui/getUIValues.js

@@ -5,64 +5,71 @@ import { COLUMN } from "../../../columns/constants/COLUMN";
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { flattenDeep } from "../../../general/array/flattenDeep";
 import { RELATIVE_CURSOR_INFO } from "../../../dates/relative/constants/RELATIVE_CURSOR_INFO";
-import { getI18nDateGroupLabel } from "../../..";
+import { getI18nDateGroupLabel } from "../../../globalization/helpers/getI18nDateGroupLabel";
 /**
- * Gets the UI Values from the filter object
- * @param filter The filter object
- * @param settings configuration for this function
+ * Gets the UI Values generated depending on the validator
+ * @param filter the filter structure
+ * @param settings a settings for this function
  * @returns an array of values
  */
 export function getUIValues(filter, settings) {
-    var _a;
+    var _a, _b;
     settings = getUiValuesSettings(settings);
+    const values = filter.values || [];
     switch (filter.validator) {
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
         case FILTER_VALIDATOR.AFTER_ON:
         case FILTER_VALIDATOR.GREATER_THAN_EQUAL:
-            return filter.values.map(value => ({
+            return values.map(value => ({
                 value: getValueLabel(value.min, filter, settings),
+                displayed: value.displayed != null ? value.displayed : true,
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR.BEFORE_ON:
         case FILTER_VALIDATOR.LESS_THAN_EQUAL:
         case FILTER_VALIDATOR.BEFORE:
         case FILTER_VALIDATOR.LESS_THAN:
-            return filter.values.map(value => ({
+            return values.map(value => ({
                 value: getValueLabel(value.max, filter, settings),
+                displayed: value.displayed != null ? value.displayed : true,
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:
         case FILTER_VALIDATOR.BETWEEN_EXCLUSIVE:
-            return filter.values.map(value => ({
+            return values.map(value => ({
                 value: `${getValueLabel(value.min, filter, settings)} ${getRangeSeparator(settings)} ${getValueLabel(value.max, filter, settings)}`,
+                displayed: value.displayed != null ? value.displayed : true,
                 enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
             return [{
                     value: (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate('filter.validators.' + filter.validator.toLowerCase() + '_label') : FILTER_VALIDATOR_INFO[filter.validator].label,
-                    enabled: settings.addEnableds ? (_a = filter.values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
+                    displayed: (_a = values[0]) === null || _a === void 0 ? void 0 : _a.displayed,
+                    enabled: settings.addEnableds ? (_b = values[0]) === null || _b === void 0 ? void 0 : _b.enabled : undefined,
                 }];
         case FILTER_VALIDATOR.IN:
-            return filter.values.map(value => {
+            return values.map(value => {
                 const cursor = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate(RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath) : RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath;
                 const from = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate('filter.relative_container.from_label') : 'from';
                 const anchor = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings === null || settings === void 0 ? void 0 : settings.translate('filter.relative_container.current_date') : 'current date';
                 return {
                     value: `${cursor} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value, settings)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `${from} ${value.anchor || anchor}` : ''}`,
-                    enabled: settings.addEnableds ? filter.enabled : undefined,
+                    displayed: value.displayed != null ? value.displayed : true,
+                    enabled: settings.addEnableds ? value.enabled : undefined,
                 };
             });
         default:
             if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
-                return getRankingUIValues(filter.values, settings.addEnableds, settings.rankingGroupIndex);
+                return getRankingUIValues(values, settings.addEnableds, settings.rankingGroupIndex);
             }
-            return (filter.values || []).map(val => ({
-                imageUrl: val.imageUrl,
-                value: getValueLabel(val.value, filter, settings),
-                enabled: settings.addEnableds ? val.enabled != null ? val.enabled : true : undefined,
-                valueid: val.valueid,
+            return values.map(value => ({
+                imageUrl: value.imageUrl,
+                value: getValueLabel(value.value, filter, settings),
+                displayed: value.displayed != null ? value.displayed : true,
+                enabled: settings.addEnableds ? value.enabled != null ? value.enabled : true : undefined,
+                valueid: value.valueid,
             }));
     }
 }
@@ -89,6 +96,7 @@ function getRankingUIValues(values, addEnableds = false, rankingGroupIndex) {
         rankingIndex: rankingGroupIndex,
         value: `${rankingValue.value.value} - ${rankingValue.position}`,
         valueid: rankingValue.value.valueid,
+        displayed: rankingValue.displayed != null ? rankingValue.displayed : true,
         enabled: addEnableds ? rankingValue.enabled : undefined
     }));
 }

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

@@ -8,4 +8,5 @@ export * from './getUIFlatFiltersByParams';
 export * from './getUIFlatFiltersByScopes';
 export * from './getUIValues';
 export * from './getUpdatedUIFilters';
+export * from './resolveUIFlatFilterByParams';
 export * from './transformFilterValues';

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

@@ -8,4 +8,5 @@ export * from './getUIFlatFiltersByParams';
 export * from './getUIFlatFiltersByScopes';
 export * from './getUIValues';
 export * from './getUpdatedUIFilters';
+export * from './resolveUIFlatFilterByParams';
 export * from './transformFilterValues';

package/dist/filters/helpers/ui/{resolveUIFlatFiltersByParams.d.ts → resolveUIFlatFilterByParams.d.ts}

@@ -1,4 +1,5 @@
-import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
+import { IFUFlattenedFilter } from "../../interfaces/ui/IFUFlattenedFilter";
+import { IFUParamsToGetFilter } from "../../interfaces/ui/IFUParamsToGetFilter";
 /**
  * Resolves conditions between UI flattened filter and given parameters
  * @param filter UI Flatten Filter

package/dist/filters/helpers/ui/{resolveUIFlatFiltersByParams.js → resolveUIFlatFilterByParams.js}

@@ -1,4 +1,4 @@
-import { isEmpty } from "../../../general";
+import { isEmpty } from "../../../general/mix/isEmpty";
 /**
  * Resolves conditions between UI flattened filter and given parameters
  * @param filter UI Flatten Filter

package/dist/filters/helpers/ui/transformFilterValues.d.ts

@@ -1,4 +1,4 @@
-import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFValue } from "../../interfaces/IFValue";
+import { IFUFilter } from "../../interfaces/ui/IFUFilter";
 import { IFUTransformFilterValuesSettings } from "../../interfaces/ui/IFUTransformFilterValuesSettings";
-export declare function transformFilterValues(filter: IFSFilter, settings: IFUTransformFilterValuesSettings): IFValue[];
+export declare function transformFilterValues(filter: IFUFilter, settings: IFUTransformFilterValuesSettings): IFValue[];

package/dist/filters/helpers/ui/transformFilterValues.js

@@ -6,13 +6,14 @@ export function transformFilterValues(filter, settings) {
     const transformValueSettings = Object.assign(Object.assign({}, settings), { column: filter.column, property: filter.property });
     if (isEmpty(filter))
         return [];
+    const values = filter.values || [];
     if (isRegularValidator(filter.validator)) {
-        return filter.values.map((value) => (Object.assign(Object.assign({}, value), { value: transformValue(value.value, transformValueSettings) })));
+        return values.map((value) => (Object.assign(Object.assign({}, value), { value: transformValue(value.value, transformValueSettings) })));
     }
     else if (isRangeValidator(filter.validator)) {
-        return filter.values.map((value) => (Object.assign(Object.assign({}, value), { min: transformValue(value.min, transformValueSettings), max: transformValue(value.max, transformValueSettings) })));
+        return values.map((value) => (Object.assign(Object.assign({}, value), { min: transformValue(value.min, transformValueSettings), max: transformValue(value.max, transformValueSettings) })));
     }
     else {
-        return filter.values;
+        return values;
     }
 }

package/dist/filters/index.d.ts

@@ -3,3 +3,4 @@ export * from './classes/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/index';
+export * from './services/index';

package/dist/filters/index.js

@@ -3,3 +3,4 @@ export * from './classes/index';
 export * from './constants/index';
 export * from './helpers/index';
 export * from './interfaces/index';
+export * from './services/index';

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

@@ -11,8 +11,10 @@ import { IFValue } from "./IFValue";
 import { IFUChartSettings } from "./ui/IFUChartSettings";
 import { IFUValue } from "./ui/IFUValue";
 export interface OLD_IFilterDetail {
-    column?: IColumn & {
+    column?: Omit<IColumn, 'label'> & {
         dataset: IDataset;
+    } & {
+        text: string;
     };
     dateSection?: IFDateSection;
     enabled?: boolean;
@@ -20,6 +22,7 @@ export interface OLD_IFilterDetail {
     nullValues?: boolean;
     operator?: IFOperator;
     property?: IFProperty;
+    selectAll?: boolean;
     validator?: IFValidator;
     values?: IFValue[];
     chartSettings?: IFUChartSettings;

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

@@ -0,0 +1,5 @@
+import { IFSValue } from "../common/IFSValue";
+export interface IFBData {
+    data: IFSValue[];
+    total?: number;
+}

package/dist/filters/interfaces/backend/IFBData.js

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

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

@@ -14,6 +14,7 @@
  */
 export * from './IFBackendExpressionValue';
 export * from './IFBackendValidator';
+export * from './IFBData';
 export * from './IFBExpression';
 export * from './IFBExpressionAggregate';
 export * from './IFBExpressionRelativeDate';

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

@@ -14,6 +14,7 @@
  */
 export * from './IFBackendExpressionValue';
 export * from './IFBackendValidator';
+export * from './IFBData';
 export * from './IFBExpression';
 export * from './IFBExpressionAggregate';
 export * from './IFBExpressionRelativeDate';

package/dist/filters/interfaces/builder/IFilterBuilderConfig.d.ts

@@ -1,5 +1,6 @@
 import { IFBLogic } from "../backend/IFBLogic";
 import { IFBUserFilters } from "../backend/IFBUserFilters";
+import { IFilterConfig } from "../common/IFilterConfig";
 import { IFSColumn } from "../common/IFSColumn";
 import { IFSData } from "../common/IFSData";
 import { IFProperty } from "../IFProperty";
@@ -8,7 +9,6 @@ import { IFSection } from "../IFSection";
 import { IFValidator } from "../IFValidator";
 import { OLD_IFilterData } from "../OLD_IFilterData";
 import { IFUData } from "../ui/IFUData";
-import { IFilterBuilderGeneralConfig } from "./IFilterBuilderGeneralConfig";
 import { IFilterBuilderSettings } from "./IFilterBuilderSettings";
 /**
  * Structure for the configuration of the Filter Builder
@@ -30,5 +30,5 @@ export interface IFilterBuilderConfig {
     tokenBoxConfig?: any;
     userFilters?: IFBUserFilters;
     validator?: IFValidator;
-    widgetConfig: IFilterBuilderGeneralConfig;
+    widgetConfig: IFilterConfig;
 }

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

@@ -13,6 +13,5 @@
  * IFP-: Structures to Filter Panel
  */
 export * from './IFilterBuilderConfig';
-export * from './IFilterBuilderGeneralConfig';
 export * from './IFilterBuilderSettings';
 export * from './IFilterBuilderSettingsScopes';

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

@@ -13,6 +13,5 @@
  * IFP-: Structures to Filter Panel
  */
 export * from './IFilterBuilderConfig';
-export * from './IFilterBuilderGeneralConfig';
 export * from './IFilterBuilderSettings';
 export * from './IFilterBuilderSettingsScopes';

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

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

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

@@ -1,2 +1,2 @@
 import { IColumn } from "../../../columns/interfaces/IColumn";
-export declare type IFSColumn = IColumn;
+export declare type IFSColumn = Omit<IColumn, 'expressionCategory' | 'expressionNegative' | 'expressionPositive' | 'expressionWords' | 'label' | 'lookupValue' | 'slidebarValue'>;