fix: 团队下新建仓库 bug

src/actions/types.ts

@@ -56,13 +56,6 @@ export interface INumItem {
   label: string
 }
 
-export interface IConfig {
-  serve: string
-  keys: string[]
-  session: {
-    key: string
-  }
-}
 export interface Repository {
   id: number
 
@@ -79,7 +72,7 @@ export interface Repository {
 
   ownerId?: number
 
-  organizationid?: number
+  organizationId?: number
 
   memberIds?: number[]
 

src/assets/index.sass

@@ -194,5 +194,4 @@ code
   &.alert-info 
     color: #0c5460
     background-color: #d1ecf1
-    border-color: #bee5eb
-
+    border-color: #bee5eb

src/components/repository/RepositoryForm.tsx

@@ -54,7 +54,7 @@ const FORM_STATE_INIT: Repository = {
   description: '',
   members: [],
   collaborators: [],
-  organizationid: 0,
+  organizationId: 0,
   collaboratorIdstring: '',
 }
 
@@ -66,11 +66,12 @@ interface Props {
   title?: string
   open: boolean
   onClose: (isOk?: boolean) => void
-  repository?: Repository
+  repository?: Repository,
+  organizationId?: number
 }
 
 function RepositoryForm(props: Props) {
-  const { open, onClose, repository, title } = props
+  const { open, onClose, repository, title, organizationId } = props
   if (repository) {
     repository.collaboratorIdstring = repository.collaborators!.map(x => { return x.id }).join(',')
   }
@@ -105,6 +106,9 @@ function RepositoryForm(props: Props) {
                   values.collaboratorIdstring || ''
                 ).split(','),
               }
+              if (organizationId !== undefined) {
+                repository.organizationId = organizationId
+              }
               const { owner, newOwner } = values
               if (newOwner && newOwner.id !== owner!.id) { repository.ownerId = newOwner.id }
               dispatch(addOrUpdateRepository(repository, () => {

src/components/repository/RepositoryListParts.tsx

@@ -46,23 +46,26 @@ export function CreateButton(props: CreateButtonProps) {
         color="primary"
         onClick={() => setCreating(true)}
       >
-        {' '}
-        新建仓库{' '}
+        新建仓库
       </Button>
 
       {organization && (
-        <button
-          className="RepositoryCreateButton btn btn-secondary ml8"
+        <Button
+          style={{marginLeft: 8}}
+          className="RepositoryCreateButton"
+          variant="contained"
+          color="primary"
           onClick={() => setImporting(true)}
         >
           <GoArrowRight /> 导入仓库
-        </button>
+        </Button>
       )}
 
       <RepositoryForm
         title="新建仓库"
         open={creating}
         onClose={() => setCreating(false)}
+        organizationId={organization ? organization.id : undefined}
       />
 
       {organization && (