@qrvey/utils 1.2.9-22 → 1.2.9-23

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.9-22*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.9-23*
 
 > Helper, Utils for all Qrvey Projects
 
@@ -688,12 +688,12 @@ Output:
 
 
 
-### dist/filters/adapters/FDToLogic.js
+### dist/filters/adapters/FDToFlatUI.js
 
 
-#### FDToLogic(filterData) 
+#### FDToFlatUI(filterData, datasetsInfo) 
 
-Generates a Filter Logic structure from Filter Data structure.
+Generates a Flattened UI filter structure from Filter Data structure.
 
 
 
@@ -703,6 +703,7 @@ Generates a Filter Logic structure from Filter Data structure.
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
 | filterData |  | The filter data object. |   |
+| datasetsInfo |  | Collection of datasets information |   |
 
 
 
@@ -710,13 +711,13 @@ Generates a Filter Logic structure from Filter Data structure.
 ##### Returns
 
 
--  a filter logic array
+-  a flattened UI filters array
 
 
 
-#### getLogicBodyFromFD21(filterData) 
+#### FD21ToFlatUI(scopes, datasetsInfo) 
 
-Gets the logic body
+Generates a Filter Builder Structure from the Filter Data structure v2.1
 
 
 
@@ -725,7 +726,8 @@ Gets the logic body
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filterData |  | The filter data object |   |
+| scopes |  | The filter scope section |   |
+| datasetsInfo |  | Collection of datasets information |   |
 
 
 
@@ -733,17 +735,17 @@ Gets the logic body
 ##### Returns
 
 
--  a filter logic array
+-  a flattened UI filters array
 
 
 
 
-### dist/filters/adapters/FDToFlatUI.js
+### dist/filters/adapters/FDToLogic.js
 
 
-#### FDToFlatUI(filterData, datasetsInfo) 
+#### FDToLogic(filterData) 
 
-Generates a Flattened UI filter structure from Filter Data structure.
+Generates a Filter Logic structure from Filter Data structure.
 
 
 
@@ -753,7 +755,6 @@ Generates a Flattened UI filter structure from Filter Data structure.
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
 | filterData |  | The filter data object. |   |
-| datasetsInfo |  | Collection of datasets information |   |
 
 
 
@@ -761,13 +762,13 @@ Generates a Flattened UI filter structure from Filter Data structure.
 ##### Returns
 
 
--  a flattened UI filters array
+-  a filter logic array
 
 
 
-#### FD21ToFlatUI(scopes, datasetsInfo) 
+#### getLogicBodyFromFD21(filterData) 
 
-Generates a Filter Builder Structure from the Filter Data structure v2.1
+Gets the logic body
 
 
 
@@ -776,8 +777,7 @@ Generates a Filter Builder Structure from the Filter Data structure v2.1
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| scopes |  | The filter scope section |   |
-| datasetsInfo |  | Collection of datasets information |   |
+| filterData |  | The filter data object |   |
 
 
 
@@ -785,7 +785,7 @@ Generates a Filter Builder Structure from the Filter Data structure v2.1
 ##### Returns
 
 
--  a flattened UI filters array
+-  a filter logic array
 
 
 
@@ -2722,50 +2722,47 @@ Gets the format config
 
 
 
-### dist/services/api/getAllDatasets.api.js
-
-
-#### getAllDatasets(config, pickDatasets) 
+### dist/stencil/decorators/Config.js
 
-Get a dataset list from a collection of Qrvey IDs
 
+#### Config() 
 
+Stencil.js - Prop Decorator
+Get and Parse the Widget Configuration Object and also provide the ability to get properties in different case styles such as: lower, upper, camel and pascal
+But for this, is required ask for a property in `snake_case` style
 
 
-##### Parameters
 
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| config |  | the widget config. Includes the appid and others configuration properties |   |
-| pickDatasets |  | Collection of Qrvey IDs for filtering the request |   |
 
 
 
+##### Examples
 
-##### Returns
+```javascript
+\ @Config() @Prop() settings;
 
+someMethod() {
+ this.settings.snake_case //it search for: obj.snake_case || obj.snakeCase || obj.SnakeCase || obj.snakecase || obj.SNAKECASE
+}
+```
 
--  a promise
 
+##### Returns
 
 
+- `Void`
 
-### dist/services/api/getAllQrveys.api.js
 
 
-#### getAllQrveys(config, params) 
 
