@qrvey/utils 1.11.3 → 1.11.4

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

@@ -3,6 +3,7 @@ import { IFSScopeID } from "../../interfaces/common/IFSScopeID";
 import { IFUData } from "../../interfaces/ui/IFUData";
 /**
  * Gets filters from Filter Data by Scopes/Scope IDs.
+ * If some scope Id property is not recieved into the collection, the filter is skipped.
  * @param filterData The filter data
  * @param scopes The collection of Scopes/Scope IDs
  * @returns a new Filter Data

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

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFiltersByScopesIds = void 0;
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const cloneDeep_1 = require("../../../general/object/cloneDeep");
-const FILTER_SCOPE_1 = require("../../constants/common/FILTER_SCOPE");
+const hasProperty_1 = require("../../../general/object/hasProperty");
 /**
  * Gets filters from Filter Data by Scopes/Scope IDs.
+ * If some scope Id property is not recieved into the collection, the filter is skipped.
  * @param filterData The filter data
  * @param scopes The collection of Scopes/Scope IDs
  * @returns a new Filter Data
@@ -16,8 +17,7 @@ function getFiltersByScopesIds(filterData, scopes = []) {
     const _filterData = (0, cloneDeep_1.cloneDeep)(filterData);
     _filterData.scopes = scopes.reduce((newScopes, scope) => {
         const filteredScopes = _filterData.scopes.filter((fScope) => scope.label === fScope.scope &&
-            (scope.id === fScope.scopeid ||
-                (fScope.scope === FILTER_SCOPE_1.FILTER_SCOPE.GLOBAL && fScope.scopeid == null)) &&
+            (scope.id === fScope.scopeid || !(0, hasProperty_1._hasProperty)(scope, "id")) &&
             fScope.datasets.length > 0);
         return newScopes.concat(filteredScopes);
     }, []);

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

@@ -1,6 +1,6 @@
 import { IFSData } from "../../interfaces/common/IFSData";
-import { IFUData } from "../../interfaces/ui/IFUData";
 import { IFSScopeID } from "../../interfaces/common/IFSScopeID";
+import { IFUData } from "../../interfaces/ui/IFUData";
 /**
  * Get a new Filter Data by filtering scopes/scope IDs and enabled flags
  * @param filterData a Filter Data or UI Filter Data

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFiltersByVisibility = void 0;
-const getFiltersByScopesIds_1 = require("./getFiltersByScopesIds");
 const getFiltersByParams_1 = require("./getFiltersByParams");
+const getFiltersByScopesIds_1 = require("./getFiltersByScopesIds");
 const isEmpty_1 = require("../../../general/mix/isEmpty");
 const cloneDeep_1 = require("../../../general/object/cloneDeep");
 /**

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

@@ -3,6 +3,7 @@ import { IFSScopeID } from "../../interfaces/common/IFSScopeID";
 import { IFUData } from "../../interfaces/ui/IFUData";
 /**
  * Gets filters from Filter Data by Scopes/Scope IDs.
+ * If some scope Id property is not recieved into the collection, the filter is skipped.
  * @param filterData The filter data
  * @param scopes The collection of Scopes/Scope IDs
  * @returns a new Filter Data

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

@@ -1,8 +1,9 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
-import { FILTER_SCOPE } from "../../constants/common/FILTER_SCOPE";
+import { _hasProperty } from "../../../general/object/hasProperty";
 /**
  * Gets filters from Filter Data by Scopes/Scope IDs.
+ * If some scope Id property is not recieved into the collection, the filter is skipped.
  * @param filterData The filter data
  * @param scopes The collection of Scopes/Scope IDs
  * @returns a new Filter Data
@@ -13,8 +14,7 @@ export function getFiltersByScopesIds(filterData, scopes = []) {
     const _filterData = cloneDeep(filterData);
     _filterData.scopes = scopes.reduce((newScopes, scope) => {
         const filteredScopes = _filterData.scopes.filter((fScope) => scope.label === fScope.scope &&
-            (scope.id === fScope.scopeid ||
-                (fScope.scope === FILTER_SCOPE.GLOBAL && fScope.scopeid == null)) &&
+            (scope.id === fScope.scopeid || !_hasProperty(scope, "id")) &&
             fScope.datasets.length > 0);
         return newScopes.concat(filteredScopes);
     }, []);

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

@@ -1,6 +1,6 @@
 import { IFSData } from "../../interfaces/common/IFSData";
-import { IFUData } from "../../interfaces/ui/IFUData";
 import { IFSScopeID } from "../../interfaces/common/IFSScopeID";
+import { IFUData } from "../../interfaces/ui/IFUData";
 /**
  * Get a new Filter Data by filtering scopes/scope IDs and enabled flags
  * @param filterData a Filter Data or UI Filter Data

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

@@ -1,5 +1,5 @@
-import { getFiltersByScopesIds } from "./getFiltersByScopesIds";
 import { getFiltersByParams } from "./getFiltersByParams";
+import { getFiltersByScopesIds } from "./getFiltersByScopesIds";
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
 /**

package/package.json

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