Fixed consumer infos tab + refresh data menu

Author: Aliaksandr.Shpak

gradle.properties

@@ -1,3 +1,3 @@
-version = 0.1.6
+version = 0.1.7
 url = https://api.github.com/repos/alshpak/kafka_data_viewer/releases/latest
-update_url = https://github.com/alshpak/kafka_data_viewer/releases
+update_url = https://github.com/alshpak/kafka_data_viewer/releases

src/main/scala/devtools/kafka_data_viewer/ui/KafkaConsumersInfoPanes.scala

@@ -3,11 +3,10 @@ package devtools.kafka_data_viewer.ui
 import devtools.kafka_data_viewer.KafkaDataViewer.ConnectionDefinition
 import devtools.kafka_data_viewer.kafkaconn.KafkaGroupsInfo
 import devtools.kafka_data_viewer.kafkaconn.KafkaGroupsInfo.PartitionAssignmentState
-import devtools.lib.rxext.Observable
 import devtools.lib.rxext.Subject.behaviorSubject
+import devtools.lib.rxext.{Observable, Subject}
 import devtools.lib.rxui.UiImplicits._
 import devtools.lib.rxui._
-import Observable.just
 
 class ConsumersInfoPane(val layoutData: String = "", condef: ConnectionDefinition) extends UiComponent {
 
@@ -57,7 +56,7 @@ class ConsumersInfoPane(val layoutData: String = "", condef: ConnectionDefinitio
                             .map(state => PartitionInfo(state)).sortBy(x => (x.name, x.partition))))
                         .sortBy(_.name),
             ))
-    )/*,
+    ) /*,
         Option(condef.zoo).filter(!_.isEmpty).map(zoo =>
             Root("ZooGroups",
                 queryGroups = () => KafkaGroupsInfo.getZooGroups(zoo).map(
@@ -66,6 +65,19 @@ class ConsumersInfoPane(val layoutData: String = "", condef: ConnectionDefinitio
             )))*/
             .filter(_.isDefined).map(_.get)
 
+    private val selection = Subject.publishSubject[Seq[Elem]]()
+
+    private val menu =
+        selection
+                .map(_.headOption)
+                .map(_.map {
+                    case x: Root => Seq(UiMenuItem("Refresh", () => x.refresh()))
+                    case x: Group => Seq(UiMenuItem("Refresh", () => x.refresh()))
+                    case _ => Seq()
+                })
+                .map(_.getOrElse(Seq()))
+
+
     override def content(): UiWidget = UiPanel(layoutData, Grid(), items = Seq(
         UiTree[Elem]("grow", items = items,
             columns = Seq[UiColumn[Elem]](
@@ -78,19 +90,16 @@ class ConsumersInfoPane(val layoutData: String = "", condef: ConnectionDefinitio
                 UiColumn("Host", _.host),
                 UiColumn("Client ID", _.clientId)
             ),
+            selection = selection,
             subitems = _.subitems(),
             expanded = _ => false,
             hasChildren = {
                 case Root(_, _) => true
                 case Group(_, _) => true
                 case _ => false
             }
-//            ,
-//            menu = Some {
-//                case x: Root => Seq(UiMenuItem("Refresh", () => x.refresh()))
-//                case x: Group => Seq(UiMenuItem("Refresh", () => x.refresh()))
-//                case _ => Seq()
-//            }
+            ,
+            menu = menu
         )
     ))
 }

src/main/scala/devtools/lib/rxui/FxRender.scala

