This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 58021df82e9943bbd049a5c7c16c838337d7fd6b
Author: Lei Zhang <zhang...@apache.org>
AuthorDate: Sat Mar 21 22:14:23 2020 +0800
SCB-1735 Show TxCompensateAckTimeoutEvent in the transaction details list
---
.../pack/alpha/ui/controller/TransactionController.java | 7 ++++---
.../src/main/resources/templates/transaction_details.html | 8 ++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git
a/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/TransactionController.java
b/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/TransactionController.java
index a8491ce..c1c8066 100644
---
a/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/TransactionController.java
+++
b/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/TransactionController.java
@@ -181,9 +181,10 @@ public class TransactionController {
eventDTO.setRetryDelayInMilliseconds(Long.valueOf(event.get("retryDelayInMilliseconds").toString()));
}
}
- if (eventDTO.getType().equals("TxAbortedEvent") || eventDTO.getType()
- .equals("SagaAbortedEvent") || eventDTO.getType()
- .equals("TxCompensateAckFailedEvent")) {
+ if (eventDTO.getType().equals("TxAbortedEvent") ||
+ eventDTO.getType().equals("SagaAbortedEvent") ||
+ eventDTO.getType().equals("TxCompensateAckFailedEvent") ||
+ eventDTO.getType().equals("TxCompensateAckTimeoutEvent")) {
if (event.containsKey("payloads")) {
Decoder decoder = Base64.getDecoder();
String exception;
diff --git
a/alpha/alpha-ui/src/main/resources/templates/transaction_details.html
b/alpha/alpha-ui/src/main/resources/templates/transaction_details.html
index 8df399f..b21fa7d 100644
--- a/alpha/alpha-ui/src/main/resources/templates/transaction_details.html
+++ b/alpha/alpha-ui/src/main/resources/templates/transaction_details.html
@@ -32,9 +32,9 @@
</div>
<div class="card-body">
<div class="events" th:each="event,stat : ${events}">
- <div th:class="${event.type}=='TxAbortedEvent' or
${event.type}=='TxCompensateAckFailedEvent' or
${event.type}=='SagaAbortedEvent' ? 'row text-danger' : 'row'">
+ <div th:class="${event.type}=='TxAbortedEvent' or
${event.type}=='TxCompensateAckFailedEvent' or
${event.type}=='TxCompensateAckTimeoutEvent' or
${event.type}=='SagaAbortedEvent' ? 'row text-danger' : 'row'">
<div class="col-xl-6 col-lg-6">
- <div><i class="fas fa-envelope"></i> <span
th:class="${event.type}=='TxAbortedEvent' or
${event.type}=='TxCompensateAckFailedEvent' or
${event.type}=='SagaAbortedEvent' ? 'small text-danger' : 'small text-success'"
th:text="${event.type}"></span></div>
+ <div><i class="fas fa-envelope"></i> <span
th:class="${event.type}=='TxAbortedEvent' or
${event.type}=='TxCompensateAckFailedEvent' or
${event.type}=='TxCompensateAckTimeoutEvent' or
${event.type}=='SagaAbortedEvent' ? 'small text-danger' : 'small text-success'"
th:text="${event.type}"></span></div>
<div><i class="fas fa-bell"></i> <span class="small"
th:text="${event.serviceName} + '(' + ${event.instanceId} + ')'"></span></div>
<div><i class="fas fa-mars-stroke"></i> <span class="small"
th:text="${event.parentTxId}"></span></div>
<div><i class="fas fa-transgender"></i> <span class="small"
th:text="${event.localTxId}"></span></div>
@@ -44,7 +44,7 @@
<div th:if="${event.type}==SagaStartedEvent"><i class="fas
fa-clock"></i> <span class="small" th:text="${event.timeout}+'ms'"></span></div>
<div th:if="${event.type}==TxStartedEvent"><i class="fas
fa-undo"></i> <span class="small" th:text="${event.reverseRetries} + '（delay '
+ ${event.retryDelayInMilliseconds} + 'ms, timeout ' + ${event.reverseTimeout}
+ 's)'"></span></div>
<div th:if="${event.type}==TxStartedEvent"><i class="fas
fa-redo"></i> <span class="small" th:text="${event.forwardRetries} + '（delay '
+ ${event.retryDelayInMilliseconds} + 'ms, timeout ' + ${event.forwardTimeout}
+ 's)'"></span></div>
- <div th:if="${event.type}==TxStartedEvent or
${event.type}==TxAbortedEvent or ${event.type}==TxCompensateAckFailedEvent or
${event.type}=='SagaAbortedEvent'" class="position-absolute" style="bottom:
0px; right: 15px;">
+ <div th:if="${event.type}==TxStartedEvent or
${event.type}==TxAbortedEvent or ${event.type}==TxCompensateAckFailedEvent or
${event.type}==TxCompensateAckTimeoutEvent or
${event.type}=='SagaAbortedEvent'" class="position-absolute" style="bottom:
0px; right: 15px;">
<i name="event_more" class="fas fa-caret-square-down"
style="cursor:pointer" th:target="'div-more-'+${stat.index}"></i>
</div>
</div>
@@ -61,7 +61,7 @@
</div>
<!-- TxAbortedEvent more -->
- <div th:id="'div-more-'+${stat.index}"
th:if="${event.type}==TxAbortedEvent or
${event.type}==TxCompensateAckFailedEvent or ${event.type}==SagaAbortedEvent"
class="d-none" style="padding-top: 10px">
+ <div th:id="'div-more-'+${stat.index}"
th:if="${event.type}==TxAbortedEvent or
${event.type}==TxCompensateAckFailedEvent or
${event.type}==TxCompensateAckTimeoutEvent or ${event.type}==SagaAbortedEvent"
class="d-none" style="padding-top: 10px">
<div class="card border-danger">
<div class="card-header small border-danger bg-danger
text-white">Exception Stack</div>
<div class="card-body">
