From 4ee6f766858cbe82ed26876e67e3b4ef8d66fe8a Mon Sep 17 00:00:00 2001
From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date: Tue, 9 Mar 2021 16:34:07 -0500
Subject: [PATCH] Squashed commit of the following:

commit bcca11cc6c04396dcd9b4fa27ca84622d49e8956
Merge: 76231df a945aca
Author: Josh Salisbury <josh@adhocteam.us>
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 <josh@adhocteam.us>
Date:   Tue Mar 9 13:21:40 2021 -0600

    Merge branch 'main' into js-283-frontend-updates

commit 3050a42acd8791a4749ea8e7219faba51afef883
Author: Josh Salisbury <josh@adhocteam.us>
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 <josh@adhocteam.us>
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 <josh@adhocteam.us>
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 <josh@adhocteam.us>
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 <josh@adhocteam.us>
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 <josh@adhocteam.us>
Date:   Wed Mar 3 13:33:22 2021 -0600

    Dev/stagging now only forward migrate

commit e8b33b91172c6d0f15d14afc5557067d8611c5ab
Author: Josh Salisbury <josh@adhocteam.us>
Date:   Wed Mar 3 12:19:24 2021 -0600

    Remove josh as a user in the seeders

commit 642917c1cb43a079fa09ba4b2a9d072f3f7e4f63
Author: Josh Salisbury <josh@adhocteam.us>
Date:   Wed Mar 3 11:20:24 2021 -0600

    Update HSES id for josh

commit 68be3b043fe53d802606146da9881b3f1398b2d5
Merge: 354ab9f 36f3803
Author: Josh Salisbury <josh@adhocteam.us>
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 <josh@adhocteam.us>
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 <josh@adhocteam.us>
Date:   Tue Mar 2 16:57:13 2021 -0600

    Lint fix

commit 079fc8b728f8cbe1f2b862e0f2ad1fa1b759092f
Merge: 01a6806 d0f5a95
Author: Josh Salisbury <josh@adhocteam.us>
Date:   Tue Mar 2 16:55:12 2021 -0600

    Merge branch 'main' into js-283-frontend-updates

commit 01a680663227c1901a2937777f13b03ab5c86296
Author: Josh Salisbury <josh@adhocteam.us>
Date:   Tue Mar 2 16:34:57 2021 -0600

    Update sandbox branch

commit 0603eb0144fbb19ab8ca68838bd0524fe1a40e36
Author: Josh Salisbury <josh@adhocteam.us>
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
---
 .circleci/config.yml                          |  10 +-
 docs/openapi/index.yaml                       |   3 -
 frontend/package.json                         |   1 +
 frontend/src/App.css                          |   4 +
 frontend/src/components/FileUploader.js       |  15 +--
 frontend/src/components/FormItem.css          |   2 -
 frontend/src/components/FormItem.js           |   2 +-
 .../src/components/__tests__/FileUploader.js  |   2 +-
 .../Pages/Review/Approver/Review.js           |   2 +-
 .../Pages/Review/Submitter/Draft.js           |   4 +-
 .../Pages/__tests__/topicsResources.js        |   8 +-
 .../ActivityReport/Pages/activitySummary.js   |  61 ++++++++---
 .../ActivityReport/Pages/components/Goal.js   |   2 +-
 .../Pages/components/GoalPicker.js            |   2 +-
 .../Pages/components/ResourceSelector.js      |  67 ++++++++++++
 .../components/__tests__/ResourceSelector.js  |  63 +++++++++++
 .../ActivityReport/Pages/goalsObjectives.js   |   4 +-
 .../ActivityReport/Pages/topicsResources.js   | 102 ++++++++++--------
 frontend/src/pages/ActivityReport/index.css   |  29 ++++-
 frontend/src/pages/ActivityReport/index.js    |  16 ++-
 frontend/yarn.lock                            |  12 +++
 ...170502-add-resources-to-activity-report.js |  29 +++++
 ...0210302215921-add-virtual-delivery-type.js |  13 +++
 .../20210305174257-remove-attachment-type.js  |  18 ++++
 src/models/activityReport.js                  |  11 +-
 src/models/file.js                            |   4 -
 src/routes/files/handlers.js                  |  14 +--
 src/routes/files/handlers.test.js             |  27 -----
 src/seeders/20201124160449-users.js           |  10 --
 src/services/activityReports.js               |  25 ++---
 src/services/activityReports.test.js          |   8 +-
 src/services/files.js                         |   2 -
 32 files changed, 392 insertions(+), 180 deletions(-)
 create mode 100644 frontend/src/pages/ActivityReport/Pages/components/ResourceSelector.js
 create mode 100644 frontend/src/pages/ActivityReport/Pages/components/__tests__/ResourceSelector.js
 create mode 100644 src/migrations/20210302170502-add-resources-to-activity-report.js
 create mode 100644 src/migrations/20210302215921-add-virtual-delivery-type.js
 create mode 100644 src/migrations/20210305174257-remove-attachment-type.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 20f1d1245b..6d77a324bb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -133,7 +133,7 @@ parameters:
     default: "main"
     type: string
   sandbox_git_branch:  # change to feature branch to test deployment
-    default: "cm-302-create-mainenance-page"
+    default: "js-283-frontend-updates"
     type: string
 jobs:
   build_and_lint:
@@ -314,10 +314,10 @@ jobs:
                 hses_data_username: HSES_DATA_USERNAME
                 hses_data_password: HSES_DATA_PASSWORD
             - run:
-                name: Return database to neutral, then migrate and seed
+                name: Migrate database
                 command: |
                   cf run-task tta-smarthub-sandbox \
-                    --command "yarn db:migrate:undo:prod && yarn db:migrate:prod && yarn db:seed:prod" \
+                    --command "yarn db:migrate:prod" \
                     --name "Reset DB"
       - when:  # dev
           condition:
@@ -339,10 +339,10 @@ jobs:
                 hses_data_username: HSES_DATA_USERNAME
                 hses_data_password: HSES_DATA_PASSWORD
             - run:
-                name: Undo database seeding, then migrate and seed
+                name: Migrate database
                 command: |
                   cf run-task tta-smarthub-dev \
-                    --command "yarn db:migrate:prod && yarn db:seed:undo:prod && yarn db:seed:prod" \
+                    --command "yarn db:migrate:prod" \
                     --name "Reset DB"
       - when:  # staging
           condition:
