@qrvey/utils 1.8.0-filter-visibility-0 → 1.8.0

package/dist/filters/adapters/flatUIToFD.js

@@ -81,7 +81,6 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
-    var _a, _b, _c;
     const _uFilter = cloneDeep(uFilter);
     const info = !isEmpty(_uFilter.extras.info)
         ? { icon: _uFilter.extras.info.icon, label: _uFilter.extras.info.label }
@@ -100,10 +99,7 @@ function buildFilter(uFilter) {
             type: _uFilter.column.type,
         },
         dateSection: _uFilter.dateSection,
-        deletable: (_a = _uFilter.deletable) !== null && _a !== void 0 ? _a : true,
         displayed: _uFilter.displayed,
-        editable: (_b = _uFilter.editable) !== null && _b !== void 0 ? _b : true,
-        enableable: (_c = _uFilter.enableable) !== null && _c !== void 0 ? _c : true,
         filterid: _uFilter.filterid,
         enabled: _uFilter.enabled,
         extras: Object.assign(Object.assign({}, _uFilter.extras), { panelid: _uFilter.extras.panelid, filterLabel: _uFilter.extras.filterLabel, info, scope: _uFilter.extras.scope, scopeid: _uFilter.extras.scopeid, section: _uFilter.extras.section }),

package/dist/filters/adapters/flatUIToUI.js

@@ -91,7 +91,6 @@ function buildDataset(uFilter) {
  * @returns an filter structure
  */
 function buildFilter(uFilter) {
-    var _a, _b, _c;
     const _uFilter = cloneDeep(uFilter);
     const info = !isEmpty(_uFilter.extras.info)
         ? { icon: _uFilter.extras.info.icon, label: _uFilter.extras.info.label }
@@ -115,10 +114,7 @@ function buildFilter(uFilter) {
             type: _uFilter.column.type,
         },
         dateSection: _uFilter.dateSection,
-        deletable: (_a = _uFilter.deletable) !== null && _a !== void 0 ? _a : true,
         displayed: _uFilter.displayed,
-        editable: (_b = _uFilter.editable) !== null && _b !== void 0 ? _b : true,
-        enableable: (_c = _uFilter.enableable) !== null && _c !== void 0 ? _c : true,
         filterid: _uFilter.filterid,
         enabled: _uFilter.enabled,
         extras: Object.assign(Object.assign({}, _uFilter.extras), { panelid: _uFilter.extras.panelid, filterLabel: _uFilter.extras.filterLabel, info, scope: _uFilter.extras.scope, scopeid: _uFilter.extras.scopeid, section: _uFilter.extras.section }),

package/dist/filters/adapters/logicToFlatUI.js

@@ -61,7 +61,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
     }
 }
 function getFilterByExpression(expression, scopeItem) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const uiExtras = expression.uiExtras;
     const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL
         ? _get(scopeItem, "uiExtras.scopeid")
@@ -87,14 +87,11 @@ function getFilterByExpression(expression, scopeItem) {
             type: (_l = uiExtras.column) === null || _l === void 0 ? void 0 : _l.type,
         },
         dateSection: uiExtras.dateSection,
