From a420d0ac364a2b97036f585c18b9f3781864f37a Mon Sep 17 00:00:00 2001
From: Roberto Jimenez Sanchez <roberto.jimenez@grafana.com>
Date: Wed, 12 Mar 2025 11:18:14 +0100
Subject: [PATCH] Revert "Use useAsync for JobStep steps"

This reverts commit 242a275cc94a2f4d61eb338d7e56e7186357a3ae.
---
 .betterer.results                             |   6 +-
 .../app/features/provisioning/JobStatus.tsx   |   2 +-
 .../features/provisioning/Wizard/JobStep.tsx  | 110 ++++++++++++------
 .../features/provisioning/Wizard/PullStep.tsx |   7 +-
 4 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/.betterer.results b/.betterer.results
index 027526239f6..ee807040ee7 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -5900,14 +5900,14 @@ exports[`better eslint`] = {
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "21"],
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "22"]
     ],
+    "public/app/features/provisioning/Wizard/JobStep.tsx:5381": [
+      [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"]
+    ],
     "public/app/features/provisioning/Wizard/MigrateStep.tsx:5381": [
       [0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "0"],
       [0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "1"],
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"]
     ],
-    "public/app/features/provisioning/Wizard/PullStep.tsx:5381": [
-      [0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "0"]
-    ],
     "public/app/features/provisioning/Wizard/Stepper.tsx:5381": [
       [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"]
     ],
diff --git a/public/app/features/provisioning/JobStatus.tsx b/public/app/features/provisioning/JobStatus.tsx
index 823bcd473e6..15faee89603 100644
--- a/public/app/features/provisioning/JobStatus.tsx
+++ b/public/app/features/provisioning/JobStatus.tsx
@@ -39,7 +39,7 @@ export function JobStatus({ name, onStatusChange, onRunningChange, onErrorChange
     }
   }, [job, onStatusChange, onErrorChange, onRunningChange]);
 
-  if (!name || jobQuery.isLoading || !job) {
+  if (jobQuery.isLoading || !job) {
     return (
       <Stack direction="row" alignItems="center" justifyContent="center" gap={2}>
         <Spinner size={24} />
diff --git a/public/app/features/provisioning/Wizard/JobStep.tsx b/public/app/features/provisioning/Wizard/JobStep.tsx
index 554806679f8..73c60755e55 100644
--- a/public/app/features/provisioning/Wizard/JobStep.tsx
+++ b/public/app/features/provisioning/Wizard/JobStep.tsx
@@ -1,10 +1,11 @@
-import { ReactNode, useState } from 'react';
+import { skipToken } from '@reduxjs/toolkit/query';
+import { ReactNode, useEffect, useRef, useState } from 'react';
 import { useFormContext } from 'react-hook-form';
-import { useAsync } from 'react-use';
 
-import { Stack, Text } from '@grafana/ui';
+import { Box, Spinner, Stack, Text } from '@grafana/ui';
 
 import { JobStatus } from '../JobStatus';
+import { useListJobQuery } from '../api';
 import { StepStatus, useStepStatus } from '../hooks/useStepStatus';
 
 import { WizardFormData } from './types';
@@ -19,59 +20,92 @@ interface JobStepProps {
 export type { JobStepProps };
 
 export function JobStep({ onStepUpdate, description, startJob, children }: JobStepProps) {
+  const hasInitialized = useRef(false);
   const { watch } = useFormContext<WizardFormData>();
   const repositoryName = watch('repositoryName');
   const stepStatus = useStepStatus({ onStepUpdate });
   const [jobName, setJobName] = useState<string>();
 
-  useAsync(async () => {
-    if (!repositoryName) {
+  // Query the job status if we have a job name
+  const jobQuery = useListJobQuery(jobName ? { watch: true, fieldSelector: `metadata.name=${jobName}` } : skipToken);
+
+  useEffect(() => {
+    if (!repositoryName || hasInitialized.current) {
       return;
     }
 
-    try {
-      stepStatus.setRunning();
-      const response = await startJob(repositoryName);
+    hasInitialized.current = true;
+    let isMounted = true;
 
-      if (!response?.metadata?.name) {
-        stepStatus.setError('Invalid response from operation');
-        throw new Error('Invalid response from operation');
+    const executeJob = async () => {
+      try {
+        if (!isMounted) {
+          return;
+        }
+
+        stepStatus.setRunning();
+        const response = await startJob(repositoryName);
+
+        if (!response?.metadata?.name) {
+          stepStatus.setError('Invalid response from operation');
+          return;
+        }
+        setJobName(response.metadata.name);
+      } catch (error) {
+        if (!isMounted) {
+          return;
+        }
+        stepStatus.setError(error instanceof Error ? error.message : 'Failed to start operation');
       }
+    };
 
-      setJobName(response.metadata.name);
-    } catch (error) {
-      stepStatus.setError(error instanceof Error ? error.message : 'Failed to start operation');
-      throw error; // Re-throw to mark the async operation as failed
-    }
+    executeJob();
+    return () => {
+      isMounted = false;
+    };
   }, [repositoryName, startJob, stepStatus]);
 
+  const job = jobQuery.data?.items?.[0];
+  const showSpinner = !job;
+
   return (
     <Stack direction="column" gap={2}>
       {description && <Text color="secondary">{description}</Text>}
       {children}
 
-      {jobName && (
-        <JobStatus
-          name={jobName}
-          onStatusChange={(success) => {
-            if (success) {
-              stepStatus.setSuccess();
-            } else {
-              stepStatus.setError('Job failed');
-            }
-          }}
-          onRunningChange={(isRunning) => {
-            if (isRunning) {
-              stepStatus.setRunning();
-            }
-          }}
-          onErrorChange={(error) => {
-            if (error) {
-              stepStatus.setError(error);
-            }
-          }}
-        />
-      )}
+      <Box>
+        {showSpinner && (
+          <Stack direction="row" alignItems="center" gap={2}>
+            <Spinner size={24} />
+            <Text element="h4" weight="bold">
+              Starting...
+            </Text>
+          </Stack>
+        )}
+
+        {job && (
+          <JobStatus
+            name={jobName!}
+            onStatusChange={(success) => {
+              if (success) {
+                stepStatus.setSuccess();
+              } else {
+                stepStatus.setError('Job failed');
+              }
+            }}
+            onRunningChange={(isRunning) => {
+              if (isRunning) {
+                stepStatus.setRunning();
+              }
+            }}
+            onErrorChange={(error) => {
+              if (error) {
+                stepStatus.setError(error);
+              }
+            }}
+          />
+        )}
+      </Box>
     </Stack>
   );
 }
diff --git a/public/app/features/provisioning/Wizard/PullStep.tsx b/public/app/features/provisioning/Wizard/PullStep.tsx
index 34fda60bdab..3d7f1d1791a 100644
--- a/public/app/features/provisioning/Wizard/PullStep.tsx
+++ b/public/app/features/provisioning/Wizard/PullStep.tsx
@@ -1,3 +1,5 @@
+import { ReactNode } from 'react';
+
 import { useCreateRepositorySyncMutation } from '../api';
 import { StepStatus } from '../hooks/useStepStatus';
 
@@ -5,9 +7,10 @@ import { JobStep } from './JobStep';
 
 interface PullStepProps {
   onStepUpdate: (status: StepStatus, error?: string) => void;
+  description?: ReactNode;
 }
 
-export function PullStep({ onStepUpdate }: PullStepProps) {
+export function PullStep({ onStepUpdate, description }: PullStepProps) {
   const [syncRepo] = useCreateRepositorySyncMutation();
 
   const startSync = async (repositoryName: string) => {
@@ -21,7 +24,7 @@ export function PullStep({ onStepUpdate }: PullStepProps) {
   return (
     <JobStep
       onStepUpdate={onStepUpdate}
-      description="Pulling all content from your repository to this Grafana instance. This ensures your dashboards and other resources are synchronized with the repository."
+      description={description || 'Pulling repository content...'}
       startJob={startSync}
     />
   );