Skip to content

Commit f657ff1

Browse files
committed
Show namespace name when there are DevWorkspaces from multiple OpenShift projects
1 parent f9319d9 commit f657ff1

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/main/kotlin/com/redhat/devtools/gateway/view/steps/DevSpacesRemoteServerConnectionStepView.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
4848
private var listDWDataModel = DefaultListModel<DevWorkspace>()
4949
private var listDevWorkspaces = JBList(listDWDataModel)
5050

51+
// 'true' when there are DevWorkspaces come from multiple namespaces
52+
private var multipleNamespaces = false
53+
5154
private lateinit var stopDevWorkspaceButton: JButton
5255

5356
override val component = panel {
@@ -125,17 +128,18 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
125128

126129
private fun doRefreshAllDevWorkspaces() {
127130
val devWorkspaces = ArrayList<DevWorkspace>()
131+
val projects = Projects(devSpacesContext.client).list()
132+
133+
multipleNamespaces = projects.size > 1
128134

129-
Projects(devSpacesContext.client)
130-
.list()
135+
projects
131136
.onEach { project ->
132137
(Utils.getValue(project, arrayOf("metadata", "name")) as String)
133138
.also {
134139
devWorkspaces.addAll(DevWorkspaces(devSpacesContext.client).list(it))
135140
}
136141
}
137142

138-
139143
val selectedIndex = listDevWorkspaces.selectedIndex
140144

141145
listDWDataModel.apply {
@@ -257,8 +261,9 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
257261
): Component {
258262
return JBLabel(
259263
String.format(
260-
"[%s] %s",
264+
"[%s] %s %s",
261265
devWorkspace.status.phase,
266+
if (!multipleNamespaces) "" else (devWorkspace.metadata.namespace + " /"),
262267
devWorkspace.metadata.name
263268
)
264269
).also {
@@ -272,4 +277,4 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
272277
refreshStopButton()
273278
}
274279
}
275-
}
280+
}

0 commit comments

Comments
 (0)