Squashed commit of the following:

commit 5896310 Merge: 55a2a37 c0394f1 Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 17:39:27 2021 -0500 Merge pull request #150 from adhocteam/kw-display-reports Display reports commit c0394f1 Merge: 9189f61 55a2a37 Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 17:13:40 2021 -0500 Merge branch 'main' into kw-display-reports commit 55a2a37 Merge: e985f60 61cb04e Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 17:11:28 2021 -0500 Merge pull request #163 from adhocteam/kw-secure-cookie Add explicit cookie-session options commit 61cb04e Merge: 4ba76a9 6740fd5 Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 16:56:17 2021 -0500 Merge branch 'kw-secure-cookie' of https://github.com/adhocteam/Head-Start-TTADP into kw-secure-cookie commit 4ba76a9 Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 16:55:58 2021 -0500 Remove one of secure cookie settings commit 6740fd5 Merge: fa3f81e e985f60 Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 16:54:01 2021 -0500 Merge branch 'main' into kw-secure-cookie commit 9189f61 Merge: c1f7ba4 e985f60 Author: Ryan Ahearn <[email protected]> Date: Fri Feb 12 14:23:56 2021 -0500 Merge branch 'main' into kw-display-reports commit c1f7ba4 Merge: f3881d1 79a4808 Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 12:57:14 2021 -0500 Merge branch 'main' into kw-display-reports commit f3881d1 Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 12:26:40 2021 -0500 Fix lint errors commit 112ccd6 Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 11:10:37 2021 -0500 Update yarn.lock commit cdc95f1 Merge: 1b1ce8c 8751dcf Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 10:18:13 2021 -0500 Merge branch 'kw-display-reports' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports commit 1b1ce8c Author: kryswisnaskas <[email protected]> Date: Fri Feb 12 10:17:49 2021 -0500 Added scrollbars; removed test; modified styles commit fa3f81e Author: kryswisnaskas <[email protected]> Date: Wed Feb 10 16:22:08 2021 -0500 Add explicit cookie session options commit 8751dcf Merge: 3d8382b c5b47a7 Author: kryswisnaskas <[email protected]> Date: Wed Feb 10 12:51:09 2021 -0500 Merge branch 'main' into kw-display-reports commit 3d8382b Author: kryswisnaskas <[email protected]> Date: Wed Feb 10 12:25:43 2021 -0500 Fix merge issue commit 3d4b1ac Merge: 6c5e287 16c743f Author: kryswisnaskas <[email protected]> Date: Wed Feb 10 11:50:02 2021 -0500 Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports commit 6c5e287 Author: kryswisnaskas <[email protected]> Date: Wed Feb 10 11:46:58 2021 -0500 Remove blank lines commit ff3b8b5 Author: kryswisnaskas <[email protected]> Date: Wed Feb 10 11:21:03 2021 -0500 Remove sorting commit 1da28b0 Merge: c3b37b4 d1c5786 Author: kryswisnaskas <[email protected]> Date: Wed Feb 10 09:32:54 2021 -0500 Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports commit c3b37b4 Author: kryswisnaskas <[email protected]> Date: Tue Feb 9 17:47:17 2021 -0500 Adjust test commit 4af7bd8 Author: kryswisnaskas <[email protected]> Date: Tue Feb 9 17:33:38 2021 -0500 Remove whitespace to satisfy eslint commit 253e568 Author: kryswisnaskas <[email protected]> Date: Tue Feb 9 17:10:15 2021 -0500 Combine values from multiples commit 23cf654 Author: kryswisnaskas <[email protected]> Date: Tue Feb 9 14:31:56 2021 -0500 Fix new eslint errors commit e4e51ec Author: kryswisnaskas <[email protected]> Date: Tue Feb 9 14:31:34 2021 -0500 Fix new eslint errors commit 4b8a95d Author: kryswisnaskas <[email protected]> Date: Tue Feb 9 13:42:36 2021 -0500 Add role acronyms to display commit 809a57b Author: kryswisnaskas <[email protected]> Date: Tue Feb 9 12:23:42 2021 -0500 Update open api doc commit 55c78db Author: kryswisnaskas <[email protected]> Date: Tue Feb 9 09:02:27 2021 -0500 Fix cucumber test commit f106cc2 Author: kryswisnaskas <[email protected]> Date: Mon Feb 8 20:26:38 2021 -0500 Modified cucumber test commit a21b9d2 Author: kryswisnaskas <[email protected]> Date: Mon Feb 8 20:12:33 2021 -0500 Modified cucumber test commit 0561da4 Merge: 664b52f a99fe60 Author: kryswisnaskas <[email protected]> Date: Mon Feb 8 19:40:25 2021 -0500 Merge branch 'kw-display-reports' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports commit 664b52f Merge: 158b2cd 0277d73 Author: kryswisnaskas <[email protected]> Date: Mon Feb 8 19:39:54 2021 -0500 Merge branch 'js-282-fix-cucumber-tests' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports commit a99fe60 Merge: 158b2cd 9f5bb95 Author: kryswisnaskas <[email protected]> Date: Mon Feb 8 19:30:27 2021 -0500 Merge branch 'main' into kw-display-reports commit 158b2cd Author: kryswisnaskas <[email protected]> Date: Mon Feb 8 19:15:28 2021 -0500 Fix lint errors commit e4dae31 Author: kryswisnaskas <[email protected]> Date: Mon Feb 8 18:08:49 2021 -0500 Added more tests commit 04bba1c Author: kryswisnaskas <[email protected]> Date: Fri Feb 5 16:51:33 2021 -0500 Fix lint errors commit 95b3a38 Author: kryswisnaskas <[email protected]> Date: Fri Feb 5 15:05:51 2021 -0500 Fix merge conflict commit 7d9805f Merge: 4b6a542 5a31b94 Author: kryswisnaskas <[email protected]> Date: Fri Feb 5 14:39:14 2021 -0500 Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports commit 4b6a542 Author: kryswisnaskas <[email protected]> Date: Fri Feb 5 13:59:37 2021 -0500 Remove unused module commit 67566d3 Author: kryswisnaskas <[email protected]> Date: Fri Feb 5 13:58:32 2021 -0500 Fix lint errors commit 6de8f8e Author: kryswisnaskas <[email protected]> Date: Fri Feb 5 12:24:20 2021 -0500 Fix merge issue commit 6431825 Author: kryswisnaskas <[email protected]> Date: Fri Feb 5 11:48:46 2021 -0500 Correct merge error commit 75f7639 Author: kryswisnaskas <[email protected]> Date: Fri Feb 5 11:46:04 2021 -0500 Added tests, empty report commit 69ccf13 Merge: a2bd6c0 8e5d3ef Author: kryswisnaskas <[email protected]> Date: Wed Feb 3 17:18:26 2021 -0500 Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports commit a2bd6c0 Merge: a716599 4c3a436 Author: kryswisnaskas <[email protected]> Date: Sat Jan 30 10:07:19 2021 -0500 Merge branch 'main' of https://github.com/adhocteam/Head-Start-TTADP into kw-display-reports commit a716599 Author: kryswisnaskas <[email protected]> Date: Fri Jan 29 13:50:53 2021 -0500 Added sorting commit cedfeb0 Author: kryswisnaskas <[email protected]> Date: Wed Jan 27 12:47:28 2021 -0500 Landing page checkpoint commit
HHS · Feb 15, 2021 · f938f49 · f938f49
1 parent bb5db6a
commit f938f49
Show file tree

