From ed4bb5c265e2a40c83cfa87cb4e5ef6d38135ed6 Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Fri, 8 Jan 2021 09:59:57 +0100
Subject: [PATCH 1/6] feature/added the example value for the method_routings
 parameters

---
 apimanager/methodrouting/views.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apimanager/methodrouting/views.py b/apimanager/methodrouting/views.py
index 57986f9..04a37e0 100644
--- a/apimanager/methodrouting/views.py
+++ b/apimanager/methodrouting/views.py
@@ -43,7 +43,14 @@ class IndexView(LoginRequiredMixin, FormView):
             error_once_only(self.request, (Exception("Unknown Error. Details:" + str(err))))
         else:
             for i in range(len(method_routings)):
-                method_routings[i]['parameters'] = json.dumps(method_routings[i]['parameters'], sort_keys=False)
+                #if the parameters are empty, we provide the example value.
+                if(str(method_routings[i]['parameters']).find("key") == -1):
+                    method_routings[i]['parameters'] = json.dumps([{
+                        "key":"url",
+                        "value":"http://mydomain.com/xxx"
+                    }], sort_keys=False)
+                else:
+                    method_routings[i]['parameters'] = json.dumps(method_routings[i]['parameters'], sort_keys=False)
 
             context.update({
                 'method_routings': method_routings,

From afc06f8df82382f4f37a8d8aa82ae71032bc4349 Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Fri, 8 Jan 2021 10:57:40 +0100
Subject: [PATCH 2/6] feature/added the Hyperlink for method-routing field

---
 .../dynamicendpoints/templates/dynamicendpoints/index.html | 1 -
 .../methodrouting/templates/methodrouting/index.html       | 4 ++--
 apimanager/methodrouting/views.py                          | 7 ++++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html b/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
index 9350455..23ff31b 100644
--- a/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
+++ b/apimanager/dynamicendpoints/templates/dynamicendpoints/index.html
@@ -19,7 +19,6 @@
             <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>#}
                         <div class="dynamic_endpoint_id">{{ dynamic_endpoint.dynamic_endpoint_id }}</div></div>
                 </div>
                 
diff --git a/apimanager/methodrouting/templates/methodrouting/index.html b/apimanager/methodrouting/templates/methodrouting/index.html
index 2116595..877af21 100644
--- a/apimanager/methodrouting/templates/methodrouting/index.html
+++ b/apimanager/methodrouting/templates/methodrouting/index.html
@@ -31,8 +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>#}
-                        <div class="method_name">{{ method_routing.method_name }}</div></div>
+                        <div class="method_name"><a href="{{methodSwaggerUrl}}obp.{{method_routing.method_name}}">{{method_routing.method_name}}</a></div>
+                    </div>
                 </div>
                 <div class="col-xs-12 col-sm-2">
                     <select class="connector_name form-control " }>
diff --git a/apimanager/methodrouting/views.py b/apimanager/methodrouting/views.py
index 04a37e0..0ce4da6 100644
--- a/apimanager/methodrouting/views.py
+++ b/apimanager/methodrouting/views.py
@@ -52,9 +52,14 @@ class IndexView(LoginRequiredMixin, FormView):
                 else:
                     method_routings[i]['parameters'] = json.dumps(method_routings[i]['parameters'], sort_keys=False)
 
+            if(str(settings.API_ROOT).find("127.0.0.1") == -1):
+                methodSwaggerUrl = '{}/message-docs?connector=stored_procedure_vDec2019#'.format(settings.API_HOST.replace(".openbankproject.", "-explorer.openbankproject."))
+            else:
+                methodSwaggerUrl = "http://127.0.0.1:8082/message-docs?connector=stored_procedure_vDec2019#"
+            
             context.update({
                 'method_routings': method_routings,
-                "methodSwaggerUrl": json.dumps('{}/message-docs/rest_vMar2019/swagger2.0?functions'.format(settings.API_ROOT ))
+                "methodSwaggerUrl": methodSwaggerUrl
             })
         return context
 

From 20f9de55a8befc3bb4e8a893cc42d2a846f17a24 Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Mon, 11 Jan 2021 13:13:39 +0100
Subject: [PATCH 3/6] feature/disabled the django session cache #it broke the
 methodrouting save,delete button

---
 apimanager/apimanager/settings.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py
index c303ea7..6ef6969 100644
--- a/apimanager/apimanager/settings.py
+++ b/apimanager/apimanager/settings.py
@@ -62,7 +62,7 @@ INSTALLED_APPS = [
 ]
 
 MIDDLEWARE = [
-    'django.middleware.cache.UpdateCacheMiddleware',
+    # 'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -70,11 +70,11 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.cache.FetchFromCacheMiddleware',
+    # 'django.middleware.cache.FetchFromCacheMiddleware',
 ]
 
 #cache the view page, we set 60s = 1m, 
-CACHE_MIDDLEWARE_SECONDS = 60
+# CACHE_MIDDLEWARE_SECONDS = 60
 
 # TIMEOUT is 31104000 seconds = 60*60*24*30*12 (1 year)
 # MAX_ENTRIES is 1000000 entities

From d17a815d6e55d7291243f71c43c542187bd4d5bc Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Mon, 11 Jan 2021 13:38:51 +0100
Subject: [PATCH 4/6] feature/set the methodrouting parameters textarea to
 readonly

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

diff --git a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
index 58375c4..929b75e 100644
--- a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
+++ b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
@@ -15,12 +15,12 @@ $(document).ready(function($) {
 		var container = $("#"+json_editor_id);
 		parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text());
 		var jsoneditor_div =  $(runner).find('.jsoneditor_div');
-		//make sure only create one jsoneditor_div block 
+		//make sure only create one jsoneditor_div block, click once to open and then close the block.
 		if(!(jsoneditor_div.css("display") ==="block")){
 			json_editors[json_editor_number] = new JSONEditor(container[0], options, parameters);
 			jsoneditor_div.css("display","block");
 		}else{
-			json_editors[json_editor_number] = json_editors[json_editor_number].set(parameters)
+			jsoneditor_div.css("display","none");
 		}
 	});
 	
