contentoh-components-library 21.1.84 → 21.1.87

package/src/global-files/customHooks.js

@@ -1,25 +1,24 @@
 import { useState } from "react";
 import { useEffect } from "react";
 
-export const closeModals = (id) => {
+export const useCloseModal = (id) => {
   const [showModal, setShowModal] = useState(false);
 
+  const closeModal = (e) => {
+    e.stopPropagation();
+    e.preventDefault();
+    if (!e.target.closest(`#${id}`) && showModal) {
+      document.removeEventListener("click", closeModal, false);
+      setShowModal(false);
+    }
+  };
   useEffect(() => {
-    const closeModal = (e) => {
-      if (
-        (!e.target.closest(`#${id}`) ||
-          e.target.closest("#close-button") ||
-          e.target.closest("#add-version")) &&
-        showModal
-      ) {
-        document.removeEventListener("click", closeModal);
-        setShowModal(false);
-      }
-    };
-
     if (showModal) {
-      document.addEventListener("click", closeModal);
+      document.addEventListener("click", closeModal, false);
     }
+    return () => {
+      document.removeEventListener("click", closeModal, false);
+    };
   }, [showModal]);
 
   return [showModal, setShowModal];

package/src/global-files/data.js

@@ -195,6 +195,7 @@ export const fetchUsers = async (auth) => {
 export const getNewStatus = (statusArray) => {
   let lookupString = "";
   statusArray.forEach((element) => (lookupString += element + "/"));
+  if (lookupString.includes("AS")) return "AS";
   if (lookupString.includes("RCA")) return "RCA";
   if (lookupString.includes("RC")) return "RC";
   if (lookupString.includes("RA")) return "RA";