From 60ac7f3ad7832c6a5b417c4cea6e4a778ca4d081 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 10 Jun 2022 13:56:40 +0200
Subject: [PATCH] chore: starting to clean up some of the form components
 Signed-off-by: blam <ben@blam.sh>

Signed-off-by: blam <ben@blam.sh>
---
 packages/core-components/src/components/Select/Select.tsx      | 1 +
 .../src/components/fields/EntityPicker/EntityPicker.tsx        | 3 ++-
 plugins/scaffolder/src/routes.ts                               | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/core-components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx
index 2edf74882f..ff98189b09 100644
--- a/packages/core-components/src/components/Select/Select.tsx
+++ b/packages/core-components/src/components/Select/Select.tsx
@@ -206,6 +206,7 @@ export function SelectComponent(props: SelectProps) {
             data-testid="select"
             displayEmpty
             multiple={multiple}
+            margin="dense"
             onChange={handleChange}
             onClick={handleClick}
             open={isOpen}
diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
index c899b56683..b7e3122c31 100644
--- a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
@@ -102,8 +102,9 @@ export const EntityPicker = (
           <TextField
             {...params}
             label={title}
-            margin="normal"
+            margin="dense"
             helperText={description}
+            FormHelperTextProps={{ margin: 'dense', style: { marginLeft: 0 } }}
             variant="outlined"
             required={required}
             InputProps={params.InputProps}
diff --git a/plugins/scaffolder/src/routes.ts b/plugins/scaffolder/src/routes.ts
index f6ca7ba467..f862b043c1 100644
--- a/plugins/scaffolder/src/routes.ts
+++ b/plugins/scaffolder/src/routes.ts
@@ -37,7 +37,7 @@ export const legacySelectedTemplateRouteRef = createSubRouteRef({
   path: '/templates/:templateName',
 });
 
-const nextRouteRef = createRouteRef({
+export const nextRouteRef = createRouteRef({
   id: 'scaffolder/next',
 });