From 52408cbbdfbfc2217567a9ffeb180e5ae9b9439b Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 20 Aug 2024 09:52:31 +0200
Subject: [PATCH] chore: updating some of the repo picker

Signed-off-by: blam <ben@blam.sh>
---
 plugins/scaffolder/api-report-alpha.md                 | 10 +++++-----
 .../fields/RepoUrlPicker/GerritRepoPicker.tsx          |  1 -
 .../fields/RepoUrlPicker/RepoUrlPickerHost.tsx         |  4 ++--
 .../fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx     |  6 +++---
 plugins/scaffolder/src/translation.ts                  |  4 +---
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/plugins/scaffolder/api-report-alpha.md b/plugins/scaffolder/api-report-alpha.md
index f0a68919a4..007b106665 100644
--- a/plugins/scaffolder/api-report-alpha.md
+++ b/plugins/scaffolder/api-report-alpha.md
@@ -150,11 +150,11 @@ export const scaffolderTranslationRef: TranslationRef<
     readonly 'fields.gitlabRepoPicker.owner.title': 'Owner Available';
     readonly 'fields.gitlabRepoPicker.owner.description': 'GitLab namespace where this repository will belong to. It can be the name of organization, group, subgroup, user, or the project.';
     readonly 'fields.gitlabRepoPicker.owner.inputTitle': 'Owner';
-    readonly 'fields.repoUrlPickerHost.host.title': 'Host';
-    readonly 'fields.repoUrlPickerHost.host.description': 'The host where the repository will be created';
-    readonly 'fields.repoUrlPickerRepoName.repository.title': 'Repositories Available';
-    readonly 'fields.repoUrlPickerRepoName.repository.description': 'The name of the repository';
-    readonly 'fields.repoUrlPickerRepoName.repository.inputTitle': 'Repository';
+    readonly 'fields.repoUrlPicker.host.title': 'Host';
+    readonly 'fields.repoUrlPicker.host.description': 'The host where the repository will be created';
+    readonly 'fields.repoUrlPicker.repository.title': 'Repositories Available';
+    readonly 'fields.repoUrlPicker.repository.description': 'The name of the repository';
+    readonly 'fields.repoUrlPicker.repository.inputTitle': 'Repository';
     readonly 'actionsPage.content.emptyState.title': 'No information to display';
     readonly 'actionsPage.content.emptyState.description': 'There are no actions installed or there was an issue communicating with backend.';
     readonly 'actionsPage.content.tableCell.type': 'Type';
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.tsx
index 9a81fd3c48..bcc665976f 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.tsx
@@ -15,7 +15,6 @@
  */
 import React from 'react';
 import FormControl from '@material-ui/core/FormControl';
-import FormHelperText from '@material-ui/core/FormHelperText';
 import TextField from '@material-ui/core/TextField';
 import { BaseRepoUrlPickerProps } from './types';
 import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.tsx
index 86adc5ee20..90f8eaf449 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.tsx
@@ -76,7 +76,7 @@ export const RepoUrlPickerHost = (props: {
         <Select
           native
           disabled={hosts?.length === 1}
-          label={t('fields.repoUrlPickerHost.host.title')}
+          label={t('fields.repoUrlPicker.host.title')}
           onChange={s => onChange(String(Array.isArray(s) ? s[0] : s))}
           selected={host}
           items={hostsOptions}
@@ -84,7 +84,7 @@ export const RepoUrlPickerHost = (props: {
         />
 
         <FormHelperText>
-          {t('fields.repoUrlPickerHost.host.description')}
+          {t('fields.repoUrlPicker.host.description')}
         </FormHelperText>
       </FormControl>
     </>
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx
index 46cde5864f..9c63140d1c 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.tsx
@@ -56,7 +56,7 @@ export const RepoUrlPickerRepoName = (props: {
         {allowedRepos?.length ? (
           <Select
             native
-            label={t('fields.repoUrlPickerRepoName.repository.title')}
+            label={t('fields.repoUrlPicker.repository.title')}
             onChange={selected =>
               onChange(String(Array.isArray(selected) ? selected[0] : selected))
             }
@@ -74,7 +74,7 @@ export const RepoUrlPickerRepoName = (props: {
             renderInput={params => (
               <TextField
                 {...params}
-                label={t('fields.repoUrlPickerRepoName.repository.inputTitle')}
+                label={t('fields.repoUrlPicker.repository.inputTitle')}
                 required
               />
             )}
@@ -83,7 +83,7 @@ export const RepoUrlPickerRepoName = (props: {
           />
         )}
         <FormHelperText>
-          {t('fields.repoUrlPickerRepoName.repository.description')}
+          {t('fields.repoUrlPicker.repository.description')}
         </FormHelperText>
       </FormControl>
     </>
diff --git a/plugins/scaffolder/src/translation.ts b/plugins/scaffolder/src/translation.ts
index bf584bb7ad..d97c3f6f05 100644
--- a/plugins/scaffolder/src/translation.ts
+++ b/plugins/scaffolder/src/translation.ts
@@ -125,13 +125,11 @@ export const scaffolderTranslationRef = createTranslationRef({
             'GitLab namespace where this repository will belong to. It can be the name of organization, group, subgroup, user, or the project.',
         },
       },
-      repoUrlPickerHost: {
+      repoUrlPicker: {
         host: {
           title: 'Host',
           description: 'The host where the repository will be created',
         },
-      },
-      repoUrlPickerRepoName: {
         repository: {
           title: 'Repositories Available',
           inputTitle: 'Repository',