You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/08/10 07:50:23 UTC
[servicecomb-pack] 18/36: SCB-1411 Return all results when the
search condition is empty
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 c033d684d91d7ecd4eb6fee6665aabac31273ec3
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Fri Aug 9 08:38:04 2019 +0800
SCB-1411 Return all results when the search condition is empty
---
.../alpha/ui/controller/TransactionController.java | 50 ++++++++++++----------
.../main/resources/templates/fragments/header.html | 32 +-------------
2 files changed, 30 insertions(+), 52 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 6ea5d52..5772103 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
@@ -53,6 +53,7 @@ import sun.misc.BASE64Decoder;
@Controller
@EnableScheduling
public class TransactionController {
+
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String WEBSOCKET_BROKER_METRICES_TOPIC = "/topic/metrics";
@@ -110,27 +111,31 @@ public class TransactionController {
@ResponseBody
public DataTablesResponseDTO searchList(
@ModelAttribute DataTablesRequestDTO dataTablesRequestDTO) throws Exception {
- List<TransactionRowDTO> data = new ArrayList<>();
- GlobalTransaction globalTransaction = findGlobalTransactionByGlobalTxId(
- dataTablesRequestDTO.getQuery());
- if (globalTransaction != null) {
- data.add(TransactionRowDTO.builder()
- .serviceName(globalTransaction.getServiceName())
- .instanceId(globalTransaction.getInstanceId())
- .globalTxId(globalTransaction.getGlobalTxId())
- .state(globalTransaction.getState())
- .beginTime(globalTransaction.getBeginTime())
- .endTime(globalTransaction.getEndTime())
- .subTxSize(globalTransaction.getSubTxSize())
- .durationTime(globalTransaction.getDurationTime())
- .build());
+ if (dataTablesRequestDTO.getQuery() != null) {
+ List<TransactionRowDTO> data = new ArrayList<>();
+ GlobalTransaction globalTransaction = findGlobalTransactionByGlobalTxId(
+ dataTablesRequestDTO.getQuery());
+ if (globalTransaction != null) {
+ data.add(TransactionRowDTO.builder()
+ .serviceName(globalTransaction.getServiceName())
+ .instanceId(globalTransaction.getInstanceId())
+ .globalTxId(globalTransaction.getGlobalTxId())
+ .state(globalTransaction.getState())
+ .beginTime(globalTransaction.getBeginTime())
+ .endTime(globalTransaction.getEndTime())
+ .subTxSize(globalTransaction.getSubTxSize())
+ .durationTime(globalTransaction.getDurationTime())
+ .build());
+ }
+ return DataTablesResponseDTO.builder()
+ .draw(dataTablesRequestDTO.getDraw())
+ .recordsTotal(1)
+ .recordsFiltered(1)
+ .data(data)
+ .build();
+ } else {
+ return this.sagaList(dataTablesRequestDTO);
}
- return DataTablesResponseDTO.builder()
- .draw(dataTablesRequestDTO.getDraw())
- .recordsTotal(1)
- .recordsFiltered(1)
- .data(data)
- .build();
}
@GetMapping("/ui/transaction/{globalTxId}")
@@ -162,7 +167,8 @@ public class TransactionController {
eventDTO.setTimeout(Long.valueOf(event.get("timeout").toString()));
}
}
- if (eventDTO.getType().equals("TxAbortedEvent") || eventDTO.getType().equals("SagaAbortedEvent")) {
+ if (eventDTO.getType().equals("TxAbortedEvent") || eventDTO.getType()
+ .equals("SagaAbortedEvent")) {
// TxAbortedEvent properties
if (event.containsKey("payloads")) {
BASE64Decoder decoder = new BASE64Decoder();
@@ -171,7 +177,7 @@ public class TransactionController {
exception = new String(decoder.decodeBuffer(event.get("payloads").toString()), "UTF-8");
} catch (IOException e) {
exception = "BASE64Decoder error";
- LOG.error(e.getMessage(),e);
+ LOG.error(e.getMessage(), e);
}
eventDTO.setException(exception);
}
diff --git a/alpha/alpha-ui/src/main/resources/templates/fragments/header.html b/alpha/alpha-ui/src/main/resources/templates/fragments/header.html
index fc430a4..9588954 100644
--- a/alpha/alpha-ui/src/main/resources/templates/fragments/header.html
+++ b/alpha/alpha-ui/src/main/resources/templates/fragments/header.html
@@ -28,7 +28,7 @@
<div class="input-group">
<input type="text" name="globalTxId" class="form-control bg-light border-0 small" placeholder="Search for Global Transaction ID ..." aria-label="Search" aria-describedby="basic-addon2">
<div class="input-group-append">
- <button class="btn btn-primary" type="button">
+ <button class="btn btn-primary" type="submit">
<i class="fas fa-search fa-sm"></i>
</button>
</div>
@@ -49,7 +49,7 @@
<div class="input-group">
<input type="text" name="globalTxId" class="form-control bg-light border-0 small" placeholder="Search for Global Transaction ID ..." aria-label="Search" aria-describedby="basic-addon2">
<div class="input-group-append">
- <button class="btn btn-primary" type="button">
+ <button class="btn btn-primary" type="submit">
<i class="fas fa-search fa-sm"></i>
</button>
</div>
@@ -57,34 +57,6 @@
</form>
</div>
</li>
-
- <!-- Nav Item - Alerts -->
- <li class="nav-item dropdown no-arrow mx-1">
- <a class="nav-link dropdown-toggle" href="#" id="alertsDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <i class="fas fa-bell fa-fw"></i>
- <!-- Counter - Alerts -->
- <span class="badge badge-danger badge-counter">1</span>
- </a>
- <!-- Dropdown - Alerts -->
- <div class="dropdown-list dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="alertsDropdown">
- <h6 class="dropdown-header">
- Alerts Center
- </h6>
- <a class="dropdown-item d-flex align-items-center" href="#">
- <div class="mr-3">
- <div class="icon-circle bg-primary">
- <i class="fas fa-file-alt text-white"></i>
- </div>
- </div>
- <div>
- <div class="small text-gray-500">December 12, 2019</div>
- <span class="font-weight-bold">Global transaction ID [205b2802-b4c9-11e9-a2a3-2a2ae2dbcce4] SUSPENDED</span>
- </div>
- </a>
- <a class="dropdown-item text-center small text-gray-500" href="#">Show All Alerts</a>
- </div>
- </li>
-
</ul>
</nav>