Skip to content

Commit

Permalink
Closes-Bug: #1528514, #1534484, #1534494 Partial-Bug #1530242
Browse files Browse the repository at this point in the history 
Add a new tab that list all interfaces on project's details page.

Fix loading of Config->Networking->Networks Page

Statistics graph does not show all the fields that the users has asked
1. Removed force fit from QE result grids
2. Fix missing columns to QE results grids

Fix Issues on Query & Network Monitoring Pages
1. Increase size of keyword input box on system logs page
2. Fix labels for CPU/Memory line-bar charts
3. Improve loading performance of instances and networks list grids

Change-Id: I74a9b7402787682d1adb21287caadb57227838cb
  • Loading branch information
Abhishek committed Jan 15, 2016
1 parent 51a51a3 commit 14d8d34
Show file tree
Hide file tree
Showing 10 changed files with 1,268 additions and 1,238 deletions.
6 changes: 3 additions & 3 deletions build-files.sh
View file
Expand Up @@ -50,9 +50,9 @@ $node_exec $rjs_bin -o $core_build_file

echo "Post Build additional changes: "
# Manually moving following views due to error in minification. will use the source file for now.
echo "GridView.js: Replacing minified GridView with original source."
mv $built_path/js/views/GridView.js $built_path/js/views/GridView.min.js
cp webroot/js/views/GridView.js $built_path/js/views/GridView.js
#echo "GridView.js: Replacing minified GridView with original source."
#mv $built_path/js/views/GridView.js $built_path/js/views/GridView.min.js
#cp webroot/js/views/GridView.js $built_path/js/views/GridView.js
# Workaround for vis.min.js taking too much time in r.js.
echo "vis-v4.9.0: Copying original minified version"
mkdir -p $built_path/assets/vis-v4.9.0/js
Expand Down
11 changes: 7 additions & 4 deletions webroot/css/contrail.custom.css
View file
Expand Up @@ -987,7 +987,7 @@ a.selectAllLink:hover {
word-break:break-all;
white-space: normal;
}
.slick-cell.cell-hyperlink-blue{
.slick-cell.cell-hyperlink-blue, .slick-cell .cell-hyperlink-blue{
color: #3182bd;
cursor: pointer;
}
Expand Down Expand Up @@ -1107,7 +1107,6 @@ margin-right: 15px;
right:10px!important;
min-width:170px;
}

