Set of backend/frontend fixes (#343)

* Bump version number after failed release workflow * Removing small widget Icons * UI fixes requested by Grzegorz * Jenkins Widget fix - when endpoint has 2 public urls set then private url is not replaced with public for the button * SonarQube wiremock endpoints fixed * Widget content fixed - it should now display scroll handle if needed * ToDo list widget - font decreased * Cypress tests fixd * Jenkins Job widget will use last of the branches mentioned in the API response * CR Fixes + new init config provided by Grzegorz Co-authored-by: szymon.owczarzak <[email protected]>
wttech · Mar 22, 2021 · 8e6a215 · 8e6a215
1 parent 2ea494e
commit 8e6a215
Show file tree

Hide file tree

Showing 20 changed files with 1,446 additions and 240 deletions.
diff --git a/api-mocks/mappings/endpoints-mapping.json b/api-mocks/mappings/endpoints-mapping.json
@@ -281,7 +281,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/api/resources?resource=success&metrics=alert_status,blocker_violations,critical_violations,major_violations,minor_violations,bugs,code_smells,info_violations,vulnerabilities"
+        "urlPattern": "\/api\/resources(.)resource=success&metrics=alert_status(.*)"
       },
       "response": {
         "status": 200,
@@ -294,7 +294,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/api/resources?resource=fail&metrics=alert_status,blocker_violations,critical_violations,major_violations,minor_violations,bugs,code_smells,info_violations,vulnerabilities"
+        "urlPattern": "\/api\/resources(.)resource=fail&metrics=alert_status(.*)"
       },
       "response": {
         "status": 200,
@@ -307,7 +307,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/api/resources?resource=warning&metrics=alert_status,blocker_violations,critical_violations,major_violations,minor_violations,bugs,code_smells,info_violations,vulnerabilities"
+        "urlPattern": "\/api\/resources(.)resource=warning&metrics=alert_status(.*)"
       },
       "response": {
         "status": 200,
@@ -320,7 +320,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/api/measures/component?component=success&metricKeys=alert_status,blocker_violations,critical_violations,major_violations,minor_violations,bugs,code_smells,info_violations,vulnerabilities"
+        "urlPattern": "\/api\/measures\/component(.)component=success&metricKeys=alert_status(.*)"
       },
       "response": {
         "status": 200,
@@ -333,7 +333,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/api/measures/component?component=fail&metricKeys=alert_status,blocker_violations,critical_violations,major_violations,minor_violations,bugs,code_smells,info_violations,vulnerabilities"
+        "urlPattern": "\/api\/measures\/component(.)component=fail&metricKeys=alert_status(.*)"
       },
       "response": {
         "status": 200,
@@ -346,7 +346,7 @@
     {
       "request": {
         "method": "GET",
-        "url": "/api/measures/component?component=warning&metricKeys=alert_status,blocker_violations,critical_violations,major_violations,minor_violations,bugs,code_smells,info_violations,vulnerabilities"
+        "urlPattern": "\/api\/measures\/component(.)component=warning&metricKeys=alert_status(.*)"
       },
       "response": {
         "status": 200,
@@ -420,9 +420,7 @@
         "headers": {
           "Content-Type": "application/json"
         },
-        "transformers": [
-          "response-template"
-        ],
+        "transformers": ["response-template"],
         "bodyFileName": "zabbix/cpu.json"
       }
     },

diff --git a/cogboard-app/src/main/kotlin/com/cognifide/cogboard/widget/Util.kt b/cogboard-app/src/main/kotlin/com/cognifide/cogboard/widget/Util.kt
@@ -0,0 +1,9 @@
+package com.cognifide.cogboard.widget
+
+fun String.makeUrlPublic(publicDomain: String): String {
+    if (this == "") return ""
+    if (publicDomain == "") return this
+
+    val rest = this.substringAfter("//").substringAfter("/")
+    return "${publicDomain.removeSuffix("/")}/$rest"
+}
diff --git a/cogboard-app/src/main/kotlin/com/cognifide/cogboard/widget/type/JenkinsJobWidget.kt b/cogboard-app/src/main/kotlin/com/cognifide/cogboard/widget/type/JenkinsJobWidget.kt
@@ -4,8 +4,10 @@ import com.cognifide.cogboard.config.service.BoardsConfigService
 import com.cognifide.cogboard.http.auth.AuthenticationType
 import com.cognifide.cogboard.widget.AsyncWidget
 import com.cognifide.cogboard.widget.Widget
+import com.cognifide.cogboard.widget.makeUrlPublic
 import io.vertx.core.Vertx
 import io.vertx.core.json.JsonObject
+import kotlin.streams.toList
 import com.cognifide.cogboard.CogboardConstants as CC
 
 class JenkinsJobWidget(
@@ -35,28 +37,23 @@ class JenkinsJobWidget(
         else Widget.Status.from(lastBuild.getString("result", ""))
 
         lastBuild.put("branch", extractBranchInfo(lastBuild))
-            .put(CC.PROP_URL, makePublic(lastBuild.getString(CC.PROP_URL, "")))
+            .put(CC.PROP_URL, lastBuild.getString(CC.PROP_URL, "").makeUrlPublic(publicUrl))
             .put(CC.PROP_WIDGET_STATUS, status)
 
         send(lastBuild)
     }
 
-    private fun makePublic(privateUrl: String): String {
-        return privateUrl.replace(url, publicUrl)
-    }
-
     private fun extractBranchInfo(data: JsonObject): String {
-        var branch = "unknown"
-        data.getJsonArray("actions")
-                ?.stream()
-                ?.map { it as JsonObject }
-                ?.filter { it.containsKey("lastBuiltRevision") }
-                ?.findFirst()
-                ?.ifPresent { action ->
-                    action.getJsonObject("lastBuiltRevision")
-                            .getJsonArray("branch")
-                            ?.first().let { branch = (it as JsonObject).getString("name") }
-                }
+        var branch: String
+        (data.getJsonArray("actions")
+            ?.stream()
+            ?.map { it as JsonObject }
+            ?.filter { it.containsKey("lastBuiltRevision") }
+            ?.toList()
+            ?.last() as JsonObject)
+            .getJsonObject("lastBuiltRevision")
+            ?.getJsonArray("branch")
+            ?.first().let { branch = (it as JsonObject).getString("name") }
         return branch
                 .replaceFirst("refs/remotes/origin/", "")
                 .replaceFirst("refs/", "")