Skip to content

Commit

Permalink
Closes-Bug: #1536573
Browse files Browse the repository at this point in the history 
Closes-Bug: #1535210
Closes-Bug: #1534005
Closes-Bug: #1533623
Closes-Bug: #1510886
- Fixed the sorting of alarms in dashboard. Higher severity alarms will show on
top.
- Fixed acknowledgement of alarms in popup.
- Aligned the circle in the alarms grid.
- Changed the action column to single ack icon. This avoids need of change in
icon.
- Added tooltip for search icon in grid.
- Clearing the selected items in the alarms grid after ack.
- Fixed the alignment of columns in the alarms grid.

Change-Id: I38122dd14d00113ecc97e40bb4cc1ba00dd4ae8f
  • Loading branch information
@manojgn
manojgn committed Feb 1, 2016
1 parent f74bb62 commit 459dc12
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 49 deletions.
16 changes: 14 additions & 2 deletions webroot/css/contrail.custom.css
View file
Expand Up @@ -2888,7 +2888,10 @@ p.error, p.error-text {
.circle.orange.filled {
background-color: #ffbf87;
}

.alarms-circle-grid-style {
margin-top: 4px;
opacity:1;
}
.chart-settings .color-selection .circle {
display:inline-block;
margin:0 5px;
Expand Down Expand Up @@ -3543,4 +3546,13 @@ tr.collapsibleChildContainer{
}
#port-tuples-collection td.action-cell{
padding-right:7px;
}
}

#dashboard-alerts-modal ul.grid-action-menu{
margin-top:-95px;
margin-right:3px;
}

