From 2cc888a9722306bb23e9436d5cc495873cc710f4 Mon Sep 17 00:00:00 2001
From: qyzh <qyzh@smail.nju.edu.cn>
Date: Tue, 1 Dec 2020 14:52:23 +0800
Subject: [PATCH] fix bugs

---
 src/forge/Version/UpdateVersion.js      | 191 ++++++++++++++++++++++++
 src/forge/sponsor/sponsor_tier_item.js  |  10 +-
 src/forge/users/sponsor/sponsor_list.js |   2 +-
 3 files changed, 198 insertions(+), 5 deletions(-)
 create mode 100644 src/forge/Version/UpdateVersion.js

diff --git a/src/forge/Version/UpdateVersion.js b/src/forge/Version/UpdateVersion.js
new file mode 100644
index 000000000..d9eebeddd
--- /dev/null
+++ b/src/forge/Version/UpdateVersion.js
@@ -0,0 +1,191 @@
+import React , { Component } from "react";
+import { Form , Input , Select,Divider,Button,Checkbox,Dropdown,Menu} from 'antd';
+import {Link} from 'react-router-dom';
+
+import UploadComponent from '../Upload/Index';
+import '../Order/order.css';
+import './version.css';
+
+import axios from 'axios';
+
+const Option = Select.Option;
+const TextArea = Input.TextArea;
+class NewVersion extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      branch_name:"",
+      issue_tag_ids:"",
+      fixed_version_id:"",
+      issue_chosen:undefined,
+      fileList:undefined,
+      ischeck:undefined,
+      pull:undefined,
+      tag_name:'',
+      data:undefined
+    }
+  }
+
+  componentDidMount=()=>{
+    this.getSelectList();
+  }
+
+  getSelectList=()=>{
+    const { projectsId,versionId} = this.props.match.params;
+    const url = `/projects/${projectsId}/version_releases/${versionId}/edit.json`;
+    axios.get(url).then((result)=>{
+      if(result){
+        this.setState({
+            data:result.data,
+          pull:result.data.target_commitish
+        })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+
+
+  //delete
+  deleteversion=()=>{
+    const { projectsId , versionId} = this.props.match.params;
+    const url = `/projects/${projectsId}/version_releases/${versionId}.json`;
+      axios.delete(url,{ data: {
+        project_id: projectsId,
+        id:versionId
+      }
+    }).then((result)=>{
+        if(result){
+          this.props.history.push(`/projects/${projectsId}/version`);
+
+        }
+      }).catch((error)=>{
+        console.log(error);
+      })
+  }
+
+  // 创建
+  handleSubmit=()=>{
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if(!err){
+        const { projectsId,versionId} = this.props.match.params;
+        const { pull,ischeck } = this.state;
+        const url = `/projects/${projectsId}/version_releases/${versionId}.json`;
+        // if(values.issue_type==="普通"){
+        //   values.issue_type="1"
+        // }
+        axios.put(url,{
+          ...values,
+          tag_name:this.state.data&&this.state.data.tag_name,
+          draft:false,
+          prerelease:ischeck,
+          target_commitish:pull
+        }).then(result=>{
+          if(result){
+            this.props.history.push(`/projects/${projectsId}/version`);
+          }
+        }).catch(error=>{
+          console.log(error);
+        })
+
+      }
+    })
+  }
+
+  RedieonChange=(e)=>{
+     this.setState({
+      ischeck:e.target.checked
+     })
+  }
+  Preservation=()=>{
+    alert(this.state.data.tag_name)  
+  }
+
+  renderMenu =(array,id)=>{
+    return(
+      <Menu>
+        {
+          array && array.length > 0 && array.map((item,key)=>{
+            return(
+              <Menu.Item key={item} onClick={()=>this.getOption(item)}>{item}</Menu.Item>
+            )
+          })
+        }
+      </Menu>
+    )
+  }
+
+  getOption=(name)=>{
+      this.setState({
+        pull:name
+      })
+    
+  }
+
+  changmodelname=(e)=>{
+    this.setState({
+      tag_name:e.target.value
+    })
+  }
+
+  render(){
+    const { getFieldDecorator } = this.props.form;
+    const { projectsId } = this.props.match.params;
+    return(
+        <div className="main">
+          <Form>
+          <h1 style={{marginLeft:15,marginTop:20}}>发布新版</h1>
+          <h5 style={{marginLeft:15}}>版本发布组织项目的版本。</h5>
+          <Divider/>
+          <div  style={{display:'flex',marginLeft:15}}>
+            {this.state.data&&this.state.data.tag_name}@{this.state.data&&this.state.data.target_commitish}
+          </div>
+           <div  style={{display:'flex'}}>
+             <div className="versionmilepostleft">
+              <h1>标题</h1> 
+               <div>
+               <Form.Item>
+                  {getFieldDecorator('name', {
+                    rules: [{
+                      required: true, message: '请输入标题'
+                    }],
+                    initialValue:this.state.data&&this.state.data.name
+                    
+                  })(
+                    <Input placeholder="标题"/>
+                  )}
+                </Form.Item>
+              </div>
+              <h1>内容</h1> 
+               <Form.Item>
+                  {getFieldDecorator('body', {
+                    rules: [{
+                      required: true, message: '请输入描述内容'
+                    }],
+                    initialValue:this.state.data&&this.state.data.body
+                  })(
+                    <TextArea placeholder="添加一个可选的扩展描述。。。"  style={{height:"300px"}}/>
+
+                  )}
+                </Form.Item>
+                {/* <UploadComponent load={this.UploadFunc} style={{width:80,marginLeft:15}}></UploadComponent> */}
+               </div>
+          </div>
+          
+        <Divider/>
+        <div className="fr">
+        <Checkbox  onChange={this.RedieonChange}>标记为预行版</Checkbox>
+        <p>标记此版本不适合生产使用</p>
+        </div>
+        <div className="clearfix mt15" style={{marginTop:5}} >
+        <a className='topWrapper_btn_delete fr' onClick={()=>this.deleteversion()} style={{marginLeft:15}}>删除发布</a>  
+        <a className='topWrapper_btn fr' onClick={()=>this.handleSubmit()} style={{marginRight:15}}>编辑发布信息</a>
+        <Link to={`/projects/${projectsId}/version`} style={{marginRight:30}} className='topWrapper_btn fr'>取消</Link>
+        </div>
+        </Form>
+    </div>
+    )
+  }
+}
+const WrappedNewVersionForm = Form.create({ name: 'NewVersionForm' })(NewVersion);
+export default WrappedNewVersionForm;
\ No newline at end of file
diff --git a/src/forge/sponsor/sponsor_tier_item.js b/src/forge/sponsor/sponsor_tier_item.js
index e5b4c1aba..267795331 100644
--- a/src/forge/sponsor/sponsor_tier_item.js
+++ b/src/forge/sponsor/sponsor_tier_item.js
@@ -175,13 +175,13 @@ class SponsorTierItem extends Component{
       let url;
       try {
         const values = await this.formRef.props.form.validateFields();
-        console.log('Success:', values);
+        // console.log('Success:', values);
       } catch (errorInfo) {
         message.warn('提交失败，数据不合法');
         return false;
       }
       let values = this.formRef.getItemsValue();
-      console.log(this.formRef);
+      // console.log(this.formRef);
       const {current_user} = this.props;
       if (this.state.new_tier == key){
         console.log("new tier");
@@ -193,16 +193,18 @@ class SponsorTierItem extends Component{
         })
         .then((result) => {
           var {tiers, edit} = this.state;
-          tiers[key] = result.data;
+          tiers[key] = result.data.tier;
           edit[key] = false;
           this.setState({
             tiers: tiers,
             edit: edit,
             new_tier: undefined
           })
+          message.success("新增成功");
         })
         .catch((error) => {
           console.log(error);
+          message.error("新增失败");
         })
       }
       else{
@@ -213,7 +215,7 @@ class SponsorTierItem extends Component{
         })
         .then((result) => {
           var {tiers, edit} = this.state;
-          tiers[key] = result.data;
+          tiers[key] = result.data.tier;
           edit[key] = false;
           this.setState({
             tiers: tiers,
diff --git a/src/forge/users/sponsor/sponsor_list.js b/src/forge/users/sponsor/sponsor_list.js
index bdb622024..629d1538d 100644
--- a/src/forge/users/sponsor/sponsor_list.js
+++ b/src/forge/users/sponsor/sponsor_list.js
@@ -12,7 +12,7 @@ class SponsorList extends Component {
 
     stop_sponsorship = (item, key, e)=>{
 
-        console.log("before: ", this.state.users);
+        // console.log("before: ", this.state.users);
         let url = `/sponsorships/${item.id}.json`;
         axios.delete(url)
             .then((result) => {