@qrvey/utils 1.10.0-0 → 1.10.0-2

package/dist/services/adapters/BDatasetsToUIDatasets.adapter.js

@@ -1,9 +1,11 @@
 import { getAttribute } from "../../general/object/getAttribute";
 import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
+import { BTimezoneToUITimezone } from "./BTimezoneToUITimezone";
 export function BDatasetsToUIDatasets(datasets = []) {
     return datasets.map((dataset) => ({
         qrveyid: getAttribute(dataset, "qrvey_id"),
         label: dataset.name,
         options: BColumnsToUIColumns(dataset.options, dataset),
+        timezone: BTimezoneToUITimezone(dataset.timezone),
     }));
 }

package/dist/services/adapters/BModelToUIModel.adapter.js

@@ -1,6 +1,7 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { BBranchesMapToUIBranchesMap } from "./BBranchesMapToUIBranchesMap.adapter";
 import { BColumnsToUIColumns } from "./BColumnsToUIColumns.adapter";
+import { BTimezoneToUITimezone } from "./BTimezoneToUITimezone";
 export function BModelToUIModel(model) {
     if (isEmpty(model))
         return;
@@ -20,6 +21,7 @@ export function BModelToUIModel(model) {
         totalRecords: model.numResponses,
         qrveyid: model.qrveyid,
         status: model.status,
+        timezone: BTimezoneToUITimezone(model.timezone),
         userid: model.userid,
     };
 }

package/dist/services/adapters/BTimezoneToUITimezone.d.ts

@@ -0,0 +1,8 @@
+import { IDTimezone } from "../../dates/interfaces/IDTimezone";
+import { IBTimezone } from "../../dates/interfaces/IBTimezone";
+/**
+ * Transforms the backenc timezone structure to UI timezone structure
+ * @param {IBTimezone} timezone the backend timezone object
+ * @returns {IDTimezone} the UI timezone object
+ */
+export declare function BTimezoneToUITimezone(timezone: IBTimezone): IDTimezone;

package/dist/services/adapters/BTimezoneToUITimezone.js

@@ -0,0 +1,14 @@
+import { TIMEZONE_TYPE } from "../../dates/constants/TIMEZONE_TYPE";
+import { getTimezoneOffsetByType } from "../../dates/helpers/getTimezoneOffsetByType";
+/**
+ * Transforms the backenc timezone structure to UI timezone structure
+ * @param {IBTimezone} timezone the backend timezone object
+ * @returns {IDTimezone} the UI timezone object
+ */
+export function BTimezoneToUITimezone(timezone) {
+    const type = (timezone === null || timezone === void 0 ? void 0 : timezone.type) || TIMEZONE_TYPE.DEFAULT;
+    return {
+        type,
+        offset: getTimezoneOffsetByType(Object.assign(Object.assign({}, timezone), { type })),
+    };
+}

package/dist/services/helpers/Request.d.ts