Hide file tree

Showing 24 changed files with 930 additions and 34 deletions.
diff --git a/cucumber/features/activityReport.feature b/cucumber/features/activityReport.feature
@@ -1,7 +1,7 @@
 Feature: TTA Smarthub Activity Report
     Scenario: Report can be filled out
         Given I am logged in
-        And I am on the activity reports page
+        And I am on the landing page
         Then I see "New activity report for Region 14" message
         When I select "Non-Grantee"
         Then I see "QRIS System" as an option in the "Non-grantee name(s)" multiselect
diff --git a/cucumber/features/steps/activityReportSteps.js b/cucumber/features/steps/activityReportSteps.js
@@ -5,14 +5,21 @@ const {
 const assertTrue = require('assert');
 const scope = require('../support/scope');
 
-Given('I am on the activity reports page', async () => {
+Given('I am on the landing page', async () => {
   const page = scope.context.currentPage;
-  const selector = 'a[href$="activity-reports/new"]';
+  const selector = 'a[href$="activity-reports"]';
   await Promise.all([
     page.waitForNavigation(),
     page.click(selector),
   ]);
   await scope.context.currentPage.waitForSelector('h1');
+
+  const selectorNewReport = 'a[href$="activity-reports/new"]';
+  await Promise.all([
+    page.waitForNavigation(),
+    page.click(selectorNewReport),
+  ]);
+  await scope.context.currentPage.waitForSelector('h1');
 });
 
 When('I select {string}', async (inputLabel) => {

diff --git a/cucumber/features/steps/homePageSteps.js b/cucumber/features/steps/homePageSteps.js
@@ -22,7 +22,7 @@ Given('I am logged in', async () => {
 
   const loginLinkSelector = 'a[href$="api/login"]';
   // const homeLinkSelector = 'a[href$="/"]';
-  const activityReportsSelector = 'a[href$="activity-reports/new"]';
+  const activityReportsSelector = 'a[href$="activity-reports"]';
 
   await page.goto(scope.uri);
   await page.waitForSelector('em'); // Page title
@@ -52,7 +52,7 @@ Then('I see {string} message', async (string) => {
 
 Then('I see {string} link', async (string) => {
   const page = scope.context.currentPage;
-  const selector = 'a[href$="activity-reports/new"]';
+  const selector = 'a[href$="activity-reports"]';
 
   await page.waitForSelector(selector);
   const value = await page.$eval(selector, (el) => el.textContent);

diff --git a/docs/openapi/index.yaml b/docs/openapi/index.yaml
@@ -113,6 +113,40 @@ components:
           description: The type of the activity, Training or Technical Assistance (or both)
           items:
             type: string
+    shortActivityReport:
+      type: object
+      description: >
+        This object represents a shorter version of a report on an activity that a specialist has completed
+        with 1 to many grants or non-grantees
+      properties:
+        id:
+          type: number
+        regionId:
+          type: number
+          description: Home region id of the activity report user
+        startDate:
+          type: string
+        lastSaved:
+          type: string
+        topics:
+          type: array
+          description: Topics covered during the TTA
+          items:
+            type: string
+        activityRecipients:
+          type: array
+          description: Activity recipients - grantees or non-grantees
+          items:
+            type: object
+        collaborators:
+          type: array
+          description: Collaborating user names
+          items:
+            type: object
+        status:
+          type: string
+          enum: ['approved', 'draft', 'submitted']
+          description: The current state of the report
     selectableUser:
       type: object
       description: >

diff --git a/docs/openapi/paths/activity-reports/activity-reports.yaml b/docs/openapi/paths/activity-reports/activity-reports.yaml
@@ -1,3 +1,15 @@
+get:
+  tags:
+    - activity-reports
+  description: Gets activity reports from the database.
+  responses:
+    200:
+      description: Successfully retrieved activity reports
+      content:
+        application/json:
+          schema:
+            type: object
+            $ref: '../../index.yaml#/components/schemas/shortActivityReport'
 post:
   tags:
     - activity-reports

diff --git a/frontend/package.json b/frontend/package.json
@@ -33,6 +33,8 @@
     "react-select": "^3.1.0",
     "react-stickynode": "^3.0.4",
     "react-with-direction": "^1.3.1",
+    "simplebar": "^5.3.0",
+    "simplebar-react": "^2.3.0",
     "url-join": "^4.0.1",
     "use-deep-compare-effect": "^1.6.1",
     "uswds": "^2.9.0"

diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -3,8 +3,8 @@
   top: 0;
   z-index: -1;
   left: 0;
-  width: 100%;
-  height: 345px;
+  width: 200px;
+  height: 100%;
   content: "";
   background-color: #264a64;
 }
@@ -38,3 +38,4 @@ body {
 .SingleDatePickerInput__disabled {
   opacity: 0.7;
 }
+
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -3,7 +3,6 @@ import 'uswds/dist/css/uswds.css';
 import '@trussworks/react-uswds/lib/index.css';
 
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
-import { GridContainer } from '@trussworks/react-uswds';
 import { Helmet } from 'react-helmet';
 
 import { fetchUser, fetchLogout } from './fetchers/Auth';
@@ -15,11 +14,14 @@ import Admin from './pages/Admin';
 import Unauthenticated from './pages/Unauthenticated';
 import NotFound from './pages/NotFound';
 import Home from './pages/Home';
+import Landing from './pages/Landing';
 import ActivityReport from './pages/ActivityReport';
 import isAdmin from './permissions';
 import 'react-dates/initialize';
 import 'react-dates/lib/css/_datepicker.css';
 import './App.css';
+import MainLayout from './components/MainLayout';
+import LandingLayout from './components/LandingLayout';
 
 function App() {
   const [user, updateUser] = useState();
@@ -58,6 +60,7 @@ function App() {
   }
 
   const admin = isAdmin(user);
+
   const renderAuthenticatedRoutes = () => (
     <div role="main" id="main-content">
       <IdleModal
@@ -66,33 +69,42 @@ function App() {
         logoutUser={logout}
       />
       <Switch>
+        <Route
+          exact
+          path="/activity-reports"
+          render={({ match }) => (
+            <LandingLayout><Landing match={match} /></LandingLayout>
+          )}
+        />
+
         <Route
           exact
           path="/"
           render={() => (
-            <Home />
+            <MainLayout><Home /></MainLayout>
           )}
         />
+
         <Route
           path="/activity-reports/:activityReportId/:currentPage?"
           render={({ match, location }) => (
-            <ActivityReport location={location} match={match} user={user} />
-          )}
-        />
-        {admin
-        && (
-        <Route
-          path="/admin/:userId?"
-          render={({ match }) => (
-            <Admin match={match} />
+            <MainLayout>
+              <ActivityReport location={location} match={match} user={user} />
+            </MainLayout>
           )}
         />
+
+        {admin && (
+          <Route
+            path="/admin/:userId?"
+            render={({ match }) => <MainLayout><Admin match={match} /></MainLayout>}
+          />
         )}
+
         <Route
-          render={() => (
-            <NotFound />
-          )}
+          render={() => <MainLayout><NotFound /></MainLayout>}
         />
+
       </Switch>
     </div>
   );
@@ -103,17 +115,21 @@ function App() {
         <meta charSet="utf-8" />
       </Helmet>
       <BrowserRouter>
-        {authenticated && <a className="usa-skipnav" href="#main-content">Skip to main content</a>}
+        {authenticated && (
+          <a className="usa-skipnav" href="#main-content">
+            Skip to main content
+          </a>
+        )}
         <UserContext.Provider value={{ user, authenticated, logout }}>
           <Header authenticated={authenticated} admin={admin} />
           <div className="background-stripe" />
           <section className="usa-section">
-            <GridContainer>
-              {!authenticated
-        && <Unauthenticated loggedOut={loggedOut} timedOut={timedOut} />}
-              {authenticated
-        && renderAuthenticatedRoutes()}
-            </GridContainer>
+
+            {!authenticated && (
+            <Unauthenticated loggedOut={loggedOut} timedOut={timedOut} />
+            )}
+            {authenticated && renderAuthenticatedRoutes()}
+
           </section>
         </UserContext.Provider>
       </BrowserRouter>

diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js
@@ -14,7 +14,7 @@ function Header({ authenticated, admin }) {
     <NavLink exact to="/">
       Home
     </NavLink>,
-    <NavLink to="/activity-reports/new">
+    <NavLink to="/activity-reports">
       Activity Reports
     </NavLink>,
   ];

diff --git a/frontend/src/components/LandingLayout.js b/frontend/src/components/LandingLayout.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Grid } from '@trussworks/react-uswds';
+
+function LandingLayout({ children }) {
+  return (
+    <Grid row>
+      <Grid tablet={{ col: true }} className="smart-hub--fit-content">{children}</Grid>
+    </Grid>
+  );
+}
+
+LandingLayout.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default LandingLayout;
diff --git a/frontend/src/components/MainLayout.js b/frontend/src/components/MainLayout.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { GridContainer } from '@trussworks/react-uswds';
+
+function MainLayout({ children }) {
+  return (
+    <GridContainer>
+      {children}
+    </GridContainer>
+  );
+}
+
+MainLayout.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default MainLayout;
diff --git a/frontend/src/fetchers/activityReports.js b/frontend/src/fetchers/activityReports.js
@@ -30,6 +30,11 @@ export const getReport = async (reportId) => {
   return report.json();
 };
 
+export const getReports = async () => {
+  const reports = await get(activityReportUrl);
+  return reports.json();
+};
+
 export const getRecipients = async () => {
   const recipients = await get(join(activityReportUrl, 'activity-recipients'));
   return recipients.json();

diff --git a/frontend/src/pages/ActivityReport/index.css b/frontend/src/pages/ActivityReport/index.css
@@ -6,9 +6,7 @@
   font-style: normal;
   line-height: normal;
   letter-spacing: normal;
-  color: #ffffff;
   margin-bottom: 40px;
-  margin-top: 40px;
 }
 
 .smart-hub--form-section {
@@ -66,4 +64,4 @@
   border-bottom-left-radius: 4px;
   border-bottom-right-radius: 4px;
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
-}
+}