Remove total grants statistics from the TTA overview widget (#354)

* Request errors api * Request errors api * Added data provider * Added show * Add backend tests * Address feedback from review, add frontend test * Deploy to sandbox * Remove total grants statistics from the TTA overview widget * Fix export * Update tests * Remove extra bracket * Update text on non-grantees served
HHS · Jul 9, 2021 · 0e29348 · 0e29348
1 parent 2c717ed
commit 0e29348
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/frontend/src/pages/Landing/__tests__/index.js b/frontend/src/pages/Landing/__tests__/index.js
@@ -702,7 +702,7 @@ describe('Landing page table menus & selections', () => {
         userEvent.click(reportMenu);
         const downloadButton = await screen.findByRole('menuitem', { name: /export table data/i });
         userEvent.click(downloadButton);
-        expect(getAllAlertsDownloadURL).toHaveBeenCalledWith('');
+        expect(getAllAlertsDownloadURL).toHaveBeenCalledWith('region.in[]=1');
       });
     });
   });
@@ -728,7 +728,7 @@ describe('Landing page table menus & selections', () => {
       userEvent.click(reportMenu);
       const downloadButton = await screen.findByRole('menuitem', { name: /export table data/i });
       userEvent.click(downloadButton);
-      expect(getAllReportsDownloadURL).toHaveBeenCalledWith('');
+      expect(getAllReportsDownloadURL).toHaveBeenCalledWith('region.in[]=1');
     });
   });
 });

diff --git a/frontend/src/pages/Landing/index.js b/frontend/src/pages/Landing/index.js
@@ -23,7 +23,7 @@ import 'uswds/dist/css/uswds.css';
 import '@trussworks/react-uswds/lib/index.css';
 import './index.css';
 import MyAlerts from './MyAlerts';
-import isAdmin, { hasReadWrite, allRegionsUserHasPermissionTo } from '../../permissions';
+import { hasReadWrite, allRegionsUserHasPermissionTo } from '../../permissions';
 import { REPORTS_PER_PAGE, ALERTS_PER_PAGE } from '../../Constants';
 import Filter, { filtersToQueryString } from './Filter';
 import ReportMenu from './ReportMenu';
@@ -380,13 +380,13 @@ function Landing() {
   };
 
   const handleDownloadAllReports = () => {
-    const filterQuery = filtersToQueryString(filters);
+    const filterQuery = filtersToQueryString(filters, appliedRegion);
     const downloadURL = getAllReportsDownloadURL(filterQuery);
     window.location.assign(downloadURL);
   };
 
   const handleDownloadAllAlerts = () => {
-    const filterQuery = filtersToQueryString(alertFilters);
+    const filterQuery = filtersToQueryString(alertFilters, appliedRegion);
     const downloadURL = getAllAlertsDownloadURL(filterQuery);
     window.location.assign(downloadURL);
   };
@@ -493,7 +493,7 @@ function Landing() {
                 <h1 className="landing">Activity Reports</h1>
               </Grid>
               <Grid col={2} className="flex-align-self-center">
-                {isAdmin(user) && getUserRegions(user).length > 1
+                {getUserRegions(user).length > 1
                 && (
                 <RegionalSelect
                   regions={allRegionsUserHasPermissionTo(user)}
@@ -509,14 +509,12 @@ function Landing() {
             </Grid>
             <Grid row gap className="smart-hub--overview">
               <Grid col={10}>
-                {isAdmin(user) && (
                 <Overview
                   filters={filters}
                   region={appliedRegion}
                   allRegions={getUserRegions(user)}
                   skipLoading
                 />
-                )}
               </Grid>
             </Grid>
             <Grid row>

diff --git a/frontend/src/widgets/Overview.js b/frontend/src/widgets/Overview.js
@@ -56,8 +56,8 @@ function Overview({ data, region }) {
         <span className="smart-hub--overview-period"> 9/15/2020 to Today</span>
       </Grid>
       <Grid row gap className="smart-hub--overview-data">
-        <Field col="fill" tablet={{ col: true }} label="Grants served " labelExt={`(of ${data.numTotalGrants})`} data={data.numGrants} />
-        <Field col="fill" label="Non-grantees served" data={data.numNonGrantees} />
+        <Field col="fill" tablet={{ col: true }} label="Grants served " data={data.numGrants} />
+        <Field col="fill" label="Non-grantee entities served" data={data.numNonGrantees} />
         <Field col="fill" label="Activity reports" data={data.numReports} />
         <Field col="fill" label="Participants" data={data.numParticipants} />
         <Field col={2} label="Hours of TTA" data={data.sumDuration} />