Merge branch 'develop' into bugfix-2672/address-test-warnings

Author: ocielliottc

docs/Gemfile.lock

@@ -251,8 +251,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rouge (3.30.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
@@ -266,7 +265,6 @@ GEM
       faraday (>= 0.17.3, < 3)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
-    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.1)

web-ui/src/pages/EmailPage.jsx

@@ -185,8 +185,18 @@ const ComposeEmailStep = ({
       const fileReader = new FileReader();
       fileReader.onload = e => {
         const mjmlContent = e.target.result.toString();
-        const { html } = mjml2html(mjmlContent);
-        onEmailContentsChange(html);
+        try {
+          const result = mjml2html(mjmlContent);
+          onEmailContentsChange(result.html);
+        } catch(e) {
+          window.snackDispatch({
+            type: UPDATE_TOAST,
+            payload: {
+              severity: 'error',
+              toast: e.message,
+            }
+          });
+        }
       };
 
       const file = event.target.files[0];

web-ui/src/pages/SkillReportPage.jsx

@@ -3,6 +3,7 @@ import React, { useContext, useRef, useState } from 'react';
 import { Button, TextField } from '@mui/material';
 import Autocomplete from '@mui/material/Autocomplete';
 
+import { UPDATE_TOAST } from '../context/actions';
 import { AppContext } from '../context/AppContext';
 import { reportSkills } from '../api/memberskill.js';
 import SearchResults from '../components/search-results/SearchResults';
@@ -126,7 +127,17 @@ const SkillReportPage = props => {
         <div className="SkillsSearch-actions fullWidth">
           <Button
             onClick={() => {
-              handleSearch(createRequestDTO(editedSearchRequest));
+              if (!searchSkills.length) {
+                window.snackDispatch({
+                  type: UPDATE_TOAST,
+                  payload: {
+                    severity: 'error',
+                    toast: 'Must select a skill'
+                  }
+                });
+              } else {
+                handleSearch(createRequestDTO(editedSearchRequest));
+              }
             }}
             color="primary"
           >