Skip to content

Fixed the issue Bug #1338520,where alerts popup dont show any alerts,wid... #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vishnuvv wants to merge 1 commit into
base: feature-dev
Choose a base branch
from
Open

Fixed the issue Bug #1338520,where alerts popup dont show any alerts,wid... #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion webroot/js/dashboard-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,13 @@ function infraMonitorClass() {
endWidgetLoading('sysinfo');
if(timeStampAlert.length > 0)
allAlerts = allAlerts.concat(timeStampAlert)
globalObj['alertsData'] = allAlerts;
//Filtering the alerts for alerts popup based on the detailAlert flag
var popupAlerts = [];
for(var i=0;i<allAlerts.length;i++) {
if(allAlerts[i]['detailAlert'] != false)
popupAlerts.push(allAlerts[i]);
}
globalObj['dataSources']['alertsDS']['dataSource'].setData(popupAlerts);
if(globalObj.showAlertsPopup){
loadAlertsContent();
}
Expand Down
180 changes: 90 additions & 90 deletions webroot/js/web-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1835,101 +1835,99 @@ function processDrillDownForNodes(e) {
}

function loadAlertsContent(){
if(globalObj.alertsData!=undefined) {
var data = globalObj.alertsData;
var renderPopupEveryTime = true,alertsData = [];
$('#header ul li.nav-header').text(data.length+' New Alerts');
var alerts = contrail.getTemplate4Id("alerts-template");
for(var i=0;i<data.length;i++) {
if(data[i]['detailAlert'] != false)
alertsData.push(data[i]);
}
var alertsTemplate = contrail.getTemplate4Id('moreAlerts-template');
var statusTemplate = contrail.getTemplate4Id('statusTemplate');
var alertsGrid;
if(renderPopupEveryTime || $("#moreAlerts").length == 0) {
$("#moreAlerts").remove();
$('body').append(alertsTemplate({}));
alertsWindow = $("#moreAlerts");
alertsWindow.modal({backdrop:'static',keyboard:false,show:false});
$("#alertsClose").click(function(){
alertsWindow.hide();
});
$("#alertContent").contrailGrid({
header : {
title : {
text : 'Details',
cssClass : 'blue',
},
customControls: []
var alertsDS = globalObj['dataSources']['alertsDS']['dataSource'];
var renderPopupEveryTime = true,alertsData = [];
//$('#header ul li.nav-header').text(data.length+' New Alerts');
var alerts = contrail.getTemplate4Id("alerts-template");
var alertsTemplate = contrail.getTemplate4Id('moreAlerts-template');
var statusTemplate = contrail.getTemplate4Id('statusTemplate');
var alertsGrid;
if(renderPopupEveryTime || $("#moreAlerts").length == 0) {
$("#moreAlerts").remove();
$('body').append(alertsTemplate({}));
alertsWindow = $("#moreAlerts");
alertsWindow.modal({backdrop:'static',keyboard:false,show:false});
$("#alertsClose").click(function(){
alertsWindow.hide();
});
$("#alertContent").contrailGrid({
header : {
title : {
text : 'Details',
cssClass : 'blue',
},
body: {
options: {
forceFitColumns:true,
},
dataSource: {
data: alertsData
},
statusMessages: {
empty: {
text: 'No Alerts to display'
},
errorGettingData: {
type: 'error',
iconClasses: 'icon-warning',
text: 'Error in getting Data.'
}
}
customControls: []
},
body: {
options: {
forceFitColumns:true,
},
columnHeader: {
columns:[
{
field:'name',
name:'Node',
minWidth:150,
formatter: function(r,c,v,cd,dc){
if(typeof(dc['sevLevel']) != "undefined" && typeof(dc['name']) != "undefined")
return "<span>"+statusTemplate({sevLevel:dc['sevLevel'],sevLevels:sevLevels})+dc['name']+"</span>";
else
return dc['name'];
},
events: {
onClick: function(e,dc) {
var nodeType = dc['pName'];
if(dc['link'] != null)
layoutHandler.setURLHashObj(dc['link']);
}
},
cssClass: 'cell-hyperlink-blue',
},{
field:'type',
name:'Process',
minWidth:100
},{
field:'msg',
name:'Status',
minWidth:200,
},{
field:'timeStamp',
name:'Time',
minWidth:100,
formatter:function(r,c,v,cd,dc) {
if(typeof(dc['timeStamp']) != "undefined")
return getFormattedDate(dc['timeStamp']/1000);
else
return "";
}
}]
dataSource: {
dataView: alertsDS,
},
statusMessages: {
empty: {
text: 'No Alerts to display'
},
errorGettingData: {
type: 'error',
iconClasses: 'icon-warning',
text: 'Error in getting Data.'
}
}
});
}
alertsWindow.modal('show');
alertsGrid = $('#alertContent').data('contrailGrid');
},
columnHeader: {
columns:[
{
field:'name',
name:'Node',
minWidth:150,
formatter: function(r,c,v,cd,dc){
if(typeof(dc['sevLevel']) != "undefined" && typeof(dc['name']) != "undefined")
return "<span>"+statusTemplate({sevLevel:dc['sevLevel'],sevLevels:sevLevels})+dc['name']+"</span>";
else
return dc['name'];
},
events: {
onClick: function(e,dc) {
var nodeType = dc['pName'];
if(dc['link'] != null)
layoutHandler.setURLHashObj(dc['link']);
}
},
cssClass: 'cell-hyperlink-blue',
},{
field:'type',
name:'Process',
minWidth:100
},{
field:'msg',
name:'Status',
minWidth:200,
},{
field:'timeStamp',
name:'Time',
minWidth:100,
formatter:function(r,c,v,cd,dc) {
if(typeof(dc['timeStamp']) != "undefined")
return getFormattedDate(dc['timeStamp']/1000);
else
return "";
}
}]
}
});
}
alertsWindow.modal('show');
alertsGrid = $('#alertContent').data('contrailGrid');
if(alertsGrid != null) {
alertsGrid.showGridMessage('loading');
alertsGrid.refreshView();
alertsGrid._grid.resizeCanvas();
alertsGrid.removeGridLoading();
globalObj.showAlertsPopup = false;
alertsGrid.removeGridMessage();
alertsGrid._eventHandlerMap.dataView['onUpdateData']();
}
globalObj.showAlertsPopup = false;
}


Expand Down Expand Up @@ -1976,7 +1974,9 @@ function ManageDataSource() {
dataSource:null,
error:null
},

'alertsDS':{
dataSource:new ContrailDataView()
},
//PortRange data for Port Distribution drill-down
'portRangeData':{
},
Expand Down