@qrvey/utils 1.2.4-8 → 1.2.7

package/dist/qrvey/constants/AGGREGATE_INFO.d.ts

@@ -0,0 +1,5 @@
+import { IAggregate } from "../interfaces/IAggregate";
+import { IAggregateInfo } from "../interfaces/IAggregateInfo";
+export declare const AGGREGATE_INFO: {
+    [key in IAggregate]: IAggregateInfo;
+};

package/dist/qrvey/constants/AGGREGATE_INFO_LIST.d.ts

@@ -0,0 +1 @@
+export declare const AGGREGATE_INFO_LIST: import("../interfaces/IAggregateInfo").IAggregateInfo[];

package/dist/qrvey/constants/AGGREGATE_LABEL.d.ts

@@ -0,0 +1,11 @@
+export declare enum AGGREGATE_LABEL {
+    NONE = "NONE",
+    AVG = "AVG",
+    MEDIAN = "MEDIAN",
+    MIN = "MIN",
+    MAX = "MAX",
+    SUM = "SUM",
+    STDEV = "STDEV",
+    COUNT = "COUNT",
+    DISTINCTCOUNT = "DISTINCTCOUNT"
+}

package/dist/qrvey/constants/AGGREGATE_LABEL.js

@@ -0,0 +1,12 @@
+export var AGGREGATE_LABEL;
+(function (AGGREGATE_LABEL) {
+    AGGREGATE_LABEL["NONE"] = "NONE";
+    AGGREGATE_LABEL["AVG"] = "AVG";
+    AGGREGATE_LABEL["MEDIAN"] = "MEDIAN";
+    AGGREGATE_LABEL["MIN"] = "MIN";
+    AGGREGATE_LABEL["MAX"] = "MAX";
+    AGGREGATE_LABEL["SUM"] = "SUM";
+    AGGREGATE_LABEL["STDEV"] = "STDEV";
+    AGGREGATE_LABEL["COUNT"] = "COUNT";
+    AGGREGATE_LABEL["DISTINCTCOUNT"] = "DISTINCTCOUNT";
+})(AGGREGATE_LABEL || (AGGREGATE_LABEL = {}));

package/dist/qrvey/constants/CALCULATION_INFO_LIST.d.ts

@@ -1 +1 @@
-export declare const CALCULATION_INFO_LIST: import("..").ICalculationInfo[];
+export declare const AGGREGATE_INFO_LIST: import("../interfaces/ICalculationInfo").ICalculationInfo[];

package/dist/qrvey/constants/CALCULATION_INFO_LIST.js

@@ -1,6 +1,6 @@
 import { CALCULATION } from "./CALCULATION";
 import { CALCULATION_INFO } from "./CALCULATION_INFO";
