aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-01-22 23:39:51 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-01-22 23:39:51 +0100
commite0433a61af4e1b9796cee8f095486fec85eb136f (patch)
treee7ba14d6da8ef93100a4b5b0c8b2c0d4031bd9be /src/main
parentb83c4eed1a75e9e68279ab6f84cd7b5eb602abec (diff)
downloadesper-testing-e0433a61af4e1b9796cee8f095486fec85eb136f.tar.gz
esper-testing-e0433a61af4e1b9796cee8f095486fec85eb136f.tar.bz2
esper-testing-e0433a61af4e1b9796cee8f095486fec85eb136f.tar.xz
esper-testing-e0433a61af4e1b9796cee8f095486fec85eb136f.zip
NavbarService:
o Renamed to NavTabService. o Listing builds per server, with paging.
Diffstat (limited to 'src/main')
-rwxr-xr-xsrc/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java16
-rwxr-xr-xsrc/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java3
-rwxr-xr-xsrc/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java22
-rwxr-xr-xsrc/main/resources/webapp/apps/app.js11
-rw-r--r--src/main/resources/webapp/apps/core/pager.html12
-rwxr-xr-xsrc/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js19
-rwxr-xr-xsrc/main/resources/webapp/apps/jenkinsApp/server.html32
7 files changed, 87 insertions, 28 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java
index bd85e89..375187e 100755
--- a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java
+++ b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java
@@ -56,7 +56,7 @@ public class JenkinsDao {
}
};
- public static final String JENKINS_BUILD = "uuid, created_date, job, file, entry_id, url, users";
+ public static final String JENKINS_BUILD = "jenkins_build.uuid, jenkins_build.created_date, jenkins_build.job, jenkins_build.file, jenkins_build.entry_id, jenkins_build.url, jenkins_build.users";
public static final SqlF<ResultSet, JenkinsBuildDto> jenkinsBuild = new SqlF<ResultSet, JenkinsBuildDto>() {
public JenkinsBuildDto apply(ResultSet rs) throws SQLException {
@@ -212,6 +212,20 @@ public class JenkinsDao {
}
}
+ public List<JenkinsBuildDto> selectBuildByServer(UUID server, PageRequest page) throws SQLException {
+ String sql = "SELECT " + JENKINS_BUILD + " FROM jenkins_build, jenkins_job WHERE jenkins_job.uuid = jenkins_build.job AND jenkins_job.server=?";
+ sql += orderBy(ifEmpty(page.orderBy, "created_date-"), "created_date");
+ sql += " LIMIT ? OFFSET ?";
+
+ try (PreparedStatement s = c.prepareStatement(sql)) {
+ int i = 1;
+ s.setString(i++, server.toString());
+ s.setInt(i++, page.count.orSome(10));
+ s.setInt(i, page.startIndex.orSome(0));
+ return toList(s, jenkinsBuild);
+ }
+ }
+
public SqlOption<JenkinsBuildDto> selectBuild(UUID uuid) throws SQLException {
try (PreparedStatement s = c.prepareStatement("SELECT " + JENKINS_BUILD + " FROM jenkins_build WHERE uuid=?")) {
int i = 1;
diff --git a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java
index f573b23..651d4b8 100755
--- a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java
+++ b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java
@@ -50,6 +50,9 @@ public class JenkinsServerActor implements TransactionalActor {
logger.info("Got " + list.size() + " entries.");
+ // Process the list from the oldest first.
+ Collections.reverse(list);
+
int i = 0;
Map<String, UUID> authors = new HashMap<>();
diff --git a/src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java b/src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java
index 450463b..e36952c 100755
--- a/src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java
+++ b/src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java
@@ -93,14 +93,26 @@ public class JenkinsResource extends AbstractResource {
@GET
@Path("/build")
@Produces(MediaType.APPLICATION_JSON)
- public List<JenkinsBuildJson> getBuilds(@MagicParam(query = "job") final UUID job, @MagicParam final PageRequest page) throws Exception {
+ public List<JenkinsBuildJson> getBuilds(@MagicParam(query = "job") final UUID job,
+ @MagicParam(query = "server") final UUID server,
+ @MagicParam final PageRequest page) throws Exception {
return da.inTransaction(new JenkinsDaosCallback<List<JenkinsBuildJson>>() {
protected List<JenkinsBuildJson> run() throws SQLException {
- List<JenkinsBuildJson> builds = new ArrayList<>();
+ List<JenkinsBuildDto> daos;
+
if(job != null) {
- for (JenkinsBuildDto dto : daos.jenkinsDao.selectBuildByJob(job, page)) {
- builds.add(getJenkinsBuildJson.apply(dto));
- }
+ daos = this.daos.jenkinsDao.selectBuildByJob(job, page);
+ }
+ else if(server != null) {
+ daos = this.daos.jenkinsDao.selectBuildByServer(server, page);
+ }
+ else {
+ throw new WebApplicationException(Response.Status.BAD_REQUEST);
+ }
+
+ List<JenkinsBuildJson> builds = new ArrayList<>();
+ for (JenkinsBuildDto dto : daos) {
+ builds.add(getJenkinsBuildJson.apply(dto));
}
return builds;
}
diff --git a/src/main/resources/webapp/apps/app.js b/src/main/resources/webapp/apps/app.js
index 69106aa..f3fca90 100755
--- a/src/main/resources/webapp/apps/app.js
+++ b/src/main/resources/webapp/apps/app.js
@@ -110,6 +110,17 @@ directives.directive('dogtagXl', function () {
}
});
+directives.directive('pager', function () {
+ return {
+ restrict: 'A',
+ scope: {
+ pager: '=x',
+ colspan: '=colspan'
+ },
+ templateUrl: '/apps/core/pager.html'
+ }
+});
+
directives.directive('spinner', function () {
return function($scope, element, attr) {
var opts = {
diff --git a/src/main/resources/webapp/apps/core/pager.html b/src/main/resources/webapp/apps/core/pager.html
new file mode 100644
index 0000000..7a141b4
--- /dev/null
+++ b/src/main/resources/webapp/apps/core/pager.html
@@ -0,0 +1,12 @@
+<tr>
+ <td colspan="{{colspan}}">
+ <ul class="pager">
+ <li class="previous" ng-class="{disabled: pager.startIndex == 0}">
+ <a ng-click="pager.prev()">&larr; Older</a>
+ </li>
+ <li class="next">
+ <a ng-click="pager.next()">Newer &rarr;</a>
+ </li>
+ </ul>
+ </td>
+</tr>
diff --git a/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js
index d31b81c..f59c107 100755
--- a/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js
+++ b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js
@@ -1,13 +1,14 @@
'use strict';
-function NavbarService($location) {
+function NavTabsService($location) {
var create = function(name, tabs) {
var keys = _.map(tabs, function(element) {
return element.toLowerCase().replace(' ', '-');
});
var currentKey = $location.search()[name] || "";
- var currentIndex = _.indexOf(keys, currentKey) || 0;
+ var currentIndex = _.indexOf(keys, currentKey);
+ currentIndex = currentIndex != -1 ? currentIndex : 0;
var currentTab = tabs[currentIndex];
var onClick = function(tab) {
@@ -38,13 +39,13 @@ function NavbarService($location) {
}
angular.
- module('navbarService', ['ngResource']).
- factory('NavbarService', NavbarService);
+ module('navTabsService', ['ngResource']).
+ factory('NavTabsService', NavTabsService);
-var jenkinsApp = angular.module('jenkinsApp', ['jenkinsServer', 'jenkinsJob', 'jenkinsBuild', 'core.directives', 'navbarService', 'pagingTableService']).config(function ($routeProvider) {
+var jenkinsApp = angular.module('jenkinsApp', ['jenkinsServer', 'jenkinsJob', 'jenkinsBuild', 'core.directives', 'navTabsService', 'pagingTableService']).config(function ($routeProvider) {
$routeProvider.
when('/', {controller: ServerListCtrl, templateUrl: '/apps/jenkinsApp/server-list.html?noCache=' + noCache}).
- when('/server/:serverUuid', {controller: ServerCtrl, templateUrl: '/apps/jenkinsApp/server.html?noCache=' + noCache}).
+ when('/server/:serverUuid', {controller: ServerCtrl, templateUrl: '/apps/jenkinsApp/server.html?noCache=' + noCache, reloadOnSearch: false}).
when('/server/:serverUuid/job/:jobUuid', {controller: JobCtrl, templateUrl: '/apps/jenkinsApp/job.html?noCache=' + noCache}).
when('/server/:serverUuid/job/:jobUuid/build/:buildUuid', {controller: BuildCtrl, templateUrl: '/apps/jenkinsApp/build.html?noCache=' + noCache});
});
@@ -55,16 +56,18 @@ function ServerListCtrl($scope, $location, JenkinsServer) {
});
}
-function ServerCtrl($scope, $routeParams, JenkinsServer, JenkinsJob, PagingTableService, NavbarService) {
+function ServerCtrl($scope, $routeParams, JenkinsServer, JenkinsJob, JenkinsBuild, PagingTableService, NavTabsService) {
$scope.serverUuid = $routeParams.serverUuid;
+ $scope.navTabs = NavTabsService.create("view", ["Overview", "Jobs", "Recent Builds"]);
+
JenkinsServer.get({uuid: $scope.serverUuid}, function (server) {
$scope.server = server;
});
$scope.jobs = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsJob, {server: $scope.serverUuid, orderBy: "display_name"}));
- $scope.navbar = NavbarService.create("view", ["Overview", "Jobs", "Recent Builds"]);
+ $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsBuild, {server: $scope.serverUuid, orderBy: "created_date-"}));
}
function JobCtrl($scope, $location, $routeParams, JenkinsJob, JenkinsBuild, PagingTableService) {
diff --git a/src/main/resources/webapp/apps/jenkinsApp/server.html b/src/main/resources/webapp/apps/jenkinsApp/server.html
index 80544b0..bf54bb8 100755
--- a/src/main/resources/webapp/apps/jenkinsApp/server.html
+++ b/src/main/resources/webapp/apps/jenkinsApp/server.html
@@ -2,7 +2,6 @@
<navbar/>
-
<div class="page-header">
<h1>Jenkins Server: {{server.name}}</h1>
</div>
@@ -12,20 +11,13 @@
<li class="active">Server</li>
</ul>
-<!--
- <ul class="nav nav-tabs">
- <li ng-class="{active: mode == 'overview'}"><a ng-click="setMode('overview')">Overview</a></li>
- <li ng-class="{active: mode == 'jobs'}"><a ng-click="setMode('jobs')">Jobs</a></li>
- <li ng-class="{active: mode == 'recentBuilds'}"><a ng-click="setMode('recentBuilds')">Recent Builds</a></li>
- </ul>
--->
<ul class="nav nav-tabs">
- <li ng-repeat="tab in navbar.tabs" ng-class="{active: navbar.selected() == tab}">
- <a ng-click="navbar.onClick(tab)">{{tab}}</a>
+ <li ng-repeat="tab in navTabs.tabs" ng-class="{active: navTabs.selected() == tab}">
+ <a ng-click="navTabs.onClick(tab)">{{tab}}</a>
</li>
</ul>
- <div ng-show="navbar.selectedIndex() == 0" class="row">
+ <div ng-show="navTabs.selectedIndex() == 0" class="row">
<div class="span12">
<h3>Overview</h3>
<table class="table">
@@ -55,7 +47,7 @@
</div>
</div>
- <div ng-show="navbar.selectedIndex() == 1" class="row">
+ <div ng-show="navTabs.selectedIndex() == 1" class="row">
<div class="span12">
<form class="form-search form-inline well">
<div class="input-append">
@@ -91,9 +83,21 @@
</div>
</div>
- <div ng-show="navbar.selectedIndex() == 2" class="row">
+ <div ng-show="navTabs.selectedIndex() == 2" class="row">
<div class="span12">
- <h3>Recent builds</h3>
+ <table class="table table-striped">
+ <tbody>
+ <tr ng-repeat="b in builds.rows">
+ <td>{{b.timestamp | date:'medium'}}</td>
+ <td class="span6">{{b.result}}</td>
+ <td class="span1"><a class="btn" href="/jenkins/#/server/{{server.uuid}}/job/{{b.job}}">Job</a></td>
+ <td class="span1">
+ <a class="btn" href="/jenkins/#/server/{{server.uuid}}/job/{{b.job}}/build/{{b.uuid}}"><i class="icon-chevron-right"></i></a>
+ </td>
+ </tr>
+ </tbody>
+ <tfoot pager colspan="4" x="builds"/>
+ </table>
</div>
</div>