diff --git a/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt index df54451540..8505d1c621 100644 --- a/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt +++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt @@ -4,7 +4,9 @@ import com.google.common.net.HostAndPort import javafx.beans.property.SimpleObjectProperty import net.corda.client.rpc.CordaRPCClient import net.corda.client.rpc.CordaRPCClientConfiguration +import net.corda.core.flows.StateMachineRunId import net.corda.core.messaging.CordaRPCOps +import net.corda.core.messaging.StateMachineInfo import net.corda.core.messaging.StateMachineUpdate import net.corda.core.node.services.NetworkMapCache.MapChange import net.corda.core.node.services.StateMachineTransactionMapping @@ -14,6 +16,16 @@ import net.corda.core.transactions.SignedTransaction import rx.Observable import rx.subjects.PublishSubject +data class ProgressTrackingEvent(val stateMachineId: StateMachineRunId, val message: String) { + companion object { + fun createStreamFromStateMachineInfo(stateMachine: StateMachineInfo): Observable? { + return stateMachine.progressTrackerStepAndUpdates?.let { (current, future) -> + future.map { ProgressTrackingEvent(stateMachine.id, it) }.startWith(ProgressTrackingEvent(stateMachine.id, current)) + } + } + } +} + /** * This model exposes raw event streams to and from the node. */ diff --git a/client/jfx/src/main/kotlin/net/corda/client/jfx/model/StateMachineDataModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/StateMachineDataModel.kt index 300523906b..139506d258 100644 --- a/client/jfx/src/main/kotlin/net/corda/client/jfx/model/StateMachineDataModel.kt +++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/StateMachineDataModel.kt @@ -10,20 +10,8 @@ import net.corda.client.jfx.utils.recordAsAssociation import net.corda.core.ErrorOr import net.corda.core.flows.FlowInitiator import net.corda.core.flows.StateMachineRunId -import net.corda.core.messaging.StateMachineInfo import net.corda.core.messaging.StateMachineUpdate import org.fxmisc.easybind.EasyBind -import rx.Observable - -data class ProgressTrackingEvent(val stateMachineId: StateMachineRunId, val message: String) { - companion object { - fun createStreamFromStateMachineInfo(stateMachine: StateMachineInfo): Observable? { - return stateMachine.progressTrackerStepAndUpdates?.let { (current, future) -> - future.map { ProgressTrackingEvent(stateMachine.id, it) }.startWith(ProgressTrackingEvent(stateMachine.id, current)) - } - } - } -} data class ProgressStatus(val status: String?) diff --git a/client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt index 62d6da5dea..899e5001da 100644 --- a/client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt +++ b/client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt @@ -1,7 +1,6 @@ package net.corda.client.jfx.model import javafx.beans.value.ObservableValue -import javafx.collections.ObservableList import javafx.collections.ObservableMap import net.corda.client.jfx.utils.* import net.corda.core.contracts.ContractState @@ -11,11 +10,6 @@ import net.corda.core.crypto.SecureHash import net.corda.core.transactions.SignedTransaction import org.fxmisc.easybind.EasyBind -data class GatheredTransactionData( - val transaction: PartiallyResolvedTransaction, - val stateMachines: ObservableList -) - /** * [PartiallyResolvedTransaction] holds a [SignedTransaction] that has zero or more inputs resolved. The intent is * to prepare clients for cases where an input can only be resolved in the future/cannot be resolved at all (for example @@ -59,7 +53,6 @@ data class PartiallyResolvedTransaction( */ class TransactionDataModel { private val transactions by observable(NodeMonitorModel::transactions) - private val collectedTransactions = transactions.recordInSequence() private val transactionMap = collectedTransactions.associateBy(SignedTransaction::id) diff --git a/tools/explorer/src/main/resources/net/corda/explorer/css/corda.css b/tools/explorer/src/main/resources/net/corda/explorer/css/corda.css index ad2a5577de..c9d5933b3d 100644 --- a/tools/explorer/src/main/resources/net/corda/explorer/css/corda.css +++ b/tools/explorer/src/main/resources/net/corda/explorer/css/corda.css @@ -277,18 +277,3 @@ .identicon { -fx-border-radius: 2; } - -.flow-expanded { - -fx-background-color: rgba(255, 255, 255); - -fx-background-size: Auto 90%; - -fx-background-repeat: no-repeat; - -fx-background-position: center center; - -fx-border-color: transparent; - -fx-border-radius: 2; -} - -.flow-expanded:hover { - -fx-border-color: -color-3; - -fx-border-width: 2; - -fx-border-radius: 2; -} diff --git a/tools/explorer/src/main/resources/net/corda/explorer/css/enterprise.css b/tools/explorer/src/main/resources/net/corda/explorer/css/enterprise.css new file mode 100644 index 0000000000..4404caea6a --- /dev/null +++ b/tools/explorer/src/main/resources/net/corda/explorer/css/enterprise.css @@ -0,0 +1,17 @@ +@import "corda-dark-color-scheme.css"; + +/* Flow triage css */ +.flow-expanded { + -fx-background-color: rgba(255, 255, 255); + -fx-background-size: Auto 90%; + -fx-background-repeat: no-repeat; + -fx-background-position: center center; + -fx-border-color: transparent; + -fx-border-radius: 2; +} + +.flow-expanded:hover { + -fx-border-color: -color-3; + -fx-border-width: 2; + -fx-border-radius: 2; +} diff --git a/tools/explorer/src/main/resources/net/corda/explorer/views/StateMachineDetailsView.fxml b/tools/explorer/src/main/resources/net/corda/explorer/views/StateMachineDetailsView.fxml index 35d00f6757..6f5ef75777 100644 --- a/tools/explorer/src/main/resources/net/corda/explorer/views/StateMachineDetailsView.fxml +++ b/tools/explorer/src/main/resources/net/corda/explorer/views/StateMachineDetailsView.fxml @@ -6,7 +6,7 @@ - +