From 8d664b54926de6cc3eba03c114e1a16de85493a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Tue, 4 Apr 2023 09:02:21 +0200
Subject: [PATCH] bugfix/Web UI Props caching does not work

---
 obp-api/src/main/scala/code/snippet/WebUI.scala                | 1 -
 .../main/scala/code/webuiprops/MappedWebUiPropsProvider.scala  | 3 +--
 obp-api/src/main/scala/code/webuiprops/WebUiProps.scala        | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/obp-api/src/main/scala/code/snippet/WebUI.scala b/obp-api/src/main/scala/code/snippet/WebUI.scala
index 4a4ab405d..4111cd200 100644
--- a/obp-api/src/main/scala/code/snippet/WebUI.scala
+++ b/obp-api/src/main/scala/code/snippet/WebUI.scala
@@ -349,7 +349,6 @@ class WebUI extends MdcLoggable{
 
 
   def apiDocumentation: CssSel = {
-    val title = "Sandbox Introduction"
     val propsValue = getWebUiPropsValue("webui_sandbox_introduction", "")
     val htmlDescription =  if (APIUtil.glossaryDocsRequireRole){
       val userId = AuthUser.getCurrentResourceUserUserId
diff --git a/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala b/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala
index c19d6e935..6695de56d 100644
--- a/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala
+++ b/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala
@@ -37,7 +37,7 @@ object MappedWebUiPropsProvider extends WebUiPropsProvider {
   // 2) Get requested + language if any
   // 3) Get requested if any
   // 4) Get default value
-  override def getWebUiPropsValue(requestedPropertyName: String, defaultValue: String): String = saveConnectorMetric {
+  override def getWebUiPropsValue(requestedPropertyName: String, defaultValue: String, language: String = I18NUtil.currentLocale().toString()): String = saveConnectorMetric {
     import scala.concurrent.duration._
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
@@ -49,7 +49,6 @@ object MappedWebUiPropsProvider extends WebUiPropsProvider {
         }
         
         // In case there is a translation we must use it
-        val language = I18NUtil.currentLocale().toString()
         val webUiPropsPropertyName = s"${brandSpecificPropertyName}_${language}"
         val translatedAndOrBrandPropertyName = WebUiProps.find(By(WebUiProps.Name, webUiPropsPropertyName)).isDefined match {
           case true => webUiPropsPropertyName
diff --git a/obp-api/src/main/scala/code/webuiprops/WebUiProps.scala b/obp-api/src/main/scala/code/webuiprops/WebUiProps.scala
index 3bc25327c..78d8d63e2 100644
--- a/obp-api/src/main/scala/code/webuiprops/WebUiProps.scala
+++ b/obp-api/src/main/scala/code/webuiprops/WebUiProps.scala
@@ -23,7 +23,7 @@ trait WebUiPropsProvider {
 
   def delete(webUiPropsId: String):Box[Boolean]
 
-  def getWebUiPropsValue(nameOfProperty: String, defaultValue: String): String
+  def getWebUiPropsValue(nameOfProperty: String, defaultValue: String, language: String): String
 }