Skip to content

Commit bb5eab4

Browse files
authored
Merge pull request #318 from EventStore/hayley-jean/remove-red-dots
Remove the red and green status dots from persistent subscriptions
2 parents 786978e + 8e12a47 commit bb5eab4

File tree

5 files changed

+4
-28
lines changed

5 files changed

+4
-28
lines changed

src/js/modules/competing/services/SubscriptionsMapper.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,6 @@ define(['./_module'], function (app) {
3333
}
3434
}
3535

36-
function determineStatus(subscription){
37-
if(subscription.behindByMessages !== 0) {
38-
if(subscription.averageItemsPerSecond > 0){
39-
return 'subscription-active';
40-
}else{
41-
return 'behind-notcatchingup';
42-
}
43-
}
44-
return 'subscription-active';
45-
}
46-
4736
function determineGroupStatus(group){
4837
for(var index in group.groups){
4938
if(group.groups[index].status.indexOf('behind') >= 0){
@@ -126,7 +115,6 @@ define(['./_module'], function (app) {
126115
}
127116
current.averageItemsPerSecond = previous ? current.totalItemsProcessed - previous.totalItemsProcessed : 0;
128117
current.inFlightMessages = current.totalInFlightMessages;
129-
current.status = determineStatus(current);
130118

131119
if(key) {
132120
if(!result[key]) {

src/js/modules/competing/templates/templates.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/modules/competing/views/subscription.row.header.tpl.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
<td>{{ esSubscription.lastCheckpointedEventPosition }}</td>
1010
<td>{{ esSubscription.inFlightMessages }}</td>
1111
<td>{{ esSubscription.connectionCount }}</td>
12-
<td>
13-
<div class="status {{ esSubscription.status }}"></div> {{ esSubscription.behindStatus }}
14-
</td>
12+
<td>{{ esSubscription.behindStatus }}</td>
1513
<td></td>
1614

1715
<!-- class="table-subheading" -->

src/js/modules/competing/views/subscription.row.tpl.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
<td>{{ esSubscription.lastCheckpointedEventPosition }}</td>
66
<td>{{ esSubscription.inFlightMessages }}</td>
77
<td>{{ esSubscription.connectionCount }}</td>
8-
<td>
9-
<div class=" status {{ esSubscription.status }}"></div>{{ esSubscription.behindStatus }}
10-
</td>
8+
<td>{{ esSubscription.behindStatus }}</td>
119
<td>
1210
<ul class="page-nav">
1311
<li ng-if="esSubscription.eventStreamId !== '$all'" class="page-nav__item">

src/scss/_module-sitemain.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,6 @@
248248
border:1px solid black;
249249
}
250250

251-
.subscription-active{
252-
background:lime;
253-
}
254-
255-
.behind-notcatchingup{
256-
background:red;
257-
}
258-
259251
.toast-container-modal {
260252
width:100%;
261253
height:100%;

0 commit comments

Comments
 (0)