Skip to content

Commit

Permalink
Related-Bug:#1457332,Closes-Bug:#1453103
Browse files Browse the repository at this point in the history 
1)Moved the grid row settings icon to left side of row which removes the checkbox
2)Added the traceflow/reverse flow,mapflow icons
3)Trace flows,virtual router case previous button goes to first page,we fixed it
4)Changed the error message from 'Please try after some time' to 'Error in fetching details'
5)Changed the next,previoud buttons in traceflows tab to icons and removed the trace flow,reverse trace flow,map flow buttons
6)When we click on the action items in settings icon,if the response the proper we scroll top to topology
Change-Id: I3dc745f1e0bf8e25409c922ffa2a1119adb62f65
  • Loading branch information
@vishnuvv
vishnuvv committed May 22, 2015
1 parent b1e448b commit 2d66c66
Show file tree
Hide file tree
Showing 3 changed files with 299 additions and 269 deletions.
89 changes: 54 additions & 35 deletions webroot/monitor/infra/underlay/ui/js/flow_queries.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ frQuery['columnDisplay'] = [
{select:"destip", display:{id:"destip", field:"destip", width:100, name:"Destination IP", groupable:true, formatter: function(r, c, v, cd, dc){ return (validateIPAddress(handleNull4Grid(dc['destip'])) == true ? handleNull4Grid(dc['destip']) : noDataStr)}}},
{select:"dport", display:{id:"dport", field:"dport", width:70, name:"Destination Port", groupable:true, formatter: function(r, c, v, cd, dc){ return handleNull4Grid(dc.dport);}}},
{select:"agg-bytes", display:{id:'agg-bytes', field:'agg-bytes', width:120, name:"Bytes/Packets", groupable:false,formatter: function(r, c, v, cd, dc) {return contrail.format("{0}/{1}",formatBytes(dc['agg-bytes'],'-'),dc['agg-packets']);}}},
];
];

frQuery['defaultColumns'] = ['sourcevn', 'sourceip', 'sport', 'destvn', 'destip', 'dport', 'protocol', 'direction_ing'];
fsQuery['defaultColumns'] = ['flow_class_id', 'direction_ing'];
Expand Down Expand Up @@ -803,7 +803,7 @@ function viewFRQueryResults(dataItem, params) {
loadFlowResultsForUnderlay(options, reqQueryObj, queryColumnDisplay);
};

function loadFlowResultsForUnderlay(options, reqQueryObj, columnDisplay, fcGridDisplay,reverseTraceFlow) {
function loadFlowResultsForUnderlay(options, reqQueryObj, columnDisplay, fcGridDisplay,traceFlow) {
var grid = $('#' + options.elementId).data('contrailGrid'),
url = "/api/admin/reports/query",
btnId = options.btnId,
Expand Down Expand Up @@ -879,14 +879,18 @@ function loadFlowResultsForUnderlay(options, reqQueryObj, columnDisplay, fcGridD
type: 'status',
iconClasses: '',
text: 'Your query has been queued.'
},error: {
type: 'error',
iconClasses: 'icon-warning',
text: 'Error in fetching details'
}
}
},
footer : {
pager : {
options : {
pageSize : options.pageSize,
pageSizeSelect : [10, 50, 100, 200, 500 ]
pageSizeSelect : [10, 50, 100, 200 ]
}
}
}
Expand All @@ -900,42 +904,57 @@ function loadFlowResultsForUnderlay(options, reqQueryObj, columnDisplay, fcGridD
<a title="View Results as Chart" id="fs-chart-link" class="margin-0-5 disabled-link" onclick=toggleToChart("fs");><i class="icon-bar-chart"></i></a>'];
}
else if(options.queryPrefix == 'fr'){
var customControls = [
'<button id="mapflow" class="btn btn-primary btn-mini" disabled="disabled" title="Map Flow">Map Flow</button>'
];
if(reverseTraceFlow == true){
customControls = [
'<button id="revTraceFlowBtn" class="btn btn-primary btn-mini" disabled="disabled" title="Reverse Trace Flow">Reverse Trace Flow</button>',
'<button id="traceFlowBtn" class="btn btn-primary btn-mini" disabled="disabled" title="Trace Flow">Trace Flow</button>',
];
}
gridConfig.header.customControls = customControls,
gridConfig.body.options = {
checkboxSelectable: {
enableRowCheckbox: true,
onNothingChecked: function(e){
$("#mapflow").attr('disabled','disabled');
$("#traceFlowBtn").attr('disabled','disabled');
$("#revTraceFlowBtn").attr('disabled','disabled');
},
onSomethingChecked: function(e){
$("#mapflow").removeAttr('disabled');
$("#traceFlowBtn").removeAttr('disabled');
$("#revTraceFlowBtn").removeAttr('disabled');
}
},
actionCell: [],
lazyLoading:true,
actionCellPosition : 'start'
};
if(getValueByJsonPath(globalObj['webServerInfo'],'disabledFeatures;disabled',[]).indexOf('mon_infra_underlay') == -1) {
if(traceFlow == true) {
gridConfig.body.options.actionCell.push({
title:'TraceFlow',
iconClass: 'icon-contrail-trace-flow',
onClick: function(rowId,targetElement){
if(typeof underlayRenderer === 'object') {
$("#"+options.elementId+" div.selected-slick-row").each(function(idx,obj){
$(obj).removeClass('selected-slick-row');
});
$(targetElement).parent().parent().addClass('selected-slick-row');
underlayRenderer.getView().doTraceFlow(rowId);
}
}
},{
title:'Reverse TraceFlow',
iconClass: 'icon-contrail-reverse-flow',
onClick: function(rowId,targetElement){
if(typeof underlayRenderer === 'object') {
$("#"+options.elementId+" div.selected-slick-row").each(function(idx,obj){
$(obj).removeClass('selected-slick-row');
});
$(targetElement).parent().parent().addClass('selected-slick-row');
underlayRenderer.getView().doReverseTraceFlow(rowId);
}
}
});
} else {
gridConfig.body.options.actionCell.push({
title: 'Show Underlay Paths',
iconClass: 'icon-contrail-trace-flow',
onClick: function(rowIndex,targetElement){
var dataItem = $('#' + options.elementId).data('contrailGrid')._grid.getDataItem(rowIndex);
var startTime = $("#"+options.queryPrefix+"-results").data('startTimeUTC');
var endTime = $("#"+options.queryPrefix+"-results").data('endTimeUTC');
dataItem['startTime'] = startTime;
dataItem['endTime'] = endTime;
$("#fr-results div.selected-slick-row").each(function(idx,obj){
$(obj).removeClass('selected-slick-row');
});
$(targetElement).parent().parent().addClass('selected-slick-row');
showUnderlayPaths(dataItem);
}
});
}
};
$("#mapflow").die('click').live('click',function(e){
var startTime = $("#"+options.queryPrefix+"-results").data('startTimeUTC');
var endTime = $("#"+options.queryPrefix+"-results").data('endTimeUTC');
var checkedRows = $("#"+options.queryPrefix+"-results").data('contrailGrid').getCheckedRows();
var dataItem = ifNull(checkedRows[0],{});
dataItem['startTime'] = startTime;
dataItem['endTime'] = endTime;
showUnderlayPaths(dataItem);
});
}
$("#" + options.elementId).contrailGrid(gridConfig);
gridObject = $("#"+options.elementId).data('contrailGrid');
Expand Down

0 comments on commit 2d66c66

Please sign in to comment.