@@ -346,16 +346,16 @@ object FxRender {
             val rootItem = new TreeItem[T]()
             treeTable.setRoot(rootItem)
 
-            for (menuItems <- $(treeModel.menu)) // TODO MENU MUST BE CHANGED AS IN TABLE
-                treeTable.setOnContextMenuRequested((event: ContextMenuEvent) =>
-                    for (selection <- Option(treeTable.getSelectionModel.getSelectedItem).flatMap(x => Option(x.getValue))) {
-                        val ctxMenuRoot = applying(new ContextMenu()) { cm =>
-                            cm.getItems.addAll(menuItems.map(itemModel =>
-                                applying(new MenuItem(itemModel.text)) { item => }).asJavaCollection)
-                        }
-                        treeTable.setContextMenu(ctxMenuRoot)
-                        ctxMenuRoot.show(treeTable, event.getScreenX, event.getScreenY)
-                    })
+            def menuToItems(parent: ContextMenu)(itemModel: UiMenuItem): MenuItem =
+                if (itemModel.subitems.isEmpty) applying(new MenuItem(itemModel.text)) { item => item.setOnAction { evt => parent.hide(); evt.consume(); itemModel.onSelect(); } }
+                else applying(new Menu(itemModel.text)) { item => item.getItems.addAll(itemModel.subitems.map(menuToItems(parent)).asJavaCollection) }
+
+            for (menuItems: Seq[UiMenuItem] <- $(treeModel.menu); if menuItems.nonEmpty) {
+                val ctxMenuRoot = applying(new ContextMenu()) { cm =>
+                    cm.getItems.addAll(menuItems.map(menuToItems(cm)).asJavaCollection)
+                }
+                treeTable.setContextMenu(ctxMenuRoot)
+            }
 
             class LazyTreeItem(val itemModel: T) extends TreeItem(itemModel) {
 
@@ -367,8 +367,10 @@ object FxRender {
 
                 override def getChildren: ObservableList[TreeItem[T]] = {
                     if (!loaded) {
-                        for (items <- $(treeModel.subitems(itemModel))) super.getChildren.setAll(items.map(new LazyTreeItem(_)).asJavaCollection) /// TODO INCORRECT YET
                         loaded = true
+                        for (items <- $(treeModel.subitems(itemModel))) {
+                            super.getChildren.setAll(items.map(new LazyTreeItem(_)).asJavaCollection)
+                        } /// TODO INCORRECT YET
                     }
                     super.getChildren
                 }

src/test/TestWidgetsSetApp.scala

@@ -171,17 +171,30 @@ object TestWidgetsSetApp {
                         override val layoutData: String = "grow"
 
                         trait TreeItem {
-                            val label:String
-                            val value:String = ""
-                            def subitems(): Seq[TreeItem] = Seq()
+                            val label: String
+                            val value: String = ""
+
+                            def query(): Seq[TreeItem] = Seq()
+
+                            private lazy val items = behaviorSubject[Seq[TreeItem]](query())
+
+                            def subitems(): Observable[Seq[TreeItem]] = items
+
                         }
-                        case class RootItem(label:String = "Root") extends TreeItem {
-                            override def subitems(): Seq[TreeItem] = {
-                                Thread.sleep(10000)
+
+                        case class RootItem(label: String = "Root") extends TreeItem {
+                            override def query(): Seq[TreeItem] = {
+                                Thread.sleep(2000)
                                 Seq(SubItem())
                             }
                         }
-                        case class SubItem(label: String = "SubItem", override val value: String = "SomeValue") extends TreeItem
+
+                        case class SubItem(label: String = "SubItem", override val value: String = "SomeValue") extends TreeItem {
+                            override def query(): Seq[TreeItem] = Seq(LeafItem())
+                        }
+
+
+                        case class LeafItem(label: String = "LeafItem", override val value: String = "Leaf Value") extends TreeItem
 
                         override def content(): UiWidget =
                             UiTree[TreeItem](layoutData,
@@ -193,7 +206,8 @@ object TestWidgetsSetApp {
                                 expanded = _ => false,
                                 subitems = _.subitems(),
                                 hasChildren = {
-                                    case RootItem(_) => true
+                                    case _: RootItem => true
+                                    case _: SubItem => true
                                     case _ => false
                                 }
                             )