@qrvey/utils 1.1.0-9 → 1.1.2-1

package/dist/cjs/filters/helpers/getScopesByHierarchy.js

@@ -10,9 +10,9 @@ exports.getScopesByHierarchy = void 0;
 function getScopesByHierarchy(scopes = [], currentScope = "GLOBAL" /* GLOBAL */) {
     const scopeIndex = scopes.findIndex(s => s.label === currentScope);
     const chartScopeIndex = scopes.findIndex(s => s.label === "CHART" /* CHART */);
-    return (scopeIndex !== -1)
+    return scopeIndex !== -1
         ? scopes.slice(0, scopeIndex)
-        : (chartScopeIndex !== -1)
+        : chartScopeIndex !== -1
             ? scopes.slice(0, chartScopeIndex)
             : [];
 }

package/dist/cjs/filters/helpers/ui/excludeUIFlatFiltersByScopes.d.ts

@@ -5,4 +5,4 @@ import { IFScope, IFUFlattenedFilter } from "../../interfaces";
  * @param scopes collection of scopes types
  * @returns The new array of UI Flattened filters
  */
-export declare function excludeUIFlatFiltersByScopes(uFilters: IFUFlattenedFilter[], scopes: IFScope[]): IFUFlattenedFilter[];
+export declare function excludeUIFlatFiltersByScopes(uFilters?: IFUFlattenedFilter[], scopes?: IFScope[]): IFUFlattenedFilter[];

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

@@ -8,7 +8,7 @@ const general_1 = require("../../../general");
  * @param scopes collection of scopes types
  * @returns The new array of UI Flattened filters
  */
