Merge issue with Download packages and consult fixed

bcgov · Nov 14, 2024 · 27e50e5 · 27e50e5
1 parent 45a5055
commit 27e50e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/web/src/components/FOI/Home/CreateResponsePDF/useSaveRedlineForSignOff.js b/web/src/components/FOI/Home/CreateResponsePDF/useSaveRedlineForSignOff.js
@@ -1287,15 +1287,15 @@ const useSaveRedlineForSignoff = (initDocInstance, initDocViewer) => {
         isOILayerSelected;
     }
   };
-  const checkSavingConsults = (documentList, instance) => {
+  const checkSavingConsults = (documentList, isOILayerSelected, instance) => {
     const publicBodyList = getPublicBodyList(documentList);
     setDocumentPublicBodies(publicBodyList);
     setEnableSavingConsults(
-      publicBodyList.length > 0
+      publicBodyList.length > 0 || !isOILayerSelected
     );
     if (instance) {
       const document = instance.UI.iframeWindow.document;
-      document.getElementById("consult_package").disabled = !(publicBodyList.length > 0);
+      document.getElementById("consult_package").disabled = !(publicBodyList.length > 0) || isOILayerSelected;
     }
   }
   const triggerRedlineZipper = (

diff --git a/web/src/components/FOI/Home/Redlining.js b/web/src/components/FOI/Home/Redlining.js
@@ -1432,10 +1432,7 @@ const Redlining = React.forwardRef(
       const redlineReadyAndValid = readyForSignOff && validRedlineDownload;
       const isOILayerSelected = currentLayer.name.toLowerCase() == "open info" ? true : false;
       const oipcRedlineReadyAndValid = (validoipcreviewlayer === true && currentLayer.name.toLowerCase() === "oipc") && readyForSignOff;
-      checkSavingConsults(documentList, _instance);
-      checkSavingRedline(redlineReadyAndValid, _instance);
-      checkSavingOIPCRedline(oipcRedlineReadyAndValid, _instance, readyForSignOff);
-      checkSavingFinalPackage(redlineReadyAndValid, _instance);
+      checkSavingConsults(documentList, isOILayerSelected, _instance);
       checkSavingRedline(redlineReadyAndValid, isOILayerSelected, _instance);
       checkSavingOIPCRedline(oipcRedlineReadyAndValid, isOILayerSelected, _instance, readyForSignOff);
       checkSavingFinalPackage(redlineReadyAndValid, isOILayerSelected, _instance);