From 1f19d91fdf6a1d32cc01a9c1410c8ba54429e812 Mon Sep 17 00:00:00 2001 From: mdoglio Date: Tue, 3 Dec 2013 22:36:06 +0100 Subject: [PATCH] change the layout of the bottom panel --- ui/css/treeherder.css | 32 ++++++++- ui/index.html | 20 +++--- ui/js/directives.js | 1 - ui/js/services.js | 21 ++++++ ui/plugins/bugs/controller.js | 19 +++++ ui/plugins/bugs/main.html | 16 +++++ ui/plugins/controller.js | 102 ++++++++++++++++++++++++-- ui/plugins/jobdetail/controller.js | 112 ----------------------------- ui/plugins/jobdetail/main.html | 60 ---------------- ui/plugins/jobfoo/controller.js | 13 ---- ui/plugins/jobfoo/main.html | 3 - ui/plugins/pluginpanel.html | 72 +++++++++++++++++-- ui/plugins/tinderbox/controller.js | 15 ++++ ui/plugins/tinderbox/directives.js | 12 ++++ ui/plugins/tinderbox/main.html | 8 +++ 15 files changed, 293 insertions(+), 213 deletions(-) create mode 100644 ui/plugins/bugs/controller.js create mode 100644 ui/plugins/bugs/main.html delete mode 100644 ui/plugins/jobdetail/controller.js delete mode 100644 ui/plugins/jobdetail/main.html delete mode 100644 ui/plugins/jobfoo/controller.js delete mode 100644 ui/plugins/jobfoo/main.html create mode 100644 ui/plugins/tinderbox/controller.js create mode 100644 ui/plugins/tinderbox/directives.js create mode 100644 ui/plugins/tinderbox/main.html diff --git a/ui/css/treeherder.css b/ui/css/treeherder.css index 7bb395e1d..7df21c302 100755 --- a/ui/css/treeherder.css +++ b/ui/css/treeherder.css @@ -124,13 +124,43 @@ body { } .job-btn { - margin: 0 -4px 0 0; + margin: 0 -3px 0 0; padding: 0 2px 0 2px; } .th-notes-accordion .accordion-toggle { padding: 0; } +div.navbar-fixed-bottom{ + border-top: 1px solid #ccc; + padding:5px; +} + +.table-super-condensed thead > tr > th, +.table-super-condensed tbody > tr > th, +.table-super-condensed tfoot > tr > th, +.table-super-condensed thead > tr > td, +.table-super-condensed tbody > tr > td, +.table-super-condensed tfoot > tr > td { + padding: 2px; + font-size: .9em; +} + +div.navbar-fixed-bottom .panel{ + box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.1), 0px 0px 2px 0px rgba(0, 0, 0, 0.8) inset +} + +div.navbar-fixed-bottom dt, +div.navbar-fixed-bottom dt { + font-size:.8em; +} + +div.navbar-fixed-bottom .close-btn{ + position:absolute; + top:-15px; + right:5px; + z-index:10; +} /* Custom Job buttons*/ .btn-orange { diff --git a/ui/index.html b/ui/index.html index 006d272d2..286adbf33 100755 --- a/ui/index.html +++ b/ui/index.html @@ -63,16 +63,13 @@ -
-
- +
+ +
+ -
-
@@ -93,8 +90,9 @@ - - + + + diff --git a/ui/js/directives.js b/ui/js/directives.js index cd43943b3..981b305e8 100755 --- a/ui/js/directives.js +++ b/ui/js/directives.js @@ -82,7 +82,6 @@ treeherder.directive('thStar', function ($parse, thStarTypes) { }); treeherder.directive('thShowJobs', function ($parse, thResultStatusInfo) { - return { link: function(scope, element, attrs) { scope.$watch('resultSeverity', function(newVal) { diff --git a/ui/js/services.js b/ui/js/services.js index 1d08e04fe..5a3141305 100755 --- a/ui/js/services.js +++ b/ui/js/services.js @@ -100,3 +100,24 @@ treeherder.factory('thRepos', } }; }]); + +treeherder.factory('thJobNote', function($resource, $http, thUrl) { + var JobNote = $resource(thUrl.getProjectUrl("/note/")); + + // Workaround to the fact that $resource strips trailing slashes + // out of urls. This causes a 301 redirect on POST because it does a + // preflight OPTIONS call. Tastypie gives up on the POST after this + // and nothing happens. So this alternative "thSave" command avoids + // that by using the trailing slash directly in a POST call. + // @@@ This may be fixed in later versions of Angular. Or perhaps there's + // a better way? + JobNote.prototype.thSave = function() { + $http.post(thUrl.getProjectUrl("/note/"), { + job_id: this.job_id, + note: this.note, + who: this.who, + failure_classification_id: this.failure_classification_id + }); + }; + return JobNote; +}); diff --git a/ui/plugins/bugs/controller.js b/ui/plugins/bugs/controller.js new file mode 100644 index 000000000..d919545df --- /dev/null +++ b/ui/plugins/bugs/controller.js @@ -0,0 +1,19 @@ +"use strict"; + +treeherder.controller('BugsPluginCtrl', + function BugsPluginCtrl($scope, $rootScope, $log) { + $log.log("bugs plugin initialized"); + $scope.$watch('jobArtifacts', function(newValue, oldValue){ + $scope.open_bugs = [] + $scope.closed_bugs = [] + $log.log(newValue) + if (newValue && newValue.hasOwnProperty('Open bugs')){ + $scope.open_bugs = newValue['Open bugs'].blob; + } + if (newValue && newValue.hasOwnProperty('Closed bugs')){ + $scope.closed_bugs = newValue['Closed bugs'].blob; + } + + }); + } +); diff --git a/ui/plugins/bugs/main.html b/ui/plugins/bugs/main.html new file mode 100644 index 000000000..40a63c600 --- /dev/null +++ b/ui/plugins/bugs/main.html @@ -0,0 +1,16 @@ +
+ open bugs: +
    +
  • + {{bug}} +
    • + +
+ closed bugs: +
    +
  • + {{bug}} +
    • + +
+
diff --git a/ui/plugins/controller.js b/ui/plugins/controller.js index d469d00d8..1c45f00c9 100644 --- a/ui/plugins/controller.js +++ b/ui/plugins/controller.js @@ -1,19 +1,107 @@ "use strict"; + treeherder.controller('PluginCtrl', - function PluginCtrl($scope, $rootScope) { + function PluginCtrl($scope, $rootScope, $resource, $http, + thServiceDomain, thUrl, thJobNote, thStarTypes, $log) { + + $scope.$watch('selectedJob', function(newValue, oldValue) { + // preferred way to get access to the selected job + if (newValue) { + $scope.job = newValue; + $scope.artifacts = {} + + var undef = "---undefined---"; + // fields that will show in the job detail panel + $scope.visibleFields = { + "Result": $scope.job.result || undef, + "Job GUID": $scope.job.job_guid || undef, + "Machine Platform Arch": $scope.job.machine_platform_architecture || undef, + "Machine Platform OS": $scope.job.machine_platform_os || undef, + "Build Platform": $scope.job.build_platform || undef, + "Build Arch": $scope.job.build_architecture || undef, + "Build OS": $scope.job.build_os || undef + }; + /*this call retrieves (again) a job detail. can we avoid it?*/ + $http.get(thServiceDomain + $scope.job.resource_uri). + success(function(data) { + $scope.logs = data.logs; + + data.artifacts.forEach(function(artifact) { + if (artifact.name != "Structured Log") { + // we don't return the blobs with job, just + // resource_uris to them. For the Job Artifact, + // we want that blob, so we need to fetch the + // detail to get the blob which has the + // tinderbox_printlines, etc. + $scope.artifacts[artifact.name] =$resource( + thServiceDomain + artifact.resource_uri).get(); + } else { + // for the structured log, we don't need the blob + // here, we have everything we need in the artifact + // as is, so just save it. + /*are we using this artifact here?*/ + $scope.lvArtifact=artifact; + $scope.lvUrl = thUrl.getLogViewerUrl(artifact.id); + } + }); + }); + $scope.updateNotes(); + } + }, true); + + $scope.starTypes = thStarTypes; + var JobNote = thJobNote; + + // load the list of existing notes (including possibly a new one just + // added). + $scope.updateNotes = function() { + $scope.notes = JobNote.query({job_id: $scope.job.job_id}); + }; + // when notes comes in, then set the latest note for the job + $scope.$watch('notes', function(newValue, oldValue) { + if (newValue && newValue.length > 0) { + $scope.job.note=newValue[0]; + } + }); + + // open form to create a new note + $scope.addNote = function() { + var fci = 0; + if ($scope.notes && $scope.notes.length > 0) { + fci = $scope.notes[0].failure_classification_id; + } + $scope.newNote = new JobNote({ + job_id: $scope.job.job_id, + note: "", + who: $scope.username, + failure_classification_id: fci + }); + $scope.focusInput=true; + }; + + // done adding a new note, so clear and hide the form + $scope.clearNewNote = function() { + $scope.newNote = null; + }; + + // save the note and hide the form + $scope.saveNote = function() { + $scope.newNote.thSave(); + $scope.updateNotes(); + $scope.clearNewNote(); + }; $scope.tabs = [ { - title: "Jobs Detail", - content: "plugins/jobdetail/main.html", - active: true + title: "Tinderbox", + content: "plugins/tinderbox/main.html" }, { - title: "Jobs Foo", - content: "plugins/jobfoo/main.html" + title: "Bug suggestions", + content: "plugins/bugs/main.html" } ]; } -); +); \ No newline at end of file diff --git a/ui/plugins/jobdetail/controller.js b/ui/plugins/jobdetail/controller.js deleted file mode 100644 index 7e7107840..000000000 --- a/ui/plugins/jobdetail/controller.js +++ /dev/null @@ -1,112 +0,0 @@ -"use strict"; - -treeherder.controller('JobDetailPluginCtrl', - function JobDetailPluginCtrl($scope, $resource, $http, - thServiceDomain, thUrl, thJobNote, thStarTypes) { - - $scope.$watch('selectedJob', function(newValue, oldValue) { - // preferred way to get access to the selected job - if (newValue) { - $scope.job = newValue; - - var undef = "---undefined---"; - // fields that will show in the job detail panel - $scope.visibleFields = { - "Result": $scope.job.result || undef, - "Job GUID": $scope.job.job_guid || undef, - "Machine Platform Arch": $scope.job.machine_platform_architecture || undef, - "Machine Platform OS": $scope.job.machine_platform_os || undef, - "Build Platform": $scope.job.build_platform || undef, - "Build Arch": $scope.job.build_architecture || undef, - "Build OS": $scope.job.build_os || undef - }; - $http.get(thServiceDomain + $scope.job.resource_uri). - success(function(data) { - $scope.logs = data.logs; - - data.artifacts.forEach(function(artifact) { - if (artifact.name.indexOf("Job Artifact") !== -1) { - // we don't return the blobs with job, just - // resource_uris to them. For the Job Artifact, - // we want that blob, so we need to fetch the - // detail to get the blob which has the - // tinderbox_printlines, etc. - $scope.jobArtifact = $resource( - thServiceDomain + artifact.resource_uri).get(); - } else if (artifact.name === "Structured Log") { - // for the structured log, we don't need the blob - // here, we have everything we need in the artifact - // as is, so just save it. - $scope.lvArtifact=artifact; - $scope.lvUrl = thUrl.getLogViewerUrl(artifact.id); - } - }); - }); - $scope.updateNotes(); - } - }, true); - - $scope.starTypes = thStarTypes; - var JobNote = thJobNote; - - // load the list of existing notes (including possibly a new one just - // added). - $scope.updateNotes = function() { - $scope.notes = JobNote.query({job_id: $scope.job.job_id}); - }; - // when notes comes in, then set the latest note for the job - $scope.$watch('notes', function(newValue, oldValue) { - if (newValue && newValue.length > 0) { - $scope.job.note=newValue[0]; - } - }); - - // open form to create a new note - $scope.addNote = function() { - var fci = 0; - if ($scope.notes && $scope.notes.length > 0) { - fci = $scope.notes[0].failure_classification_id; - } - $scope.newNote = new JobNote({ - job_id: $scope.job.job_id, - note: "", - who: $scope.username, - failure_classification_id: fci - }); - $scope.focusInput=true; - }; - - // done adding a new note, so clear and hide the form - $scope.clearNewNote = function() { - $scope.newNote = null; - }; - - // save the note and hide the form - $scope.saveNote = function() { - $scope.newNote.thSave(); - $scope.updateNotes(); - $scope.clearNewNote(); - }; - } -); - -treeherder.factory('thJobNote', function($resource, $http, thUrl) { - var JobNote = $resource(thUrl.getProjectUrl("/note/")); - - // Workaround to the fact that $resource strips trailing slashes - // out of urls. This causes a 301 redirect on POST because it does a - // preflight OPTIONS call. Tastypie gives up on the POST after this - // and nothing happens. So this alternative "thSave" command avoids - // that by using the trailing slash directly in a POST call. - // @@@ This may be fixed in later versions of Angular. Or perhaps there's - // a better way? - JobNote.prototype.thSave = function() { - $http.post(thUrl.getProjectUrl("/note/"), { - job_id: this.job_id, - note: this.note, - who: this.who, - failure_classification_id: this.failure_classification_id - }); - }; - return JobNote; -}); diff --git a/ui/plugins/jobdetail/main.html b/ui/plugins/jobdetail/main.html deleted file mode 100644 index 581cba678..000000000 --- a/ui/plugins/jobdetail/main.html +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
- -
- Structured -
-
- Raw -
-
- -
-
Machine name
-
{{ job.machine_name }}
- -
-
- -
-
-
    -
  • -
    -
    • -
-
-
-
-
- - Notes -
-
-
- {{job.note.failure_classification_id}}{{ notes[0].note_timestamp*1000|date:'medium' }} said "" -
- No notes -
-
-
-
- - - - cancel -
-
-
-
diff --git a/ui/plugins/jobfoo/controller.js b/ui/plugins/jobfoo/controller.js deleted file mode 100644 index cb178d48c..000000000 --- a/ui/plugins/jobfoo/controller.js +++ /dev/null @@ -1,13 +0,0 @@ -"use strict"; - -treeherder.controller('JobFooPluginCtrl', - function JobFooPluginCtrl($scope) { - - $scope.$watch('selectedJob', function(newValue, oldValue) { - // preferred way to get access to the selected job - if (newValue) { - $scope.job = newValue; - } - }, true); - } -); diff --git a/ui/plugins/jobfoo/main.html b/ui/plugins/jobfoo/main.html deleted file mode 100644 index 2d8d0ed67..000000000 --- a/ui/plugins/jobfoo/main.html +++ /dev/null @@ -1,3 +0,0 @@ -
-

I pitty the foo that don't like job_guid: {{ job.job_guid }}

-
diff --git a/ui/plugins/pluginpanel.html b/ui/plugins/pluginpanel.html index 9ee6f0176..6ac5351a6 100644 --- a/ui/plugins/pluginpanel.html +++ b/ui/plugins/pluginpanel.html @@ -1,7 +1,69 @@
- - - - - + +
+
+
+
+ +
+ +
+ Structured +
+
+ Raw +
+
+
+
Machine name
+
{{ job.machine_name }}
+ +
{{ label }}
+
{{ value }}
+ +
+
+
+ + Notes +
+
+
+ {{job.note.failure_classification_id}}{{ notes[0].note_timestamp*1000|date:'medium' }} said "" +
+ No notes +
+
+
+
+ + + + cancel +
+
+
+
+
+ +
+
+
+ + + + + +
+
+
+
diff --git a/ui/plugins/tinderbox/controller.js b/ui/plugins/tinderbox/controller.js new file mode 100644 index 000000000..62c9e4de2 --- /dev/null +++ b/ui/plugins/tinderbox/controller.js @@ -0,0 +1,15 @@ +"use strict"; + +treeherder.controller('TinderboxPluginCtrl', + function TinderboxPluginCtrl($scope, $rootScope, $log) { + $log.log("Tinderbox plugin initialized"); + $scope.$watch('artifacts', function(newValue, oldValue){ + $scope.tinderbox_lines = [] + $log.log(newValue) + if (newValue && newValue.hasOwnProperty('Job Info')){ + $scope.tinderbox_lines = newValue['Job Info'].blob.tinderbox_printlines; + } + }); + + } +); diff --git a/ui/plugins/tinderbox/directives.js b/ui/plugins/tinderbox/directives.js new file mode 100644 index 000000000..0d7e50100 --- /dev/null +++ b/ui/plugins/tinderbox/directives.js @@ -0,0 +1,12 @@ +"use strict"; + +treeherder.directive('thPrintLine', function() { + console.log("thPrintline initialized") + return { + restrict: 'E', + scope: { + line: '=line' + }, + template: '{{line}}' + }; +}); \ No newline at end of file diff --git a/ui/plugins/tinderbox/main.html b/ui/plugins/tinderbox/main.html new file mode 100644 index 000000000..9280bfba8 --- /dev/null +++ b/ui/plugins/tinderbox/main.html @@ -0,0 +1,8 @@ +
+
    +
  • + {{line}} +
    • + +
+