-function excludeUIFlatFiltersByScopes(uFilters = [], scopes) {
+function excludeUIFlatFiltersByScopes(uFilters = [], scopes = []) {
     if (general_1.isEmpty(uFilters))
         return [];
     uFilters = general_1.cloneDeep(uFilters);

package/dist/cjs/filters/helpers/ui/getUIFlatFilterByParams.d.ts

@@ -11,4 +11,4 @@ import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
   * - Property type
   * @returns The index of the uFilter array or the Filter object s
   */
-export declare function getUIFlatFilterByParams(uFilters: IFUFlattenedFilter[], params: IFUParamsToGetFilter, getIndex?: boolean): number | IFUFlattenedFilter;
+export declare function getUIFlatFilterByParams(uFilters?: IFUFlattenedFilter[], params?: IFUParamsToGetFilter, getIndex?: boolean): number | IFUFlattenedFilter;

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

@@ -15,7 +15,7 @@ const resolveUIFlatFiltersByParams_1 = require("./resolveUIFlatFiltersByParams")
   * - Property type
   * @returns The index of the uFilter array or the Filter object s
   */
-function getUIFlatFilterByParams(uFilters = [], params, getIndex = false) {
+function getUIFlatFilterByParams(uFilters = [], params = {}, getIndex = false) {
     if (general_1.isEmpty(params))
         return;
     uFilters = general_1.cloneDeep(uFilters);

package/dist/cjs/filters/helpers/ui/getUIFlatFiltersByParams.d.ts

@@ -12,4 +12,4 @@ import { IFUFlattenedFilter, IFUParamsToGetFilter } from "../../interfaces";
    * - Enabled flags
    * @returns The index of the uFilter array or the Filter object s
    */
-export declare function getUIFlatFiltersByParams(uFilters: IFUFlattenedFilter[], params: IFUParamsToGetFilter): IFUFlattenedFilter[];
+export declare function getUIFlatFiltersByParams(uFilters?: IFUFlattenedFilter[], params?: IFUParamsToGetFilter): IFUFlattenedFilter[];

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

@@ -16,7 +16,7 @@ const resolveUIFlatFiltersByParams_1 = require("./resolveUIFlatFiltersByParams")
    * - Enabled flags
    * @returns The index of the uFilter array or the Filter object s
    */
-function getUIFlatFiltersByParams(uFilters = [], params) {
+function getUIFlatFiltersByParams(uFilters = [], params = {}) {
     if (general_1.isEmpty(params))
         return;
     uFilters = general_1.cloneDeep(uFilters);

package/dist/cjs/filters/helpers/ui/getUIFlatFiltersByScopes.d.ts

@@ -5,4 +5,4 @@ import { IFScope, IFUFlattenedFilter } from "../../interfaces";
  * @param scopes collection of scopes types
  * @returns The new array of UI Flattened filters
  */
-export declare function getUIFlatFiltersByScopes(uFilters: IFUFlattenedFilter[], scopes: IFScope[]): IFUFlattenedFilter[];
+export declare function getUIFlatFiltersByScopes(uFilters?: IFUFlattenedFilter[], scopes?: IFScope[]): IFUFlattenedFilter[];

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

@@ -8,7 +8,7 @@ const general_1 = require("../../../general");
  * @param scopes collection of scopes types
  * @returns The new array of UI Flattened filters
  */
-function getUIFlatFiltersByScopes(uFilters = [], scopes) {
+function getUIFlatFiltersByScopes(uFilters = [], scopes = []) {
     if (general_1.isEmpty(uFilters))
         return [];
     uFilters = general_1.cloneDeep(uFilters);

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

@@ -6,6 +6,7 @@ const date_1 = require("../../../date");
 const constants_2 = require("../../../constants");
 const general_1 = require("../../../general");
 function getUIValues(filter, addEnableds = false, rankingGroupIndex) {
+    var _a;
     switch (filter.validator) {
         case "AFTER" /* AFTER */:
         case "GREATER_THAN" /* GREATER_THAN */:
@@ -13,7 +14,7 @@ function getUIValues(filter, addEnableds = false, rankingGroupIndex) {
         case "GREATER_THAN_EQUAL" /* GREATER_THAN_EQUAL */:
             return filter.values.map(value => ({
                 value: value.min,
-                enabled: addEnableds ? (value.enabled != null ? value.enabled : true) : undefined,
+                enabled: addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case "BEFORE_ON" /* BEFORE_ON */:
         case "LESS_THAN_EQUAL" /* LESS_THAN_EQUAL */:
@@ -21,19 +22,19 @@ function getUIValues(filter, addEnableds = false, rankingGroupIndex) {
         case "LESS_THAN" /* LESS_THAN */:
             return filter.values.map(value => ({
                 value: value.max,
-                enabled: addEnableds ? (value.enabled != null ? value.enabled : true) : undefined,
+                enabled: addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case "BETWEEN_INCLUSIVE" /* BETWEEN_INCLUSIVE */:
         case "BETWEEN_EXCLUSIVE" /* BETWEEN_EXCLUSIVE */:
             return filter.values.map(value => ({
                 value: `${value.min} - ${value.max}`,
-                enabled: addEnableds ? (value.enabled != null ? value.enabled : true) : undefined,
+                enabled: addEnableds ? value.enabled != null ? value.enabled : true : undefined,
             }));
         case "IS_NULL" /* IS_NULL */:
         case "IS_NOT_NULL" /* IS_NOT_NULL */:
             return [{
                     value: constants_1.FILTER_VALIDATOR_VALUE[filter.validator].label,
-                    enabled: addEnableds ? filter.enabled : undefined,
+                    enabled: addEnableds ? (_a = filter.values[0]) === null || _a === void 0 ? void 0 : _a.enabled : undefined,
                 }];
         case "IN" /* IN */:
             return filter.values.map(value => ({
@@ -47,7 +48,7 @@ function getUIValues(filter, addEnableds = false, rankingGroupIndex) {
             return (filter.values || []).map(val => ({
                 imageUrl: val.imageUrl,
                 value: val.value,
-                enabled: addEnableds ? (val.enabled != null ? val.enabled : true) : undefined,
+                enabled: addEnableds ? val.enabled != null ? val.enabled : true : undefined,
                 valueid: val.valueid,
             }));
     }

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

@@ -1,4 +1,5 @@
 import { IQrveyColumn } from "../../interfaces/Qrvey.Interface";
+import { IFSFilterExtrasInfo } from "./common";
 import { IFDateSection } from "./IFDateSection";
 import { IFOperator } from "./IFOperator";
 import { IFProperty } from "./IFProperty";
@@ -22,6 +23,7 @@ export interface OLD_IFilterDetail {
     panelid?: string;
     panelName?: string;
     expressionid?: string;
+    info?: IFSFilterExtrasInfo;
     scope?: IFScope;
     scopeid?: string;
     scopeEnabled?: boolean;
@@ -34,4 +36,5 @@ export interface OLD_IFilterDetail {
     }[] | IFUValue[];
     section?: IFSection;
     groupValue?: IFProperty;
+    extras?: any;
 }

package/dist/cjs/filters/interfaces/common/IFSFilterExtras.d.ts

@@ -1,5 +1,6 @@
 import { IFScope } from "../IFScope";
 import { IFSection } from "../IFSection";
+import { IFSFilterExtrasInfo } from "./IFSFilterExtrasInfo";
 /**
  * Structure for extra properties of the Filter.
  */
@@ -9,4 +10,6 @@ export interface IFSFilterExtras {
     scope: IFScope;
     scopeid?: string;
     section?: IFSection;
+    info?: IFSFilterExtrasInfo;
+    [x: string]: any;
 }

package/dist/cjs/filters/interfaces/common/IFSFilterExtrasInfo.d.ts

@@ -0,0 +1,4 @@
+export interface IFSFilterExtrasInfo {
+    icon: string;
+    label: string;
+}

package/dist/cjs/filters/interfaces/common/IFSFilterExtrasInfo.js

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

package/dist/cjs/filters/interfaces/common/IFSMergeFiltersSettings.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Structure for MergeFilters property settings
+ */
+export interface IFSMergeFiltersSettings {
+    overwriteValues?: boolean;
+    setGroupedColumnOperator?: boolean;
+}

package/dist/cjs/filters/interfaces/common/IFSMergeFiltersSettings.js

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

package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilter.d.ts

@@ -3,13 +3,14 @@ import { IFProperty } from "../IFProperty";
 import { IFScope } from "../IFScope";
 import { IFValidator } from "../IFValidator";
 import { IFSColumn } from "./IFSColumn";
+import { IFSParamsToGetFilterEnableds } from "./IFSParamsToGetFilterEnableds";
 /**
  * Structure for filter properties
  */
 export interface IFSParamsToGetFilter {
     column?: IFSColumn;
     dateSection?: IFDateSection;
-    enableds?: boolean;
+    enableds?: IFSParamsToGetFilterEnableds;
     linkid?: string;
     panelid?: string;
     property?: IFProperty;

package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilterEnableds.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Structure for filter structure enabled flags
+ */
+export interface IFSParamsToGetFilterEnableds {
+    scopes?: boolean;
+    datasets?: boolean;
+    filters?: boolean;
+    values?: boolean;
+}

package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilterEnableds.js

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

package/dist/cjs/filters/interfaces/common/IFSParamsToGetFilterSettings.d.ts

@@ -12,4 +12,9 @@ export interface IFSParamsToGetFilterSettings {
         dataset?: boolean;
         filter?: boolean;
     };
+    filterEmptyArrays?: {
+        scope?: boolean;
+        dataset?: boolean;
+        filter?: boolean;
+    };
 }

package/dist/cjs/filters/interfaces/common/index.d.ts

@@ -19,7 +19,10 @@ export * from './IFSDataset';
 export * from './IFSDataStore';
 export * from './IFSFilter';
 export * from './IFSFilterExtras';
+export * from './IFSFilterExtrasInfo';
+export * from './IFSMergeFiltersSettings';
 export * from './IFSParamsToGetFilter';
+export * from './IFSParamsToGetFilterEnableds';
 export * from './IFSParamsToGetFilterSettings';
 export * from './IFSScope';
 export * from './IFSScopeID';

package/dist/cjs/filters/interfaces/common/index.js

@@ -31,7 +31,10 @@ __exportStar(require("./IFSDataset"), exports);
 __exportStar(require("./IFSDataStore"), exports);
 __exportStar(require("./IFSFilter"), exports);
 __exportStar(require("./IFSFilterExtras"), exports);
+__exportStar(require("./IFSFilterExtrasInfo"), exports);
+__exportStar(require("./IFSMergeFiltersSettings"), exports);
 __exportStar(require("./IFSParamsToGetFilter"), exports);
+__exportStar(require("./IFSParamsToGetFilterEnableds"), exports);
 __exportStar(require("./IFSParamsToGetFilterSettings"), exports);
 __exportStar(require("./IFSScope"), exports);
 __exportStar(require("./IFSScopeID"), exports);

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

@@ -13,4 +13,5 @@ export interface IFPSettingsFilterPanelBodyScopeScope {
     readonly?: boolean;
     header?: IFPSettingsFilterPanelBodyScopeScopeHeader;
     body?: IFPSettingsFilterPanelBodyScopeScopeBody;
+    settingDisplayed?: boolean;
 }

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

@@ -7,5 +7,6 @@ export interface IFPSettingsFilterPanelHeader {
     readonly?: boolean;
     filterButtonDisplayed?: boolean;
     settingsButtonDisplayed?: boolean;
+    settingsReadonly?: boolean;
     menu?: IFPSettingsFilterPanelHeaderMenu;
 }

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

@@ -1,8 +1,12 @@
+import { IFPSettingsFilterPanelSettingsScope } from "./IFPSettingsFilterPanelSettingsScope";
 import { IFPSettingsPanelView } from "./IFPSettingsPanelView";
 /**
  * Structure for the additional Filter Panel settings
  */
 export interface IFPSettingsFilterPanelSettings {
+    panelInPageViewShow?: boolean;
     panelInPageViewDisplayed?: boolean;
     panelDefaultView?: IFPSettingsPanelView;
+    panelDefaultViewShow?: boolean;
+    scopeSettings?: IFPSettingsFilterPanelSettingsScope;
 }

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

@@ -0,0 +1,7 @@
+/**
+ * Scope Settings Structure
+ */
+export interface IFPSettingsFilterPanelSettingsScope {
+    displayIconDisplayed: boolean;
+    displayColorModeDisplayed: boolean;
+}

package/dist/cjs/filters/interfaces/panel/IFPSettingsFilterPanelSettingsScope.js

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

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

@@ -32,4 +32,5 @@ export * from './IFPSettingsFilterPanelBodyDatasetHeader';
 export * from './IFPSettingsFilterPanelBodyFilter';
 export * from './IFPSettingsFilterPanelBodyFilterMenu';
 export * from './IFPSettingsFilterPanelBodyOperator';
+export * from './IFPSettingsFilterPanelSettingsScope';
 export * from './IFPSettingsPanelView';

package/dist/cjs/filters/interfaces/panel/index.js

@@ -44,4 +44,5 @@ __exportStar(require("./IFPSettingsFilterPanelBodyDatasetHeader"), exports);
 __exportStar(require("./IFPSettingsFilterPanelBodyFilter"), exports);
 __exportStar(require("./IFPSettingsFilterPanelBodyFilterMenu"), exports);
 __exportStar(require("./IFPSettingsFilterPanelBodyOperator"), exports);
+__exportStar(require("./IFPSettingsFilterPanelSettingsScope"), exports);
 __exportStar(require("./IFPSettingsPanelView"), exports);

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

@@ -1,12 +1,13 @@
 import { COLUMN } from '../constants';
+import { ChartType } from '../interfaces';
 export declare const textFields: string[];
 export declare const complexFields: string[];
 export declare const numericalFields: string[];
 export declare const QUESTION_FORMAT_SUPPORT: COLUMN[];
 export declare const DATEGROUP_FORMATTING_UNSUPPORT: string[];
 export declare const appliesFormatting: (columnType: any) => boolean;
-export declare const hasfileSizeProperty: (column?: any) => any;
+export declare const hasfileSizeProperty: (column?: any) => boolean;
 export declare const isComplexColumn: (column?: any) => boolean;
 export declare const isNumericalColumn: (column?: any) => boolean;
-export declare function supportNumericFormatting(chartType: any): boolean;
+export declare function supportNumericFormatting(chartType: ChartType): boolean;
 export declare const isTextColumn: (column: any) => boolean;

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

@@ -1,5 +1,5 @@
-export declare const isEmptyValue: (variable: any) => boolean;
 export declare function formatDate(dateString: any, format: any): any;
+export declare function formatAbbreviated(num: any, decimals: any): any;
 /**
  * Set convert Bytes into MB
  * @param bytes type number

package/dist/cjs/format/format.js

@@ -3,28 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineFormat = exports.validateColumnType = exports.parseFormulaType = exports.formatValue = exports.formatFileSize = exports.formatDate = exports.isEmptyValue = void 0;
+exports.defineFormat = exports.validateColumnType = exports.parseFormulaType = exports.formatValue = exports.formatFileSize = exports.formatAbbreviated = exports.formatDate = void 0;
 const d3_1 = require("d3");
 const dayjs_1 = __importDefault(require("dayjs"));
 const constants_1 = require("../constants");
-const get_1 = require("../general/object/get");
 const definition_1 = require("./definition");
 const advancedFormat_1 = __importDefault(require("dayjs/plugin/advancedFormat"));
+const general_1 = require("../general");
 dayjs_1.default.extend(advancedFormat_1.default); // Add support to advanced formats https://day.js.org/docs/en/plugin/advanced-format
-const isEmptyValue = (variable) => {
-    return variable === undefined || variable === null || variable === '';
-};
-exports.isEmptyValue = isEmptyValue;
 /**
  * Apply to the given date format to a date value
  * @param bytes type number
  */
 function isValidDateString(dateString = '') {
     return /^\d{2}\/\d{2}\/\d{4}/.test(dateString) // MM/DD/YYY OR DD/MM/YYYY
-        || /^\d{4}\-\d{2}\-\d{2}/.test(dateString); // YYYY-MM-DD
+        || /^\d{4}-\d{2}-\d{2}/.test(dateString); // YYYY-MM-DD
 }
 function formatDate(dateString, format) {
-    if (exports.isEmptyValue(dateString) || !isNaN(dateString) || format === 'Default')
+    if (general_1.isEmpty(dateString) || !isNaN(dateString) || format === 'Default')
         return dateString;
     if (!isValidDateString(dateString))
         return dateString;
@@ -38,9 +34,10 @@ function formatAbbreviated(num, decimals) {
     const exp = Math.floor(Math.log10(absValue));
     if (exp < 0 && exp >= -3)
         return decimals ? num.toFixed(decimals) : num;
-    return d3_1.format((num > -100 && num < 100) ? '.s' : '.3s')(num);
+    return d3_1.format(num > -100 && num < 100 ? '' : '.3s')(num);
 }
-function formatNumber(num, outputFormat, config) {
+exports.formatAbbreviated = formatAbbreviated;
+function formatNumber(num, outputFormat, _config) {
     try {
         num = +(num || 0);
     }
@@ -49,7 +46,7 @@ function formatNumber(num, outputFormat, config) {
     }
     if (isNaN(num))
         num = 0;
-    const num_decimals = !exports.isEmptyValue(outputFormat.decimals) && outputFormat.format !== 'Abbreviated' ? outputFormat.decimals : 0;
+    const num_decimals = !general_1.isEmpty(outputFormat.decimals) && outputFormat.format !== 'Abbreviated' ? outputFormat.decimals : 0;
     switch (outputFormat.format) {
         case 'Abbreviated':
             return formatAbbreviated(num, num_decimals);
@@ -57,7 +54,7 @@ function formatNumber(num, outputFormat, config) {
         case 'Decimal':
             return d3_1.format(`,.${num_decimals}f`)(num).replace(/\.(%*)$/, '$1');
         case 'Currency': {
-            const currency = `${num < 0 ? '-' : ''} ${get_1._get(outputFormat, 'currency.label', '$')}`;
+            const currency = `${num < 0 ? '-' : ''} ${general_1._get(outputFormat, 'currency.label', '$')}`;
             const absNum = Math.abs(num);
             return currency + d3_1.format(`,.${num_decimals}f`)(absNum).replace(/\.(%*)$/, '$1');
         }
@@ -85,15 +82,16 @@ function formatFileSize(bytes) {
 }
 exports.formatFileSize = formatFileSize;
 const formatValue = (value, outputFormat = 'None', config) => {
-    if (exports.isEmptyValue(value) || typeof value === 'object' && exports.isEmptyValue(value[0]))
+    if (general_1.isEmpty(value) || typeof value === 'object' && general_1.isEmpty(value[0]))
         return value;
     switch (outputFormat.type) {
         case 'DATE':
         case 'DATETIME':
             return formatDate(value, outputFormat.format);
-        case 'NUMERIC':
+        case 'NUMERIC': {
             const parse = parseFloat(value);
             return isNaN(parse) ? value : formatNumber(parse, outputFormat, config);
+        }
         case 'IMAGEUPLOAD':
         case 'FILEUPLOAD':
             return formatFileSize(parseFloat(value));
@@ -125,19 +123,19 @@ const defineFormat = (column = {}, isSimpleTable = false, isCategoryDimension) =
     columnType = definition_1.isTextColumn(column) && ((column.outputFormat && column.outputFormat.type === 'NUMERIC') || (column.selectedFormat && column.selectedFormat.type === 'NUMERIC')) ? constants_1.COLUMN.NUMERIC : columnType;
     if (!definition_1.appliesFormatting(columnType) && (isSimpleTable || !isSimpleTable && column.isGroup))
         return 'None';
-    const outputFormat = get_1._get(column, 'outputFormat.format');
-    const selectedFormat = get_1._get(column, 'selectedFormat.format');
-    const outputType = get_1._get(column, 'outputFormat.type');
-    const selectType = get_1._get(column, 'selectedFormat.type');
-    const isNumericDefault = (get_1._get(column, 'defaultFormat.format') === 'Default' || get_1._get(column, 'defaultFormat.format') === 'Numeric') && get_1._get(column, 'defaultFormat.type') === 'NUMERIC';
+    const outputFormat = general_1._get(column, 'outputFormat.format');
+    const selectedFormat = general_1._get(column, 'selectedFormat.format');
+    const outputType = general_1._get(column, 'outputFormat.type');
+    const selectType = general_1._get(column, 'selectedFormat.type');
+    const isNumericDefault = (general_1._get(column, 'defaultFormat.format') === 'Default' || general_1._get(column, 'defaultFormat.format') === 'Numeric') && general_1._get(column, 'defaultFormat.type') === 'NUMERIC';
     const isTable = isSimpleTable === true || (!isSimpleTable && (column.isGroup || column.groupAgg));
     const isNumericDefaultOutput = !isTable && (outputFormat === 'Default' || outputFormat === 'Numeric') && outputType === 'NUMERIC';
-    const isNumericDefaultSelected = !isTable && (selectedFormat === 'Default' || selectedFormat === 'Numeric') && get_1._get(column, 'selectedFormat.type') === 'NUMERIC';
+    const isNumericDefaultSelected = !isTable && (selectedFormat === 'Default' || selectedFormat === 'Numeric') && general_1._get(column, 'selectedFormat.type') === 'NUMERIC';
     const defaultAbbreviated = {
         type: 'NUMERIC',
         format: 'Abbreviated'
     };
-    const dateGroupLabel = get_1._get(column, 'dateGroup.label') || column.dateGroup;
+    const dateGroupLabel = general_1._get(column, 'dateGroup.label') || column.dateGroup;
     switch (columnType) {
         case constants_1.COLUMN.YES_NO:
         case constants_1.COLUMN.PHONE:
@@ -161,6 +159,7 @@ const defineFormat = (column = {}, isSimpleTable = false, isCategoryDimension) =
                     return defaultAbbreviated;
                 return column.selectedFormat;
             }
+            break;
         case constants_1.COLUMN.DATE:
             if ((!isTable && column.isSummary) || column.isXY) {
                 if (isCategoryDimension && outputFormat !== 'Default')
@@ -174,15 +173,15 @@ const defineFormat = (column = {}, isSimpleTable = false, isCategoryDimension) =
             if ((isCategoryDimension || isTable) && selectType == 'NUMERIC' && dateGroupLabel && outputType === 'DATE')
                 return column.outputFormat;
             if ((isCategoryDimension || isTable) && selectType == 'NUMERIC' && dateGroupLabel && outputType === 'NUMERIC')
-                return get_1._get(column, 'defaultFormat');
-            if (selectedFormat) {
+                return general_1._get(column, 'defaultFormat');
+            if (selectedFormat && selectedFormat != 'Default') {
                 if (isNumericDefaultSelected)
                     return defaultAbbreviated;
                 return column.selectedFormat;
             }
             if (outputFormat) {
                 if ((isCategoryDimension || isTable) && outputType !== 'DATE')
-                    return get_1._get(column, 'defaultFormat');
+                    return general_1._get(column, 'defaultFormat');
                 if (!isCategoryDimension && !isTable && outputType === 'DATE')
                     return defaultAbbreviated;
                 return column.outputFormat;
@@ -211,7 +210,7 @@ const defineFormat = (column = {}, isSimpleTable = false, isCategoryDimension) =
                 if (isCategoryDimension === true) {
                     if (isNumericDefault)
                         return defaultAbbreviated;
-                    return get_1._get(column, 'defaultFormat');
+                    return general_1._get(column, 'defaultFormat');
                 }
                 if (selectedFormat && selectedFormat != 'Default') {
                     if (isNumericDefaultSelected)
@@ -283,7 +282,7 @@ const defineFormat = (column = {}, isSimpleTable = false, isCategoryDimension) =
             if (((column.selectedFormat &&
                 column.selectedFormat.format !== "Default") ||
                 (!isSimpleTable && column.isSummary)) &&
-                get_1._get(column, "outputFormat.format"))
+                general_1._get(column, "outputFormat.format"))
                 return column.outputFormat;
             break;
         default: