Skip to content

Commit 6ba5656

Browse files
authored
Merge pull request #54 from ctrlplanedev/dacbd/api-update
ctrlplane api updates
2 parents 7b70937 + 439172e commit 6ba5656

3 files changed

Lines changed: 278 additions & 182 deletions

File tree

cmd/ctrlc/root/ui/fetcher.go

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,17 @@ func fetchDeployments(ctx context.Context, client *api.ClientWithResponses, work
9898
if item.Deployment.Description != nil {
9999
desc = *item.Deployment.Description
100100
}
101+
// Get system names (now plural)
102+
systemNames := ""
103+
if len(item.Systems) > 0 {
104+
systemNames = item.Systems[0].Name
105+
for i := 1; i < len(item.Systems); i++ {
106+
systemNames += ", " + item.Systems[i].Name
107+
}
108+
}
101109
rows = append(rows, tableRow{
102110
id: item.Deployment.Id,
103-
cols: []string{item.Deployment.Name, item.System.Name, item.Deployment.Slug, desc},
111+
cols: []string{item.Deployment.Name, systemNames, item.Deployment.Slug, desc},
104112
rawItem: item,
105113
})
106114
}
@@ -292,9 +300,17 @@ func fetchDeploymentsForResource(client *api.ClientWithResponses, workspaceID st
292300
if dep.Description != nil {
293301
desc = *dep.Description
294302
}
303+
// Join system IDs (now plural)
304+
systemIds := ""
305+
if len(dep.SystemIds) > 0 {
306+
systemIds = dep.SystemIds[0]
307+
for i := 1; i < len(dep.SystemIds); i++ {
308+
systemIds += ", " + dep.SystemIds[i]
309+
}
310+
}
295311
rows = append(rows, tableRow{
296312
id: dep.Id,
297-
cols: []string{dep.Name, dep.Slug, dep.SystemId, desc},
313+
cols: []string{dep.Name, dep.Slug, systemIds, desc},
298314
rawItem: dep,
299315
})
300316
}

cmd/ctrlc/root/ui/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ func (m Model) handleDrillDown() (tea.Model, tea.Cmd) {
289289
switch frame.resource {
290290
case resourceTypeDeployments:
291291
if frame.drillKind == "" {
292-
depItem, ok := row.rawItem.(api.DeploymentAndSystem)
292+
depItem, ok := row.rawItem.(api.DeploymentAndSystems)
293293
if !ok {
294294
return m, nil
295295
}

0 commit comments

Comments
 (0)