@@ -2,7 +2,7 @@ export default class Request {
     static checkStatus(response: any): Promise<any>;
     static hasQvToken(config: any): boolean;
     static getQvToken(config: any): any;
-    static getTimezoneControl(config: any): any;
+    static getTimezoneOffset(config: any): string;
     static hasApiKey(config: any): boolean;
     static getApiKey(config: any): any;
     static makeUrl(config: any, url: any, params?: any): string;

package/dist/services/helpers/Request.js

@@ -7,6 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { numericOffsetToISO } from "../../dates/adapters/numericOffsetToISO";
+import { isEmpty } from "../../general/mix/isEmpty";
 import { getAttribute } from "../../general/object/getAttribute";
 import { serialize } from "../../general/object/serialize";
 import { parseUrl } from "../../general/string/parseUrl";
@@ -24,8 +26,12 @@ export default class Request {
     static getQvToken(config) {
         return getAttribute(config, "qv_token");
     }
-    static getTimezoneControl(config) {
-        return getAttribute(config, "timezone_control");
+    static getTimezoneOffset(config) {
+        var _a;
+        const timezoneOffset = (_a = config.timezone) === null || _a === void 0 ? void 0 : _a.offset;
+        if (!isEmpty(timezoneOffset)) {
+            return numericOffsetToISO(timezoneOffset);
+        }
     }
     static hasApiKey(config) {
         return !!this.getApiKey(config);
@@ -68,9 +74,9 @@ export default class Request {
                 cfg.credentials = "include";
             }
         }
-        const timezoneControl = this.getTimezoneControl(reqData.config);
-        if (timezoneControl) {
-            cfg.headers["q-timezone-control"] = `offset=${timezoneControl};use-client-offset-only`;
+        const timezoneOffset = this.getTimezoneOffset(reqData.config);
+        if (timezoneOffset) {
+            cfg.headers["q-timezone-control"] = `offset=${timezoneOffset}`;
         }
         // AbortSignal (https://developers.google.com/web/updates/2017/09/abortable-fetch)
         if (reqData.config && reqData.config.signal) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.10.0-0",
+  "version": "1.10.0-2",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
@@ -24,10 +24,10 @@
   "devDependencies": {
     "@types/jest": "29.4.0",
     "@types/responselike": "1.0.0",
-    "@typescript-eslint/eslint-plugin": "5.49.0",
-    "@typescript-eslint/parser": "5.49.0",
+    "@typescript-eslint/eslint-plugin": "5.50.0",
+    "@typescript-eslint/parser": "5.50.0",
     "auto-changelog": "2.4.0",
-    "eslint": "8.32.0",
+    "eslint": "8.33.0",
     "eslint-config-prettier": "8.6.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
@@ -36,7 +36,7 @@
     "np": "7.6.3",
     "prettier": "2.8.3",
     "ts-jest": "29.0.5",
-    "typescript": "4.9.4"
+    "typescript": "4.9.5"
   },
   "dependencies": {
     "d3-format": "2.0.0",

package/dist/cjs/dates/helpers/adjustTimezone.d.ts

@@ -1,6 +0,0 @@
-/**
- * Adjusts a Date with the UTC-0 Timezone.
- * @param date String, object or millisencond number of the date
- * @returns updated Date object
- */
-export declare function adjustTimezone(date: string | Date | number): Date;

package/dist/cjs/dates/helpers/adjustTimezone.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.adjustTimezone = void 0;
-const constants_1 = require("../constants");
-const isValidPotentialDate_1 = require("./isValidPotentialDate");
-const validateDate_1 = require("./validateDate");
-/**
- * Adjusts a Date with the UTC-0 Timezone.
- * @param date String, object or millisencond number of the date
- * @returns updated Date object
- */
-function adjustTimezone(date) {
-    if (!(0, isValidPotentialDate_1.isValidPotentialDate)(date) ||
-        (typeof date === "string" && !(0, validateDate_1.validateDate)(date, constants_1.DATE_FORMAT.DAY)))
-        return date;
-    const dt = new Date(date.valueOf());
-    return new Date(+dt + dt.getTimezoneOffset() * 1000 * 60);
-}
-exports.adjustTimezone = adjustTimezone;

package/dist/dates/helpers/adjustTimezone.d.ts

@@ -1,6 +0,0 @@
-/**
- * Adjusts a Date with the UTC-0 Timezone.
- * @param date String, object or millisencond number of the date
- * @returns updated Date object
- */
-export declare function adjustTimezone(date: string | Date | number): Date;

package/dist/dates/helpers/adjustTimezone.js

@@ -1,15 +0,0 @@
-import { DATE_FORMAT } from "../constants";
-import { isValidPotentialDate } from "./isValidPotentialDate";
-import { validateDate } from "./validateDate";
-/**
- * Adjusts a Date with the UTC-0 Timezone.
- * @param date String, object or millisencond number of the date
- * @returns updated Date object
- */
-export function adjustTimezone(date) {
-    if (!isValidPotentialDate(date) ||
-        (typeof date === "string" && !validateDate(date, DATE_FORMAT.DAY)))
-        return date;
-    const dt = new Date(date.valueOf());
-    return new Date(+dt + dt.getTimezoneOffset() * 1000 * 60);
-}