@qrvey/utils 1.2.4-7 → 1.2.4-8

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.4-7*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.4-8*
 
 > Helper, Utils for all Qrvey Projects
 
@@ -80,64 +80,6 @@ Get a text and evaluate if it matchs with a token box label.
 
 
 
-### dist/dates/range/getDateRange.js
-
-
-#### getDateRange(value, dateGroupLabel, withTime) 
-
-Get date range object from a string date value
-
-
-
-
-##### Parameters
-
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| value | `String`  | string date value |   |
-| dateGroupLabel | `String`  | could be 'YEAR', 'QUARTER', 'MONTH' or 'DAY'. Deafult is 'DAY' |   |
-| withTime | `Boolean`  | determines if the date range will include time. Default is true |   |
-
-
-
-
-##### Examples
-
-```javascript
-// 1) Year:
-getDateRange('2020', 'YEAR');
-// Will return:
-{
-   from: '01/01/2020 00:00:00',
-   to: '12/31/2020 23:59:59'
-}
-
-// 2) Quarter:
-getDateRange('Q3 2020', 'QUARTER');
-// Will return:
-{
-   from: '07/01/2020 00:00:00',
-   to: '09/30/2020 23:59:59'
-}
-
-// 3) Month:
-getDateRange('Oct 2020', 'MONTH');
-// Will return:
-{
-   from: '10/01/2020 00:00:00',
-   to: '10/31/2020 23:59:59'
-}
-```
-
-
-##### Returns
-
-
-- `Object`  an object with the date range with two string date properties: from and to
-
-
-
-
 ### dist/dates/relative/Adapter.js
 
 
@@ -351,68 +293,12 @@ Output:
 
 
 
-### dist/filters/helpers/applyHierarchyForAggFilters.js
-
-
-#### applyHierarchyForAggFilters(chartSettings, scopes, currentScope) 
-
-[TODO: Make a proper description for this function]
-
-
-
-
-##### Parameters
-
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| chartSettings |  | Chart Settings for the Filter Builder |   |
-| scopes |  |  |   |
-| currentScope |  |  |   |
-
-
-
-
-##### Returns
-
-
--  
-
-
-
-
-### dist/filters/helpers/getAvailableScopes.js
-
-
-#### getAvailableScopes(config) 
-
-Gets Scopes/Scope IDs by given IDs
-
-
-
-
-##### Parameters
-
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| config |  | given Differnts IDs in order set a available scope |   |
-
-
-
-
-##### Returns
-
-
--  a Scopes/Scope IDs array
-
-
-
-
-### dist/filters/helpers/getAvailableScopesIDsByConfig.js
+### dist/dates/range/getDateRange.js
 
 
-#### getAvailableScopesIDsByConfig(config) 
+#### getDateRange(value, dateGroupLabel, withTime) 
 
-Gets the Scopes IDS for the Available Scope function by any config
+Get date range object from a string date value
 
 
 
@@ -421,43 +307,46 @@ Gets the Scopes IDS for the Available Scope function by any config
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| config |  | any config |   |
-
-
-
-
-##### Returns
-
-
--  a Available Scope IDS config
-
-
-
-
-### dist/filters/helpers/getScopesByHierarchy.js
-
-
-#### getScopesByHierarchy(scopes, currentScope) 
-
-[TODO: Make a description for this]
+| value | `String`  | string date value |   |
+| dateGroupLabel | `String`  | could be 'YEAR', 'QUARTER', 'MONTH' or 'DAY'. Deafult is 'DAY' |   |
+| withTime | `Boolean`  | determines if the date range will include time. Default is true |   |
 
 
 
 
-##### Parameters
+##### Examples
 
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| scopes |  | the collection of Scopes/Scope IDs |   |
-| currentScope |  | Current scope type |   |
+```javascript
+// 1) Year:
+getDateRange('2020', 'YEAR');
+// Will return:
+{
+   from: '01/01/2020 00:00:00',
+   to: '12/31/2020 23:59:59'
+}
 
+// 2) Quarter:
+getDateRange('Q3 2020', 'QUARTER');
+// Will return:
+{
+   from: '07/01/2020 00:00:00',
+   to: '09/30/2020 23:59:59'
+}
 
+// 3) Month:
+getDateRange('Oct 2020', 'MONTH');
+// Will return:
+{
+   from: '10/01/2020 00:00:00',
+   to: '10/31/2020 23:59:59'
+}
+```
 
 
 ##### Returns
 
 
