You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2021/11/12 17:09:04 UTC
[isis] 03/07: ISIS-2348 Actual events in DiffDialog filled
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a708a121ea2bdb5751dd2e8ed463f22172aaecc9
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Thu Nov 11 09:27:53 2021 +0100
ISIS-2348 Actual events in DiffDialog filled
---
.../org/apache/isis/client/kroviz/core/event/ReplayCommand.kt | 4 ++--
.../kotlin/org/apache/isis/client/kroviz/ui/core/RoDialog.kt | 11 +++++------
.../kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt | 11 ++++++++---
.../apache/isis/client/kroviz/ui/dialog/ReplayDiffDialog.kt | 6 ++++--
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/ReplayCommand.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/ReplayCommand.kt
index e16da18..04bf437 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/ReplayCommand.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/core/event/ReplayCommand.kt
@@ -52,8 +52,8 @@ class ReplayCommand {
val uiEvents = filterReplayEvents(expectedEvents)
replay(uiEvents, urlUnderTest)
- val actualEvents: MutableList<LogEntry> = eventStore.log
- val rdd = ReplayDiffDialog(expectedEvents, actualEvents)
+ val title = "Replay Events: " + oldBaseUrl + " -> " + urlUnderTest
+ val rdd = ReplayDiffDialog(expectedEvents, title)
rdd.dialog.open()
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoDialog.kt
index 1403df5..5c86aaf 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/RoDialog.kt
@@ -18,7 +18,9 @@
*/
package org.apache.isis.client.kroviz.ui.core
-import io.kvision.core.*
+import io.kvision.core.CssSize
+import io.kvision.core.UNIT
+import io.kvision.core.Widget
import io.kvision.form.FormPanel
import io.kvision.html.Button
import io.kvision.html.ButtonStyle
@@ -127,11 +129,8 @@ class RoDialog(
close()
}
- fun open(at: Point = Point(100, 100)): Widget {
- val offset = UiManager.getNumberOfPopups() * 4
- left = CssSize(at.x + offset, UNIT.px)
- top = CssSize(at.y + offset, UNIT.px)
- UiManager.openDialog(this)
+ fun open(at: Point = Point(x = 100, y = 100)): Widget {
+ UiManager.openDialog(this, at)
super.show()
okButton.focus()
return this
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
index c7fcda3..cb85cb8 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/core/UiManager.kt
@@ -18,6 +18,8 @@
*/
package org.apache.isis.client.kroviz.ui.core
+import io.kvision.core.CssSize
+import io.kvision.core.UNIT
import io.kvision.core.Widget
import io.kvision.dropdown.ContextMenu
import io.kvision.panel.SimplePanel
@@ -180,7 +182,10 @@ object UiManager {
setNormalCursor()
}
- fun openDialog(panel: RoDialog) {
+ fun openDialog(panel: RoDialog, at: Point = Point(100, 100)) {
+ val offset = UiManager.getNumberOfPopups() * 4
+ panel.left = CssSize(at.x + offset, UNIT.px)
+ panel.top = CssSize(at.y + offset, UNIT.px)
getRoApp().add(panel)
push(panel)
}
@@ -202,7 +207,7 @@ object UiManager {
}
}
- fun getEventStore() : EventStore {
+ fun getEventStore(): EventStore {
return getSession().eventStore
}
@@ -217,7 +222,7 @@ object UiManager {
fun login(url: String, username: String, password: String) {
val s = Session()
s.login(url, username, password)
- sessions.add(0,s)
+ sessions.add(0, s)
}
fun getCredentials(): String {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ReplayDiffDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ReplayDiffDialog.kt
index 9f04df5..55d3a85 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ReplayDiffDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/dialog/ReplayDiffDialog.kt
@@ -34,7 +34,7 @@ import org.apache.isis.client.kroviz.ui.panel.EventLogTable
class ReplayDiffDialog(
private val expectedEvents: List<LogEntry>,
- actualEvents: List<LogEntry>
+ title: String
) : Command() {
var dialog: RoDialog
@@ -47,7 +47,7 @@ class ReplayDiffDialog(
init {
dialog = RoDialog(
- caption = "Replay Events: Expected vs. Actual",
+ caption = title,
items = mutableListOf(),
command = this,
defaultAction = "Compare",
@@ -57,6 +57,8 @@ class ReplayDiffDialog(
)
val expectedTable = EventLogTable(expectedEvents)
expectedTable.tabulator.addCssClass("tabulator-in-dialog")
+ val actualEvents: MutableList<LogEntry> = UiManager.getEventStore().log
+
val actualTable = EventLogTable(actualEvents)
actualTable.tabulator.addCssClass("tabulator-in-dialog")
expectedPanel.add(expectedTable)