@qrvey/utils 1.2.9-21 → 1.2.9-24

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/dates/constants/DATETIME_COLUMN_FORMAT.d.ts

@@ -0,0 +1 @@
+export declare const DATETIME_COLUMN_FORMAT: string[];

package/dist/cjs/dates/constants/DATETIME_COLUMN_FORMAT.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DATETIME_COLUMN_FORMAT = void 0;
+exports.DATETIME_COLUMN_FORMAT = [
+    'MM/DD/YYYY HH24:MM:SS',
+    'DD/MM/YYYY HH24:MM:SS',
+    'YYYY-MM-DD HH24:MM:SS',
+    'MM/DD/YYYY HH24:MI:SS',
+    'DD/MM/YYYY HH24:MI:SS',
+    'YYYY-MM-DD HH24:MI:SS'
+];

package/dist/cjs/dates/constants/index.d.ts

@@ -32,3 +32,4 @@ export * from './DATE_YEAR_MONTHS';
 export * from './DATE_YEAR_MONTHS_MMMM';
 export * from './DATE_YEAR_QUARTERS';
 export * from './DATE_YEAR_QUARTERS_RANGE';
+export * from './DATETIME_COLUMN_FORMAT';

package/dist/cjs/dates/constants/index.js

@@ -44,3 +44,4 @@ __exportStar(require("./DATE_YEAR_MONTHS"), exports);
 __exportStar(require("./DATE_YEAR_MONTHS_MMMM"), exports);
 __exportStar(require("./DATE_YEAR_QUARTERS"), exports);
 __exportStar(require("./DATE_YEAR_QUARTERS_RANGE"), exports);
+__exportStar(require("./DATETIME_COLUMN_FORMAT"), exports);

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

@@ -19,12 +19,26 @@ export declare const enum LOCALE_FORMATS {
     DECIMAL = "Decimal",
     CURRENCY = "Currency",
     PERCENTAGE = "Percentage",
-    SCIENTIFIC = "Scientific"
+    SCIENTIFIC = "Scientific",
+    ABBREVIATED = "Abbreviated"
 }
 export declare const enum LOCALE_STYLES {
     DECIMAL = "decimal",
     PERCENT = "percent",
     CURRENCY = "currency",
-    SCIENTIFIC = "scientific"
+    SCIENTIFIC = "scientific",
+    COMPACT = "compact"
 }
 export declare const LANG_DEFAULT = "en-US";
+export declare const CURRENCY_DEFAULT: {
+    text: string;
+    label: string;
+};
+export declare const DATETIME_OPTIONS: {
+    year: string;
+    month: string;
+    day: string;
+    hour: string;
+    minute: string;
+    second: string;
+};

package/dist/cjs/format/definition.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LANG_DEFAULT = exports.currencyISO = exports.isTextColumn = exports.supportNumericFormatting = exports.isNumericalColumn = exports.isComplexColumn = exports.hasfileSizeProperty = exports.appliesFormatting = exports.DATEGROUP_FORMATTING_UNSUPPORT = exports.QUESTION_FORMAT_SUPPORT = exports.numericalFields = exports.complexFields = exports.textFields = void 0;
+exports.DATETIME_OPTIONS = exports.CURRENCY_DEFAULT = exports.LANG_DEFAULT = exports.currencyISO = exports.isTextColumn = exports.supportNumericFormatting = exports.isNumericalColumn = exports.isComplexColumn = exports.hasfileSizeProperty = exports.appliesFormatting = exports.DATEGROUP_FORMATTING_UNSUPPORT = exports.QUESTION_FORMAT_SUPPORT = exports.numericalFields = exports.complexFields = exports.textFields = void 0;
 const COLUMN_1 = require("../columns/constants/COLUMN");
 const Charts_Const_1 = require("../constants/Charts.Const");
 exports.textFields = [COLUMN_1.COLUMN.TEXTFIELD, COLUMN_1.COLUMN.TEXT_CATEGORY, COLUMN_1.COLUMN.TEXT_LABEL, COLUMN_1.COLUMN.TEXT_CATEGORY];
@@ -82,3 +82,5 @@ exports.currencyISO = [
     { text: 'RM (MYR)', label: 'MYR' }
 ];
 exports.LANG_DEFAULT = 'en-US';
