From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 1 Aug 2023 16:23:09 +0000 (+0000)
Subject: builds: Move job queue
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afc9fdf82f7eb75a31573658584d4ab6c5b1bb2c;p=pbs.git

builds: Move job queue

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 2c8b0c23..1b0031c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,7 +186,6 @@ dist_templates_builds_DATA = \
 	src/templates/builds/clone.html \
 	src/templates/builds/delete.html \
 	src/templates/builds/index.html \
-	src/templates/builds/queue.html \
 	src/templates/builds/show.html
 
 templates_buildsdir = $(templatesdir)/builds
@@ -278,6 +277,7 @@ dist_templates_jobs_DATA = \
 	src/templates/jobs/abort.html \
 	src/templates/jobs/index.html \
 	src/templates/jobs/log-stream.html \
+	src/templates/jobs/queue.html \
 	src/templates/jobs/retry.html
 
 templates_jobsdir = $(templatesdir)/jobs
diff --git a/src/templates/base.html b/src/templates/base.html
index c4b6cb6c..58ea84c0 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -65,8 +65,8 @@
 										{{ _("Users") }}
 									</a>
 								{% end %}
-								<a class="navbar-item" href="/builds/queue">
-									{{ _("Build Queue") }}
+								<a class="navbar-item" href="/jobs/queue">
+									{{ _("Job Queue") }}
 								</a>
 								<a class="navbar-item" href="/log">
 									{{ _("Log") }}
diff --git a/src/templates/index.html b/src/templates/index.html
index b59a1275..2755dc68 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -38,7 +38,7 @@
 								<div>
 									<p class="heading">{{ _("Queued Jobs") }}</p>
 									<p class="title">
-										<a href="/builds/queue">
+										<a href="/jobs/queue">
 											{{ queue_length }}
 										</a>
 									</p>
diff --git a/src/templates/builds/queue.html b/src/templates/jobs/queue.html
similarity index 77%
rename from src/templates/builds/queue.html
rename to src/templates/jobs/queue.html
index 06d271ac..94eea4fc 100644
--- a/src/templates/builds/queue.html
+++ b/src/templates/jobs/queue.html
@@ -1,6 +1,6 @@
 {% extends "../base.html" %}
 
-{% block title %}{{ _("Build Queue") }}{% end block %}
+{% block title %}{{ _("Job Queue") }}{% end block %}
 
 {% block body %}
 	<section class="hero is-light">
@@ -9,7 +9,7 @@
 				<nav class="breadcrumb" aria-label="breadcrumbs">
 					<ul>
 						<li>
-							<a href="/builds">{{ _("Builds") }}</a>
+							<a href="/jobs">{{ _("Jobs") }}</a>
 						</li>
 						<li class="is-active">
 							<a href="#" aria-current="page">
@@ -19,7 +19,7 @@
 					</ul>
 				</nav>
 
-				<h1 class="title">{{ _("Build Queue") }}</h1>
+				<h1 class="title">{{ _("Job Queue") }}</h1>
 			</div>
 		</div>
 	</section>
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 8f4c2426..d92ffe72 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -156,7 +156,6 @@ class Application(tornado.web.Application):
 
 			# Builds
 			(r"/builds", builds.IndexHandler),
-			(r"/builds/queue", builds.QueueHandler),
 			(r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", builds.ShowHandler),
 			(r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/bug", builds.BugHandler),
 			(r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/clone", builds.CloneHandler),
@@ -174,6 +173,7 @@ class Application(tornado.web.Application):
 
 			# Jobs
 			(r"/jobs", jobs.IndexHandler),
+			(r"/jobs/queue", jobs.QueueHandler),
 			(r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/abort", jobs.AbortHandler),
 			(r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/log", jobs.LogHandler),
 			(r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/retry", jobs.RetryHandler),
diff --git a/src/web/builds.py b/src/web/builds.py
index 8fc15bba..7dc8bbaa 100644
--- a/src/web/builds.py
+++ b/src/web/builds.py
@@ -84,11 +84,6 @@ class IndexHandler(base.BaseHandler):
 			limit=limit, offset=offset)
 
 
-class QueueHandler(base.BaseHandler):
-	def get(self):
-		self.render("builds/queue.html", queue=self.backend.jobs.queue)
-
-
 class ShowHandler(base.BaseHandler):
 	async def get(self, uuid):
 		build = self.backend.builds.get_by_uuid(uuid)
diff --git a/src/web/jobs.py b/src/web/jobs.py
index 4556b771..813532ab 100644
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -160,6 +160,11 @@ class IndexHandler(base.BaseHandler):
 			failed_only=failed_only)
 
 
+class QueueHandler(base.BaseHandler):
+	def get(self):
+		self.render("jobs/queue.html", queue=self.backend.jobs.queue)
+
+
 class LogHandler(base.BaseHandler):
 	async def get(self, uuid):
 		job = self.backend.jobs.get_by_uuid(uuid)