@syncfusion/ej2-treegrid - npm Package Compare versions

Comparing version 17.2.46 to 17.2.47

CHANGELOG.md

@@ -7,2 +7,10 @@ # Changelog
 
+#### Bug Fixes
+
+- `#243953` - Filter works properly with Filter Settings and Search Settings.
+
+## 17.2.46 (2019-08-22)
+
+### TreeGrid
+
 #### New Features
@@ -9,0 +17,0 @@

dist/global/index.d.ts

 /*!
 *  filename: index.d.ts
-*  version : 17.2.46
+*  version : 17.2.47
 *  Copyright Syncfusion Inc. 2001 - 2019. All rights reserved.
@@ -5,0 +5,0 @@ *  Use of this code is subject to the terms of our license.

package.json

 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@17.2.41",
+  "_id": "@syncfusion/ej2-treegrid@17.2.46",
   "_inBundle": false,
-  "_integrity": "sha512-L/P35npDomYsNqFKTJYuiW+m3HLtmrRzfPtjG/DeEHMOQX+E1XJsx6VzpOLaENcsy9Jvn48c2iLgQivbw5TwsQ==",
+  "_integrity": "sha512-aQgncl1oO1z3xPiwgtEXBUDSFMYME7H5ZGKqNzRx2Q+Ymp92mwGYJTZVt/W5RVWeJJolQDzo4PjSJI0uoXiMnw==",
   "_location": "/@syncfusion/ej2-treegrid",
@@ -27,6 +27,6 @@ "_phantomChildren": {},
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-treegrid/-/ej2-treegrid-17.2.41.tgz",
-  "_shasum": "31462e2349613a9a82f02f1f3035707227c68330",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-treegrid/-/ej2-treegrid-17.2.46.tgz",
+  "_shasum": "2e589209d30e7d75a72401393b2fb257eecd2e4d",
   "_spec": "@syncfusion/ej2-treegrid@*",
-  "_where": "/jenkins/workspace/ation_hotfix_16.4.0.42_Vol4-CJVRBFC7Z7RSISPRJNEMNQSRMCB6XTG67IJD6R2DVNXFIKQEITTQ/packages/included",
+  "_where": "/jenkins/workspace/ation_hotfix_17.2.0.34_Vol2-DDPJ6C2YEWTWLLKKNA7AG2JBE6DYTCTNGMHGORWGAYAVCL6L7OLQ/packages/included",
   "author": {
@@ -40,6 +40,6 @@ "name": "Syncfusion Inc."
   "dependencies": {
-    "@syncfusion/ej2-base": "~17.2.46",
-    "@syncfusion/ej2-data": "~17.2.46",
-    "@syncfusion/ej2-grids": "~17.2.46",
-    "@syncfusion/ej2-popups": "~17.2.46"
+    "@syncfusion/ej2-base": "~17.2.47",
+    "@syncfusion/ej2-data": "~17.2.47",
+    "@syncfusion/ej2-grids": "~17.2.47",
+    "@syncfusion/ej2-popups": "~17.2.47"
   },
@@ -64,4 +64,5 @@ "deprecated": false,
   },
-  "version": "17.2.46",
+  "typings": "index.d.ts",
+  "version": "17.2.47",
   "sideEffects": false
 }

src/treegrid/actions/filter.js

@@ -66,5 +66,6 @@ import { getObject, Filter as GridFilter, Grid } from '@syncfusion/ej2-grids';
             this.addParentRecord(rec);
-            if (this.parent.filterSettings.hierarchyMode === 'Child' ||
-                this.parent.filterSettings.hierarchyMode === 'None' || this.parent.searchSettings.hierarchyMode === 'Child' ||
-                this.parent.searchSettings.hierarchyMode === 'None') {
+            var hierarchyMode = this.parent.grid.searchSettings.key === '' ? this.parent.filterSettings.hierarchyMode
+                : this.parent.searchSettings.hierarchyMode;
+            if (((hierarchyMode === 'Child' || hierarchyMode === 'None') &&
+                (this.parent.grid.filterSettings.columns.length !== 0 || this.parent.grid.searchSettings.key !== ''))) {
                 this.isHierarchyFilter = true;
@@ -92,3 +93,6 @@ }
         //let parent: Object = this.parent.flatData.filter((e: ITreeData) => {return e.uniqueID === record.parentUniqueID; })[0];
-        if (this.parent.filterSettings.hierarchyMode === 'None' || this.parent.searchSettings.hierarchyMode === 'None') {
+        var hierarchyMode = this.parent.grid.searchSettings.key === '' ? this.parent.filterSettings.hierarchyMode
+            : this.parent.searchSettings.hierarchyMode;
+        if (hierarchyMode === 'None' && (this.parent.grid.filterSettings.columns.length !== 0
+            || this.parent.grid.searchSettings.key !== '')) {
             if (isNullOrUndefined(parent)) {
@@ -122,4 +126,6 @@ if (this.flatFilteredData.indexOf(record) !== -1) {
             if (!isNullOrUndefined(parent)) {
-                if (this.parent.filterSettings.hierarchyMode === 'Child'
-                    || this.parent.searchSettings.hierarchyMode === 'Child') {
+                var hierarchyMode_1 = this.parent.grid.searchSettings.key === '' ?
+                    this.parent.filterSettings.hierarchyMode : this.parent.searchSettings.hierarchyMode;
+                if (hierarchyMode_1 === 'Child' && (this.parent.grid.filterSettings.columns.length !== 0
+                    || this.parent.grid.searchSettings.key !== '')) {
                     if (this.flatFilteredData.indexOf(parent) !== -1) {
@@ -144,4 +150,6 @@ this.addParentRecord(parent);
             var ischild = childRec[count].childRecords;
-            if ((this.parent.filterSettings.hierarchyMode === 'Child' || this.parent.filterSettings.hierarchyMode === 'Both') ||
-                (this.parent.searchSettings.hierarchyMode === 'Child' || this.parent.searchSettings.hierarchyMode === 'Both')) {
+            var hierarchyMode = this.parent.grid.searchSettings.key === '' ?
+                this.parent.filterSettings.hierarchyMode : this.parent.searchSettings.hierarchyMode;
+            if (((hierarchyMode === 'Child' || hierarchyMode === 'Both') && (this.parent.grid.filterSettings.columns.length !== 0
+                || this.parent.grid.searchSettings.key !== ''))) {
                 var uniqueIDValue = getValue('uniqueIDFilterCollection', this.parent);
@@ -154,4 +162,5 @@ if (!uniqueIDValue.hasOwnProperty(childRec[count].uniqueID)) {
             }
-            if (this.parent.filterSettings.hierarchyMode === 'None' || this.parent.searchSettings.hierarchyMode === 'None') {
-                if (this.flatFilteredData.indexOf(childRec[count] !== -1)) {
+            if ((hierarchyMode === 'None')
+                && (this.parent.grid.filterSettings.columns.length !== 0 || this.parent.grid.searchSettings.key !== '')) {
+                if (this.flatFilteredData.indexOf(childRec[count]) !== -1) {
                     isExist = true;
@@ -158,0 +167,0 @@ break;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3965973

increased by0.2%

Lines of code

35452

increased by0.08%

Dependency changes

• Updated@syncfusion/ej2-base@~17.2.47

• Updated@syncfusion/ej2-data@~17.2.47

• Updated@syncfusion/ej2-grids@~17.2.47

• Updated@syncfusion/ej2-popups@~17.2.47