From 2bcfc365f7fd51c0d212f2e5471c8c60d696391e Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Tue, 3 Nov 2020 14:11:58 +0200 Subject: [PATCH] Single Container View: truncate ID Truncation Id inside of NewSingle() doesn't work. It even doesn't have any effect. Instead truncate the ID inside of NewMeta() call --- container/main.go | 2 +- cwidgets/single/info.go | 3 +-- cwidgets/single/main.go | 7 ++----- grid.go | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/container/main.go b/container/main.go index e0b0c3f..8b59a50 100644 --- a/container/main.go +++ b/container/main.go @@ -34,7 +34,7 @@ func New(id string, collector collector.Collector, manager manager.Manager) *Con return &Container{ Metrics: models.NewMetrics(), Id: id, - Meta: models.NewMeta("id", id), + Meta: models.NewMeta("id", id[:12]), Widgets: widgets, updater: widgets, collector: collector, diff --git a/cwidgets/single/info.go b/cwidgets/single/info.go index 5b67717..98e51ab 100644 --- a/cwidgets/single/info.go +++ b/cwidgets/single/info.go @@ -13,14 +13,13 @@ type Info struct { data map[string]string } -func NewInfo(id string) *Info { +func NewInfo() *Info { p := ui.NewTable() p.Height = 4 p.Width = colWidth[0] p.FgColor = ui.ThemeAttr("par.text.fg") p.Separator = false i := &Info{p, make(map[string]string)} - i.Set("id", id) return i } diff --git a/cwidgets/single/main.go b/cwidgets/single/main.go index 6f7b02c..dbc5613 100644 --- a/cwidgets/single/main.go +++ b/cwidgets/single/main.go @@ -23,12 +23,9 @@ type Single struct { Width int } -func NewSingle(id string) *Single { - if len(id) > 12 { - id = id[:12] - } +func NewSingle() *Single { return &Single{ - Info: NewInfo(id), + Info: NewInfo(), Net: NewNet(), Cpu: NewCpu(), Mem: NewMem(), diff --git a/grid.go b/grid.go index 9efced3..e4e0fdb 100644 --- a/grid.go +++ b/grid.go @@ -83,7 +83,7 @@ func SingleView() MenuFn { ui.DefaultEvtStream.ResetHandlers() defer ui.DefaultEvtStream.ResetHandlers() - ex := single.NewSingle(c.Id) + ex := single.NewSingle() c.SetUpdater(ex) ex.Align()