Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Hawkular-654 Trigger Detail (Checkpoint 3, WIP)
Browse files Browse the repository at this point in the history
- Move from modal trigger detail to page views
  - Add poor-man's encoding of resourceIds where necessary, to allow using resourceIds in urls
- Add unresolved alerts side-bar to trigger detail views
- Make resource column values into links back to the resource detail view
- Make trigger details Cancel button emulate back button to maintain filtered def list views
- Add AC defs breadcrumb link to details views
  • Loading branch information
jshaughn committed Nov 11, 2015
1 parent a0ac62f commit b5600fe
Show file tree
Hide file tree
Showing 15 changed files with 511 additions and 337 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,12 @@ <h3 class="pull-left">Triggers ({{act.headerLinks.total}})</h3>
<td><input type="checkbox" ng-checked="trigger.selected"/></td>
<td>{{trigger.name}}</td>
<td>{{trigger.description}}</td>
<td>{{trigger.context.resourceName|truncate: 30}}</td>
<td><a ng-href="{{act.getResourceRoute(trigger)}}">{{trigger.context.resourceName|truncate: 30}}</a></td>
<td>{{trigger.severity|firstUpper}}</td>
<td>{{trigger.enabled ? "Enabled" : "Disabled"}}</td>
<td>{{trigger.actions.email.length}} <i class="fa fa-envelope-o"></i></td>
<td><a class="btn btn-link"><i class="fa fa-chevron-circle-right fa-lg"
tooltip="View Details" tooltip-trigger tooltip-placement="top"
ng-click="act.showDetailPage(trigger)">
<td>{{trigger.enabled ? "True" : "False"}}</td>
<td>{{trigger.actions.email.length}} <i class="fa fa-envelope"></i></td>
<td><a ng-href="{{act.getDetailRoute(trigger)}}" class="btn btn-link"><i class="fa fa-chevron-circle-right fa-lg"
tooltip="View Details" tooltip-trigger tooltip-placement="top">
</i></a>
</td>
</tr>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<div class="col-lg-3 col-md-4">
<div class="panel panel-default clearfix">
<div class="panel-heading clearfix">
<h2 class="pull-left">Alerts</h2>
<span class="label label-default pull-right">{{tc.alertList.length}}</span>
</div>
<div class="panel-body">
<div ng-show="tc.alertList.length > 0">
<div class="hk-box-v-item" ng-repeat="alert in tc.alertList">
<div class="hk-display-table">
<div class="hk-icon-container">
<i class="fa fa-exclamation-triangle hk-warning"></i>
</div>
<div class="hk-info-container">
<div class="hk-info-heading">{{alert.trigger.description}}</div>
<p class="hk-info-info">{{alert.ctime | date:'d MMM yyyy, HH:mm'}}</p>
</div>
<div class="hk-icon-container">
<a href="alert-center-detail.html" class="btn btn-link" data-toggle="tooltip" data-placement="top"
data-original-title="View Details"><i class="fa fa-chevron-circle-right"></i></a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<div class="hk-alert-center-detail">

<div class="hk-screen-top-nav">
<div class="container">
<div class="row hk-top-row">
<div class="col-xs-6">
<a href="/hawkular-ui/alerts-center-triggers" class="back">&laquo; All Definitions</a>
</div>
</div>
<div class="hk-heading">
<h1 class="offset-panels">Alert Definition Details</h1>
</div>
</div>
</div>

<div class="container">

<div class="row">
<div class="col-lg-9 col-md-8">
<div class="panel panel-default clearfix">
<div class="panel-heading">
<h2>{{tc.adm.trigger.name}}</h2>
</div>
<div class="panel-body">
<form class="form-horizontal">
<div ng-include="'plugins/metrics/html/partials/trigger-general-setup.html'"></div>

<h3>Alert Settings</h3>

<fieldset>
{{tc.adm.trigger.conditionContext.description !== '' ?
tc.adm.trigger.conditionContext.description : "Downtime"}}
</fieldset>

<hk-fieldset-dampening hk-duration="tc.adm.trigger.evalTimeSetting"
hk-title="Downtime"
hk-title-met="Every time it goes down."
hk-title-unmet="Only when it is down for more than:"></hk-fieldset-dampening>

<hk-fieldset-notification hk-alert-email="tc.adm.trigger.email"></hk-fieldset-notification>
</form>

<div class="form-actions hk-form-actions-separator text-right">
<a type="button" class="btn btn-default" ng-href="{{tc.cancel()}}" class="button">Cancel</a>
<button type="button" class="btn btn-primary" ng-click="tc.save()"
ng-disabled="tc.saveProgress || !tc.isSettingChange">
<div ng-show="tc.saveProgress" class="spinner spinner-xs hk-modal-spinner"></div>
Save
</button>
</div>

</div>
</div>
</div>

<div ng-include="'plugins/metrics/html/partials/trigger-alerts-sidebar.html'"></div>

</div> <!-- row -->

</div> <!-- container -->

</div>

0 comments on commit b5600fe

Please sign in to comment.