#1289 | fix: navigation with useHistory

src/adminApp/Organisation.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import {
   BooleanField,
   Datagrid,
@@ -32,7 +32,7 @@ import { AvniSelect } from "../common/components/AvniSelect";
 import MenuItem from "@material-ui/core/MenuItem";
 import useGetData from "../custom-hooks/useGetData";
 import httpClient from "../common/utils/httpClient";
-import { Redirect } from "react-router-dom";
+import { useHistory } from "react-router-dom";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
 
@@ -209,14 +209,21 @@ export const OrganisationCreateComponent = ({ showNotification }) => {
     categoryId: null,
     statusId: null
   });
-
+  //todo clear errors
   const [errors, setErrors] = useState({});
   const [redirect, setRedirect] = useState(false);
 
   const [category, categoryError] = useGetData("/organisationCategory");
   const [status, statusError] = useGetData("/organisationStatus");
   const categoryList = category ? category._embedded.organisationCategory.map(ele => ele) : [];
   const statusList = status ? status._embedded.organisationStatus.map(ele => ele) : [];
+  const history = useHistory();
+
+  useEffect(() => {
+    if (redirect) {
+      history.push("/admin/organisation");
+    }
+  }, [redirect]);
 
   const handleChange = (property, value) => {
     setData(currentData => ({ ...currentData, [property]: value }));
@@ -290,10 +297,6 @@ export const OrganisationCreateComponent = ({ showNotification }) => {
     );
   }
 
-  if (redirect) {
-    return <Redirect to={"/admin/organisation"} />;
-  }
-
   return (
     <>
       <Box boxShadow={2} p={2} bgcolor="background.paper">