@qrvey/utils 1.18.11 → 1.18.16

package/README.md

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

package/dist/cjs/comparativeAnalysis/index.js

@@ -5,6 +5,8 @@ exports.formatDeltaColumnCaption = formatDeltaColumnCaption;
 exports.formatReferenceColumnCaption = formatReferenceColumnCaption;
 exports.stripColumnMarker = stripColumnMarker;
 exports.resolveComparativeColumnCaption = resolveComparativeColumnCaption;
+exports.isNullDateOperator = isNullDateOperator;
+exports.formatPeriodLabel = formatPeriodLabel;
 exports.formatComparativePeriodCaption = formatComparativePeriodCaption;
 exports.formatDeltaDefaultCaption = formatDeltaDefaultCaption;
 exports.computeComparativeVirtualColumns = computeComparativeVirtualColumns;
@@ -78,25 +80,29 @@ function resolveComparativeColumnCaption(chartModel, columnKey, allDatesText) {
         return formatDeltaColumnCaption(customLabels[dataFieldKey]);
     return formatDeltaDefaultCaption(comparativeAnalisis.referencePeriod, comparativeAnalisis.compareTo, fallbackAllDates, defaultName);
 }
-function formatComparativePeriodCaption(period, allDatesText, colLabel = "") {
-    if (!period?.date1) {
-        return colLabel ? `${colLabel} - ${allDatesText}` : allDatesText;
-    }
+function isNullDateOperator(operator) {
+    const id = String(operator?.label ?? operator?.key ?? "").toUpperCase();
+    return id === "IS_NULL" || id === "IS_NOT_NULL";
+}
+function formatPeriodLabel(period, allDatesText) {
+    if (isNullDateOperator(period?.operator))
+        return period.operator.text || allDatesText;
+    if (period?.customLabel)
+        return period.customLabel;
+    if (!period?.date1)
+        return allDatesText;
     const d1 = period.formattedDate1 ?? period.date1;
     const d2 = period.formattedDate2 ?? period.date2;
     const dateRange = period.date2 ? `${d1} - ${d2}` : d1;
-    return colLabel ? `${colLabel} - ${dateRange}` : dateRange;
+    return period.presetName ? `${period.presetName} (${dateRange})` : dateRange;
+}
+function formatComparativePeriodCaption(period, allDatesText, colLabel = "") {
+    const periodLabel = formatPeriodLabel(period, allDatesText);
+    return colLabel ? `${colLabel} - ${periodLabel}` : periodLabel;
 }
 function formatDeltaDefaultCaption(referencePeriod, compareTo, allDatesText, colLabel = "") {
-    const fmtPeriodFn = (p) => {
-        if (!p?.date1)
-            return allDatesText;
-        const d1 = p.formattedDate1 ?? p.date1;
-        const d2 = p.formattedDate2 ?? p.date2;
-        return p.date2 ? `${d1} - ${d2}` : d1;
-    };
-    const ref = fmtPeriodFn(referencePeriod);
-    const cmp = fmtPeriodFn(compareTo);
+    const ref = formatPeriodLabel(referencePeriod, allDatesText);
+    const cmp = formatPeriodLabel(compareTo, allDatesText);
     const comparison = ref && cmp ? `${ref} vs ${cmp}` : ref || cmp;
     const prefix = colLabel
         ? `${exports.DELTA_COLUMN_PREFIX} ${colLabel}`
@@ -324,7 +330,7 @@ function buildComparativeChartComparison(myBus, chart, groups) {
         if (!periodData || !periodData.operator)
             return null;
         const operatorLabel = periodData.operator.label;
-        const isNullType = operatorLabel === "IS_NULL" || operatorLabel === "IS_NOT_NULL";
+        const isNullType = isNullDateOperator(periodData.operator);
         if (!isNullType && !periodData.date1)
             return null;
         const validationType = mapOperatorToValidationType(operatorLabel);

package/dist/comparativeAnalysis/index.d.ts

@@ -11,6 +11,8 @@ export interface ComparativeVirtualColumn {
     deltaDataField?: string;
     extraDeltaDataFields?: string[];
 }
+export declare function isNullDateOperator(operator: any): boolean;
+export declare function formatPeriodLabel(period: any, allDatesText: string): string;
 export declare function formatComparativePeriodCaption(period: any, allDatesText: string, colLabel?: string): string;
 export declare function formatDeltaDefaultCaption(referencePeriod: any, compareTo: any, allDatesText: string, colLabel?: string): string;
 export declare function computeComparativeVirtualColumns(isGrouped: boolean, myBus: any, chart: any, getChartColumns: () => any[]): ComparativeVirtualColumn[];

package/dist/comparativeAnalysis/index.js

@@ -60,25 +60,29 @@ export function resolveComparativeColumnCaption(chartModel, columnKey, allDatesT
         return formatDeltaColumnCaption(customLabels[dataFieldKey]);
     return formatDeltaDefaultCaption(comparativeAnalisis.referencePeriod, comparativeAnalisis.compareTo, fallbackAllDates, defaultName);
 }
-export function formatComparativePeriodCaption(period, allDatesText, colLabel = "") {
-    if (!period?.date1) {
-        return colLabel ? `${colLabel} - ${allDatesText}` : allDatesText;
-    }
+export function isNullDateOperator(operator) {
+    const id = String(operator?.label ?? operator?.key ?? "").toUpperCase();
+    return id === "IS_NULL" || id === "IS_NOT_NULL";
+}
+export function formatPeriodLabel(period, allDatesText) {
+    if (isNullDateOperator(period?.operator))
+        return period.operator.text || allDatesText;
+    if (period?.customLabel)
+        return period.customLabel;
+    if (!period?.date1)
+        return allDatesText;
     const d1 = period.formattedDate1 ?? period.date1;
     const d2 = period.formattedDate2 ?? period.date2;
     const dateRange = period.date2 ? `${d1} - ${d2}` : d1;
-    return colLabel ? `${colLabel} - ${dateRange}` : dateRange;
+    return period.presetName ? `${period.presetName} (${dateRange})` : dateRange;
+}
+export function formatComparativePeriodCaption(period, allDatesText, colLabel = "") {
+    const periodLabel = formatPeriodLabel(period, allDatesText);
+    return colLabel ? `${colLabel} - ${periodLabel}` : periodLabel;
 }
 export function formatDeltaDefaultCaption(referencePeriod, compareTo, allDatesText, colLabel = "") {
-    const fmtPeriodFn = (p) => {
-        if (!p?.date1)
-            return allDatesText;
-        const d1 = p.formattedDate1 ?? p.date1;
-        const d2 = p.formattedDate2 ?? p.date2;
-        return p.date2 ? `${d1} - ${d2}` : d1;
-    };
-    const ref = fmtPeriodFn(referencePeriod);
-    const cmp = fmtPeriodFn(compareTo);
+    const ref = formatPeriodLabel(referencePeriod, allDatesText);
+    const cmp = formatPeriodLabel(compareTo, allDatesText);
     const comparison = ref && cmp ? `${ref} vs ${cmp}` : ref || cmp;
     const prefix = colLabel
         ? `${DELTA_COLUMN_PREFIX} ${colLabel}`
@@ -306,7 +310,7 @@ export function buildComparativeChartComparison(myBus, chart, groups) {
         if (!periodData || !periodData.operator)
             return null;
         const operatorLabel = periodData.operator.label;
-        const isNullType = operatorLabel === "IS_NULL" || operatorLabel === "IS_NOT_NULL";
+        const isNullType = isNullDateOperator(periodData.operator);
         if (!isNullType && !periodData.date1)
             return null;
         const validationType = mapOperatorToValidationType(operatorLabel);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.18.11",
+  "version": "1.18.16",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/cjs/index.js",
@@ -83,7 +83,7 @@
   ],
   "overrides": {
     "brace-expansion": "^5.0.8",
-    "js-yaml": "4.3.0"
+    "js-yaml": "5.4.1"
   },
   "sideEffects": false,
   "types": "dist/index.d.ts"