diff --git a/docs/openapi/index.yaml b/docs/openapi/index.yaml
index 4f60ad4636..a6d91bddfb 100644
--- a/docs/openapi/index.yaml
+++ b/docs/openapi/index.yaml
@@ -179,9 +179,6 @@ components:
     fileUpload:
       type: object
       properties:
-        attachmentType:
-          type: string
-          description: "Type of attachment. Acceptable values are ATTACHMENT or RESOURCE"
         reportId:
           type: number
           description: "id of the Activity report the file is associated with"
diff --git a/frontend/package.json b/frontend/package.json
index 43d49dd25e..c7aeb40326 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -6,6 +6,7 @@
     "@babel/runtime": "^7.12.1",
     "@fortawesome/fontawesome-free": "^5.15.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.32",
+    "@fortawesome/free-regular-svg-icons": "^5.15.2",
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
     "@fortawesome/react-fontawesome": "^0.1.11",
     "@hookform/error-message": "^0.0.5",
diff --git a/frontend/src/App.css b/frontend/src/App.css
index 2ffa03179d..29123b2c96 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -30,6 +30,10 @@ body {
   background-color: #f8f8f8;
 }
 
+.text-ink {
+  color: #21272D
+}
+
 .smart-hub-bg-blue-primary {
   background-color: #0166ab;
 }
diff --git a/frontend/src/components/FileUploader.js b/frontend/src/components/FileUploader.js
index 0ce8a61435..228a651f9a 100644
--- a/frontend/src/components/FileUploader.js
+++ b/frontend/src/components/FileUploader.js
@@ -17,12 +17,11 @@ import { uploadFile, deleteFile } from '../fetchers/File';
 
 import './FileUploader.css';
 