-export const CALCULATION_INFO_LIST = [
+export const AGGREGATE_INFO_LIST = [
     CALCULATION_INFO[CALCULATION.AVG],
     CALCULATION_INFO[CALCULATION.SUM],
     CALCULATION_INFO[CALCULATION.MIN],

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

@@ -1,4 +1,7 @@
+export * from './AGGREGATE_ABBREVIATION';
+export * from './AGGREGATE_INFO';
+export * from './AGGREGATE_LABEL';
+export * from './AGGREGATE';
 export * from './CALCULATION_ABBREVIATION';
-export * from './CALCULATION_INFO_LIST';
 export * from './CALCULATION_LABEL';
 export * from './CALCULATION';

package/dist/qrvey/constants/index.js

@@ -1,4 +1,7 @@
+export * from './AGGREGATE_ABBREVIATION';
+export * from './AGGREGATE_INFO';
+export * from './AGGREGATE_LABEL';
+export * from './AGGREGATE';
 export * from './CALCULATION_ABBREVIATION';
-export * from './CALCULATION_INFO_LIST';
 export * from './CALCULATION_LABEL';
 export * from './CALCULATION';

package/dist/{cjs/charts/interfaces/IAggregateType.d.ts → qrvey/interfaces/IAggregate.d.ts}

@@ -1,2 +1,2 @@
 import { AGGREGATE } from "../constants/AGGREGATE";
-export declare type IAggregateType = AGGREGATE;
+export declare type IAggregate = AGGREGATE;

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

@@ -0,0 +1,5 @@
+import { IGeneralInfo } from "../../interfaces/general/IGeneralInfo";
+import { IAggregate } from "./IAggregate";
+export interface IAggregateInfo extends IGeneralInfo {
+    value: IAggregate;
+}

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

@@ -1,5 +1 @@
-export * from './IBDataset';
-export * from './ICalculation';
-export * from './ICalculationInfo';
-export * from './ICalculationType';
 export * from './IDataset';

package/dist/qrvey/interfaces/index.js

@@ -1,5 +1 @@
-export * from './IBDataset';
-export * from './ICalculation';
-export * from './ICalculationInfo';
-export * from './ICalculationType';
 export * from './IDataset';

package/dist/services/helpers/Request.js

@@ -65,7 +65,7 @@ export default class Request {
         }
         const timezoneControl = this.getTimezoneControl(reqData.config);
         if (timezoneControl) {
-            cfg.headers['q-timezone-control'] = `offset=${timezoneControl};use-client-offset-only`;
+            cfg.headers['q-timezone-control'] = `offset=<${timezoneControl}>;use-client-offset-only`;
         }
         // AbortSignal (https://developers.google.com/web/updates/2017/09/abortable-fetch)
         if (reqData.config && reqData.config.signal) {

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.4-8",
+  "version": "1.2.7",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc && tsc -m commonjs --outDir dist/cjs",
     "publish": "node prepareToPublish.js && npm login && np",
-    "publish-prerelease": "node prepareToPublish.js && npm login && np --any-branch",
     "test": "jest test",
     "test:watch": "jest --watch test",
     "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
@@ -23,16 +22,15 @@
     "ts-jest": "27.0.5",
     "typedoc": "0.22.5",
     "typescript": "4.4.4",
-    "@typescript-eslint/eslint-plugin": "5.3.0",
-    "@typescript-eslint/parser": "5.3.0",
-    "eslint": "8.1.0"
+    "@typescript-eslint/eslint-plugin": "5.0.0",
+    "@typescript-eslint/parser": "5.0.0",
+    "eslint": "8.0.0"
   },
   "peerDependencies": {
     "np": "^6.2.3"
   },
   "dependencies": {
     "d3": "6.3.1",
-    "dayjs": "1.10.7",
-    "i18next": "21.4.0"
+    "dayjs": "1.10.7"
   }
 }

package/src/charts/helpers/index.ts

@@ -0,0 +1,3 @@
+export * from './isExpandableTableChart';
+export * from './isSimpleTableChart';
+export * from './isTableChart';

package/src/charts/helpers/isExpandableTableChart.ts

@@ -0,0 +1,5 @@
+import { CHART_TYPE } from "../../constants/Charts.Const";
+
+export function isExpandableTableChart(model: any = {}): boolean {
+    return model.type === CHART_TYPE.EXPANDABLE_TABLE_CHART;
+}

package/src/charts/helpers/isSimpleTableChart.ts

@@ -0,0 +1,5 @@
+import { isTableChart } from "./isTableChart";
+
+export function isSimpleTableChart(model: any = {}): boolean {
+    return isTableChart(model.type) && !(model.chart?.fields?.groupsList || []).length;
+}

package/src/charts/helpers/isTableChart.ts

@@ -0,0 +1,5 @@
+import { CHART_TYPE } from "../../constants/Charts.Const";
+
+export function isTableChart(model: any = {}): boolean {
+    return model.type === CHART_TYPE.TABLE_CHART;
+}

package/src/columns/constants/COLUMN_INFO.ts

@@ -3,40 +3,39 @@ import { COLUMN } from "./COLUMN";
 import { IColumnType } from "../interfaces/IColumnType";
 import { IColumnInfo } from "../interfaces/IColumnInfo";
 import { COMPLEX_COLUMN_INFO } from "./COMPLEX_COLUMN_INFO";
-import { COLUMN_LABEL } from "./COLUMN_LABEL";
 
 /**
  * @description Key/array of column property info
  */
 export const COLUMN_INFO: { [key in IColumnType]: IColumnInfo } = {
-    [COLUMN.SINGLE_CHOICE]: { label: COLUMN_LABEL.SINGLE_CHOICE, shortLabel: 'Single Choice', abbrLabel: 'SC', value: COLUMN.SINGLE_CHOICE, displayed: true },
-    [COLUMN.MULTIPLE_CHOICE]: { label: COLUMN_LABEL.MULTIPLE_CHOICE, shortLabel: 'Multiple Choice', abbrLabel: 'MC', value: COLUMN.MULTIPLE_CHOICE, displayed: true },
-    [COLUMN.RATING]: { label: COLUMN_LABEL.RATING, shortLabel: 'Rating', abbrLabel: 'RA', value: COLUMN.RATING, displayed: true },
-	[COLUMN.YES_NO]: { label: COLUMN_LABEL.YES_NO, shortLabel: 'Yes No', abbrLabel: 'YS', value: COLUMN.YES_NO, displayed: true },
-	[COLUMN.RANKING]: { label: COLUMN_LABEL.RANKING, shortLabel: 'Ranking', abbrLabel: 'RAN', value: COLUMN.RANKING, displayed: true },
-	[COLUMN.DATE]: { label: COLUMN_LABEL.DATE, shortLabel: 'Date', abbrLabel: 'DA', value: COLUMN.DATE, displayed: true },
-	[COLUMN.SLIDEBAR]: { label: COLUMN_LABEL.SLIDEBAR, shortLabel: 'Slidebar', abbrLabel: 'SB', value: COLUMN.SLIDEBAR, displayed: true },
-	[COLUMN.SIGNATURE]: { label: COLUMN_LABEL.SIGNATURE, shortLabel: 'Signature', abbrLabel: 'SIGN', value: COLUMN.SIGNATURE, displayed: true },
-	[COLUMN.DROPDOWN]: { label: COLUMN_LABEL.DROPDOWN, shortLabel: 'Dropdown', abbrLabel: 'DD', value: COLUMN.DROPDOWN, displayed: true },
-	[COLUMN.NUMERIC]: { label: COLUMN_LABEL.NUMERIC, shortLabel: 'Numeric', abbrLabel: 'NUM', value: COLUMN.NUMERIC, displayed: true },
-	[COLUMN.NUMERICC]: { label: COLUMN_LABEL.NUMERICC, shortLabel: 'Numeric-C', abbrLabel: 'NUMC', value: COLUMN.NUMERICC, displayed: false },
-	[COLUMN.NUMERICP]: { label: COLUMN_LABEL.NUMERICP, shortLabel: 'Numeric-P', abbrLabel: 'NUMP', value: COLUMN.NUMERICP, displayed: false },
-	[COLUMN.NUMERICG]: { label: COLUMN_LABEL.NUMERICG, shortLabel: 'Numeric-G', abbrLabel: 'NUMG', value: COLUMN.NUMERICG, displayed: false },
-	[COLUMN.IMAGE]: { label: COLUMN_LABEL.IMAGE, shortLabel: 'Image', abbrLabel: 'IMG', value: COLUMN.IMAGE, displayed: true },
-	[COLUMN.EMAIL_FORM]: { label: COLUMN_LABEL.EMAIL_FORM, shortLabel: 'Email', abbrLabel: 'EML', value: COLUMN.EMAIL_FORM, displayed: true },
-	[COLUMN.PHONE]: { label: COLUMN_LABEL.PHONE, shortLabel: 'Phone', abbrLabel: 'PHN', value: COLUMN.PHONE, displayed: true },
-	[COLUMN.PASSWORD]: { label: COLUMN_LABEL.PASSWORD, shortLabel: 'Password', abbrLabel: 'PWD', value: COLUMN.PASSWORD, displayed: true },
-	[COLUMN.CHECKLIST]: { label: COLUMN_LABEL.CHECKLIST, shortLabel: 'Check List', abbrLabel: 'CL', value: COLUMN.CHECKLIST, displayed: false },
-	[COLUMN.NPS_SCORE]: { label: COLUMN_LABEL.NPS_SCORE, shortLabel: 'NPS Score', abbrLabel: 'NPMS', value: COLUMN.NPS_SCORE, displayed: false },
-	[COLUMN.NPS_FEEDBACK]: { label: COLUMN_LABEL.NPS_FEEDBACK, shortLabel: 'NPS Feedback', abbrLabel: 'NPSFB', value: COLUMN.NPS_FEEDBACK, displayed: false },
-	[COLUMN.TEXT_LABEL]: { label: COLUMN_LABEL.TEXT_LABEL, shortLabel: 'Text Label', abbrLabel: 'TL', value: COLUMN.TEXT_LABEL, displayed: true },
-	[COLUMN.TEXT_CATEGORY]: { label: COLUMN_LABEL.TEXT_CATEGORY, shortLabel: 'Text Category', abbrLabel: 'TC', value: COLUMN.TEXT_CATEGORY, displayed: true },
-	[COLUMN.LOOKUP]: { label: COLUMN_LABEL.LOOKUP, shortLabel: 'Lookup', abbrLabel: 'LUP', value: COLUMN.LOOKUP, displayed: true },
-	[COLUMN.HEADLINE]: { label: COLUMN_LABEL.HEADLINE, shortLabel: 'Headline', abbrLabel: 'HL', value: COLUMN.HEADLINE, displayed: false },
-	[COLUMN.SECTION]: { label: COLUMN_LABEL.SECTION, shortLabel: 'Section', abbrLabel: 'SCN', value: COLUMN.SECTION, displayed: false },
-	[COLUMN.FORMULA]: { label: COLUMN_LABEL.FORMULA, shortLabel: 'Formula', abbrLabel: 'FML', value: COLUMN.FORMULA, displayed: true },
-	[COLUMN.AGGREGATED_FORMULA]: { label: COLUMN_LABEL.AGGREGATED_FORMULA, shortLabel: 'Agg Formula', abbrLabel: 'AF', value: COLUMN.AGGREGATED_FORMULA, displayed: true },
-	[COLUMN.BUCKET]: { label: COLUMN_LABEL.BUCKET, shortLabel: 'Bucket', abbrLabel: 'BCT', value: COLUMN.BUCKET, displayed: true },
+    [COLUMN.SINGLE_CHOICE]: { label: 'Single Choice', shortLabel: 'Single Choice', abbrLabel: 'SC', value: COLUMN.SINGLE_CHOICE, displayed: true },
+    [COLUMN.MULTIPLE_CHOICE]: { label: 'Multiple Choice', shortLabel: 'Multiple Choice', abbrLabel: 'MC', value: COLUMN.MULTIPLE_CHOICE, displayed: true },
+    [COLUMN.RATING]: { label: 'Rating', shortLabel: 'Rating', abbrLabel: 'RA', value: COLUMN.RATING, displayed: true },
+	[COLUMN.YES_NO]: { label: 'Yes No', shortLabel: 'Yes No', abbrLabel: 'YS', value: COLUMN.YES_NO, displayed: true },
+	[COLUMN.RANKING]: { label: 'Ranking', shortLabel: 'Ranking', abbrLabel: 'RAN', value: COLUMN.RANKING, displayed: true },
+	[COLUMN.DATE]: { label: 'Date', shortLabel: 'Date', abbrLabel: 'DA', value: COLUMN.DATE, displayed: true },
+	[COLUMN.SLIDEBAR]: { label: 'Slidebar', shortLabel: 'Slidebar', abbrLabel: 'SB', value: COLUMN.SLIDEBAR, displayed: true },
+	[COLUMN.SIGNATURE]: { label: 'Signature', shortLabel: 'Signature', abbrLabel: 'SIGN', value: COLUMN.SIGNATURE, displayed: true },
+	[COLUMN.DROPDOWN]: { label: 'Dropdown', shortLabel: 'Dropdown', abbrLabel: 'DD', value: COLUMN.DROPDOWN, displayed: true },
+	[COLUMN.NUMERIC]: { label: 'Numeric', shortLabel: 'Numeric', abbrLabel: 'NUM', value: COLUMN.NUMERIC, displayed: true },
+	[COLUMN.NUMERICC]: { label: 'Numeric-C', shortLabel: 'Numeric-C', abbrLabel: 'NUMC', value: COLUMN.NUMERICC, displayed: false },
+	[COLUMN.NUMERICP]: { label: 'Numeric-P', shortLabel: 'Numeric-P', abbrLabel: 'NUMP', value: COLUMN.NUMERICP, displayed: false },
+	[COLUMN.NUMERICG]: { label: 'NUMERIC-G', shortLabel: 'Numeric-G', abbrLabel: 'NUMG', value: COLUMN.NUMERICG, displayed: false },
+	[COLUMN.IMAGE]: { label: 'Image', shortLabel: 'Image', abbrLabel: 'IMG', value: COLUMN.IMAGE, displayed: true },
+	[COLUMN.EMAIL_FORM]: { label: 'Email Form', shortLabel: 'Email', abbrLabel: 'EML', value: COLUMN.EMAIL_FORM, displayed: true },
+	[COLUMN.PHONE]: { label: 'Phone', shortLabel: 'Phone', abbrLabel: 'PHN', value: COLUMN.PHONE, displayed: true },
+	[COLUMN.PASSWORD]: { label: 'Password', shortLabel: 'Password', abbrLabel: 'PWD', value: COLUMN.PASSWORD, displayed: true },
+	[COLUMN.CHECKLIST]: { label: 'Check List', shortLabel: 'Check List', abbrLabel: 'CL', value: COLUMN.CHECKLIST, displayed: false },
+	[COLUMN.NPS_SCORE]: { label: 'NPS Score', shortLabel: 'NPS Score', abbrLabel: 'NPMS', value: COLUMN.NPS_SCORE, displayed: false },
+	[COLUMN.NPS_FEEDBACK]: { label: 'NPS Feedback', shortLabel: 'NPS Feedback', abbrLabel: 'NPSFB', value: COLUMN.NPS_FEEDBACK, displayed: false },
+	[COLUMN.TEXT_LABEL]: { label: 'Text Label', shortLabel: 'Text Label', abbrLabel: 'TL', value: COLUMN.TEXT_LABEL, displayed: true },
+	[COLUMN.TEXT_CATEGORY]: { label: 'Text Category', shortLabel: 'Text Category', abbrLabel: 'TC', value: COLUMN.TEXT_CATEGORY, displayed: true },
+	[COLUMN.LOOKUP]: { label: 'Lookup', shortLabel: 'Lookup', abbrLabel: 'LUP', value: COLUMN.LOOKUP, displayed: true },
+	[COLUMN.HEADLINE]: { label: 'Headline', shortLabel: 'Headline', abbrLabel: 'HL', value: COLUMN.HEADLINE, displayed: false },
+	[COLUMN.SECTION]: { label: 'Section', shortLabel: 'Section', abbrLabel: 'SCN', value: COLUMN.SECTION, displayed: false },
+	[COLUMN.FORMULA]: { label: 'Formula', shortLabel: 'Formula', abbrLabel: 'FML', value: COLUMN.FORMULA, displayed: true },
+	[COLUMN.AGGREGATED_FORMULA]: { label: 'Aggregated Formula', shortLabel: 'Agg Formula', abbrLabel: 'AF', value: COLUMN.AGGREGATED_FORMULA, displayed: true },
+	[COLUMN.BUCKET]: { label: 'Bucket', shortLabel: 'Bucket', abbrLabel: 'BCT', value: COLUMN.BUCKET, displayed: true },
 
 	...COMPOUND_COLUMN_INFO,
 	...COMPLEX_COLUMN_INFO,

package/src/columns/interfaces/IColumn.ts

@@ -1,16 +1,16 @@
-import { IColumnCalculationType } from "../../qrvey/interfaces/ICalculationType";
+import { IColumnCalculationType } from "./IColumnCalculationType";
+import { IColumnAggregateType } from "./IColumnAggregateType";
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 import { IColumnPropertyType } from "./IColumnPropertyType";
 import { IColumnSortingSettings } from "./IColumnSortingSettings";
 import { IBColumn } from "./IBColumn";
-import { IAggregateType } from "../../charts/interfaces/IAggregateType";
 
 /**
  * Structure for columns used in the  App frontend side
  */
 export interface IColumn extends Omit<IBColumn, "text" | "bucketId" | "formulaId"> {
     bucketid?: string;
-    aggregate?: IAggregateType;
+    aggregate?: IColumnAggregateType;
     calculation?: IColumnCalculationType;
     dataset?: IDataset;
     formulaid?: string;

package/src/columns/interfaces/IColumnAggregateType.ts

@@ -0,0 +1,3 @@
+import { AGGREGATE } from "../../qrvey/constants/AGGREGATE";
+
+export type IColumnAggregateType = AGGREGATE;

package/src/{qrvey/interfaces/ICalculationType.ts → columns/interfaces/IColumnCalculationType.ts}

@@ -1,3 +1,3 @@
-import { CALCULATION } from "../constants/CALCULATION";
+import { CALCULATION } from "../../qrvey/constants/CALCULATION";
 
 export type IColumnCalculationType = typeof CALCULATION[keyof typeof CALCULATION];

package/src/columns/interfaces/index.ts

@@ -1,5 +1,7 @@
 export * from './IColumn';
 
+export * from './IColumnAggregateType';
+export * from './IColumnCalculationType';
 export * from './IColumnInfo';
 export * from './IColumnOutputFormatSettings';
 

package/src/constants/Charts.Const.ts

@@ -1,6 +1,7 @@
 export enum CHART_TYPE {
     BAR_CHART = 'BAR_CHART',
     BAR_CHART_MS = 'BAR_CHART_MS',
+    EXPANDABLE_TABLE_CHART = 'EXPANDABLE_TABLE_CHART',
     SYMBOL_CHART = 'SYMBOL_CHART',
     SYMBOL_CHART_MS = 'SYMBOL_CHART_MS',
     LINE_CHART = 'LINE_CHART',

package/src/filters/adapters/UIToOldLogic.ts

@@ -93,6 +93,8 @@ function buildExpressions(filterSection: IFUFilter[], scope: IFUScope, dataset:
             value: getBackendValues(filter),
             uiExtras: getFilterDetail(filter, scope, dataset),
         };
+        expression['enabled'] = expression.value.length > 0 ? filter.enabled : false;
+
         expressions.push(expression);
         return expressions;
     }, [] as OLD_IFilterExpression[]);

package/src/filters/adapters/flatUIToOldLogic.ts

@@ -181,8 +181,7 @@ function getRankingExpressions(props: OLD_IFilterDetail): OLD_IFilterExpression[
 
 function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
   const uiValue = getUIValuess(props);
-  return {
-    enabled: props.enabled,
+  const expression = {
     groupValue: getBackendGroupValue(props as any),
     linkid: props.column.linkid,
     property: getBackendProperty(props as any),
@@ -197,6 +196,9 @@ function getRegularExpression(props: OLD_IFilterDetail): OLD_IFilterExpression {
       uiValue
     }
   };
+  expression['enabled'] = expression.value.length > 0 ? props.enabled : false;
+
+  return expression;
 }
 
 // function getGroupValue(props: OLD_IFilterDetail): IFProperty {

package/src/filters/adapters/logicToFlatUI.ts

@@ -83,7 +83,7 @@ function getFilterByExpression(expression: OLD_IFilterExpression, scopeItem: OLD
         },
         dateSection: uiExtras.dateSection,
         displayed: true,
-        enabled: expression.enabled,
+        enabled: uiExtras.enabled,
         extras: {
             ...uiExtras.extras,
             panelid: uiExtras.panelid,

package/src/filters/helpers/common/getFilterColumnLabel.ts

@@ -1,6 +1,6 @@
-import { AGGREGATE_ABBREVIATION } from "../../../charts/constants/AGGREGATE_ABBREVIATION";
 import { COMPLEX_COLUMN_PROPERTIES } from "../../../columns/constants/COMPLEX_COLUMN_PROPERTIES";
 import { isComplexColumn } from "../../../columns/helpers/isComplexColumn";
+import { AGGREGATE_ABBREVIATION } from "../../../qrvey/constants/AGGREGATE_ABBREVIATION";
 import { IFUColumn } from "../../interfaces/ui/IFUColumn";
 
 /**

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

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

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

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

package/src/general/object/mergeDeep.ts

@@ -17,21 +17,22 @@ interface IMergeDeepSettings {
  * @param settings Object settings for this function
  * @returns a new merged object
  */
-export function mergeDeep(obj1: any, obj2: any, settings?: IMergeDeepSettings) {
+export function mergeDeep(obj1: any, obj2: any, settings?: IMergeDeepSettings) { // Our merge function
     settings = getParamsToMergeDeep(settings);
 
     if (!isValid(obj1, obj2)) return objectCopy(obj1);
 
-    const result = {};
-    for(const i in obj1){
+    const result = {}; // return result
+    for(const i in obj1){      // for every property in obj1 
         if (i != null && i in obj2 && isObject(obj1[i])){
-            result[i] = mergeDeep(obj1[i], obj2[i], settings);
+            result[i] = mergeDeep(obj1[i], obj2[i], settings); // if it's an object, merge   
         } else {
-          result[i] = obj1[i];
+          result[i] = obj1[i]; // add it to result
         }
     }
-    for(const i in obj2) {
-        if (i != null && ((!isObject(obj2[i]) && i in result && settings.mergeExistingValues) || (!(i in result) && settings.mergeMissingProperties))) {
+    for(const i in obj2) { // add the remaining properties from object 2
+        if (i != null && !isObject(obj2[i]) && (i in result && settings.mergeExistingValues
+            || !(i in result) && settings.mergeMissingProperties)) { //conflict
             result[i] = obj2[i];
         }
     }

package/src/globalization/filters/FILTER_BUILDER.ts

@@ -0,0 +1,35 @@
+import { COLUMN_LABEL } from "../../columns/constants/COLUMN_LABEL";
+import { COLUMN_PROPERTY_LABEL } from "../../columns/constants/COLUMN_PROPERTY_LABEL";
+import { FILTER_DATE_SECTION_LABEL } from "../../filters/constants/common/FILTER_DATE_SECTION_LABEL";
+import { FILTER_VALIDATOR_LABEL } from "../../filters/constants/common/FILTER_VALIDATOR_LABEL";
+import { SLIDEBAR } from "./SLIDEBAR";
+import { VALUES_CONTAINER } from "./VALUES_CONTAINER";
+
+export const FILTER_BUILDER = {
+    title: 'Filter',
+    apply_button: 'Apply',
+    cancel_button: 'Cancel',
+    column_selector: {
+        title: 'Column',
+        columnTypes: COLUMN_LABEL,
+    },
+    date_sections: FILTER_DATE_SECTION_LABEL,
+    divider_label: 'Is',
+    validator_selector: FILTER_VALIDATOR_LABEL,
+    property_selector: COLUMN_PROPERTY_LABEL,
+    value_container: VALUES_CONTAINER,
+    slidebar: SLIDEBAR,
+    selected_values_container: {
+        empty_message: 'No values added'
+    },
+    info_container: {
+        info: {
+            first: 'OR',
+            second: 'logic is used for multiple values.'
+        },
+        selection: {
+            selected: 'selected of',
+            loaded: 'loaded',
+        },
+    }
+};

package/src/globalization/filters/SLIDEBAR.ts

@@ -0,0 +1,8 @@
+export const SLIDEBAR = {
+    min: 'Data Min',
+    max: 'Data Max',
+    and: 'And',
+    values_container: {
+        tooltip: 'Add new value',
+    },
+};

package/src/globalization/{labels/filters/I18N_VALUE_CONTAINER.ts → filters/VALUES_CONTAINER.ts}

@@ -1,6 +1,4 @@
-import { II18nValueContainer } from "../../interfaces/filters/II18nValueContainer";
-
-export const I18N_VALUE_CONTAINER: II18nValueContainer = {
+export const VALUES_CONTAINER = {
     search_input: {
         placeholder: 'Search or type values separated by commas. Use {{ for tokens.',
         enter_value: {
@@ -9,4 +7,5 @@ export const I18N_VALUE_CONTAINER: II18nValueContainer = {
             third: "to Insert",
         },
     },
+    select_all: 'Select All',
 };

package/src/globalization/filters/index.ts

@@ -0,0 +1,3 @@
+export * from './FILTER_BUILDER';
+export * from './SLIDEBAR';
+export * from './VALUES_CONTAINER';

package/src/globalization/index.ts

@@ -1,3 +1 @@
-export * from './interfaces/index';
-export * from './labels/index';
-export * from './service/index';
+export * from './filters/index';

package/src/index.ts

@@ -1,4 +1,3 @@
-export * from './charts/index';
 export * from './constants/index';
 export * from './columns/index';
 export * from './dates/index';

package/src/interfaces/Qrvey.Interface.ts

@@ -1,3 +1,5 @@
+import { AGGREGATE_ABBREVIATION } from "../qrvey/constants/AGGREGATE_ABBREVIATION";
+import { AGGREGATE_LABEL } from "../qrvey/constants/AGGREGATE_LABEL";
 import { CALCULATION_ABBREVIATION } from "../qrvey/constants/CALCULATION_ABBREVIATION";
 import { CALCULATION_LABEL } from "../qrvey/constants/CALCULATION_LABEL";
 
@@ -26,6 +28,13 @@ import { CALCULATION_LABEL } from "../qrvey/constants/CALCULATION_LABEL";
     
 //     options?: any[];
 // }
+
+export interface IColumnAggregate {
+    abbreviation: IColumnAggregateAbbreviation;
+    id: string;
+    label: IColumnAggregateLabel;
+    text: string;
+}
   
 export interface IColumnCalculation {
     abbreviation: IColumnCalculationAbbreviation;
@@ -41,5 +50,7 @@ export interface IColumnCalculation {
 //     showIndicator?: boolean;
 // }
 
+export type IColumnAggregateAbbreviation = AGGREGATE_ABBREVIATION;
+export type IColumnAggregateLabel = AGGREGATE_LABEL;
 export type IColumnCalculationLabel = CALCULATION_LABEL;
 export type IColumnCalculationAbbreviation = CALCULATION_ABBREVIATION;

package/src/interfaces/index.ts

@@ -1,4 +1,4 @@
 export * from './Chart.Interface';
 export * from './IChartBuilder.Interface';
-export * from './general';
+export * from './general/index';
 export * from './Qrvey.Interface';

package/src/{charts → qrvey}/constants/AGGREGATE_INFO.ts

@@ -1,10 +1,10 @@
+import { IAggregate } from "../interfaces/IAggregate";
 import { IAggregateInfo } from "../interfaces/IAggregateInfo";
-import { IAggregateType } from "../interfaces/IAggregateType";
 import { AGGREGATE } from "./AGGREGATE";
 import { AGGREGATE_ABBREVIATION } from "./AGGREGATE_ABBREVIATION";
 import { AGGREGATE_LABEL } from "./AGGREGATE_LABEL";
 
-export const AGGREGATE_INFO: { [key in IAggregateType]: IAggregateInfo } = {
+export const AGGREGATE_INFO: { [key in IAggregate]: IAggregateInfo } = {
     [AGGREGATE.NONE]: { value: AGGREGATE.NONE, displayed: true, label: AGGREGATE_LABEL.NONE, shortLabel: AGGREGATE_LABEL.NONE, abbrLabel: AGGREGATE_ABBREVIATION.NONE },
     [AGGREGATE.AVG]: { value: AGGREGATE.AVG, displayed: true, label: AGGREGATE_LABEL.AVG, shortLabel: AGGREGATE_LABEL.AVG, abbrLabel: AGGREGATE_ABBREVIATION.AVG },
     [AGGREGATE.MEDIAN]: { value: AGGREGATE.MEDIAN, displayed: true, label: AGGREGATE_LABEL.MEDIAN, shortLabel: AGGREGATE_LABEL.MEDIAN, abbrLabel: AGGREGATE_ABBREVIATION.MEDIAN },

package/src/qrvey/constants/AGGREGATE_LABEL.ts

@@ -0,0 +1,11 @@
+export enum AGGREGATE_LABEL {
+    NONE = 'NONE',
+    AVG = 'AVG',
+    MEDIAN = 'MEDIAN',
+    MIN = 'MIN',
+    MAX = 'MAX',
+    SUM = 'SUM',
+    STDEV = 'STDEV',
+    COUNT = 'COUNT',
+    DISTINCTCOUNT = 'DISTINCTCOUNT',
+}

package/src/qrvey/constants/CALCULATION_INFO_LIST.ts

@@ -1,7 +1,7 @@
 import { CALCULATION } from "./CALCULATION";
 import { CALCULATION_INFO } from "./CALCULATION_INFO";
 
-export const CALCULATION_INFO_LIST = [
+export const AGGREGATE_INFO_LIST = [
     CALCULATION_INFO[CALCULATION.AVG],
     CALCULATION_INFO[CALCULATION.SUM],
     CALCULATION_INFO[CALCULATION.MIN],

package/src/qrvey/constants/index.ts

@@ -1,4 +1,7 @@
+export * from './AGGREGATE_ABBREVIATION';
+export * from './AGGREGATE_INFO';
+export * from './AGGREGATE_LABEL';
+export * from './AGGREGATE';
 export * from './CALCULATION_ABBREVIATION';
-export * from './CALCULATION_INFO_LIST';
 export * from './CALCULATION_LABEL';
 export * from './CALCULATION';

package/src/{charts/interfaces/IAggregateType.ts → qrvey/interfaces/IAggregate.ts}

@@ -1,3 +1,3 @@
 import { AGGREGATE } from "../constants/AGGREGATE";
 
-export type IAggregateType = AGGREGATE;
+export type IAggregate = AGGREGATE;

package/src/qrvey/interfaces/IAggregateInfo.ts

@@ -0,0 +1,7 @@
+
+import { IGeneralInfo } from "../../interfaces/general/IGeneralInfo";
+import { IAggregate } from "./IAggregate";
+
+export interface IAggregateInfo extends IGeneralInfo {
+    value: IAggregate;
+}

package/src/qrvey/interfaces/index.ts

@@ -1,5 +1 @@
-export * from './IBDataset';
-export * from './ICalculation';
-export * from './ICalculationInfo';
-export * from './ICalculationType';
-export * from './IDataset';
+export * from './IDataset';

package/src/services/helpers/Request.ts

@@ -67,7 +67,7 @@ export default class Request {
     
         const timezoneControl = this.getTimezoneControl(reqData.config);
         if (timezoneControl) {
-          cfg.headers['q-timezone-control'] = `offset=${timezoneControl};use-client-offset-only`;
+          cfg.headers['q-timezone-control'] = `offset=<${timezoneControl}>;use-client-offset-only`;
         }
         
         // AbortSignal (https://developers.google.com/web/updates/2017/09/abortable-fetch)

package/src/stencil/util/index.ts

@@ -1,2 +1,2 @@
 export * from './getConfig';
-export * from './createRef';
+export * from './createRef';