@qrvey/utils 1.2.9-21 → 1.2.9-24

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/definition.ts

@@ -91,12 +91,17 @@ export const enum LOCALE_FORMATS {
   CURRENCY = 'Currency',
   PERCENTAGE = 'Percentage',
   SCIENTIFIC = 'Scientific',
+  ABBREVIATED = 'Abbreviated'
 }
 export const enum LOCALE_STYLES {
   DECIMAL = 'decimal',
   PERCENT = 'percent',
   CURRENCY = 'currency',
   SCIENTIFIC = 'scientific',
+  COMPACT = 'compact'
 }
 
-export const LANG_DEFAULT = 'en-US';
+export const LANG_DEFAULT = 'en-US';
+export const CURRENCY_DEFAULT = { text: '$ (USD)', label: 'USD' };
+export const DATETIME_OPTIONS = { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' };
+

package/src/format/format.ts

@@ -92,7 +92,7 @@ export const addFormat = (value: any, outputFormat: any = 'None', config?: IForm
       return config?.lang && outputFormat.format === 'Default' ? formatWithLocale(value, outputFormat, config) : formatDate(value, outputFormat.format);
     case 'NUMERIC': {
       const parse = parseFloat(value);
-      const withLocale = outputFormat.format !== 'Abbreviated' && outputFormat !== 'None' && config?.lang;
+      const withLocale = outputFormat !== 'None' && config?.lang;
       return isNaN(parse) ? value : withLocale ? formatWithLocale(value, outputFormat, config)
        : formatNumber(parse, outputFormat, config);
     }

package/src/format/localization.ts

@@ -1,5 +1,7 @@
+import { DATETIME_COLUMN_FORMAT } from '..';
+import { isEmpty } from '../general/mix/isEmpty';
 import { IFormatConfig, IFormatOutputFormat } from '../interfaces';
-import { currencyISO, LOCALE_FORMATS, LOCALE_STYLES, LANG_DEFAULT } from './definition';
+import { currencyISO, LOCALE_FORMATS, LOCALE_STYLES, LANG_DEFAULT, CURRENCY_DEFAULT, DATETIME_OPTIONS } from './definition';
 
 export const getLang = (locale: string | Record<string, any>) => {
     if (!locale) return;
@@ -19,19 +21,24 @@ export const formatWithLocale = (value: any, outputFormat: IFormatOutputFormat,
     switch (outputFormat.type) {
       case 'DATE':
       case 'DATETIME':
-        return formatLocaleDate(value, config);
+        return formatLocaleDate(value, outputFormat, config);
       case 'NUMERIC':
         return formatLocaleNumber(value, outputFormat, config);
     }
 };
 
-function formatLocaleDate(value: any, config: IFormatConfig) {
+function formatLocaleDate(value: any, outputFormat: IFormatOutputFormat, config: IFormatConfig) {
     const { lang = LANG_DEFAULT, options } = config;
     const dateParam = new Date(value);
+    let langOpts = options;
+    if (outputFormat?.originalFormat) {
+        const { format } = outputFormat.originalFormat;
+        if (DATETIME_COLUMN_FORMAT.includes(format)) langOpts = DATETIME_OPTIONS;
+    }
     try {
-        return new Intl.DateTimeFormat([lang, LANG_DEFAULT], options).format(dateParam);
+        return new Intl.DateTimeFormat([lang, LANG_DEFAULT], langOpts).format(dateParam);
     } catch (error) {
-        return new Intl.DateTimeFormat(LANG_DEFAULT, options).format(dateParam);
+        return new Intl.DateTimeFormat(LANG_DEFAULT, langOpts).format(dateParam);
     }
 }
 
@@ -49,12 +56,19 @@ function getLocaleOptions(outputFormat: IFormatOutputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch(format) {
         case LOCALE_FORMATS.CURRENCY: {
-            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 };
+            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 };
-        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 };
     }
 }

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

@@ -8,6 +8,7 @@ export interface II18nChartBuilderDimensions {
     geolocation: string;
     group: string;
     groups: string;
+    other_value: string;
     other_values: string;
     pivot: string;
     row: string;

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

@@ -85,6 +85,7 @@ export const I18N_CHART_BUILDER_GENERAL: Pick<II18nChartBuilder, General> = {
     geolocation: 'Geolocation',
     group: 'Group',
     groups: 'Groups',
+    other_value: 'Other Value',
     other_values: 'Other Values',
     pivot: 'Pivot',
     row: 'Row',

package/src/interfaces/format/IFormatOutputFormat.Interface.ts

@@ -6,4 +6,5 @@ export interface IFormatOutputFormat {
     decimals?: number;
     currency?: IFormatCurrency;
     backup_currency?: IFormatCurrency;
-}
+    originalFormat?: any;
+}

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.i18n?.lang };
+    return { lang: settings.i18n?.locale };
 }