From bb8e6c4075caa6e74dafd0e92d79f9bfa13bc2c8 Mon Sep 17 00:00:00 2001
From: Reena-cell <ranireena68@gmail.com>
Date: Wed, 14 Dec 2022 14:44:56 +0100
Subject: [PATCH] bugfix/ fixed static issues

---
 .../static/dynamicendpoints/js/dynamicendpoints.js |  6 +++---
 apimanager/dynamicendpoints/views.py               |  1 +
 .../static/methodrouting/js/methodrouting.js       | 14 +++++++-------
 apimanager/metrics/forms.py                        |  8 ++++----
 apimanager/metrics/templates/metrics/api.html      | 10 +++++-----
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js b/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js
index 59c06bd..e976b69 100644
--- a/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js
+++ b/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js
@@ -13,7 +13,7 @@ $(document).ready(function($) {
 		var json_editor_id= $(runner).find('.jsoneditor_div')[0].id;
 		var json_editor_number = json_editor_id.replace("jsoneditor","");
 		var container = $("#"+json_editor_id);
-		parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text());
+		var parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text());
 		var jsoneditor_div =  $(runner).find('.jsoneditor_div');
 		//make sure only create one jsoneditor_div block 
 		if(!(jsoneditor_div.css("display") ==="block")){
@@ -31,7 +31,7 @@ $(document).ready(function($) {
 		var runner = $(this).parent().parent().parent();
 		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 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");
@@ -47,7 +47,7 @@ $(document).ready(function($) {
 	$('.runner button.forDelete').click(function() {
 		var t = $(this);
 		var runner = $(this).parent().parent().parent();
-		dynamic_endpoint_id = $(runner).find('.dynamic_endpoint_id').text();
+		var dynamic_endpoint_id = $(runner).find('.dynamic_endpoint_id').text();
 		$('.runner button.forSave').attr("disabled","disabled");
 		$('.runner button.forDelete').attr("disabled","disabled");
 		$.post('dynamicendpoints/delete/dynamicendpoint', {
diff --git a/apimanager/dynamicendpoints/views.py b/apimanager/dynamicendpoints/views.py
index e8179f4..15ff490 100644
--- a/apimanager/dynamicendpoints/views.py
+++ b/apimanager/dynamicendpoints/views.py
@@ -4,6 +4,7 @@ Views of config app
 """
 
 import json
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.views.generic import FormView
 from obp.api import API, APIError
diff --git a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
index 955a278..dc146df 100644
--- a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
+++ b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js
@@ -13,7 +13,7 @@ $(document).ready(function($) {
 		var json_editor_id= $(runner).find('.jsoneditor_div')[0].id;
 		var json_editor_number = json_editor_id.replace("jsoneditor","");
 		var container = $("#"+json_editor_id);
-		parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text());
+		var 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 (typeof json_editors[json_editor_number] === 'undefined') {
@@ -32,12 +32,12 @@ $(document).ready(function($) {
 	$('.runner button.forSave').click(function() {
 		var t = $(this);
 		var runner = $(this).parent().parent().parent();
-		method_routing_id = $(runner).find('.method_routing_id').text();
-		method_name = $(runner).find('.method_name').text();
-		connector_name = $(runner).find('.connector_name').val();
-		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 method_routing_id = $(runner).find('.method_routing_id').text();
+		var method_name = $(runner).find('.method_name').text();
+		var connector_name = $(runner).find('.connector_name').val();
+		var bank_id_pattern = $(runner).find('textarea[name="bank_id_pattern"]').val();
+		var is_bank_id_exact_match = $(runner).find('.is_bank_id_exact_match').val();
+		var parameters = $(runner).find('textarea[name="parameters"]').val();
 		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.
diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py
index 4a2bddd..358ee16 100644
--- a/apimanager/metrics/forms.py
+++ b/apimanager/metrics/forms.py
@@ -68,7 +68,7 @@ class APIMetricsForm(MetricsForm):
         ('true', 'Yes'),
         ('false', 'No'),
     )
-    VERB = (
+    VERB_SELECTION = (
         ('', _('Any')),
         ('DELETE', 'DELETE'),
         ('GET', 'GET'),
@@ -125,9 +125,9 @@ class APIMetricsForm(MetricsForm):
         ),
         required=False,
     )
-    verb = forms.ChoiceField(
-        label=_('Verb'),
-        choices=VERB,
+    verb_selection = forms.ChoiceField(
+        label=_('Verb Select'),
+        choices=VERB_SELECTION,
         widget=forms.Select(
             attrs={
                 'class': 'form-control',
diff --git a/apimanager/metrics/templates/metrics/api.html b/apimanager/metrics/templates/metrics/api.html
index 104c1c2..7512ac7 100644
--- a/apimanager/metrics/templates/metrics/api.html
+++ b/apimanager/metrics/templates/metrics/api.html
@@ -85,10 +85,10 @@
 
     		<div class="row">
     			<div class="col-xs-2">
-    				{% if form.verb.errors %}<div class="alert alert-danger">{{ form.verb.errors }}</div>{% endif %}
+    				{% if form.verb_selection.errors %}<div class="alert alert-danger">{{ form.verb_selection.errors }}</div>{% endif %}
     				<div class="form-group">
-						{{ form.verb.label_tag }}
-    					{{ form.verb }}
+						{{ form.verb_selection.label_tag }}
+    					{{ form.verb_selection }}
     				</div>
     			</div>
 
@@ -140,7 +140,7 @@
     					<thead>
     					<tr>
     						<th scope="col">#</th>
-    						<th scope="col">{% trans "Verb" %}</th>
+    						<th scope="col">{% trans "Verb Select" %}</th>
     						<th scope="col">{% trans "URL" %}</th>
     						<th scope="col">{% trans "Date" %}</th>
 							<th scope="col">{% trans "Duration(ms)" %}</th>
@@ -151,7 +151,7 @@
     					{% for metric in metrics %}
     						<tr>
     							<td>{{ forloop.counter }}</td>
-    							<td>{{ metric.verb }}</td>
+    							<td>{{ metric.verb_selection }}</td>
     							<td>
     								{{ metric.url }}
     							</td>