Mhv 60731 save empty message error

src/applications/mhv-secure-messaging/components/ComposeForm/ComposeForm.jsx

@@ -47,9 +47,10 @@
 import { getCategories } from '../../actions/categories';
 import ElectronicSignature from './ElectronicSignature';
 import RecipientsSelect from './RecipientsSelect';
+import { getPatientSignature } from '../../actions/preferences';
 
 const ComposeForm = props => {
-  const { pageTitle, headerRef, draft, recipients, signature } = props;
+  const { pageTitle, headerRef, draft, recipients } = props;
   const {
     noAssociations,
     allTriageGroupsBlocked,
@@ -58,11 +59,22 @@
   const dispatch = useDispatch();
   const history = useHistory();
 
+  const signature = useSelector(state => state.sm.preferences?.signature);
+
   const [recipientsList, setRecipientsList] = useState(allowedRecipients);
   const [selectedRecipientId, setSelectedRecipientId] = useState(null);
   const [isSignatureRequired, setIsSignatureRequired] = useState(null);
   const [checkboxMarked, setCheckboxMarked] = useState(false);
 
+  useEffect(
+    () => {
+      if (!signature) {
+        dispatch(getPatientSignature());
+      }
+    },
+    [signature, dispatch],
+  );
+
   useEffect(
     () => {
       if (selectedRecipientId) {
@@ -266,7 +278,7 @@
           .catch(() => setSendMessageFlag(false), scrollToTop());
       }
     },
     [sendMessageFlag, isSaving, scrollToTop],
   );
 
   useEffect(
@@ -346,7 +358,11 @@
         setSubjectError(ErrorMessages.ComposeForm.SUBJECT_REQUIRED);
         messageValid = false;
       }
-      if (messageBody === '' || messageBody.match(/^[\s]+$/)) {
+      if (
+        messageBody === '' ||
+        messageBody.match(/^[\s]+$/) ||
+        (formattedSignature && messageBody.trim() === formattedSignature.trim())
+      ) {
         setBodyError(ErrorMessages.ComposeForm.BODY_REQUIRED);
         messageValid = false;
       }
@@ -372,6 +388,7 @@
       messageBody,
       category,
       isSignatureRequired,
+      formattedSignature,
       electronicSignature,
       checkboxMarked,
       setMessageInvalid,
@@ -713,7 +730,7 @@
         noTimeout();
       }
     },
     [
       draft,
       selectedRecipientId,
       category,
@@ -733,7 +750,7 @@
         noTimeout();
       };
     },
     [beforeUnloadHandler],
   );
 
   if (sendMessageFlag === true) {

src/applications/mhv-secure-messaging/containers/Compose.jsx

@@ -8,13 +8,11 @@
 import InterstitialPage from './InterstitialPage';
 import { closeAlert } from '../actions/alerts';
 import { PageTitles, Paths } from '../util/constants';
-import { getPatientSignature } from '../actions/preferences';
 
 const Compose = () => {
   const dispatch = useDispatch();
   const recipients = useSelector(state => state.sm.recipients);
   const { drafts, saveError } = useSelector(state => state.sm.threadDetails);
-  const signature = useSelector(state => state.sm.preferences.signature);
   const draftMessage = drafts?.[0] ?? null;
   const { draftId } = useParams();
 
@@ -44,18 +42,9 @@
         checkNextPath();
       };
     },
     [dispatch, draftId, location.pathname],
   );
 
-  useEffect(
-    () => {
-      if (!signature) {
-        dispatch(getPatientSignature());
-      }
-    },
-    [signature, dispatch],
-  );
-
   useEffect(
     () => {
       if (draftMessage?.messageId && draftMessage.draftDate === null) {
@@ -84,7 +73,7 @@
       if (acknowledged && header) focusElement(document.querySelector('h1'));
       document.title = `${pageTitle} ${PageTitles.PAGE_TITLE_TAG}`;
     },
     [header, acknowledged],
   );
 
   const content = () => {
@@ -96,7 +85,6 @@
             headerRef={header}
             draft={draftMessage}
             recipients={!recipients.error && recipients}
-            signature={signature}
           />
         </>
       );

src/applications/mhv-secure-messaging/tests/components/Compose/ComposeForm.unit.spec.jsx

@@ -352,6 +352,31 @@ describe('Compose form component', () => {
       );
   });
 
+  it('displays error states on message body field when send button is clicked and message body only has signature', async () => {
+    const customState = {
+      ...initialState,
+      sm: {
+        ...initialState.sm,
+        triageTeams: { triageTeams },
+        categories: { categories },
+        preferences: signatureReducers.signatureEnabled,
+      },
+      featureToggles: {},
+    };
+    const screen = setup(customState, Paths.COMPOSE, {
+      draft: { ...draftMessage, body: '\n\nName\nTitle' },
+    });
+
+    const sendButton = screen.getByTestId('send-button');
+
+    fireEvent.click(sendButton);
+
+    const messageInput = await screen.getByTestId('message-body-field');
+    const messageInputError = messageInput[getProps(messageInput)].error;
+
+    expect(messageInputError).to.equal('Message body cannot be blank.');
+  });
+
   it('displays an error on attempt to save a draft with attachments', async () => {
     const customProps = {
       ...draftMessage,