Merge pull request #135 from coder/minor-fixes

fioan89 · web-flow · commit a4432f0b96dd · 2022-12-23T15:49:37.000+02:00
Minor fixes
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt
@@ -3,15 +3,13 @@ package com.coder.gateway.sdk
 import com.coder.gateway.sdk.convertors.InstantConverter
 import com.coder.gateway.sdk.ex.AuthenticationResponseException
 import com.coder.gateway.sdk.ex.TemplateResponseException
-import com.coder.gateway.sdk.ex.WorkspaceResourcesResponseException
 import com.coder.gateway.sdk.ex.WorkspaceResponseException
 import com.coder.gateway.sdk.v2.CoderV2RestFacade
 import com.coder.gateway.sdk.v2.models.BuildInfo
 import com.coder.gateway.sdk.v2.models.CreateWorkspaceBuildRequest
 import com.coder.gateway.sdk.v2.models.Template
 import com.coder.gateway.sdk.v2.models.User
 import com.coder.gateway.sdk.v2.models.Workspace
-import com.coder.gateway.sdk.v2.models.WorkspaceAgent
 import com.coder.gateway.sdk.v2.models.WorkspaceBuild
 import com.coder.gateway.sdk.v2.models.WorkspaceTransition
 import com.google.gson.Gson
@@ -91,21 +89,6 @@ class CoderRestClientService {
         return buildInfoResponse.body()!!
     }
 