diff --git a/apimanager/methodrouting/templates/methodrouting/index.html b/apimanager/methodrouting/templates/methodrouting/index.html
index 877af21..b467a7b 100644
--- a/apimanager/methodrouting/templates/methodrouting/index.html
+++ b/apimanager/methodrouting/templates/methodrouting/index.html
@@ -97,7 +97,7 @@
                     </select>
                 </div>
                 <div class="col-xs-12 col-sm-2">
-                    <textarea cols="40" rows="1" class="form-control parameters"
+                    <textarea readonly cols="40" rows="1" class="form-control parameters"
                               name="parameters">{{ method_routing.parameters }}</textarea>
                 </div>
                 <div class="col-xs-12 col-sm-2">

From 6768374cae9127205cdd21b84ad24be5eeafd76a Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Mon, 11 Jan 2021 15:08:40 +0100
Subject: [PATCH 5/6] feature/set the methodrouting parameters jsoneditor to
 show or not

---
 .../static/methodrouting/js/methodrouting.js             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
index 929b75e..955a278 100644
--- a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
+++ b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
@@ -16,11 +16,16 @@ $(document).ready(function($) {
 		parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text());
 		var jsoneditor_div =  $(runner).find('.jsoneditor_div');
 		//make sure only create one jsoneditor_div block, click once to open and then close the block.
-		if(!(jsoneditor_div.css("display") ==="block")){
+		if (typeof json_editors[json_editor_number] === 'undefined') {
 			json_editors[json_editor_number] = new JSONEditor(container[0], options, parameters);
 			jsoneditor_div.css("display","block");
 		}else{
-			jsoneditor_div.css("display","none");
+			// json_editors[json_editor_number] = json_editors[json_editor_number].set(parameters)
+			if(jsoneditor_div.css("display") ==="block"){
+				jsoneditor_div.css("display","none");
+			}else{
+				jsoneditor_div.css("display","block");
+			}
 		}
 	});
 	

From ca48b530cb661420a6a8cdfa7635c79cea7e4181 Mon Sep 17 00:00:00 2001
From: Hongwei <hongwei@tesobe.com>
Date: Tue, 12 Jan 2021 11:12:50 +0100
Subject: [PATCH 6/6] feature/support multiple methodroutings

---
 .../templates/methodrouting/index.html             | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/apimanager/methodrouting/templates/methodrouting/index.html b/apimanager/methodrouting/templates/methodrouting/index.html
index b467a7b..5f30a9d 100644
--- a/apimanager/methodrouting/templates/methodrouting/index.html
+++ b/apimanager/methodrouting/templates/methodrouting/index.html
@@ -105,10 +105,16 @@
                             class="method_routing_id">{{ method_routing.method_routing_id }}</div></div>
                 </div>
                 <div class="col-sm-12 col-sm-2">
-                    <div class="form-group">
-                        <button class="btn btn-primary btn-green forSave">Save</button><span style="display: none;margin-left: 5px;background-color:#00cc00">saved.</span>
-                        <button class="btn btn-primary btn-red forDelete">Delete</button>
-                    </div>
+                    {% if method_routing.method_routing_id == "" %}
+                        <div class="form-group">
+                            <button class="btn btn-primary btn-green forSave">Create New </button>
+                        </div>
+                    {% else %}
+                        <div class="form-group">
+                            <button class="btn btn-primary btn-bule forSave">Update</button>
+                            <button class="btn btn-primary btn-red forDelete">Delete</button>
+                        </div>
+                    {% endif %}
                 </div>
                 <div class="col-sm-12 col-sm-12">
                     <div id="jsoneditor{{forloop.counter0}}" style="display: none" class ="jsoneditor_div"></div>