Squashed commit of the following:

commit 9369bd5 Merge: 0c44259 de255ce Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 12:47:40 2021 -0600 Merge pull request #226 from adhocteam/js-fix-be-tests File upload test shouldn't error out commit de255ce Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 12:37:14 2021 -0600 File upload test shouldn't error out FileId is now set in a before each and should no longer depend on tests being ran in a specific order commit 0c44259 Merge: fad3c70 30fb7c1 Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 11:35:55 2021 -0600 Merge pull request #213 from adhocteam/js-332-accessibility-updates Accessibility updates commit 30fb7c1 Merge: c1527c2 fad3c70 Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 10:04:26 2021 -0600 Merge branch 'main' into js-332-accessibility-updates Conflicts: frontend/src/pages/ActivityReport/Pages/goalsObjectives.js commit fad3c70 Merge: 79cab99 3090d99 Author: Ryan Ahearn <[email protected]> Date: Thu Mar 11 10:50:12 2021 -0500 Merge pull request #225 from adhocteam/prod-domain-terraform Production domain terraform commit 3090d99 Merge: 7cac1b4 79cab99 Author: Ryan Ahearn <[email protected]> Date: Thu Mar 11 10:41:25 2021 -0500 Merge branch 'main' into prod-domain-terraform commit 79cab99 Merge: 49f75a5 f9914ca Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 09:39:47 2021 -0600 Merge pull request #216 from adhocteam/js-287-persist-goals-objectives Objectives/Goals are persisted commit c1527c2 Merge: 9c6108f 49f75a5 Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 09:31:52 2021 -0600 Merge branch 'main' into js-332-accessibility-updates commit f9914ca Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 09:29:34 2021 -0600 Return from migrations, remove granteeId from index Renamed migrations to ensure they are ran commit 7cac1b4 Merge: 01dafc4 49f75a5 Author: Ryan Ahearn <[email protected]> Date: Thu Mar 11 10:22:42 2021 -0500 Merge branch 'main' into prod-domain-terraform commit e96c77d Merge: 2f612d9 49f75a5 Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 09:13:48 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit 49f75a5 Merge: bd830f9 72ea701 Author: Josh Salisbury <[email protected]> Date: Thu Mar 11 09:10:30 2021 -0600 Merge pull request #221 from adhocteam/js-152-browser-controls Browser nav fix and various IE 11 fixes commit 01dafc4 Author: Ryan Ahearn <[email protected]> Date: Wed Mar 10 12:02:51 2021 -0500 Add route mapping for prod url commit a7822a9 Author: Ryan Ahearn <[email protected]> Date: Wed Mar 10 11:50:57 2021 -0500 Recursively delete non-prod infrastructure commit 72ea701 Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 16:20:57 2021 -0600 Goal picker fix for IE 11 IE 11 doesn't place flex items properly when a `min-height` is used. Add a flag to the multiselect component allowing flagging it as a "single row" input to allow the goal picker to show up properly commit a270329 Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 15:31:47 2021 -0600 Attempt to force IE to not cache GET requests commit 2f612d9 Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 12:12:41 2021 -0600 Update activityReports query commit 9c6108f Merge: e1b9f45 bd830f9 Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 11:44:27 2021 -0600 Merge branch 'main' into js-332-accessibility-updates commit 81d795b Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 11:43:00 2021 -0600 Lint fix commit 3d6b908 Merge: 2b0ed3d bd830f9 Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 11:40:02 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit bd6ce10 Merge: d3fcd83 bd830f9 Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 11:33:49 2021 -0600 Merge branch 'main' into js-152-browser-controls commit d3fcd83 Merge: f0c8908 87790f3 Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 11:32:35 2021 -0600 Merge branch 'js-152-browser-controls' of github.com:adhocteam/Head-Start-TTADP into js-152-browser-controls commit f0c8908 Author: Josh Salisbury <[email protected]> Date: Wed Mar 10 11:32:16 2021 -0600 Use ie11 version of react-hook-form commit 87790f3 Merge: 91933c6 5e867d8 Author: Ryan Ahearn <[email protected]> Date: Tue Mar 9 19:13:05 2021 -0500 Merge branch 'main' into js-152-browser-controls commit 91933c6 Merge: b9a17b4 58723e1 Author: Josh Salisbury <[email protected]> Date: Tue Mar 9 16:15:18 2021 -0600 Merge branch 'js-152-browser-controls' of github.com:adhocteam/Head-Start-TTADP into js-152-browser-controls Conflicts: .circleci/config.yml commit b9a17b4 Author: Josh Salisbury <[email protected]> Date: Tue Mar 9 16:13:37 2021 -0600 Update sandbox branch commit 58723e1 Merge: d671ba4 bcca11c Author: Josh Salisbury <[email protected]> Date: Tue Mar 9 15:40:45 2021 -0600 Merge branch 'main' into js-152-browser-controls commit d671ba4 Author: Josh Salisbury <[email protected]> Date: Tue Mar 9 11:34:08 2021 -0600 Browser nav fix and various IE 11 fixes * Push nav state instead of replace on navigation. This means the back/forward browser buttons work * Goal picker sets height = min height for the controller, this makes the text inside the textbox center properly in ie11 * react-uswds ^1.12.2 was causing the page to not load in ie11. Downgrade to 1.11.0 * Hex colors with transparency weren't playing nice with ie11, converted to rgba * Padding-inline wasn't working in ie11, switch to padding-left * Duration validation updated to actually force durations rounded to the half hour * Goal multiselect only displays "x goals selected" if there is no user input * Objectives are only focused on mount instead of when the ref changes. Fixes a bug where focus switches back to the objective after switching off commit e1b9f45 Merge: 84f3d0e 5956089 Author: Josh Salisbury <[email protected]> Date: Tue Mar 9 09:35:42 2021 -0600 Merge branch 'main' into js-332-accessibility-updates commit 2b0ed3d Merge: feb5da6 5956089 Author: Josh Salisbury <[email protected]> Date: Tue Mar 9 09:35:37 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit 84f3d0e Merge: 946bfcb e7db658 Author: Josh Salisbury <[email protected]> Date: Mon Mar 8 13:19:51 2021 -0600 Merge branch 'main' into js-332-accessibility-updates commit feb5da6 Merge: 718956c e7db658 Author: Josh Salisbury <[email protected]> Date: Mon Mar 8 11:57:19 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit 718956c Author: Josh Salisbury <[email protected]> Date: Mon Mar 8 11:56:35 2021 -0600 Handle report switching from grantee to non-grantee commit cb1b865 Author: Josh Salisbury <[email protected]> Date: Mon Mar 8 11:04:45 2021 -0600 Objectives/Goals are persisted * When a report is saved the goals and objectives from the report are saved to the DB, udpated or created if needed * An ActivityReportObjective record is created for every objective associating the report to objective * Objectives that are no longer used in the report are removed from the DB, along with the ActivityReportObjective * If the goal hasn't been used on a previous report and is removed from the current report it is also removed * When a report is approved a GrantGoal record is created for every goal/grant pair commit 946bfcb Author: Josh Salisbury <[email protected]> Date: Thu Mar 4 17:02:11 2021 -0600 Update tests commit a2ef841 Author: Josh Salisbury <[email protected]> Date: Thu Mar 4 16:43:16 2021 -0600 Update sandbox branch commit edccb36 Author: Josh Salisbury <[email protected]> Date: Thu Mar 4 16:26:41 2021 -0600 Address accessibility issues * Side nav aria-label removed so the complete entry is read by screen readers * DatePicker has more helpful text announced by screen readers * Duration label is clearer * Save noticiation message is more generic and the whole message is read instead of just the updated date/time * Goal selector no longer eats tabs and can be navigated out of by a keyboard * Skip nav link placed on top of header when focused
HHS · Mar 11, 2021 · 3a0dea1 · 3a0dea1
1 parent 620ee14
commit 3a0dea1
Show file tree

