add callBack to AddDuelForm

myslak71 · Jan 28, 2019 · 7d8edec · 7d8edec
1 parent e0bd9ac
commit 7d8edec
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/duels/tests/test_utils.py b/duels/tests/test_utils.py
@@ -19,3 +19,5 @@ def test_proper_value(self):
         duel = Duel.objects.get(pk=1)
         algorithm = Algorithm.objects.get(pk=1)
         self.assertEqual(count_percentage(duel, algorithm), 99.074)
+
+
diff --git a/src/components/AddDuelForm.js b/src/components/AddDuelForm.js
@@ -26,29 +26,20 @@ class AddDuelForm extends React.Component {
             dataset: this.state.dataset,
             rounds: []
         };
-        console.log(postObj)
         axios.defaults.xsrfHeaderName = "X-CSRFTOKEN";
         axios.defaults.xsrfCookieName = "csrftoken";
         axios.defaults.headers = {
             "Content-Type": "application/json",
             Authorization: `Token ${this.props.token}`,
         };
+
+        axios.post("http://127.0.0.1:8000/api/duel/create/", postObj)
+            .then(res => {
+                if (res.status === 201) {
+                    this.props.callBack()
+                }
+            })
 
-        if (requestType === "post") {
-            await axios.post("http://127.0.0.1:8000/api/duel/create/", postObj)
-                .then(res => {
-                    if (res.status === 201) {
-                        this.props.history.push(`/`);
-                    }
-                })
-        } else if (requestType === "put") {
-            await axios.put(`http://127.0.0.1:8000/api/duel/${duelID}/update/`, postObj)
-                .then(res => {
-                    if (res.status === 200) {
-                        this.props.history.push(`/`);
-                    }
-                })
-        }
     };
 
     handleUserChange(value) {
@@ -66,8 +57,6 @@ class AddDuelForm extends React.Component {
                     onSubmit={event =>
                         this.handleFormSubmit(
                             event,
-                            this.props.requestType,
-                            this.props.articleID
                         )
                     }
                 >

diff --git a/src/containers/DuelListView.js b/src/containers/DuelListView.js
@@ -11,6 +11,13 @@ class DuelList extends React.Component {
         datasets: []
     };
 
+    update = () => {
+        const promises = [this.fetchDuels(), this.fetchUsers(), this.fetchDatasets()]
+        Promise.all(promises).then(([duelsResponse, usersResponse, datasetsResponse]) => {
+            this.setState({duels: duelsResponse.data, users: usersResponse.data, datasets: datasetsResponse.data});
+        });
+    }
+
     fetchDuels = () => {
         return axios.get("http://127.0.0.1:8000/api/duel/user/",
             {'headers': {'Authorization': `Token ${localStorage.getItem('token')}`}})
@@ -25,7 +32,7 @@ class DuelList extends React.Component {
         return axios.get("http://127.0.0.1:8000/api/dataset/",
             {'headers': {'Authorization': `Token ${localStorage.getItem('token')}`}})
     };
-    
+
     componentDidMount() {
         const promises = [this.fetchDuels(), this.fetchUsers(), this.fetchDatasets()]
         Promise.all(promises).then(([duelsResponse, usersResponse, datasetsResponse]) => {
@@ -40,7 +47,7 @@ class DuelList extends React.Component {
                 <Duels data={this.state.duels}/> <br/>
                 <h2> Add duel </h2>
                 <AddDuelForm users={this.state.users} datasets={this.state.datasets} requestType="post" articleID={null}
-                             btnText="Challenge"/>
+                             btnText="Challenge" callBack={this.update}/>
             </div>
         );
     }

diff --git a/src/containers/Layout.js b/src/containers/Layout.js
@@ -42,10 +42,6 @@ class CustomLayout extends React.Component {
                     </Menu>
                 </Header>
                 <Content style={{padding: '0 50px'}}>
-                    <Breadcrumb style={{margin: '16px 0'}}>
-                        <Breadcrumb.Item><Link to="/">Home</Link></Breadcrumb.Item>
-                        <Breadcrumb.Item><Link to="/">List</Link></Breadcrumb.Item>
-                    </Breadcrumb>
                     <div style={{background: '#fff', padding: 24, minHeight: 280}}>
                         {this.props.children}
                     </div>