From 3ff7f9932f49a47f9d56fd65a70935592b168696 Mon Sep 17 00:00:00 2001 From: Clare Constantine Date: Wed, 13 Dec 2017 15:14:06 -0800 Subject: [PATCH 1/5] Default to unmatched applications --- apps/src/code-studio/pd/application_dashboard/reducers.js | 4 ++-- apps/src/code-studio/pd/application_dashboard/summary.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/src/code-studio/pd/application_dashboard/reducers.js b/apps/src/code-studio/pd/application_dashboard/reducers.js index 7b9a76317d525..984895005ca8a 100644 --- a/apps/src/code-studio/pd/application_dashboard/reducers.js +++ b/apps/src/code-studio/pd/application_dashboard/reducers.js @@ -1,4 +1,4 @@ -import { AllPartnersLabel } from './constants'; +import { UnmatchedLabel } from './constants'; const SET_REGIONAL_PARTNER_NAME = 'application_dashboard/SET_REGIONAL_PARTNER_NAME'; const SET_REGIONAL_PARTNERS = 'application_dashboard/SET_REGIONAL_PARTNERS'; @@ -6,7 +6,7 @@ const SET_WORKSHOP_ADMIN_PERMISSION = 'application_dashboard/SET_WORKSHOP_ADMIN_ const SET_LOCK_APPLICATION_PERMISSION = 'application_dashboard/SET_LOCK_APPLICATION_PERMISSION'; const initialState = { - regionalPartnerName: AllPartnersLabel, + regionalPartnerName: UnmatchedLabel, regionalPartners: [], permissions: {} }; diff --git a/apps/src/code-studio/pd/application_dashboard/summary.jsx b/apps/src/code-studio/pd/application_dashboard/summary.jsx index c04446c9f682e..1d5d0f4b453e1 100644 --- a/apps/src/code-studio/pd/application_dashboard/summary.jsx +++ b/apps/src/code-studio/pd/application_dashboard/summary.jsx @@ -8,7 +8,7 @@ import SummaryTable from './summary_table'; import RegionalPartnerDropdown from './regional_partner_dropdown'; import Spinner from '../components/spinner'; import { - AllPartnersFilter, + UnmatchedFilter, RegionalPartnerDropdownOptions as dropdownOptions } from './constants'; import $ from 'jquery'; @@ -50,7 +50,7 @@ export class Summary extends React.Component { this.setState({ regionalPartnerName, regionalPartnerFilter }); $.ajax({ method: 'GET', - url: `/api/v1/pd/applications?regional_partner_filter=${regionalPartnerFilter ? regionalPartnerFilter : AllPartnersFilter}`, + url: `/api/v1/pd/applications?regional_partner_filter=${regionalPartnerFilter ? regionalPartnerFilter : UnmatchedFilter}`, dataType: 'json' }).done((data) => { this.setState({ From e71422a4ce0d24121e419c2bef137d3fd182dcc8 Mon Sep 17 00:00:00 2001 From: Clare Constantine Date: Wed, 13 Dec 2017 15:57:15 -0800 Subject: [PATCH 2/5] On list view, default to showing unmatched applications --- .../pd/application_dashboard/quick_view_table.jsx | 8 ++++---- apps/src/code-studio/pd/application_dashboard/summary.jsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx b/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx index 9a1788b65ce16..b4734d0e40e13 100644 --- a/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx +++ b/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx @@ -194,11 +194,11 @@ export class QuickViewTable extends React.Component { constructRows() { let rows = this.props.data; - if (this.props.regionalPartnerFilter) { - if (this.props.regionalPartnerFilter === UnmatchedFilter) { - rows = rows.filter(row => row.regional_partner_id === null); - } else if (this.props.regionalPartnerFilter !== AllPartnersFilter) { + if (this.props.regionalPartnerFilter !== AllPartnersFilter) { + if (this.props.regionalPartnerFilter !== UnmatchedFilter) { rows = rows.filter(row => row.regional_partner_id === this.props.regionalPartnerFilter); + } else { + rows = rows.filter(row => row.regional_partner_id === null); } } rows = this.props.statusFilter ? rows.filter(row => row.status === this.props.statusFilter) : rows; diff --git a/apps/src/code-studio/pd/application_dashboard/summary.jsx b/apps/src/code-studio/pd/application_dashboard/summary.jsx index 1d5d0f4b453e1..ce80dea906726 100644 --- a/apps/src/code-studio/pd/application_dashboard/summary.jsx +++ b/apps/src/code-studio/pd/application_dashboard/summary.jsx @@ -33,7 +33,7 @@ export class Summary extends React.Component { componentWillMount() { $.ajax({ method: 'GET', - url: '/api/v1/pd/applications', + url: `/api/v1/pd/applications?regional_partner_filter=${UnmatchedFilter}`, dataType: 'json' }) .done(data => { From c66b1f7b40c37071c02d30fcac6372fa23281671 Mon Sep 17 00:00:00 2001 From: Clare Constantine Date: Wed, 13 Dec 2017 16:51:13 -0800 Subject: [PATCH 3/5] Refactor for readability --- .../pd/application_dashboard/quick_view_table.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx b/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx index b4734d0e40e13..887113fc851f1 100644 --- a/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx +++ b/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx @@ -195,10 +195,10 @@ export class QuickViewTable extends React.Component { constructRows() { let rows = this.props.data; if (this.props.regionalPartnerFilter !== AllPartnersFilter) { - if (this.props.regionalPartnerFilter !== UnmatchedFilter) { - rows = rows.filter(row => row.regional_partner_id === this.props.regionalPartnerFilter); - } else { + if (this.props.regionalPartnerFilter === UnmatchedFilter) { rows = rows.filter(row => row.regional_partner_id === null); + } else { + rows = rows.filter(row => row.regional_partner_id === this.props.regionalPartnerFilter); } } rows = this.props.statusFilter ? rows.filter(row => row.status === this.props.statusFilter) : rows; From 57eb583cf095b54e522bf2314f273b6b8e47fc46 Mon Sep 17 00:00:00 2001 From: Clare Constantine Date: Wed, 13 Dec 2017 16:53:06 -0800 Subject: [PATCH 4/5] Nothing selected should default to unmatched --- .../code-studio/pd/application_dashboard/quick_view_table.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx b/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx index 887113fc851f1..83f789fc0a82d 100644 --- a/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx +++ b/apps/src/code-studio/pd/application_dashboard/quick_view_table.jsx @@ -195,7 +195,7 @@ export class QuickViewTable extends React.Component { constructRows() { let rows = this.props.data; if (this.props.regionalPartnerFilter !== AllPartnersFilter) { - if (this.props.regionalPartnerFilter === UnmatchedFilter) { + if (this.props.regionalPartnerFilter === UnmatchedFilter || this.props.regionalPartnerFilter === null) { rows = rows.filter(row => row.regional_partner_id === null); } else { rows = rows.filter(row => row.regional_partner_id === this.props.regionalPartnerFilter); From 78f96c4a369df8b503f917c46f4c8645b8c7498f Mon Sep 17 00:00:00 2001 From: Clare Constantine Date: Fri, 15 Dec 2017 15:58:01 -0800 Subject: [PATCH 5/5] Fix broken test --- .../unit/code-studio/pd/application_dashboard/summaryTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/test/unit/code-studio/pd/application_dashboard/summaryTest.js b/apps/test/unit/code-studio/pd/application_dashboard/summaryTest.js index 21f7732acd880..2834ca7f5960d 100644 --- a/apps/test/unit/code-studio/pd/application_dashboard/summaryTest.js +++ b/apps/test/unit/code-studio/pd/application_dashboard/summaryTest.js @@ -26,7 +26,7 @@ describe("Summary", () => { it("Generates 5 tables after hearing from server", () => { let server = sinon.fakeServer.create(); - server.respondWith("GET", '/api/v1/pd/applications', + server.respondWith("GET", '/api/v1/pd/applications?regional_partner_filter=none', [ 200, {"Content-Type": "application/json"},