Add host add&delete in host view

Change host delete api check form and data

Related to #CE-9

https://jira.hyperledger.org/browse/CE-9

Change-Id: Ia08acb00083a18bb2c6dd659ae70fd21400231c9
Signed-off-by: Haitao Yue <hightall@me.com>

src/resources/host_api.py

@@ -4,6 +4,7 @@
 
 from flask import jsonify, Blueprint, render_template
 from flask import request as r
+import json
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
 from common import log_handler, LOG_LEVEL, \
@@ -113,18 +114,23 @@ def host_update():
 @bp_host_api.route('/host', methods=['PUT', 'DELETE'])
 def host_delete():
     request_debug(r, logger)
-    if "id" not in r.form or not r.form["id"]:
+    request_data = r.get_json(force=True, silent=True)
+    if "id" in r.form:
+        host_id = r.form["id"]
+    elif "id" in request_data:
+        host_id = request_data.get("id")
+    else:
         error_msg = "host delete without enough data"
         logger.warning(error_msg)
         return make_fail_response(error=error_msg, data=r.form)
+
+    logger.debug("host delete with id={0}".format(host_id))
+    if host_handler.delete(id=host_id):
+        return make_ok_response()
     else:
-        logger.debug("host delete with id={0}".format(r.form["id"]))
-        if host_handler.delete(id=r.form["id"]):
-            return make_ok_response()
-        else:
-            error_msg = "Failed to delete host {}".format(r.form["id"])
-            logger.warning(error_msg)
-            return make_fail_response(error=error_msg)
+        error_msg = "Failed to delete host {}".format(host_id)
+        logger.warning(error_msg)
+        return make_fail_response(error=error_msg)
 
 
 @bp_host_api.route('/host_op', methods=['POST'])

src/themes/react/static/js/models/host.js

@@ -1,7 +1,7 @@
 /**
  * Created by yuehaitao on 2017/1/18.
  */
-import {getHosts} from '../services/host'
+import {getHosts, createHost, deleteHost} from '../services/host'
 import {message} from 'antd'
 
 export default {
@@ -39,6 +39,34 @@ export default {
                 message.error("get hosts list failed")
                 yield put({type: 'hideLoadingHosts'})
             }
+        },
+        *createHost({payload}, {call, put}) {
+            const data = yield call(createHost, payload)
+            if (data && data.status === "OK") {
+                yield put({
+                    type: 'hideModal'
+                })
+                message.success("Create host successful")
+                yield put({
+                    type: 'getHosts'
+                })
+            } else {
+                yield put({
+                    type: 'hideModal'
+                })
+                message.error("Create host failed")
+            }
+        },
+        *deleteHost({payload}, {select, call, put}) {
+            const data = yield call(deleteHost, payload)
+            if (data && data.status === "OK") {
+                message.success("Delete Host successful")
+                yield put({
+                    type: 'getHosts'
+                })
+            } else {
+                message.error("Delete Host failed")
+            }
         }
     },
     reducers: {

src/themes/react/static/js/routes/host/HostList.js

@@ -8,13 +8,13 @@ import { DropOption } from '../../components'
 
 const confirm = Modal.confirm
 
-function list({loadingList, dataSource, onDeleteItem, onSelectItem, onSelectTagItem}) {
-    const handleMenuClick = (record, e) => {
+function list({loadingList, dataSource, onDelete, onSelectItem, onSelectTagItem}) {
+    const handleMenuClick = (record, e, index) => {
         if (e.key === 'delete') {
             confirm({
                 title: 'Confirm to delete?',
                 onOk () {
-                    onDeleteItem(record.id)
+                    onDelete(record, index)
                 },
             })
         }
@@ -60,11 +60,11 @@ function list({loadingList, dataSource, onDeleteItem, onSelectItem, onSelectTagI
             title: 'Operation',
             key: 'operation',
             width: 100,
-            render: (text, record) => {
+            render: (text, record, index) => {
                 const menuOptions = [
                     {key: 'delete', name: 'Delete'}
                 ]
-                return <DropOption onMenuClick={e => handleMenuClick(record, e)} menuOptions={menuOptions} />
+                return <DropOption onMenuClick={e => handleMenuClick(record, e, index)} menuOptions={menuOptions} />
             }
         }
     ]