fix: redirect on create repository (#794)

harness · Nov 13, 2023 · 65f0505 · 65f0505
1 parent 66ff29d
commit 65f0505
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/web/src/components/NewRepoModalButton/NewRepoModalButton.tsx b/web/src/components/NewRepoModalButton/NewRepoModalButton.tsx
@@ -66,7 +66,12 @@ import {
  isGitBranchNameValid,
  getProviderTypeMapping
 } from 'utils/GitUtils'
-import type { TypesSpace, TypesRepository, OpenapiCreateRepositoryRequest } from 'services/code'
+import type {
+ TypesSpace,
+ TypesRepository,
+ SpaceImportRepositoriesOutput,
+ OpenapiCreateRepositoryRequest
+} from 'services/code'
 import { useAppContext } from 'AppContext'
 import ImportForm from './ImportForm/ImportForm'
 import ImportReposForm from './ImportReposForm/ImportReposForm'
@@ -88,7 +93,7 @@ export interface NewRepoModalButtonProps extends Omit<ButtonProps, 'onClick' | '
  modalTitle: string
  submitButtonTitle?: string
  cancelButtonTitle?: string
- onSubmit: (data: TypesRepository) => void
+ onSubmit: (data: TypesRepository & SpaceImportRepositoriesOutput) => void
 }
 
 export const NewRepoModalButton: React.FC<NewRepoModalButtonProps> = ({

diff --git a/web/src/pages/RepositoriesListing/RepositoriesListing.tsx b/web/src/pages/RepositoriesListing/RepositoriesListing.tsx
@@ -35,7 +35,7 @@ import { useHistory } from 'react-router-dom'
 import { useStrings } from 'framework/strings'
 import { voidFn, formatDate, getErrorMessage, LIST_FETCHING_LIMIT, PageBrowserProps } from 'utils/Utils'
 import { NewRepoModalButton } from 'components/NewRepoModalButton/NewRepoModalButton'
-import type { TypesRepository, SpaceImportRepositoriesOutput } from 'services/code'
+import type { TypesRepository } from 'services/code'
 import { usePageIndex } from 'hooks/usePageIndex'
 import { useQueryParams } from 'hooks/useQueryParams'
 import { useUpdateQueryParams } from 'hooks/useUpdateQueryParams'
@@ -176,12 +176,9 @@ export default function RepositoriesListing() {
  onSubmit={repoInfo => {
  if (repoInfo.importing) {
  refetch()
- } else if (repoInfo) {
- const multipleImportRepoInfo = repoInfo as SpaceImportRepositoriesOutput
- if (multipleImportRepoInfo.importing_repos) {
- history.push(routes.toCODERepositories({ space: space as string }))
- refetch()
- }
+ } else if (repoInfo.importing_repos) {
+ history.push(routes.toCODERepositories({ space: space as string }))
+ refetch()
  } else {
  history.push(routes.toCODERepository({ repoPath: (repoInfo as TypesRepository).path as string }))
  }