-        deletable: (_o = (_m = uiExtras._newFilters) === null || _m === void 0 ? void 0 : _m.deletable) !== null && _o !== void 0 ? _o : true,
-        displayed: (_q = (_p = uiExtras._newFilters) === null || _p === void 0 ? void 0 : _p.displayed) !== null && _q !== void 0 ? _q : true,
-        editable: (_s = (_r = uiExtras._newFilters) === null || _r === void 0 ? void 0 : _r.editable) !== null && _s !== void 0 ? _s : true,
-        enableable: (_u = (_t = uiExtras._newFilters) === null || _t === void 0 ? void 0 : _t.enableable) !== null && _u !== void 0 ? _u : true,
+        displayed: true,
         enabled: uiExtras.enabled,
         extras: Object.assign(Object.assign({}, uiExtras.extras), { panelid: uiExtras.panelid, filterLabel: uiExtras.panelName, info,
             scopeid, scope: scopeItem.scope, section: uiExtras.section, scopeInfo: {
-                collapsed: (_v = scopeItem.uiExtras) === null || _v === void 0 ? void 0 : _v.collapsed,
+                collapsed: (_m = scopeItem.uiExtras) === null || _m === void 0 ? void 0 : _m.collapsed,
                 enabled: scopeItem.enabled,
                 displayed: true,
                 scope: scopeItem.scope,
@@ -103,7 +100,7 @@ function getFilterByExpression(expression, scopeItem) {
                 collapsed: false,
                 enabled: true,
                 displayed: true,
-                qrveyid: (_w = uiExtras.column) === null || _w === void 0 ? void 0 : _w.qrveyid,
+                qrveyid: (_o = uiExtras.column) === null || _o === void 0 ? void 0 : _o.qrveyid,
                 label: _get(uiExtras.column, "dataset.name") ||
                     _get(uiExtras.column, "label"),
             } }),

package/dist/filters/constants/settings/FILTER_SETTINGS_DEFAULT.js

@@ -9,7 +9,6 @@ export const FILTER_SETTINGS_DEFAULT = {
     filterBuilder: {
         scopeSelectorDisplayed: true,
         scopeSelectorEnabled: true,
-        strictlyInteractivity: false,
     },
     filterDisplayer: {
         addFilterDisplayed: true,
@@ -72,7 +71,6 @@ export const FILTER_SETTINGS_DEFAULT = {
         },
         iconsDisplayed: true,
         readonly: false,
-        strictlyInteractivity: false,
         updateFilterInfo: true,
     },
     filterPanelSettings: {

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

@@ -14,11 +14,6 @@ export function resolveDatasetConditions(dataset, params, letPassUndefinedProper
         (letPassUndefinedProperties && dataset.enabled == null) ||
         (letPassUndefinedParams && params.enableds.datasets == null) ||
         params.enableds.datasets === dataset.enabled) &&
-        (!_hasProperty(params, "displayeds") ||
-            !_hasProperty(params.displayeds, "datasets") ||
-            (letPassUndefinedProperties && dataset.displayed == null) ||
-            (letPassUndefinedParams && params.displayeds.datasets == null) ||
-            params.displayeds.datasets === dataset.displayed) &&
         (!_hasProperty(params, "qrveyid") ||
             (letPassUndefinedProperties && dataset.qrveyid == null) ||
             (letPassUndefinedParams && isEmpty(params.qrveyid)) ||

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

@@ -15,11 +15,6 @@ export function resolveFilterConditions(filter, params, letPassUndefinedProperti
         (letPassUndefinedProperties && filter.enabled == null) ||
         (letPassUndefinedParams && params.enableds.filters == null) ||
         params.enableds.filters === filter.enabled) &&
-        (!_hasProperty(params, "displayeds") ||
-            !_hasProperty(params.displayeds, "filters") ||
-            (letPassUndefinedProperties && filter.displayed == null) ||
-            (letPassUndefinedParams && params.displayeds.filters == null) ||
-            params.displayeds.filters === filter.displayed) &&
         (!_hasProperty(params, "dateSection") ||
             (letPassUndefinedProperties && filter.dateSection == null) ||
             (letPassUndefinedParams && isEmpty(params.dateSection)) ||

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

@@ -14,11 +14,6 @@ export function resolveScopeConditions(scope, params, letPassUndefinedProperties
         (letPassUndefinedProperties && scope.enabled == null) ||
         (letPassUndefinedParams && params.enableds.scopes == null) ||
         params.enableds.scopes === scope.enabled) &&
-        (!_hasProperty(params, "displayeds") ||
-            !_hasProperty(params.displayeds, "scopes") ||
-            (letPassUndefinedProperties && scope.displayed == null) ||
-            (letPassUndefinedParams && params.displayeds.scopes == null) ||
-            params.displayeds.scopes === scope.displayed) &&
         (!_hasProperty(params, "scope") ||
             (letPassUndefinedProperties && scope.scope == null) ||
             (letPassUndefinedParams && isEmpty(params.scope)) ||

package/dist/filters/helpers/getTokensFromFilters.js

@@ -31,7 +31,7 @@ export function getTokensFromFilters(filters, options) {
             continue;
         if (options.showScope) {
             tokens.push({
-                token: i18nService.translate(`filter.scope_title.${scope.scope.toLowerCase()}`) + ":",
+                token: `${i18nService.translate(`filter.scope_title.${scope.scope.toLowerCase()}`)}:`,
                 type: FILTER_TOKENS_STRUCTURE_TYPE.SCOPE,
             });
         }
@@ -41,7 +41,7 @@ export function getTokensFromFilters(filters, options) {
                 continue;
             if (options.showDatabaseName) {
                 tokens.push({
-                    token: database.label + ":",
+                    token: `${database.label}:`,
                     type: FILTER_TOKENS_STRUCTURE_TYPE.DATABASE_NAME,
                 });
             }
@@ -57,27 +57,26 @@ export function getTokensFromFilters(filters, options) {
                 if (!thereIsFiltersWithValues)
                     thereIsFiltersWithValues = true;
                 if (options.showChartName && scope.scope === FILTER_SCOPE.CHART) {
-                    const searchToken = tokens.find((token) => token.token === filter.extras.filterLabel + ":");
+                    const searchToken = tokens.find((token) => token.token === `${filter.extras.filterLabel}:` &&
+                        token.id === filter.extras.panelid);
                     if (!searchToken) {
                         if (((_b = tokens[tokens.length - 1]) === null || _b === void 0 ? void 0 : _b.type) ===
                             FILTER_TOKENS_STRUCTURE_TYPE.LOGICAL_OPERATOR) {
                             tokens.pop();
                         }
                         tokens.push({
-                            token: filter.extras.filterLabel + ":",
+                            token: `${filter.extras.filterLabel}:`,
                             type: FILTER_TOKENS_STRUCTURE_TYPE.CHART_NAME,
+                            id: filter.extras.panelid,
                         });
                     }
                 }
                 let columnLabel = filter.column.label;
                 if ((_c = filter === null || filter === void 0 ? void 0 : filter.column) === null || _c === void 0 ? void 0 : _c.aggregate) {
-                    columnLabel +=
-                        " (" +
-                            i18nService.translate(`common.aggregate_labels.${(_d = filter === null || filter === void 0 ? void 0 : filter.column) === null || _d === void 0 ? void 0 : _d.aggregate.toLowerCase()}`) +
-                            ")";
+                    columnLabel += ` (${i18nService.translate(`common.aggregate_labels.${(_d = filter === null || filter === void 0 ? void 0 : filter.column) === null || _d === void 0 ? void 0 : _d.aggregate.toLowerCase()}`)})`;
                 }
                 tokens.push({
-                    token: columnLabel + ":",
+                    token: `${columnLabel}:`,
                     type: FILTER_TOKENS_STRUCTURE_TYPE.COLUMN_NAME,
                 });
                 const property = getFilterPropertyLabel(filter, settings.translate);

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

@@ -1,7 +1,8 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { transformValue } from "../../../qrvey/helpers/transformValue";
-import { isRankingFilter } from "../common";
+import { isInValidator } from "../common/isInValidator";
 import { isRangeValidator } from "../common/isRangeValidator";
+import { isRankingFilter } from "../common/isRankingFilter";
 import { isRegularValidator } from "../common/isRegularValidator";
 export function transformFilterValues(filter, settings) {
     const transformValueSettings = Object.assign(Object.assign({}, settings), { column: filter.column, property: filter.property });
@@ -14,5 +15,10 @@ export function transformFilterValues(filter, settings) {
     else if (isRangeValidator(filter.validator)) {
         return values.map((value) => (Object.assign(Object.assign({}, value), { min: transformValue(value.min, transformValueSettings), max: transformValue(value.max, transformValueSettings) })));
     }
+    else if (isInValidator(filter.validator)) {
+        return values.map((value) => (Object.assign(Object.assign({}, value), { anchor: typeof value.anchor === "string"
+                ? transformValue(value.anchor, transformValueSettings)
+                : value.anchor })));
+    }
     return values;
 }

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

@@ -2,4 +2,5 @@ import { FILTER_TOKENS_STRUCTURE_TYPE } from "../constants/common/FILTER_TOKENS_
 export interface IFFilterTokens {
     token: string;
     type: FILTER_TOKENS_STRUCTURE_TYPE;
+    id?: string;
 }

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

@@ -1,6 +1,5 @@
 import { IColumn } from "../../columns/interfaces/IColumn";
 import { IDataset } from "../../qrvey/interfaces/IDataset";
-import { IFSFilter } from "./common/IFSFilter";
 import { IFSFilterExtrasInfo } from "./common/IFSFilterExtrasInfo";
 import { IFDateSection } from "./IFDateSection";
 import { IFOperator } from "./IFOperator";
@@ -10,8 +9,6 @@ import { IFSection } from "./IFSection";
 import { IFValidator } from "./IFValidator";
 import { IFValue } from "./IFValue";
 import { IFUChartSettings } from "./ui/IFUChartSettings";
-import { IFUFilter } from "./ui/IFUFilter";
-import { IFUFlattenedFilter } from "./ui/IFUFlattenedFilter";
 import { IFUValue } from "./ui/IFUValue";
 export interface OLD_IFilterDetail {
     column?: Omit<IColumn, "label"> & {
@@ -47,5 +44,4 @@ export interface OLD_IFilterDetail {
     section?: IFSection;
     groupValue?: IFProperty;
     extras?: any;
-    _newFilters?: IFUFilter | IFSFilter | IFUFlattenedFilter;
 }

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

@@ -8,9 +8,4 @@ export interface IFilterBuilderSettings {
     chart?: IFUChartSettings;
     mode?: FILTER_FLOW;
     returningFilterStructureType?: IFStructureType;
-    displayed?: boolean;
-    displayable?: boolean;
-    deletable?: boolean;
-    editable?: boolean;
-    enableable?: boolean;
 }

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

@@ -12,11 +12,8 @@ export interface IFSFilter {
     collapsed: boolean;
     column: IFSColumn;
     dateSection?: IFDateSection;
-    deletable: boolean;
     displayed: boolean;
-    editable: boolean;
     enabled: boolean;
-    enableable: boolean;
     extras: IFSFilterExtras;
     filterid: string;
     lookupDisplayIndex?: number;

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

@@ -4,7 +4,6 @@ import { IFScope } from "../IFScope";
 import { IFValidator } from "../IFValidator";
 import { IFUChartSettings } from "../ui/IFUChartSettings";
 import { IFSColumn } from "./IFSColumn";
-import { IFSParamsToGetFilterDisplayeds } from "./IFSParamsToGetFilterDisplayeds";
 import { IFSParamsToGetFilterEnableds } from "./IFSParamsToGetFilterEnableds";
 /**
  * Structure for filter properties
@@ -12,7 +11,6 @@ import { IFSParamsToGetFilterEnableds } from "./IFSParamsToGetFilterEnableds";
 export interface IFSParamsToGetFilter {
     column?: Partial<IFSColumn>;
     dateSection?: IFDateSection;
-    displayeds?: IFSParamsToGetFilterDisplayeds;
     enableds?: IFSParamsToGetFilterEnableds;
     chart?: IFUChartSettings;
     panelid?: string;

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

@@ -23,7 +23,6 @@ export * from "./IFSFilterExtras";
 export * from "./IFSFilterExtrasInfo";
 export * from "./IFSGetDataValues";
 export * from "./IFSParamsToGetFilter";
-export * from "./IFSParamsToGetFilterDisplayeds";
 export * from "./IFSParamsToGetFilterEnableds";
 export * from "./IFSScope";
 export * from "./IFSScopeID";

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

@@ -23,7 +23,6 @@ export * from "./IFSFilterExtras";
 export * from "./IFSFilterExtrasInfo";
 export * from "./IFSGetDataValues";
 export * from "./IFSParamsToGetFilter";
-export * from "./IFSParamsToGetFilterDisplayeds";
 export * from "./IFSParamsToGetFilterEnableds";
 export * from "./IFSScope";
 export * from "./IFSScopeID";

package/dist/filters/interfaces/settings/IFSettingsFilterBuilder.d.ts

@@ -4,5 +4,4 @@
 export interface IFSettingsFilterBuilder {
     scopeSelectorDisplayed?: boolean;
     scopeSelectorEnabled?: boolean;
-    strictlyInteractivity?: boolean;
 }

package/dist/filters/interfaces/settings/IFSettingsFilterPanel.d.ts

@@ -14,6 +14,5 @@ export interface IFSettingsFilterPanel {
     header?: IFSettingsFilterPanelHeader;
     iconsDisplayed?: boolean;
     readonly?: boolean;
-    strictlyInteractivity?: boolean;
     updateFilterInfo?: boolean;
 }

package/dist/globalization/interfaces/chart_builder/II18nChartBuilderComparisionOptions.d.ts

@@ -1,5 +1,6 @@
 export interface II18nChartBuilderComparisionOptions {
     add_column: string;
+    add_column_disabled: string;
     comparison: string;
     change_triangle_up: string;
     change_triangle_down: string;

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

@@ -1,6 +1,7 @@
 export const I18N_CHART_BUILDER_COMPARISION_OPTIONS = {
     comparison_options: {
         add_column: "Add Comparison Column",
+        add_column_disabled: "Comparison is disabled, add fields on Columns shelf to enable it.",
         comparison: "Comparison",
         change_triangle_up: "Triangle Up",
         change_triangle_down: "Triangle Down",

package/dist/qrvey/helpers/transformValue.js

@@ -34,8 +34,9 @@ function getOutputFormat(settings) {
         DATE_GROUPING_TIME_PROPERTY.HOUR,
         DATE_GROUPING_TIME_PROPERTY.MINUTE,
         DATE_GROUPING_TIME_PROPERTY.SECOND,
+        undefined,
     ].includes(settings.property);
-    const isDate = [DATE_GROUPING_PROPERTY.DAY].includes(settings.property);
+    const isDate = [DATE_GROUPING_PROPERTY.DAY, undefined].includes(settings.property);
     if (isDateColumn(settings.column) && (isDate || isDateTime)) {
         type = "DATE";
         format = "Default";

package/package.json

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

package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilterDisplayeds.d.ts

@@ -1,9 +0,0 @@
-/**
- * Structure for filter structure displayed flags
- */
-export interface IFSParamsToGetFilterDisplayeds {
-    scopes?: boolean;
-    datasets?: boolean;
-    filters?: boolean;
-    values?: boolean;
-}

package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilterDisplayeds.js

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

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

@@ -1,9 +0,0 @@
-/**
- * Structure for filter structure displayed flags
- */
-export interface IFSParamsToGetFilterDisplayeds {
-    scopes?: boolean;
-    datasets?: boolean;
-    filters?: boolean;
-    values?: boolean;
-}

package/dist/filters/interfaces/common/IFSParamsToGetFilterDisplayeds.js

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