@@ -48,6 +48,9 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
48
48
private var listDWDataModel = DefaultListModel <DevWorkspace >()
49
49
private var listDevWorkspaces = JBList (listDWDataModel)
50
50
51
+ // 'true' when there are DevWorkspaces come from multiple namespaces
52
+ private var multipleNamespaces = false
53
+
51
54
private lateinit var stopDevWorkspaceButton: JButton
52
55
53
56
override val component = panel {
@@ -125,17 +128,18 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
125
128
126
129
private fun doRefreshAllDevWorkspaces () {
127
130
val devWorkspaces = ArrayList <DevWorkspace >()
131
+ val projects = Projects (devSpacesContext.client).list()
132
+
133
+ multipleNamespaces = projects.size > 1
128
134
129
- Projects (devSpacesContext.client)
130
- .list()
135
+ projects
131
136
.onEach { project ->
132
137
(Utils .getValue(project, arrayOf(" metadata" , " name" )) as String )
133
138
.also {
134
139
devWorkspaces.addAll(DevWorkspaces (devSpacesContext.client).list(it))
135
140
}
136
141
}
137
142
138
-
139
143
val selectedIndex = listDevWorkspaces.selectedIndex
140
144
141
145
listDWDataModel.apply {
@@ -257,8 +261,9 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
257
261
): Component {
258
262
return JBLabel (
259
263
String .format(
260
- " [%s] %s" ,
264
+ " [%s] %s %s " ,
261
265
devWorkspace.status.phase,
266
+ if (! multipleNamespaces) " " else (devWorkspace.metadata.namespace + " /" ),
262
267
devWorkspace.metadata.name
263
268
)
264
269
).also {
@@ -272,4 +277,4 @@ class DevSpacesRemoteServerConnectionStepView(private var devSpacesContext: DevS
272
277
refreshStopButton()
273
278
}
274
279
}
275
- }
280
+ }
0 commit comments