@qrvey/utils 1.2.9-10 → 1.2.9-11

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.9-10*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.9-11*
 
 > Helper, Utils for all Qrvey Projects
 
@@ -946,6 +946,34 @@ Generates a Flattened UI Filter Structure from the UI Filter Data structure v2.1
 
 
 
+### dist/filters/adapters/adaptDateGroupingProperty.js
+
+
+#### adaptDateGroupingProperty(property) 
+
+[TODO: For 2022, eliminate this adapter]
+Get the new property base on the old date grouping properties
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| property |  |  |   |
+
+
+
+
+##### Returns
+
+
+-  
+
+
+
+
 ### dist/filters/adapters/adaptFilterData.js
 
 
@@ -1510,6 +1538,26 @@ const filterData = transformFilters(oldPreferenceFilters, 'ANALYZE');
 
 
 
+### dist/filters/classes/FilterInputErrorHandler.js
+
+
+#### new FilterInputErrorHandler() 
+
+
+
+
+
+
+
+
+##### Returns
+
+
+- `Void`
+
+
+
+
 ### dist/filters/helpers/applyHierarchyForAggFilters.js
 
 
@@ -1621,54 +1669,6 @@ Gets the Scopes IDS for the Available Scope function by any config
 
 
 
-### dist/filters/classes/FilterInputErrorHandler.js
-
-
-#### new FilterInputErrorHandler() 
-
-
-
-
-
-
-
-
-##### Returns
-
-
-- `Void`
-
-
-
-
-### dist/filters/adapters/adaptDateGroupingProperty.js
-
-
-#### adaptDateGroupingProperty(property) 
-
-[TODO: For 2022, eliminate this adapter]
-Get the new property base on the old date grouping properties
-
-
-
-
-##### Parameters
-
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| property |  |  |   |
-
-
-
-
-##### Returns
-
-
--  
-
-
-
-
 ### dist/general/array/delete.js
 
 
@@ -2348,6 +2348,35 @@ Checks if the given argument is an object type
 
 
 
+### dist/general/object/mapValues.js
+
+
+#### mapValues(baseObject, iteratee) 
+
+Invoke iteratee (function) for each object key-value pair
+and return a mapped object
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| baseObject | `Object`  | Base object. |   |
+| iteratee | `Function`  | The executed per iteration. |   |
+
+
+
+
+##### Returns
+
+
+- `Object`  New mapped object.
+
+
+
+
 ### dist/general/object/mergeDeep.js
 
 
@@ -2810,35 +2839,6 @@ try to find this string as a variable on Windows object
 
 
 
-### dist/general/object/mapValues.js
-
-
-#### mapValues(baseObject, iteratee) 
-
-Invoke iteratee (function) for each object key-value pair
-and return a mapped object
-
-
-
-
-##### Parameters
-
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| baseObject | `Object`  | Base object. |   |
-| iteratee | `Function`  | The executed per iteration. |   |
-
-
-
-
-##### Returns
-
-
-- `Object`  New mapped object.
-
-
-
-
 ### dist/dates/relative/helpers/formatStatement.js
 
 
@@ -3244,12 +3244,12 @@ Returns a filter builder config object by a any given config
 
 
 
-### dist/filters/helpers/common/areFiltersEquals.js
+### dist/filters/helpers/common/excludeFiltersByAggregateColumn.js
 
 
-#### areFiltersEquals(filter1, filter2) 
+#### excludeFiltersByAggregateColumn(filterData) 
 
-Validates if both filters are the same
+Excludes Aggregate Filters in the Filter Data. Excluding filters when the column.aggregate is included.
 
 
 
@@ -3258,8 +3258,7 @@ Validates if both filters are the same
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filter1 |  | filter 1 |   |
-| filter2 |  | filter 2 |   |
+| filterData |  | The filter data object |   |
 
 
 
@@ -3267,17 +3266,17 @@ Validates if both filters are the same
 ##### Returns
 
 
--  true: the filters are equal; false: the filters are NOT equal
+-  The new filter data object that were excluded the aggregate filters
 
 
 
 
-### dist/filters/helpers/common/excludeFiltersByAggregateColumn.js
+### dist/filters/helpers/common/areFiltersEquals.js
 
 
-#### excludeFiltersByAggregateColumn(filterData) 
+#### areFiltersEquals(filter1, filter2) 
 
-Excludes Aggregate Filters in the Filter Data. Excluding filters when the column.aggregate is included.
+Validates if both filters are the same
 
 
 
@@ -3286,7 +3285,8 @@ Excludes Aggregate Filters in the Filter Data. Excluding filters when the column
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filterData |  | The filter data object |   |
+| filter1 |  | filter 1 |   |
+| filter2 |  | filter 2 |   |
 
 
 
