Replace history with window.location (#67)

Signed-off-by: Aravinda Vishwanathapura <[email protected]>
kadalu · Jan 14, 2023 · eafea52 · eafea52
1 parent 1e53b7c
commit eafea52
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/ui/src/pages/bricks.jsx b/ui/src/pages/bricks.jsx
@@ -65,7 +65,7 @@ export function Bricks({ history }) {
              })
              .catch(err => {
                  if (err.response.status === 403) {
-                     history.push('/login');
+                     window.location = '/login';
                  } else {
                      setLoading(false);
                      setError("Failed to get data from the server(HTTP Status: " + err.response.status + ")");

diff --git a/ui/src/pages/dashboard.jsx b/ui/src/pages/dashboard.jsx
@@ -38,11 +38,11 @@ function dashboardUI(history, volumes, peers) {
     }
     return (
         <div className="">
-            <Box label="Peers" value={upPeers + ' / ' + peers.length} onClick={() => history.push('/peers')}/>
-            <Box label="Volumes" value={upVolumes + ' / ' + volumes.length} onClick={() => history.push('/volumes')}/>
-            <Box label="Bricks" value={upBricks + ' / ' + numBricks} onClick={() => history.push('/bricks')}/>
+            <Box label="Peers" value={upPeers + ' / ' + peers.length} onClick={() => window.location = '/peers'}/>
+            <Box label="Volumes" value={upVolumes + ' / ' + volumes.length} onClick={() => window.location = '/volumes'}/>
+            <Box label="Bricks" value={upBricks + ' / ' + numBricks} onClick={() => window.location = '/bricks'}/>
         </div>
-    );
+);
 }
 
 export function Dashboard({ history }) {
@@ -64,7 +64,7 @@ export function Dashboard({ history }) {
              })
              .catch(err => {
                  if (err.response.status === 403) {
-                     history.push('/login');
+                     window.location = '/login';
                  } else {
                      setLoading(false);
                      setError("Failed to get data from the server(HTTP Status: " + err.response.status + ")");
@@ -77,7 +77,7 @@ export function Dashboard({ history }) {
              })
              .catch(err => {
                  if (err.response.status === 403) {
-                     history.push('/login');
+                     window.location = '/login';
                  }
              });
     }, [refreshRequired, history]);

diff --git a/ui/src/pages/login.jsx b/ui/src/pages/login.jsx
@@ -18,7 +18,7 @@ export function Login({ history }) {
     useEffect(() => {
         axios.get("/api/login")
              .then((resp) => {
-                 history.push('/dashboard');
+                 window.location = '/dashboard';
              });
     }, [history]);
 
@@ -36,7 +36,7 @@ export function Login({ history }) {
             username: username,
             password: password
         }).then(res => {
-            history.push('/dashboard');
+            window.location = '/dashboard';
         }).catch(err => {
             if (err.response.status === 403) {
                 setError("Invalid username/password");

diff --git a/ui/src/pages/logout.jsx b/ui/src/pages/logout.jsx
@@ -10,7 +10,7 @@ export function Logout({ history }) {
              .then((resp) => {
                  setMessage("Logged out Successfully...");
                  setInterval(() => {
-                     history.push('/login');
+                     window.location = '/login';
                  }, 2000);
              }).catch(err => {
                  setError("Failed to get data from the server(HTTP Status: " + err.response.status + ")");

diff --git a/ui/src/pages/peers.jsx b/ui/src/pages/peers.jsx
@@ -61,7 +61,7 @@ export function Peers({ history }) {
              })
              .catch(err => {
                  if (err.response.status === 403) {
-                     history.push('/login');
+                     window.location = '/login';
                  } else {
                      setLoading(false);
                      setError("Failed to get data from the server(HTTP Status: " + err.response.status + ")");

diff --git a/ui/src/pages/volumeDetail.jsx b/ui/src/pages/volumeDetail.jsx
@@ -134,7 +134,7 @@ export function VolumeDetail({ history }) {
              })
              .catch(err => {
                  if (err.response.status === 403) {
-                     history.push('/login');
+                     window.location = '/login';
                  } else {
                      setLoading(false);
                      setError("Failed to get data from the server(HTTP Status: " + err.response.status + ")");

diff --git a/ui/src/pages/volumes.jsx b/ui/src/pages/volumes.jsx
@@ -59,7 +59,7 @@ export function Volumes({ history }) {
              })
              .catch(err => {
                  if (err.response.status === 403) {
-                     history.push('/login');
+                     window.location = '/login';
                  } else {
                      setLoading(false);
                      setError("Failed to get data from the server(HTTP Status: " + err.response.status + ")");