From 21eead9b465a967080d510c28a906b12a770594c Mon Sep 17 00:00:00 2001 From: nabeelmd-eGov Date: Fri, 2 Feb 2024 16:26:31 +0530 Subject: [PATCH 1/2] DPG-2197: Adhoc session fixes --- .../add-test-results/CreateAddTestResult.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js index 5589a4e080..ef78b83830 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js @@ -30,9 +30,16 @@ const Create = () => { const CreateAdhocTestSession = Digit.Hooks.useSessionStorage("CREATE_ADHOC_TEST", {}); const [sessionFormData,setSessionFormData, clearSessionFormData] = CreateAdhocTestSession; - + const [formSession, setFormSession] = useState(sessionFormData); + + useEffect(() => { + setFormSession(sessionFormData) + },[sessionFormData]) + const onFormValueChange = (setValue, formData, formState, reset, setError, clearErrors, trigger, getValues) => { - if (!_.isEqual(sessionFormData, formData)) { + const temp = JSON.parse(sessionStorage.getItem("Digit.CREATE_ADHOC_TEST")) + if(!temp && _.isEmpty(formData?.TestStandard)) return; + if (!_.isEqual(temp?.value, formData)) { if(Object.keys(sessionFormData)?.length===0){ setSessionFormData({ ...formData }); }else{ @@ -112,7 +119,7 @@ const Create = () => { }; })} - defaultValues={sessionFormData} + defaultValues={formSession} onSubmit={onSubmit} fieldStyle={{ marginRight: 0 }} noBreakLine={true} From 7ca4241d85a9bad750b52467169ee18189992514 Mon Sep 17 00:00:00 2001 From: nabeelmd-eGov Date: Fri, 2 Feb 2024 17:25:07 +0530 Subject: [PATCH 2/2] SM-3889: TQM ADMIN session fixes --- .../employee/add-test-results/CreateAddTestResult.js | 8 ++++++++ .../pages/employee/search-test-results/TqmSearch.js | 10 +++++++++- .../react-components/src/hoc/InboxSearchComposer.js | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js index ef78b83830..5a5e61ea38 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/add-test-results/CreateAddTestResult.js +++ b/frontend/micro-ui/web/micro-ui-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/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/search-test-results/TqmSearch.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/search-test-results/TqmSearch.js index dadbb41388..7eac3c939b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tqm/src/pages/employee/search-test-results/TqmSearch.js +++ b/frontend/micro-ui/web/micro-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 return ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js index da9b73c39d..294d40fbaf 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js +++ b/frontend/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") + } }; });