-    /**
-     * Retrieves the workspace agents a template declares.
-     * A workspace is a collection of objects like, VMs, containers, cloud DBs, etc...Agents run on compute hosts like VMs or containers.
-     *
-     * @throws WorkspaceResourcesResponseException if workspace resources could not be retrieved.
-     */
-    fun workspaceAgentsByTemplate(workspace: Workspace): List<WorkspaceAgent> {
-        val workspaceResourcesResponse = retroRestClient.templateVersionResources(workspace.latestBuild.templateVersionID).execute()
-        if (!workspaceResourcesResponse.isSuccessful) {
-            throw WorkspaceResourcesResponseException("Could not retrieve agents for ${workspace.name} workspace :${workspaceResourcesResponse.code()}, reason: ${workspaceResourcesResponse.message()}")
-        }
-
-        return workspaceResourcesResponse.body()!!.flatMap { it.agents ?: emptyList() }
-    }
-
     private fun template(templateID: UUID): Template {
         val templateResponse = retroRestClient.template(templateID).execute()
         if (!templateResponse.isSuccessful) {
diff --git a/src/main/kotlin/com/coder/gateway/sdk/TemplateIconDownloader.kt b/src/main/kotlin/com/coder/gateway/sdk/TemplateIconDownloader.kt
@@ -15,28 +15,28 @@ class TemplateIconDownloader {
     private val coderClient: CoderRestClientService = service()
     private val cache = mutableMapOf<Pair<String, String>, Icon>()
 
-    fun load(path: String, templateName: String): Icon {
+    fun load(path: String, workspaceName: String): Icon {
         var url: URL? = null
         if (path.startsWith("http")) {
             url = path.toURL()
-        } else if (path.contains(coderClient.coderURL.host)) {
+        } else if (!path.contains(":") && !path.contains("//")) {
             url = coderClient.coderURL.withPath(path)
         }
 
         if (url != null) {
-            val cachedIcon = cache[Pair(templateName, path)]
+            val cachedIcon = cache[Pair(workspaceName, path)]
             if (cachedIcon != null) {
                 return cachedIcon
             }
             var img = ImageLoader.loadFromUrl(url)
             if (img != null) {
                 val icon = IconUtil.toRetinaAwareIcon(Scalr.resize(ImageUtil.toBufferedImage(img), Scalr.Method.ULTRA_QUALITY, 32))
-                cache[Pair(templateName, path)] = icon
+                cache[Pair(workspaceName, path)] = icon
                 return icon
             }
         }
 
-        return iconForChar(templateName.lowercase().first())
+        return iconForChar(workspaceName.lowercase().first())
     }
 
     private fun iconForChar(c: Char) = when (c) {
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v2/CoderV2RestFacade.kt b/src/main/kotlin/com/coder/gateway/sdk/v2/CoderV2RestFacade.kt
@@ -5,7 +5,6 @@ import com.coder.gateway.sdk.v2.models.CreateWorkspaceBuildRequest
 import com.coder.gateway.sdk.v2.models.Template
 import com.coder.gateway.sdk.v2.models.User
 import com.coder.gateway.sdk.v2.models.WorkspaceBuild
-import com.coder.gateway.sdk.v2.models.WorkspaceResource
 import com.coder.gateway.sdk.v2.models.WorkspacesResponse
 import retrofit2.Call
 import retrofit2.http.Body
@@ -32,9 +31,6 @@ interface CoderV2RestFacade {
     @GET("api/v2/buildinfo")
     fun buildInfo(): Call<BuildInfo>
 
-    @GET("api/v2/templateversions/{templateID}/resources")
-    fun templateVersionResources(@Path("templateID") templateID: UUID): Call<List<WorkspaceResource>>
-
     /**
      * Queues a new build to occur for a workspace.
      */
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -118,7 +118,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
             maxWidth = JBUI.scale(52)
             minWidth = JBUI.scale(52)
         }
-
+        rowHeight = 48
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         selectionModel.addListSelectionListener {
             enableNextButtonCallback(selectedObject != null && selectedObject?.agentStatus == RUNNING && selectedObject?.agentOS == OS.LINUX)
@@ -523,7 +523,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                     null
                 )
                 cs.launch(Dispatchers.IO) {
-                    wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.templateName)
+                    wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)
                     withContext(Dispatchers.Main) {
                         tableOfWorkspaces.updateUI()
                     }
@@ -550,7 +550,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                         agent.directory
                     )
                     cs.launch(Dispatchers.IO) {
-                        wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.templateName)
+                        wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)
                         withContext(Dispatchers.Main) {
                             tableOfWorkspaces.updateUI()
                         }
@@ -575,7 +575,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
                         null
                     )
                     cs.launch(Dispatchers.IO) {
-                        wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.templateName)
+                        wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)
                         withContext(Dispatchers.Main) {
                             tableOfWorkspaces.updateUI()
                         }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :`
`118`	`118`	`maxWidth = JBUI.scale(52)`
`119`	`119`	`minWidth = JBUI.scale(52)`
`120`	`120`	`}`
`121`		`-`
	`121`	`+ rowHeight = 48`
`122`	`122`	`setSelectionMode(ListSelectionModel.SINGLE_SELECTION)`
`123`	`123`	`selectionModel.addListSelectionListener {`
`124`	`124`	`enableNextButtonCallback(selectedObject != null && selectedObject?.agentStatus == RUNNING && selectedObject?.agentOS == OS.LINUX)`
`@@ -523,7 +523,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :`
`523`	`523`	`null`
`524`	`524`	`)`
`525`	`525`	`cs.launch(Dispatchers.IO) {`
`526`		`- wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.templateName)`
	`526`	`+ wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)`
`527`	`527`	`withContext(Dispatchers.Main) {`
`528`	`528`	`tableOfWorkspaces.updateUI()`
`529`	`529`	`}`
`@@ -550,7 +550,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :`
`550`	`550`	`agent.directory`
`551`	`551`	`)`
`552`	`552`	`cs.launch(Dispatchers.IO) {`
`553`		`- wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.templateName)`
	`553`	`+ wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)`
`554`	`554`	`withContext(Dispatchers.Main) {`
`555`	`555`	`tableOfWorkspaces.updateUI()`
`556`	`556`	`}`
`@@ -575,7 +575,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :`
`575`	`575`	`null`
`576`	`576`	`)`
`577`	`577`	`cs.launch(Dispatchers.IO) {`
`578`		`- wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.templateName)`
	`578`	`+ wm.templateIcon = iconDownloader.load(wm.templateIconPath, wm.name)`
`579`	`579`	`withContext(Dispatchers.Main) {`
`580`	`580`	`tableOfWorkspaces.updateUI()`
`581`	`581`	`}`