From 19d495939d23984987ac1097e61faadb3b0fd2aa Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Thu, 27 Jun 2024 23:20:51 -0400
Subject: [PATCH] Extract condition check to function

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .../components/ReviewState/ReviewState.tsx    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
index ac7ac989e3..202e0c0fbf 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
@@ -47,11 +47,8 @@ function flattenObject(
 
       // Recurse into nested objects
       if (
-        backstageReviewOptions &&
-        backstageReviewOptions.explode &&
-        typeof value === 'object' &&
-        value !== null &&
-        !Array.isArray(value)
+        backstageReviewOptions?.explode &&
+        isJsonObject(value)
       ) {
         return flattenObject(value, prefixedKey, schema, formState);
       }
@@ -61,6 +58,14 @@ function flattenObject(
   });
 }
 
+function isJsonObject(value?: JsonValue): value is JsonObject {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    !Array.isArray(value)
+  );
+}
+
 /**
  * The component used by the {@link Stepper} to render the review step.
  * @alpha
@@ -89,9 +94,7 @@ export const ReviewState = (props: ReviewStateProps) => {
               }
               if (
                 backstageReviewOptions.explode &&
-                typeof value === 'object' &&
-                value !== null &&
-                !Array.isArray(value)
+                isJsonObject(value)
               ) {
                 return flattenObject(value, key, parsedSchema, props.formState);
               }
@@ -106,7 +109,7 @@ export const ReviewState = (props: ReviewStateProps) => {
                 [
                   key,
                   definitionInSchema.enumNames[
-                    definitionInSchema.enum.indexOf(value)
+                  definitionInSchema.enum.indexOf(value)
                   ] || value,
                 ],
               ];