Skip to content

Add timebox filter support #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2018
Merged

Add timebox filter support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions deploy/App.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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){
Expand Down Expand Up @@ -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);


Expand Down Expand Up @@ -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;
},
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
25 changes: 18 additions & 7 deletions src/javascript/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down Expand Up @@ -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);


Expand Down Expand Up @@ -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;
},
Expand Down