@qrvey/utils 1.2.9-15 → 1.2.9-19

package/src/globalization/helpers/getI18nCalendar.ts

@@ -0,0 +1,68 @@
+import { II18nCalendarProperties } from "../interfaces/calendar/II18nCalendarProperties";
+import { II18nServiceTranslate } from "../interfaces/II18nServiceTranslate";
+import { I18nService } from "../service/i18nextBuilder";
+
+export function getI18nCalendar(locale: I18nService | II18nServiceTranslate): II18nCalendarProperties {
+    const localeOverride = locale instanceof I18nService ? locale : typeof locale === 'function' ? { translate: locale } : undefined;
+    if (!localeOverride) return undefined;
+
+    return {
+      clear: localeOverride.translate('common.calendar.clear'),
+      days: [
+        localeOverride.translate('common.day_names.sunday_dddd'), 
+        localeOverride.translate('common.day_names.monday_dddd'), 
+        localeOverride.translate('common.day_names.tuesday_dddd'), 
+        localeOverride.translate('common.day_names.wednesday_dddd'), 
+        localeOverride.translate('common.day_names.thursday_dddd'), 
+        localeOverride.translate('common.day_names.friday_dddd'),
+        localeOverride.translate('common.day_names.saturday_dddd')
+      ],
+      daysMin: [
+        localeOverride.translate('common.day_names.sunday_dd'), 
+        localeOverride.translate('common.day_names.monday_dd'), 
+        localeOverride.translate('common.day_names.tuesday_dd'), 
+        localeOverride.translate('common.day_names.wednesday_dd'), 
+        localeOverride.translate('common.day_names.thursday_dd'), 
+        localeOverride.translate('common.day_names.friday_dd'),
+        localeOverride.translate('common.day_names.saturday_dd')
+      ],
+      daysShort: [
+        localeOverride.translate('common.day_names.sunday_ddd'), 
+        localeOverride.translate('common.day_names.monday_ddd'), 
+        localeOverride.translate('common.day_names.tuesday_ddd'), 
+        localeOverride.translate('common.day_names.wednesday_ddd'), 
+        localeOverride.translate('common.day_names.thursday_ddd'), 
+        localeOverride.translate('common.day_names.friday_ddd'),
+        localeOverride.translate('common.day_names.saturday_ddd')
+      ],
+      months: [
+        localeOverride.translate('common.date_grouping.january_mmmm'), 
+        localeOverride.translate('common.date_grouping.february_mmmm'), 
+        localeOverride.translate('common.date_grouping.march_mmmm'), 
+        localeOverride.translate('common.date_grouping.april_mmmm'), 
+        localeOverride.translate('common.date_grouping.may_mmmm'), 
+        localeOverride.translate('common.date_grouping.june_mmmm'),
+        localeOverride.translate('common.date_grouping.july_mmmm'),
+        localeOverride.translate('common.date_grouping.august_mmmm'),
+        localeOverride.translate('common.date_grouping.september_mmmm'),
+        localeOverride.translate('common.date_grouping.october_mmmm'),
+        localeOverride.translate('common.date_grouping.november_mmmm'),
+        localeOverride.translate('common.date_grouping.december_mmmm')
+      ],
+      monthsShort: [
+        localeOverride.translate('common.date_grouping.january_mmm'), 
+        localeOverride.translate('common.date_grouping.february_mmm'), 
+        localeOverride.translate('common.date_grouping.march_mmm'), 
+        localeOverride.translate('common.date_grouping.april_mmm'), 
+        localeOverride.translate('common.date_grouping.may_mmm'), 
+        localeOverride.translate('common.date_grouping.june_mmm'),
+        localeOverride.translate('common.date_grouping.july_mmm'),
+        localeOverride.translate('common.date_grouping.august_mmm'),
+        localeOverride.translate('common.date_grouping.september_mmm'),
+        localeOverride.translate('common.date_grouping.october_mmm'),
+        localeOverride.translate('common.date_grouping.november_mmm'),
+        localeOverride.translate('common.date_grouping.december_mmm')
+      ],
+      today: localeOverride.translate('common.calendar.today')
+    };
+}

package/src/globalization/helpers/index.ts

