@qrvey/utils 1.7.0-3 → 1.7.0-4

package/dist/cjs/filters/adapters/adaptFilterValues.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adaptFilterValues = void 0;
 const isEmpty_1 = require("../../general/mix/isEmpty");
-const COLUMN_1 = require("../../columns/constants/COLUMN");
-const constants_1 = require("../constants");
+const isRankingFilter_1 = require("../helpers/common/isRankingFilter");
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Gets an adapted filter value array. Validates the enabled property and sets
@@ -12,10 +11,7 @@ const constants_1 = require("../constants");
  */
 function adaptFilterValues(filter) {
     const setValue = (value) => (Object.assign(Object.assign({}, value), { value: (0, isEmpty_1.isEmpty)(value.value) ? undefined : value.value, displayed: (0, isEmpty_1.isEmpty)(value.displayed) ? true : value.displayed, enabled: (0, isEmpty_1.isEmpty)(value.enabled) ? true : value.enabled }));
-    if (filter.column.type === COLUMN_1.COLUMN.RANKING &&
-        (0, isEmpty_1.isEmpty)(filter.column.aggregate) &&
-        filter.validator !== constants_1.FILTER_VALIDATOR.IS_NULL &&
-        filter.validator !== constants_1.FILTER_VALIDATOR.IS_NOT_NULL) {
+    if ((0, isRankingFilter_1.isRankingFilter)(filter)) {
         return (filter.values || []).map((rValues) => rValues.map(setValue));
     }
     return ((filter.values || []) || []).map(setValue);

package/dist/cjs/filters/adapters/flatUIToOldLogic.js

@@ -17,6 +17,7 @@ const isNull_1 = require("../../general/mix/isNull");
 const flattenDeep_1 = require("../../general/array/flattenDeep");
 const getBackendGroupValue_1 = require("../helpers/backend/getBackendGroupValue");
 const getBackendProperty_1 = require("../helpers/backend/getBackendProperty");
+const isRankingFilter_1 = require("../helpers/common/isRankingFilter");
 /**
  * Generates a Logic structure from flattened UI filters
  * @param uFilters Array of flat filters from UI
@@ -114,7 +115,7 @@ function getLogicBody(uFilters) {
 exports.getLogicBody = getLogicBody;
 function getExpressions(props) {
     let expressions = [];
-    if (props.column.type === COLUMN_1.COLUMN.RANKING && (0, isEmpty_1.isEmpty)(props.column.aggregate)) {
+    if ((0, isRankingFilter_1.isRankingFilter)(props)) {
         expressions = expressions.concat(getRankingExpressions(props));
     }
     else {
@@ -168,8 +169,7 @@ function getValues(props, rankingGroupIndex) {
     switch (props.validator) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_EQUAL:
-            if (props.column.type === COLUMN_1.COLUMN.RANKING &&
-                (0, isEmpty_1.isEmpty)(props.column.aggregate))
+            if ((0, isRankingFilter_1.isRankingFilter)(props))
                 return getRankingValues(values, rankingGroupIndex);
             return getResultValues(values, props);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.CONTAINS:
@@ -253,8 +253,7 @@ function getUIValuess(props, rankingGroupIndex) {
                     ? `from ${value.anchor || "current date"}`
                     : ""}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
         default:
-            if (props.column.type === COLUMN_1.COLUMN.RANKING &&
-                (0, isEmpty_1.isEmpty)(props.column.aggregate)) {
+            if ((0, isRankingFilter_1.isRankingFilter)(props)) {
                 return getRankingUIValues(values, rankingGroupIndex);
             }
             return values.map((val) => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));

package/dist/cjs/filters/adapters/logicToFlatUI.js

@@ -13,6 +13,7 @@ const FILTER_SCOPE_1 = require("../constants/common/FILTER_SCOPE");
 const get_1 = require("../../general/object/get");
 const isNullValidator_1 = require("../helpers/common/isNullValidator");
 const FILTER_VALIDATOR_INFO_1 = require("../constants/common/FILTER_VALIDATOR_INFO");
+const isRankingFilter_1 = require("../helpers/common/isRankingFilter");
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
  * @param logics The old logic structure (v2.0)
@@ -50,8 +51,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
         uFilter.filterid = (0, getFilterid_1.getFilterid)(uFilter);
         uFilters.push(uFilter);
     }
-    if (uiExtras.column.type === COLUMN_1.COLUMN.RANKING &&
-        (0, isEmpty_1.isEmpty)(uiExtras.column.aggregate)) {
+    if ((0, isRankingFilter_1.isRankingFilter)(uiExtras)) {
         // Restore uiExtras.values array into single IFilterDetail object values array
         if (index > -1)
             uFilters[index].values.push(uiExtras.values[0]);

package/dist/cjs/filters/helpers/backend/getBackendValues.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendValues = void 0;
 const COLUMN_1 = require("../../../columns/constants/COLUMN");
 const flattenDeep_1 = require("../../../general/array/flattenDeep");
-const isEmpty_1 = require("../../../general/mix/isEmpty");
 const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
 const FILTER_VALIDATOR_INFO_1 = require("../../constants/common/FILTER_VALIDATOR_INFO");
+const isRankingFilter_1 = require("../common/isRankingFilter");
 /**
  * Gets the expresion values in the logic format
  * @param filter The filter structure
@@ -22,8 +22,7 @@ function getBackendValues(filter) {
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.ENDS_WITH:
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.NOT_END_WITH:
-            if (filter.column.type === COLUMN_1.COLUMN.RANKING &&
-                (0, isEmpty_1.isEmpty)(filter.column.aggregate))
+            if ((0, isRankingFilter_1.isRankingFilter)(filter))
                 return getRankingValues(values);
             return getResultValues(values, filter);
         case FILTER_VALIDATOR_1.FILTER_VALIDATOR.BETWEEN_INCLUSIVE:

package/dist/cjs/filters/helpers/common/index.d.ts

@@ -21,6 +21,7 @@ export * from "./isDateDistinctProperty";
 export * from "./isInValidator";
 export * from "./isNullValidator";
 export * from "./isRangeValidator";
+export * from "./isRankingFilter";
 export * from "./isRegularValidator";
 export * from "./mergeFilters";
 export * from "./mergeValues";

package/dist/cjs/filters/helpers/common/index.js

@@ -37,6 +37,7 @@ __exportStar(require("./isDateDistinctProperty"), exports);
 __exportStar(require("./isInValidator"), exports);
 __exportStar(require("./isNullValidator"), exports);
 __exportStar(require("./isRangeValidator"), exports);
+__exportStar(require("./isRankingFilter"), exports);
 __exportStar(require("./isRegularValidator"), exports);
 __exportStar(require("./mergeFilters"), exports);
 __exportStar(require("./mergeValues"), exports);

package/dist/cjs/filters/helpers/common/isRankingFilter.d.ts

@@ -0,0 +1,9 @@
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFUFilter } from "../../interfaces/ui/IFUFilter";
+/**
+ * Validates if the given filter is considering a ranking filter type.
+ * - Filters with Null and Is Not Null for ranking column are not considering as Ranking Filters.
+ * @param filter The filter object
+ * @returns a true if the filter is a ranking filter.
+ */
+export declare function isRankingFilter(filter: IFUFilter | IFSFilter): boolean;

package/dist/cjs/filters/helpers/common/isRankingFilter.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRankingFilter = void 0;
+const COLUMN_1 = require("../../../columns/constants/COLUMN");
+const isEmpty_1 = require("../../../general/mix/isEmpty");
+const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
+/**
+ * Validates if the given filter is considering a ranking filter type.
+ * - Filters with Null and Is Not Null for ranking column are not considering as Ranking Filters.
+ * @param filter The filter object
+ * @returns a true if the filter is a ranking filter.
+ */
+function isRankingFilter(filter) {
+    return (filter.column.type === COLUMN_1.COLUMN.RANKING &&
+        (0, isEmpty_1.isEmpty)(filter.column.aggregate) &&
+        filter.validator !== FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NULL &&
+        filter.validator !== FILTER_VALIDATOR_1.FILTER_VALIDATOR.IS_NOT_NULL);
+}
+exports.isRankingFilter = isRankingFilter;

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

@@ -4,12 +4,12 @@ exports.getUIValues = void 0;
 const RELATIVE_CURSOR_1 = require("../../../dates/relative/constants/RELATIVE_CURSOR");
 const FILTER_VALIDATOR_1 = require("../../constants/common/FILTER_VALIDATOR");
 const FILTER_VALIDATOR_INFO_1 = require("../../constants/common/FILTER_VALIDATOR_INFO");
-const COLUMN_1 = require("../../../columns/constants/COLUMN");
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const flattenDeep_1 = require("../../../general/array/flattenDeep");
 const RELATIVE_CURSOR_INFO_1 = require("../../../dates/relative/constants/RELATIVE_CURSOR_INFO");
 const getI18nDateGroupLabel_1 = require("../../../globalization/helpers/getI18nDateGroupLabel");
 const I18N_RELATIVE_CONTAINER_1 = require("../../../globalization/labels/filters/I18N_RELATIVE_CONTAINER");
+const isRankingFilter_1 = require("../common/isRankingFilter");
 /**
  * Gets the UI Values generated depending on the validator
  * @param filter the filter structure
@@ -82,8 +82,7 @@ function getUiInValues(values, settings) {
     });
 }
 function getUiEqualValues(values, filter, settings) {
-    if (filter.column.type === COLUMN_1.COLUMN.RANKING &&
-        (0, isEmpty_1.isEmpty)(filter.column.aggregate)) {
+    if ((0, isRankingFilter_1.isRankingFilter)(filter)) {
         return getRankingUIValues(values, settings.addEnableds, settings.rankingGroupIndex);
     }
     return values.map((value) => getRegularValue(Object.assign(Object.assign({}, value), { value: getValueLabel(value.value, filter, settings) }), settings));

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

@@ -3,6 +3,7 @@ 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 isRangeValidator_1 = require("../common/isRangeValidator");
 const isRegularValidator_1 = require("../common/isRegularValidator");
 function transformFilterValues(filter, settings) {
@@ -10,7 +11,7 @@ function transformFilterValues(filter, settings) {
     if ((0, isEmpty_1.isEmpty)(filter))
         return [];
     const values = filter.values || [];
-    if ((0, isRegularValidator_1.isRegularValidator)(filter.validator)) {
+    if ((0, isRegularValidator_1.isRegularValidator)(filter.validator) && !(0, common_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)) {

package/dist/filters/adapters/adaptFilterValues.js

@@ -1,6 +1,5 @@
 import { isEmpty } from "../../general/mix/isEmpty";
-import { COLUMN } from "../../columns/constants/COLUMN";
-import { FILTER_VALIDATOR } from "../constants";
+import { isRankingFilter } from "../helpers/common/isRankingFilter";
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Gets an adapted filter value array. Validates the enabled property and sets
@@ -9,10 +8,7 @@ import { FILTER_VALIDATOR } from "../constants";
  */
 export function adaptFilterValues(filter) {
     const setValue = (value) => (Object.assign(Object.assign({}, value), { value: isEmpty(value.value) ? undefined : value.value, displayed: isEmpty(value.displayed) ? true : value.displayed, enabled: isEmpty(value.enabled) ? true : value.enabled }));
-    if (filter.column.type === COLUMN.RANKING &&
-        isEmpty(filter.column.aggregate) &&
-        filter.validator !== FILTER_VALIDATOR.IS_NULL &&
-        filter.validator !== FILTER_VALIDATOR.IS_NOT_NULL) {
+    if (isRankingFilter(filter)) {
         return (filter.values || []).map((rValues) => rValues.map(setValue));
     }
     return ((filter.values || []) || []).map(setValue);

package/dist/filters/adapters/flatUIToOldLogic.js

@@ -14,6 +14,7 @@ import { isNull } from "../../general/mix/isNull";
 import { flattenDeep } from "../../general/array/flattenDeep";
 import { getBackendGroupValue } from "../helpers/backend/getBackendGroupValue";
 import { getBackendProperty } from "../helpers/backend/getBackendProperty";
+import { isRankingFilter } from "../helpers/common/isRankingFilter";
 /**
  * Generates a Logic structure from flattened UI filters
  * @param uFilters Array of flat filters from UI
@@ -109,7 +110,7 @@ export function getLogicBody(uFilters) {
 }
 function getExpressions(props) {
     let expressions = [];
-    if (props.column.type === COLUMN.RANKING && isEmpty(props.column.aggregate)) {
+    if (isRankingFilter(props)) {
         expressions = expressions.concat(getRankingExpressions(props));
     }
     else {
@@ -162,8 +163,7 @@ function getValues(props, rankingGroupIndex) {
     switch (props.validator) {
         case FILTER_VALIDATOR.EQUALS:
         case FILTER_VALIDATOR.NOT_EQUAL:
-            if (props.column.type === COLUMN.RANKING &&
-                isEmpty(props.column.aggregate))
+            if (isRankingFilter(props))
                 return getRankingValues(values, rankingGroupIndex);
             return getResultValues(values, props);
         case FILTER_VALIDATOR.CONTAINS:
@@ -247,8 +247,7 @@ function getUIValuess(props, rankingGroupIndex) {
                     ? `from ${value.anchor || "current date"}`
                     : ""}`, displayed: value.displayed != null ? value.displayed : true, enabled: props.enabled })));
         default:
-            if (props.column.type === COLUMN.RANKING &&
-                isEmpty(props.column.aggregate)) {
+            if (isRankingFilter(props)) {
                 return getRankingUIValues(values, rankingGroupIndex);
             }
             return values.map((val) => (Object.assign(Object.assign({}, val), { enabled: val.enabled != null ? val.enabled : true })));

package/dist/filters/adapters/logicToFlatUI.js

@@ -10,6 +10,7 @@ import { FILTER_SCOPE } from "../constants/common/FILTER_SCOPE";
 import { _get } from "../../general/object/get";
 import { isNullValidator } from "../helpers/common/isNullValidator";
 import { FILTER_VALIDATOR_INFO } from "../constants/common/FILTER_VALIDATOR_INFO";
+import { isRankingFilter } from "../helpers/common/isRankingFilter";
 /**
  * Adapts the Old logic structure (v2.0) to the flattened UI filter Structure.
  * @param logics The old logic structure (v2.0)
@@ -46,8 +47,7 @@ function buildFilterByExpression(expression, scopeItem, uFilters) {
         uFilter.filterid = getFilterid(uFilter);
         uFilters.push(uFilter);
     }
-    if (uiExtras.column.type === COLUMN.RANKING &&
-        isEmpty(uiExtras.column.aggregate)) {
+    if (isRankingFilter(uiExtras)) {
         // Restore uiExtras.values array into single IFilterDetail object values array
         if (index > -1)
             uFilters[index].values.push(uiExtras.values[0]);

package/dist/filters/helpers/backend/getBackendValues.js

@@ -1,8 +1,8 @@
 import { COLUMN } from "../../../columns/constants/COLUMN";
 import { flattenDeep } from "../../../general/array/flattenDeep";
-import { isEmpty } from "../../../general/mix/isEmpty";
 import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
 import { FILTER_VALIDATOR_INFO } from "../../constants/common/FILTER_VALIDATOR_INFO";
+import { isRankingFilter } from "../common/isRankingFilter";
 /**
  * Gets the expresion values in the logic format
  * @param filter The filter structure
@@ -19,8 +19,7 @@ export function getBackendValues(filter) {
         case FILTER_VALIDATOR.NOT_START_WITH:
         case FILTER_VALIDATOR.ENDS_WITH:
         case FILTER_VALIDATOR.NOT_END_WITH:
-            if (filter.column.type === COLUMN.RANKING &&
-                isEmpty(filter.column.aggregate))
+            if (isRankingFilter(filter))
                 return getRankingValues(values);
             return getResultValues(values, filter);
         case FILTER_VALIDATOR.BETWEEN_INCLUSIVE:

package/dist/filters/helpers/common/index.d.ts

@@ -21,6 +21,7 @@ export * from "./isDateDistinctProperty";
 export * from "./isInValidator";
 export * from "./isNullValidator";
 export * from "./isRangeValidator";
+export * from "./isRankingFilter";
 export * from "./isRegularValidator";
 export * from "./mergeFilters";
 export * from "./mergeValues";

package/dist/filters/helpers/common/index.js

@@ -21,6 +21,7 @@ export * from "./isDateDistinctProperty";
 export * from "./isInValidator";
 export * from "./isNullValidator";
 export * from "./isRangeValidator";
+export * from "./isRankingFilter";
 export * from "./isRegularValidator";
 export * from "./mergeFilters";
 export * from "./mergeValues";

package/dist/filters/helpers/common/isRankingFilter.d.ts

@@ -0,0 +1,9 @@
+import { IFSFilter } from "../../interfaces/common/IFSFilter";
+import { IFUFilter } from "../../interfaces/ui/IFUFilter";
+/**
+ * Validates if the given filter is considering a ranking filter type.
+ * - Filters with Null and Is Not Null for ranking column are not considering as Ranking Filters.
+ * @param filter The filter object
+ * @returns a true if the filter is a ranking filter.
+ */
+export declare function isRankingFilter(filter: IFUFilter | IFSFilter): boolean;

package/dist/filters/helpers/common/isRankingFilter.js

@@ -0,0 +1,15 @@
+import { COLUMN } from "../../../columns/constants/COLUMN";
+import { isEmpty } from "../../../general/mix/isEmpty";
+import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
+/**
+ * Validates if the given filter is considering a ranking filter type.
+ * - Filters with Null and Is Not Null for ranking column are not considering as Ranking Filters.
+ * @param filter The filter object
+ * @returns a true if the filter is a ranking filter.
+ */
+export function isRankingFilter(filter) {
+    return (filter.column.type === COLUMN.RANKING &&
+        isEmpty(filter.column.aggregate) &&
+        filter.validator !== FILTER_VALIDATOR.IS_NULL &&
+        filter.validator !== FILTER_VALIDATOR.IS_NOT_NULL);
+}

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

@@ -1,12 +1,12 @@
 import { RELATIVE_CURSOR } from "../../../dates/relative/constants/RELATIVE_CURSOR";
 import { FILTER_VALIDATOR } from "../../constants/common/FILTER_VALIDATOR";
 import { FILTER_VALIDATOR_INFO } from "../../constants/common/FILTER_VALIDATOR_INFO";
-import { COLUMN } from "../../../columns/constants/COLUMN";
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { flattenDeep } from "../../../general/array/flattenDeep";
 import { RELATIVE_CURSOR_INFO } from "../../../dates/relative/constants/RELATIVE_CURSOR_INFO";
 import { getI18nDateGroupLabel } from "../../../globalization/helpers/getI18nDateGroupLabel";
 import { I18N_RELATIVE_CONTAINER } from "../../../globalization/labels/filters/I18N_RELATIVE_CONTAINER";
+import { isRankingFilter } from "../common/isRankingFilter";
 /**
  * Gets the UI Values generated depending on the validator
  * @param filter the filter structure
@@ -78,8 +78,7 @@ function getUiInValues(values, settings) {
     });
 }
 function getUiEqualValues(values, filter, settings) {
-    if (filter.column.type === COLUMN.RANKING &&
-        isEmpty(filter.column.aggregate)) {
+    if (isRankingFilter(filter)) {
         return getRankingUIValues(values, settings.addEnableds, settings.rankingGroupIndex);
     }
     return values.map((value) => getRegularValue(Object.assign(Object.assign({}, value), { value: getValueLabel(value.value, filter, settings) }), settings));

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

@@ -1,5 +1,6 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { transformValue } from "../../../qrvey/helpers/transformValue";
+import { isRankingFilter } from "../common";
 import { isRangeValidator } from "../common/isRangeValidator";
 import { isRegularValidator } from "../common/isRegularValidator";
 export function transformFilterValues(filter, settings) {
@@ -7,7 +8,7 @@ export function transformFilterValues(filter, settings) {
     if (isEmpty(filter))
         return [];
     const values = filter.values || [];
-    if (isRegularValidator(filter.validator)) {
+    if (isRegularValidator(filter.validator) && !isRankingFilter(filter)) {
         return values.map((value) => (Object.assign(Object.assign({}, value), { value: transformValue(value.value, transformValueSettings) })));
     }
     else if (isRangeValidator(filter.validator)) {

package/package.json

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