From 3fc62b71087e4ed269416d85a15a3f81ca79402b Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Tue, 31 Mar 2020 20:50:32 +0200
Subject: [PATCH 1/7] code clean

---
 .../methodrouting/static/methodrouting/js/methodrouting.js      | 1 -
 apimanager/users/views.py                                       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
index 1802975..77ef80b 100644
--- a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
+++ b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
@@ -36,7 +36,6 @@ $(document).ready(function($) {
 		var jsoneditor_id= $(runner).find('.jsoneditor_div')[0].id
 		var json_editor_number = jsoneditor_id.replace("jsoneditor","")
 		parameters_Json_editor = JSON.stringify(json_editors[json_editor_number].get());
-		console.log("parameters_Json_editor:"+parameters_Json_editor)
 		$('.runner button.forSave').attr("disabled","disabled");
 		$('.runner button.forDelete').attr("disabled","disabled");
 		$.post('methodrouting/save/method', {
diff --git a/apimanager/users/views.py b/apimanager/users/views.py
index 5ef9031..394efb8 100644
--- a/apimanager/users/views.py
+++ b/apimanager/users/views.py
@@ -58,7 +58,7 @@ class IndexView(LoginRequiredMixin, TemplateView):
             entitlements = api.get(urlpath)
             if 'code' in entitlements and entitlements['code'] >= 400:
                 messages.error(self.request, entitlements['message'] +
-                               " No Role name will be shown in the 'Filters' dropdown!")
+                               ". No Role name will be shown in the 'Filters' dropdown!")
             else:
                 for entitlement in entitlements['list']:
                     role_names.append(entitlement['role_name'])

From 516f1f36f2da715470975f9569c516bd17f14e45 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Tue, 31 Mar 2020 22:25:40 +0200
Subject: [PATCH 2/7] added the sub title for Dynamic Endpoints and Method
 Routings

---
 .../dynamicendpoints/templates/dynamicendpoints/index.html      | 2 +-
 apimanager/methodrouting/templates/methodrouting/index.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html b/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
index a7b8a6c..e9b1447 100644
--- a/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
+++ b/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load static %}
-{% block page_title %}{{ block.super }} / Users{% endblock page_title %}
+{% block page_title %}{{ block.super }} / Dynamic Endpoints{% endblock page_title %}
 
 {% block content %}
     <h1>Dynamic Endpoints</h1>
diff --git a/apimanager/methodrouting/templates/methodrouting/index.html b/apimanager/methodrouting/templates/methodrouting/index.html
index e7c4d10..292f081 100644
--- a/apimanager/methodrouting/templates/methodrouting/index.html
+++ b/apimanager/methodrouting/templates/methodrouting/index.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load static %}
-{% block page_title %}{{ block.super }} / Users{% endblock page_title %}
+{% block page_title %}{{ block.super }} / Method Routings{% endblock page_title %}
 
 {% block content %}
     <h1>Method Routing</h1>

From ea5477b8ef5890daec642ec2caf36157266418e7 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Tue, 31 Mar 2020 22:46:38 +0200
Subject: [PATCH 3/7] update the date to 2020

---
 apimanager/base/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html
index fa80ed1..673dfff 100644
--- a/apimanager/base/templates/base.html
+++ b/apimanager/base/templates/base.html
@@ -114,7 +114,7 @@
 				<a title="API ROOT" href="{{ API_ROOT }}">API ROOT: {{ API_ROOT }}</a> |
 				<a title="Open Bank Project" href="https://openbankproject.com">Open Bank Project</a> |
 				Powered by <a title="TESOBE" href="http://tesobe.com">TESOBE</a> |
-				<small>Copyright &copy; 2016 - 2017</small>
+				<small>Copyright &copy; 2016 - 2020</small>
 			</p>
 		</div>
 	</footer>

From 6d5c56a04728b26282bb3e724ece9969f2c28086 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Wed, 1 Apr 2020 12:42:21 +0200
Subject: [PATCH 4/7] used the <div instead of <a for method_name and
 dynamic_endpoint_id

---
 .../dynamicendpoints/templates/dynamicendpoints/index.html     | 3 ++-
 apimanager/methodrouting/templates/methodrouting/index.html    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html b/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
index e9b1447..9350455 100644
--- a/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
+++ b/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
@@ -19,7 +19,8 @@
             <div class="row">
                 <div class="col-xs-12 col-sm-2">
                     <div class="form-group" cols="1" rows="1">
-                        <a href="" class="dynamic_endpoint_id">{{ dynamic_endpoint.dynamic_endpoint_id }}</a></div>
+{#                        <a href="" class="dynamic_endpoint_id">{{ dynamic_endpoint.dynamic_endpoint_id }}</a></div>#}
+                        <div class="dynamic_endpoint_id">{{ dynamic_endpoint.dynamic_endpoint_id }}</div></div>
                 </div>
                 
                 <div class="col-xs-12 col-sm-8">
diff --git a/apimanager/methodrouting/templates/methodrouting/index.html b/apimanager/methodrouting/templates/methodrouting/index.html
index 292f081..0dff49e 100644
--- a/apimanager/methodrouting/templates/methodrouting/index.html
+++ b/apimanager/methodrouting/templates/methodrouting/index.html
@@ -31,7 +31,8 @@
             <div class="row">
                 <div class="col-xs-12 col-sm-2">
                     <div class="form-group" cols="1" rows="1">
-                        <a href="{{ methodSwaggerUrl }}={{ method_routing.method_name }}" class="method_name">{{ method_routing.method_name }}</a></div>
+{#                        <a href="{{ methodSwaggerUrl }}={{ method_routing.method_name }}" class="method_name">{{ method_routing.method_name }}</a></div>#}
+                        <div class="method_name">{{ method_routing.method_name }}</div></div>
                 </div>
                 <div class="col-xs-12 col-sm-2">
                     <select class="connector_name form-control " }>

From 16a1afd0a870bf3b462f20a498088d413cb8dabb Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Wed, 1 Apr 2020 12:43:09 +0200
Subject: [PATCH 5/7] use the parameter when there is no json_editors

---
 .../static/methodrouting/js/methodrouting.js         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
index 77ef80b..58375c4 100644
--- a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
+++ b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
@@ -33,9 +33,14 @@ $(document).ready(function($) {
 		bank_id_pattern = $(runner).find('textarea[name="bank_id_pattern"]').val();
 		is_bank_id_exact_match = $(runner).find('.is_bank_id_exact_match').val();
 		parameters = $(runner).find('textarea[name="parameters"]').val();
-		var jsoneditor_id= $(runner).find('.jsoneditor_div')[0].id
-		var json_editor_number = jsoneditor_id.replace("jsoneditor","")
-		parameters_Json_editor = JSON.stringify(json_editors[json_editor_number].get());
+		var jsoneditor_id= $(runner).find('.jsoneditor_div')[0].id;
+		var json_editor_number = jsoneditor_id.replace("jsoneditor","");
+		//if the user do not click the `parameters` box, then there is no json_editors here,so we use the parameters directly.
+		if (typeof json_editors[json_editor_number] === 'undefined') {
+			parameters_Json_editor = parameters;
+		} else {
+			parameters_Json_editor = JSON.stringify(json_editors[json_editor_number].get());
+		}
 		$('.runner button.forSave').attr("disabled","disabled");
 		$('.runner button.forDelete').attr("disabled","disabled");
 		$.post('methodrouting/save/method', {
@@ -44,7 +49,6 @@ $(document).ready(function($) {
 			'connector_name': connector_name,
 			'bank_id_pattern': bank_id_pattern,
 			'is_bank_id_exact_match': is_bank_id_exact_match,
-			'parameters': parameters_Json_editor,
 			'parameters_Json_editor': parameters_Json_editor,
 		}, function (response) {
 			location.reload(); 

From 804ff6954b2e5f3a3a34752ad468b81c03b19216 Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Wed, 1 Apr 2020 14:02:50 +0200
Subject: [PATCH 6/7] fixed the error handling for 204 error

---
 apimanager/obp/api.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/apimanager/obp/api.py b/apimanager/obp/api.py
index ec21904..efcf578 100644
--- a/apimanager/obp/api.py
+++ b/apimanager/obp/api.py
@@ -125,16 +125,12 @@ class API(object):
     def handle_response(self, response):
         """Handles the response, e.g. errors or conversion to JSON"""
         prefix = 'APIError'
-        # if response.status_code == 404:
-        #     self.handle_response_404(response, prefix)
-        # elif response.status_code == 500:
-        #     self.handle_response_500(response, prefix)
-        # elif response.status_code in [204]:
-        #     return response.text
-        # else:
-        data = response.json()
-        if isinstance(data,dict) and 'error' in data:
-            self.handle_response_error(prefix, data['error'])
+        if response.status_code in [204]:
+            return response.text
+        else:
+            data = response.json()
+            if isinstance(data,dict) and 'error' in data:
+                self.handle_response_error(prefix, data['error'])
         return data
 
     def start_session(self, session_data):

From fb24fc2d7189b4e9c38a021c5d8f3c7b7ed53c6d Mon Sep 17 00:00:00 2001
From: hongwei <hongwei@tesobe.com>
Date: Wed, 1 Apr 2020 14:03:29 +0200
Subject: [PATCH 7/7] blocked the textarea field when click parameter area

---
 .../static/dynamicendpoints/js/dynamicendpoints.js              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js b/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js
index 12005cf..59c06bd 100644
--- a/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js
+++ b/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js
@@ -18,9 +18,11 @@ $(document).ready(function($) {
 		//make sure only create one jsoneditor_div block 
 		if(!(jsoneditor_div.css("display") ==="block")){
 			json_editors[json_editor_number] = new JSONEditor(container[0], options, parameters);
+			$(runner).find('textarea[name="parameters"]').prop( "disabled", true );
 			jsoneditor_div.css("display","block");
 		}else{
 			json_editors[json_editor_number] = json_editors[json_editor_number].set(parameters)
+			$(runner).find('textarea[name="parameters"]').prop( "disabled", true );
 		}
 	});