diff --git a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/transaction/TransactionsPresenter.java b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/transaction/TransactionsPresenter.java index c0b4ed8e2b..deeec04683 100644 --- a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/transaction/TransactionsPresenter.java +++ b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/transaction/TransactionsPresenter.java @@ -45,9 +45,10 @@ import static org.jboss.hal.client.runtime.subsystem.transaction.AddressTemplates.LOGSTORE_RUNTIME_TEMPLATE; import static org.jboss.hal.client.runtime.subsystem.transaction.AddressTemplates.TRANSACTIONS_LOGSTORE_RUNTIME_TEMPLATE; import static org.jboss.hal.client.runtime.subsystem.transaction.AddressTemplates.TRANSACTION_RUNTIME_ADDRESS; +import static org.jboss.hal.dmr.ModelDescriptionConstants.CHILD_TYPE; import static org.jboss.hal.dmr.ModelDescriptionConstants.INCLUDE_RUNTIME; import static org.jboss.hal.dmr.ModelDescriptionConstants.PROBE_OPERATION; -import static org.jboss.hal.dmr.ModelDescriptionConstants.READ_RESOURCE_OPERATION; +import static org.jboss.hal.dmr.ModelDescriptionConstants.READ_CHILDREN_RESOURCES_OPERATION; import static org.jboss.hal.dmr.ModelDescriptionConstants.RECURSIVE; import static org.jboss.hal.dmr.ModelDescriptionConstants.TRANSACTIONS; import static org.jboss.hal.dmr.ModelNodeHelper.asNamedNodes; @@ -97,14 +98,13 @@ public FinderPath finderPath() { @Override protected void reload() { - ResourceAddress address = TRANSACTIONS_LOGSTORE_RUNTIME_TEMPLATE.resolve(statementContext); - Operation operation = new Operation.Builder(address, READ_RESOURCE_OPERATION) + ResourceAddress address = LOGSTORE_RUNTIME_TEMPLATE.resolve(statementContext); + Operation operation = new Operation.Builder(address, READ_CHILDREN_RESOURCES_OPERATION) + .param(CHILD_TYPE, TRANSACTIONS) .param(INCLUDE_RUNTIME, true) .param(RECURSIVE, true) .build(); - dispatcher.execute(operation, result -> { - getView().update(asNamedNodes(result.asPropertyList())); - }); + dispatcher.execute(operation, result -> getView().update(asNamedNodes(result.asPropertyList()))); } void probe() { diff --git a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/transaction/TransactionsView.java b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/transaction/TransactionsView.java index d2ba74086e..152dc1bd53 100644 --- a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/transaction/TransactionsView.java +++ b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/transaction/TransactionsView.java @@ -115,12 +115,12 @@ public TransactionsView(MetadataRegistry metadataRegistry, Resources resources) initElement(row() .add(column() - .addAll(section, sectionParticipants))); + .add(pages))); } private void showParticipants(NamedNode transactionNode) { selectedTx = transactionNode.getName(); - List participants = asNamedNodes(transactionNode.asPropertyList()); + List participants = asNamedNodes(transactionNode.get(PARTICIPANTS).asPropertyList()); participantsForm.clear(); participantsTable.update(participants); pages.showPage(Ids.TRANSACTION_PARTICIPANTS_PAGE); diff --git a/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java b/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java index b24232d278..7d6270057e 100644 --- a/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java +++ b/dmr/src/main/java/org/jboss/hal/dmr/ModelDescriptionConstants.java @@ -672,7 +672,7 @@ public interface ModelDescriptionConstants { String OVERRIDE_ALL = "override-all"; String OVERRIDE_MODULE = "override-modules"; String PARAMS = "params"; - String PARTICIPANTS = "partitcipants"; + String PARTICIPANTS = "participants"; String PARTITION_HANDLING = "partition-handling"; String PASSIVATED_COUNT = "passivated-count"; String PASSIVATION_STORE = "passivation-store";