From 42addd8c8df87a0a93e9ae824acdf11f43e55030 Mon Sep 17 00:00:00 2001
From: Alex Rybchenko <arybchenko@box.com>
Date: Fri, 18 Nov 2022 14:16:58 +0100
Subject: [PATCH] added formData to validation function

Signed-off-by: Alex Rybchenko <arybchenko@box.com>
---
 plugins/scaffolder/api-report.md                         | 9 +++++----
 plugins/scaffolder/src/extensions/types.ts               | 3 ++-
 .../TemplateWizardPage/Stepper/createAsyncValidators.ts  | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 33a5f8c2fe..f94cb26d21 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -110,9 +110,9 @@ export type EntityPickerUiOptions =
 export const EntityTagsPickerFieldExtension: FieldExtensionComponent<
   string[],
   {
-    showCounts?: boolean | undefined;
-    kinds?: string[] | undefined;
     helperText?: string | undefined;
+    kinds?: string[] | undefined;
+    showCounts?: boolean | undefined;
   }
 >;
 
@@ -120,9 +120,9 @@ export const EntityTagsPickerFieldExtension: FieldExtensionComponent<
 export const EntityTagsPickerFieldSchema: FieldSchema<
   string[],
   {
-    showCounts?: boolean | undefined;
-    kinds?: string[] | undefined;
     helperText?: string | undefined;
+    kinds?: string[] | undefined;
+    showCounts?: boolean | undefined;
   }
 >;
 
@@ -224,6 +224,7 @@ export type NextCustomFieldValidator<TFieldReturnValue> = (
   field: FieldValidation_2,
   context: {
     apiHolder: ApiHolder;
+    formData: JsonObject;
   },
 ) => void | Promise<void>;
 
diff --git a/plugins/scaffolder/src/extensions/types.ts b/plugins/scaffolder/src/extensions/types.ts
index 3834b39c0a..5e133c676b 100644
--- a/plugins/scaffolder/src/extensions/types.ts
+++ b/plugins/scaffolder/src/extensions/types.ts
@@ -23,6 +23,7 @@ import {
 } from '@rjsf/utils';
 import { PropsWithChildren } from 'react';
 import { JSONSchema7 } from 'json-schema';
+import { JsonObject } from '@backstage/types';
 
 /**
  * Field validation type for Custom Field Extensions.
@@ -100,7 +101,7 @@ export interface NextFieldExtensionComponentProps<
 export type NextCustomFieldValidator<TFieldReturnValue> = (
   data: TFieldReturnValue,
   field: FieldValidationV5,
-  context: { apiHolder: ApiHolder },
+  context: { apiHolder: ApiHolder; formData: JsonObject },
 ) => void | Promise<void>;
 
 /**
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.ts b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.ts
index 1355387eda..6483ce2393 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.ts
+++ b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.ts
@@ -42,7 +42,7 @@ export const createAsyncValidators = (
         if (validator) {
           const fieldValidation = createFieldValidation();
           try {
-            await validator(value, fieldValidation, context);
+            await validator(value, fieldValidation, { ...context, formData });
           } catch (ex) {
             fieldValidation.addError(ex.message);
           }