Merge pull request #5945 from backstage/jhaals/fix-import

catalog-import: Display prepareResult in final step

plugins/catalog-import/src/components/ImportStepper/defaults.tsx

@@ -328,7 +328,7 @@ export const defaultStepper: StepperProvider = {
     stepLabel: <StepLabel>Finish</StepLabel>,
     content: (
       <StepFinishImportLocation
-        reviewResult={state.reviewResult}
+        prepareResult={state.prepareResult}
         onReset={state.onReset}
       />
     ),

plugins/catalog-import/src/components/StepFinishImportLocation/StepFinishImportLocation.tsx

@@ -20,25 +20,25 @@ import LocationOnIcon from '@material-ui/icons/LocationOn';
 import React from 'react';
 import { BackButton } from '../Buttons';
 import { EntityListComponent } from '../EntityListComponent';
-import { ReviewResult } from '../useImportState';
+import { PrepareResult } from '../useImportState';
 
 type Props = {
-  reviewResult: ReviewResult;
+  prepareResult: PrepareResult;
   onReset: () => void;
 };
 
-export const StepFinishImportLocation = ({ reviewResult, onReset }: Props) => (
+export const StepFinishImportLocation = ({ prepareResult, onReset }: Props) => (
   <>
-    {reviewResult.type === 'repository' && (
+    {prepareResult.type === 'repository' && (
       <>
         <Typography paragraph>
           The following Pull Request has been opened:{' '}
           <Link
-            to={reviewResult.pullRequest.url}
+            to={prepareResult.pullRequest.url}
             target="_blank"
             rel="noreferrer"
           >
-            {reviewResult.pullRequest.url}
+            {prepareResult.pullRequest.url}
           </Link>
         </Typography>
 
@@ -53,7 +53,7 @@ export const StepFinishImportLocation = ({ reviewResult, onReset }: Props) => (
     </Typography>
 
     <EntityListComponent
-      locations={reviewResult.locations}
+      locations={prepareResult.locations}
       locationListItemIcon={() => <LocationOnIcon />}
       withLinks
     />

plugins/catalog-import/src/components/useImportState.test.tsx

@@ -127,7 +127,7 @@ describe('useImportState', () => {
         activeState: 'finish',
         analyzeResult: locationAP,
         prepareResult: locationAP,
-        reviewResult: locationR,
+        reviewResult: locationAP,
       });
 
       act(() => result.current.onReset());
@@ -138,8 +138,8 @@ describe('useImportState', () => {
         analysisUrl: undefined,
         activeState: 'analyze',
         analyzeResult: undefined,
-        prepareResult: undefined,
-        reviewResult: locationR,
+        prepareResult: locationR,
+        reviewResult: undefined,
       });
     });
 

plugins/catalog-import/src/components/useImportState.ts

@@ -227,9 +227,9 @@ function reducer(state: ReducerState, action: ReducerActions): ReducerState {
       return {
         ...init(action.initialUrl),
 
-        // we keep the old reviewResult since the form is animated and an
+        // we keep the old prepareResult since the form is animated and an
         // undefined value might crash the last step.
-        reviewResult: state.reviewResult,
+        prepareResult: state.prepareResult,
       };
 
     default: