Merge pull request #4817 from bcgov/dev-rook-ST-4671-4677

Dev rook st 4671 4677
bcgov · Dec 1, 2023 · e51e859 · e51e859
2 parents f59adde + cb95b33
commit e51e859
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/forms-flow-web/src/components/FOI/FOIRequest/OIPCDetails/oipcHook.js b/forms-flow-web/src/components/FOI/FOIRequest/OIPCDetails/oipcHook.js
@@ -32,10 +32,12 @@ const useOIPCHook = () => {
   }
   const [oipcData, setOipcData] = useState(requestDetails.oipcdetails);
   const [isOIPCReview, setIsOIPCReview] = useState(requestDetails.isoipcreview);
-
+  const [resettoInitial, setResettoInitial] = useState(false);
   useEffect(() => {
+    if (resettoInitial == false) {
     const stagedOIPCData = stageOIPCData(isOIPCReview, requestDetails.oipcdetails);
     setOipcData(stagedOIPCData);
+    }
   }, [isOIPCReview])
 
   //OIPC Functions
@@ -59,11 +61,17 @@ const useOIPCHook = () => {
     })
   }
   const removeOIPC = (oipcId) => {
+    if (oipcData.length == 1) {
+      setOipcData([]);  
+      setResettoInitial(true)
+    }
+    else {
     setOipcData((prev) => {
       const previousOIPCData = [...prev];
-      return previousOIPCData.filter(oipc => oipcId !== oipc.id);
+      return previousOIPCData.filter(oipc => oipcId !== oipc.id);     
     });
   }
+  }
   const updateOIPC = (newOIPCObj) => {
     setOipcData((prev) => {
       const previousOIPCData = [...prev];

diff --git a/forms-flow-web/src/components/FOI/customComponents/requestflag.scss b/forms-flow-web/src/components/FOI/customComponents/requestflag.scss
@@ -1,6 +1,5 @@
 .request-flag {
 
-    margin-left: -50px;
     padding-top: 50px;
 
     .request-flag-dropdown-all {