From 87d6c57174df7c734a7d02ef33f40955dbe6747c Mon Sep 17 00:00:00 2001
From: regexowl <ksimicko@redhat.com>
Date: Tue, 11 Feb 2025 15:24:04 +0100
Subject: [PATCH] Wizard: Fix nav status icon

Status icon rendered only when the step was previously visited, this caused problems with imported blueprints.

How to reproduce a bug:
1. import a blueprint with invalid hostname
2. skip to Review

Current behaviour:
- the Create blueprint button is disabled, but there is no indication of error next to the Hostname step in navigation

After fix:
- the error status should be rendered next to the Hostname nav item
---
 .../CreateImageWizard/CreateImageWizard.tsx   |  6 ++--
 .../utilities/useValidation.tsx               | 33 +++++++++++++------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/Components/CreateImageWizard/CreateImageWizard.tsx b/src/Components/CreateImageWizard/CreateImageWizard.tsx
index 18f3e2d7..1930fb43 100644
--- a/src/Components/CreateImageWizard/CreateImageWizard.tsx
+++ b/src/Components/CreateImageWizard/CreateImageWizard.tsx
@@ -282,16 +282,14 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => {
     );
 
     // Only this code is different from the original
-    const status =
-      (step.isVisited && step.id !== activeStep?.id && step.status) ||
-      'default';
+    const status = (step.id !== activeStep.id && step.status) || 'default';
 
     return (
       <WizardNavItem
         key={step.id}
         id={step.id}
         content={step.name}
-        isCurrent={activeStep?.id === step.id}
+        isCurrent={activeStep.id === step.id}
         isDisabled={
           step.isDisabled ||
           (isVisitRequired && !step.isVisited && !hasVisitedNextStep)
diff --git a/src/Components/CreateImageWizard/utilities/useValidation.tsx b/src/Components/CreateImageWizard/utilities/useValidation.tsx
index 88633103..0f4facd8 100644
--- a/src/Components/CreateImageWizard/utilities/useValidation.tsx
+++ b/src/Components/CreateImageWizard/utilities/useValidation.tsx
@@ -4,7 +4,10 @@ import { UNIQUE_VALIDATION_DELAY } from '../../../constants';
 import { useLazyGetBlueprintsQuery } from '../../../store/backendApi';
 import { useAppSelector } from '../../../store/hooks';
 import { BlueprintsResponse } from '../../../store/imageBuilderApi';
-import { useShowActivationKeyQuery } from '../../../store/rhsmApi';
+import {
+  useListActivationKeysQuery,
+  useShowActivationKeyQuery,
+} from '../../../store/rhsmApi';
 import {
   selectBlueprintId,
   selectBlueprintName,
@@ -78,14 +81,24 @@ export function useRegistrationValidation(): StepValidation {
   const registrationType = useAppSelector(selectRegistrationType);
   const activationKey = useAppSelector(selectActivationKey);
 
-  const { isFetching, isError } = useShowActivationKeyQuery(
-    { name: activationKey! },
-    {
-      skip: !activationKey,
-    }
-  );
+  const {
+    isUninitialized,
+    isFetching: isFetchingKeys,
+    isError: isErrorKeys,
+  } = useListActivationKeysQuery();
+
+  const { isFetching: isFetchingKeyInfo, isError: isErrorKeyInfo } =
+    useShowActivationKeyQuery(
+      { name: activationKey! },
+      {
+        skip: !activationKey,
+      }
+    );
 
   if (registrationType !== 'register-later' && !activationKey) {
+    if (isUninitialized || isFetchingKeys || !isErrorKeys) {
+      return { errors: {}, disabledNext: false };
+    }
     return {
       errors: { activationKey: 'No activation key selected' },
       disabledNext: true,
@@ -95,7 +108,7 @@ export function useRegistrationValidation(): StepValidation {
   if (
     registrationType !== 'register-later' &&
     activationKey &&
-    (isFetching || isError)
+    (isFetchingKeyInfo || isErrorKeyInfo)
   ) {
     return {
       errors: { activationKey: 'Invalid activation key' },
@@ -404,13 +417,13 @@ export function useDetailsValidation(): StepValidation {
   }, [blueprintId, name, setUniqueName, trigger, nameValid]);
 
   let nameError = '';
-  if (!nameValid) {
+  if (name && !nameValid) {
     nameError = 'Invalid blueprint name';
   } else if (uniqueName === false) {
     nameError = 'Blueprint with this name already exists';
   } else if (!blueprintId && uniqueName === null) {
     // Hack to keep the error message from flickering in create mode
-    nameError = 'default';
+    return { errors: { name: '' }, disabledNext: false };
   }
 
   return {