@@ -3294,7 +3294,7 @@ Excludes Aggregate Filters in the Filter Data. Excluding filters when the column
 ##### Returns
 
 
--  The new filter data object that were excluded the aggregate filters
+-  true: the filters are equal; false: the filters are NOT equal
 
 
 

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

@@ -49,10 +49,15 @@ function getUIValues(filter, settings) {
                     enabled: settings.addEnableds ? (_a = filter.values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
                 }];
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:
-            return filter.values.map(value => ({
-                value: `${settings.translate(RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value, settings)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS ? `${settings.translate('filter.relative_container.from_label')} ${value.anchor || settings.translate('filter.relative_container.current_date')}` : ''}`,
-                enabled: settings.addEnableds ? filter.enabled : undefined,
-            }));
+            return filter.values.map(value => {
+                const cursor = (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate(RELATIVE_CURSOR_INFO_1.RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath) : RELATIVE_CURSOR_INFO_1.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_1.RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value, settings)} ${value.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS ? `${from} ${value.anchor || anchor}` : ''}`,
+                    enabled: settings.addEnableds ? filter.enabled : undefined,
+                };
+            });
         default:
             if (filter.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(filter.column.aggregate)) {
                 return getRankingUIValues(filter.values, settings.addEnableds, settings.rankingGroupIndex);
@@ -78,7 +83,8 @@ function getUiValuesSettings(settings) {
     };
 }
 function getValueUiUnitRelativeDate(relative, settings) {
-    return relative.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && relative.number > 1 ? `${settings.translate(`common.units.${relative.unit}`)}s` : settings.translate(`common.units.${relative.unit}`);
+    const unit = settings.translate ? `${settings.translate(`common.units.${relative.unit}`)}` : relative.unit;
+    return relative.cursor !== RELATIVE_CURSOR_1.RELATIVE_CURSOR.THIS && relative.number > 1 ? `${unit}s` : unit;
 }
 function getRankingUIValues(values, addEnableds = false, rankingGroupIndex) {
     const flattenValues = rankingGroupIndex == null ? (0, flattenDeep_1.flattenDeep)(values) : values[rankingGroupIndex];

package/dist/cjs/globalization/interfaces/chart_builder/II18nChartBuilderRefernceLine.d.ts

@@ -12,4 +12,5 @@ export interface II18nChartBuilderReferenceLine {
     title: string;
     value: string;
     value_aggregated: string;
+    value_aggregated_placeholder: string;
 }

package/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_LAYER_OPTIONS.js

@@ -25,11 +25,12 @@ exports.I18N_CHART_BUILDER_LAYER_OPTIONS = {
         custom_label_placeholder: 'Type custom label',
         dynamic: 'Dynamic',
         fixed: 'Fixed',
-        new_reference_line_label: 'Reference Line num',
+        new_reference_line_label: 'Reference Line',
         opacity: 'Opacity',
         remove: 'Remove',
         title: 'Reference Line',
         value: 'Value',
         value_aggregated: 'Value Aggregate',
+        value_aggregated_placeholder: 'Select Aggregate',
     },
 };

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

@@ -46,10 +46,15 @@ export function getUIValues(filter, settings) {
                     enabled: settings.addEnableds ? (_a = filter.values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
                 }];
         case FILTER_VALIDATOR.IN:
-            return filter.values.map(value => ({
-                value: `${settings.translate(RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath)} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value, settings)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `${settings.translate('filter.relative_container.from_label')} ${value.anchor || settings.translate('filter.relative_container.current_date')}` : ''}`,
-                enabled: settings.addEnableds ? filter.enabled : undefined,
-            }));
+            return filter.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,
+                };
+            });
         default:
             if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
                 return getRankingUIValues(filter.values, settings.addEnableds, settings.rankingGroupIndex);
@@ -74,7 +79,8 @@ function getUiValuesSettings(settings) {
     };
 }
 function getValueUiUnitRelativeDate(relative, settings) {
-    return relative.cursor !== RELATIVE_CURSOR.THIS && relative.number > 1 ? `${settings.translate(`common.units.${relative.unit}`)}s` : settings.translate(`common.units.${relative.unit}`);
+    const unit = settings.translate ? `${settings.translate(`common.units.${relative.unit}`)}` : relative.unit;
+    return relative.cursor !== RELATIVE_CURSOR.THIS && relative.number > 1 ? `${unit}s` : unit;
 }
 function getRankingUIValues(values, addEnableds = false, rankingGroupIndex) {
     const flattenValues = rankingGroupIndex == null ? flattenDeep(values) : values[rankingGroupIndex];

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

@@ -12,4 +12,5 @@ export interface II18nChartBuilderReferenceLine {
     title: string;
     value: string;
     value_aggregated: string;
+    value_aggregated_placeholder: string;
 }

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

@@ -22,11 +22,12 @@ export const I18N_CHART_BUILDER_LAYER_OPTIONS = {
         custom_label_placeholder: 'Type custom label',
         dynamic: 'Dynamic',
         fixed: 'Fixed',
-        new_reference_line_label: 'Reference Line num',
+        new_reference_line_label: 'Reference Line',
         opacity: 'Opacity',
         remove: 'Remove',
         title: 'Reference Line',
         value: 'Value',
         value_aggregated: 'Value Aggregate',
+        value_aggregated_placeholder: 'Select Aggregate',
     },
 };

package/package.json

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

package/src/filters/helpers/ui/getUIValues.ts

@@ -23,7 +23,6 @@ import { getI18nDateGroupLabel, IDateColumnPropertyType } from "../../..";
  */
 export function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): IFUValue[] {
     settings = getUiValuesSettings(settings);
-
     switch (filter.validator) {
         case FILTER_VALIDATOR.AFTER:
         case FILTER_VALIDATOR.GREATER_THAN:
@@ -54,11 +53,16 @@ export function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): I
                 enabled: settings.addEnableds ? (filter.values as IFSValue[])[0]?.enabled : undefined,
             }];
         case FILTER_VALIDATOR.IN:
-            return (filter.values as IFSValueRelativeDate[]).map(value => ({
-                value: 
-                `${settings.translate(RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath)} ${value.cursor !== RELATIVE_CURSOR.THIS && value.number > 1 ? value.number : ''} ${getValueUiUnitRelativeDate(value, settings)} ${value.cursor !== RELATIVE_CURSOR.THIS ? `${settings.translate('filter.relative_container.from_label')} ${value.anchor || settings.translate('filter.relative_container.current_date')}`: ''}`,
-                enabled: settings.addEnableds ? filter.enabled : undefined,
-            }));
+            return (filter.values as IFSValueRelativeDate[]).map(value => {
+                const cursor = settings?.translate ? settings.translate(RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath) : RELATIVE_CURSOR_INFO[value.cursor].i18nLabelPath;
+                const from = settings?.translate ? settings.translate('filter.relative_container.from_label') : 'from';
+                const anchor = settings?.translate ?  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,
+                };
+            });
         default:
             if (filter.column.type === COLUMN.RANKING && isEmpty(filter.column.aggregate)) {
                 return getRankingUIValues(filter.values as IFSValueRanking[][], settings.addEnableds, settings.rankingGroupIndex);
@@ -85,7 +89,8 @@ function getUiValuesSettings(settings: IFUUIValueSettings): IFUUIValueSettings {
 }
 
 function getValueUiUnitRelativeDate(relative: IFSValueRelativeDate, settings: IFUUIValueSettings) {
-    return relative.cursor !== RELATIVE_CURSOR.THIS && relative.number > 1 ? `${settings.translate(`common.units.${relative.unit}`)}s`: settings.translate(`common.units.${relative.unit}`);
+    const unit = settings.translate ? `${settings.translate(`common.units.${relative.unit}`)}` : relative.unit;
+    return relative.cursor !== RELATIVE_CURSOR.THIS && relative.number > 1 ? `${unit}s`: unit;
 }
 
 function getRankingUIValues(values: IFSValueRanking[][], addEnableds = false, rankingGroupIndex?: number) {

package/src/globalization/interfaces/chart_builder/II18nChartBuilderRefernceLine.ts

@@ -12,4 +12,5 @@ export interface II18nChartBuilderReferenceLine {
     title: string;
     value: string;
     value_aggregated: string;
+    value_aggregated_placeholder: string;
 }

package/src/globalization/labels/chart_builder/I18N_CHART_BUILDER_LAYER_OPTIONS.ts

@@ -25,11 +25,12 @@ export const I18N_CHART_BUILDER_LAYER_OPTIONS: Pick<II18nChartBuilder, LayerOpti
         custom_label_placeholder: 'Type custom label',
         dynamic: 'Dynamic',
         fixed: 'Fixed',
-        new_reference_line_label: 'Reference Line num',
+        new_reference_line_label: 'Reference Line',
         opacity: 'Opacity',
         remove: 'Remove',
         title: 'Reference Line',
         value: 'Value',
         value_aggregated: 'Value Aggregate',
+        value_aggregated_placeholder: 'Select Aggregate',
     },
 };