Merge pull request #19647 from code-dot-org/regional-partner-dropdown…

…-default Regional partner dropdown default
code-dot-org · Jan 2, 2018 · adeb6be · adeb6be
2 parents 3f2dd37 + 78f96c4
commit adeb6be
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 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
@@ -194,10 +194,10 @@ export class QuickViewTable extends React.Component {
 
   constructRows() {
     let rows = this.props.data;
-    if (this.props.regionalPartnerFilter) {
-      if (this.props.regionalPartnerFilter === UnmatchedFilter) {
+    if (this.props.regionalPartnerFilter !== AllPartnersFilter) {
+      if (this.props.regionalPartnerFilter === UnmatchedFilter || this.props.regionalPartnerFilter === null) {
         rows = rows.filter(row => row.regional_partner_id === null);
-      } else if (this.props.regionalPartnerFilter !== AllPartnersFilter) {
+      } else {
         rows = rows.filter(row => row.regional_partner_id === this.props.regionalPartnerFilter);
       }
     }

diff --git a/apps/src/code-studio/pd/application_dashboard/reducers.js b/apps/src/code-studio/pd/application_dashboard/reducers.js
@@ -1,12 +1,12 @@
-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';
 const SET_WORKSHOP_ADMIN_PERMISSION = 'application_dashboard/SET_WORKSHOP_ADMIN_PERMISSION';
 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
@@ -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';
@@ -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 => {
@@ -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({

diff --git 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"},