allow null

Author: summer-cook

src/components/FilesTable/FilesTable.jsx

@@ -4,6 +4,7 @@ import {
   // Button,
   Table,
 } from 'react-bootstrap'
+import { allowNull } from '../../resources/utilityFunctions'
 
 // TODO(summer-cook):
 // add back handleDeleteFile to props once posting attachments/messages is working/during the work for this ticket:
@@ -65,7 +66,7 @@ FilesTable.propTypes = {
       download: PropTypes.string.isRequired,
       fileName: PropTypes.string.isRequired,
       href: PropTypes.string.isRequired,
-      status: PropTypes.string,
+      status: allowNull(PropTypes.string.isRequired),
       uploadedBy: PropTypes.string.isRequired,
       uuid: PropTypes.string.isRequired,
     }),
@@ -76,9 +77,6 @@ FilesTable.propTypes = {
 
 FilesTable.defaultProps = {
   addClass: '',
-  files: [{
-    status: null
-  }]
 }
 
 export default FilesTable

src/compounds/ActionsGroup/ActionsGroup.jsx

@@ -4,6 +4,7 @@ import { ListGroup } from 'react-bootstrap'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 // 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. see below TODO.
@@ -68,17 +69,11 @@ ActionsGroup.propTypes = {
       download: PropTypes.string.isRequired,
       fileName: PropTypes.string.isRequired,
       href: PropTypes.string.isRequired,
-      status: PropTypes.string,
+      status: allowNull(PropTypes.string.isRequired),
       uploadedBy: PropTypes.string.isRequired,
       uuid: PropTypes.string.isRequired,
     }),
   ).isRequired,
 }
 
-ActionsGroup.defaultProps = {
-  initialFiles: [{
-    status: null
-  }]
-}
-
 export default ActionsGroup

src/compounds/ActionsGroup/actions/ViewFiles.jsx

@@ -15,8 +15,9 @@ import {
 // import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import FilesTable from '../../../components/FilesTable/FilesTable'
 // import { apiV2CompatibleStrings, convertToBase64 } from '../../../resources/utilityFunctions'
+import { allowNull } from '../../../resources/utilityFunctions'
 
-const ViewFiles = ({ initialFiles, handleClose, show }) => {
+const ViewFiles = ({ initialFiles, handleClose }) => {
   // TODO(summercook):
   // - comment back in the following 2 lines & above imports once posting messages/attachments is working
   // const fileRef = useRef(null)
@@ -135,19 +136,12 @@ ViewFiles.propTypes = {
       download: PropTypes.string.isRequired,
       fileName: PropTypes.string.isRequired,
       href: PropTypes.string.isRequired,
-      status: PropTypes.string,
+      status: allowNull(PropTypes.string.isRequired),
       uploadedBy: PropTypes.string.isRequired,
       uuid: PropTypes.string.isRequired,
     }),
   ).isRequired,
   handleClose: PropTypes.func.isRequired,
-  show: PropTypes.bool.isRequired,
-}
-
-ViewFiles.defaultProps = {
-  initialFiles: [{
-    status: null
-  }]
 }
 
 export default ViewFiles

src/resources/utilityFunctions.js

@@ -15,3 +15,10 @@ export const addDays = (date, days) => {
   date.setDate(date.getDate() + days)
   return date
 }
+
+export const allowNull = (wrappedPropTypes) => {
+  return (props, propName, ...rest) => {
+    if (props[propName] === null) return null
+    return wrappedPropTypes(props, propName, ...rest)
+  }
+}