merge conflicts

Author: summer-cook

src/components/StatusBar/StatusBar.jsx

@@ -16,7 +16,7 @@ const StatusBar = ({ backgroundColor, statusArray, apiRequestStatus, addClass })
 
   return (
     <div className={`container ${addClass}`}>
-      <div className='row border'>
+      <div className='row border' data-cy='status-bar'>
         {statusArray.map((statusObject, index) => {
           const { statusLabel, statusIcon } = statusObject
           const border = index !== statusArray.length - 1 ? 'border-end' : ''

src/compounds/ActionsGroup/actions/SendMessage.jsx

@@ -78,6 +78,20 @@ const SendMessage = ({ backgroundColor, onSubmit, handleClose }) => {
           </ListGroup>
         </Modal.Body>
         <Modal.Footer>
+          <p className='fw-light fst-italic disclaimer'>
+            {/* The "small" tag will make the font size 0.875em of the parent element. It's also accessibility friendly */}
+            <small>
+              Please note that Supplier pricing and other information marked confidential by Supplier must be treated as such.
+            </small>
+          </p>
+
+          <p className='fw-light fst-italic disclaimer'>
+            <small>
+              Do not include any Sensitive Personal Data (e.g. data consisting of racial or ethnic origin, political opinions, religious or
+              philosophical beliefs, or trade union membership, genetic data, biometric data, data concerning health or data concerning a
+              natural person's sex life or sexual orientation) or potentially regulated information in messages or attachments.
+            </small>
+          </p>
           <Button variant='primary' onClick={handleSubmit} type='submit'>
             Send
           </Button>

src/compounds/ActionsGroup/actions/styles.scss

@@ -4,3 +4,8 @@
 #send-message {
   height: 150px;
 }
+
+.disclaimer {
+  font-size: 14px;
+  line-height: 16px;
+}

src/compounds/Document/Document.jsx

@@ -6,11 +6,12 @@ import Notice from '../../components/Notice/Notice'
 import { allowNull } from '../../resources/utilityFunctions'
 import './document.scss'
 
-const Document = ({ addClass, acceptSOW, backgroundColor, document }) => {
-  const { identifier, date, documentStatusColor, documentType,
-    documentTypeColor, documentStatus, lineItems, requestIdentifier,
-    shippingPrice, shipTo, shipFrom, sowID, subtotalPrice,
-    taxAmount, terms, totalPrice } = document
+const Document = ({ document, addClass }) => {
+  const {
+    adPO, date, documentStatusColor, documentType, documentTypeColor, documentStatus, identifier, lineItems, poNumber,
+    relatedSOWIdentifier, requestIdentifier, shippingPrice, shipTo, shipFrom, subtotalPrice, taxAmount, terms, totalPrice,
+    turnaroundTime,
+  } = document
   const [show, setShow] = useState(false)
   const [showNotice, setShowNotice] = useState(false)
   const handleClose = () => setShow(false)
@@ -23,7 +24,7 @@ const Document = ({ addClass, acceptSOW, backgroundColor, document }) => {
             {documentType}
           </div>
           <div className='border-end p-2'>
-            <b>{identifier}:</b> {subtotalPrice}
+            <b>{(documentType === 'SOW') ? identifier : poNumber}:</b> {subtotalPrice}
           </div>
           <small className='text-muted fw-light p-2'>
             {date}
@@ -75,8 +76,12 @@ const Document = ({ addClass, acceptSOW, backgroundColor, document }) => {
           )}
           <div className='d-block d-md-flex justify-content-between'>
             <div className='details'>
-              <h6>Details:</h6>
-              <b>Proposal:</b> {identifier}<br />
+              <h5>Details:</h5>
+              {poNumber && <><b>PO:</b> {poNumber}<br /></>}
+              {adPO && <><b>AD PO:</b> {identifier}<br /></>}
+              {documentType === 'SOW'
+                ? <><b>Proposal:</b> {identifier}</>
+                : <><b>Related SOW:</b> {relatedSOWIdentifier}</>}<br />
               <b>Amount:</b> {subtotalPrice}<br />
               <b>Request:</b> {requestIdentifier} <br />
               <b>Date:</b> {date}<br />
@@ -103,6 +108,7 @@ const Document = ({ addClass, acceptSOW, backgroundColor, document }) => {
               totalPrice={totalPrice}
             />
           )}
+          {turnaroundTime && <h5><b>Turnaround Time:</b> {turnaroundTime}</h5>}
         </Offcanvas.Body>
       </Offcanvas>
     </>
@@ -116,13 +122,16 @@ Document.propTypes = {
   backgroundColor: PropTypes.string,
   acceptSOW: PropTypes.func.isRequired,
   document: PropTypes.shape({
+    adPO: PropTypes.string,
     identifier: PropTypes.string.isRequired,
     date: PropTypes.string.isRequired,
     documentStatus: PropTypes.string.isRequired,
     documentStatusColor: PropTypes.string,
     documentType: PropTypes.string.isRequired,
     documentTypeColor: PropTypes.string,
     lineItems: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
+    poNumber: PropTypes.string,
+    relatedSOWIdentifier: PropTypes.string,
     requestIdentifier: PropTypes.string.isRequired,
     shippingPrice: PropTypes.string.isRequired,
     shipTo: PropTypes.shape({
@@ -138,6 +147,7 @@ Document.propTypes = {
     taxAmount: PropTypes.string.isRequired,
     terms: PropTypes.string.isRequired,
     totalPrice: PropTypes.string.isRequired,
+    turnaroundTime: PropTypes.string,
   }),
 }