Hide file tree

Showing 59 changed files with 887 additions and 224 deletions.
diff --git a/docs/logical_data_model.md b/docs/logical_data_model.md
@@ -1,14 +1,14 @@
 Logical Data Model
 ==================
 
-![logical data model diagram](http://www.plantuml.com/plantuml/png/nLTjRzis4FwkNy5lUm5Y31k60KLGDCtS8S2M1N7w0yxIHUP6yRZZAQsHvBzFD1FPjEI4jR3rIm8zz_xmZaU_ym8iRMCANu91zSFibv-BuXi5TwGhvPYM1XklFcbPAR2rmKgLJ9-ykaMKml-jhGE6HXbjKTOE5R6ig2XA0zwhZnvPtHTAVQywRs-Kje9r1vsUrcYHGR1w-tOZNddqGViYg7bXRUi4jz3WhYJWPsqNYhLez9q8c65z6XM2ptqBjoABbsspHDw5iG5jTW7HOl2DGjis8GurU8sr9dknKy2tF_tudRgUVvXVpo_FvmlbsgNHvImg-fckDhaRyF8xrTfsXg8Rz0ADsqXAnb3xcGmahQj698_FXCO8UPIc1FGk5YKvFCQ3KXNwahKJJRP79vLpXTnexxDBQZronZc4XkbFWOyyFHzuoZ3Ry1ciffxiFss7pPc9VGuRvCA79hjxGYthtSy6PKN9H74CyvwgTGfxHzRZ8VoSAkpnYOMI6Mk_brhsXfmkispICD4kgxEOJCvX1w_zMKjmVr6zPhF9Odg3_4PWyZXGoWj8wtUHuF2MzzIq_y3KB1fWyIj4kH6uCX0QQaba4EoaZEEnlPHstSaoI0yklXBfb_XP5e9kEv5f1L2AljEolaP7BA-dTPReFwTdIJ0PhW3Sh1sEJzp16iRxXi4APexS5B9Yf8Dn1flts8kvZWNbD4xK38Q3cOW8owyWk5Sescg8JYOcT776NNHCWIarkNR1wjWnd31HP6FMnxn1feLEXoydFAEdbilD4pHPer1LEknUC9Sac7HLRFG_Rw-0HPVQ1QQJMQZGw3lazH-3vLor_KQliDGDcAGRGt5zsoOGz9Lr0JLQ2PV7oDf7JgaSpeHZgXcQO3_sg1RW6kMAN6iscOxfC88dEo9m2IFxudYpZme4OZq3IKbMyBCa1K2D2udi_EN9Tb03jWCvFQcZtvC6l7oCZVP-_Hy_Hf_CfhVyjXcp-dwusDGHc-tBhgDeOllh8SDkUvTC9YfD_voCWIKn2F7_oDSNDMGm6Ky_VzLCJVk83VAKTgX0FJoSqBsAhHwHHpevURZV-LrOn9-hGpnQZGd8FEl75sYn-QiU7pPGoA68NTEhzVkv27y6Q7GvcwdmVyVbE1I3RhsbI0mSAkz3F9MIOYdFmSdX3etKlQmozDS_RL-DbTHoI1JftHCdvxmdIZyJdUI-Yfm5-RXuUmaSrdc7jceRyoy0)
+<img src="http://www.plantuml.com/plantuml/png/nLTVRzis47_Nf-3R_g0nYkrXG14KJJDt2B2vHfn-05gwoEme7dSyfJ6IVFUP8aA8YfpGrfQ-9F3l_j_zZgG-E9R4RQCBLqeDuktijxT5yOEGDwWgOGdN6XedlYdU26bg3PKe2RyvSGt0XVjR6Ij9Da8h0xor891uWqLHQkcS-EA0n5qXnCz2LUATK8QXta6dfpKO8CbGlN_VYJSEdDU-y6gEIPawmOrie2_n-5cx2qMA5RYTI1B9xMbGy3w75dQ31XPjimRgmz18fVi0AzRmJe1f6ny76xY4Mg6vw1Nmuw-__2Gkvv_cb_F5-NmbRBlMgfm5HJTJLPUxbex_n5gPdI6h1XpBndQIai3NViPF9AsjHYGFZmqD4V9QcZOWkbYLQE4O3q9Ku4fIbXMQY4ugPmdKAEUoIseTKCOSF67Y5EZ8wJdVfmophf_UQkfa_sbts9m8oULq0wt_eT3q9zIIwlziW3UOR1I5C1-nsgQmisWSxCFFiOA8JomKzHZzdgFi5LfLvjl4CC4kYrc4EcVOtckSDNlt5zLBDbqMqmdo1qgTrmCX74jkNH_n3gzfeARS9y9crKXYjm7WAvPBBJsXreWQf9cKSHZRSsdNErb6qxsBxzJq1TpoYi6wM49QWInPtIZUNe95ufVJEalq7zCpo90ibmUkjXR6Dsvl3UEy8MaOybPkKhD2fBrnXZVlqGTp7GhA8KxGz8OZE-4Hujybmw1GCDK8EhKndiLvPz711QQjoRNpLWUluVIDGXEoFl8DCY5qkdmvuGaSjbHsJz3a6fLLfLYXaNg130ch0j4_NoybiIgLzPrETg42hMw0jdyzkPohDjxe5PIgaJfXeoykqZQ1PAni5r21ONzuZ5pxG4ahHtR24jOa6sy_zgXcIJNm4cshkqp7T0YaGpCYi6b71k9mieyAMFfyHYGb6ePRJWgGDQmuTEUhGxE36cbs8AMJElezgQNZBu5e7xV_ysDqyhPzNdy5pusCPJlm90YfiM8DiQTlmh2MX3UgWYh11rHxyz-iSc_9yYeSNjZYY1lxi6Csc9Xux6NOBQBoP0AawP-ZrdAD91dfjVfrwA9vaptfUzwzLjh7xCEUjECIlchk-1WrmqFCS0BV_Ep4_Vq9tebmU0Na0KzExkzwN_f5zy4yWWUhCG7ggD-zwulkhtYuxo3V_IBiIrIBBwx2_tc21fUpcV3_Uox7eH0qUXiW8R2lF8PuB2N1qYbv9_jtCxJkMPKHV_5ZvSLOIItxHA6z0t4GXJ57rXJx-1xwdg-OYXDE3KJfpqGdkHN2VBnyNDnxZkxL-G2cQXlzBm00" alt="logical data model diagram">
 
 UML Source
 ----------
 
 ```
 @startuml
-scale 0.75
+scale 0.70
 
 ' avoid problems with angled crows feet
 skinparam linetype ortho
@@ -170,6 +170,16 @@ class ActivityReport {
   * updatedAt : timestamp
 }
 
+class Objective {
+  * id : integer <<generated>>
+  * goalId : integer(32) REFERENCES public.Goal.id
+  title : string,
+  ttaProvided : string,
+  status : string,
+  * createdAt : timestamp
+  * updatedAt : timestamp
+}
+
 class ActivityParticipant {
   * id : integer <<generated>>
   * activityReportId : integer(32) REFERENCES public.ActivityReport.id
@@ -191,6 +201,14 @@ class ActivityReportGoal {
   * goalId : integer(32) REFERENCES public.Goal.id
 }
 
+class ActivityReportObjective {
+  * id : integer <<generated>>
+  * activityReportId : integer(32) REFERENCES public.ActivityReport.id
+  * objectiveId : integer(32) REFERENCES public.Objective.id
+  * createdAt : timestamp
+  * updatedAt : timestamp
+}
+
 User ||-o{ Region
 User }o--|{ Permission
 Scope }o--|{ Permission
@@ -211,6 +229,9 @@ ActivityReport .. NextSteps
 ActivityReport .. ActivityReportGoal
 Goal .. ActivityReportGoal
 Goal }|--|{ ActivityReport
+Goal ||-o{ Objective
+ActivityReportObjective }o--|{ Objective
+ActivityReportObjective }o--|{ ActivityReport
 
 User ||-o{ ActivityReport
 ActivityReport ||-o{ ActivityParticipant
@@ -222,7 +243,7 @@ NonGrantee ||-{ ActivityParticipant
 Instructions
 ------------
 
-1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/uml/nLTjRzis4FwkNy5lUm5Y31k60KLGDCtS8S2M1N7w0yxIHUP6yRZZAQsHvBzFD1FPjEI4jR3rIm8zz_xmZaU_ym8iRMCANu91zSFibv-BuXi5TwGhvPYM1XklFcbPAR2rmKgLJ9-ykaMKml-jhGE6HXbjKTOE5R6ig2XA0zwhZnvPtHTAVQywRs-Kje9r1vsUrcYHGR1w-tOZNddqGViYg7bXRUi4jz3WhYJWPsqNYhLez9q8c65z6XM2ptqBjoABbsspHDw5iG5jTW7HOl2DGjis8GurU8sr9dknKy2tF_tudRgUVvXVpo_FvmlbsgNHvImg-fckDhaRyF8xrTfsXg8Rz0ADsqXAnb3xcGmahQj698_FXCO8UPIc1FGk5YKvFCQ3KXNwahKJJRP79vLpXTnexxDBQZronZc4XkbFWOyyFHzuoZ3Ry1ciffxiFss7pPc9VGuRvCA79hjxGYthtSy6PKN9H74CyvwgTGfxHzRZ8VoSAkpnYOMI6Mk_brhsXfmkispICD4kgxEOJCvX1w_zMKjmVr6zPhF9Odg3_4PWyZXGoWj8wtUHuF2MzzIq_y3KB1fWyIj4kH6uCX0QQaba4EoaZEEnlPHstSaoI0yklXBfb_XP5e9kEv5f1L2AljEolaP7BA-dTPReFwTdIJ0PhW3Sh1sEJzp16iRxXi4APexS5B9Yf8Dn1flts8kvZWNbD4xK38Q3cOW8owyWk5Sescg8JYOcT776NNHCWIarkNR1wjWnd31HP6FMnxn1feLEXoydFAEdbilD4pHPer1LEknUC9Sac7HLRFG_Rw-0HPVQ1QQJMQZGw3lazH-3vLor_KQliDGDcAGRGt5zsoOGz9Lr0JLQ2PV7oDf7JgaSpeHZgXcQO3_sg1RW6kMAN6iscOxfC88dEo9m2IFxudYpZme4OZq3IKbMyBCa1K2D2udi_EN9Tb03jWCvFQcZtvC6l7oCZVP-_Hy_Hf_CfhVyjXcp-dwusDGHc-tBhgDeOllh8SDkUvTC9YfD_voCWIKn2F7_oDSNDMGm6Ky_VzLCJVk83VAKTgX0FJoSqBsAhHwHHpevURZV-LrOn9-hGpnQZGd8FEl75sYn-QiU7pPGoA68NTEhzVkv27y6Q7GvcwdmVyVbE1I3RhsbI0mSAkz3F9MIOYdFmSdX3etKlQmozDS_RL-DbTHoI1JftHCdvxmdIZyJdUI-Yfm5-RXuUmaSrdc7jceRyoy0)
+1. [Edit this diagram with plantuml.com](http://www.plantuml.com/plantuml/uml/nLTVRzis47_Nf-3R_g0nYkrXG14KJJDt2B2vHfn-05gwoEme7dSyfJ6IVFUP8aA8YfpGrfQ-9F3l_j_zZgG-E9R4RQCBLqeDuktijxT5yOEGDwWgOGdN6XedlYdU26bg3PKe2RyvSGt0XVjR6Ij9Da8h0xor891uWqLHQkcS-EA0n5qXnCz2LUATK8QXta6dfpKO8CbGlN_VYJSEdDU-y6gEIPawmOrie2_n-5cx2qMA5RYTI1B9xMbGy3w75dQ31XPjimRgmz18fVi0AzRmJe1f6ny76xY4Mg6vw1Nmuw-__2Gkvv_cb_F5-NmbRBlMgfm5HJTJLPUxbex_n5gPdI6h1XpBndQIai3NViPF9AsjHYGFZmqD4V9QcZOWkbYLQE4O3q9Ku4fIbXMQY4ugPmdKAEUoIseTKCOSF67Y5EZ8wJdVfmophf_UQkfa_sbts9m8oULq0wt_eT3q9zIIwlziW3UOR1I5C1-nsgQmisWSxCFFiOA8JomKzHZzdgFi5LfLvjl4CC4kYrc4EcVOtckSDNlt5zLBDbqMqmdo1qgTrmCX74jkNH_n3gzfeARS9y9crKXYjm7WAvPBBJsXreWQf9cKSHZRSsdNErb6qxsBxzJq1TpoYi6wM49QWInPtIZUNe95ufVJEalq7zCpo90ibmUkjXR6Dsvl3UEy8MaOybPkKhD2fBrnXZVlqGTp7GhA8KxGz8OZE-4Hujybmw1GCDK8EhKndiLvPz711QQjoRNpLWUluVIDGXEoFl8DCY5qkdmvuGaSjbHsJz3a6fLLfLYXaNg130ch0j4_NoybiIgLzPrETg42hMw0jdyzkPohDjxe5PIgaJfXeoykqZQ1PAni5r21ONzuZ5pxG4ahHtR24jOa6sy_zgXcIJNm4cshkqp7T0YaGpCYi6b71k9mieyAMFfyHYGb6ePRJWgGDQmuTEUhGxE36cbs8AMJElezgQNZBu5e7xV_ysDqyhPzNdy5pusCPJlm90YfiM8DiQTlmh2MX3UgWYh11rHxyz-iSc_9yYeSNjZYY1lxi6Csc9Xux6NOBQBoP0AawP-ZrdAD91dfjVfrwA9vaptfUzwzLjh7xCEUjECIlchk-1WrmqFCS0BV_Ep4_Vq9tebmU0Na0KzExkzwN_f5zy4yWWUhCG7ggD-zwulkhtYuxo3V_IBiIrIBBwx2_tc21fUpcV3_Uox7eH0qUXiW8R2lF8PuB2N1qYbv9_jtCxJkMPKHV_5ZvSLOIItxHA6z0t4GXJ57rXJx-1xwdg-OYXDE3KJfpqGdkHN2VBnyNDnxZkxL-G2cQXlzBm00)
 2. Copy and paste the final UML into the UML Source section
 3. Update the img src and edit link target to the current values
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -10,7 +10,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
     "@fortawesome/react-fontawesome": "^0.1.11",
     "@hookform/error-message": "^0.0.5",
-    "@trussworks/react-uswds": "^1.12.2",
+    "@trussworks/react-uswds": "1.11.0",
     "@use-it/interval": "^1.0.0",
     "http-proxy-middleware": "^1.0.5",
     "lodash": "^4.17.20",

diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -1,3 +1,7 @@
+.usa-skipnav:focus {
+  z-index: 999999;
+}
+
 .smart-hub-offset-nav {
   margin-left: 8rem;
 }

diff --git a/frontend/src/components/DatePicker.css b/frontend/src/components/DatePicker.css
@@ -7,7 +7,7 @@
     with the tab key. Since the open button has tabindex of -1
     we won't run into an issue of focus moving "backwards"
   */
-  flex-direction: row-reverse;
+  /* flex-direction: row-reverse; */
   width: fit-content;
 }
 

diff --git a/frontend/src/components/DatePicker.js b/frontend/src/components/DatePicker.js
@@ -14,15 +14,15 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { SingleDatePicker } from 'react-dates';
 import { OPEN_UP, OPEN_DOWN } from 'react-dates/constants';
-import { Controller } from 'react-hook-form';
+import { Controller } from 'react-hook-form/dist/index.ie11';
 import moment from 'moment';
 
 import './DatePicker.css';
 
 const dateFmt = 'MM/DD/YYYY';
 
 const DateInput = ({
-  control, minDate, name, disabled, maxDate, openUp, required,
+  control, minDate, name, disabled, maxDate, openUp, required, ariaName,
 }) => {
   const hintId = `${name}-hint`;
   const [isFocused, updateFocus] = useState(false);
@@ -35,6 +35,8 @@ const DateInput = ({
     return isBefore || isAfter;
   };
 
+  const message = isFocused ? '' : 'Navigate forward and push button to open the calendar';
+
   return (
     <>
       <div className="usa-hint font-body-2xs" id={hintId}>mm/dd/yyyy</div>
@@ -43,22 +45,35 @@ const DateInput = ({
           const date = value ? moment(value, dateFmt) : null;
           return (
             <div className="display-flex smart-hub--date-picker-input">
-              <button onClick={() => { updateFocus(true); }} disabled={disabled} tabIndex={-1} aria-label="open calendar" type="button" className="usa-date-picker__button margin-top-0" />
               <SingleDatePicker
                 id={name}
+                ariaLabel={`${ariaName}, month/day/year, edit text`}
+                placeholder={null}
                 focused={isFocused}
                 date={date}
                 ref={ref}
                 isOutsideRange={isOutsideRange}
                 numberOfMonths={1}
+                screenReaderInputMessage={message}
                 openDirection={openDirection}
                 disabled={disabled}
+                hideKeyboardShortcutsPanel
                 onDateChange={(d) => {
                   const newDate = d ? d.format(dateFmt) : d;
                   onChange(newDate);
                 }}
-                onFocusChange={({ focused }) => updateFocus(focused)}
-                hideKeyboardShortcutsPanel
+                onFocusChange={({ focused }) => {
+                  if (!focused) {
+                    updateFocus(focused);
+                  }
+                }}
+              />
+              <button
+                onClick={() => { updateFocus(true); }}
+                disabled={disabled}
+                aria-label={`${ariaName} open calendar"`}
+                type="button"
+                className="usa-date-picker__button margin-top-0"
               />
             </div>
           );