.max-z-index {
z-index: 30000;
}
1 change: 1 addition & 0 deletions webroot/js/common/core.labels.js
View file
Expand Up @@ -194,6 +194,7 @@ define([
this.QE_FILTER_MODAL_SUFFIX = '-filter-modal';

//Alarms labels
this.ALARM_PREFIX_ID = 'alarms';
this.ALARMS_BREADCRUMB_DROPDOWN = "alarms-breadcrumb-dropdown";
this.ALARMS_LIST_ID = 'alarms-list-view';
this.MONITOR_ALARMS_PAGE_ID = "monitor-alarms-page";
Expand Down
1 change: 1 addition & 0 deletions webroot/js/models/NodeListModel.js
View file
Expand Up @@ -84,6 +84,7 @@ define([
self.alertListModel.addItem(alerts[i]);
}
});
self.alertListModel.sort(dashboardUtils.sortInfraAlerts);
self.nodeListModel.endUpdate();
self.alertListModel.endUpdate();
}
Expand Down
80 changes: 38 additions & 42 deletions webroot/js/views/AlarmGridView.js
View file
Expand Up @@ -96,7 +96,7 @@ define([
{
field: 'severity',
name: '',
minWidth: 30,
width: 1,
searchFn: function (d) {
return d['severity'];
},
Expand All @@ -105,15 +105,15 @@ define([
var formattedDiv;
if(dc['ack']) {
if(dc['severity'] === 4) {
formattedDiv = '<div data-color="orange" class="circle orange" style="opacity:1"></div>';
formattedDiv = '<div data-color="orange" class="circle orange alarms-circle-grid-style"></div>';
} else if (dc['severity'] === 3) {
formattedDiv = '<div data-color="red" class="circle red" style="opacity:1"></div>';
formattedDiv = '<div data-color="red" class="circle red alarms-circle-grid-style"></div>';
}
} else {
if(dc['severity'] === 3) {
formattedDiv = '<div data-color="red" class="circle red filled" style="opacity:1"></div>';
formattedDiv = '<div data-color="red" class="circle red filled alarms-circle-grid-style"></div>';
} else if (dc['severity'] === 4) {
formattedDiv = '<div data-color="orange" class="circle orange filled" style="opacity:1"></div>';
formattedDiv = '<div data-color="orange" class="circle orange filled alarms-circle-grid-style"></div>';
}
}
return formattedDiv;
Expand All @@ -130,15 +130,27 @@ define([
{
field: 'alarm_msg',
name: 'Alarm',
minWidth: 250,
// formatter : function (r, c, v, cd, dc) {
// return dc.description[0].rule;
// }
minWidth: 200,
},
{
field: 'display_name',
name: 'Source',
minWidth: 100
},
{
field: 'acknowledge',
name:'',
formatter : function (r,c,v,cd,dc) {
var formattedDiv = '';
if(!dc['ack']) {
formattedDiv = '<span title="Acknowledge"><i class="icon-check-sign"></i></span>';
}
return formattedDiv;
},
events: {
onClick: onAcknowledgeActionClicked
},
width:1
}
];
var gridElementConfig = {
Expand All @@ -152,11 +164,6 @@ define([
refreshable: true,
searchable: true
},
// customControls: ['<a id="btnAcknowledge" class="disabled-link" title="Acknowledge"><i class=" icon-check-sign"></i></a>',
// '<div data-color="red" class="circle red" style="opacity:1" onclick=""></div>',
// '<div data-color="orange" class="circle orange" style="opacity:1"></div>',
// '<div data-color="red" class="circle red filled" style="opacity:1"></div>',
// '<div data-color="orange" class="circle orange filled" style="opacity:1"></div>']
advanceControls: getHeaderActionConfig()
},
body: {
Expand All @@ -170,7 +177,6 @@ define([
$('#btnAcknowledge').removeClass('disabled-link');
}
},
actionCell: getRowActionConfig,
detail: {
template: cowu.generateDetailTemplateHTML(getAlarmDetailsTemplateConfig(), cowc.APP_CONTRAIL_CONTROLLER)
}
Expand All @@ -186,25 +192,22 @@ define([
return gridElementConfig;
};

function getRowActionConfig(rowData) {
var ret = [];
var dataView = $('#' + cowl.ALARMS_GRID_ID).data("contrailGrid")._dataView;
if(!rowData.ack) {
ret.push(getAcknowledgeAction(function (rowIndex) {
alarmsEditView.model = new AlarmsModel();
alarmsEditView.renderAckAlarms ({
"title": 'Acknowledge Alarms',
checkedRows: [dataView.getItem(rowIndex)],
callback: function () {
dataView.refreshData();
$('#' + cowl.ALARMS_GRID_ID).data("contrailGrid").refreshView();
}
});
})
);
}
return ret;
};
function onAcknowledge (checkedRows) {
alarmsEditView.model = new AlarmsModel();
alarmsEditView.renderAckAlarms ({
"title": 'Acknowledge Alarms',
checkedRows:checkedRows,
callback: function () {
var alarmGrid = $('#' + cowl.ALARMS_GRID_ID).data("contrailGrid");
alarmGrid.refreshData();
alarmGrid.setCheckedRows([]);//Clear the selected items
}
});
}

function onAcknowledgeActionClicked (e,rowData) {
onAcknowledge ([rowData]);
}

function getHeaderActionConfig() {
var headerActionConfig = [
Expand All @@ -216,14 +219,7 @@ define([
"onClick": function () {
var gridElId = '#' + cowl.ALARMS_GRID_ID;
var checkedRows = $(gridElId).data("contrailGrid").getCheckedRows();
alarmsEditView.model = new AlarmsModel();
alarmsEditView.renderAckAlarms ({
"title": 'Acknowledge Alarms',
checkedRows:checkedRows,
callback: function () {
$('#' + cowl.ALARMS_GRID_ID).data("contrailGrid").refreshData();
}
});
onAcknowledge (checkedRows);
}
},
{
Expand Down
7 changes: 3 additions & 4 deletions webroot/js/views/AlarmsEditView.js
View file
Expand Up @@ -7,9 +7,8 @@ define([
'contrail-view',
'knockback'
], function (_, ContrailView, Knockback) {
var gridElId = '#' + ctwl.CFG_IPAM_GRID_ID;
var prefixId = ctwl.CFG_IPAM_PREFIX_ID;
var modalId = 'configure-' + prefixId;
var prefixId = cowl.ALARM_PREFIX_ID;
var modalId = 'acknowledge-' + prefixId;

var AlarmsEditView = ContrailView.extend({

Expand All @@ -20,7 +19,7 @@ define([
var self = this;

var ackLayout = ackTemplate({prefixId: prefixId});
cowu.createModal({'modalId': modalId, 'className': 'modal-480',
cowu.createModal({'modalId': modalId, 'className': 'modal-480 max-z-index',
'title': options['title'], 'btnName': 'Confirm',
'body': ackLayout,
'onSave': function () {
Expand Down
2 changes: 1 addition & 1 deletion webroot/js/views/GridView.js
View file
Expand Up @@ -1114,7 +1114,7 @@ define([
if (headerConfig.defaultControls.searchable) {
template += '\
<div class="widget-toolbar pull-right"> \
<a class="widget-toolbar-icon link-searchbox" data-action="search"> \
<a class="widget-toolbar-icon link-searchbox" title="Search" data-action="search"> \
<i class="icon-search"></i> \
</a> \
<span class="input-searchbox hide"> \
Expand Down

0 comments on commit 459dc12

Please sign in to comment.