Skip to content

Commit 6cadc80

Browse files
committed
Update UI to handle redacted events
1 parent 705672b commit 6cadc80

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ 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=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' +
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 ng-if=!evt.isRedacted>\n' +
3434
'{{ evt.data }}\n' +
35-
' </pre></div><div ng-if=evt.isMetaData><strong>Metadata</strong><pre>\n' +
35+
' </pre><span class=note--warning ng-if=evt.isRedacted>This event\'s data was redacted</span></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' +
@@ -48,9 +48,9 @@ try {
4848
}
4949
module.run(['$templateCache', function($templateCache) {
5050
$templateCache.put('streams.item.events.tpl.html',
51-
'<table><thead><tr><th>Event #</th><th>Name</th><th>Type</th><th>Created Date</th><th></th></tr></thead><tbody ng-repeat="event in streams track by $index"><tr ng-class="{ \'invalid\': !event.streamId }"><td><a ng-if=event.streamId ui-sref="^.event({streamId: event.streamId, eventNumber: event.eventNumber})">{{ event.positionEventNumber }}</a><text ng-if=!event.streamId>{{ event.positionEventNumber }}</text></td><td><a ng-if=event.streamId ui-sref="^.event({streamId: event.streamId, eventNumber: event.eventNumber})">{{ event.title }}</a><text ng-if=!event.streamId>{{ event.title }}</text></td><td>{{ event.eventType }}</td><td>{{ event.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td><td><a ng-click="toggleJson($event, event)" style="cursor: pointer;" ng-if="event.isJson || event.isLinkMetaData || event.isMetaData">JSON</a></td></tr><tr ng-show=event.showJson><td colspan=5><div ng-if=event.isJson><strong>Data</strong><pre>\n' +
51+
'<table><thead><tr><th>Event #</th><th>Name</th><th>Type</th><th>Created Date</th><th></th></tr></thead><tbody ng-repeat="event in streams track by $index"><tr ng-class="{ \'invalid\': !event.streamId }"><td><a ng-if=event.streamId ui-sref="^.event({streamId: event.streamId, eventNumber: event.eventNumber})">{{ event.positionEventNumber }}</a><text ng-if=!event.streamId>{{ event.positionEventNumber }}</text></td><td><a ng-if=event.streamId ui-sref="^.event({streamId: event.streamId, eventNumber: event.eventNumber})">{{ event.title }}</a><text ng-if=!event.streamId>{{ event.title }}</text></td><td>{{ event.eventType }}</td><td>{{ event.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td><td><a ng-click="toggleJson($event, event)" style="cursor: pointer;" ng-if="event.isJson || event.isLinkMetaData || event.isMetaData">JSON</a></td></tr><tr ng-show=event.showJson><td colspan=5><div ng-if=event.isJson><strong>Data</strong><pre ng-if=!event.isRedacted>\n' +
5252
'{{ event.data }} \n' +
53-
' </pre></div><div ng-if=event.metaData><strong>Metadata</strong><pre>\n' +
53+
' </pre><span class=note--warning ng-if=event.isRedacted>This event\'s data was redacted</span></div><div ng-if=event.metaData><strong>Metadata</strong><pre>\n' +
5454
'{{ event.metaData }} \n' +
5555
' </pre></div><div ng-if=event.isLinkMetaData><strong>Link metadata</strong><pre>\n' +
5656
'{{ event.linkMetaData }} \n' +

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,13 @@ <h2 class="page-title">
4949
<tr ng-if="evt.isJson || evt.isMetaData || evt.isLinkMetaData">
5050
<td colspan="4">
5151
<div ng-if="evt.isJson">
52-
<strong>Data</strong><pre>
52+
<strong>Data</strong>
53+
<pre ng-if="!evt.isRedacted">
5354
{{ evt.data }}
5455
</pre>
56+
<span class="note--warning" ng-if="evt.isRedacted">
57+
This event's data was redacted
58+
</span>
5559
</div>
5660
<div ng-if="evt.isMetaData">
5761
<strong>Metadata</strong><pre>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<td colspan="5">
3131
<div ng-if="event.isJson">
3232
<strong>Data</strong>
33-
<pre>
33+
<pre ng-if="!event.isRedacted">
3434
{{ event.data }}
3535
</pre>
36+
<span class="note--warning" ng-if="event.isRedacted">
37+
This event's data was redacted
38+
</span>
3639
</div>
3740
<div ng-if="event.metaData">
3841
<strong>Metadata</strong>

0 commit comments

Comments
 (0)