Add support for jumping to lease (brittle).

Author: Cedric BAIL

binding.go

@@ -160,7 +160,8 @@ func (m *MikrotikRouter) IP() string {
 }
 
 type MikrotikDataItem struct {
-	id string
+	router string
+	id     string
 
 	properties map[string]binding.String
 
@@ -214,7 +215,7 @@ func NewMikrotikData(dial func(ctx context.Context, network, address string) (ne
 	listen := false
 
 	for _, s := range r.Re {
-		item := newMikrotikDataItem(s)
+		item := newMikrotikDataItem(s, host)
 		m.items[item.id] = item
 		m.itemsList = append(m.itemsList, item)
 		if item.id != "" {
@@ -243,7 +244,7 @@ func NewMikrotikData(dial func(ctx context.Context, network, address string) (ne
 					item, ok := m.items[id]
 					if !ok {
 						if id != "" {
-							item = newMikrotikDataItem(s)
+							item = newMikrotikDataItem(s, host)
 							m.items[id] = item
 							m.itemsList = append(m.itemsList, item)
 							m.listeners.Range(func(key, value interface{}) bool {
@@ -332,6 +333,10 @@ func (m *MikrotikDataTable) RemoveListener(l binding.DataListener) {
 	m.listeners.Delete(l)
 }
 
+func (m *MikrotikDataItem) Router() string {
+	return m.router
+}
+
 func (m *MikrotikDataItem) Get(key string) (binding.String, error) {
 	if b, ok := m.properties[key]; ok {
 		return b, nil
@@ -368,8 +373,8 @@ func getID(r *proto.Sentence) string {
 	return ""
 }
 
-func newMikrotikDataItem(r *proto.Sentence) *MikrotikDataItem {
-	item := &MikrotikDataItem{properties: map[string]binding.String{}}
+func newMikrotikDataItem(r *proto.Sentence, host string) *MikrotikDataItem {
+	item := &MikrotikDataItem{router: host, properties: map[string]binding.String{}}
 	for _, p := range r.List {
 		if p.Key == ".id" {
 			item.id = p.Value

button.go

@@ -90,6 +90,10 @@ refreshDisable:
 }
 
 func getString(data binding.String) string {
+	if data == nil {
+		return ""
+	}
+
 	v, err := data.Get()
 	if err != nil {
 		return ""
@@ -98,6 +102,10 @@ func getString(data binding.String) string {
 }
 
 func getBool(data binding.Bool) bool {
+	if data == nil {
+		return false
+	}
+
 	v, err := data.Get()
 	if err != nil {
 		return false

table.go

@@ -11,12 +11,12 @@ import (
 	"fyne.io/fyne/v2/widget"
 )
 
-func (a *appData) NewTableWithDataColumn(column []RouterOSHeader, data *MikrotikDataTable) *widget.Table {
+func (a *appData) NewTableWithDataColumn(jumpToTab func(host, view string), column []RouterOSHeader, data *MikrotikDataTable) *widget.Table {
 	t := widget.NewTable(func() (int, int) {
 		return data.Length(), len(column)
 	}, func() fyne.CanvasObject {
 		var button *Button
-		button = NewButton("MAC Address", a.lookupIP(button))
+		button = NewButton("MAC Address", a.lookupIP(jumpToTab, button))
 		button.Hide()
 		button.Importance = widget.LowImportance
 
@@ -60,7 +60,7 @@ func (a *appData) NewTableWithDataColumn(column []RouterOSHeader, data *Mikrotik
 				exist = append(exist, router.leaseBinding.Exist("mac-address", button.Text))
 			}
 			button.Icon = nil
-			button.OnTapped = a.lookupIP(button)
+			button.OnTapped = a.lookupIP(jumpToTab, button)
 			button.BindDisable(NewNot(NewOr(exist...)))
 		} else if column[i.Col].copy {
 			button.Icon = theme.ContentCopyIcon()
@@ -88,7 +88,7 @@ func (a *appData) NewTableWithDataColumn(column []RouterOSHeader, data *Mikrotik
 	return t
 }
 
-func (a *appData) lookupIP(button *Button) func() {
+func (a *appData) lookupIP(jumpToTab func(host, view string), button *Button) func() {
 	return func() {
 		dl := []binding.DataList{}
 
@@ -107,34 +107,40 @@ func (a *appData) lookupIP(button *Button) func() {
 
 		merged := NewMergeDataList(dl)
 
+		var d *dialog.CustomDialog
+
 		list := widget.NewListWithData(merged, func() fyne.CanvasObject {
-			return widget.NewLabel("hostname.somewhere.com (255.255.255.255)")
+			return NewButton("hostname.somewhere.com (255.255.255.255)", func() {})
 		}, func(di binding.DataItem, co fyne.CanvasObject) {
 			lookup := di.(*MikrotikDataItem)
-			label := co.(*widget.Label)
+			btn := co.(*Button)
 
 			ipString, _ := lookup.Get("active-address")
 			hostnameString, _ := lookup.Get("host-name")
 
+			btn.OnTapped = func() {
+				d.Hide()
+				jumpToTab(lookup.Router(), "DHCP Server")
+			}
 			if len(getString(hostnameString)) > 0 {
 				if len(getString(ipString)) > 0 {
-					label.Bind(binding.NewSprintf("%s (%s)\n", hostnameString, ipString))
+					btn.Bind(binding.NewSprintf("%s (%s)", hostnameString, ipString))
 				} else {
-					label.Bind(binding.NewSprintf("%s (-)\n", hostnameString))
+					btn.Bind(binding.NewSprintf("%s (-)", hostnameString))
 				}
 			} else if len(getString(ipString)) > 0 {
-				label.Bind(binding.NewSprintf("%s\n", ipString))
+				btn.Bind(binding.NewSprintf("%s", ipString))
 			} else {
-				label.Unbind()
-				label.SetText("unknown")
+				btn.OnTapped = func() {}
+				btn.Unbind()
+				btn.SetText("unknown")
 			}
 
 		})
 
-		d := dialog.NewCustom("Matching information for "+button.Text, "OK", container.New(&moreSpace{a.win}, list), a.win)
+		d = dialog.NewCustom("Matching information for "+button.Text, "OK", container.New(&moreSpace{a.win}, list), a.win)
 		d.SetOnClosed(func() {
 			merged.Close()
-			d.Hide()
 		})
 		d.Show()
 	}

ui.go

@@ -84,9 +84,15 @@ func (a *appData) createUI(lastHost string) {
 		footer.SetText("")
 	}
 
+	var sel *widget.Select
+
 	tree := widget.NewTreeWithStrings(routerOStree)
+	jumpToTab := func(host, view string) {
+		sel.SetSelected(host)
+		tree.OnSelected(view)
+	}
 	tree.OnSelected = func(id string) {
-		err := a.buildView(tabs, id)
+		err := a.buildView(tabs, jumpToTab, id)
 		if err != nil {
 			updateStatus(nil, false, err)
 			return
@@ -96,7 +102,7 @@ func (a *appData) createUI(lastHost string) {
 		updateStatus(a.identity, a.current.ssl, nil)
 	}
 
-	sel := widget.NewSelect([]string{}, a.selectHost(tabs, updateStatus))
+	sel = widget.NewSelect([]string{}, a.selectHost(tabs, updateStatus, jumpToTab))
 
 	var useTailScale *widget.Check
 	updateTailScale := func(b bool) {
@@ -279,7 +285,7 @@ func (a *appData) newHost(sel *widget.Select, ip string) {
 	a.win.Canvas().Focus(host)
 }
 
-func (a *appData) selectHost(tabs *container.AppTabs, updateStatus func(identity binding.String, ssl bool, err error)) func(s string) {
+func (a *appData) selectHost(tabs *container.AppTabs, updateStatus func(identity binding.String, ssl bool, err error), jumpToTab func(host, view string)) func(s string) {
 	return func(s string) {
 		for _, b := range a.bindings {
 			b.Close()
@@ -308,7 +314,7 @@ func (a *appData) selectHost(tabs *container.AppTabs, updateStatus func(identity
 		a.identity = identity
 
 		if a.currentView != "" {
-			err := a.buildView(tabs, a.currentView)
+			err := a.buildView(tabs, jumpToTab, a.currentView)
 			if err != nil {
 				updateStatus(nil, false, err)
 				return
@@ -388,7 +394,7 @@ func (a *appData) getPassword(lastHost string, sel *widget.Select) {
 	a.win.Canvas().Focus(password)
 }
 
-func (a *appData) buildView(tabs *container.AppTabs, view string) error {
+func (a *appData) buildView(tabs *container.AppTabs, jumpToTab func(host, view string), view string) error {
 	a.currentView = view
 
 	if a.current == nil {
@@ -413,7 +419,7 @@ func (a *appData) buildView(tabs *container.AppTabs, view string) error {
 		if a.currentTab == cmd.title {
 			selectIndex = len(tabs.Items)
 		}
-		tabs.Items = append(tabs.Items, container.NewTabItem(cmd.title, a.NewTableWithDataColumn(cmd.headers, b)))
+		tabs.Items = append(tabs.Items, container.NewTabItem(cmd.title, a.NewTableWithDataColumn(jumpToTab, cmd.headers, b)))
 	}
 	tabs.SelectIndex(selectIndex)
 	tabs.Refresh()