Skip to content

Commit 4eabff8

Browse files
author
Aliaksandr.Shpak
committed
several more fixes
1 parent fa3286c commit 4eabff8

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class SearchedTextDataPane(val layoutData: String,
134134
displayText <<< text
135135

136136
private val seachItems: Observable[Seq[SearchElement]] = text.map(s =>
137-
s.toCharArray
137+
s.toCharArray.filterNot(p => p == '\r')
138138
.foldRight(List[List[Char]]())((el, acc) =>
139139
acc.headOption.map(head => el :: head).getOrElse(List(el)) :: acc)
140140
.zipWithIndex)
@@ -213,6 +213,7 @@ class TableOutputDataPane[T](val layoutData: String,
213213

214214
private val fieldToCols = fields.map(field => FieldToColumn(title = field._1, data = field._2, onSort = if (sorting.isDefinedAt(field._1)) Some(publishSubject()) else None))
215215
for (f2c <- fieldToCols; onSort <- f2c.onSort; asc <- onSort) sortRecords(f2c.title, asc = asc)
216+
for (x <- onLoadNewData; y <- x) println("Read done ")
216217

217218
override def content(): UiWidget = UiPanel(layoutData, Grid("margin 2"), items = Seq(
218219
new SearchElementsPane[T]("growx", cachedRecordsSubj, searchSelection, compare, searchText),
@@ -223,7 +224,7 @@ class TableOutputDataPane[T](val layoutData: String,
223224
selection = selectedRecords,
224225
columns = fieldToCols.map(f2c => UiColumn[T](title = f2c.title, value = f2c.data, onSort = (asc: Boolean) => f2c.onSort.get << asc))
225226
),
226-
onLoadNewData.map(_ => UiLink("growx", text = "Click to read next portion of data", onAction = onLoadNewData)))
227+
onLoadNewData.map(action => UiLink("growx", text = "Click to read next portion of data", onAction = action)))
227228
.filter(_.isDefined).map(_.get)),
228229
UiTabPanel("grow", tabs = behaviorSubject(Seq(
229230
UiTab(label = "Raw Output", content = new SearchedTextDataPane("grow", text = selectedRecordValue, defaultSearch = searchText)),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ object FxRender {
164164
override def render(): Button = {
165165
val c = new Button()
166166
for (disabled <- link.disabled) c.setDisable(disabled)
167-
for (obs <- link.onAction) c.onActionProperty().addListener((_: EventHandler[ActionEvent], _: EventHandler[ActionEvent]) => obs << Unit)
167+
c.setOnAction((event: ActionEvent) => link.onAction())
168168
for (text <- link.text) c.setText(text)
169169
c
170170
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ case class UiCombo(layoutData: String = "",
5555

5656
case class UiLink(layoutData: String = "",
5757
text: Observable[String] = empty(),
58-
onAction: Option[Subject[Unit]] = None,
58+
onAction: () => Unit = () => Unit,
5959
disabled: Observable[Boolean] = false) extends UiWidget
6060

6161
case class UiButton(layoutData: String = "",

0 commit comments

Comments
 (0)