update templates

pyproject.toml

@@ -40,7 +40,7 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
 
 [project.optional-dependencies]
-dev = ["ruff", "pytest", "pytest-flask", "build", "wheel", "setuptools_scm"]
+dev = ["ruff", "pytest", "pytest-flask", "build", "wheel", "setuptools_scm", "requests-mock"]
 
 [project.urls]
 "Source Code" = "https://github.com/taranis-ai/taranis-scheduler"

scheduler/core_api.py

@@ -19,7 +19,7 @@ def get_headers(self) -> dict:
     def get_jwt_from_request(self):
         return request.cookies.get(Config.JWT_ACCESS_COOKIE_NAME)
 
-    def check_response(self, response, url):
+    def check_response(self, response: requests.Response, url: str):
         try:
             if response.ok:
                 return response.json()

scheduler/router.py

@@ -5,7 +5,6 @@
 
 from scheduler.core_api import CoreApi
 from scheduler.config import Config
-from scheduler.log import logger
 
 
 def is_htmx_request() -> bool:
@@ -27,9 +26,8 @@ def get(self):
         page_size = int(request.args.get("page_size", 10))
 
         result = CoreApi().get_schedule({"page": page, "page_size": page_size, "search": search_term})
-        logger.debug(result)
 
-        if not result:
+        if result is None:
             return "Failed to fetch jobs", 500
 
         if is_htmx_request():

scheduler/templates/index.html

@@ -31,7 +31,7 @@ <h1 class="text-3xl font-bold mb-4">Scheduled Jobs</h1>
                 <tr>
                     <th class="px-6 py-3 border-b-2 border-gray-300 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase">Job ID</th>
                     <th class="px-6 py-3 border-b-2 border-gray-300 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase">Name</th>
-                    <th class="px-6 py-3 border-b-2 border-gray-300 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase">Args</th>
+                    <th class="px-6 py-3 border-b-2 border-gray-300 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase">Interval</th>
                     <th class="px-6 py-3 border-b-2 border-gray-300 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase">Next Run Time</th>
                     <th class="px-6 py-3 border-b-2 border-gray-300 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase">Actions</th>
                 </tr>

scheduler/templates/jobs_partial.html

@@ -2,7 +2,7 @@
 <tr hx-get="{{ url_for('jobs.jobdetails', job_id=job.id) }}" hx-target="#details-{{ job.id }}" hx-swap="innerHTML" data-expanded="false" onclick="toggleDetails('{{ job.id }}')" id="job-row-{{ job.id }}">
     <td class="px-6 py-4 border-b border-gray-300 text-sm">{{ job.id }}</td>
     <td class="px-6 py-4 border-b border-gray-300 text-sm">{{ job.name }}</td>
-    <td class="px-6 py-4 border-b border-gray-300 text-sm">{{ job.args }}</td>
+    <td class="px-6 py-4 border-b border-gray-300 text-sm">{{ job.trigger }}</td>
     <td class="px-6 py-4 border-b border-gray-300 text-sm">{{ job.next_run_time }}</td>
     <td class="px-6 py-4 border-b border-gray-300 text-sm">
         <!-- Conditionally show the delete button only in debug mode -->

tests/conftest.py

@@ -25,3 +25,10 @@ def app():
 @pytest.fixture(scope="session")
 def client(app):
     yield app.test_client()
+
+
+@pytest.fixture
+def schedule_get_mock(requests_mock):
+    from scheduler.config import Config
+
+    yield requests_mock.get(f"{Config.TARANIS_CORE_URL}/config/schedule", json={"items": [], "total_count": 0})

tests/test_api.py

@@ -1,6 +1,7 @@
 from scheduler.config import Config
 
 
-def test_jobindex(client):
+def test_jobindex(schedule_get_mock, client):
     response = client.get(f"{Config.APPLICATION_ROOT}/")
+    print(response.text)
     assert response.status_code == 200

tests/test_settings.py

@@ -1,4 +1,4 @@
 def test_flask_secret_key(app):
     with app.app_context():
-        secret_key = app.config.get("SECRET_KEY", None)
-        assert secret_key == "test_key"
+        secret_key = app.config.get("JWT_ACCESS_COOKIE_NAME", None)
+        assert secret_key == "access_token_cookie"