Merge pull request #15 from RallyCommunity/timebox_filter_support

krmorse · web-flow · commit a68e4fcf8c47 · 2018-08-16T13:49:51.000-06:00
Add timebox filter support
diff --git a/deploy/App.txt b/deploy/App.txt
@@ -3,11 +3,11 @@
 <head>
     <title>Custom Grid with Deep Export</title>
     <!--  (c) 2015 Rally Software Development Corp.  All Rights Reserved. -->
-    <!--  Build Date: Fri May 18 2018 10:21:38 GMT-0600 (MDT) -->
+    <!--  Build Date: Wed Aug 15 2018 12:11:02 GMT-0600 (MDT) -->
     
     <script type="text/javascript">
-        var APP_BUILD_DATE = "Fri May 18 2018 10:21:38 GMT-0600 (MDT)";
-        var CHECKSUM = 34251012870;
+        var APP_BUILD_DATE = "Wed Aug 15 2018 12:11:02 GMT-0600 (MDT)";
+        var CHECKSUM = 35081721478;
     </script>
     
     <script type="text/javascript" src="/apps/2.1/sdk.js"></script>
@@ -877,6 +877,11 @@ Ext.define("custom-grid-with-deep-export", {
     allowExpansionStateToBeSaved: false,
     enableAddNew: true,
 
+    onTimeboxScopeChange: function(newTimeboxScope) {
+        this.callParent(arguments);
+        this._buildStore();
+    },
+
     launch: function () {
         this.fetchPortfolioItemTypes().then({
             success: function(portfolioItemTypes){
@@ -912,7 +917,11 @@ Ext.define("custom-grid-with-deep-export", {
             this.down('#display_box').removeAll();
         }
 
-        var filters = this.getSetting('query') ? Rally.data.wsapi.Filter.fromQueryString(this.getSetting('query')) : [];
+        var filters = this.getSetting('query') ? [Rally.data.wsapi.Filter.fromQueryString(this.getSetting('query'))] : [];
+        var timeboxScope = this.getContext().getTimeboxScope();
+        if (timeboxScope && timeboxScope.isApplicable(store.model)) {
+            filters.push(timeboxScope.getQueryFilter());
+        }
         this.logger.log('_addGridboard', store);
 
 
@@ -1055,12 +1064,14 @@ Ext.define("custom-grid-with-deep-export", {
         if (grid.currentCustomFilter && grid.currentCustomFilter.filters){
             filters = grid.currentCustomFilter.filters;
         }
-        if (query){
-            if (filters && filters.length > 0){
-                return filters.and(filters, Rally.data.wsapi.Filter.fromQueryString(query));
-            } else {
-                return Rally.data.wsapi.Filter.fromQueryString(query);
-            }
+
+        if (query) {
+            filters.push(Rally.data.wsapi.Filter.fromQueryString(query));
+        }
+
+        var timeboxScope = this.getContext().getTimeboxScope();
+        if (timeboxScope && timeboxScope.isApplicable(grid.getGridOrBoard().store.model)) {
+            filters.push(timeboxScope.getQueryFilter());
         }
         return filters;
     },
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "_comment": "This file is used by grunt",
   "name": "custom-grid-with-deep-export",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "dependencies": {},
   "devDependencies": {
     "grunt": "~0.4.1",
diff --git a/src/javascript/app.js b/src/javascript/app.js
@@ -29,6 +29,11 @@ Ext.define("custom-grid-with-deep-export", {
     allowExpansionStateToBeSaved: false,
     enableAddNew: true,
 
+    onTimeboxScopeChange: function(newTimeboxScope) {
+        this.callParent(arguments);
+        this._buildStore();
+    },
+
     launch: function () {
         this.fetchPortfolioItemTypes().then({
             success: function(portfolioItemTypes){
@@ -64,7 +69,11 @@ Ext.define("custom-grid-with-deep-export", {
             this.down('#display_box').removeAll();
         }
 
-        var filters = this.getSetting('query') ? Rally.data.wsapi.Filter.fromQueryString(this.getSetting('query')) : [];
+        var filters = this.getSetting('query') ? [Rally.data.wsapi.Filter.fromQueryString(this.getSetting('query'))] : [];
+        var timeboxScope = this.getContext().getTimeboxScope();
+        if (timeboxScope && timeboxScope.isApplicable(store.model)) {
+            filters.push(timeboxScope.getQueryFilter());
+        }
         this.logger.log('_addGridboard', store);
 
 
@@ -207,12 +216,14 @@ Ext.define("custom-grid-with-deep-export", {
         if (grid.currentCustomFilter && grid.currentCustomFilter.filters){
             filters = grid.currentCustomFilter.filters;
         }
-        if (query){
-            if (filters && filters.length > 0){
-                return filters.and(filters, Rally.data.wsapi.Filter.fromQueryString(query));
-            } else {
-                return Rally.data.wsapi.Filter.fromQueryString(query);
-            }
+
+        if (query) {
+            filters.push(Rally.data.wsapi.Filter.fromQueryString(query));
+        }
+
+        var timeboxScope = this.getContext().getTimeboxScope();
+        if (timeboxScope && timeboxScope.isApplicable(grid.getGridOrBoard().store.model)) {
+            filters.push(timeboxScope.getQueryFilter());
         }
         return filters;
     },

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"_comment": "This file is used by grunt",`
`3`	`3`	`"name": "custom-grid-with-deep-export",`
`4`		`- "version": "1.1.2",`
	`4`	`+ "version": "1.1.3",`
`5`	`5`	`"dependencies": {},`
`6`	`6`	`"devDependencies": {`
`7`	`7`	`"grunt": "~0.4.1",`