Merge branch 'main' into 176-demo-account

Author: alishaevn

src/compounds/ActionsGroup/ActionsGroup.jsx

@@ -2,13 +2,12 @@ import React, { useState } from 'react'
 import PropTypes from 'prop-types'
 import { ListGroup } from 'react-bootstrap'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-// import SendMessage from './actions/SendMessage'
+import SendMessage from './actions/SendMessage'
 import ViewFiles from './actions/ViewFiles'
 import { allowNull } from '../../resources/utilityFunctions'
 import './actions-group.scss'
 
-// TODO: add back handleSendingMessagesOrFiles into the props, removing for now to avoid console error. see below TODO.
-const ActionsGroup = ({ initialFiles }) => {
+const ActionsGroup = ({ handleSendingMessagesOrFiles, initialFiles }) => {
   const [show, setShow] = useState(false)
   const [action, setAction] = useState(null)
 
@@ -24,15 +23,15 @@ const ActionsGroup = ({ initialFiles }) => {
   return (
     <>
       <ListGroup className='actions-group'>
-        {/* TODO(@summercook): return this and the below commented code
-        once we are able to refactor posting messages & attachments */}
-        {/* <ListGroup.Item action variant='primary' onClick={() => handleShow('SendMessage')}>
+        <ListGroup.Item
+          action
+          onClick={() => handleShow('SendMessage')}
+        >
           <FontAwesomeIcon icon='fa-envelope' />
           Send Message
-        </ListGroup.Item> */}
+        </ListGroup.Item>
         <ListGroup.Item
           action
-          variant='primary'
           onClick={() => handleShow('ViewFiles')}
           role='presentation'
           bsPrefix='bg-secondary-8 list-group-item'
@@ -41,19 +40,19 @@ const ActionsGroup = ({ initialFiles }) => {
           View Files
         </ListGroup.Item>
       </ListGroup>
-      {/* {(action === 'SendMessage' && show)
+      {(action === 'SendMessage' && show)
         && (
           <SendMessage
             handleClose={handleClose}
             onSubmit={handleSendingMessagesOrFiles}
           />
-        )} */}
+        )}
       {(action === 'ViewFiles' && show)
         && (
           <ViewFiles
             handleClose={handleClose}
             initialFiles={initialFiles}
-            // onSubmit={handleSendingMessagesOrFiles}
+            onSubmit={handleSendingMessagesOrFiles}
           />
         )}
     </>

src/compounds/RequestList/RequestList.jsx

@@ -8,11 +8,19 @@ const RequestList = ({ backgroundColor, requests }) => (
   <>
     <Title title='My Requests' size='medium' />
     <div className='rounded overflow-hidden mb-4'>
-      {requests.map((req, index) => (
+      {requests.length === 0 ? (
+        // the no-requests class is for testing purposes in the webstore - do not remove
+        <p className='mt-2 no-requests'>
+          You do not have any requests yet.
+          <br />
+          <a href='/browse'>Browse our available services</a> to create a request,
+          or start a new general request by clicking the <b>"Initiate a Request"</b> button above.
+        </p>
+      ) : (requests.map((req, index) => (
         <Link key={req.id} href={`${req.href}`} passHref legacyBehavior>
           <RequestItem request={req} index={index} backgroundColor={backgroundColor} />
         </Link>
-      ))}
+      )))}
     </div>
   </>
 )

src/compounds/RequestList/RequestList.stories.jsx

@@ -75,3 +75,8 @@ Alternate.args = {
     },
   ],
 }
+
+export const NoRequests = Template.bind({})
+NoRequests.args = {
+  requests: [],
+}