Skip to content

Commit b3828ed

Browse files
committed
Show full nodeID and executionID with --wide flag
1 parent 7cf0f35 commit b3828ed

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

cmd/cli/job/executions.go

+10-4
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,18 @@ var (
106106
Value: func(e *models.Execution) string { return output.Elapsed(e.GetModifyTime()) },
107107
}
108108
executionColumnID = output.TableColumn[*models.Execution]{
109-
ColumnConfig: table.ColumnConfig{Name: "ID", WidthMax: 10, WidthMaxEnforcer: text.WrapText},
110-
Value: func(e *models.Execution) string { return idgen.ShortUUID(e.ID) },
109+
ColumnConfig: table.ColumnConfig{
110+
Name: "ID",
111+
WidthMax: idgen.ShortIDLengthWithPrefix,
112+
WidthMaxEnforcer: func(col string, maxLen int) string { return idgen.ShortUUID(col) }},
113+
Value: func(e *models.Execution) string { return e.ID },
111114
}
112115
executionColumnNodeID = output.TableColumn[*models.Execution]{
113-
ColumnConfig: table.ColumnConfig{Name: "Node ID", WidthMax: 10, WidthMaxEnforcer: text.WrapText},
114-
Value: func(e *models.Execution) string { return idgen.ShortNodeID(e.NodeID) },
116+
ColumnConfig: table.ColumnConfig{
117+
Name: "Node ID",
118+
WidthMax: idgen.ShortIDLengthWithPrefix,
119+
WidthMaxEnforcer: func(col string, maxLen int) string { return idgen.ShortUUID(col) }},
120+
Value: func(e *models.Execution) string { return e.NodeID },
115121
}
116122
executionColumnRev = output.TableColumn[*models.Execution]{
117123
ColumnConfig: table.ColumnConfig{Name: "Rev.", WidthMax: 4, WidthMaxEnforcer: text.WrapText},

cmd/cli/job/history.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func NewHistoryCmd() *cobra.Command {
8888
}
8989

9090
var historyColumns = []output.TableColumn[*models.JobHistory]{
91-
cols.HistoryTime,
91+
cols.HistoryDateTime,
9292
cols.HistoryLevel,
9393
cols.HistoryExecID,
9494
cols.HistoryTopic,

cmd/cli/node/columns.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ import (
1717

1818
var alwaysColumns = []output.TableColumn[*models.NodeState]{
1919
{
20-
ColumnConfig: table.ColumnConfig{Name: "id"},
21-
Value: func(node *models.NodeState) string { return idgen.ShortNodeID(node.Info.ID()) },
20+
ColumnConfig: table.ColumnConfig{
21+
Name: "id",
22+
WidthMax: idgen.ShortIDLengthWithPrefix,
23+
WidthMaxEnforcer: func(col string, maxLen int) string { return idgen.ShortNodeID(col) }},
24+
Value: func(node *models.NodeState) string { return node.Info.ID() },
2225
},
2326
{
2427
ColumnConfig: table.ColumnConfig{Name: "type"},

cmd/util/cols/history.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ import (
1414
)
1515

1616
var (
17-
HistoryTime = output.TableColumn[*models.JobHistory]{
18-
ColumnConfig: table.ColumnConfig{Name: "Time", WidthMax: len(time.StampMilli), WidthMaxEnforcer: output.ShortenTime},
19-
Value: func(j *models.JobHistory) string { return j.Occurred().Format(time.StampMilli) },
20-
}
2117
HistoryTimeOnly = output.TableColumn[*models.JobHistory]{
2218
ColumnConfig: table.ColumnConfig{Name: "Time", WidthMax: len(TimeOnlyMilli), WidthMaxEnforcer: text.Trim},
2319
Value: func(j *models.JobHistory) string { return j.Occurred().Format(TimeOnlyMilli) },
@@ -31,12 +27,15 @@ var (
3127
Value: func(jwi *models.JobHistory) string { return jwi.Type.String() },
3228
}
3329
HistoryExecID = output.TableColumn[*models.JobHistory]{
34-
ColumnConfig: table.ColumnConfig{Name: "Exec. ID", WidthMax: 10, WidthMaxEnforcer: text.WrapText},
30+
ColumnConfig: table.ColumnConfig{
31+
Name: "Exec. ID",
32+
WidthMax: idgen.ShortIDLengthWithPrefix,
33+
WidthMaxEnforcer: func(col string, maxLen int) string { return idgen.ShortUUID(col) }},
3534
Value: func(j *models.JobHistory) string {
3635
if j.ExecutionID == "" {
3736
return ""
3837
}
39-
return idgen.ShortUUID(j.ExecutionID)
38+
return j.ExecutionID
4039
},
4140
}
4241
HistoryTopic = output.TableColumn[*models.JobHistory]{

0 commit comments

Comments
 (0)