@qrvey/utils 1.8.0-6 → 1.8.0-8

package/README.md

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

package/dist/charts/helpers/getChartComparison.d.ts

@@ -0,0 +1,4 @@
+export declare function getChartComparison(comparisonItem: any): {
+    comparison: import("..").RelativeDateConfig | import("..").MetricCustomRange;
+    period: import("..").RelativeDateConfig | import("..").MetricCustomRange;
+};

package/dist/charts/helpers/getChartComparison.js

@@ -0,0 +1,20 @@
+import { isEmpty } from "../../general/mix/isEmpty";
+import { metricMakeTimeData } from "../adapters/RequestAdapterMetric";
+export function getChartComparison(comparisonItem) {
+    var _a, _b, _c, _d;
+    if (isEmpty(comparisonItem === null || comparisonItem === void 0 ? void 0 : comparisonItem.comparison))
+        return undefined;
+    const { comparison, id, qrveyid, text, type } = comparisonItem;
+    const dateColumn = { id, qrveyid, text, type };
+    const makeComparison = metricMakeTimeData(dateColumn, { key: "", label: comparison.time_comparison.value, text: "" }, {
+        startingDate: (_a = comparison.time_comparison) === null || _a === void 0 ? void 0 : _a.start,
+        endDate: (_b = comparison.time_comparison) === null || _b === void 0 ? void 0 : _b.end,
+        label: comparison.time_comparison.range,
+    });
+    const makePeriod = metricMakeTimeData(dateColumn, { key: "", label: comparison.time_period.value, text: "" }, {
+        startingDate: (_c = comparison.time_period) === null || _c === void 0 ? void 0 : _c.start,
+        endDate: (_d = comparison.time_period) === null || _d === void 0 ? void 0 : _d.end,
+        label: comparison.time_period.range,
+    });
+    return { comparison: makeComparison, period: makePeriod };
+}

package/dist/charts/helpers/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./isExpandableTableChart";
 export * from "./isSimpleTableChart";
 export * from "./isTableChart";
+export * from "./getChartComparison";

package/dist/charts/helpers/index.js

@@ -1,3 +1,4 @@
 export * from "./isExpandableTableChart";
 export * from "./isSimpleTableChart";
 export * from "./isTableChart";
+export * from "./getChartComparison";

package/dist/charts/index.d.ts

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

package/dist/charts/index.js

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

package/dist/cjs/charts/helpers/getChartComparison.d.ts

@@ -0,0 +1,4 @@
+export declare function getChartComparison(comparisonItem: any): {
+    comparison: import("..").RelativeDateConfig | import("..").MetricCustomRange;
+    period: import("..").RelativeDateConfig | import("..").MetricCustomRange;
+};

package/dist/cjs/charts/helpers/getChartComparison.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChartComparison = void 0;
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const RequestAdapterMetric_1 = require("../adapters/RequestAdapterMetric");
+function getChartComparison(comparisonItem) {
+    var _a, _b, _c, _d;
+    if ((0, isEmpty_1.isEmpty)(comparisonItem === null || comparisonItem === void 0 ? void 0 : comparisonItem.comparison))
+        return undefined;
+    const { comparison, id, qrveyid, text, type } = comparisonItem;
+    const dateColumn = { id, qrveyid, text, type };
+    const makeComparison = (0, RequestAdapterMetric_1.metricMakeTimeData)(dateColumn, { key: "", label: comparison.time_comparison.value, text: "" }, {
+        startingDate: (_a = comparison.time_comparison) === null || _a === void 0 ? void 0 : _a.start,
+        endDate: (_b = comparison.time_comparison) === null || _b === void 0 ? void 0 : _b.end,
+        label: comparison.time_comparison.range,
+    });
+    const makePeriod = (0, RequestAdapterMetric_1.metricMakeTimeData)(dateColumn, { key: "", label: comparison.time_period.value, text: "" }, {
+        startingDate: (_c = comparison.time_period) === null || _c === void 0 ? void 0 : _c.start,
+        endDate: (_d = comparison.time_period) === null || _d === void 0 ? void 0 : _d.end,
+        label: comparison.time_period.range,
+    });
+    return { comparison: makeComparison, period: makePeriod };
+}
+exports.getChartComparison = getChartComparison;

