remove username req when not needed for import repo and space (#765)

harness · Nov 3, 2023 · 2112fcb · 2112fcb
1 parent bf9a595
commit 2112fcb
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 23 deletions.
diff --git a/web/src/components/NewRepoModalButton/ImportForm/ImportForm.tsx b/web/src/components/NewRepoModalButton/ImportForm/ImportForm.tsx
@@ -184,19 +184,29 @@ const ImportForm = (props: ImportFormProps) => {
 
  {auth ? (
  <>
- <FormInput.Text
- name="username"
- label={getString('userName')}
- placeholder={getString('importRepo.userPlaceholder')}
- tooltipProps={{
- dataTooltipId: 'repositoryUserTextField'
- }}
- />
+ {formik.values.gitProvider === GitProviders.BITBUCKET && (
+ <FormInput.Text
+ name="username"
+ label={getString('userName')}
+ placeholder={getString('importRepo.userPlaceholder')}
+ tooltipProps={{
+ dataTooltipId: 'repositoryUserTextField'
+ }}
+ />
+ )}
  <FormInput.Text
  inputGroup={{ type: 'password' }}
  name="password"
- label={getString('importRepo.passToken')}
- placeholder={getString('importRepo.passwordPlaceholder')}
+ label={
+ formik.values.gitProvider === GitProviders.BITBUCKET
+ ? getString('importRepo.appPassword')
+ : getString('importRepo.passToken')
+ }
+ placeholder={
+ formik.values.gitProvider === GitProviders.BITBUCKET
+ ? getString('importRepo.appPasswordPlaceholder')
+ : getString('importRepo.passTokenPlaceholder')
+ }
  tooltipProps={{
  dataTooltipId: 'repositoryPasswordTextField'
  }}

diff --git a/web/src/components/NewSpaceModalButton/ImportSpaceForm/ImportSpaceForm.tsx b/web/src/components/NewSpaceModalButton/ImportSpaceForm/ImportSpaceForm.tsx
@@ -164,14 +164,16 @@ const ImportSpaceForm = (props: ImportFormProps) => {
  <hr className={css.dividerContainer} />
  </Container>
  </Layout.Horizontal>
- <FormInput.Text
- name="username"
- label={getString('userName')}
- placeholder={getString('importRepo.userPlaceholder')}
- tooltipProps={{
- dataTooltipId: 'spaceUserTextField'
- }}
- />
+ {formik.values.gitProvider === GitProviders.BITBUCKET && (
+ <FormInput.Text
+ name="username"
+ label={getString('userName')}
+ placeholder={getString('importRepo.userPlaceholder')}
+ tooltipProps={{
+ dataTooltipId: 'spaceUserTextField'
+ }}
+ />
+ )}
  {formik.errors.username ? (
  <Text
  margin={{ top: 'small', bottom: 'small' }}
@@ -183,8 +185,16 @@ const ImportSpaceForm = (props: ImportFormProps) => {
  ) : null}
  <FormInput.Text
  name="password"
- label={getString('importRepo.passToken')}
- placeholder={getString('importRepo.passwordPlaceholder')}
+ label={
+ formik.values.gitProvider === GitProviders.BITBUCKET
+ ? getString('importRepo.appPassword')
+ : getString('importRepo.passToken')
+ }
+ placeholder={
+ formik.values.gitProvider === GitProviders.BITBUCKET
+ ? getString('importRepo.appPasswordPlaceholder')
+ : getString('importRepo.passTokenPlaceholder')
+ }
  tooltipProps={{
  dataTooltipId: 'spacePasswordTextField'
  }}

diff --git a/web/src/framework/strings/stringTypes.ts b/web/src/framework/strings/stringTypes.ts
@@ -311,13 +311,15 @@ export interface StringsMap {
  'imageUpload.upload': string
  importGitRepo: string
  importProgress: string
+ 'importRepo.appPassword': string
+ 'importRepo.appPasswordPlaceholder': string
  'importRepo.failedToImportRepo': string
  'importRepo.group': string
  'importRepo.groupPlaceholder': string
  'importRepo.org': string
  'importRepo.orgPlaceholder': string
  'importRepo.passToken': string
- 'importRepo.passwordPlaceholder': string
+ 'importRepo.passTokenPlaceholder': string
  'importRepo.passwordReq': string
  'importRepo.project': string
  'importRepo.projectPlaceholder': string

diff --git a/web/src/i18n/strings.en.yaml b/web/src/i18n/strings.en.yaml
@@ -764,8 +764,10 @@ importRepo:
  groupPlaceholder: Enter the Group name
  reqAuth: Requires Authorization
  userPlaceholder: Enter Username
- passwordPlaceholder: Enter Password
- passToken: Password/Token
+ passToken: Token
+ passTokenPlaceholder: Enter Token
+ appPassword: App Password
+ appPasswordPlaceholder: Enter App Password
  failedToImportRepo: Failed to import repository. Please try again.
  validation: Invalid GitHub or GitLab URL
  required: Repository URL is required