Skip to content

Commit

Permalink
#1065 Add a Preview button to the case alerts list
Browse files Browse the repository at this point in the history
  • Loading branch information
nadouani committed Aug 30, 2019
1 parent ec885d9 commit 7ab234e
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 9 deletions.
4 changes: 3 additions & 1 deletion ui/app/scripts/controllers/SearchCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
event: event,
templates: function() {
return CaseTemplateSrv.list();
}
},
readonly: true,
isAdmin: false
}
}).result.then(function(/*response*/) {
$scope.searchResults.update();
Expand Down
3 changes: 2 additions & 1 deletion ui/app/scripts/controllers/alert/AlertEventCtrl.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
(function() {
'use strict';
angular.module('theHiveControllers')
.controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, ModalUtilsSrv, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, UiSettingsSrv, clipboard, event, templates, isAdmin) {
.controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, ModalUtilsSrv, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, UiSettingsSrv, clipboard, event, templates, isAdmin, readonly) {
var self = this;
var eventId = event.id;

self.readonly = readonly;
self.isAdmin = isAdmin;
self.templates = _.pluck(templates, 'name');
self.CaseResolutionStatus = CaseResolutionStatus;
Expand Down
3 changes: 2 additions & 1 deletion ui/app/scripts/controllers/alert/AlertListCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@
templates: function() {
return CaseTemplateSrv.list();
},
isAdmin: self.isAdmin
isAdmin: self.isAdmin,
readonly: false
}
});
};
Expand Down
18 changes: 18 additions & 0 deletions ui/app/scripts/controllers/case/CaseAlertsCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,24 @@
}
};

$scope.previewEvent = function(event) {
$uibModal.open({
templateUrl: 'views/partials/alert/event.dialog.html',
controller: 'AlertEventCtrl',
controllerAs: 'dialog',
size: 'max',
resolve: {
event: event,
templates: function() {
//return CaseTemplateSrv.list();
return [];
},
isAdmin: false,
readonly: true
}
});
};

$scope.alertStats = $scope.initStats($scope.alerts);
}
);
Expand Down
12 changes: 6 additions & 6 deletions ui/app/views/partials/alert/event.dialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,31 +143,31 @@ <h4 class="vpad10 text-primary">


<button class="btn btn-default" type="button"
ng-if="dialog.canMarkAsRead(dialog.event)"
ng-if="dialog.canMarkAsRead(dialog.event) && !dialog.readonly"
ng-disabled="dialog.loading"
ng-click="dialog.markAsRead(dialog.event)">
<i class="fa fa-envelope"></i> Mark as read
</button>
<button class="btn btn-default" type="button"
ng-if="dialog.canMarkAsUnread(dialog.event)"
ng-if="dialog.canMarkAsUnread(dialog.event) && !dialog.readonly"
ng-disabled="dialog.loading"
ng-click="dialog.markAsRead(dialog.event)">
<i class="fa fa-envelope-open-o"></i> Mark as unread
</button>

<button class="btn btn-default" type="button" ng-disabled="dialog.loading" ng-click="dialog.follow()">
<button class="btn btn-default" type="button" ng-if="!dialog.readonly" ng-disabled="dialog.loading" ng-click="dialog.follow()">
<i class="fa" ng-class="{'fa-eye': dialog.event.follow, 'fa-eye-slash': !dialog.event.follow}"></i> {{dialog.event.follow ? 'Ignore new updates' : 'Track new updates'}}
</button>

<button class="btn btn-default" type="button" ng-disabled="dialog.loading" ng-click="dialog.merge()">
<button class="btn btn-default" type="button" ng-if="!dialog.readonly" ng-disabled="dialog.loading" ng-click="dialog.merge()">
<i class="fa fa-compress"></i> Merge into case
</button>

<button ng-if="dialog.isAdmin" class="btn btn-danger" type="button" ng-disabled="dialog.loading" ng-click="dialog.delete()">
<button ng-if="dialog.isAdmin && !dialog.readonly" class="btn btn-danger" type="button" ng-disabled="dialog.loading" ng-click="dialog.delete()">
<i class="fa fa-trash"></i> Delete
</button>

<form name="eventForm" class="form-horizontal pull-right mr-xs" style="width:450px;" ng-submit="dialog.import()">
<form ng-if="!dialog.readonly" name="eventForm" class="form-horizontal pull-right mr-xs" style="width:450px;" ng-submit="dialog.import()">
<div class="form-group">
<label class="col-sm-4 control-label">Import alert as</label>
<div class="col-sm-8 input-group">
Expand Down
6 changes: 6 additions & 0 deletions ui/app/views/partials/case/case.alerts.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
<i ng-show="sorting.field === '-date'" class="fa fa-caret-down"></i>
</a>
</th>
<th style="width: 60px"></th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -129,6 +130,11 @@
</td>
<td class="text-center">{{::event.artifacts.length || 0}}</td>
<td>{{event.date | showDate}}</td>
<td>
<a class="btn btn-xs btn-icon btn-clear" href ng-click="previewEvent(event)" uib-tooltip="Preview">
<i class="text-info text-20 fa fa-file-text-o"></i>
</a>
</td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit 7ab234e

Please sign in to comment.