From 263168b1578b0764500d24a8e26d154a015ed5f5 Mon Sep 17 00:00:00 2001
From: hongwei1 <hongwei@tesobe.com>
Date: Mon, 19 Aug 2019 18:11:14 +0200
Subject: [PATCH] added the delete button for webuiprops

---
 apimanager/webui/static/webui/js/webui.js   | 15 ++++++++--
 apimanager/webui/templates/webui/index.html | 33 ++++++++-------------
 apimanager/webui/urls.py                    |  4 ++-
 apimanager/webui/views.py                   | 19 ++++++++++++
 4 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/apimanager/webui/static/webui/js/webui.js b/apimanager/webui/static/webui/js/webui.js
index 31a3d9d..1f699a9 100644
--- a/apimanager/webui/static/webui/js/webui.js
+++ b/apimanager/webui/static/webui/js/webui.js
@@ -7,8 +7,19 @@ $(document).ready(function($) {
 
 		$.post('/webui/save/method', {
 			'webui_props_name': webui_props_name,
-			'webui_props_value': webui_props_value,
-			'csrfmiddlewaretoken': window.CSRF
+			'webui_props_value': webui_props_value
+		}, function (response) {
+			t.next().show().fadeOut(1000);
+		});
+	});
+
+	$('.runner button.forDelete').click(function() {
+		var t = $(this);
+		var runner = $(this).parent().parent().parent();
+		web_ui_props_id = $(runner).find('.web_ui_props_id').val();
+
+		$.post('/webui/delete/method', {
+			'web_ui_props_id': web_ui_props_id
 		}, function (response) {
 			t.next().show().fadeOut(1000);
 		});
diff --git a/apimanager/webui/templates/webui/index.html b/apimanager/webui/templates/webui/index.html
index dba24bf..d4cc3b0 100644
--- a/apimanager/webui/templates/webui/index.html
+++ b/apimanager/webui/templates/webui/index.html
@@ -7,30 +7,23 @@
     <div id="webui">
         <div id="webui_list">
             <h1>WEBUI</h1>
-
+            <div class="row">
+                <div class="col-xs-12 col-sm-4">
+                    <label class="form-group">Web UI Props Name:</label> <br>
+                </div>
+                <div class="col-xs-12 col-sm-4">
+                    <label class="form-group">Web UI Props Value:</label> <br>
+                </div>
+                <div class="col-sm-12 col-sm-4">
+                    <label class="form-group">Save Value:</label> <br>
+                </div>
+            </div>
             <form method="post">
                 {% csrf_token %}
-                {% if form.non_field_errors %}
-                    <div class="alert alert-danger">
-                        {{ form.non_field_errors }}
-                    </div>
-                {% endif %}
-
-                <div class="row">
-                    <div class="col-xs-12 col-sm-4">
-                        <label class="form-group">Web UI Props Name:</label> <br>
-                    </div>
-                    <div class="col-xs-12 col-sm-4">
-                        <label class="form-group">Web UI Props Value:</label> <br>
-                    </div>
-                    <div class="col-sm-12 col-sm-4">
-                        <label class="form-group">Save Value:</label> <br>
-                    </div>
-                </div>
-
                 {% for webui_prop in webui_props %}
                     <div class="runner">
                         <div class="row">
+                            <input type="hidden" , class="web_ui_props_id" , value="{{ webui_prop.web_ui_props_id }}">
                             <div class="col-xs-12 col-sm-4">
                                 <div class="form-group" cols="20" rows="1"><strong
                                         class="webui_props_name">{{ webui_prop.name }}</strong></div>
@@ -44,12 +37,12 @@
                             <div class="col-sm-12 col-sm-4">
                                 <div class="form-group">
                                     <button class="btn btn-primary btn-green forSave">Save</button>
+                                    <button class="btn btn-primary btn-red forDelete">Delete</button>
                                 </div>
                             </div>
                         </div>
                     </div>
                 {% endfor %}
-
             </form>
         </div>
     </div>
diff --git a/apimanager/webui/urls.py b/apimanager/webui/urls.py
index 4e687ff..ee5f9ee 100644
--- a/apimanager/webui/urls.py
+++ b/apimanager/webui/urls.py
@@ -5,7 +5,7 @@ URLs for config app
 
 from django.conf.urls import url
 
-from .views import IndexView, webui_save
+from .views import IndexView, webui_save, webui_delete
 
 urlpatterns = [
     url(r'^$',
@@ -13,4 +13,6 @@ urlpatterns = [
         name='webui-index'),
     url(r'save/method', webui_save,
         name='methodrouting-save'),
+    url(r'delete/method', webui_delete,
+        name='methodrouting-delete')
 ]
diff --git a/apimanager/webui/views.py b/apimanager/webui/views.py
index 06f7b2d..fe43d98 100644
--- a/apimanager/webui/views.py
+++ b/apimanager/webui/views.py
@@ -89,4 +89,23 @@ def webui_save(request):
         error_once_only(request, result['message'])
         msg = 'Submission successfully!'
         messages.success(request, msg)
+    return JsonResponse({'state': True})
+
+@csrf_exempt
+def webui_delete(request):
+    web_ui_props_id = request.POST.get('web_ui_props_id')
+
+    api = API(request.session.get('obp'))
+    try:
+        urlpath = '/management/webui_props/{}'.format(web_ui_props_id)
+        result = api.delete(urlpath)
+    except APIError as err:
+        error_once_only(request, APIError(Exception("OBP-API server is not running or do not response properly. "
+                                                    "Please check OBP-API server.   Details: " + str(err))))
+    except Exception as err:
+        error_once_only(request, "Unknown Error. Details: " + str(err))
+    if 'code' in result and result['code'] >= 400:
+        error_once_only(request, result['message'])
+        msg = 'Submission successfully!'
+        messages.success(request, msg)
     return JsonResponse({'state': True})
\ No newline at end of file