From 115214b719140909b798548398285f61146178a8 Mon Sep 17 00:00:00 2001
From: Ingmar van Dijk <ingmar.van.dijk@philips.com>
Date: Fri, 27 May 2022 10:33:07 +0200
Subject: [PATCH 1/4] Make code work as documented. Review mask does not need
 'show: true'. (#11687)

Signed-off-by: Ingmar van Dijk <ingmar.van.dijk@philips.com>
---
 .../MultistepJsonForm/MultistepJsonForm.test.tsx          | 1 -
 .../components/MultistepJsonForm/MultistepJsonForm.tsx    | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.test.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.test.tsx
index 5f7091832f..21540a4895 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.test.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.test.tsx
@@ -41,7 +41,6 @@ describe('MultistepJsonForm', () => {
             type: 'string',
             'ui:backstage': {
               review: {
-                show: true,
                 mask: '******',
               },
             },
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index fb1de5f46d..d2ed0241ef 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -94,14 +94,14 @@ export function getReviewData(formData: Record<string, any>, steps: Step[]) {
       }
 
       const review = uiSchema['ui:backstage'].review as JsonObject;
-      if (!review.show) {
-        continue;
-      }
-
       if (review.mask) {
         reviewData[key] = review.mask;
         continue;
       }
+      
+      if (!review.show) {
+        continue;
+      }
       reviewData[key] = formData[key];
     }
   }

From ac0c7e45ee1d6dd867db35d3db73858e4a93d04f Mon Sep 17 00:00:00 2001
From: Ingmar van Dijk <ingmar.van.dijk@philips.com>
Date: Tue, 31 May 2022 10:17:35 +0200
Subject: [PATCH 2/4] Adding changeset.

Signed-off-by: Ingmar van Dijk <ingmar.van.dijk@philips.com>
---
 .changeset/beige-dots-bathe.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/beige-dots-bathe.md

diff --git a/.changeset/beige-dots-bathe.md b/.changeset/beige-dots-bathe.md
new file mode 100644
index 0000000000..a061ae769f
--- /dev/null
+++ b/.changeset/beige-dots-bathe.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fixes review mask in MultistepJsonForm to work as documented. 'show: true' no longer needed when mask is set.

From b9ce08bbb813d3e808e76c6ad458f5dd84e09285 Mon Sep 17 00:00:00 2001
From: Ingmar van Dijk <ingmar.van.dijk@philips.com>
Date: Tue, 31 May 2022 10:27:41 +0200
Subject: [PATCH 3/4] Fix code style on MultistepJsonForm. Prettier check will
 pass now.

Signed-off-by: Ingmar van Dijk <ingmar.van.dijk@philips.com>
---
 .../src/components/MultistepJsonForm/MultistepJsonForm.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index d2ed0241ef..34ceeb730d 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -98,7 +98,7 @@ export function getReviewData(formData: Record<string, any>, steps: Step[]) {
         reviewData[key] = review.mask;
         continue;
       }
-      
+
       if (!review.show) {
         continue;
       }

From a83465692eee782c8aacafb392bd20e8b264c936 Mon Sep 17 00:00:00 2001
From: Ben Lambert <blam@spotify.com>
Date: Tue, 31 May 2022 11:06:05 +0200
Subject: [PATCH 4/4] Update beige-dots-bathe.md

Signed-off-by: Ben Lambert <blam@spotify.com>
---
 .changeset/beige-dots-bathe.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/beige-dots-bathe.md b/.changeset/beige-dots-bathe.md
index a061ae769f..3d8f34f1db 100644
--- a/.changeset/beige-dots-bathe.md
+++ b/.changeset/beige-dots-bathe.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder': patch
 ---
 
-Fixes review mask in MultistepJsonForm to work as documented. 'show: true' no longer needed when mask is set.
+Fixes review mask in `MultistepJsonForm` to work as documented. `show: true` no longer needed when mask is set.