This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/main by this push:
new 0d7937f Remove the prior page for reviewing tasks
0d7937f is described below
commit 0d7937ff937b85fb22666a3b340b8cd2d63a87f7
Author: Sean B. Palmer <[email protected]>
AuthorDate: Tue Dec 9 20:41:55 2025 +0000
Remove the prior page for reviewing tasks
---
atr/admin/__init__.py | 5 --
atr/admin/templates/tasks.html | 83 ----------------------------------
atr/static/README.txt | 1 -
atr/static/css/mermaid.min.css | 5 --
atr/static/js/gridjs.production.min.js | 2 -
atr/templates/includes/topnav.html | 10 +---
6 files changed, 1 insertion(+), 105 deletions(-)
diff --git a/atr/admin/__init__.py b/atr/admin/__init__.py
index 5808e6a..7a58b44 100644
--- a/atr/admin/__init__.py
+++ b/atr/admin/__init__.py
@@ -715,11 +715,6 @@ async def task_times(
return web.TextResponse("\n".join(values))
[email protected]("/tasks")
-async def tasks_(session: web.Committer) -> str:
- return await template.render("tasks.html")
-
-
@admin.get("/tasks/recent/<int:minutes>")
async def tasks_recent(session: web.Committer, minutes: int) -> str:
"""Display tasks from the last N minutes."""
diff --git a/atr/admin/templates/tasks.html b/atr/admin/templates/tasks.html
deleted file mode 100644
index 3a72def..0000000
--- a/atr/admin/templates/tasks.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends "layouts/base-admin.html" %}
-
-{%- block title -%}Executed Tasks ~ ATR{%- endblock -%}
-
-{% block stylesheets %}
- {{ super() }}
- <link rel="stylesheet"
- href="{{ static_url('css/mermaid.min.css') }}" />
-
- <style>
- .gridjs-pages button {
- color: unset;
- }
- </style>
-{% endblock stylesheets %}
-
-{% block content %}
- <h1>Executed Background Tasks</h1>
-
- <div id="task-table"></div>
-{% endblock content %}
-
-{% block javascripts %}
- {{ super() }}
- <script src="{{ static_url('js/gridjs.production.min.js') }}"></script>
-
- <script>
- new gridjs.Grid({
- columns: [
- {
- name: 'ID',
- width: '40px'
- },
- {
- name: 'Task Type',
- width: '140px'
- },
- {
- name: 'Task Status',
- width: '60px'
- },
- {
- name: 'Added',
- width: '100px',
- formatter: (cell) => `${new Date(cell).toISOString()}`
- },
- {
- name: 'Started',
- width: '100px',
- formatter: (cell) => `${new Date(cell).toISOString()}`
- },
- {
- name: 'Completed',
- width: '100px',
- formatter: (cell) => `${new Date(cell).toISOString()}`
- }
- ],
- autoWidth: false,
- resizable: true,
- style: {
- table: {
- // TODO: Need a better fix here
- // 'white-space': 'nowrap'
- }
- },
- search: true,
- pagination: {
- limit: 15,
- server: {
- url: (prev, page, limit) => `${prev}?limit=${limit}&offset=${page *
limit}`
- }
- },
- // sort: true,
- server: {
- url: '/api/tasks',
- then: data => data.data.map(task => [
- task.id, task.task_type, task.status, task.added, task.started,
task.completed
- ]),
- total: data => data.count
- }
- }).render(document.getElementById("task-table"));
- </script>
-{% endblock javascripts %}
diff --git a/atr/static/README.txt b/atr/static/README.txt
index f6d7751..24e9335 100644
--- a/atr/static/README.txt
+++ b/atr/static/README.txt
@@ -3,4 +3,3 @@ The following static resources are copied:
bootstrap 5.3.3
fontawesome-free 6.7.2
normalize.css 8.0.1
-gridjs 6.2.0
diff --git a/atr/static/css/mermaid.min.css b/atr/static/css/mermaid.min.css
deleted file mode 100644
index 718601d..0000000
--- a/atr/static/css/mermaid.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.gridjs-footer button,.gridjs-head
button{background-color:transparent;background-image:none;border:none;cursor:pointer;margin:0;outline:none;padding:0}.gridjs-temp{position:relative}.gridjs-head{margin-bottom:5px;padding:5px
1px;width:100%}.gridjs-head::after{clear:both;content:"";display:block}.gridjs-head:empty{border:none;padding:0}.gridjs-container{color:#000000;display:inline-block;overflow:hidden;padding:2px;position:relative;z-index:0}.gridjs-footer{background-color:#ffffff;borde
[...]
-
-@supports (-moz-appearance:none){th.gridjs-th-fixed{box-shadow:0 0 0 1px
#e5e7eb}}th.gridjs-th:first-child{border-left:none}th.gridjs-th:last-child{border-right:none}.gridjs-tr{border:none}.gridjs-tr-selected
td{background-color:#ebf5ff}.gridjs-tr:last-child td{border-bottom:0}.gridjs
*,.gridjs ::after,.gridjs
::before{box-sizing:border-box}.gridjs-wrapper{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;border-color:#e5e7eb;border-radius:8px
8px 0 0;border-top-width: [...]
-
-@keyframes shimmer{100%{transform:translateX(100%)}}.gridjs-td
.gridjs-checkbox{cursor:pointer;display:block;margin:auto}.gridjs-resizable{bottom:0;position:absolute;right:0;top:0;width:5px}.gridjs-resizable:hover{background-color:#9bc2f7;cursor:ew-resize}
diff --git a/atr/static/js/gridjs.production.min.js
b/atr/static/js/gridjs.production.min.js
deleted file mode 100644
index 31761d7..0000000
--- a/atr/static/js/gridjs.production.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(t,n){"object"==typeof exports&&"undefined"!=typeof
module?n(exports):"function"==typeof
define&&define.amd?define(["exports"],n):n((t||self).gridjs={})}(this,function(t){function
n(t,n){for(var e=0;e<n.length;e++){var
r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in
r&&(r.writable=!0),Object.defineProperty(t,"symbol"==typeof(o=function(t,n){if("object"!=typeof
t||null===t)return t;var e=t[Symbol.toPrimitive];if(void 0!==e){var
r=e.call(t,"string");if("object"!=t [...]
-//# sourceMappingURL=gridjs.umd.js.map
diff --git a/atr/templates/includes/topnav.html
b/atr/templates/includes/topnav.html
index 450ba42..001c787 100644
--- a/atr/templates/includes/topnav.html
+++ b/atr/templates/includes/topnav.html
@@ -264,15 +264,7 @@
</li>
<li>
<a class="dropdown-item"
- href="{{ as_url(admin.tasks_) }}"
- {% if request.endpoint == 'atr_admin_tasks_'
%}class="active"{% endif %}><i class="bi bi-list-task"></i> Background tasks</a>
- </li>
- <li>
- <hr class="dropdown-divider" />
- </li>
- <li>
- <a class="dropdown-item"
- href="{{ as_url(admin.tasks_recent, minutes=5) }}"><i
class="bi bi-clock-history"></i> Recent tasks</a>
+ href="{{ as_url(admin.tasks_recent, minutes=5) }}"><i
class="bi bi-list-task"></i> Recent tasks</a>
</li>
<li>
<a class="dropdown-item"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