@@ -80,6 +95,7 @@ DateInput.propTypes = {
   // eslint-disable-next-line react/forbid-prop-types
   control: PropTypes.object.isRequired,
   name: PropTypes.string.isRequired,
+  ariaName: PropTypes.string.isRequired,
   minDate: PropTypes.string,
   maxDate: PropTypes.string,
   openUp: PropTypes.bool,

diff --git a/frontend/src/components/FormItem.js b/frontend/src/components/FormItem.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext } from 'react-hook-form/dist/index.ie11';
 import { ErrorMessage as ReactHookFormError } from '@hookform/error-message';
 import {
   Label, FormGroup, ErrorMessage, Fieldset,

diff --git a/frontend/src/components/MultiSelect.js b/frontend/src/components/MultiSelect.js
@@ -23,7 +23,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Select, { components } from 'react-select';
-import { Controller } from 'react-hook-form';
+import { Controller } from 'react-hook-form/dist/index.ie11';
 
 import arrowBoth from '../images/arrow-both.svg';
 
@@ -34,43 +34,6 @@ const DropdownIndicator = (props) => (
   </components.DropdownIndicator>
 );
 
-const styles = {
-  container: (provided, state) => {
-    // To match the focus indicator provided by uswds
-    const outline = state.isFocused ? '0.25rem solid #2491ff;' : '';
-    return {
-      ...provided,
-      outline,
-    };
-  },
-  groupHeading: (provided) => ({
-    ...provided,
-    fontWeight: 'bold',
-    fontFamily: 'SourceSansPro',
-    textTransform: 'capitalize',
-    fontSize: '14px',
-    color: '#21272d',
-    lineHeight: '22px',
-  }),
-  control: (provided, state) => ({
-    ...provided,
-    borderColor: '#565c65',
-    backgroundColor: 'white',
-    borderRadius: '0',
-    '&:hover': {
-      borderColor: '#565c65',
-    },
-    // Match uswds disabled style
-    opacity: state.isDisabled ? '0.7' : '1',
-  }),
-  indicatorsContainer: (provided) => ({
-    ...provided,
-    // The arrow dropdown icon is too far to the right, this pushes it back to the left
-    marginRight: '4px',
-  }),
-  indicatorSeparator: () => ({ display: 'none' }),
-};
-
 function MultiSelect({
   name,
   options,
@@ -83,8 +46,47 @@ function MultiSelect({
   rules,
   multiSelectOptions,
   onItemSelected,
+  singleRowInput,
   components: componentReplacements,
 }) {
+  const styles = {
+    container: (provided, state) => {
+      // To match the focus indicator provided by uswds
+      const outline = state.isFocused ? '0.25rem solid #2491ff;' : '';
+      return {
+        ...provided,
+        outline,
+      };
+    },
+    groupHeading: (provided) => ({
+      ...provided,
+      fontWeight: 'bold',
+      fontFamily: 'SourceSansPro',
+      textTransform: 'capitalize',
+      fontSize: '14px',
+      color: '#21272d',
+      lineHeight: '22px',
+    }),
+    control: (provided, state) => ({
+      height: singleRowInput ? '38px' : '',
+      ...provided,
+      borderColor: '#565c65',
+      backgroundColor: 'white',
+      borderRadius: '0',
+      '&:hover': {
+        borderColor: '#565c65',
+      },
+      // Match uswds disabled style
+      opacity: state.isDisabled ? '0.7' : '1',
+    }),
+    indicatorsContainer: (provided) => ({
+      ...provided,
+      // The arrow dropdown icon is too far to the right, this pushes it back to the left
+      marginRight: '4px',
+    }),
+    indicatorSeparator: () => ({ display: 'none' }),
+  };
+
   /*
    * @param {Array<string> || Array<object>} - value array. Either an array of strings or array
    * of objects
@@ -146,6 +148,7 @@ function MultiSelect({
             components={{ ...componentReplacements, DropdownIndicator }}
             options={options}
             isDisabled={disabled}
+            tabSelectsValue={false}
             isClearable={multiSelectOptions.isClearable}
             closeMenuOnSelect={multiSelectOptions.closeMenuOnSelect}
             controlShouldRenderValue={multiSelectOptions.controlShouldRenderValue}
@@ -196,6 +199,7 @@ MultiSelect.propTypes = {
   control: PropTypes.object.isRequired,
   components: PropTypes.shape({}),
   onItemSelected: PropTypes.func,
+  singleRowInput: PropTypes.bool,
   multiSelectOptions: PropTypes.shape({
     isClearable: PropTypes.bool,
     closeMenuOnSelect: PropTypes.bool,
@@ -209,6 +213,7 @@ MultiSelect.propTypes = {
 
 MultiSelect.defaultProps = {
   disabled: false,
+  singleRowInput: false,
   required: 'Please select at least one item',
   simple: true,
   labelProperty: 'label',

diff --git a/frontend/src/components/Navigator/__tests__/index.js b/frontend/src/components/Navigator/__tests__/index.js
@@ -5,7 +5,7 @@ import {
   render, screen, waitFor, within,
 } from '@testing-library/react';
 
-import { useFormContext } from 'react-hook-form';
+import { useFormContext } from 'react-hook-form/dist/index.ie11';
 import Navigator from '../index';
 import { NOT_STARTED } from '../constants';
 
@@ -91,7 +91,7 @@ describe('Navigator', () => {
     renderNavigator();
     const firstInput = screen.getByTestId('first');
     userEvent.click(firstInput);
-    const first = await screen.findByRole('button', { name: 'first page' });
+    const first = await screen.findByRole('button', { name: 'first page In Progress' });
     await waitFor(() => expect(within(first).getByText('In Progress')).toBeVisible());
   });
 
@@ -121,7 +121,7 @@ describe('Navigator', () => {
     const updatePage = jest.fn();
     const updateForm = jest.fn();
     renderNavigator('second', () => {}, () => {}, updatePage, updateForm);
-    userEvent.click(await screen.findByRole('button', { name: 'first page' }));
+    userEvent.click(await screen.findByRole('button', { name: 'first page Not Started' }));
     await waitFor(() => expect(updateForm).toHaveBeenCalledWith({ ...initialData, second: null }));
     await waitFor(() => expect(updatePage).toHaveBeenCalledWith(1));
   });