package/dist/cjs/charts/helpers/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./isExpandableTableChart";
 export * from "./isSimpleTableChart";
 export * from "./isTableChart";
+export * from "./getChartComparison";

package/dist/cjs/charts/helpers/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./isExpandableTableChart"), exports);
 __exportStar(require("./isSimpleTableChart"), exports);
 __exportStar(require("./isTableChart"), exports);
+__exportStar(require("./getChartComparison"), exports);

package/dist/cjs/charts/index.d.ts

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

package/dist/cjs/charts/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./constants/index"), exports);
 __exportStar(require("./interfaces/index"), exports);
 __exportStar(require("./adapters/index"), exports);
+__exportStar(require("./helpers/index"), exports);

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

@@ -34,7 +34,7 @@ function getTokensFromFilters(filters, options) {
             continue;
         if (options.showScope) {
             tokens.push({
-                token: i18nService.translate(`filter.scope_title.${scope.scope.toLowerCase()}`) + ":",
+                token: `${i18nService.translate(`filter.scope_title.${scope.scope.toLowerCase()}`)}:`,
                 type: FILTER_TOKENS_STRUCTURE_TYPE_1.FILTER_TOKENS_STRUCTURE_TYPE.SCOPE,
             });
         }
@@ -44,7 +44,7 @@ function getTokensFromFilters(filters, options) {
                 continue;
             if (options.showDatabaseName) {
                 tokens.push({
-                    token: database.label + ":",
+                    token: `${database.label}:`,
                     type: FILTER_TOKENS_STRUCTURE_TYPE_1.FILTER_TOKENS_STRUCTURE_TYPE.DATABASE_NAME,
                 });
             }
@@ -60,27 +60,26 @@ function getTokensFromFilters(filters, options) {
                 if (!thereIsFiltersWithValues)
                     thereIsFiltersWithValues = true;
                 if (options.showChartName && scope.scope === constants_1.FILTER_SCOPE.CHART) {
-                    const searchToken = tokens.find((token) => token.token === filter.extras.filterLabel + ":");
+                    const searchToken = tokens.find((token) => token.token === `${filter.extras.filterLabel}:` &&
+                        token.id === filter.extras.panelid);
                     if (!searchToken) {
                         if (((_b = tokens[tokens.length - 1]) === null || _b === void 0 ? void 0 : _b.type) ===
                             FILTER_TOKENS_STRUCTURE_TYPE_1.FILTER_TOKENS_STRUCTURE_TYPE.LOGICAL_OPERATOR) {
                             tokens.pop();
                         }
                         tokens.push({
-                            token: filter.extras.filterLabel + ":",
+                            token: `${filter.extras.filterLabel}:`,
                             type: FILTER_TOKENS_STRUCTURE_TYPE_1.FILTER_TOKENS_STRUCTURE_TYPE.CHART_NAME,
+                            id: filter.extras.panelid,
                         });
                     }
                 }
                 let columnLabel = filter.column.label;
                 if ((_c = filter === null || filter === void 0 ? void 0 : filter.column) === null || _c === void 0 ? void 0 : _c.aggregate) {
-                    columnLabel +=
-                        " (" +
-                            i18nService.translate(`common.aggregate_labels.${(_d = filter === null || filter === void 0 ? void 0 : filter.column) === null || _d === void 0 ? void 0 : _d.aggregate.toLowerCase()}`) +
-                            ")";
+                    columnLabel += ` (${i18nService.translate(`common.aggregate_labels.${(_d = filter === null || filter === void 0 ? void 0 : filter.column) === null || _d === void 0 ? void 0 : _d.aggregate.toLowerCase()}`)})`;
                 }
                 tokens.push({
-                    token: columnLabel + ":",
+                    token: `${columnLabel}:`,
                     type: FILTER_TOKENS_STRUCTURE_TYPE_1.FILTER_TOKENS_STRUCTURE_TYPE.COLUMN_NAME,
                 });
                 const property = (0, getFilterPropertyLabel_1.getFilterPropertyLabel)(filter, settings.translate);

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

@@ -3,20 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformFilterValues = void 0;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const transformValue_1 = require("../../../qrvey/helpers/transformValue");
-const common_1 = require("../common");
+const isInValidator_1 = require("../common/isInValidator");
 const isRangeValidator_1 = require("../common/isRangeValidator");
+const isRankingFilter_1 = require("../common/isRankingFilter");
 const isRegularValidator_1 = require("../common/isRegularValidator");
 function transformFilterValues(filter, settings) {
     const transformValueSettings = Object.assign(Object.assign({}, settings), { column: filter.column, property: filter.property });
     if ((0, isEmpty_1.isEmpty)(filter))
         return [];
     const values = filter.values || [];
-    if ((0, isRegularValidator_1.isRegularValidator)(filter.validator) && !(0, common_1.isRankingFilter)(filter)) {
+    if ((0, isRegularValidator_1.isRegularValidator)(filter.validator) && !(0, isRankingFilter_1.isRankingFilter)(filter)) {
         return values.map((value) => (Object.assign(Object.assign({}, value), { value: (0, transformValue_1.transformValue)(value.value, transformValueSettings) })));
     }
     else if ((0, isRangeValidator_1.isRangeValidator)(filter.validator)) {
         return values.map((value) => (Object.assign(Object.assign({}, value), { min: (0, transformValue_1.transformValue)(value.min, transformValueSettings), max: (0, transformValue_1.transformValue)(value.max, transformValueSettings) })));
     }
+    else if ((0, isInValidator_1.isInValidator)(filter.validator)) {
+        return values.map((value) => (Object.assign(Object.assign({}, value), { anchor: typeof value.anchor === "string"
+                ? (0, transformValue_1.transformValue)(value.anchor, transformValueSettings)
+                : value.anchor })));
+    }
     return values;
 }
 exports.transformFilterValues = transformFilterValues;

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

@@ -2,4 +2,5 @@ import { FILTER_TOKENS_STRUCTURE_TYPE } from "../constants/common/FILTER_TOKENS_
 export interface IFFilterTokens {
     token: string;
     type: FILTER_TOKENS_STRUCTURE_TYPE;
+    id?: string;
 }

package/dist/cjs/qrvey/helpers/transformValue.js

@@ -38,8 +38,9 @@ function getOutputFormat(settings) {
         DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.HOUR,
         DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.MINUTE,
         DATE_GROUPING_TIME_PROPERTY_1.DATE_GROUPING_TIME_PROPERTY.SECOND,
+        undefined,
     ].includes(settings.property);
-    const isDate = [DATE_GROUPING_PROPERTY_1.DATE_GROUPING_PROPERTY.DAY].includes(settings.property);
+    const isDate = [DATE_GROUPING_PROPERTY_1.DATE_GROUPING_PROPERTY.DAY, undefined].includes(settings.property);
     if ((0, isDateColumn_1.isDateColumn)(settings.column) && (isDate || isDateTime)) {
         type = "DATE";
         format = "Default";

package/dist/filters/helpers/getTokensFromFilters.js

@@ -31,7 +31,7 @@ export function getTokensFromFilters(filters, options) {
             continue;
         if (options.showScope) {
             tokens.push({
-                token: i18nService.translate(`filter.scope_title.${scope.scope.toLowerCase()}`) + ":",
+                token: `${i18nService.translate(`filter.scope_title.${scope.scope.toLowerCase()}`)}:`,
                 type: FILTER_TOKENS_STRUCTURE_TYPE.SCOPE,
             });
         }
@@ -41,7 +41,7 @@ export function getTokensFromFilters(filters, options) {
                 continue;
             if (options.showDatabaseName) {
                 tokens.push({
-                    token: database.label + ":",
+                    token: `${database.label}:`,
                     type: FILTER_TOKENS_STRUCTURE_TYPE.DATABASE_NAME,
                 });
             }
@@ -57,27 +57,26 @@ export function getTokensFromFilters(filters, options) {
                 if (!thereIsFiltersWithValues)
                     thereIsFiltersWithValues = true;
                 if (options.showChartName && scope.scope === FILTER_SCOPE.CHART) {
-                    const searchToken = tokens.find((token) => token.token === filter.extras.filterLabel + ":");
+                    const searchToken = tokens.find((token) => token.token === `${filter.extras.filterLabel}:` &&
+                        token.id === filter.extras.panelid);
                     if (!searchToken) {
                         if (((_b = tokens[tokens.length - 1]) === null || _b === void 0 ? void 0 : _b.type) ===
                             FILTER_TOKENS_STRUCTURE_TYPE.LOGICAL_OPERATOR) {
                             tokens.pop();
                         }
                         tokens.push({
-                            token: filter.extras.filterLabel + ":",
+                            token: `${filter.extras.filterLabel}:`,
                             type: FILTER_TOKENS_STRUCTURE_TYPE.CHART_NAME,
+                            id: filter.extras.panelid,
                         });
                     }
                 }
                 let columnLabel = filter.column.label;
                 if ((_c = filter === null || filter === void 0 ? void 0 : filter.column) === null || _c === void 0 ? void 0 : _c.aggregate) {
-                    columnLabel +=
-                        " (" +
-                            i18nService.translate(`common.aggregate_labels.${(_d = filter === null || filter === void 0 ? void 0 : filter.column) === null || _d === void 0 ? void 0 : _d.aggregate.toLowerCase()}`) +
-                            ")";
+                    columnLabel += ` (${i18nService.translate(`common.aggregate_labels.${(_d = filter === null || filter === void 0 ? void 0 : filter.column) === null || _d === void 0 ? void 0 : _d.aggregate.toLowerCase()}`)})`;
                 }
                 tokens.push({
-                    token: columnLabel + ":",
+                    token: `${columnLabel}:`,
                     type: FILTER_TOKENS_STRUCTURE_TYPE.COLUMN_NAME,
                 });
                 const property = getFilterPropertyLabel(filter, settings.translate);

package/dist/filters/helpers/ui/transformFilterValues.js

@@ -1,7 +1,8 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { transformValue } from "../../../qrvey/helpers/transformValue";
-import { isRankingFilter } from "../common";
+import { isInValidator } from "../common/isInValidator";
 import { isRangeValidator } from "../common/isRangeValidator";
+import { isRankingFilter } from "../common/isRankingFilter";
 import { isRegularValidator } from "../common/isRegularValidator";
 export function transformFilterValues(filter, settings) {
     const transformValueSettings = Object.assign(Object.assign({}, settings), { column: filter.column, property: filter.property });
@@ -14,5 +15,10 @@ export function transformFilterValues(filter, settings) {
     else if (isRangeValidator(filter.validator)) {
         return values.map((value) => (Object.assign(Object.assign({}, value), { min: transformValue(value.min, transformValueSettings), max: transformValue(value.max, transformValueSettings) })));
     }
+    else if (isInValidator(filter.validator)) {
+        return values.map((value) => (Object.assign(Object.assign({}, value), { anchor: typeof value.anchor === "string"
+                ? transformValue(value.anchor, transformValueSettings)
+                : value.anchor })));
+    }
     return values;
 }

package/dist/filters/interfaces/IFFilterTokens.d.ts

@@ -2,4 +2,5 @@ import { FILTER_TOKENS_STRUCTURE_TYPE } from "../constants/common/FILTER_TOKENS_
 export interface IFFilterTokens {
     token: string;
     type: FILTER_TOKENS_STRUCTURE_TYPE;
+    id?: string;
 }

package/dist/qrvey/helpers/transformValue.js

@@ -34,8 +34,9 @@ function getOutputFormat(settings) {
         DATE_GROUPING_TIME_PROPERTY.HOUR,
         DATE_GROUPING_TIME_PROPERTY.MINUTE,
         DATE_GROUPING_TIME_PROPERTY.SECOND,
+        undefined,
     ].includes(settings.property);
-    const isDate = [DATE_GROUPING_PROPERTY.DAY].includes(settings.property);
+    const isDate = [DATE_GROUPING_PROPERTY.DAY, undefined].includes(settings.property);
     if (isDateColumn(settings.column) && (isDate || isDateTime)) {
         type = "DATE";
         format = "Default";

package/package.json

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