From 40f393ea8aeda3f3174e5e6cb2afc0ac8e7822f7 Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu, 11 Mar 2021 15:12:10 -0500 Subject: [PATCH] Squashed commit of the following: commit 3e618ff4dd65b01f8773828e958dd74b949864a4 Merge: b9dff4e c17ad32 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 15:10:55 2021 -0500 Merge pull request #227 from adhocteam/cm-367-ignore-304-and-401 add 403 and 401 status codes to expected_status_code in newrelic.js commit c17ad3213c9e553339b50d6b4a9c9b7fb1d43cc2 Merge: fdc34a2 b9dff4e Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 15:00:08 2021 -0500 Merge branch 'main' into cm-367-ignore-304-and-401 commit b9dff4e1beff5b51c7a89bbcabb9ac630374ad66 Merge: 5a98984 120041f Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 14:59:51 2021 -0500 Merge pull request #222 from adhocteam/cm-302-add-maintenance-mode-script add and document maintenance mode commit fdc34a2fb1da35ddf97c106b260d6c578d87f9b6 Merge: ae18da5 5a98984 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 14:45:49 2021 -0500 Merge branch 'main' into cm-367-ignore-304-and-401 commit 120041f8304434945f4dc362249b0ffe28e54659 Merge: 06de998 5a98984 Author: Ryan Ahearn Date: Thu Mar 11 14:43:36 2021 -0500 Merge branch 'main' into cm-302-add-maintenance-mode-script commit 06de998412958451d6d09bde97794513d5c1ab2e Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 14:39:05 2021 -0500 make logo relative commit f9f334faab64557c6eb5fdeed1e3d9fa333bc459 Merge: 072692a 9369bd5 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 14:08:01 2021 -0500 Merge branch 'main' into cm-302-add-maintenance-mode-script commit 072692ad2b9040f8eea11c22e854fc48d3534553 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 14:05:47 2021 -0500 Squashed commit of the following: commit 9369bd5b9f31334810b5c459dd4c9a99bf6f9af5 Merge: 0c44259 de255ce Author: Josh Salisbury 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 de255ce27d7e49ea1e5ed4dafa62b490303b3994 Author: Josh Salisbury 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 0c44259e901435756b0336ae055d59713cbd91a6 Merge: fad3c70 30fb7c1 Author: Josh Salisbury Date: Thu Mar 11 11:35:55 2021 -0600 Merge pull request #213 from adhocteam/js-332-accessibility-updates Accessibility updates commit 30fb7c1ddb3f5f155d791178a45480da2cc11240 Merge: c1527c2 fad3c70 Author: Josh Salisbury 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 fad3c704f475050bde6fb62cce48355072a711c1 Merge: 79cab99 3090d99 Author: Ryan Ahearn Date: Thu Mar 11 10:50:12 2021 -0500 Merge pull request #225 from adhocteam/prod-domain-terraform Production domain terraform commit 3090d993fac0fc7b16496b1de03e0387927efe99 Merge: 7cac1b4 79cab99 Author: Ryan Ahearn Date: Thu Mar 11 10:41:25 2021 -0500 Merge branch 'main' into prod-domain-terraform commit 79cab995702c8637f12be61daf6a3561d557522c Merge: 49f75a5 f9914ca Author: Josh Salisbury 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 c1527c20468ddc11a37df886d51bb8c84bd70b9b Merge: 9c6108f 49f75a5 Author: Josh Salisbury Date: Thu Mar 11 09:31:52 2021 -0600 Merge branch 'main' into js-332-accessibility-updates commit f9914ca6dcecf205d81e065ff0430c853ead6ae2 Author: Josh Salisbury Date: Thu Mar 11 09:29:34 2021 -0600 Return from migrations, remove granteeId from index Renamed migrations to ensure they are ran commit 7cac1b4fec6161eda1d205485bfd8a8f1df26c5f Merge: 01dafc4 49f75a5 Author: Ryan Ahearn Date: Thu Mar 11 10:22:42 2021 -0500 Merge branch 'main' into prod-domain-terraform commit e96c77d30bf8e4c7d6433c8e0e1b70f7ed88a64d Merge: 2f612d9 49f75a5 Author: Josh Salisbury Date: Thu Mar 11 09:13:48 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit 49f75a51cc4052a33493a5bf222f1a87bed0a13c Merge: bd830f9 72ea701 Author: Josh Salisbury 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 01dafc410406351c00d6ec80fdc2ac4328ccd613 Author: Ryan Ahearn Date: Wed Mar 10 12:02:51 2021 -0500 Add route mapping for prod url commit a7822a964a43a1941df3da0ce1290d5db67f851b Author: Ryan Ahearn Date: Wed Mar 10 11:50:57 2021 -0500 Recursively delete non-prod infrastructure commit 72ea701fdfb6875c2c4db7783ea479bb4053246f Author: Josh Salisbury 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 a2703293df7457ff023a908658ccf469c126dbe7 Author: Josh Salisbury Date: Wed Mar 10 15:31:47 2021 -0600 Attempt to force IE to not cache GET requests commit 2f612d99c075d76a5533ea233b190e663778102a Author: Josh Salisbury Date: Wed Mar 10 12:12:41 2021 -0600 Update activityReports query commit 9c6108f9aff5f13f4ad4268a1b863805b89bc532 Merge: e1b9f45 bd830f9 Author: Josh Salisbury Date: Wed Mar 10 11:44:27 2021 -0600 Merge branch 'main' into js-332-accessibility-updates commit 81d795bec8f9b69943df94ab1fa401b6614e3ac4 Author: Josh Salisbury Date: Wed Mar 10 11:43:00 2021 -0600 Lint fix commit 3d6b908ddb60b22267c8cc258384b7eb368da3a9 Merge: 2b0ed3d bd830f9 Author: Josh Salisbury Date: Wed Mar 10 11:40:02 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit bd6ce103db6187e0681ce71bda8da1f35ed81ee7 Merge: d3fcd83 bd830f9 Author: Josh Salisbury Date: Wed Mar 10 11:33:49 2021 -0600 Merge branch 'main' into js-152-browser-controls commit d3fcd838fb70e83690b5321bea5d962cfaac73c4 Merge: f0c8908 87790f3 Author: Josh Salisbury 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 f0c890829015d7572f8324b53c47b48954d7d034 Author: Josh Salisbury Date: Wed Mar 10 11:32:16 2021 -0600 Use ie11 version of react-hook-form commit 87790f34f4e2e2eb9e9992604fbee0a4d2146f4b Merge: 91933c6 5e867d8 Author: Ryan Ahearn Date: Tue Mar 9 19:13:05 2021 -0500 Merge branch 'main' into js-152-browser-controls commit 91933c6ff511a651435a93504a983cc34f281548 Merge: b9a17b4 58723e1 Author: Josh Salisbury 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 b9a17b4290d330b3ec087e7717122cde7983d36d Author: Josh Salisbury Date: Tue Mar 9 16:13:37 2021 -0600 Update sandbox branch commit 58723e154dab4834c4930fb6681267dbda8c2b3f Merge: d671ba4 bcca11c Author: Josh Salisbury Date: Tue Mar 9 15:40:45 2021 -0600 Merge branch 'main' into js-152-browser-controls commit d671ba4f097cd7fb584ee17e06180e563739a53d Author: Josh Salisbury 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 e1b9f45bfdbda18ad18e45500891d0f01a8bdce9 Merge: 84f3d0e 5956089 Author: Josh Salisbury Date: Tue Mar 9 09:35:42 2021 -0600 Merge branch 'main' into js-332-accessibility-updates commit 2b0ed3dd3ff8119509d88c8659904aaf7b0602a4 Merge: feb5da6 5956089 Author: Josh Salisbury Date: Tue Mar 9 09:35:37 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit 84f3d0e26b101dd3fe543fd0b1ef03b26fd0015d Merge: 946bfcb e7db658 Author: Josh Salisbury Date: Mon Mar 8 13:19:51 2021 -0600 Merge branch 'main' into js-332-accessibility-updates commit feb5da6f555fb802d0a3b029225ee784dd36686e Merge: 718956c e7db658 Author: Josh Salisbury Date: Mon Mar 8 11:57:19 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit 718956c8770ea24d04e041e4205940f4d180afdb Author: Josh Salisbury Date: Mon Mar 8 11:56:35 2021 -0600 Handle report switching from grantee to non-grantee commit cb1b86584be577a2652ccb3b64e94bc9a859494a Author: Josh Salisbury 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 946bfcb3d6a5b5ac5090d0e407ce40cef048dbc3 Author: Josh Salisbury Date: Thu Mar 4 17:02:11 2021 -0600 Update tests commit a2ef84133608a5f30108354180303b45e64d216e Author: Josh Salisbury Date: Thu Mar 4 16:43:16 2021 -0600 Update sandbox branch commit edccb36dd6961aca04ca09ec2a9f7081b6e4f6a1 Author: Josh Salisbury 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 commit ae18da5d7bc7a7125bfb3ded2a6829c312a975ae Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 13:53:47 2021 -0500 add 403 and 401 status codes to expected_status_code in newrelic.js commit a2f5a376429554383899bb0421b7809e22088eac Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 13:44:10 2021 -0500 update nginx conf commit 8482724460360b0ced26e39726d8c99bad7f50c3 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 13:41:58 2021 -0500 redirect everything to root commit 3081c07c24c5e8c03a0a08926064929101eb39ff Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 13:11:55 2021 -0500 update nginx conf commit 53e2207afa3d8144903592b6eaca60d37d2c389d Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 11:37:06 2021 -0500 remove default values from maintenance script commit 4f301ceac441e71dba88d1389fee6646d40c4342 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 11:31:27 2021 -0500 update nginx conf commit 9d053eaf5452bbe0718c278794d8319c7c91ee2d Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 11:28:20 2021 -0500 update default -m value commit e6610ad5837431862df1f415cbd464714298a751 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 11:16:45 2021 -0500 Squashed commit of the following: commit fad3c704f475050bde6fb62cce48355072a711c1 Merge: 79cab99 3090d99 Author: Ryan Ahearn Date: Thu Mar 11 10:50:12 2021 -0500 Merge pull request #225 from adhocteam/prod-domain-terraform Production domain terraform commit 3090d993fac0fc7b16496b1de03e0387927efe99 Merge: 7cac1b4 79cab99 Author: Ryan Ahearn Date: Thu Mar 11 10:41:25 2021 -0500 Merge branch 'main' into prod-domain-terraform commit 79cab995702c8637f12be61daf6a3561d557522c Merge: 49f75a5 f9914ca Author: Josh Salisbury 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 f9914ca6dcecf205d81e065ff0430c853ead6ae2 Author: Josh Salisbury Date: Thu Mar 11 09:29:34 2021 -0600 Return from migrations, remove granteeId from index Renamed migrations to ensure they are ran commit 7cac1b4fec6161eda1d205485bfd8a8f1df26c5f Merge: 01dafc4 49f75a5 Author: Ryan Ahearn Date: Thu Mar 11 10:22:42 2021 -0500 Merge branch 'main' into prod-domain-terraform commit e96c77d30bf8e4c7d6433c8e0e1b70f7ed88a64d Merge: 2f612d9 49f75a5 Author: Josh Salisbury Date: Thu Mar 11 09:13:48 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit 49f75a51cc4052a33493a5bf222f1a87bed0a13c Merge: bd830f9 72ea701 Author: Josh Salisbury 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 01dafc410406351c00d6ec80fdc2ac4328ccd613 Author: Ryan Ahearn Date: Wed Mar 10 12:02:51 2021 -0500 Add route mapping for prod url commit a7822a964a43a1941df3da0ce1290d5db67f851b Author: Ryan Ahearn Date: Wed Mar 10 11:50:57 2021 -0500 Recursively delete non-prod infrastructure commit 72ea701fdfb6875c2c4db7783ea479bb4053246f Author: Josh Salisbury 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 a2703293df7457ff023a908658ccf469c126dbe7 Author: Josh Salisbury Date: Wed Mar 10 15:31:47 2021 -0600 Attempt to force IE to not cache GET requests commit 2f612d99c075d76a5533ea233b190e663778102a Author: Josh Salisbury Date: Wed Mar 10 12:12:41 2021 -0600 Update activityReports query commit 81d795bec8f9b69943df94ab1fa401b6614e3ac4 Author: Josh Salisbury Date: Wed Mar 10 11:43:00 2021 -0600 Lint fix commit 3d6b908ddb60b22267c8cc258384b7eb368da3a9 Merge: 2b0ed3d bd830f9 Author: Josh Salisbury Date: Wed Mar 10 11:40:02 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit bd6ce103db6187e0681ce71bda8da1f35ed81ee7 Merge: d3fcd83 bd830f9 Author: Josh Salisbury Date: Wed Mar 10 11:33:49 2021 -0600 Merge branch 'main' into js-152-browser-controls commit d3fcd838fb70e83690b5321bea5d962cfaac73c4 Merge: f0c8908 87790f3 Author: Josh Salisbury 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 f0c890829015d7572f8324b53c47b48954d7d034 Author: Josh Salisbury Date: Wed Mar 10 11:32:16 2021 -0600 Use ie11 version of react-hook-form commit 87790f34f4e2e2eb9e9992604fbee0a4d2146f4b Merge: 91933c6 5e867d8 Author: Ryan Ahearn Date: Tue Mar 9 19:13:05 2021 -0500 Merge branch 'main' into js-152-browser-controls commit 91933c6ff511a651435a93504a983cc34f281548 Merge: b9a17b4 58723e1 Author: Josh Salisbury 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 b9a17b4290d330b3ec087e7717122cde7983d36d Author: Josh Salisbury Date: Tue Mar 9 16:13:37 2021 -0600 Update sandbox branch commit 58723e154dab4834c4930fb6681267dbda8c2b3f Merge: d671ba4 bcca11c Author: Josh Salisbury Date: Tue Mar 9 15:40:45 2021 -0600 Merge branch 'main' into js-152-browser-controls commit d671ba4f097cd7fb584ee17e06180e563739a53d Author: Josh Salisbury 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 2b0ed3dd3ff8119509d88c8659904aaf7b0602a4 Merge: feb5da6 5956089 Author: Josh Salisbury Date: Tue Mar 9 09:35:37 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit feb5da6f555fb802d0a3b029225ee784dd36686e Merge: 718956c e7db658 Author: Josh Salisbury Date: Mon Mar 8 11:57:19 2021 -0600 Merge branch 'main' into js-287-persist-goals-objectives commit 718956c8770ea24d04e041e4205940f4d180afdb Author: Josh Salisbury Date: Mon Mar 8 11:56:35 2021 -0600 Handle report switching from grantee to non-grantee commit cb1b86584be577a2652ccb3b64e94bc9a859494a Author: Josh Salisbury 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 3950b611da5d076620b9de0a6f292b5bd215faa7 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Thu Mar 11 10:24:28 2021 -0500 fix typo commit 40f802878a4b0eba00e7ee2af2a012f201fb9d19 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Wed Mar 10 16:15:43 2021 -0500 change sandbox branch commit a37a1af7e0327da4c6569a7b13f8f580705342db Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Wed Mar 10 14:09:24 2021 -0500 update nginx conf commit 8a216ee572ba4d87e821838932d129cbede26abe Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Wed Mar 10 13:30:10 2021 -0500 move nginx conf commit 8fcc79b2cc7411609b9d3ad167088ec666f12c69 Merge: f5df884 bd830f9 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Wed Mar 10 18:27:59 2021 +0000 Merge branch 'main' into cm-302-add-maintenance-mode-script commit f5df884d3f98a35c901c0b9c02618483a5e417c1 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Wed Mar 10 13:26:23 2021 -0500 deploy to sandbox commit b091fcc9e8e3bccf7cad73e5a09d30773b93ccaa Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Wed Mar 10 13:24:58 2021 -0500 add nginx conf for maintenance page commit c5a195e913e4af7a86675090e1e97b505f4bd0b8 Merge: 59377f0 5e867d8 Author: Ryan Ahearn Date: Wed Mar 10 10:11:55 2021 -0500 Merge branch 'main' into cm-302-add-maintenance-mode-script commit 59377f0029c38bc052bfe0926d8e80e91e06defb Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Wed Mar 10 09:24:15 2021 -0500 remove maintenance route because of oauth issues commit 4ee6f766858cbe82ed26876e67e3b4ef8d66fe8a Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 16:34:07 2021 -0500 Squashed commit of the following: commit bcca11cc6c04396dcd9b4fa27ca84622d49e8956 Merge: 76231df a945aca Author: Josh Salisbury Date: Tue Mar 9 15:18:13 2021 -0600 Merge pull request #205 from adhocteam/js-283-frontend-updates Frontend updates commit a945aca80f1e56fe1b903315508fa302e8fa9c2d Merge: 3050a42 76231df Author: Josh Salisbury Date: Tue Mar 9 13:21:40 2021 -0600 Merge branch 'main' into js-283-frontend-updates commit 3050a42acd8791a4749ea8e7219faba51afef883 Author: Josh Salisbury Date: Tue Mar 9 13:20:23 2021 -0600 Feedback from PR * Deploy to sandbox * Attachments edit link goes to correct page * Resources data types change to array of text instead of array of strings commit 76231dfeb1ca8ac44aad40604852708037dc1d3d Merge: d694b96 64bf3cd Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 19:16:27 2021 +0000 Merge pull request #218 from adhocteam/cm-302-create-mainenance-page Cm 302 create mainenance page commit d694b9650bb3993bef89f0edf5fdaa60d41f6d9f Merge: a35691d 74ee33f Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 16:47:39 2021 +0000 Merge pull request #220 from adhocteam/fix-double-import clean up double import commit 74ee33f4a49f232c7824e5f3473de7bc209dd55f Merge: 275e472 a35691d Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 16:36:10 2021 +0000 Merge branch 'main' into fix-double-import commit 275e472be5bc62eabb660cef2ad88ce4bdede526 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 11:32:11 2021 -0500 clean up double import commit a35691dc506c285df40c78c345e6c180a283697c Merge: 5956089 ff1c224 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 16:04:41 2021 +0000 Merge pull request #219 from adhocteam/cm-add-new-relic-to-worker add new relic to worker.js commit ff1c224150ef28afd4e442957fc4660fe5c5eb95 Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 10:50:47 2021 -0500 move require to start of file. commit 77173a4ec5a4d130a44d23394da264da170df930 Merge: eadf312 5956089 Author: Josh Salisbury Date: Tue Mar 9 09:35:09 2021 -0600 Merge branch 'main' into js-283-frontend-updates commit 49314662862d87ab6702e9238749788009adae1f Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 09:49:04 2021 -0500 add new relic to worker.js commit eadf3120f26661497babb868bfdc435487b8560c Merge: 64db2a9 e7db658 Author: Josh Salisbury Date: Mon Mar 8 13:22:32 2021 -0600 Merge branch 'main' into js-283-frontend-updates Conflicts: frontend/src/pages/ActivityReport/Pages/components/Goal.js src/seeders/20201124160449-users.js commit 64db2a9bdabb5eb9bb0a93c686b5d0b0db7ea697 Author: Josh Salisbury Date: Fri Mar 5 12:12:07 2021 -0600 PR feedback * Set required font-family/size via uswds class * Use uswds margin classes instead of `smart-hub--*` classes * Wrap group of `await` calls in `Promise.all` inside resource migration * Remove File `attachmentType` field * Change trashcan icon's color to black to match other trashcan icons commit 9438d3fb3170e7ea448a7091c5f734c162edc4f6 Merge: 0cf6743 92a929b Author: Josh Salisbury Date: Thu Mar 4 11:17:37 2021 -0600 Merge branch 'main' into js-283-frontend-updates Conflicts: .circleci/config.yml frontend/src/pages/ActivityReport/Pages/topicsResources.js commit 0cf67439ed0437d819afd2be8fc3e6994fa0fa0b Author: Josh Salisbury Date: Wed Mar 3 13:33:22 2021 -0600 Dev/stagging now only forward migrate commit e8b33b91172c6d0f15d14afc5557067d8611c5ab Author: Josh Salisbury Date: Wed Mar 3 12:19:24 2021 -0600 Remove josh as a user in the seeders commit 642917c1cb43a079fa09ba4b2a9d072f3f7e4f63 Author: Josh Salisbury Date: Wed Mar 3 11:20:24 2021 -0600 Update HSES id for josh commit 68be3b043fe53d802606146da9881b3f1398b2d5 Merge: 354ab9f 36f3803 Author: Josh Salisbury Date: Wed Mar 3 09:57:32 2021 -0600 Merge branch 'main' into js-283-frontend-updates commit 354ab9f96c3433797e3d2a2ea14e0d635d29d721 Merge: eeef66a 079fc8b Author: Josh Salisbury Date: Tue Mar 2 16:57:42 2021 -0600 Merge branch 'js-283-frontend-updates' of github.com:adhocteam/Head-Start-TTADP into js-283-frontend-updates commit eeef66a895a67ad6a43083b071b1dae671bb28aa Author: Josh Salisbury Date: Tue Mar 2 16:57:13 2021 -0600 Lint fix commit 079fc8b728f8cbe1f2b862e0f2ad1fa1b759092f Merge: 01a6806 d0f5a95 Author: Josh Salisbury Date: Tue Mar 2 16:55:12 2021 -0600 Merge branch 'main' into js-283-frontend-updates commit 01a680663227c1901a2937777f13b03ab5c86296 Author: Josh Salisbury Date: Tue Mar 2 16:34:57 2021 -0600 Update sandbox branch commit 0603eb0144fbb19ab8ca68838bd0524fe1a40e36 Author: Josh Salisbury Date: Tue Mar 2 16:33:14 2021 -0600 Various frontend changes to better match design * Add resource selector * Virtual delivery method field added * Fix styling (margins colors etc) * Copy updates commit d501eff402e99e16ef7bb4306b132491d9803a2f Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue Mar 9 16:08:06 2021 -0500 add and document maintenance mode --- src/newrelic.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/newrelic.js b/src/newrelic.js index 878b0fec56..c1b2c99087 100644 --- a/src/newrelic.js +++ b/src/newrelic.js @@ -80,4 +80,10 @@ exports.config = { 'response.headers.x*', ], }, + error_collector: { + expected_status_codes: [ + '401', + '403', + ], + }, };