Merge pull request #478 from egovernments/DPG-2197

SM-3889: TQM ADMIN SESSION FIX
egovernments · Feb 2, 2024 · e77d3e5 · e77d3e5
2 parents 84f5216 + 0c8c03e
commit e77d3e5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/...internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js b/...internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js
@@ -36,6 +36,14 @@ const Create = () => {
     setFormSession(sessionFormData)
   },[sessionFormData])
 
+  useEffect(()=> {
+    return () => {
+      if(!location.pathname.includes("tqm")){
+        sessionStorage.removeItem("Digit.CREATE_ADHOC_TEST")
+      }
+    }
+  },[])
+
   const onFormValueChange = (setValue, formData, formState, reset, setError, clearErrors, trigger, getValues) => {
     const temp = JSON.parse(sessionStorage.getItem("Digit.CREATE_ADHOC_TEST"))
     if(!temp && _.isEmpty(formData?.TestStandard)) return;

diff --git a/...cro-ui-internals/packages/modules/tqm/src/pages/employee/search-test-results/TqmSearch.js b/...cro-ui-internals/packages/modules/tqm/src/pages/employee/search-test-results/TqmSearch.js
@@ -1,4 +1,4 @@
-import React, {useMemo} from "react";
+import React, {useEffect, useMemo} from "react";
 import { useTranslation } from "react-i18next";
 import { Header, InboxSearchComposer,Loader } from "@egovernments/digit-ui-react-components";
 import { tqmSearchConfigPlantOperator } from "./configPlantOperator";
@@ -8,6 +8,7 @@ const TqmSearch = () => {
     // Hook calling to enable scroll persistent 
     const scrollPosition = Digit.Hooks.useScrollPersistence();
     const configModuleName = Digit.Utils.getConfigModuleName()
+    const isUlbAdminLoggedIn = Digit.Utils.tqm.isUlbAdminLoggedIn()
     const tenant = Digit.ULBService.getStateId();
     const { isLoading, data } = Digit.Hooks.useCustomMDMS(
         tenant,
@@ -62,6 +63,13 @@ const TqmSearch = () => {
         ),[data]);
 
     const tqmSearchSession = Digit.Hooks.useSessionStorage("TQM_SEARCH_SESSION", {})
+    useEffect(()=> {
+      return () => {
+        if(!location.pathname.includes("tqm") && isUlbAdminLoggedIn){
+          sessionStorage.removeItem("Digit.TQM_SEARCH_SESSION")
+        }
+      }
+    },[])
     if (isLoading) return <Loader />
     return (
         <React.Fragment>

diff --git a/.../micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js b/.../micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js
@@ -143,6 +143,9 @@ const InboxSearchComposer = ({configs,scrollPosition,browserSession}) => {
         return () => {
             revalidate();
             setEnable(false);
+            if(!location.pathname.includes("tqm") && Digit.Utils.tqm.isUlbAdminLoggedIn()){
+                sessionStorage.removeItem("Digit.TQM_INBOX_SESSION")
+            }
         };
     });