#72 Fix container url when using unix:///var/run/docker.sock

Author: Felix

chromeapp/src/main/scala/util/ChromePlatformService.scala

@@ -88,6 +88,8 @@ object ChromePlatformService extends PlatformService {
   }
 
   override def checkIsLatestVersion(callback: (String) => Unit): Unit = {} // Auto Chrome update
+
+  def openExternalLink(event: Event): Unit = {}  // Already in the browser
 }
 
 

electron/src/main/scala/util/ElectronPlatformService.scala

@@ -6,6 +6,7 @@ import model.{BasicWebSocket, Connection, DockerEvent}
 import nodejs.raw.EventEmitter
 import org.scalajs.dom
 import org.scalajs.dom.ext.Ajax.InputData
+import org.scalajs.dom.raw.Event
 import util.EventsCustomParser.DockerEventStream
 import util.PullEventsCustomParser.{EventStatus, EventStream}
 import util.logger.log
@@ -89,6 +90,14 @@ object ElectronPlatformService extends PlatformService {
   }
 
   override def checkIsLatestVersion(callback: (String) => Unit): Unit = CheckIsLatestVersion.check(callback)
+
+
+  def openExternalLink(event: Event): Unit = {
+    val shell = js.Dynamic.global.require("electron").shell
+    event.preventDefault()
+    shell.openExternal(event.target.asInstanceOf[Dynamic].href)
+  }
+
 }
 
 class ElectronDockerConnection(val connection: Connection) extends DockerConnection {

src/main/scala/model/model.scala

@@ -15,7 +15,7 @@ import scala.util.Try
 
 case class Connection(url: String) {
   import util.StringUtils._
-  def ip = substringBefore(substringAfter(url, "://"), ":")
+  def host = substringBefore(substringAfter(url, "://"), ":").replace("/var/run/docker.sock", "localhost")
 }
 
 case class DockerMetadata(connectionInfo: String,

src/main/scala/ui/pages/ContainerPage.scala

@@ -5,7 +5,7 @@ import japgolly.scalajs.react.vdom.prefix_<^._
 import japgolly.scalajs.react.{BackendScope, ReactComponentB, ReactElement}
 import model.stats.ContainerStats
 import model.{BasicWebSocket, ContainerInfo, ContainerTop, FileSystemChange}
-import org.scalajs.dom.raw.WebSocket
+import org.scalajs.dom.raw.{Event, WebSocket}
 import ui.WorkbenchRef
 import ui.widgets.TerminalCard.TerminalInfo
 import ui.widgets._
@@ -128,6 +128,10 @@ object ContainerPage {
       stream.abort()
       t.modState(s => s.copy(statsConnectedStream = None))
     }
+
+    def openExternalLink(event: Event): Unit = {
+      PlatformService.current.openExternalLink(event)
+    }
   }
 
 
@@ -191,7 +195,7 @@ object ContainerPageRender {
         vdomCommands(S, B)
       ),
       InfoCard(executionInfo),
-      InfoCard(networkInfo, InfoCard.SMALL, None, Seq.empty, vdomServiceUrl(containerInfo, P))
+      InfoCard(networkInfo, InfoCard.SMALL, None, Seq.empty, vdomServiceUrl(B, containerInfo, P))
     )
   }
 
@@ -221,12 +225,12 @@ object ContainerPageRender {
     )
   }
 
-  def vdomServiceUrl(containerInfo: ContainerInfo, P: Props) = {
-    val ip = P.ref.connection.map(_.ip).getOrElse("")
+  def vdomServiceUrl(B: Backend, containerInfo: ContainerInfo, P: Props) = {
+    val host = P.ref.connection.map(_.host).getOrElse("")
     containerInfo.NetworkSettings.ports.map {
-      case (external, internal) => ip + ":" + external
+      case (external, _) => host + ":" + external
     }
-  }.map(url => <.div(^.className := "panel-footer", <.a(^.href := s"http://$url", ^.target := "_blank")(url))).headOption
+  }.map(url => <.div(^.className := "panel-footer", <.a(^.href := s"http://$url", ^.target := "_blank", ^.onClick ==> B.openExternalLink )(url))).headOption
 
   def vdomCommands(state: State, B: Backend) =
     Some(<.div(^.className := "panel-footer",

src/main/scala/util/PlatformService.scala

@@ -2,6 +2,7 @@ package util
 
 import api.DockerClient
 import model.Connection
+import org.scalajs.dom.raw.Event
 import util.logger._
 
 import scala.concurrent.Future
@@ -29,6 +30,8 @@ trait PlatformService {
 
   def checkIsLatestVersion(callback: (String => Unit)): Unit
 
+  def openExternalLink(event: Event): Unit
+
 }
 
 object PlatformService {