From 910d93473f249296dcb2212e02a01bf464ae955a Mon Sep 17 00:00:00 2001 From: JanhaviAlekar Date: Thu, 22 Aug 2024 15:45:28 +0530 Subject: [PATCH] made remoteHub as required field Signed-off-by: JanhaviAlekar --- chaoscenter/web/src/api/core/chaoshubs/addChaosHub.ts | 2 +- chaoscenter/web/src/strings/strings.en.yaml | 1 + chaoscenter/web/src/strings/types.ts | 1 + .../web/src/views/AddHubModalWizard/AddHubModalWizard.tsx | 5 +++-- .../src/views/ChaosHubMenu/__tests__/ChoasHubMenu.test.tsx | 1 + chaoscenter/web/src/views/ChaosHubs/ChaosHubs.tsx | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/chaoscenter/web/src/api/core/chaoshubs/addChaosHub.ts b/chaoscenter/web/src/api/core/chaoshubs/addChaosHub.ts index 1f8a282be49..c6c36465335 100644 --- a/chaoscenter/web/src/api/core/chaoshubs/addChaosHub.ts +++ b/chaoscenter/web/src/api/core/chaoshubs/addChaosHub.ts @@ -8,7 +8,7 @@ export interface CreateChaosHubRequest { description?: string; repoURL: string; repoBranch: string; - remoteHub?: string; + remoteHub: string; isPrivate: boolean; authType: AuthType; token?: string; diff --git a/chaoscenter/web/src/strings/strings.en.yaml b/chaoscenter/web/src/strings/strings.en.yaml index bfe16f64f61..15ed535321e 100644 --- a/chaoscenter/web/src/strings/strings.en.yaml +++ b/chaoscenter/web/src/strings/strings.en.yaml @@ -908,6 +908,7 @@ referencedBy: Referenced By registry: Registry registryName: Registry Name registryType: Registry Type +remoteHub: Select Remote hub remoteRepo: Remote Repository remove: Remove removeMember: Remove Member diff --git a/chaoscenter/web/src/strings/types.ts b/chaoscenter/web/src/strings/types.ts index 5d0470c5945..b6c09f5e436 100644 --- a/chaoscenter/web/src/strings/types.ts +++ b/chaoscenter/web/src/strings/types.ts @@ -752,6 +752,7 @@ export interface StringsMap { 'registry': unknown 'registryName': unknown 'registryType': unknown + 'remoteHub': unknown 'remoteRepo': unknown 'remove': unknown 'removeMember': unknown diff --git a/chaoscenter/web/src/views/AddHubModalWizard/AddHubModalWizard.tsx b/chaoscenter/web/src/views/AddHubModalWizard/AddHubModalWizard.tsx index 2a434b664df..0ff63427bf7 100644 --- a/chaoscenter/web/src/views/AddHubModalWizard/AddHubModalWizard.tsx +++ b/chaoscenter/web/src/views/AddHubModalWizard/AddHubModalWizard.tsx @@ -192,7 +192,8 @@ const GitConnectionStep: React.FC< }} validationSchema={Yup.object().shape({ repoBranch: Yup.string().trim().required('Hub Branch name is a required field'), - repoURL: Yup.string().trim().required('Hub Repo name is a required field') + repoURL: Yup.string().trim().required('Hub Repo name is a required field'), + remoteHub: Yup.string().trim().required('Remote Hub name is a required field') })} > {formikProps => { @@ -238,7 +239,7 @@ const GitConnectionStep: React.FC< Remote Hub} - placeholder={'Select Remote hub'} + placeholder={getString('remoteHub')} items={[ { label: 'GitHub', value: 'GitHub' }, { label: 'Bitbucket', value: 'Bitbucket' }, diff --git a/chaoscenter/web/src/views/ChaosHubMenu/__tests__/ChoasHubMenu.test.tsx b/chaoscenter/web/src/views/ChaosHubMenu/__tests__/ChoasHubMenu.test.tsx index f27b86d08c2..4583cb044e7 100644 --- a/chaoscenter/web/src/views/ChaosHubMenu/__tests__/ChoasHubMenu.test.tsx +++ b/chaoscenter/web/src/views/ChaosHubMenu/__tests__/ChoasHubMenu.test.tsx @@ -38,6 +38,7 @@ describe('ChaosHubMenuView Tests', () => { name: 'Test Hub', isDefault: false, repoURL: '', + remoteHub: '', repoBranch: '', projectID: '', authType: AuthType.SSH, diff --git a/chaoscenter/web/src/views/ChaosHubs/ChaosHubs.tsx b/chaoscenter/web/src/views/ChaosHubs/ChaosHubs.tsx index 81361c2e1d9..19bc0732c47 100644 --- a/chaoscenter/web/src/views/ChaosHubs/ChaosHubs.tsx +++ b/chaoscenter/web/src/views/ChaosHubs/ChaosHubs.tsx @@ -68,7 +68,7 @@ const RemoteHubImage = ({ remoteHubName }: { remoteHubName: string }): React.Rea } }; - return <>{hubSvg()}; + return hubSvg(); }; export const ChaosHubsView: React.FC = ({