@qrvey/utils 1.8.0-3 → 1.8.0-4

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.8.0-3*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.8.0-4*
 
 > Helper, Utils for all Qrvey Projects
 

package/dist/charts/adapters/RequestAdapterMetric.d.ts

@@ -1,7 +1,20 @@
-import { MetricConfig, MetricRequestPayload } from "../interfaces/IRequestAdapterMetric";
+import { IBColumn } from "../../columns";
+import { CustomRangeConfig, MetricConfig, MetricCustomRange, MetricPeriod, MetricRequestPayload, MetricTimeInfo } from "../interfaces/IRequestAdapterMetric";
 /**
  * It takes a metric object and returns a metric request object
  * @param {MetricConfig} metricObj - MetricConfigData
  * @returns A function that takes in a metricObj and returns a partial metricRequest
  */
 export declare const makeBodyRequestMetrics: (metricObj: MetricConfig) => Partial<MetricRequestPayload>;
+/**
+ * It takes a date column, time data, and a custom range config and returns a metric period or metric
+ * custom range
+ * @param dateColumn - The column that contains the date data.
+ * @param timeData - {
+ * @param {CustomRangeConfig} range - CustomRangeConfig
+ * @returns An object with the following properties:
+ *   - label
+ *   - value
+ *   - questionid
+ */
+export declare const metricMakeTimeData: (dateColumn: IBColumn, timeData: MetricTimeInfo, range: CustomRangeConfig) => MetricPeriod | MetricCustomRange;

package/dist/charts/adapters/RequestAdapterMetric.js

@@ -53,7 +53,7 @@ const isComparison = (data) => Boolean(data === null || data === void 0 ? void 0
  *   - value
  *   - questionid
  */
-const metricMakeTimeData = (dateColumn, timeData, range) => {
+export const metricMakeTimeData = (dateColumn, timeData, range) => {
     const relativObject = getConfigRelativeObjectBytimeLabel(timeData.label, range);
     if (!isEmpty(relativObject))
         return Object.assign(Object.assign({}, relativObject), { questionid: dateColumn.id });
@@ -83,7 +83,7 @@ const makeCustomRangeConfig = (customRangeData) => {
         return { gte: startingDate };
     if (label === TP_CUSTOM_RANGE.BEFORE && !isEmpty(startingDate))
         return { lte: startingDate };
-    if (!isEmpty(startingDate) && !isEmpty(endDate))
+    if (!isEmpty(startingDate) || !isEmpty(endDate))
         return { gte: startingDate, lte: endDate };
 };
 /**

package/dist/cjs/charts/adapters/RequestAdapterMetric.d.ts

@@ -1,7 +1,20 @@
-import { MetricConfig, MetricRequestPayload } from "../interfaces/IRequestAdapterMetric";
+import { IBColumn } from "../../columns";
+import { CustomRangeConfig, MetricConfig, MetricCustomRange, MetricPeriod, MetricRequestPayload, MetricTimeInfo } from "../interfaces/IRequestAdapterMetric";
 /**
  * It takes a metric object and returns a metric request object
  * @param {MetricConfig} metricObj - MetricConfigData
  * @returns A function that takes in a metricObj and returns a partial metricRequest
  */
 export declare const makeBodyRequestMetrics: (metricObj: MetricConfig) => Partial<MetricRequestPayload>;
+/**
+ * It takes a date column, time data, and a custom range config and returns a metric period or metric
+ * custom range
+ * @param dateColumn - The column that contains the date data.
+ * @param timeData - {
+ * @param {CustomRangeConfig} range - CustomRangeConfig
+ * @returns An object with the following properties:
+ *   - label
+ *   - value
+ *   - questionid
+ */
+export declare const metricMakeTimeData: (dateColumn: IBColumn, timeData: MetricTimeInfo, range: CustomRangeConfig) => MetricPeriod | MetricCustomRange;

package/dist/cjs/charts/adapters/RequestAdapterMetric.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeBodyRequestMetrics = void 0;
+exports.metricMakeTimeData = exports.makeBodyRequestMetrics = void 0;
 const general_1 = require("../../general");
 const interfaces_1 = require("../../interfaces");
 const REQUEST_ADAPTER_1 = require("../constants/REQUEST_ADAPTER");
@@ -17,8 +17,8 @@ const makeBodyRequestMetrics = (metricObj) => {
     /* Checking if the data object has a dateColumn property. If it does, it will add a period and
       comparison property to the body object. */
     if (isComparison(data)) {
-        body.period = metricMakeTimeData(data.dateColumn, data.timePeriod, getRangeDataPeriod(data));
-        body.comparison = metricMakeTimeData(data.dateColumn, data.comparison, getRangeDataComparison(data));
+        body.period = (0, exports.metricMakeTimeData)(data.dateColumn, data.timePeriod, getRangeDataPeriod(data));
+        body.comparison = (0, exports.metricMakeTimeData)(data.dateColumn, data.comparison, getRangeDataComparison(data));
     }
     return body;
 };
@@ -62,6 +62,7 @@ const metricMakeTimeData = (dateColumn, timeData, range) => {
     if (!(0, general_1.isEmpty)(relativObject))
         return Object.assign(Object.assign({}, relativObject), { questionid: dateColumn.id });
 };
+exports.metricMakeTimeData = metricMakeTimeData;
 /**
  * Given a time label and a custom range, return a relative date config or a metric custom range.
  * @param {TIME_PERIOD} timeLabel - TIME_PERIOD.CUSTOM_RANGE
@@ -87,7 +88,7 @@ const makeCustomRangeConfig = (customRangeData) => {
         return { gte: startingDate };
     if (label === interfaces_1.TP_CUSTOM_RANGE.BEFORE && !(0, general_1.isEmpty)(startingDate))
         return { lte: startingDate };
-    if (!(0, general_1.isEmpty)(startingDate) && !(0, general_1.isEmpty)(endDate))
+    if (!(0, general_1.isEmpty)(startingDate) || !(0, general_1.isEmpty)(endDate))
         return { gte: startingDate, lte: endDate };
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.8.0-3",
+  "version": "1.8.0-4",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",