@qrvey/utils 1.2.2 → 1.2.4-10

package/src/interfaces/Qrvey.Interface.ts

@@ -1,5 +1,3 @@
-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";
 
@@ -28,13 +26,6 @@ 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;
@@ -50,7 +41,5 @@ 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/general/IGeneralWidgetConfig.ts

@@ -3,6 +3,7 @@ export interface IGeneralWidgetConfig {
     apiKey?: string;
     qrveyid?: string;
     qv_token?: string;
+    timezoneControl?: string;
     isFromAN?: boolean;
     appid: string;
     userid: string;

package/src/interfaces/index.ts

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

package/src/qrvey/constants/CALCULATION_INFO_LIST.ts

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

package/src/qrvey/constants/index.ts

@@ -1,7 +1,4 @@
-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/{columns/interfaces/IColumnCalculationType.ts → qrvey/interfaces/ICalculationType.ts}

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

package/src/qrvey/interfaces/index.ts

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

package/src/services/adapters/BColumnsToUIColumns.adapter.ts

@@ -0,0 +1,20 @@
+import { IBColumn } from "../../columns/interfaces/IBColumn";
+import { IColumn } from "../../columns/interfaces/IColumn";
+import { IBDataset } from "../../qrvey/interfaces/IBDataset";
+
+export function BColumnsToUIColumns(columns: IBColumn[] = [], dataset?: IBDataset): IColumn[] {
+    return columns.map(column => ({
+      bucketid: column.bucketId,
+      formulaid: column.formulaId,
+      formulaType: column.formulaType,
+      geogroup: column.geogroup,
+      id: column.id,
+      label: column.text,
+      linked: column.linked,
+      linkid: dataset?.linkid || column.linkid,
+      outputFormat: column.outputFormat,
+      property: column.property,
+      qrveyid: dataset?.qrveyid || column.qrveyid,
+      type: column.type,
+    }));
+}

package/src/services/adapters/BDatasetsToUIDatasets.adapter.ts

@@ -0,0 +1,12 @@
+import { IBDataset } from "../../qrvey/interfaces/IBDataset";
+import { IDataset } from "../../qrvey/interfaces/IDataset";
+import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
+
+export function BDatasetsToUIDatasets(datasets: IBDataset[] = []): IDataset[] {
+    return datasets.map(dataset => ({
+      qrveyid: dataset.qrveyid,
+      label: dataset.name,
+      linkid: dataset.linkid,
+      options: BColumnsToUIColumns(dataset.options, dataset),
+    }));
+}

package/src/services/adapters/index.ts

@@ -0,0 +1,2 @@
+export * from './BDatasetsToUIDatasets.adapter';
+export * from './BColumnsToUIColumns.adapter';

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

@@ -1,8 +1,8 @@
 import { IGeneralWidgetConfig } from "../../interfaces/general/IGeneralWidgetConfig";
 import { IDataset } from "../../qrvey/interfaces/IDataset";
-import { IBDataset } from "../../qrvey/interfaces/IBDataset";
 import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
 import Request from "../helpers/Request";
+import { BDatasetsToUIDatasets } from "../adapters/BDatasetsToUIDatasets.adapter";
 
 /**
    * Get a dataset by Qrvey ID
@@ -14,6 +14,6 @@ export function getDatasetColumns(config: IGeneralWidgetConfig, qrveyid?: string
       'optionsAttributes': ['id', 'text', 'type', 'property', 'linked', 'linkid', 'qrveyid', 'bucketId', 'formulaId', 'formulaType', 'geogroup', 'outputFormat'],
       'extend': true
     })
-    .then((datasets: IBDataset[]): IDataset[] => datasets.map(dataset => ({ ...dataset, label: dataset.name, options: dataset.options.map(option => ({ ...option, label: option.text, linkid: dataset.linkid, qrveyid: dataset.qrveyid })) })))
+    .then(BDatasetsToUIDatasets)
     .catch(_e => []);
 }

package/src/services/helpers/Request.ts

@@ -14,10 +14,14 @@ export default class Request {
         return !!this.getQvToken(config);
       }
     
-      static getQvToken(config) {
+    static getQvToken(config) {
         return getAttribute(config, 'qv_token');
     }
 
+    static getTimezoneControl(config) {
+      return getAttribute(config, 'timezone_control');
+    }
+
     static hasApiKey(config) {
         return !!this.getApiKey(config);
     }
@@ -61,6 +65,11 @@ export default class Request {
           }
         }
     
+        const timezoneControl = this.getTimezoneControl(reqData.config);
+        if (timezoneControl) {
+          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) {
           cfg.signal = reqData.config.signal;

package/src/services/index.ts

@@ -1,3 +1,4 @@
+export * from './adapters/index';
 export * from './api/index';
 export * from './constants/index';
 export * from './helpers/index';

package/src/stencil/util/index.ts

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

package/test/format.test.js

@@ -64,8 +64,8 @@ describe('Testing format util', function () {
     });
 
     test("Format Number Abbreviated", ()=>{
-        const numberFormasted = formatAbbreviated(4.419, 0);
-        expect(numberFormasted).toEqual("4.4");
+        const numberFormatted = formatAbbreviated(4.419, 0);
+        expect(numberFormatted).toEqual("4.42");
     })
 
 });