-POST Request for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
+### dist/stencil/util/createRef.js
 
 
+#### createRef() 
 
+lit implementation of React createRef (https://reactjs.org/docs/refs-and-the-dom.html)
 
-##### Parameters
 
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| config |  | Configuration |   |
-| params |  | Object for getting precise data |   |
 
 
 
@@ -2773,17 +2770,21 @@ POST Request for getting Qrveys such as Web Forms and Datasets. Use params for g
 ##### Returns
 
 
-- `Void`
+-  function - Function to use in ref prop in html elements
 
 
 
 
-### dist/services/api/getDatasetColumns.api.js
+### dist/stencil/util/getConfig.js
 
 
-#### getDatasetColumns(qrveyid) 
+#### getConfig(cfg) 
 
-Get a dataset by Qrvey ID
+verify the Config object type and try to return a parsed Object
+- In case _cfg_ is a string, first try to make a JSON parse in other case
+try to find this string as a variable on Windows object
+- If _cfg_ is a fuction, tis is invoked and parsed
+- Finally, if is an object, _cfg_ is inmediatly returned
 
 
 
@@ -2792,7 +2793,7 @@ Get a dataset by Qrvey ID
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| qrveyid |  | The Qrvey ID |   |
+| cfg |  |  |   |
 
 
 
@@ -2800,52 +2801,27 @@ Get a dataset by Qrvey ID
 ##### Returns
 
 
--  a promise
-
-
-
-
-### dist/stencil/decorators/Config.js
-
-
-#### Config() 
-
-Stencil.js - Prop Decorator
-Get and Parse the Widget Configuration Object and also provide the ability to get properties in different case styles such as: lower, upper, camel and pascal
-But for this, is required ask for a property in `snake_case` style
-
-
-
-
-
-
-##### Examples
-
-```javascript
-\ @Config() @Prop() settings;
-
-someMethod() {
- this.settings.snake_case //it search for: obj.snake_case || obj.snakeCase || obj.SnakeCase || obj.snakecase || obj.SNAKECASE
-}
-```
-
+- `Void`
 
-##### Returns
 
 
-- `Void`
 
+### dist/services/api/getAllDatasets.api.js
 
 
+#### getAllDatasets(config, pickDatasets) 
 
-### dist/stencil/util/createRef.js
+Get a dataset list from a collection of Qrvey IDs
 
 
-#### createRef() 
 
-lit implementation of React createRef (https://reactjs.org/docs/refs-and-the-dom.html)
 
+##### Parameters
 
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| config |  | the widget config. Includes the appid and others configuration properties |   |
+| pickDatasets |  | Collection of Qrvey IDs for filtering the request |   |
 
 
 
@@ -2853,21 +2829,17 @@ lit implementation of React createRef (https://reactjs.org/docs/refs-and-the-dom
 ##### Returns
 
 
--  function - Function to use in ref prop in html elements
+-  a promise
 
 
 
 
-### dist/stencil/util/getConfig.js
+### dist/services/api/getAllQrveys.api.js
 
 
-#### getConfig(cfg) 
+#### getAllQrveys(config, params) 
 
-verify the Config object type and try to return a parsed Object
-- In case _cfg_ is a string, first try to make a JSON parse in other case
-try to find this string as a variable on Windows object
-- If _cfg_ is a fuction, tis is invoked and parsed
-- Finally, if is an object, _cfg_ is inmediatly returned
+POST Request for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
 
 
 
@@ -2876,7 +2848,8 @@ try to find this string as a variable on Windows object
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| cfg |  |  |   |
+| config |  | Configuration |   |
+| params |  | Object for getting precise data |   |
 
 
 
@@ -2889,12 +2862,12 @@ try to find this string as a variable on Windows object
 
 
 
-### dist/typescript/decorators/Throttled.js
+### dist/services/api/getDatasetColumns.api.js
 
 
-#### Throttled(time) 
+#### getDatasetColumns(qrveyid) 
 
-(Method Decorator) Throttled Class Method
+Get a dataset by Qrvey ID
 
 
 
@@ -2903,7 +2876,7 @@ try to find this string as a variable on Windows object
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| time |  | (optional) deafult 500 |   |
+| qrveyid |  | The Qrvey ID |   |
 
 
 
@@ -2911,7 +2884,7 @@ try to find this string as a variable on Windows object
 ##### Returns
 
 
-- `Void`
+-  a promise
 
 
 
@@ -2943,12 +2916,12 @@ try to find this string as a variable on Windows object
 
 
 
-### dist/dates/relative/helpers/getStatementCase.js
+### dist/typescript/decorators/Throttled.js
 
 
-#### getStatementCase(includeCurrent, isCalendarDate) 
+#### Throttled(time) 
 
-Returns a number/constant that identifies a relative date case
+(Method Decorator) Throttled Class Method
 
 
 
@@ -2957,8 +2930,7 @@ Returns a number/constant that identifies a relative date case
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| includeCurrent | `boolean`  |  |   |
-| isCalendarDate | `boolean`  |  |   |
+| time |  | (optional) deafult 500 |   |
 
 
 
@@ -2966,7 +2938,7 @@ Returns a number/constant that identifies a relative date case
 ##### Returns
 
 
-- `number`  
+- `Void`
 
 
 
@@ -2998,12 +2970,12 @@ Build a proper relative date statement type
 
 
 
-### dist/dates/relative/helpers/parseDate.js
+### dist/dates/relative/helpers/getStatementCase.js
 
 
-#### parseDate(date) 
+#### getStatementCase(includeCurrent, isCalendarDate) 
 
-Parses a string date and returns a dayjs date
+Returns a number/constant that identifies a relative date case
 
 
 
@@ -3012,7 +2984,8 @@ Parses a string date and returns a dayjs date
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| date | `string` `Dayjs` `Date`  |  |   |
+| includeCurrent | `boolean`  |  |   |
+| isCalendarDate | `boolean`  |  |   |
 
 
 
@@ -3020,17 +2993,17 @@ Parses a string date and returns a dayjs date
 ##### Returns
 
 
-- `Dayjs`  A dayjs date
+- `number`  
 
 
 
 
-### dist/filters/helpers/builder/getFilterBuilderGeneralConfig.js
+### dist/dates/relative/helpers/parseDate.js
 
 
-#### getFilterBuilderGeneralConfig(config) 
+#### parseDate(date) 
 
-Returns a filter builder config object by a any given config
+Parses a string date and returns a dayjs date
 
 
 
@@ -3039,7 +3012,7 @@ Returns a filter builder config object by a any given config
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| config |  | any config object |   |
+| date | `string` `Dayjs` `Date`  |  |   |
 
 
 
@@ -3047,7 +3020,7 @@ Returns a filter builder config object by a any given config
 ##### Returns
 
 
--  The filter builder config object
+- `Dayjs`  A dayjs date
 
 
 
@@ -3348,12 +3321,12 @@ Gets filters from the logic by the scopes hierarchy.
 
 
 
-### dist/filters/helpers/common/areFiltersEquals.js
+### dist/filters/helpers/builder/getFilterBuilderGeneralConfig.js
 
 
-#### areFiltersEquals(filter1, filter2) 
+#### getFilterBuilderGeneralConfig(config) 
 
-Validates if both filters are the same
+Returns a filter builder config object by a any given config
 
 
 
@@ -3362,8 +3335,7 @@ Validates if both filters are the same
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filter1 |  | filter 1 |   |
-| filter2 |  | filter 2 |   |
+| config |  | any config object |   |
 
 
 
@@ -3371,17 +3343,17 @@ Validates if both filters are the same
 ##### Returns
 
 
--  true: the filters are equal; false: the filters are NOT equal
+-  The filter builder config object
 
 
 
 
-### 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
 
 
 
@@ -3390,7 +3362,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 |   |
 
 
 
@@ -3398,17 +3371,17 @@ 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
 
 
 
 
-### dist/filters/helpers/common/excludeFiltersByScopes.js
+### dist/filters/helpers/common/excludeFiltersByAggregateColumn.js
 
 
-#### excludeFiltersByScopes(filterData, scopes) 
+#### excludeFiltersByAggregateColumn(filterData) 
 
-Excludes and returns a filter data without filters by the given scopes
+Excludes Aggregate Filters in the Filter Data. Excluding filters when the column.aggregate is included.
 
 
 
@@ -3417,8 +3390,7 @@ Excludes and returns a filter data without filters by the given scopes
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filterData |  | The Filter Data |   |
-| scopes |  | collection of scopes to be as filtering parameters |   |
+| filterData |  | The filter data object |   |
 
 
 
@@ -3426,7 +3398,7 @@ Excludes and returns a filter data without filters by the given scopes
 ##### Returns
 
 
--  The new Filter Data without filters by the given scopes.
+-  The new filter data object that were excluded the aggregate filters
 
 
 
@@ -3468,12 +3440,12 @@ The validation to filter the stored filter is depending on:
 
 
 
-### dist/filters/helpers/common/getFilterColumnLabel.js
+### dist/filters/helpers/common/excludeFiltersByScopes.js
 
 
-#### getFilterColumnLabel(column) 
+#### excludeFiltersByScopes(filterData, scopes) 
 
-Get an string of the properties of the given filter column.
+Excludes and returns a filter data without filters by the given scopes
 
 
 
@@ -3482,7 +3454,8 @@ Get an string of the properties of the given filter column.
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| column |  | The filter column |   |
+| filterData |  | The Filter Data |   |
+| scopes |  | collection of scopes to be as filtering parameters |   |
 
 
 
@@ -3490,7 +3463,7 @@ Get an string of the properties of the given filter column.
 ##### Returns
 
 
--  an string with the property, aggregate or calculation label.
+-  The new Filter Data without filters by the given scopes.
 
 
 
@@ -4480,4 +4453,31 @@ Resolves conditions between UI flattened filter and given parameters
 
 
 
+### dist/filters/helpers/common/getFilterColumnLabel.js
+
+
+#### getFilterColumnLabel(column) 
+
+Get an string of the properties of the given filter column.
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| column |  | The filter column |   |
+
+
+
+
+##### Returns
+
+
+-  an string with the property, aggregate or calculation label.
+
+
+
+
 *Documentation generated with [doxdox](https://github.com/neogeek/doxdox).*

package/dist/cjs/columns/interfaces/IColumn.d.ts

@@ -1,5 +1,4 @@
 import { IColumnCalculationType } from "../../qrvey/interfaces/ICalculationType";
-import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnSortingSettings } from "./IColumnSortingSettings";
 import { IBColumn } from "./IBColumn";
@@ -11,7 +10,6 @@ export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId
     bucketid?: string;
     aggregate?: IAggregateType;
     calculation?: IColumnCalculationType;
-    dataset?: IDataset;
     formulaid?: string;
     label?: string;
     linkid?: string;

package/dist/cjs/filters/adapters/FDToFlatUI.js

@@ -44,7 +44,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                         const datasetInfo = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
                         let columnInfo;
                         if (!(0, isEmpty_1.isEmpty)(datasetInfo))
-                            columnInfo = datasetInfo.options.find(cInfo => { var _a, _b; return cInfo.id === filter.column.id && ((_a = cInfo.dataset) === null || _a === void 0 ? void 0 : _a.qrveyid) === filter.column.qrveyid && ((_b = cInfo.dataset) === null || _b === void 0 ? void 0 : _b.linkid) === filter.column.linkid; });
+                            columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                         const info = !(0, isEmpty_1.isEmpty)(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
                         const property = (0, adaptDateGroupingProperty_1.adaptDateGroupingProperty)(filter.property);
                         const uFilter = {

package/dist/cjs/filters/adapters/FDToUI.js

@@ -48,7 +48,6 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHER
     ufData.scopes = scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(dataset => {
             const datasetInfo = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
             return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label, filters: dataset.filters.map(filter => {
-                    var _a;
                     let columnInfo;
                     if (!(0, isEmpty_1.isEmpty)(datasetInfo))
                         columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
@@ -60,7 +59,7 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION_1.FILTER_SECTION.ANYWHER
                             id: filter.column.id,
                             label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
                             linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
-                            linkid: ((_a = columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.dataset) === null || _a === void 0 ? void 0 : _a.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
+                            linkid: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
                             outputFormat: (0, get_1._get)(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,

package/dist/cjs/filters/adapters/logicToFlatUI.js

@@ -56,7 +56,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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const uiExtras = expression.uiExtras;
     const scopeid = scopeItem.scope !== FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL ? (0, get_1._get)(scopeItem, 'uiExtras.scopeid') : undefined;
     const info = !(0, isEmpty_1.isEmpty)(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
@@ -92,8 +92,8 @@ function getFilterByExpression(expression, scopeItem) {
                 enabled: true,
                 displayed: true,
                 qrveyid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.qrveyid,
-                label: (0, get_1._get)((_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.dataset, 'name') || ((_u = (_t = uiExtras.column) === null || _t === void 0 ? void 0 : _t.dataset) === null || _u === void 0 ? void 0 : _u.label),
-                linkid: (_v = uiExtras.column) === null || _v === void 0 ? void 0 : _v.linkid,
+                label: (0, get_1._get)(uiExtras.column, 'dataset.name') || ((_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.label),
+                linkid: (_t = uiExtras.column) === null || _t === void 0 ? void 0 : _t.linkid,
             } }),
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,

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

@@ -19,7 +19,7 @@ function getUpdatedUIFilters(data, datasets = []) {
             dataset.filters = dataset.filters.map(filter => {
                 let columnInfo;
                 if (!(0, isEmpty_1.isEmpty)(datasetInfo))
-                    columnInfo = datasetInfo.options.find(cInfo => { var _a, _b; return cInfo.id === filter.column.id && ((_a = cInfo.dataset) === null || _a === void 0 ? void 0 : _a.qrveyid) === filter.column.qrveyid && ((_b = cInfo.dataset) === null || _b === void 0 ? void 0 : _b.linkid) === filter.column.linkid; });
+                    columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                 if (!(0, isEmpty_1.isEmpty)(columnInfo)) {
                     filter.column.formulaType = columnInfo.formulaType;
                     filter.column.label = columnInfo.label;

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

@@ -1,4 +1,5 @@
 import { IColumn } from "../../columns/interfaces/IColumn";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IFSFilterExtrasInfo } from "./common/IFSFilterExtrasInfo";
 import { IFDateSection } from "./IFDateSection";
 import { IFOperator } from "./IFOperator";
@@ -10,7 +11,9 @@ import { IFValue } from "./IFValue";
 import { IFUChartSettings } from "./ui/IFUChartSettings";
 import { IFUValue } from "./ui/IFUValue";
 export interface OLD_IFilterDetail {
-    column?: IColumn;
+    column?: IColumn & {
+        dataset: IDataset;
+    };
     dateSection?: IFDateSection;
     enabled?: boolean;
     lookupDisplayIndex?: number;

package/dist/cjs/format/localization.js

@@ -53,13 +53,19 @@ function getLocaleOptions(outputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch (format) {
         case "Currency" /* CURRENCY */: {
-            const iso = (0, isEmpty_1.isEmpty)(currency) ? definition_1.CURRENCY_DEFAULT : definition_1.currencyISO.find(item => (item.text === currency.text) || item.text.includes(currency.label));
-            return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0, currencyDisplay: 'narrowSymbol' };
+            let iso = (0, isEmpty_1.isEmpty)(currency) ? definition_1.CURRENCY_DEFAULT : definition_1.currencyISO.find(item => item.text === currency.text);
+            if ((0, isEmpty_1.isEmpty)(iso)) {
+                iso = definition_1.currencyISO.find(item => {
+                    const symbol = item.text.split(' ')[0];
+                    return symbol === currency.label;
+                });
+            }
+            return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: decimals, currencyDisplay: 'narrowSymbol' };
         }
         case "Scientific" /* SCIENTIFIC */: return { style: "decimal" /* DECIMAL */,
-            notation: "scientific" /* SCIENTIFIC */, maximumFractionDigits: decimals };
-        case "Percentage" /* PERCENTAGE */: return { style: "percent" /* PERCENT */, maximumFractionDigits: decimals };
-        case "Abbreviated" /* ABBREVIATED */: return { notation: "compact" /* COMPACT */, maximumFractionDigits: decimals };
-        default: return { style: "decimal" /* DECIMAL */, maximumFractionDigits: decimals };
+            notation: "scientific" /* SCIENTIFIC */, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        case "Percentage" /* PERCENTAGE */: return { style: "percent" /* PERCENT */, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        case "Abbreviated" /* ABBREVIATED */: return { notation: "compact" /* COMPACT */, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        default: return { style: "decimal" /* DECIMAL */, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
     }
 }

package/dist/columns/interfaces/IColumn.d.ts

@@ -1,5 +1,4 @@
 import { IColumnCalculationType } from "../../qrvey/interfaces/ICalculationType";
-import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnSortingSettings } from "./IColumnSortingSettings";
 import { IBColumn } from "./IBColumn";
@@ -11,7 +10,6 @@ export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId
     bucketid?: string;
     aggregate?: IAggregateType;
     calculation?: IColumnCalculationType;
-    dataset?: IDataset;
     formulaid?: string;
     label?: string;
     linkid?: string;

package/dist/filters/adapters/FDToFlatUI.js

@@ -40,7 +40,7 @@ function FD21ToFlatUI(scopes = [], datasetsInfo = []) {
                         const datasetInfo = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
                         let columnInfo;
                         if (!isEmpty(datasetInfo))
-                            columnInfo = datasetInfo.options.find(cInfo => { var _a, _b; return cInfo.id === filter.column.id && ((_a = cInfo.dataset) === null || _a === void 0 ? void 0 : _a.qrveyid) === filter.column.qrveyid && ((_b = cInfo.dataset) === null || _b === void 0 ? void 0 : _b.linkid) === filter.column.linkid; });
+                            columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                         const info = !isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
                         const property = adaptDateGroupingProperty(filter.property);
                         const uFilter = {

package/dist/filters/adapters/FDToUI.js

@@ -44,7 +44,6 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION.ANYWHERE, enabled = true
     ufData.scopes = scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(dataset => {
             const datasetInfo = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
             return Object.assign(Object.assign({}, dataset), { label: datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.label, filters: dataset.filters.map(filter => {
-                    var _a;
                     let columnInfo;
                     if (!isEmpty(datasetInfo))
                         columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
@@ -56,7 +55,7 @@ function FD21ToUI(scopes = [], section = FILTER_SECTION.ANYWHERE, enabled = true
                             id: filter.column.id,
                             label: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.label,
                             linked: columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linked,
-                            linkid: ((_a = columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.dataset) === null || _a === void 0 ? void 0 : _a.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
+                            linkid: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.linkid) || (datasetInfo === null || datasetInfo === void 0 ? void 0 : datasetInfo.linkid),
                             outputFormat: _get(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: (columnInfo === null || columnInfo === void 0 ? void 0 : columnInfo.type) || filter.column.type,

package/dist/filters/adapters/logicToFlatUI.js

@@ -52,7 +52,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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const uiExtras = expression.uiExtras;
     const scopeid = scopeItem.scope !== FILTER_SCOPE.GLOBAL ? _get(scopeItem, 'uiExtras.scopeid') : undefined;
     const info = !isEmpty(uiExtras.info) ? { icon: uiExtras.info.icon, label: uiExtras.info.label } : undefined;
@@ -88,8 +88,8 @@ function getFilterByExpression(expression, scopeItem) {
                 enabled: true,
                 displayed: true,
                 qrveyid: (_r = uiExtras.column) === null || _r === void 0 ? void 0 : _r.qrveyid,
-                label: _get((_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.dataset, 'name') || ((_u = (_t = uiExtras.column) === null || _t === void 0 ? void 0 : _t.dataset) === null || _u === void 0 ? void 0 : _u.label),
-                linkid: (_v = uiExtras.column) === null || _v === void 0 ? void 0 : _v.linkid,
+                label: _get(uiExtras.column, 'dataset.name') || ((_s = uiExtras.column) === null || _s === void 0 ? void 0 : _s.label),
+                linkid: (_t = uiExtras.column) === null || _t === void 0 ? void 0 : _t.linkid,
             } }),
         filterid: undefined,
         lookupDisplayIndex: uiExtras.lookupDisplayIndex,

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

@@ -16,7 +16,7 @@ export function getUpdatedUIFilters(data, datasets = []) {
             dataset.filters = dataset.filters.map(filter => {
                 let columnInfo;
                 if (!isEmpty(datasetInfo))
-                    columnInfo = datasetInfo.options.find(cInfo => { var _a, _b; return cInfo.id === filter.column.id && ((_a = cInfo.dataset) === null || _a === void 0 ? void 0 : _a.qrveyid) === filter.column.qrveyid && ((_b = cInfo.dataset) === null || _b === void 0 ? void 0 : _b.linkid) === filter.column.linkid; });
+                    columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                 if (!isEmpty(columnInfo)) {
                     filter.column.formulaType = columnInfo.formulaType;
                     filter.column.label = columnInfo.label;

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

@@ -1,4 +1,5 @@
 import { IColumn } from "../../columns/interfaces/IColumn";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IFSFilterExtrasInfo } from "./common/IFSFilterExtrasInfo";
 import { IFDateSection } from "./IFDateSection";
 import { IFOperator } from "./IFOperator";
@@ -10,7 +11,9 @@ import { IFValue } from "./IFValue";
 import { IFUChartSettings } from "./ui/IFUChartSettings";
 import { IFUValue } from "./ui/IFUValue";
 export interface OLD_IFilterDetail {
-    column?: IColumn;
+    column?: IColumn & {
+        dataset: IDataset;
+    };
     dateSection?: IFDateSection;
     enabled?: boolean;
     lookupDisplayIndex?: number;

package/dist/format/localization.js

@@ -47,13 +47,19 @@ function getLocaleOptions(outputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch (format) {
         case "Currency" /* CURRENCY */: {
-            const iso = isEmpty(currency) ? CURRENCY_DEFAULT : currencyISO.find(item => (item.text === currency.text) || item.text.includes(currency.label));
-            return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0, currencyDisplay: 'narrowSymbol' };
+            let iso = isEmpty(currency) ? CURRENCY_DEFAULT : currencyISO.find(item => item.text === currency.text);
+            if (isEmpty(iso)) {
+                iso = currencyISO.find(item => {
+                    const symbol = item.text.split(' ')[0];
+                    return symbol === currency.label;
+                });
+            }
+            return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: decimals, currencyDisplay: 'narrowSymbol' };
         }
         case "Scientific" /* SCIENTIFIC */: return { style: "decimal" /* DECIMAL */,
-            notation: "scientific" /* SCIENTIFIC */, maximumFractionDigits: decimals };
-        case "Percentage" /* PERCENTAGE */: return { style: "percent" /* PERCENT */, maximumFractionDigits: decimals };
-        case "Abbreviated" /* ABBREVIATED */: return { notation: "compact" /* COMPACT */, maximumFractionDigits: decimals };
-        default: return { style: "decimal" /* DECIMAL */, maximumFractionDigits: decimals };
+            notation: "scientific" /* SCIENTIFIC */, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        case "Percentage" /* PERCENTAGE */: return { style: "percent" /* PERCENT */, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        case "Abbreviated" /* ABBREVIATED */: return { notation: "compact" /* COMPACT */, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        default: return { style: "decimal" /* DECIMAL */, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
     }
 }

package/package.json

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

package/src/columns/interfaces/IColumn.ts

@@ -1,5 +1,4 @@
 import { IColumnCalculationType } from "../../qrvey/interfaces/ICalculationType";
-import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnSortingSettings } from "./IColumnSortingSettings";
 import { IBColumn } from "./IBColumn";
@@ -12,7 +11,6 @@ export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId
     bucketid?: string;
     aggregate?: IAggregateType;
     calculation?: IColumnCalculationType;
-    dataset?: IDataset;
     formulaid?: string;
     label?: string;
     linkid?: string;

package/src/filters/adapters/FDToFlatUI.ts

@@ -47,7 +47,7 @@ function FD21ToFlatUI(scopes: IFSScope[] = [], datasetsInfo: IDataset[] = []): I
                     dataset.filters.forEach(filter => {
                         const datasetInfo: IDataset = datasetsInfo.find(dInfo => dInfo.qrveyid === dataset.qrveyid && dInfo.linkid === dataset.linkid);
                         let columnInfo: IColumn;
-                        if (!isEmpty(datasetInfo)) columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.dataset?.qrveyid === filter.column.qrveyid && cInfo.dataset?.linkid === filter.column.linkid);
+                        if (!isEmpty(datasetInfo)) columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                         const info = !isEmpty(filter.extras.info) ? { icon: filter.extras.info.icon, label: filter.extras.info.label } : undefined;
                         const property = adaptDateGroupingProperty(filter.property);
 

package/src/filters/adapters/FDToUI.ts

@@ -71,7 +71,7 @@ export function FDToUI(filterData: IFSData, datasetsInfo: IDataset[] = []): IFUD
                             id: filter.column.id,
                             label: columnInfo?.label,
                             linked: columnInfo?.linked,
-                            linkid: columnInfo?.dataset?.linkid || datasetInfo?.linkid,
+                            linkid: columnInfo?.linkid || datasetInfo?.linkid,
                             outputFormat: _get(datasetInfo, 'outputFormat'),
                             qrveyid: filter.column.qrveyid,
                             type: columnInfo?.type || filter.column.type,

package/src/filters/adapters/logicToFlatUI.ts

@@ -103,7 +103,7 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
                 enabled: true,
                 displayed: true,
                 qrveyid: uiExtras.column?.qrveyid,
-                label: _get( uiExtras.column?.dataset, 'name') || uiExtras.column?.dataset?.label,
+                label: _get(uiExtras.column, 'dataset.name') || uiExtras.column?.label,
                 linkid: uiExtras.column?.linkid,
             },
         },

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

@@ -18,7 +18,7 @@ export function getUpdatedUIFilters(data: IFUData, datasets: IDataset[] = []): I
             if (!isEmpty(datasetInfo)) dataset.label = datasetInfo.label;
             dataset.filters = dataset.filters.map(filter => {
                 let columnInfo: IColumn;
-                if (!isEmpty(datasetInfo)) columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.dataset?.qrveyid === filter.column.qrveyid && cInfo.dataset?.linkid === filter.column.linkid);
+                if (!isEmpty(datasetInfo)) columnInfo = datasetInfo.options.find(cInfo => cInfo.id === filter.column.id && cInfo.qrveyid === filter.column.qrveyid && cInfo.linkid === filter.column.linkid);
                 if (!isEmpty(columnInfo)) {
                     filter.column.formulaType = columnInfo.formulaType;
                     filter.column.label = columnInfo.label;

package/src/filters/interfaces/OLD_IFilterDetail.ts

@@ -1,4 +1,5 @@
 import { IColumn } from "../../columns/interfaces/IColumn";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IFSFilterExtrasInfo } from "./common/IFSFilterExtrasInfo";
 import { IFDateSection } from "./IFDateSection";
 import { IFOperator } from "./IFOperator";
@@ -11,7 +12,7 @@ import { IFUChartSettings } from "./ui/IFUChartSettings";
 import { IFUValue } from "./ui/IFUValue";
 
 export interface OLD_IFilterDetail {
-    column?: IColumn;
+    column?: IColumn & { dataset: IDataset };
     dateSection?: IFDateSection;
     enabled?: boolean;
     lookupDisplayIndex?: number;

package/src/format/localization.ts

@@ -50,13 +50,19 @@ function getLocaleOptions(outputFormat: IFormatOutputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch(format) {
         case LOCALE_FORMATS.CURRENCY: {
-            const iso = isEmpty(currency) ? CURRENCY_DEFAULT : currencyISO.find(item => (item.text === currency.text) || item.text.includes(currency.label));
-            return { style: LOCALE_STYLES.CURRENCY, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0, currencyDisplay: 'narrowSymbol' };
+            let iso = isEmpty(currency) ? CURRENCY_DEFAULT : currencyISO.find(item => item.text === currency.text);
+            if(isEmpty(iso)) {
+                iso = currencyISO.find(item => {
+                    const symbol = item.text.split(' ')[0];
+                    return symbol === currency.label;
+                });
+            }
+            return { style: LOCALE_STYLES.CURRENCY, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: decimals, currencyDisplay: 'narrowSymbol' };
         }
         case LOCALE_FORMATS.SCIENTIFIC: return { style: LOCALE_STYLES.DECIMAL,
-             notation: LOCALE_STYLES.SCIENTIFIC, maximumFractionDigits: decimals };
-        case LOCALE_FORMATS.PERCENTAGE: return { style: LOCALE_STYLES.PERCENT, maximumFractionDigits: decimals };
-        case LOCALE_FORMATS.ABBREVIATED: return { notation: LOCALE_STYLES.COMPACT, maximumFractionDigits: decimals };
-        default: return { style: LOCALE_STYLES.DECIMAL, maximumFractionDigits: decimals };
+             notation: LOCALE_STYLES.SCIENTIFIC, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        case LOCALE_FORMATS.PERCENTAGE: return { style: LOCALE_STYLES.PERCENT, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        case LOCALE_FORMATS.ABBREVIATED: return { notation: LOCALE_STYLES.COMPACT, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
+        default: return { style: LOCALE_STYLES.DECIMAL, maximumFractionDigits: decimals, minimumFractionDigits: decimals };
     }
 }