diff --git a/.changeset/beige-dots-bathe.md b/.changeset/beige-dots-bathe.md new file mode 100644 index 0000000000..3d8f34f1db --- /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. 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 33e274934e..43e12ae85f 100644 --- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx +++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx @@ -95,12 +95,12 @@ export function getReviewData(formData: Record, steps: Step[]) { } const review = uiSchema['ui:backstage'].review as JsonObject; - if (!review.show) { + if (review.mask) { + reviewData[key] = review.mask; continue; } - if (review.mask) { - reviewData[key] = review.mask; + if (!review.show) { continue; } reviewData[key] = formData[key];