mirror of
https://github.com/OpenBankProject/API-Explorer.git
synced 2026-02-06 10:47:23 +00:00
Merge pull request #69 from hongwei1/develop
set the version into props
This commit is contained in:
Simon Redfern
GitHub
commit
48c759547b
@ -87,3 +87,6 @@ ssl_truststore_password=test1234
|
||||
ssl_keystore_location=/var/private/ssl/keystore.jks
|
||||
ssl_keystore_password=test1234
|
||||
ssl_key_password=test1234
|
||||
|
||||
# a list of version names those are shown in the main page, split with ,
|
||||
#main.included.links=OBP_PSD2, OBP_3.1.0
|
||||
@ -5,12 +5,11 @@ import java.net.URL
|
||||
import code.lib.ObpJson._
|
||||
import code.lib._
|
||||
import code.util.Helper.MdcLoggable
|
||||
import net.liftweb.util.Props
|
||||
import net.liftweb.util.{CssSel, Props}
|
||||
|
||||
import scala.collection.immutable.{List, Nil}
|
||||
|
||||
//import code.snippet.CallUrlForm._
|
||||
import net.liftweb._
|
||||
import net.liftweb.http.{S, SHtml}
|
||||
import net.liftweb.json.JsonAST.{JObject, JValue}
|
||||
import net.liftweb.json.{Extraction, JsonParser}
|
||||
@ -225,8 +224,11 @@ WIP to add comments on resource docs. This code copied from Sofit.
|
||||
val rawTagsParam = S.param("tags")
|
||||
|
||||
logger.info(s"rawTagsParam is $rawTagsParam")
|
||||
|
||||
val tagsParamString = "&tags=" + rawTagsParam.mkString(",")
|
||||
|
||||
|
||||
logger.info(s"tagsParamString is $rawTagsParam")
|
||||
|
||||
val tagsParam: Option[List[String]] = rawTagsParam match {
|
||||
// if tags= is supplied in the url we want to ignore it
|
||||
case Full("") => None
|
||||
@ -387,7 +389,7 @@ WIP to add comments on resource docs. This code copied from Sofit.
|
||||
// Possible OBP Versions
|
||||
//val obpVersionsSupported = List("1.2.1", "1.3.0", "1.4.0", "2.0.0", "2.1.0", "2.2.0", "3.0.0")
|
||||
// Save some space:
|
||||
val obpVersionsSupported = List("OBPv2.2.0", "OBPv3.0.0", "OBPv3.1.0")
|
||||
val obpVersionsSupported = List("OBPv2.2.0", "OBPv3.0.0", "OBPv3.1.0", "OBPv4.0.0")
|
||||
|
||||
// Save some more space:
|
||||
//val obpVersionsSupported = List("OBPv3.1.0")
|
||||
@ -431,10 +433,10 @@ WIP to add comments on resource docs. This code copied from Sofit.
|
||||
val baseVersionUrl = s"${OAuthClient.currentApiBaseUrl}"
|
||||
|
||||
// Link to the API endpoint for the resource docs json TODO change apiVersion so it doesn't have a "v" prefix
|
||||
val resourceDocsPath = s"${OAuthClient.currentApiBaseUrl}/obp/v1.4.0/resource-docs/${apiVersion.stripPrefix("v")}/obp?$pureCatalogParams"
|
||||
val resourceDocsPath = s"${OAuthClient.currentApiBaseUrl}/obp/v1.4.0/resource-docs/${apiVersion.stripPrefix("v")}/obp?$pureCatalogParams${tagsParamString}"
|
||||
|
||||
// Link to the API endpoint for the swagger json
|
||||
val swaggerPath = s"${OAuthClient.currentApiBaseUrl}/obp/v1.4.0/resource-docs/${apiVersion.stripPrefix("v")}/swagger?$pureCatalogParams"
|
||||
val swaggerPath = s"${OAuthClient.currentApiBaseUrl}/obp/v1.4.0/resource-docs/${apiVersion.stripPrefix("v")}/swagger?$pureCatalogParams${tagsParamString}"
|
||||
|
||||
|
||||
|
||||
@ -532,8 +534,10 @@ WIP to add comments on resource docs. This code copied from Sofit.
|
||||
}
|
||||
|
||||
val filteredResources2: List[ResourceDocPlus] = showPSD2 match {
|
||||
case Some(true) => filteredResources1.filter(x => x.isPSD2 == true)
|
||||
case Some(false) => filteredResources1.filter(x => x.isPSD2 == false)
|
||||
case Some(true) => filteredResources1
|
||||
.filter(_.isPSD2)
|
||||
.map(resourceDocPlus => resourceDocPlus.copy(tags = resourceDocPlus.tags.tail)) // exclude head tag
|
||||
case Some(false) => filteredResources1.filterNot(_.isPSD2)
|
||||
case _ => filteredResources1
|
||||
}
|
||||
|
||||
@ -960,9 +964,6 @@ WIP to add comments on resource docs. This code copied from Sofit.
|
||||
}
|
||||
|
||||
|
||||
val tagsParamString = "&tags=" + rawTagsParam.mkString(",")
|
||||
|
||||
|
||||
val thisApplicationUrl = s"${CurrentReq.value.uri}?version=${apiVersionRequested}&list-all-banks=${listAllBanks}${catalogParams}${tagsParamString}"
|
||||
|
||||
|
||||
@ -1233,6 +1234,7 @@ WIP to add comments on resource docs. This code copied from Sofit.
|
||||
//
|
||||
// Show the version to the user.
|
||||
// Append to the content child of id="version" e.g. the fixed text "Version:" is replacedWith "Version: 1.2.3"
|
||||
shownVersions() &
|
||||
"#version *+" #> apiVersion &
|
||||
"@obp_versions" #> obpVersionUrls.map { i =>
|
||||
"@obp_version *" #> s" ${i._1} " &
|
||||
@ -1417,6 +1419,30 @@ WIP to add comments on resource docs. This code copied from Sofit.
|
||||
".description *" #> stringToNodeSeq((i.description))
|
||||
}
|
||||
}
|
||||
|
||||
private lazy val shownVersionNamesInMainPage: Set[String] = {
|
||||
val shownLinks = Props.get("main.included.links") match {
|
||||
case Full(v) if(v.trim.size > 0) => v.trim
|
||||
case _ => "OBP_PSD2, OBP_3.1.0"
|
||||
}
|
||||
|
||||
shownLinks.split("""\s*,\s*""")
|
||||
.map(_.replaceAll("\\s+", "_"))
|
||||
.filterNot(_.isEmpty)
|
||||
.toSet
|
||||
}
|
||||
|
||||
|
||||
|
||||
private def shownVersions(): CssSel = {
|
||||
val requestUrl = S.uri.replaceFirst("""/?\?.*""", "") // remove request param part: /?param=.. or ?param=...
|
||||
requestUrl match {
|
||||
case "/" if(shownVersionNamesInMainPage.nonEmpty)=> shownVersionNamesInMainPage
|
||||
.map(id => s"#$id [style]" #> "").reduce( _ & _)
|
||||
case _ => "#notExists_this_is_just_do_nothing" #> "" // a placeholder of do nothing
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -54,10 +54,10 @@
|
||||
<div class="breadcrumbs">
|
||||
|
||||
<ul class="breadcrumbs__row">
|
||||
<li class="breadcrumbs__list">
|
||||
<li class="breadcrumbs__list" id="API_Home">
|
||||
<a id="api_home_link" href="This href should be replaced" class="breadcrumbs__link">API Home</a>
|
||||
</li>
|
||||
<li class="breadcrumbs__list">
|
||||
<li class="breadcrumbs__list" id="Glossary">
|
||||
<a id="glossary_link" href="./glossary" class="breadcrumbs__link">Glossary</a>
|
||||
</li>
|
||||
<!--
|
||||
@ -67,15 +67,16 @@
|
||||
<a name="obp_version" class="version" href="./?version=1.2.1">version</a>
|
||||
</li>
|
||||
-->
|
||||
<!--
|
||||
<li class="breadcrumbs__list">
|
||||
<li class="breadcrumbs__list" id="OBP_PSD2" style="display:none;">
|
||||
<a class="version" href="./?psd2=true">OBP PSD2</a>
|
||||
</li>
|
||||
-->
|
||||
<li class="breadcrumbs__list">
|
||||
<a class="version" href="?version=OBPv3.1.0">OBP 3.1.0</a>
|
||||
<li class="breadcrumbs__list" id="OBP_3.1.0" style="display:none;">
|
||||
<a class="version" href="?version=OBPv3.1.0" id="OBP 3.1.0">OBP 3.1.0</a>
|
||||
</li>
|
||||
<li class="breadcrumbs__list">
|
||||
<li class="breadcrumbs__list" id="OBP_4.0.0" style="display:none;">
|
||||
<a class="version" href="?version=OBPv4.0.0">OBP 4.0.0</a>
|
||||
</li>
|
||||
<li class="breadcrumbs__list" id="Berlin_Group" style="display:none;">
|
||||
<a class="version" href="?version=BGv1.3&tags=Berlin-Group-M">Berlin Group</a>
|
||||
</li>
|
||||
<!--
|
||||
@ -83,7 +84,7 @@
|
||||
<a name="other_version" class="version" href="./?version=1.2.1">version</a>
|
||||
</li>
|
||||
-->
|
||||
<li class="breadcrumbs__list">
|
||||
<li class="breadcrumbs__list" id="More">
|
||||
<a id="more-link" href="./more" class="breadcrumbs__link">More</a>
|
||||
</li>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user