--  A new array of Scopes/Scope IDs
+- `Object`  an object with the date range with two string date properties: from and to
 
 
 
@@ -1312,6 +1201,117 @@ const filterData = transformFilters(oldPreferenceFilters, 'ANALYZE');
 
 
 
+### dist/filters/helpers/applyHierarchyForAggFilters.js
+
+
+#### applyHierarchyForAggFilters(chartSettings, scopes, currentScope) 
+
+[TODO: Make a proper description for this function]
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| chartSettings |  | Chart Settings for the Filter Builder |   |
+| scopes |  |  |   |
+| currentScope |  |  |   |
+
+
+
+
+##### Returns
+
+
+-  
+
+
+
+
+### dist/filters/helpers/getAvailableScopes.js
+
+
+#### getAvailableScopes(config) 
+
+Gets Scopes/Scope IDs by given IDs
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| config |  | given Differnts IDs in order set a available scope |   |
+
+
+
+
+##### Returns
+
+
+-  a Scopes/Scope IDs array
+
+
+
+
+### dist/filters/helpers/getAvailableScopesIDsByConfig.js
+
+
+#### getAvailableScopesIDsByConfig(config) 
+
+Gets the Scopes IDS for the Available Scope function by any config
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| config |  | any config |   |
+
+
+
+
+##### Returns
+
+
+-  a Available Scope IDS config
+
+
+
+
+### dist/filters/helpers/getScopesByHierarchy.js
+
+
+#### getScopesByHierarchy(scopes, currentScope) 
+
+[TODO: Make a description for this]
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| scopes |  | the collection of Scopes/Scope IDs |   |
+| currentScope |  | Current scope type |   |
+
+
+
+
+##### Returns
+
+
+-  A new array of Scopes/Scope IDs
+
+
+
+
 ### dist/general/array/delete.js
 
 
@@ -2260,12 +2260,12 @@ Get a dataset list from a collection of Qrvey IDs
 
 
 
-### dist/services/api/getDatasetColumns.api.js
+### dist/services/api/getAllQrveys.api.js
 
 
-#### getDatasetColumns(qrveyid) 
+#### getAllQrveys(config, params) 
 
-Get a dataset by Qrvey ID
+POST Request for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
 
 
 
@@ -2274,7 +2274,8 @@ Get a dataset by Qrvey ID
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| qrveyid |  | The Qrvey ID |   |
+| config |  | Configuration |   |
+| params |  | Object for getting precise data |   |
 
 
 
@@ -2282,17 +2283,17 @@ Get a dataset by Qrvey ID
 ##### Returns
 
 
--  a promise
+- `Void`
 
 
 
 
-### dist/services/api/getAllQrveys.api.js
+### dist/services/api/getDatasetColumns.api.js
 
 
-#### getAllQrveys(config, params) 
+#### getDatasetColumns(qrveyid) 
 
-POST Request for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
+Get a dataset by Qrvey ID
 
 
 
@@ -2301,8 +2302,7 @@ POST Request for getting Qrveys such as Web Forms and Datasets. Use params for g
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| config |  | Configuration |   |
-| params |  | Object for getting precise data |   |
+| qrveyid |  | The Qrvey ID |   |
 
 
 
@@ -2310,7 +2310,7 @@ POST Request for getting Qrveys such as Web Forms and Datasets. Use params for g
 ##### Returns
 
 
-- `Void`
+-  a promise
 
 
 
@@ -2858,12 +2858,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.
 
 
 
@@ -2872,8 +2872,7 @@ Validates if both filters are the same
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filter1 |  | filter 1 |   |
-| filter2 |  | filter 2 |   |
+| filterData |  | The filter data object |   |
 
 
 
@@ -2881,17 +2880,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
 
 
 
@@ -2900,7 +2899,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 |   |
 
 
 
@@ -2908,7 +2908,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
 
 
 
@@ -3097,12 +3097,21 @@ Gets Aggregate Filters in the Filter Data. Gets the filters when the column.aggr
 
 
 