+exports.CURRENCY_DEFAULT = { text: '$ (USD)', label: 'USD' };
+exports.DATETIME_OPTIONS = { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' };

package/dist/cjs/format/format.js

@@ -93,7 +93,7 @@ const addFormat = (value, outputFormat = 'None', config) => {
             return (config === null || config === void 0 ? void 0 : config.lang) && outputFormat.format === 'Default' ? (0, localization_1.formatWithLocale)(value, outputFormat, config) : formatDate(value, outputFormat.format);
         case 'NUMERIC': {
             const parse = parseFloat(value);
-            const withLocale = outputFormat.format !== 'Abbreviated' && outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);
+            const withLocale = outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);
             return isNaN(parse) ? value : withLocale ? (0, localization_1.formatWithLocale)(value, outputFormat, config)
                 : formatNumber(parse, outputFormat, config);
         }

package/dist/cjs/format/localization.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatWithLocale = exports.chooseLang = exports.getLang = void 0;
+const __1 = require("..");
+const isEmpty_1 = require("../general/mix/isEmpty");
 const definition_1 = require("./definition");
 const getLang = (locale) => {
     if (!locale)
@@ -22,20 +24,26 @@ const formatWithLocale = (value, outputFormat, config = {}) => {
     switch (outputFormat.type) {
         case 'DATE':
         case 'DATETIME':
-            return formatLocaleDate(value, config);
+            return formatLocaleDate(value, outputFormat, config);
         case 'NUMERIC':
             return formatLocaleNumber(value, outputFormat, config);
     }
 };
 exports.formatWithLocale = formatWithLocale;
-function formatLocaleDate(value, config) {
+function formatLocaleDate(value, outputFormat, config) {
     const { lang = definition_1.LANG_DEFAULT, options } = config;
     const dateParam = new Date(value);
+    let langOpts = options;
+    if (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) {
+        const { format } = outputFormat.originalFormat;
+        if (__1.DATETIME_COLUMN_FORMAT.includes(format))
+            langOpts = definition_1.DATETIME_OPTIONS;
+    }
     try {
-        return new Intl.DateTimeFormat([lang, definition_1.LANG_DEFAULT], options).format(dateParam);
+        return new Intl.DateTimeFormat([lang, definition_1.LANG_DEFAULT], langOpts).format(dateParam);
     }
     catch (error) {
-        return new Intl.DateTimeFormat(definition_1.LANG_DEFAULT, options).format(dateParam);
+        return new Intl.DateTimeFormat(definition_1.LANG_DEFAULT, langOpts).format(dateParam);
     }
 }
 function formatLocaleNumber(value, outputFormat, config) {
@@ -52,12 +60,19 @@ function getLocaleOptions(outputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch (format) {
         case "Currency" /* CURRENCY */: {
-            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 };
+            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 };
-        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/cjs/globalization/interfaces/chart_builder/II18nChartBuilderDimensions.d.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/dist/cjs/globalization/labels/chart_builder/I18N_CHART_BUILDER_GENERAL.js

@@ -79,6 +79,7 @@ exports.I18N_CHART_BUILDER_GENERAL = {
         geolocation: 'Geolocation',
         group: 'Group',
         groups: 'Groups',
+        other_value: 'Other Value',
         other_values: 'Other Values',
         pivot: 'Pivot',
         row: 'Row',

package/dist/cjs/interfaces/format/IFormatOutputFormat.Interface.d.ts

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

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

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

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/dates/constants/DATETIME_COLUMN_FORMAT.d.ts

@@ -0,0 +1 @@
+export declare const DATETIME_COLUMN_FORMAT: string[];

package/dist/dates/constants/DATETIME_COLUMN_FORMAT.js

@@ -0,0 +1,8 @@
+export const DATETIME_COLUMN_FORMAT = [
+    'MM/DD/YYYY HH24:MM:SS',
+    'DD/MM/YYYY HH24:MM:SS',
+    'YYYY-MM-DD HH24:MM:SS',
+    'MM/DD/YYYY HH24:MI:SS',
+    'DD/MM/YYYY HH24:MI:SS',
+    'YYYY-MM-DD HH24:MI:SS'
+];

package/dist/dates/constants/index.d.ts

@@ -32,3 +32,4 @@ export * from './DATE_YEAR_MONTHS';
 export * from './DATE_YEAR_MONTHS_MMMM';
 export * from './DATE_YEAR_QUARTERS';
 export * from './DATE_YEAR_QUARTERS_RANGE';
+export * from './DATETIME_COLUMN_FORMAT';

package/dist/dates/constants/index.js

@@ -32,3 +32,4 @@ export * from './DATE_YEAR_MONTHS';
 export * from './DATE_YEAR_MONTHS_MMMM';
 export * from './DATE_YEAR_QUARTERS';
 export * from './DATE_YEAR_QUARTERS_RANGE';
+export * from './DATETIME_COLUMN_FORMAT';

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

@@ -19,12 +19,26 @@ export declare const enum LOCALE_FORMATS {
     DECIMAL = "Decimal",
     CURRENCY = "Currency",
     PERCENTAGE = "Percentage",
-    SCIENTIFIC = "Scientific"
+    SCIENTIFIC = "Scientific",
+    ABBREVIATED = "Abbreviated"
 }
 export declare const enum LOCALE_STYLES {
     DECIMAL = "decimal",
     PERCENT = "percent",
     CURRENCY = "currency",
-    SCIENTIFIC = "scientific"
+    SCIENTIFIC = "scientific",
+    COMPACT = "compact"
 }
 export declare const LANG_DEFAULT = "en-US";
+export declare const CURRENCY_DEFAULT: {
+    text: string;
+    label: string;
+};
+export declare const DATETIME_OPTIONS: {
+    year: string;
+    month: string;
+    day: string;
+    hour: string;
+    minute: string;
+    second: string;
+};

package/dist/format/definition.js

@@ -73,3 +73,5 @@ export const currencyISO = [
     { text: 'RM (MYR)', label: 'MYR' }
 ];
 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/dist/format/format.js

@@ -84,7 +84,7 @@ export const addFormat = (value, outputFormat = 'None', config) => {
             return (config === null || config === void 0 ? void 0 : 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 === null || config === void 0 ? void 0 : config.lang);
+            const withLocale = outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);
             return isNaN(parse) ? value : withLocale ? formatWithLocale(value, outputFormat, config)
                 : formatNumber(parse, outputFormat, config);
         }

package/dist/format/localization.js

@@ -1,4 +1,6 @@
-import { currencyISO, LANG_DEFAULT } from './definition';
+import { DATETIME_COLUMN_FORMAT } from '..';
+import { isEmpty } from '../general/mix/isEmpty';
+import { currencyISO, LANG_DEFAULT, CURRENCY_DEFAULT, DATETIME_OPTIONS } from './definition';
 export const getLang = (locale) => {
     if (!locale)
         return;
@@ -17,19 +19,25 @@ export const formatWithLocale = (value, outputFormat, config = {}) => {
     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, config) {
+function formatLocaleDate(value, outputFormat, config) {
     const { lang = LANG_DEFAULT, options } = config;
     const dateParam = new Date(value);
+    let langOpts = options;
+    if (outputFormat === null || outputFormat === void 0 ? void 0 : 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);
     }
 }
 function formatLocaleNumber(value, outputFormat, config) {
@@ -46,12 +54,19 @@ function getLocaleOptions(outputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch (format) {
         case "Currency" /* CURRENCY */: {
-            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 };
+            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 };
-        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/globalization/interfaces/chart_builder/II18nChartBuilderDimensions.d.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/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER_GENERAL.js

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

package/dist/interfaces/format/IFormatOutputFormat.Interface.d.ts

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

package/dist/qrvey/helpers/transformValue.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.9-21",
+  "version": "1.2.9-24",
   "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/dates/constants/DATETIME_COLUMN_FORMAT.ts

@@ -0,0 +1,8 @@
+export const DATETIME_COLUMN_FORMAT = [
+    'MM/DD/YYYY HH24:MM:SS',
+    'DD/MM/YYYY HH24:MM:SS',
+    'YYYY-MM-DD HH24:MM:SS',
+    'MM/DD/YYYY HH24:MI:SS',
+    'DD/MM/YYYY HH24:MI:SS',
+    'YYYY-MM-DD HH24:MI:SS'
+];

package/src/dates/constants/index.ts

@@ -40,3 +40,4 @@ export * from './DATE_YEAR_MONTHS';
 export * from './DATE_YEAR_MONTHS_MMMM';
 export * from './DATE_YEAR_QUARTERS';
 export * from './DATE_YEAR_QUARTERS_RANGE';
+export * from './DATETIME_COLUMN_FORMAT';

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,
             },
         },