Skip to content
This repository was archived by the owner on Mar 6, 2023. It is now read-only.

Commit a968671

Browse files
committed
Added the ability to display event references
1 parent 1e5cd01 commit a968671

File tree

8 files changed

+28
-66
lines changed

8 files changed

+28
-66
lines changed

src/.jshintrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"curly": false,
33
"eqeqeq": true,
44
"immed": true,
5-
"latedef": true,
5+
"latedef": false,
66
"newcap": true,
77
"noarg": true,
88
"sub": true,
@@ -28,4 +28,4 @@
2828
"xit": true,
2929
"spyOn": true
3030
}
31-
}
31+
}

src/app/event/event-controller.js

+20-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.controller('Event', ['$ExceptionlessClient', '$scope', '$state', '$stateParams', 'errorService', 'eventService', 'hotkeys', 'linkService', 'notificationService', 'projectService', 'urlService', function ($ExceptionlessClient, $scope, $state, $stateParams, errorService, eventService, hotkeys, linkService, notificationService, projectService, urlService) {
66
var source = 'app.event.Event';
77
var _eventId = $stateParams.id;
8-
var _knownDataKeys = ['error', 'simple_error', 'request', 'environment', 'user', 'user_description', 'sessionend', 'version'];
8+
var _knownDataKeys = ['error', 'simple_error', 'request', 'environment', 'user', 'user_description', 'sessionend', 'session_id', 'version'];
99
var vm = this;
1010

1111
function addHotKeys() {
@@ -54,6 +54,23 @@
5454

5555
}
5656

57+
function buildReferences() {
58+
function toSpacedWords(value) {
59+
value = value.replace(/_/g, ' ').replace(/\s+/g, ' ').trim();
60+
value = value.replace(/([a-z0-9])([A-Z0-9])/g, '$1 $2');
61+
return value.length > 1 ? value.charAt(0).toUpperCase() + value.slice(1) : value;
62+
}
63+
64+
vm.references = [];
65+
66+
var referencePrefix = '@ref:';
67+
angular.forEach(vm.event.data, function(data, key) {
68+
if (key.startsWith(referencePrefix)) {
69+
vm.references.push({ id: data, name: toSpacedWords(key.slice(5)) });
70+
}
71+
});
72+
}
73+
5774
function buildTabs(tabNameToActivate) {
5875
var tabs = [{title: 'Overview', template_key: 'overview'}];
5976

@@ -185,6 +202,7 @@
185202
vm.next = links['next'] ? links['next'].split('/').pop() : null;
186203

187204
addHotKeys();
205+
buildReferences();
188206

189207
return vm.event;
190208
}
@@ -387,6 +405,7 @@
387405
vm.isSessionStart = isSessionStart;
388406
vm.project = {};
389407
vm.promoteTab = promoteTab;
408+
vm.references = [];
390409
vm.sessionEvents = {
391410
get: function (options) {
392411
function optionsCallback(options) {

src/app/event/tabs/overview.tpl.html

+4-6
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,14 @@
1919
<th>Project</th>
2020
<td><a ui-sref="app.project-dashboard({ projectId: vm.project.id })">{{vm.project.name}}</a></td>
2121
</tr>
22-
<tr ng-if="vm.event.session_id">
23-
<th>Session<span ng-if="vm.isSessionStart()"> Id</span></th>
24-
<td>
25-
<span ng-if="vm.isSessionStart()">{{vm.event.session_id}}</span>
26-
<a ng-if="!vm.isSessionStart()" ui-sref="app.session.list({ id: vm.event.session_id })">{{vm.event.session_id}}</a></td>
27-
</tr>
2822
<tr ng-if="vm.event.reference_id">
2923
<th>Reference</th>
3024
<td>{{vm.event.reference_id}}</td>
3125
</tr>
26+
<tr ng-repeat="reference in vm.references | orderBy: 'name'">
27+
<th>{{reference.name}}</th>
28+
<td><a ui-sref="app.app.event-reference({ referenceId: reference.id })">{{reference.id}}</a></td>
29+
</tr>
3230
<tr class="hidden-print" ng-if="vm.hasLevel()">
3331
<th>Level</th>
3432
<td><span class="label label-default" ng-class="{ 'label-success': vm.isLevelSuccess(), 'label-info': vm.isLevelInfo(), 'label-warning': vm.isLevelWarning(), 'label-danger': vm.isLevelError() }">{{::vm.event.data['@level']}}</span></td>

src/app/session/list-controller.js

-31
This file was deleted.

src/app/session/list.tpl.html

-12
This file was deleted.

src/app/session/session.js

-11
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,5 @@
9090
}]
9191
}
9292
});
93-
94-
$stateProvider.state('app.session.list', {
95-
url: '/{id:[0-9a-zA-Z\-]{8,100}}',
96-
controller: 'session.List',
97-
controllerAs: 'vm',
98-
templateUrl: 'app/session/list.tpl.html',
99-
onEnter: ['filterService', function (filterService) {
100-
filterService.setEventType('session', true);
101-
}],
102-
onExit: onExitRemoveTypeFilter
103-
});
10493
}]);
10594
}());

src/index.html

-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@
245245

246246
<script src="app/session/session.js"></script>
247247
<script src="app/session/dashboard-controller.js"></script>
248-
<script src="app/session/list-controller.js"></script>
249248
<script src="app/session/sessions-directive.js"></script>
250249

251250
<script src="app/stack/stack.js"></script>

src/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"devDependencies": {
66
"bower": "1.7.2",
77
"grunt": "0.4",
8-
"grunt-angular-templates": "0.5",
8+
"grunt-angular-templates": "1.0",
99
"grunt-browser-output": "1.0.3",
1010
"grunt-cache-bust": "0.6.1",
1111
"grunt-cli": "0.1.13",
@@ -16,7 +16,7 @@
1616
"grunt-contrib-copy": "0.8",
1717
"grunt-contrib-cssmin": "0.14.0",
1818
"grunt-contrib-htmlmin": "0.6",
19-
"grunt-contrib-jshint": "0.11",
19+
"grunt-contrib-jshint": "0.12",
2020
"grunt-contrib-less": "1.1",
2121
"grunt-contrib-uglify": "0.11",
2222
"grunt-contrib-watch": "0.6",

0 commit comments

Comments
 (0)