-### dist/filters/helpers/common/getFiltersByScopes.js
+### dist/filters/helpers/common/getFiltersByParams.js
 
 
-#### getFiltersByScopes(filterData, scopes) 
+#### getFiltersByParams(filterData, params) 
 
-Filters and gets a Filter Data by the given scopes
+Gets filters from the given params.
+The validation to filter the stored filter is depending on:
+- Column
+- Qrvey ID
+- Scope type
+- Scope ID
+- Panel ID
+- Validator type
+- Property type
+- Enabled flags
 
 
 
@@ -3111,8 +3120,8 @@ Filters and gets a Filter Data by the given scopes
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filterData |  | The Filter Data |   |
-| scopes |  | collection of scopes types |   |
+| filterData |  | The Filter Data or the UI Filter Data |   |
+| params |  | given parameters to validate the dataset |   |
 
 
 
@@ -3120,26 +3129,17 @@ Filters and gets a Filter Data by the given scopes
 ##### Returns
 
 
--  The new Filter Data
+-  a new Filter object structure
 
 
 
 
-### dist/filters/helpers/common/getFiltersByParams.js
+### dist/filters/helpers/common/getFiltersByScopes.js
 
 
-#### getFiltersByParams(filterData, params) 
+#### getFiltersByScopes(filterData, scopes) 
 
-Gets filters from the given params.
-The validation to filter the stored filter is depending on:
-- Column
-- Qrvey ID
-- Scope type
-- Scope ID
-- Panel ID
-- Validator type
-- Property type
-- Enabled flags
+Filters and gets a Filter Data by the given scopes
 
 
 
@@ -3148,8 +3148,8 @@ The validation to filter the stored filter is depending on:
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filterData |  | The Filter Data or the UI Filter Data |   |
-| params |  | given parameters to validate the dataset |   |
+| filterData |  | The Filter Data |   |
+| scopes |  | collection of scopes types |   |
 
 
 
@@ -3157,7 +3157,7 @@ The validation to filter the stored filter is depending on:
 ##### Returns
 
 
--  a new Filter object structure
+-  The new Filter Data
 
 
 
@@ -3682,12 +3682,12 @@ Resolves the conditions by given params
 
 
 
-### dist/filters/helpers/ui/excludeUIFlatFiltersByScopes.js
+### dist/filters/helpers/ui/excludeUIFiltersByAggregate.js
 
 
-#### excludeUIFlatFiltersByScopes(uFilters, scopes) 
+#### excludeUIFiltersByAggregate(uFilters) 
 
-Excludes and returns a UI Flat Filters without filters by the given scopes
+Excludes Aggregate Filters in the Flattened UI Filters array
 
 
 
@@ -3696,8 +3696,7 @@ Excludes and returns a UI Flat Filters without filters by the given scopes
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| uFilters |  | The Flatten UI Filters |   |
-| scopes |  | collection of scopes types |   |
+| uFilters |  | Collection of Flat UI Filters |   |
 
 
 
@@ -3705,17 +3704,17 @@ Excludes and returns a UI Flat Filters without filters by the given scopes
 ##### Returns
 
 
--  The new array of UI Flattened filters
+-  a new Flat UI Filters that were excluded the aggregate filters
 
 
 
 
-### dist/filters/helpers/ui/excludeUIFiltersByAggregate.js
+### dist/filters/helpers/ui/excludeUIFlatFiltersByScopes.js
 
 
-#### excludeUIFiltersByAggregate(uFilters) 
+#### excludeUIFlatFiltersByScopes(uFilters, scopes) 
 
-Excludes Aggregate Filters in the Flattened UI Filters array
+Excludes and returns a UI Flat Filters without filters by the given scopes
 
 
 
@@ -3724,7 +3723,8 @@ Excludes Aggregate Filters in the Flattened UI Filters array
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| uFilters |  | Collection of Flat UI Filters |   |
+| uFilters |  | The Flatten UI Filters |   |
+| scopes |  | collection of scopes types |   |
 
 
 
@@ -3732,7 +3732,7 @@ Excludes Aggregate Filters in the Flattened UI Filters array
 ##### Returns
 
 
--  a new Flat UI Filters that were excluded the aggregate filters
+-  The new array of UI Flattened filters
 
 
 

package/dist/cjs/general/object/mergeDeep.js

