Skip to content

Commit 67db06b

Browse files
committed
Ensure that event 0 can be viewed in stream browser
1 parent af5baec commit 67db06b

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/js/modules/streams/controllers/StreamsItemEventCtrl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ define(['./_module'], function (app) {
2323
.then(function (res) {
2424
var data = res.data;
2525
$scope.evt = data;
26+
$scope.hasEvent = data.eventNumber !== null && data.eventNumber !== undefined;
2627
$scope.isNotTheSame = data.positionStreamId !== data.streamId || data.positionEventNumber !== data.eventNumber;
2728
$scope.links = data.links;
2829

src/js/modules/streams/templates/templates.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ try {
3030
}
3131
module.run(['$templateCache', function($templateCache) {
3232
$templateCache.put('streams.item.event.tpl.html',
33-
'<header class=page-header><h2 class=page-title>{{ evt.title }} <small ng-if=isNotTheSame>Link from {{ evt.positionEventNumber + \'@\' + evt.positionStreamId }}</small></h2><ul class=page-nav><li class=page-nav__item><a ng-if=evt ui-sref="^.addStreamEvent({ fromEvent: evt })">Add New Like This</a></li><li class=page-nav__item><a ui-sref=^.events>Back</a></li></ul></header><ul class=page-nav style="padding:0rem 0rem 2rem 0rem !important"><li class=page-nav__item><button ng-disabled=!prev ui-sref=".({streamId: evt.streamId, eventNumber: evt.positionEventNumber - 1})">prev</button></li><li class=page-nav__item><button ng-disabled=!next ui-sref=".({streamId: evt.streamId, eventNumber: evt.positionEventNumber + 1})">next</button></li></ul><br><table><thead><tr><th>No</th><th>Stream</th><th>Type</th><th>Timestamp</th></tr></thead><tbody ng-hide=evt.eventNumber><tr><td colspan=5><em>Event does not exist for stream: {{streamId}}</em></td></tr></tbody><tbody ng-show=evt.eventNumber><tr><td>{{ evt.eventNumber }}</td><td><a ui-sref="^.events({streamId: evt.streamId})">{{ evt.streamId }}</a></td><td>{{ evt.eventType }}</td><td>{{ evt.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td></tr><tr ng-if="evt.isJson || evt.isMetaData || evt.isLinkMetaData"><td colspan=4><div ng-if=evt.isJson><strong>Data</strong><pre>\n' +
33+
'<header class=page-header><h2 class=page-title>{{ evt.title }} <small ng-if=isNotTheSame>Link from {{ evt.positionEventNumber + \'@\' + evt.positionStreamId }}</small></h2><ul class=page-nav><li class=page-nav__item><a ng-if=evt ui-sref="^.addStreamEvent({ fromEvent: evt })">Add New Like This</a></li><li class=page-nav__item><a ui-sref=^.events>Back</a></li></ul></header><ul class=page-nav style="padding:0rem 0rem 2rem 0rem !important"><li class=page-nav__item><button ng-disabled=!prev ui-sref=".({streamId: evt.streamId, eventNumber: evt.positionEventNumber - 1})">prev</button></li><li class=page-nav__item><button ng-disabled=!next ui-sref=".({streamId: evt.streamId, eventNumber: evt.positionEventNumber + 1})">next</button></li></ul><br><table><thead><tr><th>No</th><th>Stream</th><th>Type</th><th>Timestamp</th></tr></thead><tbody ng-hide=hasEvent><tr><td colspan=5><em>Event does not exist for stream: {{streamId}}</em></td></tr></tbody><tbody ng-show=hasEvent><tr><td>{{ evt.eventNumber }}</td><td><a ui-sref="^.events({streamId: evt.streamId})">{{ evt.streamId }}</a></td><td>{{ evt.eventType }}</td><td>{{ evt.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td></tr><tr ng-if="evt.isJson || evt.isMetaData || evt.isLinkMetaData"><td colspan=4><div ng-if=evt.isJson><strong>Data</strong><pre>\n' +
3434
'{{ evt.data }}\n' +
3535
' </pre></div><div ng-if=evt.isMetaData><strong>Metadata</strong><pre>\n' +
3636
'{{ evt.metaData }}\n' +
3737
' </pre></div><div ng-if=evt.isLinkMetaData><strong>Link metadata</strong><pre>\n' +
3838
'{{ evt.content.linkMetaData }}\n' +
39-
' </pre></div></td></tr></tbody><thead ng-show=evt.eventNumber><tr><th colspan=4>Internal data</th></tr></thead><tbody ng-show=evt.eventNumber><tr><td>EventId</td><td colspan=3>{{ evt.eventId }}</td></tr></tbody></table>');
39+
' </pre></div></td></tr></tbody><thead ng-show=hasEvent><tr><th colspan=4>Internal data</th></tr></thead><tbody ng-show=hasEvent><tr><td>EventId</td><td colspan=3>{{ evt.eventId }}</td></tr></tbody></table>');
4040
}]);
4141
})();
4242

src/js/modules/streams/views/streams.item.event.tpl.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ <h2 class="page-title">
3131
<th>Timestamp</th>
3232
</tr>
3333
</thead>
34-
<tbody ng-hide="evt.eventNumber">
34+
<tbody ng-hide="hasEvent">
3535
<tr>
3636
<td colspan="5">
3737
<em>Event does not exist for stream: {{streamId}}
3838
</td>
3939
</tr>
4040
</tbody>
4141

42-
<tbody ng-show="evt.eventNumber">
42+
<tbody ng-show="hasEvent">
4343
<tr>
4444
<td>{{ evt.eventNumber }}</td>
4545
<td><a ui-sref="^.events({streamId: evt.streamId})">{{ evt.streamId }}</a></td>
@@ -66,12 +66,12 @@ <h2 class="page-title">
6666
</td>
6767
</tr>
6868
</tbody>
69-
<thead ng-show="evt.eventNumber">
69+
<thead ng-show="hasEvent">
7070
<tr>
7171
<th colspan="4">Internal data</th>
7272
</tr>
7373
</thead>
74-
<tbody ng-show="evt.eventNumber">
74+
<tbody ng-show="hasEvent">
7575
<tr>
7676
<td>EventId</td>
7777
<td colspan="3">{{ evt.eventId }}</td>

0 commit comments

Comments
 (0)