From c621e9524707608269e86fe6a9b788028df4ff77 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Mon, 16 Feb 2015 16:08:15 +0100 Subject: Bump JS library version number. Change-Id: Ib09d1169aa0d85f815df156f6839e44f29fb3286 --- app/dashboard/static/js/linaro-jobs-all-1.1.2.js | 341 ----------------------- app/dashboard/static/js/linaro-jobs-all-1.1.3.js | 341 +++++++++++++++++++++++ app/dashboard/templates/jobs-all.html | 2 +- 3 files changed, 342 insertions(+), 342 deletions(-) delete mode 100644 app/dashboard/static/js/linaro-jobs-all-1.1.2.js create mode 100644 app/dashboard/static/js/linaro-jobs-all-1.1.3.js diff --git a/app/dashboard/static/js/linaro-jobs-all-1.1.2.js b/app/dashboard/static/js/linaro-jobs-all-1.1.2.js deleted file mode 100644 index b485316..0000000 --- a/app/dashboard/static/js/linaro-jobs-all-1.1.2.js +++ /dev/null @@ -1,341 +0,0 @@ -var searchFilter = $('#search-filter').val(); -var pageLen = $('#page-len').val(); -var dateRange = $('#date-range').val(); - -function failedAjaxCall() { - 'use strict'; - $('#table-loading').remove(); -} - -function countFailCallback() { - 'use strict'; - JSBase.replaceContentByClass('.count-badge', '∞'); -} - -function batchCountElements(data) { - 'use strict'; - var localData = data.result, - len = localData.length, - i = 0, - j = 0, - batchElements = 4, - jobName = '', - kernelName = '', - queriesLen = len * 4, - batchQueries = new Array(queriesLen), - errorReason = 'Batch count failed', - deferredAjaxCall = null, - ajaxData = null; - - if (len > 0) { - for (i; i < queriesLen; i += batchElements) { - j = i; - jobName = localData[i / batchElements].job; - kernelName = localData[i / batchElements].kernel; - - // Get successful defconfig count. - batchQueries[i] = { - 'method': 'GET', - 'operation_id': '#defconf-success-count-' + jobName, - 'collection': 'count', - 'document_id': 'defconfig', - 'query': 'status=PASS&job=' + jobName + '&kernel=' + kernelName - }; - - // Get failed defconfig count. - batchQueries[j + 1] = { - 'method': 'GET', - 'operation_id': '#defconf-fail-count-' + jobName, - 'collection': 'count', - 'document_id': 'defconfig', - 'query': 'status=FAIL&job=' + jobName + '&kernel=' + kernelName - }; - - // Get successful boot reports count. - batchQueries[j + 2] = { - 'method': 'GET', - 'operation_id': '#boot-success-count-' + jobName, - 'collection': 'count', - 'document_id': 'boot', - 'query': 'status=PASS&job=' + jobName + '&kernel=' + kernelName - }; - - // Get failed boot reports count. - batchQueries[j + 3] = { - 'method': 'GET', - 'operation_id': '#boot-fail-count-' + jobName, - 'collection': 'count', - 'document_id': 'boot', - 'query': 'status=FAIL&job=' + jobName + '&kernel=' + kernelName - }; - } - - ajaxData = JSON.stringify({ - 'batch': batchQueries - }); - deferredAjaxCall = JSBase.createDeferredCall( - '/_ajax/batch', - 'POST', - ajaxData, - null, - countFailCallback, - errorReason, - {'Content-Type': 'application/json'}, - 'batch-failed' - ); - - $.when(deferredAjaxCall).done(function(data) { - var batchData = data.result, - batchLen = batchData.length, - batchResult = null, - idx = 0; - - if (batchLen > 0) { - for (idx; idx < batchLen; idx = idx + 1) { - batchResult = batchData[idx].result[0]; - $(batchData[idx].operation_id).empty().append( - batchResult.count); - } - } - }); - } -} - -function createJobsTable(data) { - 'use strict'; - - var localData = data.result, - table = $('#jobstable').dataTable({ - 'dom': '<"row"<"col-xs-12 col-sm-12 col-md-6 col-lg-6"' + - '<"length-menu"l>>' + - '<"col-xs-12 col-sm-12 col-md-4 col-lg-4 col-lg-offset-2"f>' + - 'r' + - '<"col-xs-12 col-sm-12 col-md-12 col-lg-12"t>>' + - '<"row"<"col-xs-12 col-sm-12 col-md-6 col-lg-6"i>' + - '<"col-xs-12 col-sm-12 col-md-6 col-lg-6"p>>', - 'language': { - 'lengthMenu': '_MENU_ jobs per page', - 'zeroRecords': '

No jobs to display.

', - 'search': '
' + - '' + - '_INPUT_
' - }, - 'initComplete': function() { - $('#table-loading').remove(); - $('#table-div').fadeIn('slow', 'linear'); - - var api = this.api(); - - if (pageLen !== undefined && pageLen !== null) { - if (pageLen.length > 0) { - pageLen = Number(pageLen); - if (isNaN(pageLen)) { - pageLen = 25; - } - - api.page.len(pageLen).draw(); - } - } - - if (searchFilter !== null && searchFilter !== undefined) { - if (searchFilter.length > 0) { - api.search(searchFilter, true).draw(); - } - } - }, - 'lengthMenu': [25, 50, 75, 100], - 'deferRender': true, - 'ordering': true, - 'processing': true, - 'stateDuration': -1, - 'stateSave': true, - 'order': [3, 'desc'], - 'search': { - 'regex': true, - 'smart': true - }, - 'data': localData, - 'columns': [ - { - 'data': 'job', - 'title': 'Tree ‐ Branch', - 'type': 'string', - 'render': function(data, type, object) { - return '' + data + ' ‐ ' + - object.git_branch + ''; - } - }, - { - 'data': 'job', - 'title': '' + - 'Latest Build Status', - 'type': 'String', - 'searchable': false, - 'orderable': false, - 'className': 'pull-center', - 'render': function(data) { - return '' + - '' + - '' + - '' + - '' + - '' + - '' + - ''; - } - }, - { - 'data': 'job', - 'title': '' + - 'Latest Boot Status', - 'type': 'string', - 'searchable': false, - 'orderable': false, - 'className': 'pull-center', - 'render': function(data) { - return '' + - '' + - '' + - '' + - '' + - '' + - '' + - ''; - } - }, - { - 'data': 'created_on', - 'title': 'Date', - 'type': 'date', - 'render': function(data) { - var created = new Date(data.$date); - return created.getCustomISODate(); - } - }, - { - 'data': 'status', - 'title': 'Status', - 'type': 'string', - 'className': 'pull-center', - 'render': function(data) { - var displ; - switch (data) { - case 'BUILD': - displ = '' + - '' + - ''; - break; - case 'PASS': - displ = '' + - '' + - ''; - break; - case 'FAIL': - displ = '' + - '' + - '' + - ''; - break; - default: - displ = '' + - '' + - '' + - ''; - break; - } - return displ; - } - }, - { - 'data': 'job', - 'title': '', - 'searchable': false, - 'orderable': false, - 'width': '30px', - 'className': 'pull-center', - 'render': function(data) { - return '' + - '' + - ''; - } - } - ] - }); - - $(document).on('click', '#jobstable tbody tr', function() { - var tableData = table.fnGetData(this); - if (tableData) { - window.location = '/job/' + tableData.job + '/'; - } - }); - - $('#search-area > .input-sm').attr('placeholder', 'Filter the results'); - $('.input-sm').keyup(function(key) { - // Remove focus from input when Esc is pressed. - if (key.keyCode === 27) { - $(this).blur(); - } - }); - - return data; -} - -function updateJobsPage(data) { - 'use strict'; - // Simple function needed to wrap another deferred call. - // Create the table, then update it with the batch count operation. - $.when(createJobsTable(data)).done(batchCountElements); -} - -$(document).ready(function() { - 'use strict'; - - $('#li-job').addClass('active'); - $('#table-div').hide(); - - var errorReason = 'Job data call failed', - deferredAjaxCall = null, - ajaxData = null; - - ajaxData = { - 'aggregate': 'job', - 'sort': 'created_on', - 'sort_order': -1, - 'date_range': $('#date-range').val(), - 'field': [ - 'job', 'created_on', 'status', 'git_branch', 'kernel' - ] - }; - deferredAjaxCall = JSBase.createDeferredCall( - '/_ajax/job', - 'GET', - ajaxData, - null, - failedAjaxCall, - errorReason, - null, - 'failed-job' - ); - - $.when(deferredAjaxCall).done(updateJobsPage); -}); diff --git a/app/dashboard/static/js/linaro-jobs-all-1.1.3.js b/app/dashboard/static/js/linaro-jobs-all-1.1.3.js new file mode 100644 index 0000000..b485316 --- /dev/null +++ b/app/dashboard/static/js/linaro-jobs-all-1.1.3.js @@ -0,0 +1,341 @@ +var searchFilter = $('#search-filter').val(); +var pageLen = $('#page-len').val(); +var dateRange = $('#date-range').val(); + +function failedAjaxCall() { + 'use strict'; + $('#table-loading').remove(); +} + +function countFailCallback() { + 'use strict'; + JSBase.replaceContentByClass('.count-badge', '∞'); +} + +function batchCountElements(data) { + 'use strict'; + var localData = data.result, + len = localData.length, + i = 0, + j = 0, + batchElements = 4, + jobName = '', + kernelName = '', + queriesLen = len * 4, + batchQueries = new Array(queriesLen), + errorReason = 'Batch count failed', + deferredAjaxCall = null, + ajaxData = null; + + if (len > 0) { + for (i; i < queriesLen; i += batchElements) { + j = i; + jobName = localData[i / batchElements].job; + kernelName = localData[i / batchElements].kernel; + + // Get successful defconfig count. + batchQueries[i] = { + 'method': 'GET', + 'operation_id': '#defconf-success-count-' + jobName, + 'collection': 'count', + 'document_id': 'defconfig', + 'query': 'status=PASS&job=' + jobName + '&kernel=' + kernelName + }; + + // Get failed defconfig count. + batchQueries[j + 1] = { + 'method': 'GET', + 'operation_id': '#defconf-fail-count-' + jobName, + 'collection': 'count', + 'document_id': 'defconfig', + 'query': 'status=FAIL&job=' + jobName + '&kernel=' + kernelName + }; + + // Get successful boot reports count. + batchQueries[j + 2] = { + 'method': 'GET', + 'operation_id': '#boot-success-count-' + jobName, + 'collection': 'count', + 'document_id': 'boot', + 'query': 'status=PASS&job=' + jobName + '&kernel=' + kernelName + }; + + // Get failed boot reports count. + batchQueries[j + 3] = { + 'method': 'GET', + 'operation_id': '#boot-fail-count-' + jobName, + 'collection': 'count', + 'document_id': 'boot', + 'query': 'status=FAIL&job=' + jobName + '&kernel=' + kernelName + }; + } + + ajaxData = JSON.stringify({ + 'batch': batchQueries + }); + deferredAjaxCall = JSBase.createDeferredCall( + '/_ajax/batch', + 'POST', + ajaxData, + null, + countFailCallback, + errorReason, + {'Content-Type': 'application/json'}, + 'batch-failed' + ); + + $.when(deferredAjaxCall).done(function(data) { + var batchData = data.result, + batchLen = batchData.length, + batchResult = null, + idx = 0; + + if (batchLen > 0) { + for (idx; idx < batchLen; idx = idx + 1) { + batchResult = batchData[idx].result[0]; + $(batchData[idx].operation_id).empty().append( + batchResult.count); + } + } + }); + } +} + +function createJobsTable(data) { + 'use strict'; + + var localData = data.result, + table = $('#jobstable').dataTable({ + 'dom': '<"row"<"col-xs-12 col-sm-12 col-md-6 col-lg-6"' + + '<"length-menu"l>>' + + '<"col-xs-12 col-sm-12 col-md-4 col-lg-4 col-lg-offset-2"f>' + + 'r' + + '<"col-xs-12 col-sm-12 col-md-12 col-lg-12"t>>' + + '<"row"<"col-xs-12 col-sm-12 col-md-6 col-lg-6"i>' + + '<"col-xs-12 col-sm-12 col-md-6 col-lg-6"p>>', + 'language': { + 'lengthMenu': '_MENU_ jobs per page', + 'zeroRecords': '

No jobs to display.

', + 'search': '
' + + '' + + '_INPUT_
' + }, + 'initComplete': function() { + $('#table-loading').remove(); + $('#table-div').fadeIn('slow', 'linear'); + + var api = this.api(); + + if (pageLen !== undefined && pageLen !== null) { + if (pageLen.length > 0) { + pageLen = Number(pageLen); + if (isNaN(pageLen)) { + pageLen = 25; + } + + api.page.len(pageLen).draw(); + } + } + + if (searchFilter !== null && searchFilter !== undefined) { + if (searchFilter.length > 0) { + api.search(searchFilter, true).draw(); + } + } + }, + 'lengthMenu': [25, 50, 75, 100], + 'deferRender': true, + 'ordering': true, + 'processing': true, + 'stateDuration': -1, + 'stateSave': true, + 'order': [3, 'desc'], + 'search': { + 'regex': true, + 'smart': true + }, + 'data': localData, + 'columns': [ + { + 'data': 'job', + 'title': 'Tree ‐ Branch', + 'type': 'string', + 'render': function(data, type, object) { + return '' + data + ' ‐ ' + + object.git_branch + ''; + } + }, + { + 'data': 'job', + 'title': '' + + 'Latest Build Status', + 'type': 'String', + 'searchable': false, + 'orderable': false, + 'className': 'pull-center', + 'render': function(data) { + return '' + + '' + + '' + + '' + + '' + + '' + + '' + + ''; + } + }, + { + 'data': 'job', + 'title': '' + + 'Latest Boot Status', + 'type': 'string', + 'searchable': false, + 'orderable': false, + 'className': 'pull-center', + 'render': function(data) { + return '' + + '' + + '' + + '' + + '' + + '' + + '' + + ''; + } + }, + { + 'data': 'created_on', + 'title': 'Date', + 'type': 'date', + 'render': function(data) { + var created = new Date(data.$date); + return created.getCustomISODate(); + } + }, + { + 'data': 'status', + 'title': 'Status', + 'type': 'string', + 'className': 'pull-center', + 'render': function(data) { + var displ; + switch (data) { + case 'BUILD': + displ = '' + + '' + + ''; + break; + case 'PASS': + displ = '' + + '' + + ''; + break; + case 'FAIL': + displ = '' + + '' + + '' + + ''; + break; + default: + displ = '' + + '' + + '' + + ''; + break; + } + return displ; + } + }, + { + 'data': 'job', + 'title': '', + 'searchable': false, + 'orderable': false, + 'width': '30px', + 'className': 'pull-center', + 'render': function(data) { + return '' + + '' + + ''; + } + } + ] + }); + + $(document).on('click', '#jobstable tbody tr', function() { + var tableData = table.fnGetData(this); + if (tableData) { + window.location = '/job/' + tableData.job + '/'; + } + }); + + $('#search-area > .input-sm').attr('placeholder', 'Filter the results'); + $('.input-sm').keyup(function(key) { + // Remove focus from input when Esc is pressed. + if (key.keyCode === 27) { + $(this).blur(); + } + }); + + return data; +} + +function updateJobsPage(data) { + 'use strict'; + // Simple function needed to wrap another deferred call. + // Create the table, then update it with the batch count operation. + $.when(createJobsTable(data)).done(batchCountElements); +} + +$(document).ready(function() { + 'use strict'; + + $('#li-job').addClass('active'); + $('#table-div').hide(); + + var errorReason = 'Job data call failed', + deferredAjaxCall = null, + ajaxData = null; + + ajaxData = { + 'aggregate': 'job', + 'sort': 'created_on', + 'sort_order': -1, + 'date_range': $('#date-range').val(), + 'field': [ + 'job', 'created_on', 'status', 'git_branch', 'kernel' + ] + }; + deferredAjaxCall = JSBase.createDeferredCall( + '/_ajax/job', + 'GET', + ajaxData, + null, + failedAjaxCall, + errorReason, + null, + 'failed-job' + ); + + $.when(deferredAjaxCall).done(updateJobsPage); +}); diff --git a/app/dashboard/templates/jobs-all.html b/app/dashboard/templates/jobs-all.html index 1d3978d..b8b641a 100644 --- a/app/dashboard/templates/jobs-all.html +++ b/app/dashboard/templates/jobs-all.html @@ -31,5 +31,5 @@ {{ super() }} - + {%- endblock %} -- cgit v1.2.3