fix goBack precedence (ohcnetwork#6285)

* fix go back precedence * fixes ohcnetwork#6233
yogeshbhutkar · Sep 14, 2023 · 2956fa9 · 2956fa9
1 parent cc6b570
commit 2956fa9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Common/hooks/useAppHistory.ts b/src/Common/hooks/useAppHistory.ts
@@ -10,12 +10,13 @@ export default function useAppHistory() {
   const resetHistory = useContext(ResetHistoryContext);
 
   const goBack = (fallbackUrl?: string) => {
-    if (fallbackUrl)
-      // use provided fallback url if provided.
-      return navigate(fallbackUrl);
     if (history.length > 1)
       // Otherwise, navigate to history present in the app navigation history stack.
       return navigate(history[1]);
+
+    if (fallbackUrl)
+      // use provided fallback url if provided.
+      return navigate(fallbackUrl);
     // Otherwise, fallback to browser's go back behaviour.
     window.history.back();
   };

diff --git a/src/Components/Assets/AssetType/ONVIFCamera.tsx b/src/Components/Assets/AssetType/ONVIFCamera.tsx
@@ -42,6 +42,7 @@ const ONVIFCamera = (props: ONVIFCameraProps) => {
   const [refreshPresetsHash, setRefreshPresetsHash] = useState(
     Number(new Date())
   );
+  const [refreshHash, setRefreshHash] = useState(Number(new Date()));
   const dispatch = useDispatch<any>();
 
   useEffect(() => {
@@ -89,7 +90,7 @@ const ONVIFCamera = (props: ONVIFCameraProps) => {
         Notification.Success({
           msg: "Asset Configured Successfully",
         });
-        window.location.reload();
+        setRefreshHash(Number(new Date()));
       } else {
         Notification.Error({
           msg: "Something went wrong..!",
@@ -200,6 +201,7 @@ const ONVIFCamera = (props: ONVIFCameraProps) => {
 
       {assetType === "ONVIF" ? (
         <CameraConfigure
+          key={refreshHash}
           asset={asset as AssetData}
           bed={bed}
           setBed={setBed}