Skip to content

Commit

Permalink
Closes-Bug: #1541140, Partial-Bug: #1530242
Browse files Browse the repository at this point in the history 
1. Fixed checkedMultiselect z-index issue.
2. Added GridFormatters and enhanced formatters to be easily extendble.
3. Added disabeRowOnLoading option to disable row while loading.
4. Added logic to disable export and refresh while loading.
5. Fixed QueryResultLineChart issue where last point was getting dipped.

Change-Id: I2177ab544a2eb2f1f3a386f06d28cac6ece1df21
  • Loading branch information
@sgrgala
sgrgala committed Feb 4, 2016
1 parent 1208de2 commit d36e708
Show file tree
Hide file tree
Showing 13 changed files with 470 additions and 273 deletions.
9 changes: 8 additions & 1 deletion webroot/css/contrail.custom.css
View file
Expand Up @@ -898,6 +898,13 @@ a.selectAllLink:hover {
.slick-viewport {
border-top: 1px solid #dadada;
}
.grid-state-fetching-rows .slick-row,
.grid-state-fetching .widget-toolbar .widget-toolbar-icon[data-action="export"],
.grid-state-fetching .widget-toolbar .widget-toolbar-icon[data-action="refresh"] {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
filter: alpha(opacity=60);
opacity: 0.6;
}
.slick-row {
border:none;
}
Expand Down Expand Up @@ -2754,7 +2761,7 @@ p.error, p.error-text {
font-size: 11px;
}

.ui-multiselect-menu { display:none; position:absolute; z-index: 12; text-align: left }
.ui-multiselect-menu { display:none; position:absolute; z-index: 1051; text-align: left }
.ui-multiselect-checkboxes { position:relative /* fixes bug in IE6/7 */; overflow-y:scroll }
.ui-multiselect-checkboxes input.ace-input[type=checkbox] { width: 0; }
.ui-multiselect-checkboxes label { cursor:default; display:block; border:1px solid transparent; padding:3px 3px 3px 10px }
Expand Down
49 changes: 22 additions & 27 deletions webroot/css/contrail.layout.css
View file
Expand Up @@ -541,23 +541,23 @@ li [class*=" icon-"],
.nav-list > li.open {
border-bottom-color: #e5e5e5;
}
.nav-list > li.active.open > .submenu > li.active > a:after {
display: inline-block;
content: "";
position: absolute !important;
right: -8px;
top: 9px;
width: 15px;
height: 15px;
border: 1px solid #ccc;
border-width: 1px 0 0 1px;
background-color: #FFF;
-webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-ms-transform: rotate(-45deg);
-o-transform: rotate(-45deg);
transform: rotate(-45deg);
}
/*.nav-list > li.active.open > .submenu > li.active > a:after {*/
/*display: inline-block;*/
/*content: "";*/
/*position: absolute !important;*/
/*right: -8px;*/
/*top: 9px;*/
/*width: 15px;*/
/*height: 15px;*/
/*border: 1px solid #ccc;*/
/*border-width: 1px 0 0 1px;*/
/*background-color: #FFF;*/
/*!*-webkit-transform: rotate(-45deg);*!*/
/*-moz-transform: rotate(-45deg);*/
/*-ms-transform: rotate(-45deg);*/
/*-o-transform: rotate(-45deg);*/
/*transform: rotate(-45deg);*/
/*}*/

.nav-list > li.active .submenu {
display: block;
Expand All @@ -572,17 +572,12 @@ li [class*=" icon-"],
border-top: 1px solid #e5e5e5;
}
.nav-list > li .submenu > li {
margin-left: 0;
position: relative;
/* tree like menu */

/* the horizontal dashed line */

/* the vertical dashed line */

/* optional icon before each item */

margin-left: 0;
position: relative;
}
/*.nav-list > li .submenu > li.active {*/
/*border-right: 3px solid #555555;*/
/*}*/
.nav-list > li .submenu > li > a {
display: block;
position: relative;
Expand Down
65 changes: 53 additions & 12 deletions webroot/js/common/core.constants.js
View file
Expand Up @@ -266,7 +266,7 @@ define([
{id: "50", text: "50 Messages" },
{id: "100", text: "100 Messages" },
{id: "200", text: "200 Messages" },
{id: "500", text: "500 Messages" },
{id: "500", text: "500 Messages" }
];

this.DIRECTION_DROPDOWN_VALUES = [
Expand All @@ -290,6 +290,8 @@ define([
8: 'RegEx='
};

this.BYTE_PREFIX = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];

this.URL_TABLES = "/api/qe/tables";
this.URL_PREFIX_TABLE_SCHEMA = "/api/qe/table/schema/";

Expand All @@ -303,129 +305,168 @@ define([
this.UMID_QUERY_RESULT_LINE_CHART_MODEL = "qe:query-result-line-chart-model";
this.UMID_QUERY_RESULT_LIST_MODEL = "qe:query-result-list-model";

this.MAP_Y_FORMATTER = {
this.QUERY_COLUMN_FORMATTER = {
"T": "micro-date",
"T=": "micro-date",
"MessageTS": "micro-date",
"protocol": "protocol",
"direction_ing": "query-direction",

"bytes": "byte",
"sum(bytes)": "byte",
"packets": "number",
"sum(packets)": "number",
"flow_count": "number",

"agg-bytes": "byte",
"agg-packets": "number",

// cpu_info
"cpu_info.mem_virt": "byte",
"SUM(cpu_info.mem_virt)": "byte",
"MAX(cpu_info.mem_virt)": "byte",
"MIN(cpu_info.mem_virt)": "byte",

"cpu_info.mem_res": "byte",
"SUM(cpu_info.mem_res)": "byte",
"MAX(cpu_info.mem_res)": "byte",
"MIN(cpu_info.mem_res)": "byte",

"cpu_info.used_sys_mem": "byte",
"SUM(cpu_info.used_sys_mem)": "byte",
"MAX(cpu_info.used_sys_mem)": "byte",
"MIN(cpu_info.used_sys_mem)": "byte",


"SUM(cpu_info.cpu_share)": "percentage",
"MAX(cpu_info.cpu_share)": "percentage",
"MIN(cpu_info.cpu_share)": "percentage",
"cpu_info.cpu_share": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"SUM(cpu_info.cpu_share)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"MAX(cpu_info.cpu_share)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"MIN(cpu_info.cpu_share)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],


"SUM(cpu_info.one_min_cpuload)": "percentage",
"MAX(cpu_info.one_min_cpuload)": "percentage",
"MIN(cpu_info.one_min_cpuload)": "percentage",
"cpu_info.one_min_cpuload": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"SUM(cpu_info.one_min_cpuload)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"MAX(cpu_info.one_min_cpuload)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"MIN(cpu_info.one_min_cpuload)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],

// cpu_stats
"SUM(cpu_stats.cpu_one_min_avg)": "percentage",
"MAX(cpu_stats.cpu_one_min_avg)": "percentage",
"MIN(cpu_stats.cpu_one_min_avg)": "percentage",
"cpu_stats.cpu_one_min_avg": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"SUM(cpu_stats.cpu_one_min_avg)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"MAX(cpu_stats.cpu_one_min_avg)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],
"MIN(cpu_stats.cpu_one_min_avg)": [{format: 'number', options: {formatSpecifier: '.3n'}}, {format: 'percentage'}],

"cpu_stats.vm_memory_quota": "byte",
"SUM(cpu_stats.vm_memory_quota)": "byte",
"MAX(cpu_stats.vm_memory_quota)": "byte",
"MIN(cpu_stats.vm_memory_quota)": "byte",

"cpu_stats.virt_memory": "byte",
"SUM(cpu_stats.virt_memory)": "byte",
"MAX(cpu_stats.virt_memory)": "byte",
"MIN(cpu_stats.virt_memory)": "byte",

"cpu_stats.peak_virt_memory": "byte",
"SUM(cpu_stats.peak_virt_memory)": "byte",
"MAX(cpu_stats.peak_virt_memory)": "byte",
"MIN(cpu_stats.peak_virt_memory)": "byte",


// msg_info
"msg_info.bytes": "byte",
"SUM(msg_info.bytes)": "byte",
"MAX(msg_info.bytes)": "byte",
"MIN(msg_info.bytes)": "byte",


// vn_stats
"vn_stats.in_bytes": "byte",
"SUM(vn_stats.in_bytes)": "byte",
"MAX(vn_stats.in_bytes)": "byte",
"MIN(vn_stats.in_bytes)": "byte",

"vn_stats.out_bytes": "byte",
"SUM(vn_stats.out_bytes)": "byte",
"MAX(vn_stats.out_bytes)": "byte",
"MIN(vn_stats.out_bytes)": "byte",

// tx_socket_stats
"tx_socket_stats.bytes": "byte",
"SUM(tx_socket_stats.bytes)": "byte",
"MAX(tx_socket_stats.bytes)": "byte",
"MIN(tx_socket_stats.bytes)": "byte",

"tx_socket_stats.average_bytes": "byte",
"SUM(tx_socket_stats.average_bytes)": "byte",
"MAX(tx_socket_stats.average_bytes)": "byte",
"MIN(tx_socket_stats.average_bytes)": "byte",

// rx_socket_stats
"rx_socket_stats.bytes": "byte",
"SUM(rx_socket_stats.bytes)": "byte",
"MAX(rx_socket_stats.bytes)": "byte",
"MIN(rx_socket_stats.bytes)": "byte",

"rx_socket_stats.average_bytes": "byte",
"SUM(rx_socket_stats.average_bytes)": "byte",
"MAX(rx_socket_stats.average_bytes)": "byte",
"MIN(rx_socket_stats.average_bytes)": "byte",

// rx_message_stats
"rx_message_stats.bytes": "byte",
"SUM(rx_message_stats.bytes)": "byte",
"MAX(rx_message_stats.bytes)": "byte",
"MIN(rx_message_stats.bytes)": "byte",

// virtual_ip_stats
"virtual_ip_stats.bytes_in": "byte",
"SUM(virtual_ip_stats.bytes_in)": "byte",
"MAX(virtual_ip_stats.bytes_in)": "byte",
"MIN(virtual_ip_stats.bytes_in)": "byte",

"virtual_ip_stats.bytes_out": "byte",
"SUM(virtual_ip_stats.bytes_out)": "byte",
"MAX(virtual_ip_stats.bytes_out)": "byte",
"MIN(virtual_ip_stats.bytes_out)": "byte",

// pool_stats
"pool_stats.bytes_in": "byte",
"SUM(pool_stats.bytes_in)": "byte",
"MAX(pool_stats.bytes_in)": "byte",
"MIN(pool_stats.bytes_in)": "byte",

"pool_stats.bytes_out": "byte",
"SUM(pool_stats.bytes_out)": "byte",
"MAX(pool_stats.bytes_out)": "byte",
"MIN(pool_stats.bytes_out)": "byte",

// member_stats
"member_stats.bytes_in": "byte",
"SUM(member_stats.bytes_in)": "byte",
"MAX(member_stats.bytes_in)": "byte",
"MIN(member_stats.bytes_in)": "byte",

"member_stats.bytes_out": "byte",
"SUM(member_stats.bytes_out)": "byte",
"MAX(member_stats.bytes_out)": "byte",
"MIN(member_stats.bytes_out)": "byte",

// fip_diff_stats
"fip_diff_stats.in_bytes": "byte",
"SUM(fip_diff_stats.in_bytes)": "byte",
"MAX(fip_diff_stats.in_bytes)": "byte",
"MIN(fip_diff_stats.in_bytes)": "byte",

"fip_diff_stats.out_bytes": "byte",
"SUM(fip_diff_stats.out_bytes)": "byte",
"MAX(fip_diff_stats.out_bytes)": "byte",
"MIN(fip_diff_stats.out_bytes)": "byte",

// if_stats
"if_stats.in_bytes": "byte",
"SUM(if_stats.in_bytes)": "byte",
"MAX(if_stats.in_bytes)": "byte",
"MIN(if_stats.in_bytes)": "byte",

"if_stats.out_bytes": "byte",
"SUM(if_stats.out_bytes)": "byte",
"MAX(if_stats.out_bytes)": "byte",
"MIN(if_stats.out_bytes)": "byte",
Expand Down

0 comments on commit d36e708

Please sign in to comment.