From 5fb4fd04e4fbe0c3944cf39faedf792ce3b334a1 Mon Sep 17 00:00:00 2001
From: Matt Benson <gudnabrsam@gmail.com>
Date: Fri, 27 Jan 2023 12:58:12 -0600
Subject: [PATCH 1/2] issue 15788: restore schema-based review step property
 obfuscation

Signed-off-by: Matt Benson <gudnabrsam@gmail.com>
---
 .../src/components/MultistepJsonForm/ReviewStep.tsx        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/ReviewStep.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/ReviewStep.tsx
index d78d726869..1bcf06eee7 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/ReviewStep.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/ReviewStep.tsx
@@ -98,7 +98,12 @@ export const ReviewStep = (props: ReviewStepProps) => {
         <Typography variant="h6">Review and create</Typography>
         <StructuredMetadataTable
           dense
-          metadata={getReviewData(formData, getUiSchemasFromSteps(steps))}
+          metadata={getReviewData(
+            formData,
+            getUiSchemasFromSteps(
+              steps.map(({ mergedSchema }) => ({ schema: mergedSchema })),
+            ),
+          )}
         />
         <Box mb={4} />
         <Button onClick={handleBack} disabled={disableButtons}>

From 38992bdbaf5361dac1424352ba02eebace6e5388 Mon Sep 17 00:00:00 2001
From: Matt Benson <gudnabrsam@gmail.com>
Date: Fri, 27 Jan 2023 13:05:49 -0600
Subject: [PATCH 2/2] add changeset for review step fix

Signed-off-by: Matt Benson <gudnabrsam@gmail.com>
---
 .changeset/thick-clocks-pump.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/thick-clocks-pump.md

diff --git a/.changeset/thick-clocks-pump.md b/.changeset/thick-clocks-pump.md
new file mode 100644
index 0000000000..6b3b6e86de
--- /dev/null
+++ b/.changeset/thick-clocks-pump.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fixed bug in review step refactor that caused schema-based display settings for individual property values to be discarded.