Skip to content

Commit d5127eb

Browse files
authored
Various UI tweaks (#97)
1 parent e34f2d0 commit d5127eb

File tree

10 files changed

+39
-6
lines changed

10 files changed

+39
-6
lines changed

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
55
## 2.0.0 (UNRELEASED)
66

77
- Added new Stream consumer management page at /configuration/stream
8-
- Added ability to disable user authentication, allowing for anonymous users to access the web service.
8+
- Added ability to disable user authentication. This allows for anonymous user access.
99
- Added ability to create topics via the UI.
1010
- Added ability to modify topic configuration via the UI.
11+
- Various UI usability improvements.
1112
- Updated SpringBoot framework from 1.5.x to 2.0.5.
1213

1314
### Breaking Changes
1415

15-
TODO Write migration guide
16+
Kafka-WebView's configuration file has changed slightly. Most notably the `require-ssl` property has moved and been renamed requiredSsl.
17+
Please review the default [config.yml](kafka-webview-ui/src/assembly/distribution/config.yml) for references to the new configuration options.
1618

1719
## 1.0.5 (06/22/2018)
1820
- [Issue#75](https://github.com/SourceLabOrg/kafka-webview/issues/75) Bugfix Add Jackson serializer that falls back to using toString() when consuming entries from Kafka.

kafka-webview-ui/src/assembly/distribution/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ app:
1010
## Defines a prefix prepended to the Id of all consumers.
1111
consumerIdPrefix: "KafkaWebViewConsumer"
1212

13+
## Sets upper limit on the number of concurrent web socket consumers supported.
14+
maxConcurrentWebSocketConsumers: 64
15+
1316
## Require SSL
1417
requireSsl: false
1518

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/cluster/ClusterConfigController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public String index(final Model model) {
8080
setupBreadCrumbs(model, null, null);
8181

8282
// Retrieve all clusters
83-
final Iterable<Cluster> clusterList = clusterRepository.findAll();
83+
final Iterable<Cluster> clusterList = clusterRepository.findAllByOrderByNameAsc();
8484
model.addAttribute("clusterList", clusterList);
8585

8686
return "configuration/cluster/index";

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/configuration/view/ViewConfigController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public String index(final Model model) {
101101
setupBreadCrumbs(model, null, null);
102102

103103
// Retrieve all message formats
104-
final Iterable<View> viewList = viewRepository.findAll();
104+
final Iterable<View> viewList = viewRepository.findAllByOrderByNameAsc();
105105
model.addAttribute("views", viewList);
106106

107107
return "configuration/view/index";

kafka-webview-ui/src/main/resources/templates/cluster/read.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ <h4 class="alert-heading">No Brokers Found</h4>
191191
Cluster <strong th:text="${cluster.name}"></strong> Topics
192192

193193
<div class="btn-group float-right" role="group" aria-label="Button group" sec:authorize="hasRole('ROLE_ADMIN')">
194-
<button class="btn" type="button" data-toggle="modal" data-target="#createTopicModal" style="padding-bottom: 0;">
194+
<a class="btn" href="#" style="padding-bottom: 0;" data-toggle="modal" data-target="#createTopicModal">
195195
<i class="icon-settings"></i>
196196
&nbsp;Create new
197-
</button>
197+
</a>
198198
</div>
199199
</div>
200200
<div class="card-body">

kafka-webview-ui/src/main/resources/templates/configuration/cluster/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
</tr>
3636
</thead>
3737
<tbody>
38+
<tr th:if="${clusterList.isEmpty()}" align="center">
39+
<td colspan="5">
40+
No clusters found!
41+
</td>
42+
</tr>
3843
<tr th:each="cluster : ${clusterList}">
3944
<td th:text="${cluster.name}"></td>
4045
<td th:text="${cluster.brokerHosts}"></td>

kafka-webview-ui/src/main/resources/templates/configuration/filter/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
</tr>
4141
</thead>
4242
<tbody>
43+
<tr th:if="${filters.isEmpty()}" align="center">
44+
<td colspan="5">
45+
No filters found!
46+
</td>
47+
</tr>
4348
<tr th:each="filter : ${filters}">
4449
<td th:text="${filter.name}"></td>
4550
<td th:text="${filter.classpath}"></td>

kafka-webview-ui/src/main/resources/templates/configuration/index.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@
7070
Kafka cluster and topic. It also allows you to configure Record Filters.
7171
</td>
7272
</tr>
73+
<tr>
74+
<td>
75+
<a href="/configuration/stream">Active Streams</a>
76+
</td>
77+
<td>
78+
This section allows you to view any active stream consumers.
79+
</td>
80+
</tr>
7381
</tbody>
7482
</table>
7583
</div>

kafka-webview-ui/src/main/resources/templates/configuration/stream/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
</tr>
3131
</thead>
3232
<tbody>
33+
<tr th:if="${consumers.isEmpty()}" align="center">
34+
<td colspan="6">
35+
No active consumers found!
36+
</td>
37+
</tr>
3338
<tr th:each="consumer : ${consumers}">
3439
<td th:text="${userMap.get(consumer.getUserId()).getDisplayName()}"></td>
3540
<td>

kafka-webview-ui/src/main/resources/templates/configuration/view/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
</tr>
3838
</thead>
3939
<tbody>
40+
<tr th:if="${views.isEmpty()}" align="center">
41+
<td colspan="7">
42+
No views found!
43+
</td>
44+
</tr>
4045
<tr th:each="view : ${views}">
4146
<td>
4247
<a th:href="@{/view/{id}(id=${view.id})}" th:text="${view.name}"/>

0 commit comments

Comments
 (0)