From 73a2c649cbc53dfad6781c514ed0ed823f7fba1d Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Thu, 6 May 2021 14:16:59 +0200
Subject: [PATCH] Replace hacky refetchTrigger with useAsyncFn

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .../ResponseStepDialog/ResponseStepDialog.tsx      |  4 ++--
 .../src/contexts/RefetchContext.ts                 |  8 ++------
 .../git-release-manager/src/features/Features.tsx  |  6 ++----
 .../src/hooks/useGetGitBatchInfo.ts                | 14 +++++++++-----
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/plugins/git-release-manager/src/components/ResponseStepDialog/ResponseStepDialog.tsx b/plugins/git-release-manager/src/components/ResponseStepDialog/ResponseStepDialog.tsx
index d504ffec70..52ae3e68c0 100644
--- a/plugins/git-release-manager/src/components/ResponseStepDialog/ResponseStepDialog.tsx
+++ b/plugins/git-release-manager/src/components/ResponseStepDialog/ResponseStepDialog.tsx
@@ -40,7 +40,7 @@ export const ResponseStepDialog = ({
   responseSteps,
   title,
 }: DialogProps) => {
-  const { setRefetchTrigger } = useRefetchContext();
+  const { fetchGitBatchInfo } = useRefetchContext();
 
   return (
     <MaterialDialog
@@ -60,7 +60,7 @@ export const ResponseStepDialog = ({
 
       <DialogActions style={{ padding: 20 }}>
         <Button
-          onClick={() => setRefetchTrigger(Date.now())}
+          onClick={() => fetchGitBatchInfo()}
           disabled={progress < 100}
           variant="contained"
           size="large"
diff --git a/plugins/git-release-manager/src/contexts/RefetchContext.ts b/plugins/git-release-manager/src/contexts/RefetchContext.ts
index 24867ca7c9..9545944a30 100644
--- a/plugins/git-release-manager/src/contexts/RefetchContext.ts
+++ b/plugins/git-release-manager/src/contexts/RefetchContext.ts
@@ -19,11 +19,7 @@ import { createContext, useContext } from 'react';
 import { GitReleaseManagerError } from '../errors/GitReleaseManagerError';
 
 export const RefetchContext = createContext<
-  | {
-      refetchTrigger: number;
-      setRefetchTrigger: React.Dispatch<React.SetStateAction<number>>;
-    }
-  | undefined
+  { fetchGitBatchInfo: () => any } | undefined
 >(undefined);
 
 export const useRefetchContext = () => {
@@ -34,6 +30,6 @@ export const useRefetchContext = () => {
   }
 
   return {
-    setRefetchTrigger: refetch.setRefetchTrigger,
+    fetchGitBatchInfo: refetch.fetchGitBatchInfo,
   };
 };
diff --git a/plugins/git-release-manager/src/features/Features.tsx b/plugins/git-release-manager/src/features/Features.tsx
index 6f2d56c4d2..874271aca0 100644
--- a/plugins/git-release-manager/src/features/Features.tsx
+++ b/plugins/git-release-manager/src/features/Features.tsx
@@ -37,11 +37,9 @@ export function Features({
 }) {
   const pluginApiClient = useApi(gitReleaseManagerApiRef);
   const { project } = useProjectContext();
-  const [refetchTrigger, setRefetchTrigger] = useState(0);
-  const { gitBatchInfo } = useGetGitBatchInfo({
+  const { gitBatchInfo, fetchGitBatchInfo } = useGetGitBatchInfo({
     pluginApiClient,
     project,
-    refetchTrigger,
   });
 
   const { versioningStrategyMatches } = useVersioningStrategyMatchesRepoTags({
@@ -90,7 +88,7 @@ export function Features({
   }
 
   return (
-    <RefetchContext.Provider value={{ refetchTrigger, setRefetchTrigger }}>
+    <RefetchContext.Provider value={{ fetchGitBatchInfo }}>
       <ErrorBoundary>
         {gitBatchInfo.value.latestRelease && !versioningStrategyMatches && (
           <Alert severity="warning" style={{ marginBottom: 20 }}>
diff --git a/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts b/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts
index 74f31a4ee3..39935b7a6a 100644
--- a/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts
+++ b/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { useAsync } from 'react-use';
+import { useEffect } from 'react';
+import { useAsyncFn } from 'react-use';
 
 import { GitReleaseApi } from '../api/GitReleaseClient';
 import { Project } from '../contexts/ProjectContext';
@@ -22,15 +23,13 @@ import { Project } from '../contexts/ProjectContext';
 interface GetGitBatchInfo {
   project: Project;
   pluginApiClient: GitReleaseApi;
-  refetchTrigger: number;
 }
 
 export const useGetGitBatchInfo = ({
   project,
   pluginApiClient,
-  refetchTrigger,
 }: GetGitBatchInfo) => {
-  const gitBatchInfo = useAsync(async () => {
+  const [gitBatchInfo, fetchGitBatchInfo] = useAsyncFn(async () => {
     const [{ repository }, { latestRelease }] = await Promise.all([
       pluginApiClient.getRepository({
         owner: project.owner,
@@ -61,9 +60,14 @@ export const useGetGitBatchInfo = ({
       releaseBranch,
       repository,
     };
-  }, [project, refetchTrigger]);
+  });
+
+  useEffect(() => {
+    fetchGitBatchInfo();
+  }, [fetchGitBatchInfo, project]);
 
   return {
     gitBatchInfo,
+    fetchGitBatchInfo,
   };
 };