-export const upload = async (file, reportId, attachmentType, setErrorMessage) => {
+export const upload = async (file, reportId, setErrorMessage) => {
   let res;
   try {
     const data = new FormData();
     data.append('reportId', reportId);
-    data.append('attachmentType', attachmentType);
     data.append('file', file);
     res = await uploadFile(data);
   } catch (error) {
@@ -42,13 +41,7 @@ export const handleDrop = async (e, reportId, id, onChange, setErrorMessage) =>
     setErrorMessage('Cannot save attachments without a Grantee or Non-Grantee selected');
     return;
   }
-  let attachmentType;
-  if (id === 'attachments') {
-    attachmentType = 'ATTACHMENT';
-  } else if (id === 'otherResources') {
-    attachmentType = 'RESOURCE';
-  }
-  const newFiles = e.map((file) => upload(file, reportId, attachmentType, setErrorMessage));
+  const newFiles = e.map((file) => upload(file, reportId, setErrorMessage));
   Promise.all(newFiles).then((values) => {
     onChange(values);
   });
@@ -66,8 +59,8 @@ function Dropzone(props) {
       {...getRootProps()}
     >
       <input {...getInputProps()} />
-      <button type="button" className="usa-button">
-        Browse files
+      <button type="button" className="usa-button usa-button--outline">
+        Upload Resources
       </button>
       {errorMessage
         && (
diff --git a/frontend/src/components/FormItem.css b/frontend/src/components/FormItem.css
index f2ddc3bd1e..73f211d96d 100644
--- a/frontend/src/components/FormItem.css
+++ b/frontend/src/components/FormItem.css
@@ -1,5 +1,3 @@
 .smart-hub--form-required {
-  font-family: SourceSansPro;
-  font-size: 16px;
   color: #d42240;
 }
diff --git a/frontend/src/components/FormItem.js b/frontend/src/components/FormItem.js
index 7060e5b02b..70d6635de4 100644
--- a/frontend/src/components/FormItem.js
+++ b/frontend/src/components/FormItem.js
@@ -44,7 +44,7 @@ function FormItem({
   const labelWithRequiredTag = (
     <>
       {label}
-      {required && (<span className="smart-hub--form-required"> (Required)</span>)}
+      {required && (<span className="smart-hub--form-required font-family-sans font-ui-xs"> (Required)</span>)}
     </>
   );
 
diff --git a/frontend/src/components/__tests__/FileUploader.js b/frontend/src/components/__tests__/FileUploader.js
index 961714bb06..b47d4c9d16 100644
--- a/frontend/src/components/__tests__/FileUploader.js
+++ b/frontend/src/components/__tests__/FileUploader.js
@@ -33,7 +33,7 @@ describe('upload tests', () => {
   const mockSetErrorMessage = jest.fn();
   it('can upload a file and return the correct information', async () => {
     const mockFileUpload = jest.spyOn(fileFetcher, 'uploadFile').mockImplementation(async () => ({ id: 1, url: 'url' }));
-    const got = await upload(mockFile, 1, 'fakeAttachment', mockSetErrorMessage);
+    const got = await upload(mockFile, 1, mockSetErrorMessage);
     expect(got).toStrictEqual({
       id: 1, originalFileName: mockFile.name, fileSize: mockFile.size, status: 'UPLOADED', url: 'url',
     });
diff --git a/frontend/src/pages/ActivityReport/Pages/Review/Approver/Review.js b/frontend/src/pages/ActivityReport/Pages/Review/Approver/Review.js
index 3ed908fc00..b741cd770a 100644
--- a/frontend/src/pages/ActivityReport/Pages/Review/Approver/Review.js
+++ b/frontend/src/pages/ActivityReport/Pages/Review/Approver/Review.js
@@ -38,7 +38,7 @@ const Review = ({
         </p>
       </div>
       <Form className="smart-hub--form-large" onSubmit={handleSubmit(onFormReview)}>
-        <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
+        <Fieldset className="smart-hub--report-legend margin-top-4" legend="Review and submit report">
           <Label htmlFor="managerNotes">Manager notes</Label>
           <Textarea inputRef={register} id="managerNotes" name="managerNotes" className={textAreaClass} />
         </Fieldset>
diff --git a/frontend/src/pages/ActivityReport/Pages/Review/Submitter/Draft.js b/frontend/src/pages/ActivityReport/Pages/Review/Submitter/Draft.js
index d9ea673414..b32f9e40e6 100644
--- a/frontend/src/pages/ActivityReport/Pages/Review/Submitter/Draft.js
+++ b/frontend/src/pages/ActivityReport/Pages/Review/Submitter/Draft.js
@@ -37,7 +37,7 @@ const Draft = ({
     <>
       <h2>Submit Report</h2>
       <Form className="smart-hub--form-large" onSubmit={handleSubmit(onSubmit)}>
-        <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Additional Notes">
+        <Fieldset className="smart-hub--report-legend margin-top-4" legend="Additional Notes">
           <FormItem
             label="Creator notes"
             name="additionalNotes"
@@ -46,7 +46,7 @@ const Draft = ({
             <Textarea inputRef={register} id="additionalNotes" name="additionalNotes" className={textAreaClass} />
           </FormItem>
         </Fieldset>
-        <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Review and submit report">
+        <Fieldset className="smart-hub--report-legend margin-top-4" legend="Review and submit report">
           <p className="margin-top-4">
             Submitting this form for approval means that you will no longer be in draft
             mode. Please review all information in each section before submitting to your
diff --git a/frontend/src/pages/ActivityReport/Pages/__tests__/topicsResources.js b/frontend/src/pages/ActivityReport/Pages/__tests__/topicsResources.js
index 8a965dc01b..75e0f52198 100644
--- a/frontend/src/pages/ActivityReport/Pages/__tests__/topicsResources.js
+++ b/frontend/src/pages/ActivityReport/Pages/__tests__/topicsResources.js
@@ -27,18 +27,18 @@ const RenderTopicsResourcesReview = ({ data }) => {
 
 describe('Topics & resources', () => {
   const data = {
-    otherResources: [{ originalFileName: 'other', url: { url: 'http://localhost/other' }, status: 'APPROVED' }],
     attachments: [{ originalFileName: 'attachment', url: { url: 'http://localhost/attachment' }, status: 'APPROVED' }],
-    resourcesUsed: 'resources',
+    ECLKCResourcesUsed: [{ value: 'eclkc' }],
+    nonECLKCResourcesUsed: [{ value: 'nonEclkc' }],
     topics: 'topics',
   };
 
   describe('review page', () => {
     it('displays attachments and other resources', async () => {
       render(<RenderTopicsResourcesReview data={data} />);
-      expect(await screen.findByText('other')).toBeVisible();
+      expect(await screen.findByText('eclkc')).toBeVisible();
       expect(await screen.findByText('attachment')).toBeVisible();
-      expect(await screen.findByText('resources')).toBeVisible();
+      expect(await screen.findByText('nonEclkc')).toBeVisible();
       expect(await screen.findByText('topics')).toBeVisible();
     });
   });
diff --git a/frontend/src/pages/ActivityReport/Pages/activitySummary.js b/frontend/src/pages/ActivityReport/Pages/activitySummary.js
index 337d501624..6959673bf1 100644
--- a/frontend/src/pages/ActivityReport/Pages/activitySummary.js
+++ b/frontend/src/pages/ActivityReport/Pages/activitySummary.js
@@ -34,6 +34,7 @@ const ActivitySummary = ({
   const activityRecipientType = watch('activityRecipientType');
   const startDate = watch('startDate');
   const endDate = watch('endDate');
+  const isVirtual = watch('deliveryMethod') === 'virtual';
   const { nonGrantees: rawNonGrantees, grants: rawGrants } = recipients;
 
   const grants = rawGrants.map((grantee) => ({
@@ -87,9 +88,9 @@ const ActivitySummary = ({
       <Helmet>
         <title>Activity summary</title>
       </Helmet>
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Who was the activity for?">
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="Who was the activity for?">
         <div id="activity-for" />
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label="Was this activity for a grantee or non-grantee?"
             name="activityRecipientType"
@@ -113,7 +114,7 @@ const ActivitySummary = ({
             />
           </FormItem>
         </div>
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label={recipientLabel}
             name="activityRecipients"
@@ -130,7 +131,7 @@ const ActivitySummary = ({
             />
           </FormItem>
         </div>
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label="Collaborating Specialists"
             name="collaborators"
@@ -149,7 +150,7 @@ const ActivitySummary = ({
         </div>
         {granteeSelected
         && (
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label="Program type(s)"
             name="programTypes"
@@ -164,7 +165,7 @@ const ActivitySummary = ({
           </FormItem>
         </div>
         )}
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label="Target Populations addressed. You may choose more than one."
             name="targetPopulations"
@@ -179,9 +180,9 @@ const ActivitySummary = ({
           </FormItem>
         </div>
       </Fieldset>
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Reason for Activity">
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="Reason for Activity">
         <div id="reasons" />
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label="Who requested this activity? Use &quot;Regional Office&quot; for TTA not requested by grantee."
             name="requester"
@@ -205,7 +206,7 @@ const ActivitySummary = ({
             />
           </FormItem>
         </div>
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label="Reason(s). You may choose more than one."
             name="reason"
@@ -218,7 +219,7 @@ const ActivitySummary = ({
           </FormItem>
         </div>
       </Fieldset>
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Activity date">
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="Activity date">
         <div id="date" />
         <div>
           <Grid row gap>
@@ -251,7 +252,7 @@ const ActivitySummary = ({
             </Grid>
             <Grid col={5}>
               <FormItem
-                label="Duration"
+                label="Duration (round to the nearest half hour)"
                 name="duration"
               >
                 <TextInput
@@ -273,9 +274,9 @@ const ActivitySummary = ({
           </Grid>
         </div>
       </Fieldset>
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Training or Technical Assistance">
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="Training or Technical Assistance">
         <div id="tta" />
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label="What TTA was provided"
             name="ttaType"
@@ -285,7 +286,7 @@ const ActivitySummary = ({
             {renderCheckbox('ttaType', 'technical-assistance', 'Technical Assistance', 'Please specify the type of TTA provided')}
           </FormItem>
         </div>
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label="How was the activity conducted?"
             name="deliveryMethod"
@@ -308,11 +309,39 @@ const ActivitySummary = ({
               inputRef={register({ required: 'Please specify how the activity was conducted' })}
             />
           </FormItem>
+          <div aria-live="polite">
+            {isVirtual && (
+            <div className="margin-top-2 smart-hub--virtual-delivery-group">
+              <FormItem
+                label="Please specify how the virtual event was conducted."
+                name="virtualDeliveryType"
+                fieldSetWrapper
+              >
+                <Radio
+                  id="virtual-deliver-method-video"
+                  name="virtualDeliveryType"
+                  label="Video"
+                  value="video"
+                  className="smart-hub--report-checkbox"
+                  inputRef={register({ required: 'Please specify how the virtual event was conducted' })}
+                />
+                <Radio
+                  id="virtual-deliver-method-telephone"
+                  name="virtualDeliveryType"
+                  label="Telephone"
+                  value="telephone"
+                  className="smart-hub--report-checkbox"
+                  inputRef={register({ required: 'Please specify how the virtual event was conducted' })}
+                />
+              </FormItem>
+            </div>
+            )}
+          </div>
         </div>
       </Fieldset>
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Participants">
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="Participants">
         <div id="other-participants" />
-        <div className="smart-hub--form-section">
+        <div className="margin-top-2">
           <FormItem
             label={participantsLabel}
             name="participants"
diff --git a/frontend/src/pages/ActivityReport/Pages/components/Goal.js b/frontend/src/pages/ActivityReport/Pages/components/Goal.js
index 5a8afd9d8a..b91dd1934a 100644
--- a/frontend/src/pages/ActivityReport/Pages/components/Goal.js
+++ b/frontend/src/pages/ActivityReport/Pages/components/Goal.js
@@ -34,7 +34,7 @@ const Goals = ({
 
           <div className="margin-left-auto">
             <Button type="button" onClick={onRemoveGoal} unstyled className="smart-hub--button" aria-label={`remove goal ${goalIndex + 1}`}>
-              <FontAwesomeIcon color="gray" icon={faTrash} />
+              <FontAwesomeIcon color="black" icon={faTrash} />
             </Button>
           </div>
         </div>
diff --git a/frontend/src/pages/ActivityReport/Pages/components/GoalPicker.js b/frontend/src/pages/ActivityReport/Pages/components/GoalPicker.js
index 3220b0072a..db40e34f48 100644
--- a/frontend/src/pages/ActivityReport/Pages/components/GoalPicker.js
+++ b/frontend/src/pages/ActivityReport/Pages/components/GoalPicker.js
@@ -78,7 +78,7 @@ const GoalPicker = ({
   const uniqueAvailableGoals = uniqBy(allAvailableGoals, 'id');
 
   return (
-    <div className="smart-hub--form-section">
+    <div className="margin-top-4">
       <FormItem
         label="You must select an established goal(s) OR create a new goal for this activity."
         name="goals"
diff --git a/frontend/src/pages/ActivityReport/Pages/components/ResourceSelector.js b/frontend/src/pages/ActivityReport/Pages/components/ResourceSelector.js
new file mode 100644
index 0000000000..3bcb61bf3e
--- /dev/null
+++ b/frontend/src/pages/ActivityReport/Pages/components/ResourceSelector.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { useFormContext, useFieldArray } from 'react-hook-form';
+
+import { Button, TextInput } from '@trussworks/react-uswds';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { faCircle } from '@fortawesome/free-regular-svg-icons';
+
+const ResourceSelector = ({ name, ariaName }) => {
+  const { register, control, getValues } = useFormContext();
+
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name,
+  });
+
+  const canDelete = fields.length > 1;
+
+  return (
+    <>
+      {fields.map((item, index) => (
+        <div key={item.id} className="display-flex flex-align-center">
+          <TextInput
+            name={`${name}[${index}].value`}
+            type="text"
+            defaultValue={item.value}
+            inputRef={register()}
+          />
+          {canDelete && (
+          <Button onClick={() => remove(index)} aria-label={`remove ${ariaName} ${index + 1}`} className="smart-hub--remove-resource" unstyled type="button">
+            <FontAwesomeIcon color="black" icon={faTrash} />
+          </Button>
+          )}
+        </div>
+      ))}
+      <Button
+        unstyled
+        type="button"
+        onClick={() => {
+          const allValues = getValues();
+          const fieldArray = allValues[name] || [];
+          const canAdd = fieldArray.every((field) => field.value !== '');
+          if (canAdd) {
+            append({ value: '' });
+          }
+        }}
+      >
+        <span className="fa-layers fa-fw">
+          <FontAwesomeIcon color="#0166ab" size="lg" icon={faCircle} />
+          <FontAwesomeIcon color="#0166ab" size="xs" icon={faPlus} />
+        </span>
+        <span className="margin-left-1">
+          Add New Resource
+        </span>
+      </Button>
+    </>
+  );
+};
+
+ResourceSelector.propTypes = {
+  name: PropTypes.string.isRequired,
+  ariaName: PropTypes.string.isRequired,
+};
+
+export default ResourceSelector;
diff --git a/frontend/src/pages/ActivityReport/Pages/components/__tests__/ResourceSelector.js b/frontend/src/pages/ActivityReport/Pages/components/__tests__/ResourceSelector.js
new file mode 100644
index 0000000000..21fd8fe60a
--- /dev/null
+++ b/frontend/src/pages/ActivityReport/Pages/components/__tests__/ResourceSelector.js
@@ -0,0 +1,63 @@
+/* eslint-disable react/jsx-props-no-spreading */
+import '@testing-library/jest-dom';
+import userEvent from '@testing-library/user-event';
+import { render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+
+import ResourceSelector from '../ResourceSelector';
+
+// eslint-disable-next-line react/prop-types
+const RenderResourceSelector = ({ data }) => {
+  const hookForm = useForm({
+    defaultValues: {
+      name: data,
+    },
+  });
+  return (
+    <FormProvider {...hookForm}>
+      <ResourceSelector
+        name="name"
+        ariaName="name"
+      />
+    </FormProvider>
+  );
+};
+
+describe('ResourceSelector', () => {
+  it('can have a resource added', async () => {
+    render(<RenderResourceSelector data={[{ value: 'test' }]} />);
+    const addResource = await screen.findByRole('button', { name: 'Add New Resource' });
+    userEvent.click(addResource);
+    const text = await screen.findAllByRole('textbox');
+    expect(text.length).toBe(2);
+  });
+
+  it('prevents adding of additional resources if one resource is empty', async () => {
+    render(<RenderResourceSelector data={[{ value: '' }]} />);
+    const addResource = await screen.findByRole('button');
+    userEvent.click(addResource);
+    const text = await screen.findAllByRole('textbox');
+    expect(text.length).toBe(1);
+  });
+
+  describe('with a single entry', () => {
+    it('hides the delete button', async () => {
+      render(<RenderResourceSelector data={[{ value: 'test' }]} />);
+      const remove = screen.queryByRole('button', { name: 'remove name 1' });
+      await waitFor(() => expect(remove).toBeNull());
+    });
+  });
+
+  describe('with multiple entries', () => {
+    it('allows removal of an item', async () => {
+      render(<RenderResourceSelector data={[{ value: 'first' }, { value: 'second' }]} />);
+      const text = await screen.findAllByRole('textbox');
+      expect(text.length).toBe(2);
+      const remove = screen.queryByRole('button', { name: 'remove name 1' });
+      userEvent.click(remove);
+      const newText = await screen.findAllByRole('textbox');
+      expect(newText.length).toBe(1);
+    });
+  });
+});
diff --git a/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js b/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
index d98bf45e2c..9640810228 100644
--- a/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
+++ b/frontend/src/pages/ActivityReport/Pages/goalsObjectives.js
@@ -40,14 +40,14 @@ const GoalsObjectives = ({
       </Helmet>
       {activityRecipientType === 'grantee' && hasGrants
         && (
-        <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Goals and objectives">
+        <Fieldset className="smart-hub--report-legend margin-top-4" legend="Goals and objectives">
           <div id="goals-and-objectives" />
           <GoalPicker
             availableGoals={availableGoals}
           />
         </Fieldset>
         )}
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Context">
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="Context">
         <Label htmlFor="context">OPTIONAL: Provide background or context for this activity</Label>
         <Textarea id="context" name="context" inputRef={register()} />
       </Fieldset>
diff --git a/frontend/src/pages/ActivityReport/Pages/topicsResources.js b/frontend/src/pages/ActivityReport/Pages/topicsResources.js
index f49ceabb00..76dcc4d490 100644
--- a/frontend/src/pages/ActivityReport/Pages/topicsResources.js
+++ b/frontend/src/pages/ActivityReport/Pages/topicsResources.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Controller, useFormContext } from 'react-hook-form';
 import { Helmet } from 'react-helmet';
 import {
-  Fieldset, Label, TextInput,
+  Fieldset, Label,
 } from '@trussworks/react-uswds';
 
 import { isUndefined } from 'lodash';
@@ -13,20 +13,22 @@ import FileReviewItem from './Review/FileReviewItem';
 import MultiSelect from '../../../components/MultiSelect';
 import FileUploader from '../../../components/FileUploader';
 import FormItem from '../../../components/FormItem';
+import ResourceSelector from './components/ResourceSelector';
 import { topics } from '../constants';
 
 const TopicsResources = ({
   reportId,
 }) => {
-  const { register, control } = useFormContext();
+  const { control } = useFormContext();
+
   return (
     <>
       <Helmet>
         <title>Topics and resources</title>
       </Helmet>
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Topics Covered">
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="Topics Covered">
         <div id="topics-covered" />
-        <div className="smart-hub--form-section">
+        <div className="margin-top-4">
           <FormItem
             label="Topic(s) covered. You may choose more than one."
             name="topics"
@@ -44,38 +46,39 @@ const TopicsResources = ({
           </FormItem>
         </div>
       </Fieldset>
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="OHS / ECLKC resources">
-        <div id="resources" />
-        <div className="smart-hub--form-section">
-          <Label htmlFor="resourcesUsed">
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="OHS / ECLKC resources">
+        <div id="ECLKCResources" />
+        <div className="margin-top-4">
+          <Label>
             Resources from OHS / ECLKC
             <br />
-            Enter the URL for OHS resource(s) used. https://eclkc.ohs.acf.hhs.gov/
+            Enter the URL for OHS resource(s) used.
+            {' '}
+            <a href="https://eclkc.ohs.acf.hhs.gov/">https://eclkc.ohs.acf.hhs.gov/</a>
+            <ResourceSelector
+              name="ECLKCResourcesUsed"
+              ariaName="ECLKC Resources"
+            />
           </Label>
-          <TextInput
-            id="resourcesUsed"
-            name="resourcesUsed"
-            type="text"
-            inputRef={register()}
-          />
         </div>
       </Fieldset>
-      <Fieldset className="smart-hub--report-legend smart-hub--form-section" legend="Upload resources">
-        <div className="smart-hub--form-section">
-          <Label htmlFor="otherResources">Upload any resources used that are not available through ECLKC</Label>
-          <Controller
-            name="otherResources"
-            defaultValue={[]}
-            control={control}
-            render={({ onChange, value }) => (
-              <FileUploader files={value} onChange={onChange} reportId={reportId} id="otherResources" />
-            )}
-          />
+      <Fieldset className="smart-hub--report-legend margin-top-4" legend="Non-ECLKC resources">
+        <div id="nonECLKCResources" />
+        <div className="margin-top-4">
+          <Label>
+            For non-ECLKC resources enter URL.
+            <br />
+            If no URL is available, upload document in next section.
+            <ResourceSelector
+              name="nonECLKCResourcesUsed"
+              ariaName="non-ECLKC Resources"
+            />
+          </Label>
         </div>
       </Fieldset>
-      <Fieldset legend="Attachments" className="smart-hub--report-legend smart-hub--form-section">
+      <Fieldset legend="Supporting attachments" className="smart-hub--report-legend margin-top-4">
         <div id="attachments" />
-        <Label htmlFor="attachments">Agendas, service plans, sign-in sheets, etc.</Label>
+        <Label htmlFor="attachments">Upload resources not available online, agenda, service plans, sign-in sheets, etc.</Label>
         <Controller
           name="attachments"
           defaultValue={[]}
@@ -96,13 +99,12 @@ TopicsResources.propTypes = {
 const ReviewSection = () => {
   const { watch } = useFormContext();
   const {
-    otherResources,
-    resourcesUsed,
+    nonECLKCResources,
+    ECLKCResources,
     attachments,
     topics: formTopics,
   } = watch();
 
-  const hasOtherResources = otherResources && otherResources.length > 0;
   const hasAttachments = attachments && attachments.length > 0;
 
   return (
@@ -120,29 +122,35 @@ const ReviewSection = () => {
         />
       </Section>
       <Section
-        hidePrint={!hasOtherResources && isUndefined(resourcesUsed)}
-        key="Resources"
-        basePath="resources"
-        anchor="resources"
-        title="Resources"
+        hidePrint={isUndefined(ECLKCResources)}
+        key="OHS / ECLKC resources"
+        basePath="topics-resources"
+        anchor="ECLKCResources"
+        title="OHS / ECLKC resources"
       >
         <ReviewItem
-          label="Resources used"
-          name="resourcesUsed"
+          label="ECLKC resources"
+          name="ECLKCResourcesUsed"
+          path="value"
+        />
+      </Section>
+      <Section
+        hidePrint={isUndefined(nonECLKCResources)}
+        key="Non-ECLKC resources"
+        basePath="topics-resources"
+        anchor="nonECLKCResources"
+        title="Non-ECLKC resources"
+      >
+        <ReviewItem
+          label="Non-ECLKC resources"
+          name="nonECLKCResourcesUsed"
+          path="value"
         />
-        {otherResources.map((file) => (
-          <FileReviewItem
-            key={file.url.url}
-            filename={file.originalFileName}
-            url={file.url.url}
-            status={file.status}
-          />
-        ))}
       </Section>
       <Section
         hidePrint={!hasAttachments}
         key="Attachments"
-        basePath="attachments"
+        basePath="topics-resources"
         anchor="attachments"
         title="Attachments"
       >
diff --git a/frontend/src/pages/ActivityReport/index.css b/frontend/src/pages/ActivityReport/index.css
index c67497045e..90ea4db663 100644
--- a/frontend/src/pages/ActivityReport/index.css
+++ b/frontend/src/pages/ActivityReport/index.css
@@ -1,13 +1,22 @@
-.smart-hub--form-section {
-  margin-top: 2rem;
-}
 
 .smart-hub--report-checkbox {
   margin-top: 1.25rem;
 }
 
+.smart-hub--remove-resource {
+  margin-top: 8px !important;
+  margin-left: 4px;
+}
+
+.smart-hub--virtual-delivery-group {
+  border-left-color: #0166ab;
+  border-left-style: solid;
+  border-left-width: 4px;
+  padding-left: 10px;
+}
+
 .smart-hub--report-legend .usa-legend {
-  font-family: Merriweather;
+  font-family: 'Source Sans Pro Web';
   font-size: 17px;
   color: #21272d;
   line-height: 22px;
@@ -54,3 +63,15 @@
   border-bottom-right-radius: 4px;
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
 }
+
+.icon {
+  display:inline-block;
+    font-size: 40px;
+    line-height: 50px;
+    background-color:black;
+    color:white;
+    width: 50px;
+    height: 50px;
+    text-align: center;
+    vertical-align: bottom;
+}
\ No newline at end of file
diff --git a/frontend/src/pages/ActivityReport/index.js b/frontend/src/pages/ActivityReport/index.js
index 225ee44a01..f9872ab4d5 100644
--- a/frontend/src/pages/ActivityReport/index.js
+++ b/frontend/src/pages/ActivityReport/index.js
@@ -49,7 +49,8 @@ const defaultValues = {
   programTypes: [],
   reason: [],
   requester: '',
-  resourcesUsed: '',
+  ECLKCResourcesUsed: [{ value: '' }],
+  nonECLKCResourcesUsed: [{ value: '' }],
   startDate: null,
   targetPopulations: [],
   topics: [],
@@ -84,6 +85,14 @@ function ActivityReport({
     history.replace();
   }, [activityReportId, history]);
 
+  const unflattenResourcesUsed = (array) => {
+    if (!array) {
+      return [];
+    }
+
+    return array.map((value) => ({ value }));
+  };
+
   useDeepCompareEffect(() => {
     const fetch = async () => {
       let report;
@@ -91,7 +100,10 @@ function ActivityReport({
       try {
         updateLoading(true);
         if (activityReportId !== 'new') {
-          report = await getReport(activityReportId);
+          const fetchedReport = await getReport(activityReportId);
+          const ECLKCResourcesUsed = unflattenResourcesUsed(fetchedReport.ECLKCResourcesUsed);
+          const nonECLKCResourcesUsed = unflattenResourcesUsed(fetchedReport.nonECLKCResourcesUsed);
+          report = { ...fetchedReport, ECLKCResourcesUsed, nonECLKCResourcesUsed };
         } else {
           report = {
             ...defaultValues,
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 877cedf406..5cfeca87f4 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1259,6 +1259,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz#0a8c348bb23b7b760030f5b1d912e582be4ec915"
   integrity sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA==
 
+"@fortawesome/fontawesome-common-types@^0.2.34":
+  version "0.2.34"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz#0a8c348bb23b7b760030f5b1d912e582be4ec915"
+  integrity sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA==
+
 "@fortawesome/fontawesome-free@^5.15.1":
   version "5.15.2"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz#218cd7276ab4f9ab57cc3d2efa2697e6a579f25d"
@@ -1271,6 +1276,13 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.34"
 
+"@fortawesome/free-regular-svg-icons@^5.15.2":
+  version "5.15.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.2.tgz#61eeb8c206e792c530eaa58279cc32c55332fe8f"
+  integrity sha512-Uv5NQCYjyisNVTu/1Xjs+z8vwQjbfT6hiqYvQNfF0n8qdgfWLM581bAfVMQ3BCs1SPy+eEUKNcGkK4n0FihFHg==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "^0.2.34"
+
 "@fortawesome/free-solid-svg-icons@^5.15.1":
   version "5.15.2"
   resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.2.tgz#25bb035de57cf85aee8072965732368ccc8e8943"
diff --git a/src/migrations/20210302170502-add-resources-to-activity-report.js b/src/migrations/20210302170502-add-resources-to-activity-report.js
new file mode 100644
index 0000000000..e2511db8b3
--- /dev/null
+++ b/src/migrations/20210302170502-add-resources-to-activity-report.js
@@ -0,0 +1,29 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    queryInterface.sequelize.transaction(async (transaction) => {
+      await Promise.all([
+        queryInterface.addColumn('ActivityReports',
+          'nonECLKCResourcesUsed',
+          {
+            type: Sequelize.ARRAY(Sequelize.TEXT),
+          }, { transaction }),
+        queryInterface.removeColumn('ActivityReports', 'resourcesUsed', { transaction }),
+        queryInterface.addColumn('ActivityReports',
+          'ECLKCResourcesUsed',
+          {
+            type: Sequelize.ARRAY(Sequelize.TEXT),
+          }, { transaction }),
+      ]);
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    queryInterface.sequelize.transaction(async (transaction) => {
+      await Promise.all([
+        queryInterface.removeColumn('ActivityReports', 'nonECLKCResourcesUsed', { transaction }),
+        queryInterface.removeColumn('ActivityReports', 'ECLKCResourcesUsed', { transaction }),
+        queryInterface.addColumn('ActivityReports', 'resourcesUsed', { type: Sequelize.TEXT }, { transaction }),
+      ]);
+    });
+  },
+};
diff --git a/src/migrations/20210302215921-add-virtual-delivery-type.js b/src/migrations/20210302215921-add-virtual-delivery-type.js
new file mode 100644
index 0000000000..9271f46cd3
--- /dev/null
+++ b/src/migrations/20210302215921-add-virtual-delivery-type.js
@@ -0,0 +1,13 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn('ActivityReports',
+      'virtualDeliveryType',
+      {
+        type: Sequelize.STRING,
+      });
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.removeColumn('ActivityReports', 'virtualDeliveryType');
+  },
+};
diff --git a/src/migrations/20210305174257-remove-attachment-type.js b/src/migrations/20210305174257-remove-attachment-type.js
new file mode 100644
index 0000000000..c0c41a1082
--- /dev/null
+++ b/src/migrations/20210305174257-remove-attachment-type.js
@@ -0,0 +1,18 @@
+module.exports = {
+  up: async (queryInterface) => {
+    queryInterface.sequelize.transaction((t) => Promise.all([
+      queryInterface.removeColumn('Files', 'attachmentType', { transaction: t }),
+      queryInterface.sequelize.query('DROP TYPE public."enum_Files_attachmentType";', { transaction: t }),
+    ]));
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    queryInterface.addColumn(
+      'Files',
+      'attachmentType',
+      {
+        type: Sequelize.DataTypes.ENUM(['ATTACHMENT', 'RESOURCE']),
+      },
+    );
+  },
+};
diff --git a/src/models/activityReport.js b/src/models/activityReport.js
index bb8ba81aa3..bd5970b98a 100644
--- a/src/models/activityReport.js
+++ b/src/models/activityReport.js
@@ -28,7 +28,6 @@ export default (sequelize, DataTypes) => {
       });
       ActivityReport.belongsTo(models.Region, { foreignKey: 'regionId', as: 'region' });
       ActivityReport.hasMany(models.File, { foreignKey: 'activityReportId', as: 'attachments' });
-      ActivityReport.hasMany(models.File, { foreignKey: 'activityReportId', as: 'otherResources' });
       ActivityReport.hasMany(models.NextStep, { foreignKey: 'activityReportId', as: 'specialistNextSteps' });
       ActivityReport.hasMany(models.NextStep, { foreignKey: 'activityReportId', as: 'granteeNextSteps' });
       ActivityReport.belongsToMany(models.Goal, {
@@ -56,8 +55,11 @@ export default (sequelize, DataTypes) => {
       type: DataTypes.INTEGER,
       allowNull: true,
     },
-    resourcesUsed: {
-      type: DataTypes.TEXT,
+    ECLKCResourcesUsed: {
+      type: DataTypes.ARRAY(DataTypes.TEXT),
+    },
+    nonECLKCResourcesUsed: {
+      type: DataTypes.ARRAY(DataTypes.TEXT),
     },
     additionalNotes: {
       type: DataTypes.TEXT,
@@ -91,6 +93,9 @@ export default (sequelize, DataTypes) => {
     targetPopulations: {
       type: DataTypes.ARRAY(DataTypes.STRING),
     },
+    virtualDeliveryType: {
+      type: DataTypes.STRING,
+    },
     reason: {
       type: DataTypes.ARRAY(DataTypes.STRING),
     },
diff --git a/src/models/file.js b/src/models/file.js
index 4f64d93bf0..44099a5c9a 100644
--- a/src/models/file.js
+++ b/src/models/file.js
@@ -38,10 +38,6 @@ module.exports = (sequelize, DataTypes) => {
       ),
       allowNull: false,
     },
-    attachmentType: {
-      type: DataTypes.ENUM('ATTACHMENT', 'RESOURCE'),
-      allowNull: false,
-    },
     // File size in bytes
     fileSize: {
       type: DataTypes.INTEGER,
diff --git a/src/routes/files/handlers.js b/src/routes/files/handlers.js
index 8e0e0cfd26..3c94bd3291 100644
--- a/src/routes/files/handlers.js
+++ b/src/routes/files/handlers.js
@@ -17,9 +17,6 @@ const multiparty = require('multiparty');
 
 const namespace = 'SERVICE:FILES';
 
-const ATTACHMENT = 'ATTACHMENT';
-const RESOURCE = 'RESOURCE';
-
 const logContext = {
   namespace,
 };
@@ -57,7 +54,7 @@ export const deleteHandler = async (req, res) => {
 export default async function uploadHandler(req, res) {
   const form = new multiparty.Form();
   form.parse(req, async (error, fields, files) => {
-    const { reportId, attachmentType } = fields;
+    const { reportId } = fields;
     if (error) {
       res.status(500).send(error);
     }
@@ -88,14 +85,6 @@ export default async function uploadHandler(req, res) {
         res.status(400).send({ error: 'reportId required' });
         return;
       }
-      if (!attachmentType) {
-        res.status(400).send({ error: 'attachmentType required' });
-        return;
-      }
-      if (attachmentType[0] !== ATTACHMENT && attachmentType[0] !== RESOURCE) {
-        res.status(400).send({ error: `incorrect attachmentType. Wanted: ${ATTACHMENT} or ${RESOURCE}. Got: ${attachmentType[0]}` });
-        return;
-      }
       buffer = fs.readFileSync(path);
       type = await fileType.fromFile(path);
       if (!type) {
@@ -107,7 +96,6 @@ export default async function uploadHandler(req, res) {
         originalFilename,
         fileName,
         reportId,
-        attachmentType[0],
         size,
       );
     } catch (err) {
diff --git a/src/routes/files/handlers.test.js b/src/routes/files/handlers.test.js
index 115f6a0173..1b8deb0bbf 100644
--- a/src/routes/files/handlers.test.js
+++ b/src/routes/files/handlers.test.js
@@ -92,7 +92,6 @@ describe('File Upload', () => {
       await request(app)
         .post('/api/files')
         .field('reportId', report.dataValues.id)
-        .field('attachmentType', 'ATTACHMENT')
         .attach('file', `${__dirname}/testfiles/testfile.pdf`)
         .expect(200)
         .then((res) => {
@@ -143,7 +142,6 @@ describe('File Upload', () => {
       }));
       await request(app)
         .post('/api/files')
-        .field('attachmentType', 'ATTACHMENT')
         .attach('file', `${__dirname}/testfiles/testfile.pdf`)
         .expect(400, { error: 'reportId required' })
         .then(() => expect(uploadFile).not.toHaveBeenCalled());
@@ -155,33 +153,9 @@ describe('File Upload', () => {
       await request(app)
         .post('/api/files')
         .field('reportId', report.dataValues.id)
-        .field('attachmentType', 'ATTACHMENT')
         .expect(400, { error: 'file required' })
         .then(() => expect(uploadFile).not.toHaveBeenCalled());
     });
-    it('tests a file upload without a attachment', async () => {
-      ActivityReportPolicy.mockImplementation(() => ({
-        canUpdate: () => true,
-      }));
-      await request(app)
-        .post('/api/files')
-        .field('reportId', report.dataValues.id)
-        .attach('file', `${__dirname}/testfiles/testfile.pdf`)
-        .expect(400, { error: 'attachmentType required' })
-        .then(() => expect(uploadFile).not.toHaveBeenCalled());
-    });
-    it('tests a file upload with an incorrect attachment value', async () => {
-      ActivityReportPolicy.mockImplementation(() => ({
-        canUpdate: () => true,
-      }));
-      await request(app)
-        .post('/api/files')
-        .field('reportId', report.dataValues.id)
-        .field('attachmentType', 'FAKE')
-        .attach('file', `${__dirname}/testfiles/testfile.pdf`)
-        .expect(400, { error: 'incorrect attachmentType. Wanted: ATTACHMENT or RESOURCE. Got: FAKE' })
-        .then(() => expect(uploadFile).not.toHaveBeenCalled());
-    });
     it('tests an unauthorized upload', async () => {
       jest.clearAllMocks();
       ActivityReportPolicy.mockImplementation(() => ({
@@ -190,7 +164,6 @@ describe('File Upload', () => {
       await request(app)
         .post('/api/files')
         .field('reportId', report.dataValues.id)
-        .field('attachmentType', 'ATTACHMENT')
         .attach('file', `${__dirname}/testfiles/testfile.pdf`)
         .expect(403)
         .then(() => expect(uploadFile).not.toHaveBeenCalled());
diff --git a/src/seeders/20201124160449-users.js b/src/seeders/20201124160449-users.js
index df805a9e2e..2299e66f59 100644
--- a/src/seeders/20201124160449-users.js
+++ b/src/seeders/20201124160449-users.js
@@ -82,16 +82,6 @@ const permissions = [
     regionId: 14,
     scopeId: ADMIN,
   },
-  {
-    userId: 7,
-    scopeId: SITE_ACCESS,
-    regionId: 14,
-  },
-  {
-    userId: 7,
-    regionId: 14,
-    scopeId: ADMIN,
-  },
   {
     userId: 6,
     regionId: 1,
diff --git a/src/services/activityReports.js b/src/services/activityReports.js
index 1125eb6a50..7ec56f7e77 100644
--- a/src/services/activityReports.js
+++ b/src/services/activityReports.js
@@ -199,7 +199,6 @@ export function activityReportById(activityReportId) {
       {
         model: File,
         where: {
-          attachmentType: 'ATTACHMENT',
           status: {
             [Op.ne]: 'UPLOAD_FAILED',
           },
@@ -207,17 +206,6 @@ export function activityReportById(activityReportId) {
         as: 'attachments',
         required: false,
       },
-      {
-        model: File,
-        where: {
-          attachmentType: 'RESOURCE',
-          status: {
-            [Op.ne]: 'UPLOAD_FAILED',
-          },
-        },
-        as: 'otherResources',
-        required: false,
-      },
       {
         model: NextStep,
         where: {
@@ -387,13 +375,22 @@ export async function createOrUpdate(newActivityReport, report) {
     collaborators,
     activityRecipients,
     attachments,
-    otherResources,
     approvingManager,
     author,
     granteeNextSteps,
     specialistNextSteps,
-    ...updatedFields
+    ...allFields
   } = newActivityReport;
+
+  const ECLKCResourcesUsed = allFields.ECLKCResourcesUsed
+    ? allFields.ECLKCResourcesUsed.map((item) => item.value)
+    : [];
+
+  const nonECLKCResourcesUsed = allFields.nonECLKCResourcesUsed
+    ? allFields.nonECLKCResourcesUsed.map((item) => item.value)
+    : [];
+
+  const updatedFields = { ...allFields, ECLKCResourcesUsed, nonECLKCResourcesUsed };
   await sequelize.transaction(async (transaction) => {
     if (report) {
       savedReport = await update(updatedFields, report, transaction);
diff --git a/src/services/activityReports.test.js b/src/services/activityReports.test.js
index 46ab4f63a4..f2308702ee 100644
--- a/src/services/activityReports.test.js
+++ b/src/services/activityReports.test.js
@@ -22,7 +22,7 @@ const reportObject = {
   userId: mockUser.id,
   regionId: 1,
   lastUpdatedById: mockUser.id,
-  resourcesUsed: 'test',
+  ECLKCResourcesUsed: ['test'],
   activityRecipients: [{ activityRecipientId: RECIPIENT_ID }],
 };
 
@@ -58,8 +58,8 @@ describe('Activity Reports DB service', () => {
   describe('createOrUpdate', () => {
     it('updates an already saved report', async () => {
       const report = await ActivityReport.create(reportObject);
-      const newReport = await createOrUpdate({ resourcesUsed: 'updated' }, report);
-      expect(newReport.resourcesUsed).toBe('updated');
+      const newReport = await createOrUpdate({ ECLKCResourcesUsed: [{ value: 'updated' }] }, report);
+      expect(newReport.ECLKCResourcesUsed).toEqual(['updated']);
     });
 
     it('creates a new report', async () => {
@@ -234,7 +234,7 @@ describe('Activity Reports DB service', () => {
 
       const foundReport = await activityReportById(report.id);
       expect(foundReport.id).toBe(report.id);
-      expect(foundReport.resourcesUsed).toBe('test');
+      expect(foundReport.ECLKCResourcesUsed).toEqual(['test']);
     });
   });
 
diff --git a/src/services/files.js b/src/services/files.js
index 5efb79b9e5..8e0343fd20 100644
--- a/src/services/files.js
+++ b/src/services/files.js
@@ -22,13 +22,11 @@ export default async function createFileMetaData(
   originalFileName,
   s3FileName,
   reportId,
-  attachmentType,
   fileSize,
 ) {
   const newFile = {
     activityReportId: reportId,
     originalFileName,
-    attachmentType,
     key: s3FileName,
     status: UPLOADING,
     fileSize,