/*
Editable Slick Grid
*/
Expand Down Expand Up @@ -1311,7 +1310,7 @@ label.jqInvalid{
}
.custom-combobox .ui-autocomplete-input {
margin: 0;
padding: 0 11px 0 5px;
padding: 0 28px 0 5px;
height: 28px;
min-height: 28px;
color: #787878;
Expand All @@ -1334,6 +1333,9 @@ label.jqInvalid{
min-height: 26px;
border: 1px solid #dadada;
}
.select2-container .select2-choice {
padding: 0 0 0 5px;
}
.select2-container .select2-choice > .select2-chosen{
margin-right: 17px;
text-align: left;
Expand All @@ -1356,6 +1358,7 @@ label.jqInvalid{
.select2-container .select2-choice .select2-arrow {
border-left: 1px solid #fff;
background: none;
width: 14px;
}
.select2-container .select2-choice .select2-arrow b {
background: none !important;
Expand All @@ -1368,7 +1371,7 @@ label.jqInvalid{
text-decoration: inherit;
font-size: 14px;
color: #393939;
padding-left: 0.40em;
padding-right: 5px;
content: "\f0d7";
}
.select2-container.select2-dropdown-open .select2-choice .select2-arrow b:before {
Expand Down
2 changes: 2 additions & 0 deletions webroot/js/common/core.constants.js
View file
Expand Up @@ -76,6 +76,8 @@ define([
this.TMPL_EDITABLE_GRID_VIEW = "core-editable-grid-view-template";
this.TMPL_TEXT_VIEW = "core-text-view-template";

this.TMPL_ELEMENT_NAME = 'core-element-name-template';

this.TMPL_GRID_VIEW = "core-grid-view-template";

this.TMPL_COLLECTION_VIEW = "core-collection-view-template";
Expand Down
6 changes: 6 additions & 0 deletions webroot/js/common/core.formatters.js
View file
Expand Up @@ -168,6 +168,12 @@ define([
default: return function(d) { return d; }
}
};

this.formatElementName = function(options) {
var elementNameTemplate = contrail.getTemplate4Id(cowc.TMPL_ELEMENT_NAME);

return elementNameTemplate(options);
};
};
return CoreFormatters;
});
2,389 changes: 1,190 additions & 1,199 deletions webroot/js/common/qe.grid.config.js
View file

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions webroot/js/handlers/ContrailRemoteDataHandler.js
View file
Expand Up @@ -114,6 +114,11 @@ define([
postData['chunk'] = 1;
pAjaxConfig['data'] = JSON.stringify(postData);
}

if(contrail.checkIfExist(pUrlParams['firstCount'])) {
pUrlParams['count'] = pUrlParams['firstCount'];
}

pAjaxConfig['url'] = pUrl.split('?')[0] + '?' + $.param(pUrlParams);
if (pCompleteCallback != null) {
pCompleteCallback(pRequestCompleteResponse);
Expand All @@ -124,6 +129,12 @@ define([

function setNextUrl(lastKey) {
pUrlParams['lastKey'] = lastKey;

if(contrail.checkIfExist(pUrlParams['nextCount']) && pUrlParams['count'] !== pUrlParams['nextCount']) {
pUrlParams['firstCount'] = pUrlParams['count'];
pUrlParams['count'] = pUrlParams['nextCount'];
}

pAjaxConfig['url'] = pUrl.split('?')[0] + '?' + $.param(pUrlParams);
}

Expand Down
50 changes: 28 additions & 22 deletions webroot/js/slickgrid-utils.js
View file
Expand Up @@ -208,34 +208,40 @@ function getDefaultGridConfig() {
}

function searchFilter(item, args) {
if (args.searchString == ""){
return true;
} else {
var returnFlag = false;
$.each(args.searchColumns, function(key, val){
var queryString = String(item[val.field]);
if(typeof val.formatter !== 'undefined'){
queryString = String(val.formatter(0, 0, 0, 0, item));
}
if(typeof val.searchFn !== 'undefined'){
var returnFlag = false;

if (args.searchString == "") {
returnFlag = true;
} else {
$.each(args.searchColumns, function (key, val) {
var queryString = String(item[val.field]);
if (contrail.checkIfFunction(val.formatter)) {
queryString = String(val.formatter(0, 0, 0, 0, item));
}
if (contrail.checkIfFunction(val.searchFn)) {
queryString = String(val.searchFn(item));
}

var argSearchStr = args.searchString.trim().toLowerCase(),
queryStrLower = queryString.toLowerCase();

//extending search to comma separted input values
if(args.searchString.indexOf(',') === -1) {
if(queryString.toLowerCase().indexOf(args.searchString.trim().toLowerCase()) != -1){
returnFlag = true;
}
if (argSearchStr.indexOf(',') === -1) {
if (queryStrLower.indexOf(argSearchStr) != -1) {
returnFlag = true;
}
} else {
var searchStrArry = args.searchString.split(',');
for(var i = 0; i < searchStrArry.length; i++) {
if(searchStrArry[i] != '' && queryString.toLowerCase().indexOf(searchStrArry[i].trim().toLowerCase()) != -1){
returnFlag = true;
}
var searchStrArray = args.searchString.split(',');
for (var i = 0; i < searchStrArray.length; i++) {
var searchStr = searchStrArray[i].trim().toLowerCase();
if (searchStrArray[i] != '' && (queryStrLower.indexOf(searchStr)) != -1) {
returnFlag = true;
}
}
}
});
return returnFlag;
}
});
}
return returnFlag;
};

function startAutoRefresh(refreshPeriod){
Expand Down
26 changes: 16 additions & 10 deletions webroot/js/views/GridView.js
View file
Expand Up @@ -93,34 +93,40 @@ define([
});

function searchFilter(item, args) {
var returnFlag = false;

if (args.searchString == "") {
return true;
returnFlag = true;
} else {
var returnFlag = false;
$.each(args.searchColumns, function (key, val) {
var queryString = String(item[val.field]);
if (typeof val.formatter !== 'undefined') {
if (contrail.checkIfFunction(val.formatter)) {
queryString = String(val.formatter(0, 0, 0, 0, item));
}
if (typeof val.searchFn !== 'undefined') {
if (contrail.checkIfFunction(val.searchFn)) {
queryString = String(val.searchFn(item));
}

var argSearchStr = args.searchString.trim().toLowerCase(),
queryStrLower = queryString.toLowerCase();

//extending search to comma separted input values
if (args.searchString.indexOf(',') === -1) {
if (queryString.toLowerCase().indexOf(args.searchString.trim().toLowerCase()) != -1) {
if (argSearchStr.indexOf(',') === -1) {
if (queryStrLower.indexOf(argSearchStr) != -1) {
returnFlag = true;
}
} else {
var searchStrArry = args.searchString.split(',');
for (var i = 0; i < searchStrArry.length; i++) {
if (searchStrArry[i] != '' && queryString.toLowerCase().indexOf(searchStrArry[i].trim().toLowerCase()) != -1) {
var searchStrArray = args.searchString.split(',');
for (var i = 0; i < searchStrArray.length; i++) {
var searchStr = searchStrArray[i].trim().toLowerCase();
if (searchStrArray[i] != '' && (queryStrLower.indexOf(searchStr)) != -1) {
returnFlag = true;
}
}
}
});
return returnFlag;
}
return returnFlag;
};

function startAutoRefresh(refreshPeriod) {
Expand Down
1 change: 1 addition & 0 deletions webroot/js/views/QueryResultGridView.js
View file
Expand Up @@ -96,6 +96,7 @@ define([
checkboxSelectable: false,
fixedRowHeight: contrail.checkIfExist(gridOptions.fixedRowHeight) ? gridOptions.fixedRowHeight : 30,
lazyLoading: true,
forceFitColumns: false,
defaultDataStatusMessage: false
},
dataSource: {
Expand Down
4 changes: 4 additions & 0 deletions webroot/templates/core.common.tmpl
View file
Expand Up @@ -1322,6 +1322,10 @@
</div>
</script>

<script type="text/x-handlebars-template" id="core-element-name-template">
<span class="{{cssClass}}" name="{{name}}" title="{{value}}">{{value}}</span>
</script>

<script type="text/x-handlebars-template" id="core-actions-template">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="icon-cog"></i>
Expand Down

0 comments on commit 14d8d34

Please sign in to comment.