diff --git a/apimanager/apicollections/static/apicollections/js/apicollections.js b/apimanager/apicollections/static/apicollections/js/apicollections.js index d0d9d94..d38af31 100644 --- a/apimanager/apicollections/static/apicollections/js/apicollections.js +++ b/apimanager/apicollections/static/apicollections/js/apicollections.js @@ -1,11 +1,10 @@ $(document).ready(function($) { $('.runner button.forSave').click(function(e) { e.preventDefault(); - var t = $(this); - var runner = t.parent().parent().parent(); - var api_collection_name = $(runner).find('.api_collection_name').val(); - var api_collection_is_sharable = $(runner).find('.api_collection_is_sharable').val(); - var api_collection_description = $(runner).find('.api_collection_description').val(); + let runner = $(this).parent().parent().parent(); + let api_collection_name = $(runner).find('.api_collection_name').val(); + let api_collection_is_sharable = $(runner).find('.api_collection_is_sharable').val(); + let api_collection_description = $(runner).find('.api_collection_description').val(); $('.runner button.forSave').attr("disabled","disabled"); $('.runner button.forDelete').attr("disabled","disabled"); @@ -20,9 +19,8 @@ $(document).ready(function($) { $('.runner button.forDelete').click(function(e) { e.preventDefault(); - var t = $(this); - var runner = t.parent().parent().parent(); - var api_collection_id = $(runner).find('.api_collection_id').html(); + let runner = $(this).parent().parent().parent(); + let api_collection_id = $(runner).find('.api_collection_id').html(); $('.runner button.forSave').attr("disabled","disabled"); $('.runner button.forDelete').attr("disabled","disabled"); $.post('delete/apicollection', { diff --git a/apimanager/apicollections/views.py b/apimanager/apicollections/views.py index 7213925..a74ec0c 100644 --- a/apimanager/apicollections/views.py +++ b/apimanager/apicollections/views.py @@ -73,8 +73,8 @@ class DetailView(LoginRequiredMixin, FormView): except APIError as err: messages.error(self.request, err) return super(DetailView, self).form_invalid(form) - except: - messages.error(self.request, 'Unknown Error') + except BaseException as err: + error_once_only(self.request, (Exception("Unknown Error. Details:" + str(err)))) return super(DetailView, self).form_invalid(form) if 'code' in api_collection_endpoint and api_collection_endpoint['code']>=400: messages.error(self.request, api_collection_endpoint['message']) @@ -126,8 +126,8 @@ class DeleteCollectionEndpointView(LoginRequiredMixin, FormView): messages.success(request, msg) except APIError as err: messages.error(request, err) - except: - messages.error(self.request, 'Unknown Error') + except BaseException as err: + messages.error(self.request, 'Unknown Error', err) redirect_url = reverse('my-api-collection-detail',kwargs={"api_collection_id":kwargs['api_collection_id']}) return HttpResponseRedirect(redirect_url) @@ -155,7 +155,6 @@ def connectormethod_update(request): 'api_collection_is_sharable': request.POST.get('api_collection_is_sharable'), 'method_body': request.POST.get('api_collection_method_body_update').strip() } - result = HttpResponse(content_type = 'application/json') result = api.put(urlpath, payload=payload) return result diff --git a/apimanager/apimanager/urls.py b/apimanager/apimanager/urls.py index 5051e2a..419fb3a 100644 --- a/apimanager/apimanager/urls.py +++ b/apimanager/apimanager/urls.py @@ -54,7 +54,7 @@ urlpatterns += i18n_patterns( url(r'^connectormethod/', include('connectormethod.urls')), url(r'^dynamicendpoints/', include('dynamicendpoints.urls')), url(r'^apicollections/', include('apicollections.urls')), - url(r'^apicollections/list', include('apicollectionlist.urls')), + url(r'^apicollections-list', include('apicollectionlist.urls')), ) #prefix_default_language=False, #)+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/apimanager/base/static/css/base.css b/apimanager/base/static/css/base.css index b887c71..1a65793 100644 --- a/apimanager/base/static/css/base.css +++ b/apimanager/base/static/css/base.css @@ -208,13 +208,17 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo } .language-select { - text-decoration: none; - color:#fff; margin-left:5rem; + text-decoration: none !important; } #uk { cursor:pointer; } #es { cursor:pointer; -}1 \ No newline at end of file +} +.language_underline_format > a > span:hover + { + text-decoration: underline; + font-weight: bold !important; +} diff --git a/apimanager/base/static/js/base.js b/apimanager/base/static/js/base.js index cb2ee98..59d9dad 100644 --- a/apimanager/base/static/js/base.js +++ b/apimanager/base/static/js/base.js @@ -2,7 +2,7 @@ $(document).ready(function($) { $('table.tablesorter').tablesorter(); $('#authentication-select').change(function() { $('.authentication-method').hide(); - var method = $(this).val(); + let method = $(this).val(); $(`#authenticate-${method}`).show(); }); }); diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html index 10fe5b8..5f65ba1 100644 --- a/apimanager/base/templates/base.html +++ b/apimanager/base/templates/base.html @@ -14,7 +14,6 @@ - {% block extracss %}{% endblock extracss %} @@ -63,7 +62,7 @@
  • {% trans "Resources" %}
    • @@ -100,19 +100,16 @@ {% trans "API Tester" %} {% endif %} -
  • {% if user.is_authenticated %}

    {{API_USERNAME}}  {% trans "Logout" %}

    {% endif %}
    • - -
  • Language +
  • Language EN | ES
    • - diff --git a/apimanager/base/templates/home.html b/apimanager/base/templates/home.html index 3903534..a9351eb 100644 --- a/apimanager/base/templates/home.html +++ b/apimanager/base/templates/home.html @@ -46,10 +46,6 @@ {{ directlogin_form.password }} - diff --git a/apimanager/base/utils.py b/apimanager/base/utils.py index e904df6..54df439 100644 --- a/apimanager/base/utils.py +++ b/apimanager/base/utils.py @@ -24,7 +24,6 @@ def get_cache_key_for_current_call(request, urlpath): """we will generate the cache key by login username+urlpath url path may contain lots of special characters, here we use the hash method first. """ - #TODO, we need the obp user.provide there. return context_processors.api_username(request).get('API_USERNAME') + str(hash(urlpath)) diff --git a/apimanager/connectormethod/static/connectormethod/js/connectormethod.js b/apimanager/connectormethod/static/connectormethod/js/connectormethod.js index ddd25a2..9b9cc63 100644 --- a/apimanager/connectormethod/static/connectormethod/js/connectormethod.js +++ b/apimanager/connectormethod/static/connectormethod/js/connectormethod.js @@ -1,11 +1,10 @@ $(document).ready(function($) { $('.runner button.forSave').click(function(e) { e.preventDefault(); - var t = $(this); - var runner = t.parent().parent().parent(); - var connector_method_name = $(runner).find('.connector_method_name').val(); - var connector_method_programming_lang = $(runner).find('.connector_method_programming_lang').val(); - var connector_method_body = $(runner).find('.connector_method_body').val(); + let runner = $(this).parent().parent().parent(); + let connector_method_name = $(runner).find('.connector_method_name').val(); + let connector_method_programming_lang = $(runner).find('.connector_method_programming_lang').val(); + let connector_method_body = $(runner).find('.connector_method_body').val(); $('.runner button.forSave').attr("disabled", "disabled"); $('.runner button.forDelete').attr("disabled", "disabled"); @@ -20,11 +19,10 @@ $(document).ready(function($) { $('.runner button.forUpdate').click(function(e) { e.preventDefault(); - var t = $(this); - var runner = t.parent().parent().parent(); - var connector_method_id = $(runner).find('.connector_method_id').html(); - var connector_method_programming_lang_update = $(runner).find('.connector_method_programming_lang_update').val(); - var connector_method_body_update = $(runner).find('.connector_method_body_update').val(); + let runner = $(this).parent().parent().parent(); + let connector_method_id = $(runner).find('.connector_method_id').html(); + let connector_method_programming_lang_update = $(runner).find('.connector_method_programming_lang_update').val(); + let connector_method_body_update = $(runner).find('.connector_method_body_update').val(); $('.runner button.forSave').attr("disabled", "disabled"); $('.runner button.forUpdate').attr("disabled", "disabled"); diff --git a/apimanager/connectormethod/views.py b/apimanager/connectormethod/views.py index 7fa0fa1..56c15f6 100644 --- a/apimanager/connectormethod/views.py +++ b/apimanager/connectormethod/views.py @@ -73,6 +73,5 @@ def connectormethod_update(request): 'programming_lang': request.POST.get('connector_method_programming_lang_update'), 'method_body': request.POST.get('connector_method_body_update').strip() } - result = HttpResponse(content_type = 'application/json') result = api.put(urlpath, payload=payload) return result diff --git a/apimanager/consumers/views.py b/apimanager/consumers/views.py index 5ca2f48..b1fb37e 100644 --- a/apimanager/consumers/views.py +++ b/apimanager/consumers/views.py @@ -16,9 +16,6 @@ from base.filters import BaseFilter, FilterTime from .forms import ApiConsumersForm -# import logging -# logger = logging.getLogger(__name__) - class FilterAppType(BaseFilter): """Filter consumers by application type""" @@ -129,7 +126,6 @@ class DetailView(LoginRequiredMixin, FormView): 'per_week_call_limit': data['per_week_call_limit'], 'per_month_call_limit': data['per_month_call_limit'] } - user = self.api.put(urlpath, payload=payload) except APIError as err: messages.error(self.request, err) return super(DetailView, self).form_invalid(api_consumers_form) @@ -191,8 +187,8 @@ class EnableDisableView(LoginRequiredMixin, RedirectView): messages.success(self.request, self.success) except APIError as err: messages.error(self.request, err) - except: - messages.error(self.request, "Unknown") + except APIError as err: + messages.error(self.request, err) urlpath = self.request.POST.get('next', reverse('consumers-index')) query = self.request.GET.urlencode() diff --git a/apimanager/customerlist/views.py b/apimanager/customerlist/views.py index 1774edf..04e2569 100644 --- a/apimanager/customerlist/views.py +++ b/apimanager/customerlist/views.py @@ -26,9 +26,7 @@ class CustomerListView(CreateView, LoginRequiredMixin, FormView ): try: self.bankids = get_banks(self.request) customers_list = [] - #for bank_id in self.bankids: urlpath = '/customers' - #urlpath = 'http://127.0.0.1:8080/obp/v4.0.0/my/customers' result = api.get(urlpath) if 'customers' in result: customers_list.extend(result['customers']) diff --git a/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js b/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js index e976b69..d3c2616 100644 --- a/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js +++ b/apimanager/dynamicendpoints/static/dynamicendpoints/js/dynamicendpoints.js @@ -9,12 +9,12 @@ $(document).ready(function($) { //and will use the data from click `save` button. var json_editors = [] $('.parameters').click(function() { - var runner = $(this).parent().parent().parent(); - var json_editor_id= $(runner).find('.jsoneditor_div')[0].id; - var json_editor_number = json_editor_id.replace("jsoneditor",""); - var container = $("#"+json_editor_id); - var parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text()); - var jsoneditor_div = $(runner).find('.jsoneditor_div'); + let runner = $(this).parent().parent().parent(); + let json_editor_id= $(runner).find('.jsoneditor_div')[0].id; + let json_editor_number = json_editor_id.replace("jsoneditor",""); + let container = $("#"+json_editor_id); + let parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text()); + let jsoneditor_div = $(runner).find('.jsoneditor_div'); //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); @@ -27,11 +27,10 @@ $(document).ready(function($) { }); $('.runner button.forSave').click(function() { - var t = $(this); - var runner = $(this).parent().parent().parent(); - var jsoneditor_id= $(runner).find('.jsoneditor_div')[0].id - var json_editor_number = jsoneditor_id.replace("jsoneditor","") - var parameters_Json_editor = JSON.stringify(json_editors[json_editor_number].get()); + let runner = $(this).parent().parent().parent(); + let jsoneditor_id= $(runner).find('.jsoneditor_div')[0].id + let json_editor_number = jsoneditor_id.replace("jsoneditor","") + let 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"); @@ -45,9 +44,8 @@ $(document).ready(function($) { }); $('.runner button.forDelete').click(function() { - var t = $(this); - var runner = $(this).parent().parent().parent(); - var dynamic_endpoint_id = $(runner).find('.dynamic_endpoint_id').text(); + let runner = $(this).parent().parent().parent(); + let 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 15ff490..3ec011a 100644 --- a/apimanager/dynamicendpoints/views.py +++ b/apimanager/dynamicendpoints/views.py @@ -274,10 +274,10 @@ class IndexView(LoginRequiredMixin, FormView): @exception_handle @csrf_exempt def dynamicendpoints_save(request): - parameters_Json_editor = request.POST.get('parameters_Json_editor') + parameters_Json_editor_dynamic = request.POST.get('parameters_Json_editor') api = API(request.session.get('obp')) urlpath = '/management/dynamic-endpoints' - result = api.post(urlpath, payload=json.loads(parameters_Json_editor) ) + result = api.post(urlpath, payload=json.loads(parameters_Json_editor_dynamic) ) return result diff --git a/apimanager/locale/deepl_translation_function.py b/apimanager/locale/deepl_translation_function.py index 5786433..b5792c3 100644 --- a/apimanager/locale/deepl_translation_function.py +++ b/apimanager/locale/deepl_translation_function.py @@ -1,7 +1,6 @@ import requests import os import dotenv -#from deepl_translation_fun import trasnlator BASE_DIR = os.getcwd() #method tells us the location of current working directory diff --git a/apimanager/locale/generatePo.py b/apimanager/locale/generatePo.py index 558101b..fa06fd1 100644 --- a/apimanager/locale/generatePo.py +++ b/apimanager/locale/generatePo.py @@ -7,29 +7,27 @@ languages=['de','es','fr','hi'] # Defining languages # This class is used for converting languages -class clsTranslate(): - def translateText(self, strString, strTolang): +class languageConverting(): + def parametersTextConverte(self, stString, prevlangToNewlang): """ This function translates one language into another language. It takes two parameters - 1. strString :=> String that you want to convert - 2. strTolang :=> Languages(fr,hi,es etc) + 1. prevStrToNewString :=> String that you want to convert + 2. prevlangToNewlang :=> Languages(fr,hi,es etc) """ - self.strString = strString - self.strTolang = strTolang - translator = translator(text=self.strString, language=self.strTolang) + self.prevStrToNewString = prevStrToNewString + self.prevlangToNewlang = prevlangToNewlang + translator = translator(text=self.prevStrToNewString, language=self.prevlangToNewlang) return (str(translator)) # This is method for writing file -def writeFile(language): - print(language,"Started") +def localeWriteFile(language): fileName=f'locale/{language}/LC_MESSAGES/django.po' # Openning a file try: with open(fileName,encoding='utf-8') as f: # Reading from the file a=[i.replace("\n","") for i in f.readlines()] # Reading everyline from a file and store it into a except Exception as e: # same like try block. - print(fileName, e) b=0 for i in range(len(a)): if 'msgid' in a[i] and a[i]!='msgid ""': @@ -37,29 +35,25 @@ def writeFile(language): break if b!=0: - trans=clsTranslate() # Creating object for translation class + trans=languageConverting() # Creating object for translation class for i in range(b-1,len(a)): try: if "msgid" in a[i]: msgid,msgstr=a[i],a[i+1] if msgstr == 'msgstr ""': ms=msgid[7:len(msgid)-1] - val=trans.translateText(ms,language) + val=trans.parametersTextConverte(ms,language) a[i+1]=f'msgstr "{val}"' - # print(a[i]) except: pass try: lock.acquire() with open(fileName,'w',encoding='utf-8') as f: for i in a: f.write(f"{i}\n") - print(language,"is completed") lock.release() except Exception as e: - print(e) lock.release() else: - print(language,"is completed") with tpe() as e: - e.map(writeFile,languages) + e.map(localeWriteFile,languages) diff --git a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js index dc146df..912fc07 100644 --- a/apimanager/methodrouting/static/methodrouting/js/methodrouting.js +++ b/apimanager/methodrouting/static/methodrouting/js/methodrouting.js @@ -7,14 +7,14 @@ $(document).ready(function($) { //each method_routing will have each own json_editor, and will put data into it when click `parameter` box //and will use the data from click `save` button. - var json_editors = [] + let json_editors = [] $('.parameters').click(function() { - var runner = $(this).parent().parent().parent(); - var json_editor_id= $(runner).find('.jsoneditor_div')[0].id; - var json_editor_number = json_editor_id.replace("jsoneditor",""); - var container = $("#"+json_editor_id); - var parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text()); - var jsoneditor_div = $(runner).find('.jsoneditor_div'); + let runner = $(this).parent().parent().parent(); + let json_editor_id= $(runner).find('.jsoneditor_div')[0].id; + let json_editor_number = json_editor_id.replace("jsoneditor",""); + let container = $("#"+json_editor_id); + let parameters = JSON.parse($(runner).find('textarea[name="parameters"]').text()); + let 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') { json_editors[json_editor_number] = new JSONEditor(container[0], options, parameters); @@ -30,21 +30,20 @@ $(document).ready(function($) { }); $('.runner button.forSave').click(function() { - var t = $(this); - var runner = $(this).parent().parent().parent(); - 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",""); + let runner = $(this).parent().parent().parent(); + let method_routing_id = $(runner).find('.method_routing_id').text(); + let method_name = $(runner).find('.method_name').text(); + let connector_name = $(runner).find('.connector_name').val(); + let bank_id_pattern = $(runner).find('textarea[name="bank_id_pattern"]').val(); + let is_bank_id_exact_match = $(runner).find('.is_bank_id_exact_match').val(); + let parameters = $(runner).find('textarea[name="parameters"]').val(); + let jsoneditor_id= $(runner).find('.jsoneditor_div')[0].id; + let 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; + let parameters_Json_editor = parameters; } else { - parameters_Json_editor = JSON.stringify(json_editors[json_editor_number].get()); + let parameters_Json_editor = JSON.stringify(json_editors[json_editor_number].get()); } $('.runner button.forSave').attr("disabled","disabled"); $('.runner button.forDelete').attr("disabled","disabled"); @@ -63,9 +62,8 @@ $(document).ready(function($) { }); $('.runner button.forDelete').click(function() { - var t = $(this); - var runner = $(this).parent().parent().parent(); - method_routing_id = $(runner).find('.method_routing_id').text(); + let runner = $(this).parent().parent().parent(); + let method_routing_id = $(runner).find('.method_routing_id').text(); $('.runner button.forSave').attr("disabled","disabled"); $('.runner button.forDelete').attr("disabled","disabled"); $.post('methodrouting/delete/method', { diff --git a/apimanager/methodrouting/templates/methodrouting/index.html b/apimanager/methodrouting/templates/methodrouting/index.html index 0944e6d..229c236 100644 --- a/apimanager/methodrouting/templates/methodrouting/index.html +++ b/apimanager/methodrouting/templates/methodrouting/index.html @@ -99,7 +99,7 @@ -
    +