@qrvey/utils 1.2.9-18 → 1.2.9-21

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.9-18*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.9-21*
 
 > Helper, Utils for all Qrvey Projects
 

package/dist/cjs/filters/helpers/builder/getFilterBuilderGeneralConfig.js

@@ -12,7 +12,7 @@ function getFilterBuilderGeneralConfig(config = {}) {
         apiKey: (0, getAttribute_1.getAttribute)(config, 'api_key') || config.apiKey,
         appid: (0, getAttribute_1.getAttribute)(config, 'app_id') || config.appid,
         domain: config.domain,
-        locale: config.locale,
+        i18n: config.i18n,
         qv_token: config.qv_token,
         timezoneControl: (0, getAttribute_1.getAttribute)(config, 'timezone_control') || config.timezoneControl,
         userid: (0, getAttribute_1.getAttribute)(config, 'user_id') || config.userid,

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

@@ -45,7 +45,7 @@ function getUIValues(filter, settings) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL:
             return [{
-                    value: FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[filter.validator].label,
+                    value: (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate('filter.validators.' + filter.validator.toLowerCase() + '_label') : FILTER_VALIDATOR_INFO_1.FILTER_VALIDATOR_INFO[filter.validator].label,
                     enabled: settings.addEnableds ? (_a = filter.values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
                 }];
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.IN:

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

@@ -1,4 +1,3 @@
-import { IResourceI18n } from "../../../globalization/interfaces/IResourceI18n";
 import { IFBLogic } from "../backend/IFBLogic";
 import { IFBUserFilters } from "../backend/IFBUserFilters";
 import { IFSColumn } from "../common/IFSColumn";
@@ -15,7 +14,6 @@ import { IFilterBuilderSettings } from "./IFilterBuilderSettings";
  * Structure for the configuration of the Filter Builder
  */
 export interface IFilterBuilderConfig {
-    i18n?: IResourceI18n;
     datasets?: string[];
     filterData?: IFSData;
     filterLabel?: string;

package/dist/cjs/filters/interfaces/builder/IFilterBuilderGeneralConfig.d.ts

@@ -1,3 +1,4 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
 /**
  * Structure for the Fiter Builder General config
  */
@@ -7,6 +8,6 @@ export interface IFilterBuilderGeneralConfig {
     domain: string;
     qv_token?: string;
     timezoneControl?: string;
-    locale?: string;
+    i18n?: II18nConfig;
     userid: string;
 }

package/dist/cjs/filters/interfaces/panel/IFilterPanelConfig.d.ts

@@ -1,4 +1,4 @@
-import { IResourceI18n } from "../../../globalization";
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
 import { IFilterBuilderConfig } from "../builder/IFilterBuilderConfig";
 import { IFUDataStore } from "../ui/IFUDataStore";
 /**
@@ -6,6 +6,5 @@ import { IFUDataStore } from "../ui/IFUDataStore";
  */
 export interface IFilterPanelConfig extends IFUDataStore {
     filterBuilderConfig?: IFilterBuilderConfig;
-    i18n?: IResourceI18n;
-    locale?: string;
+    i18n?: II18nConfig;
 }

package/dist/cjs/filters/interfaces/ui/IFUTransformFilterValuesSettings.d.ts

@@ -1,6 +1,7 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
 import { II18nServiceTranslate } from "../../../globalization/interfaces/II18nServiceTranslate";
 export interface IFUTransformFilterValuesSettings {
     translate: II18nServiceTranslate;
-    locale: string;
+    i18n: II18nConfig;
     suffixTranslateLabel?: string;
 }

package/dist/cjs/format/localization.d.ts

@@ -1,3 +1,4 @@
 import { IFormatConfig, IFormatOutputFormat } from '../interfaces';
 export declare const getLang: (locale: string | Record<string, any>) => Record<string, any>;
+export declare const chooseLang: (config: Record<string, any>) => string;
 export declare const formatWithLocale: (value: any, outputFormat: IFormatOutputFormat, config?: IFormatConfig) => any;

package/dist/cjs/format/localization.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatWithLocale = exports.getLang = void 0;
+exports.formatWithLocale = exports.chooseLang = exports.getLang = void 0;
 const definition_1 = require("./definition");
 const getLang = (locale) => {
     if (!locale)
@@ -11,6 +11,13 @@ const getLang = (locale) => {
         return { lang: locale === "browser" ? window.navigator.language : locale };
 };
 exports.getLang = getLang;
+const chooseLang = (config) => {
+    var _a, _b;
+    const lang = (((_a = config === null || config === void 0 ? void 0 : config.i18n) === null || _a === void 0 ? void 0 : _a.lang) ||
+        config.lang);
+    return ((_b = lang) === null || _b === void 0 ? void 0 : _b.lang) || lang || definition_1.LANG_DEFAULT;
+};
+exports.chooseLang = chooseLang;
 const formatWithLocale = (value, outputFormat, config = {}) => {
     switch (outputFormat.type) {
         case 'DATE':
@@ -42,10 +49,10 @@ function formatLocaleNumber(value, outputFormat, config) {
     }
 }
 function getLocaleOptions(outputFormat) {
-    const { format, decimals, currency, backup_currency } = outputFormat;
+    const { format, decimals, currency } = outputFormat;
     switch (format) {
         case "Currency" /* CURRENCY */: {
-            const iso = definition_1.currencyISO.find(item => item.text === (currency.text || backup_currency.text));
+            const iso = 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 };
         }
         case "Scientific" /* SCIENTIFIC */: return { style: "decimal" /* DECIMAL */,

package/dist/cjs/globalization/interfaces/II18nConfig.d.ts

@@ -0,0 +1,6 @@
+import { II18nResource } from "./II18nResource";
+export interface II18nConfig {
+    lang?: string;
+    locale?: string;
+    lang_object?: II18nResource;
+}

package/dist/cjs/globalization/interfaces/{IResourceI18n.d.ts → II18nResource.d.ts}

@@ -11,7 +11,7 @@ import { II18nBucketBuilder } from './bucket_builder/II18nBucketBuilder';
 import { II18nCrossTabs } from './cross_tabs';
 import { II18nChartBuilder } from '.';
 import { II18nStyleThemes } from './style_themes/II18nStyleThemes';
-export interface IResourceI18n {
+export interface II18nResource {
     bucket_builder?: II18nBucketBuilder;
     chart_builder?: II18nChartBuilder;
     common?: II18nCommon;

package/dist/cjs/globalization/interfaces/II18nResource.js

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

package/dist/cjs/globalization/interfaces/bucket_builder/II18nBucketBuilderModalBucket.d.ts

@@ -2,4 +2,6 @@ export interface II18nBucketBuilderModalBucket {
     add_bucketed_column: string;
     loading: string;
     title: string;
+    information_text_link: string;
+    information_text_text: string;
 }

package/dist/cjs/globalization/interfaces/formula_builder/II18nFormulaBuilderListModal.d.ts

@@ -2,4 +2,6 @@ export interface II18nFormulaBuilderListModal {
     title_header: string;
     create_button: string;
     empty_message: string;
+    information_text_link: string;
+    information_text_text: string;
 }

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

@@ -10,6 +10,7 @@ export * from './formula_builder/index';
 export * from './panel/index';
 export * from './style_themes/index';
 export * from './table_charts/index';
+export * from './II18nConfig';
+export * from './II18nResource';
 export * from './II18nServiceTranslate';
 export * from './II18nServiceTranslateOption';
-export * from './IResourceI18n';

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

@@ -22,6 +22,7 @@ __exportStar(require("./formula_builder/index"), exports);
 __exportStar(require("./panel/index"), exports);
 __exportStar(require("./style_themes/index"), exports);
 __exportStar(require("./table_charts/index"), exports);
+__exportStar(require("./II18nConfig"), exports);
+__exportStar(require("./II18nResource"), exports);
 __exportStar(require("./II18nServiceTranslate"), exports);
 __exportStar(require("./II18nServiceTranslateOption"), exports);
-__exportStar(require("./IResourceI18n"), exports);

package/dist/cjs/globalization/interfaces/style_themes/II18nStyleThemesTooltips.d.ts

@@ -1,3 +1,4 @@
 export interface II18nStyleThemesTooltips {
     theme_used_in_all_applications: string;
+    theme_will_be_used_in_all_applications: string;
 }

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

@@ -1,2 +1,2 @@
-import { IResourceI18n } from "../interfaces/IResourceI18n";
-export declare const I18N_DEFAULT: IResourceI18n;
+import { II18nResource } from "../interfaces/II18nResource";
+export declare const I18N_DEFAULT: II18nResource;

package/dist/cjs/globalization/labels/bucket_builder/I18N_BUCKET_BUILDER.js

@@ -97,6 +97,8 @@ exports.I18N_BUCKET_BUILDER = {
         loading: 'Loading dependencies...',
         title: 'Buckets',
         add_bucketed_column: 'Add Bucketed Column',
+        information_text_link: 'Learn how to',
+        information_text_text: 'create and work with buckets',
     },
     operator: {
         greater_than: 'Greater than',

package/dist/cjs/globalization/labels/formula_builder/I18N_FORMULA_BUILDER.js

@@ -5,7 +5,9 @@ exports.I18N_FORMULA_BUILDER = {
     list_modal: {
         title_header: 'Formulas',
         create_button: 'Create Formula',
-        empty_message: 'No Formulas Yet'
+        empty_message: 'No Formulas Yet',
+        information_text_link: 'Learn how to',
+        information_text_text: 'create and work with formulas',
     },
     list_table: {
         name: 'Formula Name',

package/dist/cjs/globalization/labels/style_themes/I18N_STYLE_THEMES.js

@@ -53,5 +53,6 @@ exports.I18N_STYLE_THEMES = {
     title: 'Style Themes',
     tooltips: {
         theme_used_in_all_applications: 'This theme is being used in all applications',
+        theme_will_be_used_in_all_applications: 'This theme will be used in all applications'
     }
 };

package/dist/cjs/globalization/service/i18nextBuilder.d.ts

@@ -1,9 +1,9 @@
-import { IResourceI18n } from "../interfaces";
+import { II18nResource } from '../interfaces/II18nResource';
 import { II18nServiceTranslateOption } from "../interfaces/II18nServiceTranslateOption";
 export declare class I18nServiceBuilder {
-    static buildI18n(i18nDefault: IResourceI18n, i18nResource: IResourceI18n): Promise<I18nService>;
+    static buildI18n(i18nDefault: II18nResource, i18nResource: II18nResource): Promise<I18nService>;
     private static _initI18n;
-    static setTranslations(i18nDefault: any, i18nResource: IResourceI18n): IResourceI18n;
+    static setTranslations(i18nDefault: any, i18nResource: II18nResource): II18nResource;
 }
 export declare abstract class I18nService {
     abstract translate(key: string, options?: II18nServiceTranslateOption): string;

package/dist/cjs/globalization/service/initI18n.d.ts

@@ -1,3 +1,3 @@
-import { IResourceI18n } from "../interfaces";
+import { II18nResource } from "../interfaces/II18nResource";
 import { I18nService } from "../service/i18nextBuilder";
-export declare function initI18n(i18nConfig?: IResourceI18n, i18nDefault?: IResourceI18n): Promise<I18nService>;
+export declare function initI18n(i18nConfig?: II18nResource, i18nDefault?: II18nResource): Promise<I18nService>;

package/dist/cjs/qrvey/helpers/transformValue.js

@@ -42,5 +42,6 @@ function getOutputFormat(settings) {
  * @returns the format config
  */
 function getFormatConfig(settings) {
-    return { lang: settings.locale };
+    var _a;
+    return { lang: (_a = settings.i18n) === null || _a === void 0 ? void 0 : _a.lang };
 }

package/dist/cjs/qrvey/interfaces/ITransformValueSettings.d.ts

@@ -1,10 +1,11 @@
 import { IColumn } from "../../columns/interfaces/IColumn";
 import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
+import { II18nConfig } from "../../globalization/interfaces/II18nConfig";
 import { II18nServiceTranslate } from "../../globalization/interfaces/II18nServiceTranslate";
 export interface ITransformValueSettings {
     column: IColumn;
     property: IColumnPropertyType;
     translate: II18nServiceTranslate;
-    locale: string;
+    i18n: II18nConfig;
     suffixTranslateLabel?: string;
 }

package/dist/cjs/services/api/getDatasetColumns.api.js

@@ -7,7 +7,6 @@ exports.getDatasetColumns = void 0;
 const CHART_ENDPOINT_1 = require("../constants/CHART_ENDPOINT");
 const Request_1 = __importDefault(require("../helpers/Request"));
 const BDatasetsToUIDatasets_adapter_1 = require("../adapters/BDatasetsToUIDatasets.adapter");
-const definition_1 = require("../../format/definition");
 const __1 = require("../..");
 /**
    * Get a dataset by Qrvey ID
@@ -15,8 +14,7 @@ const __1 = require("../..");
    * @returns a promise
    */
 function getDatasetColumns(config, qrveyid) {
-    var _a;
-    const lang = (0, __1.getLang)(config.lang || ((_a = config.locale) === null || _a === void 0 ? void 0 : _a.lang) || config.locale || definition_1.LANG_DEFAULT).lang;
+    const lang = (0, __1.chooseLang)(config);
     return Request_1.default.post(Object.assign(Object.assign({}, config), { qrveyid, endpoint: CHART_ENDPOINT_1.CHART_ENDPOINT }), '/question/list', {
         'optionsAttributes': ['id', 'text', 'type', 'property', 'linked', 'linkid', 'qrveyid', 'bucketId', 'formulaId', 'formulaType', 'geogroup', 'outputFormat'],
         'extend': true

package/dist/filters/helpers/builder/getFilterBuilderGeneralConfig.js

@@ -9,7 +9,7 @@ export function getFilterBuilderGeneralConfig(config = {}) {
         apiKey: getAttribute(config, 'api_key') || config.apiKey,
         appid: getAttribute(config, 'app_id') || config.appid,
         domain: config.domain,
-        locale: config.locale,
+        i18n: config.i18n,
         qv_token: config.qv_token,
         timezoneControl: getAttribute(config, 'timezone_control') || config.timezoneControl,
         userid: getAttribute(config, 'user_id') || config.userid,

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

@@ -42,7 +42,7 @@ export function getUIValues(filter, settings) {
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
             return [{
-                    value: FILTER_VALIDATOR_INFO[filter.validator].label,
+                    value: (settings === null || settings === void 0 ? void 0 : settings.translate) ? settings.translate('filter.validators.' + filter.validator.toLowerCase() + '_label') : FILTER_VALIDATOR_INFO[filter.validator].label,
                     enabled: settings.addEnableds ? (_a = filter.values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
                 }];
         case FILTER_VALIDATOR.IN:

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

@@ -1,4 +1,3 @@
-import { IResourceI18n } from "../../../globalization/interfaces/IResourceI18n";
 import { IFBLogic } from "../backend/IFBLogic";
 import { IFBUserFilters } from "../backend/IFBUserFilters";
 import { IFSColumn } from "../common/IFSColumn";
@@ -15,7 +14,6 @@ import { IFilterBuilderSettings } from "./IFilterBuilderSettings";
  * Structure for the configuration of the Filter Builder
  */
 export interface IFilterBuilderConfig {
-    i18n?: IResourceI18n;
     datasets?: string[];
     filterData?: IFSData;
     filterLabel?: string;

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

@@ -1,3 +1,4 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
 /**
  * Structure for the Fiter Builder General config
  */
@@ -7,6 +8,6 @@ export interface IFilterBuilderGeneralConfig {
     domain: string;
     qv_token?: string;
     timezoneControl?: string;
-    locale?: string;
+    i18n?: II18nConfig;
     userid: string;
 }

package/dist/filters/interfaces/panel/IFilterPanelConfig.d.ts

@@ -1,4 +1,4 @@
-import { IResourceI18n } from "../../../globalization";
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
 import { IFilterBuilderConfig } from "../builder/IFilterBuilderConfig";
 import { IFUDataStore } from "../ui/IFUDataStore";
 /**
@@ -6,6 +6,5 @@ import { IFUDataStore } from "../ui/IFUDataStore";
  */
 export interface IFilterPanelConfig extends IFUDataStore {
     filterBuilderConfig?: IFilterBuilderConfig;
-    i18n?: IResourceI18n;
-    locale?: string;
+    i18n?: II18nConfig;
 }

package/dist/filters/interfaces/ui/IFUTransformFilterValuesSettings.d.ts

@@ -1,6 +1,7 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
 import { II18nServiceTranslate } from "../../../globalization/interfaces/II18nServiceTranslate";
 export interface IFUTransformFilterValuesSettings {
     translate: II18nServiceTranslate;
-    locale: string;
+    i18n: II18nConfig;
     suffixTranslateLabel?: string;
 }

package/dist/format/localization.d.ts

@@ -1,3 +1,4 @@
 import { IFormatConfig, IFormatOutputFormat } from '../interfaces';
 export declare const getLang: (locale: string | Record<string, any>) => Record<string, any>;
+export declare const chooseLang: (config: Record<string, any>) => string;
 export declare const formatWithLocale: (value: any, outputFormat: IFormatOutputFormat, config?: IFormatConfig) => any;

package/dist/format/localization.js

@@ -7,6 +7,12 @@ export const getLang = (locale) => {
     else
         return { lang: locale === "browser" ? window.navigator.language : locale };
 };
+export const chooseLang = (config) => {
+    var _a, _b;
+    const lang = (((_a = config === null || config === void 0 ? void 0 : config.i18n) === null || _a === void 0 ? void 0 : _a.lang) ||
+        config.lang);
+    return ((_b = lang) === null || _b === void 0 ? void 0 : _b.lang) || lang || LANG_DEFAULT;
+};
 export const formatWithLocale = (value, outputFormat, config = {}) => {
     switch (outputFormat.type) {
         case 'DATE':
@@ -37,10 +43,10 @@ function formatLocaleNumber(value, outputFormat, config) {
     }
 }
 function getLocaleOptions(outputFormat) {
-    const { format, decimals, currency, backup_currency } = outputFormat;
+    const { format, decimals, currency } = outputFormat;
     switch (format) {
         case "Currency" /* CURRENCY */: {
-            const iso = currencyISO.find(item => item.text === (currency.text || backup_currency.text));
+            const iso = currencyISO.find(item => (item.text === currency.text) || (item.text.includes(currency.label)));
             return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0 };
         }
         case "Scientific" /* SCIENTIFIC */: return { style: "decimal" /* DECIMAL */,

package/dist/globalization/interfaces/II18nConfig.d.ts

@@ -0,0 +1,6 @@
+import { II18nResource } from "./II18nResource";
+export interface II18nConfig {
+    lang?: string;
+    locale?: string;
+    lang_object?: II18nResource;
+}

package/dist/globalization/interfaces/{IResourceI18n.d.ts → II18nResource.d.ts}

@@ -11,7 +11,7 @@ import { II18nBucketBuilder } from './bucket_builder/II18nBucketBuilder';
 import { II18nCrossTabs } from './cross_tabs';
 import { II18nChartBuilder } from '.';
 import { II18nStyleThemes } from './style_themes/II18nStyleThemes';
-export interface IResourceI18n {
+export interface II18nResource {
     bucket_builder?: II18nBucketBuilder;
     chart_builder?: II18nChartBuilder;
     common?: II18nCommon;

package/dist/globalization/interfaces/II18nResource.js

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

package/dist/globalization/interfaces/bucket_builder/II18nBucketBuilderModalBucket.d.ts

@@ -2,4 +2,6 @@ export interface II18nBucketBuilderModalBucket {
     add_bucketed_column: string;
     loading: string;
     title: string;
+    information_text_link: string;
+    information_text_text: string;
 }

package/dist/globalization/interfaces/formula_builder/II18nFormulaBuilderListModal.d.ts

@@ -2,4 +2,6 @@ export interface II18nFormulaBuilderListModal {
     title_header: string;
     create_button: string;
     empty_message: string;
+    information_text_link: string;
+    information_text_text: string;
 }

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

@@ -10,6 +10,7 @@ export * from './formula_builder/index';
 export * from './panel/index';
 export * from './style_themes/index';
 export * from './table_charts/index';
+export * from './II18nConfig';
+export * from './II18nResource';
 export * from './II18nServiceTranslate';
 export * from './II18nServiceTranslateOption';
-export * from './IResourceI18n';

package/dist/globalization/interfaces/index.js

@@ -10,6 +10,7 @@ export * from './formula_builder/index';
 export * from './panel/index';
 export * from './style_themes/index';
 export * from './table_charts/index';
+export * from './II18nConfig';
+export * from './II18nResource';
 export * from './II18nServiceTranslate';
 export * from './II18nServiceTranslateOption';
-export * from './IResourceI18n';

package/dist/globalization/interfaces/style_themes/II18nStyleThemesTooltips.d.ts

@@ -1,3 +1,4 @@
 export interface II18nStyleThemesTooltips {
     theme_used_in_all_applications: string;
+    theme_will_be_used_in_all_applications: string;
 }

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

@@ -1,2 +1,2 @@
-import { IResourceI18n } from "../interfaces/IResourceI18n";
-export declare const I18N_DEFAULT: IResourceI18n;
+import { II18nResource } from "../interfaces/II18nResource";
+export declare const I18N_DEFAULT: II18nResource;

package/dist/globalization/labels/bucket_builder/I18N_BUCKET_BUILDER.js

@@ -94,6 +94,8 @@ export const I18N_BUCKET_BUILDER = {
         loading: 'Loading dependencies...',
         title: 'Buckets',
         add_bucketed_column: 'Add Bucketed Column',
+        information_text_link: 'Learn how to',
+        information_text_text: 'create and work with buckets',
     },
     operator: {
         greater_than: 'Greater than',

package/dist/globalization/labels/formula_builder/I18N_FORMULA_BUILDER.js

@@ -2,7 +2,9 @@ export const I18N_FORMULA_BUILDER = {
     list_modal: {
         title_header: 'Formulas',
         create_button: 'Create Formula',
-        empty_message: 'No Formulas Yet'
+        empty_message: 'No Formulas Yet',
+        information_text_link: 'Learn how to',
+        information_text_text: 'create and work with formulas',
     },
     list_table: {
         name: 'Formula Name',

package/dist/globalization/labels/style_themes/I18N_STYLE_THEMES.js

@@ -50,5 +50,6 @@ export const I18N_STYLE_THEMES = {
     title: 'Style Themes',
     tooltips: {
         theme_used_in_all_applications: 'This theme is being used in all applications',
+        theme_will_be_used_in_all_applications: 'This theme will be used in all applications'
     }
 };

package/dist/globalization/service/i18nextBuilder.d.ts

@@ -1,9 +1,9 @@
-import { IResourceI18n } from "../interfaces";
+import { II18nResource } from '../interfaces/II18nResource';
 import { II18nServiceTranslateOption } from "../interfaces/II18nServiceTranslateOption";
 export declare class I18nServiceBuilder {
-    static buildI18n(i18nDefault: IResourceI18n, i18nResource: IResourceI18n): Promise<I18nService>;
+    static buildI18n(i18nDefault: II18nResource, i18nResource: II18nResource): Promise<I18nService>;
     private static _initI18n;
-    static setTranslations(i18nDefault: any, i18nResource: IResourceI18n): IResourceI18n;
+    static setTranslations(i18nDefault: any, i18nResource: II18nResource): II18nResource;
 }
 export declare abstract class I18nService {
     abstract translate(key: string, options?: II18nServiceTranslateOption): string;

package/dist/globalization/service/initI18n.d.ts

@@ -1,3 +1,3 @@
-import { IResourceI18n } from "../interfaces";
+import { II18nResource } from "../interfaces/II18nResource";
 import { I18nService } from "../service/i18nextBuilder";
-export declare function initI18n(i18nConfig?: IResourceI18n, i18nDefault?: IResourceI18n): Promise<I18nService>;
+export declare function initI18n(i18nConfig?: II18nResource, i18nDefault?: II18nResource): Promise<I18nService>;

package/dist/qrvey/helpers/transformValue.js

@@ -38,5 +38,6 @@ function getOutputFormat(settings) {
  * @returns the format config
  */
 function getFormatConfig(settings) {
-    return { lang: settings.locale };
+    var _a;
+    return { lang: (_a = settings.i18n) === null || _a === void 0 ? void 0 : _a.lang };
 }

package/dist/qrvey/interfaces/ITransformValueSettings.d.ts

@@ -1,10 +1,11 @@
 import { IColumn } from "../../columns/interfaces/IColumn";
 import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
+import { II18nConfig } from "../../globalization/interfaces/II18nConfig";
 import { II18nServiceTranslate } from "../../globalization/interfaces/II18nServiceTranslate";
 export interface ITransformValueSettings {
     column: IColumn;
     property: IColumnPropertyType;
     translate: II18nServiceTranslate;
-    locale: string;
+    i18n: II18nConfig;
     suffixTranslateLabel?: string;
 }

package/dist/services/api/getDatasetColumns.api.js

@@ -1,16 +1,14 @@
 import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
 import Request from "../helpers/Request";
 import { BDatasetsToUIDatasets } from "../adapters/BDatasetsToUIDatasets.adapter";
-import { LANG_DEFAULT } from "../../format/definition";
-import { getLang } from "../..";
+import { chooseLang } from "../..";
 /**
    * Get a dataset by Qrvey ID
    * @param qrveyid The Qrvey ID
    * @returns a promise
    */
 export function getDatasetColumns(config, qrveyid) {
-    var _a;
-    const lang = getLang(config.lang || ((_a = config.locale) === null || _a === void 0 ? void 0 : _a.lang) || config.locale || LANG_DEFAULT).lang;
+    const lang = chooseLang(config);
     return Request.post(Object.assign(Object.assign({}, config), { qrveyid, endpoint: CHART_ENDPOINT }), '/question/list', {
         'optionsAttributes': ['id', 'text', 'type', 'property', 'linked', 'linkid', 'qrveyid', 'bucketId', 'formulaId', 'formulaType', 'geogroup', 'outputFormat'],
         'extend': true

package/package.json

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

package/src/filters/helpers/builder/getFilterBuilderGeneralConfig.ts

@@ -11,7 +11,7 @@ export function getFilterBuilderGeneralConfig(config: any = {}): IFilterBuilderG
         apiKey: getAttribute(config, 'api_key') || config.apiKey,
         appid: getAttribute(config, 'app_id') || config.appid,
         domain: config.domain,
-        locale: config.locale,
+        i18n: config.i18n,
         qv_token: config.qv_token,
         timezoneControl: getAttribute(config, 'timezone_control') || config.timezoneControl,
         userid: getAttribute(config, 'user_id') || config.userid,

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

@@ -49,7 +49,7 @@ export function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): I
         case FILTER_VALIDATOR.IS_NULL:
         case FILTER_VALIDATOR.IS_NOT_NULL:
             return [{
-                value: FILTER_VALIDATOR_INFO[filter.validator].label,
+                value: settings?.translate ? settings.translate('filter.validators.' + filter.validator.toLowerCase() + '_label') : FILTER_VALIDATOR_INFO[filter.validator].label,
                 enabled: settings.addEnableds ? (filter.values as IFSValue[])[0]?.enabled : undefined,
             }];
         case FILTER_VALIDATOR.IN:

package/src/filters/interfaces/builder/IFilterBuilderConfig.ts

@@ -1,4 +1,3 @@
-import { IResourceI18n } from "../../../globalization/interfaces/IResourceI18n";
 import { IFBLogic } from "../backend/IFBLogic";
 import { IFBUserFilters } from "../backend/IFBUserFilters";
 import { IFSColumn } from "../common/IFSColumn";
@@ -16,7 +15,6 @@ import { IFilterBuilderSettings } from "./IFilterBuilderSettings";
  * Structure for the configuration of the Filter Builder
  */
 export interface IFilterBuilderConfig {
-    i18n?: IResourceI18n; // Globalization object
     datasets?: string[]; // Qrvey IDs for displaying their columns in the colum selector. No qrveyids, the column list is not render
     filterData?: IFSData; // The Filter Data structure
     filterLabel?: string; // A label for the filter. If filterLabel is provided the old filterLabel is replaced by the new one

package/src/filters/interfaces/builder/IFilterBuilderGeneralConfig.ts

@@ -1,3 +1,5 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
+
 /**
  * Structure for the Fiter Builder General config
  */
@@ -7,6 +9,6 @@ export interface IFilterBuilderGeneralConfig {
     domain: string; // The domain of the environment
     qv_token?: string; // Qrvey Token for RLS
     timezoneControl?: string; // Offset number for Timezone
-    locale?: string; // Localization setting
+    i18n?: II18nConfig; // The i18n configuration;
     userid: string; // User ID
 }

package/src/filters/interfaces/panel/IFilterPanelConfig.ts

@@ -1,4 +1,4 @@
-import { IResourceI18n } from "../../../globalization";
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
 import { IFilterBuilderConfig } from "../builder/IFilterBuilderConfig";
 import { IFUDataStore } from "../ui/IFUDataStore";
 
@@ -7,6 +7,5 @@ import { IFUDataStore } from "../ui/IFUDataStore";
  */
 export interface IFilterPanelConfig extends IFUDataStore {
     filterBuilderConfig?: IFilterBuilderConfig; // Filter Builder config object
-    i18n?: IResourceI18n;
-    locale?: string; // Localization setting
+    i18n?: II18nConfig; // The i18n configuration;
 }

package/src/filters/interfaces/ui/IFUTransformFilterValuesSettings.ts

@@ -1,7 +1,8 @@
+import { II18nConfig } from "../../../globalization/interfaces/II18nConfig";
 import { II18nServiceTranslate } from "../../../globalization/interfaces/II18nServiceTranslate";
 
 export interface IFUTransformFilterValuesSettings {
     translate: II18nServiceTranslate; // Function for getting translations
-    locale: string; // The locale string
+    i18n: II18nConfig; // I18n configuration
     suffixTranslateLabel?: string // The i18n label for the suffix values.
 }

package/src/format/localization.ts

@@ -7,6 +7,14 @@ export const getLang = (locale: string | Record<string, any>) => {
     else return { lang: locale === "browser" ? window.navigator.language : locale };
 };
 
+export const chooseLang = (config: Record<string, any>): string => {
+    const lang: string | Record<string, any> = (
+        config?.i18n?.lang ||
+        config.lang
+    );
+    return (<any>lang)?.lang || lang || LANG_DEFAULT;
+};
+
 export const formatWithLocale = (value: any, outputFormat: IFormatOutputFormat, config: IFormatConfig = {}): any => {
     switch (outputFormat.type) {
       case 'DATE':
@@ -38,10 +46,10 @@ function formatLocaleNumber(value: any, outputFormat: IFormatOutputFormat, confi
 }
 
 function getLocaleOptions(outputFormat: IFormatOutputFormat) {
-    const { format, decimals, currency, backup_currency } = outputFormat;
+    const { format, decimals, currency } = outputFormat;
     switch(format) {
         case LOCALE_FORMATS.CURRENCY: {
-            const iso = currencyISO.find(item => item.text === (currency.text || backup_currency.text));
+            const iso = currencyISO.find(item => (item.text === currency.text) || (item.text.includes(currency.label)));
             return { style: LOCALE_STYLES.CURRENCY, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0 };
         }
         case LOCALE_FORMATS.SCIENTIFIC: return { style: LOCALE_STYLES.DECIMAL,

package/src/globalization/interfaces/II18nConfig.ts

@@ -0,0 +1,7 @@
+import { II18nResource } from "./II18nResource";
+
+export interface II18nConfig {
+    lang?: string; // Language format for getting stored traslations of the labels (en-US)
+    locale?: string; // Language format for transform number and date values (en-US)
+    lang_object?: II18nResource; // Oject Structure to translate labels
+}

package/src/globalization/interfaces/{IResourceI18n.ts → II18nResource.ts}

@@ -12,7 +12,7 @@ import { II18nCrossTabs } from './cross_tabs';
 import { II18nChartBuilder } from '.';
 import { II18nStyleThemes } from './style_themes/II18nStyleThemes';
 
-export interface IResourceI18n {
+export interface II18nResource {
     bucket_builder?: II18nBucketBuilder;
     chart_builder?: II18nChartBuilder;
     common?: II18nCommon;

package/src/globalization/interfaces/bucket_builder/II18nBucketBuilderModalBucket.ts

@@ -2,4 +2,6 @@ export interface II18nBucketBuilderModalBucket {
     add_bucketed_column: string;
     loading: string;
     title: string;
+    information_text_link: string,
+    information_text_text: string,
 }

package/src/globalization/interfaces/formula_builder/II18nFormulaBuilderListModal.ts

@@ -1,5 +1,7 @@
 export interface II18nFormulaBuilderListModal {
     title_header: string,
     create_button: string,
-    empty_message: string
+    empty_message: string,
+    information_text_link: string,
+    information_text_text: string
 }

package/src/globalization/interfaces/index.ts

@@ -11,6 +11,7 @@ export * from './panel/index';
 export * from './style_themes/index';
 export * from './table_charts/index';
 
+export * from './II18nConfig';
+export * from './II18nResource';
 export * from './II18nServiceTranslate';
 export * from './II18nServiceTranslateOption';
-export * from './IResourceI18n';

package/src/globalization/interfaces/style_themes/II18nStyleThemesTooltips.ts

@@ -1,3 +1,4 @@
 export interface II18nStyleThemesTooltips {
     theme_used_in_all_applications: string;
+    theme_will_be_used_in_all_applications: string;
 }

package/src/globalization/labels/I18N_DEFAULT.ts

@@ -1,4 +1,4 @@
-import { IResourceI18n } from "../interfaces/IResourceI18n";
+import { II18nResource } from "../interfaces/II18nResource";
 import { I18N_DASHBOARD } from "./dashboard/I18N_DASHBOARD";
 import { I18N_PANEL } from "./panel/I18N_PANEL";
 import { I18N_FILTER } from "./filters/I18N_FILTER";
@@ -14,7 +14,7 @@ import { I18N_CHART_BUILDER } from "./chart_builder";
 import { I18N_STYLE_THEMES } from "./style_themes";
 
 
-export const I18N_DEFAULT: IResourceI18n = {
+export const I18N_DEFAULT: II18nResource = {
     bucket_builder: I18N_BUCKET_BUILDER,
     chart_builder: I18N_CHART_BUILDER,
     common: I18N_COMMON,

package/src/globalization/labels/bucket_builder/I18N_BUCKET_BUILDER.ts

@@ -96,6 +96,8 @@ export const I18N_BUCKET_BUILDER: II18nBucketBuilder = {
     loading: 'Loading dependencies...',
     title: 'Buckets',
     add_bucketed_column: 'Add Bucketed Column',
+    information_text_link: 'Learn how to',
+    information_text_text: 'create and work with buckets',
   },
   operator: {
     greater_than: 'Greater than',

package/src/globalization/labels/formula_builder/I18N_FORMULA_BUILDER.ts

@@ -4,7 +4,9 @@ export const I18N_FORMULA_BUILDER: II18nFormulaBuilder = {
     list_modal: {
         title_header: 'Formulas',
         create_button: 'Create Formula',
-        empty_message: 'No Formulas Yet'
+        empty_message: 'No Formulas Yet',
+        information_text_link: 'Learn how to',
+        information_text_text: 'create and work with formulas',
     },
     list_table: {
         name: 'Formula Name',

package/src/globalization/labels/style_themes/I18N_STYLE_THEMES.ts

@@ -52,5 +52,6 @@ export const I18N_STYLE_THEMES: II18nStyleThemes = {
     title: 'Style Themes',
     tooltips: {
       theme_used_in_all_applications: 'This theme is being used in all applications',
+      theme_will_be_used_in_all_applications: 'This theme will be used in all applications'
     }
   };

package/src/globalization/service/i18nextBuilder.ts

@@ -1,15 +1,15 @@
-import { IResourceI18n } from "../interfaces";
 import i18next from 'i18next';
 import { mergeDeep } from "../../general/object/mergeDeep";
+import { II18nResource } from '../interfaces/II18nResource';
 import { II18nServiceTranslateOption } from "../interfaces/II18nServiceTranslateOption";
 
 export class I18nServiceBuilder {
 
-  public static async buildI18n(i18nDefault: IResourceI18n, i18nResource: IResourceI18n): Promise<I18nService> {
+  public static async buildI18n(i18nDefault: II18nResource, i18nResource: II18nResource): Promise<I18nService> {
     return await this._initI18n(i18nDefault, i18nResource);
   }
 
-  private static async _initI18n(i18nDefault: IResourceI18n, i18nResource: IResourceI18n): Promise<I18nService> {
+  private static async _initI18n(i18nDefault: II18nResource, i18nResource: II18nResource): Promise<I18nService> {
     
     if (!i18next.isInitialized) {
       await i18next
@@ -30,7 +30,7 @@ export class I18nServiceBuilder {
     return new I18nServiceConcrete(i18next);
   }
 
-  public static  setTranslations(i18nDefault, i18nResource: IResourceI18n): IResourceI18n {
+  public static  setTranslations(i18nDefault, i18nResource: II18nResource): II18nResource {
     return mergeDeep(i18nResource, i18nDefault, { mergeExistingValues: false });
   }
 }

package/src/globalization/service/initI18n.ts

@@ -1,6 +1,6 @@
-import { IResourceI18n } from "../interfaces";
+import { II18nResource } from "../interfaces/II18nResource";
 import { I18nService, I18nServiceBuilder } from "../service/i18nextBuilder";
 
-export async function initI18n(i18nConfig: IResourceI18n = {}, i18nDefault: IResourceI18n = {}): Promise<I18nService> {
+export async function initI18n(i18nConfig: II18nResource = {}, i18nDefault: II18nResource = {}): Promise<I18nService> {
     return await I18nServiceBuilder.buildI18n(i18nDefault, i18nConfig);
-}
+}

package/src/qrvey/helpers/transformValue.ts

@@ -43,5 +43,5 @@ function getOutputFormat(settings: ITransformValueSettings) {
  * @returns the format config
  */
 function getFormatConfig(settings: ITransformValueSettings) {
-    return { lang: settings.locale };
+    return { lang: settings.i18n?.lang };
 }

package/src/qrvey/interfaces/ITransformValueSettings.ts

@@ -1,5 +1,6 @@
 import { IColumn } from "../../columns/interfaces/IColumn";
 import { IColumnPropertyType } from "../../columns/interfaces/IColumnPropertyType";
+import { II18nConfig } from "../../globalization/interfaces/II18nConfig";
 import { II18nServiceTranslate } from "../../globalization/interfaces/II18nServiceTranslate";
 
 export interface ITransformValueSettings {
@@ -7,6 +8,6 @@ export interface ITransformValueSettings {
     property: IColumnPropertyType;
 
     translate: II18nServiceTranslate; // Function for getting translations
-    locale: string; // The locale string
+    i18n: II18nConfig; // The i18n configuration;
     suffixTranslateLabel?: string // The i18n label for the suffix values.
 }

package/src/services/api/getDatasetColumns.api.ts

@@ -3,8 +3,7 @@ import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
 import Request from "../helpers/Request";
 import { BDatasetsToUIDatasets } from "../adapters/BDatasetsToUIDatasets.adapter";
-import { LANG_DEFAULT } from "../../format/definition";
-import { getLang } from "../..";
+import { chooseLang } from "../..";
 
 /**
    * Get a dataset by Qrvey ID
@@ -12,7 +11,7 @@ import { getLang } from "../..";
    * @returns a promise
    */
 export function getDatasetColumns(config: IGeneralWidgetConfig, qrveyid?: string): Promise<IDataset[]> {
-    const lang = getLang(config.lang || (<any>config.locale)?.lang || config.locale || LANG_DEFAULT).lang;
+    const lang = chooseLang(config);
     return Request.post({ ...config, qrveyid, endpoint: CHART_ENDPOINT }, '/question/list', {
       'optionsAttributes': ['id', 'text', 'type', 'property', 'linked', 'linkid', 'qrveyid', 'bucketId', 'formulaId', 'formulaType', 'geogroup', 'outputFormat'],
       'extend': true