@@ -1,2 +1,3 @@
+export * from './getI18nCalendar';
 export * from './getI18nDateGroupLabel';
 export * from './getReverseI18nGroupLabel';

package/src/globalization/interfaces/calendar/II18nCalendar.ts

@@ -0,0 +1,7 @@
+export interface II18nCalendar {
+    clear: string;
+    hours: string;
+    minutes: string;
+    seconds: string;
+    today: string;
+}

package/src/globalization/interfaces/calendar/II18nCalendarProperties.ts

@@ -0,0 +1,9 @@
+export interface II18nCalendarProperties {
+    clear: string;
+    days: string[];
+    daysMin: string[];
+    daysShort: string[];
+    months: string[];
+    monthsShort: string[];
+    today: string;
+}

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

@@ -0,0 +1,2 @@
+export * from './II18nCalendar';
+export * from './II18nCalendarProperties';

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

@@ -5,9 +5,11 @@ import { II18nColumnTypesSuffixes } from "./II18nColumnTypesSuffixes";
 import { II18nDateGrouping } from "./II18nDateGrouping";
 import { II18nDayNames } from "./II18nDayNames";
 import { II18nUnits } from "./II18nUnits";
+import { II18nCalendar } from "../calendar/II18nCalendar";
 
 export interface II18nCommon {
     aggregate_labels: II18nAgreggateLabels;
+    calendar: II18nCalendar;
     column_types: II18nColumnTypes;
     column_types_suffixes: II18nColumnTypesSuffixes;
     date_grouping: II18nDateGrouping;

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

@@ -1,4 +1,12 @@
 export interface II18nDayNames {
+    sunday_dd: string;
+    monday_dd: string;
+    tuesday_dd: string;
+    wednesday_dd: string;
+    thursday_dd: string;
+    friday_dd: string;
+    saturday_dd: string;
+
     sunday_ddd: string;
     monday_ddd: string;
     tuesday_ddd: string;

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

@@ -7,6 +7,7 @@ import { II18nFilterOperator } from "./II18nFilterOperator";
 import { II18nFilterScopes } from "./II18nFilterScopes";
 import { II18nFilterPanelScopeTitle } from "./II18nFilterPanelScopeTitle";
 import { II18nFilterDateSections } from "./II18nFilterDateSections";
+import { II18nTokenBox } from './II18nTokenBox';
 
 export interface II18nFilter {
     date_sections: II18nFilterDateSections;
@@ -16,6 +17,7 @@ export interface II18nFilter {
     scope_title: II18nFilterPanelScopeTitle;
     scopes: II18nFilterScopes;
     slidebar: II18nSlidebar;
+    token_box?: II18nTokenBox;
     validators: II18nFilterValidator;
     value_container: II18nValueContainer;
 }

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

@@ -0,0 +1,6 @@
+export interface II18nTokenBox {
+  data_tokens?: string;
+  search?: string;
+  system_tokens?: string;
+  user_tokens?: string;
+}

package/src/globalization/interfaces/index.ts

@@ -1,4 +1,5 @@
 export * from './bucket_builder/index';
+export * from './calendar/index';
 export * from './chart_builder/index';
 export * from './columns/index';
 export * from './common/index';

package/src/globalization/labels/calendar/I18N_CALENDAR.ts

@@ -0,0 +1,9 @@
+import { II18nCalendar } from "../../interfaces/calendar/II18nCalendar";
+
+export const I18N_CALENDAR: II18nCalendar = {
+  clear: "Clear",
+  hours: 'Hours',
+  minutes: 'Minutes',
+  seconds: 'Seconds',
+  today: "Today"
+};

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

@@ -0,0 +1 @@
+export * from './I18N_CALENDAR';

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

@@ -1,5 +1,6 @@
 import { RELATIVE_UNIT_INFO } from "../../../dates/relative/constants/RELATIVE_UNIT_INFO";
 import { II18nCommon } from "../../interfaces/common/II18nCommon";
+import { I18N_CALENDAR } from "../calendar";
 import { I18N_AGGREGATE_LABEL } from "./I18N_AGGREGATE_LABEL";
 import { I18N_COLUMN_LABEL } from "./I18N_COLUMN_LABEL";
 import { I18N_COLUMN_PROPERTY_LABEL } from "./I18N_COLUMN_PROPERTY_LABEL";
@@ -8,6 +9,7 @@ import { I18N_DAY_NAMES } from "./I18N_DAY_NAMES";
 
 export const I18N_COMMON: II18nCommon = {
     aggregate_labels: I18N_AGGREGATE_LABEL,
+    calendar: I18N_CALENDAR,
     column_types: I18N_COLUMN_LABEL,
     column_types_suffixes: {
         slidebar_one: 'Step',

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

@@ -4,6 +4,14 @@ import { capitalize } from "../../../general/string/capitalize";
 import { II18nDayNames } from "../../interfaces/common/II18nDayNames";
 
 export const I18N_DAY_NAMES: II18nDayNames = {
+    sunday_dd: capitalize(DATE_WEEK_DAYS[0].substring(0, 2)),
+    monday_dd: capitalize(DATE_WEEK_DAYS[1].substring(0, 2)),
+    tuesday_dd: capitalize(DATE_WEEK_DAYS[2].substring(0, 2)),
+    wednesday_dd: capitalize(DATE_WEEK_DAYS[3].substring(0, 2)),
+    thursday_dd: capitalize(DATE_WEEK_DAYS[4].substring(0, 2)),
+    friday_dd: capitalize(DATE_WEEK_DAYS[5].substring(0, 2)),
+    saturday_dd: capitalize(DATE_WEEK_DAYS[6].substring(0, 2)),
+
     sunday_ddd: capitalize(DATE_WEEK_DAYS[0]),
     monday_ddd: capitalize(DATE_WEEK_DAYS[1]),
     tuesday_ddd: capitalize(DATE_WEEK_DAYS[2]),

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

@@ -28,6 +28,12 @@ export const I18N_FILTER: II18nFilter = {
     },
     scopes: I18N_FILTER_SCOPE,
     slidebar: I18N_SLIDEBAR,
+    token_box: {
+        data_tokens: 'DataTokens',
+        search: 'Search',
+        system_tokens: 'SystemTokens',
+        user_tokens: 'UserTokens',
+    },
     validators: I18N_FILTER_VALIDATOR,
     value_container: I18N_VALUE_CONTAINER,
 };

package/src/globalization/labels/index.ts

@@ -1,4 +1,5 @@
 export * from './bucket_builder';
+export * from './calendar';
 export * from './chart_builder';
 export * from './columns';
 export * from './common';

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

@@ -0,0 +1,5 @@
+export interface IFormatConfig {
+    lang?: string;
+    options?: object;
+    isMultiplied?: boolean;
+}

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

@@ -0,0 +1,4 @@
+export interface IFormatCurrency {
+    text: string;
+    label: string;
+}

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

@@ -0,0 +1,9 @@
+import { IFormatCurrency } from "./IFormatCurrency.Interface";
+
+export interface IFormatOutputFormat {
+    format: string;
+    type: string;
+    decimals?: number;
+    currency?: IFormatCurrency;
+    backup_currency?: IFormatCurrency;
+}

package/src/interfaces/format/index.ts

@@ -0,0 +1,3 @@
+export * from './IFormatConfig.Interface';
+export * from './IFormatOutputFormat.Interface';
+export * from './IFormatCurrency.Interface';

package/src/interfaces/general/IGeneralWidgetConfig.ts

@@ -3,8 +3,10 @@ export interface IGeneralWidgetConfig {
     apiKey?: string;
     qrveyid?: string;
     qv_token?: string;
+    locale?: string;
     timezoneControl?: string;
     isFromAN?: boolean;
     appid: string;
     userid: string;
+    lang?: string;
 }

package/src/interfaces/index.ts

@@ -2,3 +2,4 @@ export * from './Chart.Interface';
 export * from './IChartBuilder.Interface';
 export * from './general';
 export * from './Qrvey.Interface';
+export * from './format';

package/src/qrvey/helpers/getValueWithSuffixes.ts

@@ -0,0 +1,19 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { isNaNV2 } from "../../general/mix/isNaNV2";
+import { IGetValueWithSuffixesSettings } from "../interfaces/IGetValueWithSuffixesSettings";
+
+/**
+ * Get a string value with suffixes if available.
+ * Add suffix into the value string. Prioritized for numeric values.
+ * @param value a number or string
+ * @param suffixes An object with singular or plural suffix string.
+ * @returns a string value with suffix
+ */
+export function getValueWithSuffixes(value: string | number, settings: IGetValueWithSuffixesSettings): string {
+    let suffix = '';
+    if (!isNaNV2(value)) {
+        if (!isEmpty(settings.suffixTranslateLabel) && !isEmpty(settings.translate)) suffix = settings.translate(settings.suffixTranslateLabel, { count: +value });
+        if (!isEmpty(settings.suffixes)) suffix = (+value > 1 || +value === 0) ? settings.suffixes.plural : settings.suffixes.singular;
+    }
+    return value + (!isEmpty(suffix) ? ' ' + suffix : '');
+}

package/src/qrvey/helpers/index.ts

@@ -1,2 +1,4 @@
 export * from './getColumnsLabel';
 export * from './getPropertyLabel';
+export * from './getValueWithSuffixes';
+export * from './transformValue';

package/src/qrvey/helpers/transformValue.ts

@@ -0,0 +1,47 @@
+import { isDateColumn } from "../../columns/helpers/isDateColumn";
+import { isNumericalColumn } from "../../columns/helpers/isNumericalColumn";
+import { IDateColumnPropertyType } from "../../columns/interfaces/IDateColumnPropertyType";
+import { DATE_GROUPING_PROPERTY } from "../../dates/constants/DATE_GROUPING_PROPERTY";
+import { DATE_GROUPING_TIME_PROPERTY } from "../../dates/constants/DATE_GROUPING_TIME_PROPERTY";
+import { addFormat } from "../../format/format";
+import { getI18nDateGroupLabel } from "../../globalization/helpers/getI18nDateGroupLabel";
+import { ITransformValueSettings } from "../interfaces/ITransformValueSettings";
+import { getValueWithSuffixes } from "./getValueWithSuffixes";
+
+/**
+ * Transforms a value depending of localization/globalization and extras settings.
+ * @param value A value to transform
+ * @param settings The settings of the transformValue function
+ * @returns A transformed value
+ */
+export function transformValue(value: string, settings: ITransformValueSettings): string {
+    const valueWithI18n = getI18nDateGroupLabel(value, settings.property as IDateColumnPropertyType, settings.translate);
+    
+    const valueWithLocalization = addFormat(valueWithI18n, getOutputFormat(settings), getFormatConfig(settings));
+    return getValueWithSuffixes(valueWithLocalization, { suffixTranslateLabel: settings.suffixTranslateLabel, translate: settings.translate });
+}
+
+/**
+ * Gets the outputformat settings
+ * @param settings The settings of the transformValue function
+ * @returns the outputformat settings
+ */
+function getOutputFormat(settings: ITransformValueSettings) {
+    let type, format;
+    if (isDateColumn(settings.column) && [DATE_GROUPING_PROPERTY.DAY, DATE_GROUPING_TIME_PROPERTY.HOUR, DATE_GROUPING_TIME_PROPERTY.MINUTE, DATE_GROUPING_TIME_PROPERTY.SECOND].includes(settings.property as any)) {
+        type = 'DATE';
+        format = 'Default';
+    } else if (isNumericalColumn(settings.column)) {
+        type = 'NUMERIC';
+    }
+    return { type, format };
+}
+
+/**
+ * Gets the format config
+ * @param settings The settings of the transformValue function
+ * @returns the format config
+ */
+function getFormatConfig(settings: ITransformValueSettings) {
+    return { lang: settings.locale };
+}

package/src/qrvey/interfaces/IGetValueWithSuffixesSettings.ts

@@ -0,0 +1,12 @@
+import { II18nServiceTranslate } from "../../globalization/interfaces/II18nServiceTranslate";
+
+export interface IGetValueWithSuffixesSettings {
+    translate?: II18nServiceTranslate; // Function for getting translations
+    suffixTranslateLabel?: string; // Label of the i18n path for translations
+    suffixes?: IGetValueWithSuffixesSettingsSuffixes; // Manual suffixes to add if the translate and the suffixes translate label is not present
+}
+
+interface IGetValueWithSuffixesSettingsSuffixes {
+    singular: string;
+    plural: string;
+}

package/src/qrvey/interfaces/ITransformValueSettings.ts

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

package/src/qrvey/interfaces/index.ts

@@ -3,3 +3,5 @@ export * from './ICalculation';
 export * from './ICalculationInfo';
 export * from './ICalculationType';
 export * from './IDataset';
+export * from './IGetValueWithSuffixesSettings';
+export * from './ITransformValueSettings';

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

@@ -3,6 +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 { chooseLang } from "../..";
 
 /**
    * Get a dataset by Qrvey ID
@@ -10,10 +11,11 @@ import { BDatasetsToUIDatasets } from "../adapters/BDatasetsToUIDatasets.adapter
    * @returns a promise
    */
 export function getDatasetColumns(config: IGeneralWidgetConfig, qrveyid?: string): Promise<IDataset[]> {
+    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
-    })
+    }, { lang })
     .then(BDatasetsToUIDatasets)
     .catch(_e => []);
 }

package/test/columns/isNumericalColumn.test.js

@@ -0,0 +1,154 @@
+const { COLUMN, FORMULA, isNumericalColumn } = require("../../dist/cjs");
+
+const column1 = {
+    id: '123',
+    qrveyid: 'abc',
+    type: COLUMN.NUMERIC
+};
+
+const column2 = {
+    id: '222',
+    qrveyid: 'abc',
+    type: COLUMN.RATING
+};
+
+const column3 = {
+    id: '333',
+    qrveyid: 'abc',
+    type: COLUMN.SLIDEBAR
+};
+
+const column4 = {
+    formulaid: '456',
+    formulaType: FORMULA.NUMBER,
+    id: '456',
+    qrveyid: 'abc',
+    type: COLUMN.FORMULA
+};
+
+const wrongColumn1 = {
+    formulaid: '456',
+    formulaType: FORMULA.DATE,
+    id: '494',
+    qrveyid: 'abc',
+    type: COLUMN.FORMULA
+};
+
+const wrongColumn2 = {
+    id: '789',
+    qrveyid: 'abc',
+    type: COLUMN.TEXTFIELD
+};
+
+describe('Testing undefined/empty arguments', function () {
+    const empty1 = undefined;
+    const empty2 = null;
+    const empty3 = '';
+    const empty4 = [];
+    const empty5 = {};
+
+    test('no argument passed', function () {
+        const validation = isNumericalColumn();
+        expect(validation).toBeFalsy();
+    });
+
+    test('Undefined argument', function () {
+        const validation = isNumericalColumn(empty1);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Null argument', function () {
+        const validation = isNumericalColumn(empty2);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Empty string argument', function () {
+        const validation = isNumericalColumn(empty3);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Empty array argument', function () {
+        const validation = isNumericalColumn(empty4);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Empty object argument', function () {
+        const validation = isNumericalColumn(empty5);
+        expect(validation).toBeFalsy();
+    });
+});
+
+describe('Testing no-object arguments', function () {
+    const variable1 = 1;
+    const variable2 = false;
+    const variable3 = new Date();
+    const variable4 = ['Hello', 'World'];
+    const variable5 = (num1 = 1, num2 = 2) => num1 + num2;
+
+    test('Numeric variable', function () {
+        const validation = isNumericalColumn(variable1);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Boolean variable', function () {
+        const validation = isNumericalColumn(variable2);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Date object variable', function () {
+        const validation = isNumericalColumn(variable3);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Array variable', function () {
+        const validation = isNumericalColumn(variable4);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Function-like variable', function () {
+        const validation = isNumericalColumn(variable5);
+        expect(validation).toBeFalsy();
+    });
+});
+
+describe('Testing invalid expected object', function () {
+    const variable1 = { tag1: 'value1', tag2: 'value2' };
+    
+    test('Different expected object', function () {
+        const validation = isNumericalColumn(variable1);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Different column type 2', function () {
+        const validation = isNumericalColumn(wrongColumn1);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Different column type 1', function () {
+        const validation = isNumericalColumn(wrongColumn2);
+        expect(validation).toBeFalsy();
+    });
+});
+
+describe('Regular scenarios', function () {
+    test('Scenario #1 - Numeric column type', function () {
+        const validation = isNumericalColumn(column1);
+        expect(validation).toBeTruthy();
+    });
+
+    test('Scenario #2 - Rating column type', function () {
+        const validation = isNumericalColumn(column2);
+        expect(validation).toBeTruthy();
+    });
+
+    test('Scenario #4 - Slidebar column type', function () {
+        const validation = isNumericalColumn(column3);
+        expect(validation).toBeTruthy();
+    });
+
+    test('Scenario #4 - Formula column type with a number type', function () {
+        const validation = isNumericalColumn(column4);
+        expect(validation).toBeTruthy();
+    });
+    
+});

package/test/format.test.js

@@ -1,29 +1,29 @@
-const { formatValue, defineFormat, formatAbbreviated } = require('../dist/cjs');
+const { addFormat, defineFormat, formatAbbreviated } = require('../dist/cjs');
 
 describe('Testing format util', function () {
     test('Number formats', function () {
-        const abbreviated = formatValue('1000000', {
+        const abbreviated = addFormat('1000000', {
             "type": "NUMERIC",
             "format": "Abbreviated",
             "decimals": "3"
         });
         expect(abbreviated).toEqual('1.00M');
 
-        const numeric = formatValue('1000000', {
+        const numeric = addFormat('1000000', {
             "type": "NUMERIC",
             "format": "Numeric",
             "decimals": "3"
         });
         expect(numeric).toEqual('1,000,000.000');
 
-        const currency = formatValue('1000000', {
+        const currency = addFormat('1000000', {
             "type": "NUMERIC",
             "format": "Currency",
             "decimals": "3"
         });
         expect(currency).toEqual(' $1,000,000.000');
 
-        const percentage = formatValue('1000000', {
+        const percentage = addFormat('1000000', {
             "type": "NUMERIC",
             "format": "Percentage",
             "decimals": "3"
@@ -32,31 +32,31 @@ describe('Testing format util', function () {
     });
 
     test('Date formats', function () {
-        const yyyyMMdd = formatValue('2021-08-06', {
+        const yyyyMMdd = addFormat('2021-08-06', {
             "type": "DATE",
             "format": "MM/DD/YYYY HH24:MM:SS"
         });
         expect(yyyyMMdd).toEqual('08/06/2021 00:00:00');
 
-        const yyyyMMddHHmmSS = formatValue('2021-08-06 05:30:50', {
+        const yyyyMMddHHmmSS = addFormat('2021-08-06 05:30:50', {
             "type": "DATE",
             "format": "MM/DD/YYYY HH24:MM:SS"
         });
         expect(yyyyMMddHHmmSS).toEqual('08/06/2021 05:30:50');
 
-        const ISOFormat = formatValue('2021-06-09T13:15:46', {
+        const ISOFormat = addFormat('2021-06-09T13:15:46', {
             "type": "DATE",
             "format": "MM/DD/YYYY hh:MM:SS"
         });
         expect(ISOFormat).toEqual('06/09/2021 01:15:46');
 
-        const ISOFormatRandom = formatValue('2021-06-09T13:15:46', {
+        const ISOFormatRandom = addFormat('2021-06-09T13:15:46', {
             "type": "DATE",
             "format": "MM YYYY H M s"
         });
         expect(ISOFormatRandom).toEqual('06 2021 13 6 46');
 
-        const ISOFormatRandom1 = formatValue('2018-01-01T00:00:00', {
+        const ISOFormatRandom1 = addFormat('2018-01-01T00:00:00', {
             "type": "DATE",
             "format": "Q MMMM Do ddd"
         });
@@ -336,7 +336,7 @@ describe('Define format tests', function () {
 
         const format = defineFormat(column, true);
         expect(format).toEqual({ type: 'NUMERIC', format: 'Currency', decimals: '3' });
-        const currency = formatValue('1000000', format);
+        const currency = addFormat('1000000', format);
         expect(currency).toEqual(' $1,000,000.000');
     });