Merge pull request #5464 from bcgov/test-marshal-JC-FOIMOD-2981

FOIMOD-2981 Fix issue on validation to display Communication tab and …
bcgov · Dec 4, 2024 · 68f92b9 · 68f92b9
2 parents 317304f + 790a3af
commit 68f92b9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js b/forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js
@@ -1078,15 +1078,6 @@ const FOIRequest = React.memo(({ userDetail, openApplicantProfileModal }) => {
     );
   };
 
-  const showContactApplicantTab = () => {
-    return (
-      // requestState !== StateEnum.intakeinprogress.name &&
-      // requestState !== StateEnum.unopened.name &&
-      // requestState !== StateEnum.open.name &&
-      // requestState !== StateEnum.appfeeowing.name &&
-      requestDetails?.requestType === FOI_COMPONENT_CONSTANTS.REQUEST_TYPE_GENERAL)
-  }
-
   const getHistoryCount = () => {
     let historyCount= applicantCorrespondence.length + requestNotes.filter(
             c => c.commentTypeId !== getCommentTypeIdByName(commentTypes, "Ministry Internal") &&
@@ -1208,7 +1199,7 @@ const FOIRequest = React.memo(({ userDetail, openApplicantProfileModal }) => {
                     Records
                   </div>
                 )}
-                {showContactApplicantTab() && (
+                {
                   <div
                     className={clsx("tablinks", {
                       active: tabLinksStatuses.ContactApplicant.active,
@@ -1221,7 +1212,7 @@ const FOIRequest = React.memo(({ userDetail, openApplicantProfileModal }) => {
                       ? `(${applicantCorrespondence.length})`
                       : ""}
                   </div>
-                )}
+                }
               </>
             )}
             <div
@@ -1751,7 +1742,7 @@ const FOIRequest = React.memo(({ userDetail, openApplicantProfileModal }) => {
               </>
             )}
           </div>
-          {showContactApplicantTab() && (
+          {
             <div
               id="ContactApplicant"
               className={clsx("tabcontent", {
@@ -1778,7 +1769,7 @@ const FOIRequest = React.memo(({ userDetail, openApplicantProfileModal }) => {
                 <Loading />
               )}
             </div>
-          )}
+          }
           <div
             id="RequestHistory"
             className={clsx("tabcontent", {

diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.scss b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.scss
@@ -16,6 +16,15 @@
   }
 }
 
+.addCorrespondence-menuitem {
+  li.MuiMenuItem-root {
+    background-color: #FFF !important; 
+    &:hover,
+    &:focus {
+      background-color: #e3f2fd !important;
+    }
+  }
+}
 
 .previewEmail {
   float: right;

diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx
@@ -967,6 +967,7 @@ export const ContactApplicant = ({
             size="small"
             fullWidth
           >
+            <div className="addCorrespondence-menuitem">
             <MenuItem
               onClick={() => addCorrespondence()}
               key='messagetoapplicant'
@@ -983,6 +984,7 @@ export const ContactApplicant = ({
             >
               Attach Response
             </MenuItem>
+            </div>
           </TextField>
         </Grid>
       </Grid>