Skip to content

[pull] master from museumsvictoria:master #13

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

Merged
pull merged 1 commit into from
Nov 16, 2020
Merged

[pull] master from museumsvictoria:master #13

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
19 changes: 14 additions & 5 deletions nodel-webui-js/src/nodel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,15 +422,17 @@ $(function() {
} else {
$.when(createDynamicElements().then(function(){
updatepadding();
getNodeList();
getNodeList().then(function(){
refreshNodeList();
});
checkHostList();
setEvents();
updateLogForm();
updateCharts();
initToolkit();
checkHostOnline();
$('*[data-nav]').first().trigger('click');
$('.nodelistfilter').focus();
$('.nodelistfilter').trigger('focus');
var filt = getParameterByName('filter');
if(filt) $('.nodelistfilter').val(filt).trigger('keyup');
}));
Expand Down Expand Up @@ -790,16 +792,23 @@ var checkHostList = function(){
}
};

var refreshNodeList = function(){
setTimeout(function(){
getNodeList().then(function(){
refreshNodeList();
})
}, 2000);
}

var getNodeList = function(filterstr){
if(!_.isUndefined(filterstr)) filter={'filter':filterstr};
else filter = {};
if(!_.isUndefined(filterstr)) $.observable(nodeList['flt'] = filterstr);
filter = {'filter': nodeList['flt']};
var d = $.Deferred();
if(nodeListreq) nodeListreq.abort();
// test list (for large Nodel networks performance testing)
//nodeListreq = $.getJSON(proto+'//'+host+'/nodeURLs.json', function(data) {
nodeListreq = $.postJSON(proto+'//'+host+'/REST/nodeURLs', JSON.stringify(filter), function(data) {
for (i=0; i<data.length; i++) {
var ind = -1;
data[i].host = getHost(data[i].address);
data[i].name = data[i].node;
data[i].node = getSimpleName(data[i].node);
Expand Down