From f657ff15829d62c2d959c44946b927f95405efc5 Mon Sep 17 00:00:00 2001
From: Artem Zatsarynnyi <azatsary@redhat.com>
Date: Tue, 16 Jul 2024 13:39:44 +0200
Subject: [PATCH] Show namespace name when there are DevWorkspaces from
 multiple OpenShift projects

---
 .../DevSpacesRemoteServerConnectionStepView.kt    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/redhat/devtools/gateway/view/steps/DevSpacesRemoteServerConnectionStepView.kt b/src/main/kotlin/com/redhat/devtools/gateway/view/steps/DevSpacesRemoteServerConnectionStepView.kt
index 82fe734..a9f92f2 100644
--- a/src/main/kotlin/com/redhat/devtools/gateway/view/steps/DevSpacesRemoteServerConnectionStepView.kt
+++ b/src/main/kotlin/com/redhat/devtools/gateway/view/steps/DevSpacesRemoteServerConnectionStepView.kt
@@ -48,6 +48,9 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
     private var listDWDataModel = DefaultListModel<DevWorkspace>()
     private var listDevWorkspaces = JBList(listDWDataModel)
 
+    // 'true' when there are DevWorkspaces come from multiple namespaces
+    private var multipleNamespaces = false
+
     private lateinit var stopDevWorkspaceButton: JButton
 
     override val component = panel {
@@ -125,9 +128,11 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
 
     private fun doRefreshAllDevWorkspaces() {
         val devWorkspaces = ArrayList<DevWorkspace>()
+        val projects = Projects(devSpacesContext.client).list()
+
+        multipleNamespaces = projects.size > 1
 
-        Projects(devSpacesContext.client)
-            .list()
+        projects
             .onEach { project ->
                 (Utils.getValue(project, arrayOf("metadata", "name")) as String)
                     .also {
@@ -135,7 +140,6 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
                     }
             }
 
-
         val selectedIndex = listDevWorkspaces.selectedIndex
 
         listDWDataModel.apply {
@@ -257,8 +261,9 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
         ): Component {
             return JBLabel(
                 String.format(
-                    "[%s] %s",
+                    "[%s] %s %s",
                     devWorkspace.status.phase,
+                    if (!multipleNamespaces) "" else (devWorkspace.metadata.namespace + " /"),
                     devWorkspace.metadata.name
                 )
             ).also {
@@ -272,4 +277,4 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
             refreshStopButton()
         }
     }
-}
\ No newline at end of file
+}