@@ -15,18 +15,17 @@ function mergeDeep(obj1, obj2, settings) {
     settings = getParamsToMergeDeep(settings);
     if (!isValid(obj1, obj2))
         return (0, objectCopy_1.objectCopy)(obj1);
-    const result = {}; // return result
-    for (const i in obj1) { // for every property in obj1 
+    const result = {};
+    for (const i in obj1) {
         if (i != null && i in obj2 && (0, isObject_1.isObject)(obj1[i])) {
-            result[i] = mergeDeep(obj1[i], obj2[i], settings); // if it's an object, merge   
+            result[i] = mergeDeep(obj1[i], obj2[i], settings);
         }
         else {
-            result[i] = obj1[i]; // add it to result
+            result[i] = obj1[i];
         }
     }
-    for (const i in obj2) { // add the remaining properties from object 2
-        if (i != null && !(0, isObject_1.isObject)(obj2[i]) && (i in result && settings.mergeExistingValues
-            || !(i in result) && settings.mergeMissingProperties)) { //conflict
+    for (const i in obj2) {
+        if (i != null && ((!(0, isObject_1.isObject)(obj2[i]) && i in result && settings.mergeExistingValues) || (!(i in result) && settings.mergeMissingProperties))) {
             result[i] = obj2[i];
         }
     }

package/dist/cjs/globalization/interfaces/common/index.d.ts

@@ -4,8 +4,3 @@ export * from './II18nChartInfoMessagesCrosstab';
 export * from './II18nChartInfoMessagesDefault';
 export * from './II18nChartInfoMessagesTableChart';
 export * from './II18nColumnTypes';
-export * from './II18nSlidebar';
-export * from './II18nSlidebarValueContainer';
-export * from './II18nValueContainer';
-export * from './II18nValueContainerSearchInput';
-export * from './II18nValueContainerSearchInputEnterValue';

package/dist/cjs/globalization/interfaces/common/index.js

@@ -16,8 +16,3 @@ __exportStar(require("./II18nChartInfoMessagesCrosstab"), exports);
 __exportStar(require("./II18nChartInfoMessagesDefault"), exports);
 __exportStar(require("./II18nChartInfoMessagesTableChart"), exports);
 __exportStar(require("./II18nColumnTypes"), exports);
-__exportStar(require("./II18nSlidebar"), exports);
-__exportStar(require("./II18nSlidebarValueContainer"), exports);
-__exportStar(require("./II18nValueContainer"), exports);
-__exportStar(require("./II18nValueContainerSearchInput"), exports);
-__exportStar(require("./II18nValueContainerSearchInputEnterValue"), exports);

package/dist/cjs/globalization/interfaces/filters/II18nFilter.d.ts

@@ -1,8 +1,8 @@
-import { II18nSlidebar } from "../common/II18nSlidebar";
-import { II18nValueContainer } from "../common/II18nValueContainer";
+import { II18nSlidebar } from "./II18nSlidebar";
+import { II18nValueContainer } from "./II18nValueContainer";
 import { II18nFilterValidator } from "./II18nFilterValidator";
 export interface II18nFilter {
-    slidebar?: II18nSlidebar;
+    slidebar: II18nSlidebar;
     validators: II18nFilterValidator;
-    value_container?: II18nValueContainer;
+    value_container: II18nValueContainer;
 }

package/dist/cjs/globalization/labels/common/index.d.ts

@@ -1,4 +1,3 @@
 export * from './I18N_COMMON';
+export * from './I18N_AGGREGATE_LABEL';
 export * from './I18N_COLUMN_LABEL';
-export * from './I18N_SLIDEBAR';
-export * from './I18N_VALUE_CONTAINER';

package/dist/cjs/globalization/labels/common/index.js

@@ -11,6 +11,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./I18N_COMMON"), exports);
+__exportStar(require("./I18N_AGGREGATE_LABEL"), exports);
 __exportStar(require("./I18N_COLUMN_LABEL"), exports);
-__exportStar(require("./I18N_SLIDEBAR"), exports);
-__exportStar(require("./I18N_VALUE_CONTAINER"), exports);

package/dist/cjs/globalization/labels/filters/I18N_FILTER.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18N_FILTER = void 0;
 const I18N_FILTER_VALIDATOR_1 = require("./I18N_FILTER_VALIDATOR");
+const I18N_SLIDEBAR_1 = require("./I18N_SLIDEBAR");
+const I18N_VALUE_CONTAINER_1 = require("./I18N_VALUE_CONTAINER");
 exports.I18N_FILTER = {
+    slidebar: I18N_SLIDEBAR_1.I18N_SLIDEBAR,
     validators: I18N_FILTER_VALIDATOR_1.I18N_FILTER_VALIDATOR,
+    value_container: I18N_VALUE_CONTAINER_1.I18N_VALUE_CONTAINER
 };

package/dist/cjs/globalization/labels/filters/I18N_FILTER_BUILDER.js

@@ -14,8 +14,6 @@ exports.I18N_FILTER_BUILDER = {
     date_sections: FILTER_DATE_SECTION_LABEL_1.FILTER_DATE_SECTION_LABEL,
     divider_label: 'Is',
     // properties: COLUMN_PROPERTY_LABEL, //In different location
-    // value_container: VALUES_CONTAINER, //In different location
-    // slidebar: SLIDEBAR, //In different location
     selected_values_container: {
         empty_message: 'No values added'
     },

package/dist/cjs/globalization/labels/filters/I18N_SLIDEBAR.d.ts

@@ -0,0 +1,2 @@
+import { II18nSlidebar } from "../../interfaces/filters/II18nSlidebar";
+export declare const I18N_SLIDEBAR: II18nSlidebar;

package/dist/cjs/globalization/labels/filters/I18N_VALUE_CONTAINER.d.ts

@@ -0,0 +1,2 @@
+import { II18nValueContainer } from "../../interfaces/filters/II18nValueContainer";
+export declare const I18N_VALUE_CONTAINER: II18nValueContainer;

package/dist/cjs/globalization/labels/filters/index.d.ts

@@ -1,3 +1,5 @@
 export * from './I18N_FILTER_BUILDER';
-export * from './I18N_FILTER';
 export * from './I18N_FILTER_VALIDATOR';
+export * from './I18N_FILTER';
+export * from './I18N_SLIDEBAR';
+export * from './I18N_VALUE_CONTAINER';

package/dist/cjs/globalization/labels/filters/index.js

@@ -11,5 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./I18N_FILTER_BUILDER"), exports);
-__exportStar(require("./I18N_FILTER"), exports);
 __exportStar(require("./I18N_FILTER_VALIDATOR"), exports);
+__exportStar(require("./I18N_FILTER"), exports);
+__exportStar(require("./I18N_SLIDEBAR"), exports);
+__exportStar(require("./I18N_VALUE_CONTAINER"), exports);

package/dist/cjs/globalization/labels/index.d.ts

@@ -1,4 +1,5 @@
 export * from './columns';
+export * from './common';
 export * from './dashboard';
 export * from './filters';
 export * from './panel';

package/dist/cjs/globalization/labels/index.js

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./columns"), exports);
+__exportStar(require("./common"), exports);
 __exportStar(require("./dashboard"), exports);
 __exportStar(require("./filters"), exports);
 __exportStar(require("./panel"), exports);

package/dist/general/object/mergeDeep.js

@@ -12,18 +12,17 @@ export function mergeDeep(obj1, obj2, settings) {
     settings = getParamsToMergeDeep(settings);
     if (!isValid(obj1, obj2))
         return objectCopy(obj1);
-    const result = {}; // return result
-    for (const i in obj1) { // for every property in obj1 
+    const result = {};
+    for (const i in obj1) {
         if (i != null && i in obj2 && isObject(obj1[i])) {
-            result[i] = mergeDeep(obj1[i], obj2[i], settings); // if it's an object, merge   
+            result[i] = mergeDeep(obj1[i], obj2[i], settings);
         }
         else {
-            result[i] = obj1[i]; // add it to result
+            result[i] = obj1[i];
         }
     }
-    for (const i in obj2) { // add the remaining properties from object 2
-        if (i != null && !isObject(obj2[i]) && (i in result && settings.mergeExistingValues
-            || !(i in result) && settings.mergeMissingProperties)) { //conflict
+    for (const i in obj2) {
+        if (i != null && ((!isObject(obj2[i]) && i in result && settings.mergeExistingValues) || (!(i in result) && settings.mergeMissingProperties))) {
             result[i] = obj2[i];
         }
     }

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

@@ -4,8 +4,3 @@ export * from './II18nChartInfoMessagesCrosstab';
 export * from './II18nChartInfoMessagesDefault';
 export * from './II18nChartInfoMessagesTableChart';
 export * from './II18nColumnTypes';
-export * from './II18nSlidebar';
-export * from './II18nSlidebarValueContainer';
-export * from './II18nValueContainer';
-export * from './II18nValueContainerSearchInput';
-export * from './II18nValueContainerSearchInputEnterValue';

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

@@ -4,8 +4,3 @@ export * from './II18nChartInfoMessagesCrosstab';
 export * from './II18nChartInfoMessagesDefault';
 export * from './II18nChartInfoMessagesTableChart';
 export * from './II18nColumnTypes';
-export * from './II18nSlidebar';
-export * from './II18nSlidebarValueContainer';
-export * from './II18nValueContainer';
-export * from './II18nValueContainerSearchInput';
-export * from './II18nValueContainerSearchInputEnterValue';

package/dist/globalization/interfaces/filters/II18nFilter.d.ts

@@ -1,8 +1,8 @@
-import { II18nSlidebar } from "../common/II18nSlidebar";
-import { II18nValueContainer } from "../common/II18nValueContainer";
+import { II18nSlidebar } from "./II18nSlidebar";
+import { II18nValueContainer } from "./II18nValueContainer";
 import { II18nFilterValidator } from "./II18nFilterValidator";
 export interface II18nFilter {
-    slidebar?: II18nSlidebar;
+    slidebar: II18nSlidebar;
     validators: II18nFilterValidator;
-    value_container?: II18nValueContainer;
+    value_container: II18nValueContainer;
 }

package/dist/globalization/labels/common/index.d.ts

@@ -1,4 +1,3 @@
 export * from './I18N_COMMON';
+export * from './I18N_AGGREGATE_LABEL';
 export * from './I18N_COLUMN_LABEL';
-export * from './I18N_SLIDEBAR';
-export * from './I18N_VALUE_CONTAINER';

package/dist/globalization/labels/common/index.js

@@ -1,4 +1,3 @@
 export * from './I18N_COMMON';
+export * from './I18N_AGGREGATE_LABEL';
 export * from './I18N_COLUMN_LABEL';
-export * from './I18N_SLIDEBAR';
-export * from './I18N_VALUE_CONTAINER';

package/dist/globalization/labels/filters/I18N_FILTER.js

@@ -1,4 +1,8 @@
 import { I18N_FILTER_VALIDATOR } from "./I18N_FILTER_VALIDATOR";
+import { I18N_SLIDEBAR } from "./I18N_SLIDEBAR";
+import { I18N_VALUE_CONTAINER } from "./I18N_VALUE_CONTAINER";
 export const I18N_FILTER = {
+    slidebar: I18N_SLIDEBAR,
     validators: I18N_FILTER_VALIDATOR,
+    value_container: I18N_VALUE_CONTAINER
 };

package/dist/globalization/labels/filters/I18N_FILTER_BUILDER.js

@@ -11,8 +11,6 @@ export const I18N_FILTER_BUILDER = {
     date_sections: FILTER_DATE_SECTION_LABEL,
     divider_label: 'Is',
     // properties: COLUMN_PROPERTY_LABEL, //In different location
-    // value_container: VALUES_CONTAINER, //In different location
-    // slidebar: SLIDEBAR, //In different location
     selected_values_container: {
         empty_message: 'No values added'
     },

package/dist/globalization/labels/filters/I18N_SLIDEBAR.d.ts

@@ -0,0 +1,2 @@
+import { II18nSlidebar } from "../../interfaces/filters/II18nSlidebar";
+export declare const I18N_SLIDEBAR: II18nSlidebar;

package/dist/globalization/labels/filters/I18N_VALUE_CONTAINER.d.ts

@@ -0,0 +1,2 @@
+import { II18nValueContainer } from "../../interfaces/filters/II18nValueContainer";
+export declare const I18N_VALUE_CONTAINER: II18nValueContainer;

package/dist/globalization/labels/filters/index.d.ts

@@ -1,3 +1,5 @@
 export * from './I18N_FILTER_BUILDER';
-export * from './I18N_FILTER';
 export * from './I18N_FILTER_VALIDATOR';
+export * from './I18N_FILTER';
+export * from './I18N_SLIDEBAR';
+export * from './I18N_VALUE_CONTAINER';

package/dist/globalization/labels/filters/index.js

@@ -1,3 +1,5 @@
 export * from './I18N_FILTER_BUILDER';
-export * from './I18N_FILTER';
 export * from './I18N_FILTER_VALIDATOR';
+export * from './I18N_FILTER';
+export * from './I18N_SLIDEBAR';
+export * from './I18N_VALUE_CONTAINER';

package/dist/globalization/labels/index.d.ts

@@ -1,4 +1,5 @@
 export * from './columns';
+export * from './common';
 export * from './dashboard';
 export * from './filters';
 export * from './panel';

package/dist/globalization/labels/index.js

@@ -1,4 +1,5 @@
 export * from './columns';
+export * from './common';
 export * from './dashboard';
 export * from './filters';
 export * from './panel';

package/package.json

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

package/src/general/object/mergeDeep.ts

@@ -17,22 +17,21 @@ interface IMergeDeepSettings {
  * @param settings Object settings for this function
  * @returns a new merged object
  */
-export function mergeDeep(obj1: any, obj2: any, settings?: IMergeDeepSettings) { // Our merge function
+export function mergeDeep(obj1: any, obj2: any, settings?: IMergeDeepSettings) {
     settings = getParamsToMergeDeep(settings);
 
     if (!isValid(obj1, obj2)) return objectCopy(obj1);
 
-    const result = {}; // return result
-    for(const i in obj1){      // for every property in obj1 
+    const result = {};
+    for(const i in obj1){
         if (i != null && i in obj2 && isObject(obj1[i])){
-            result[i] = mergeDeep(obj1[i], obj2[i], settings); // if it's an object, merge   
+            result[i] = mergeDeep(obj1[i], obj2[i], settings);
         } else {
-          result[i] = obj1[i]; // add it to result
+          result[i] = obj1[i];
         }
     }
-    for(const i in obj2) { // add the remaining properties from object 2
-        if (i != null && !isObject(obj2[i]) && (i in result && settings.mergeExistingValues
-            || !(i in result) && settings.mergeMissingProperties)) { //conflict
+    for(const i in obj2) {
+        if (i != null && ((!isObject(obj2[i]) && i in result && settings.mergeExistingValues) || (!(i in result) && settings.mergeMissingProperties))) {
             result[i] = obj2[i];
         }
     }

package/src/globalization/interfaces/common/index.ts

@@ -6,8 +6,3 @@ export * from './II18nChartInfoMessagesCrosstab';
 export * from './II18nChartInfoMessagesDefault';
 export * from './II18nChartInfoMessagesTableChart';
 export * from './II18nColumnTypes';
-export * from './II18nSlidebar';
-export * from './II18nSlidebarValueContainer';
-export * from './II18nValueContainer';
-export * from './II18nValueContainerSearchInput';
-export * from './II18nValueContainerSearchInputEnterValue';

package/src/globalization/interfaces/filters/II18nFilter.ts

@@ -1,9 +1,9 @@
-import { II18nSlidebar } from "../common/II18nSlidebar";
-import { II18nValueContainer } from "../common/II18nValueContainer";
+import { II18nSlidebar } from "./II18nSlidebar";
+import { II18nValueContainer } from "./II18nValueContainer";
 import { II18nFilterValidator } from "./II18nFilterValidator";
 
 export interface II18nFilter {
-    slidebar?: II18nSlidebar;
+    slidebar: II18nSlidebar;
     validators: II18nFilterValidator;
-    value_container?: II18nValueContainer;
+    value_container: II18nValueContainer;
 }

package/src/globalization/interfaces/filters/II18nFilterBuilder.ts

@@ -12,8 +12,6 @@ export interface II18nFilterBuilder {
     date_sections: { [key in IFDateSection]: string };
     divider_label: string;
     // properties: { [key in IColumnPropertyType]: string }; // In different location
-    // values_container: VALUES_CONTAINER; // In different location
-    // slidebar: SLIDEBAR; // In different location
     selected_values_container: II18nFilterBuilderSelectedValuesContainer;
     info_container: II18nFilterBuilderInfoContainer;
 }

package/src/globalization/labels/common/index.ts

@@ -1,5 +1,5 @@
 export * from './I18N_COMMON';
 
+export * from './I18N_AGGREGATE_LABEL';
 export * from './I18N_COLUMN_LABEL';
-export * from './I18N_SLIDEBAR';
-export * from './I18N_VALUE_CONTAINER';
+

package/src/globalization/labels/filters/I18N_FILTER.ts

@@ -1,6 +1,10 @@
 import { II18nFilter } from "../../interfaces/filters/II18nFilter";
 import { I18N_FILTER_VALIDATOR } from "./I18N_FILTER_VALIDATOR";
+import { I18N_SLIDEBAR } from "./I18N_SLIDEBAR";
+import { I18N_VALUE_CONTAINER } from "./I18N_VALUE_CONTAINER";
 
 export const I18N_FILTER: II18nFilter = {
+    slidebar: I18N_SLIDEBAR,
     validators: I18N_FILTER_VALIDATOR,
+    value_container: I18N_VALUE_CONTAINER
 };

package/src/globalization/labels/filters/I18N_FILTER_BUILDER.ts

@@ -13,8 +13,6 @@ export const I18N_FILTER_BUILDER: II18nFilterBuilder = {
     date_sections: FILTER_DATE_SECTION_LABEL,
     divider_label: 'Is',
     // properties: COLUMN_PROPERTY_LABEL, //In different location
-    // value_container: VALUES_CONTAINER, //In different location
-    // slidebar: SLIDEBAR, //In different location
     selected_values_container: {
         empty_message: 'No values added'
     },

package/src/globalization/labels/{common → filters}/I18N_SLIDEBAR.ts

@@ -1,4 +1,4 @@
-import { II18nSlidebar } from "../../interfaces/common/II18nSlidebar";
+import { II18nSlidebar } from "../../interfaces/filters/II18nSlidebar";
 
 export const I18N_SLIDEBAR: II18nSlidebar = {
     min: 'Data Min',

package/src/globalization/labels/{common → filters}/I18N_VALUE_CONTAINER.ts

@@ -1,4 +1,4 @@
-import { II18nValueContainer } from "../../interfaces/common/II18nValueContainer";
+import { II18nValueContainer } from "../../interfaces/filters/II18nValueContainer";
 
 export const I18N_VALUE_CONTAINER: II18nValueContainer = {
     search_input: {

package/src/globalization/labels/filters/index.ts

@@ -1,3 +1,7 @@
 export * from './I18N_FILTER_BUILDER';
-export * from './I18N_FILTER';
 export * from './I18N_FILTER_VALIDATOR';
+export * from './I18N_FILTER';
+
+export * from './I18N_SLIDEBAR';
+export * from './I18N_VALUE_CONTAINER';
+

package/src/globalization/labels/index.ts

@@ -1,6 +1,8 @@
 export * from './columns';
+export * from './common';
 export * from './dashboard';
 export * from './filters';
 export * from './panel';
 export * from './table_charts';
+
 export * from './I18N_DEFAULT';

package/dist/cjs/globalization/labels/common/I18N_SLIDEBAR.d.ts

@@ -1,2 +0,0 @@
-import { II18nSlidebar } from "../../interfaces/common/II18nSlidebar";
-export declare const I18N_SLIDEBAR: II18nSlidebar;

package/dist/cjs/globalization/labels/common/I18N_VALUE_CONTAINER.d.ts

@@ -1,2 +0,0 @@
-import { II18nValueContainer } from "../../interfaces/common/II18nValueContainer";
-export declare const I18N_VALUE_CONTAINER: II18nValueContainer;

package/dist/globalization/labels/common/I18N_SLIDEBAR.d.ts

@@ -1,2 +0,0 @@
-import { II18nSlidebar } from "../../interfaces/common/II18nSlidebar";
-export declare const I18N_SLIDEBAR: II18nSlidebar;

package/dist/globalization/labels/common/I18N_VALUE_CONTAINER.d.ts

@@ -1,2 +0,0 @@
-import { II18nValueContainer } from "../../interfaces/common/II18nValueContainer";
-export declare const I18N_VALUE_CONTAINER: II18nValueContainer;