From 9b78b9dfc013a72ae5cfebe6909cde53f329e866 Mon Sep 17 00:00:00 2001
From: Karolina Przerwa <karolina.m.przerwa@gmail.com>
Date: Mon, 26 Aug 2024 15:14:02 +0200
Subject: [PATCH] alembic: change jobs table names for consistency

* tests: adapt tests to new implementation of jobs registry
* chore: fix formatting
---
 invenio_jobs/administration/jobs.py           |   2 +
 invenio_jobs/administration/runs.py           |   9 -
 ...6f6990b8_update_jobs_module_table_names.py |  59 +++++++
 invenio_jobs/api.py                           |  17 ++
 .../invenio_jobs/administration/JobActions.js |   6 +
 .../administration/JobRunsHeader.js           |   6 -
 .../JobSearchResultItemLayout.js              |   1 -
 .../administration/RunActionForm.js           |   8 +-
 .../invenio_jobs/administration/RunButton.js  | 145 ---------------
 .../RunsSearchResultItemLayout.js             |   1 -
 .../administration/ScheduleJobModal.js        |   6 +
 .../administration/StatusFormatter.js         |   6 +
 .../js/invenio_jobs/administration/index.js   |   1 -
 invenio_jobs/ext.py                           |   1 -
 invenio_jobs/jobs.py                          |  10 +-
 invenio_jobs/models.py                        |  47 ++---
 invenio_jobs/registry.py                      |  11 +-
 invenio_jobs/resources/config.py              |   1 -
 invenio_jobs/resources/resources.py           |   7 +-
 invenio_jobs/services/config.py               |   4 +-
 invenio_jobs/services/results.py              |   7 +-
 invenio_jobs/services/schema.py               |  12 +-
 invenio_jobs/services/services.py             |  70 ++++----
 invenio_jobs/services/ui_schema.py            |   1 -
 invenio_jobs/tasks.py                         |   2 +-
 invenio_jobs/webpack.py                       |   2 +-
 tests/conftest.py                             |  29 +--
 tests/mock_module/__init__.py                 |   8 +
 tests/mock_module/jobs.py                     |  21 +++
 tests/resources/test_resources.py             | 166 +++++++++---------
 tests/test_alembic.py                         |   6 +-
 31 files changed, 323 insertions(+), 349 deletions(-)
 create mode 100644 invenio_jobs/alembic/1f896f6990b8_update_jobs_module_table_names.py
 create mode 100644 invenio_jobs/api.py
 delete mode 100644 invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunButton.js
 create mode 100644 tests/mock_module/__init__.py
 create mode 100644 tests/mock_module/jobs.py

diff --git a/invenio_jobs/administration/jobs.py b/invenio_jobs/administration/jobs.py
index 1ffa1e2..0e391e3 100644
--- a/invenio_jobs/administration/jobs.py
+++ b/invenio_jobs/administration/jobs.py
@@ -108,6 +108,7 @@ def get_api_endpoint(self, pid_value=None):
         return f"/api/jobs/{pid_value}/runs"
 
     def get_details_api_endpoint(self):
+        """Compute api endpoint link for job details view."""
         api_url_prefix = current_app.config["SITE_API_URL"]
         slash_tpl = "/" if not self.api_endpoint.startswith("/") else ""
 
@@ -117,6 +118,7 @@ def get_details_api_endpoint(self):
         return f"{slash_tpl}{self.api_endpoint}"
 
     def get_context(self, **kwargs):
+        """Compute admin view context."""
         ctx = super().get_context(**kwargs)
         ctx["request_headers"] = self.request_headers
         ctx["ui_config"] = self.item_field_list
diff --git a/invenio_jobs/administration/runs.py b/invenio_jobs/administration/runs.py
index 10499fd..4379252 100644
--- a/invenio_jobs/administration/runs.py
+++ b/invenio_jobs/administration/runs.py
@@ -28,12 +28,3 @@ class RunsListView(AdminResourceListView):
     display_edit = False
     display_create = False
     actions = None
-
-    # item_field_list = {
-    #     "job": {"text": _("Jobs"), "order": 1, "width": 3},
-    #     "active": {"text": _("Status"), "order": 2, "width": 2},
-    #     "last_run_start_time": {"text": _("Last run"), "order": 3, "width": 3},
-    #     "user": {"text": _("Started by"), "order": 4, "width": 3},
-    #     "next_run": {"text": _("Next run"), "order": 5, "width": 3},
-    # }
-
diff --git a/invenio_jobs/alembic/1f896f6990b8_update_jobs_module_table_names.py b/invenio_jobs/alembic/1f896f6990b8_update_jobs_module_table_names.py
new file mode 100644
index 0000000..3f3d04e
--- /dev/null
+++ b/invenio_jobs/alembic/1f896f6990b8_update_jobs_module_table_names.py
@@ -0,0 +1,59 @@
+#
+# This file is part of Invenio.
+# Copyright (C) 2016-2018 CERN.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Update jobs module table names."""
+
+import sqlalchemy as sa
+import sqlalchemy_utils
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "1f896f6990b8"
+down_revision = "356496a01197"
+branch_labels = ()
+depends_on = None
+
+
+def upgrade():
+    """Upgrade database."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint("fk_run_job_id_job", "run", type_="foreignkey")
+    op.rename_table("job", "jobs_job")
+    op.rename_table("run", "jobs_run")
+
+    op.create_foreign_key(
+        "fk_jobs_run_job_id_jobs_job", "jobs_run", "jobs_job", ["job_id"], ["id"]
+    )
+    op.drop_column("jobs_job", "default_args")
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    """Downgrade database."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint("fk_jobs_run_job_id_jobs_job", "jobs_run", type_="foreignkey")
+
+    op.rename_table("jobs_job", "job")
+    op.rename_table("jobs_run", "run")
+    op.create_foreign_key("fk_run_job_id_job", "run", "job", ["job_id"], ["id"])
+    op.add_column(
+        "job",
+        sa.Column(
+            "default_args",
+            sa.JSON()
+            .with_variant(sqlalchemy_utils.types.json.JSONType(), "mysql")
+            .with_variant(
+                postgresql.JSONB(none_as_null=True, astext_type=sa.Text()), "postgresql"
+            )
+            .with_variant(sqlalchemy_utils.types.json.JSONType(), "sqlite"),
+            nullable=True,
+        ),
+    )
+
+    # ### end Alembic commands ###
diff --git a/invenio_jobs/api.py b/invenio_jobs/api.py
new file mode 100644
index 0000000..0df85f4
--- /dev/null
+++ b/invenio_jobs/api.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2024 CERN.
+#
+# Invenio-Jobs is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Record class mock."""
+
+
+class AttrDict(dict):
+    """Mock record class."""
+
+    def __init__(self, *args, **kwargs):
+        """Constructor."""
+        super(AttrDict, self).__init__(*args, **kwargs)
+        self.__dict__ = self
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobActions.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobActions.js
index 8810c7f..5516900 100644
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobActions.js
+++ b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobActions.js
@@ -1,3 +1,9 @@
+// This file is part of InvenioRDM
+// Copyright (C) 2024 CERN
+//
+// Invenio RDM Records is free software; you can redistribute it and/or modify it
+// under the terms of the MIT License; see LICENSE file for more details.
+
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Button, Modal, Icon } from "semantic-ui-react";
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobRunsHeader.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobRunsHeader.js
index df68802..3918836 100644
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobRunsHeader.js
+++ b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobRunsHeader.js
@@ -14,10 +14,8 @@ import { i18next } from "@translations/invenio_app_rdm/i18next";
 import _isEmpty from "lodash/isEmpty";
 import PropTypes from "prop-types";
 import React, { Component } from "react";
-import { http } from "react-invenio-forms";
 import { Divider, Button, Grid, Header } from "semantic-ui-react";
 import { AdminUIRoutes } from "@js/invenio_administration";
-import { withCancel } from "react-invenio-forms";
 
 export class JobRunsHeader extends Component {
   constructor(props) {
@@ -45,17 +43,13 @@ export class JobRunsHeader extends Component {
 
   render() {
     const {
-      pid,
-      columns,
       actions,
       apiEndpoint,
       idKeyPath,
       listUIEndpoint,
-      resourceSchema,
       resourceName,
       displayDelete,
       displayEdit,
-      uiSchema,
       data,
       error,
       loading,
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobSearchResultItemLayout.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobSearchResultItemLayout.js
index c8c5dcf..f00a6f6 100644
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobSearchResultItemLayout.js
+++ b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/JobSearchResultItemLayout.js
@@ -14,7 +14,6 @@ import { UserListItemCompact, toRelativeTime } from "react-invenio-forms";
 import { withState } from "react-searchkit";
 import { Popup, Table, Button } from "semantic-ui-react";
 import { Actions } from "@js/invenio_administration";
-import { RunButton } from "./RunButton";
 import { StatusFormatter } from "./StatusFormatter";
 import { AdminUIRoutes } from "@js/invenio_administration/src/routes";
 
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunActionForm.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunActionForm.js
index a41f8e1..4c546f8 100644
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunActionForm.js
+++ b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunActionForm.js
@@ -1,7 +1,13 @@
+// This file is part of InvenioRDM
+// Copyright (C) 2024 CERN
+//
+// Invenio RDM Records is free software; you can redistribute it and/or modify it
+// under the terms of the MIT License; see LICENSE file for more details.
+
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { ActionFormLayout } from "@js/invenio_administration";
-import ReactJson from "react-json-view";
+import ReactJson from "@microlink/react-json-view";
 import { Accordion, Icon, Modal } from "semantic-ui-react";
 
 export class RunActionForm extends Component {
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunButton.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunButton.js
deleted file mode 100644
index 3328848..0000000
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunButton.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// This file is part of InvenioRDM
-// Copyright (C) 2024 CERN
-//
-// Invenio RDM Records is free software; you can redistribute it and/or modify it
-// under the terms of the MIT License; see LICENSE file for more details.
-
-import { i18next } from "@translations/invenio_app_rdm/i18next";
-import PropTypes from "prop-types";
-import React, { Component } from "react";
-import { http, withCancel } from "react-invenio-forms";
-import {
-  Button,
-  Dropdown,
-  DropdownMenu,
-  Form,
-  FormField,
-  FormInput,
-  TextArea,
-} from "semantic-ui-react";
-
-export class RunButton extends Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      title: "Manual run",
-      config: JSON.stringify(props.config, null, "\t"),
-      queue: props.queue || "celery",
-      loading: false,
-    };
-  }
-
-  componentWillUnmount() {
-    this.cancellableAction && this.cancellableAction.cancel();
-  }
-
-  handleTitleChange = (e, { name, value }) => this.setState({ title: value });
-  handleConfigChange = (e, { name, value }) => this.setState({ config: value });
-  handleQueueChange = (e, { name, value }) => this.setState({ queue: value });
-
-  handleSubmit = async () => {
-    this.setState({ loading: true });
-
-    const { jobId, onError, setRun } = this.props;
-    const { title, config, queue } = this.state;
-
-    try {
-      var userConfigJSON = config === "" ? null : JSON.parse(config);
-    } catch (e) {
-      onError(e);
-    }
-
-    const runData = {
-      title: title,
-      queue: queue,
-    };
-
-    if (userConfigJSON !== null) {
-      runData.args = userConfigJSON;
-    }
-
-    try {
-      this.cancellableAction = await withCancel(
-        http.post("/api/jobs/" + jobId + "/runs", runData)
-      );
-    } catch (error) {
-      if (error.response) {
-        onError(error.response.data);
-      } else {
-        onError(error);
-      }
-    }
-    const response = await this.cancellableAction.promise;
-    setRun(response.data?.status, response.data?.created);
-    this.setState({ loading: false });
-  };
-
-  render() {
-    const { title, config, queue, loading } = this.state;
-    const lines = config.split(/\r?\n/).length;
-
-    return (
-      <Dropdown
-        text={i18next.t("Run now")}
-        icon="play"
-        floating
-        labeled
-        button
-        className="icon"
-        basic
-        direction="left"
-      >
-        <DropdownMenu>
-          <Form className="p-10" onSubmit={this.handleSubmit}>
-            <FormInput
-              name="title"
-              label="Title"
-              value={title}
-              onClick={(e) => e.stopPropagation()}
-              onChange={this.handleTitleChange}
-            />
-            <FormField
-              control={TextArea}
-              label="Arguments"
-              name="config"
-              rows={lines}
-              className="block min-width-max"
-              value={config}
-              onClick={(e) => e.stopPropagation()}
-              onChange={this.handleConfigChange}
-            />
-            <FormField
-              control={Dropdown}
-              name="queue"
-              label="Queue"
-              selection
-              value={queue}
-              options={[
-                { key: "celery", text: "celery", value: "celery" },
-                { key: "low", text: "low", value: "low" },
-              ]}
-              onChange={this.handleQueueChange}
-            />
-            <Button type="submit" content="Run" loading={loading} />
-          </Form>
-        </DropdownMenu>
-      </Dropdown>
-    );
-  }
-}
-
-RunButton.propTypes = {
-  jobId: PropTypes.string.isRequired,
-  config: PropTypes.object.isRequired,
-  onError: PropTypes.func.isRequired,
-  setRun: PropTypes.func,
-  queue: PropTypes.string.isRequired,
-};
-
-RunButton.defaultProps = {
-  setRun: (status, created) => {
-    // purposeful console.log if setRun function not passed
-    console.log(status, created);
-  },
-};
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunsSearchResultItemLayout.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunsSearchResultItemLayout.js
index 1336e72..d42987f 100644
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunsSearchResultItemLayout.js
+++ b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/RunsSearchResultItemLayout.js
@@ -41,7 +41,6 @@ class SearchResultItemComponent extends Component {
   render() {
     const { result } = this.props;
     const { status } = this.state;
-    debugger; // eslint-disable-line no-debugger
     return (
       <Table.Row>
         <Table.Cell
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/ScheduleJobModal.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/ScheduleJobModal.js
index b732fd7..ad1d5c7 100644
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/ScheduleJobModal.js
+++ b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/ScheduleJobModal.js
@@ -1,3 +1,9 @@
+// This file is part of InvenioRDM
+// Copyright (C) 2024 CERN
+//
+// Invenio RDM Records is free software; you can redistribute it and/or modify it
+// under the terms of the MIT License; see LICENSE file for more details.
+
 import React from "react";
 import PropTypes from "prop-types";
 import { Modal, Dropdown, Input, Button, Icon } from "semantic-ui-react";
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/StatusFormatter.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/StatusFormatter.js
index bf60fa9..7d0c225 100644
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/StatusFormatter.js
+++ b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/StatusFormatter.js
@@ -1,3 +1,9 @@
+// This file is part of InvenioRDM
+// Copyright (C) 2024 CERN
+//
+// Invenio RDM Records is free software; you can redistribute it and/or modify it
+// under the terms of the MIT License; see LICENSE file for more details.
+
 import { BoolFormatter } from "@js/invenio_administration";
 import { i18next } from "@translations/invenio_app_rdm/i18next";
 import React from "react";
diff --git a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/index.js b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/index.js
index 7e953b5..f4ccdaa 100644
--- a/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/index.js
+++ b/invenio_jobs/assets/semantic-ui/js/invenio_jobs/administration/index.js
@@ -7,7 +7,6 @@
 import { initDefaultSearchComponents } from "@js/invenio_administration";
 import { createSearchAppInit } from "@js/invenio_search_ui";
 import { NotificationController } from "@js/invenio_administration";
-import { JobRunsHeader } from "./JobRunsHeader";
 import { RunActionForm } from "./RunActionForm";
 import { SearchResultItemLayout } from "./JobSearchResultItemLayout";
 import { JobSearchLayout } from "./JobSearchLayout";
diff --git a/invenio_jobs/ext.py b/invenio_jobs/ext.py
index 01ca350..351163c 100644
--- a/invenio_jobs/ext.py
+++ b/invenio_jobs/ext.py
@@ -104,7 +104,6 @@ def jobs(self):
         return self.registry.all_registered_jobs()
 
 
-
 def finalize_app(app):
     """Finalize app."""
     rr_ext = app.extensions["invenio-records-resources"]
diff --git a/invenio_jobs/jobs.py b/invenio_jobs/jobs.py
index 9f54d5f..438ed1f 100644
--- a/invenio_jobs/jobs.py
+++ b/invenio_jobs/jobs.py
@@ -4,18 +4,25 @@
 #
 # Invenio-Jobs is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
+
+"""Jobs module."""
+
 from functools import partial
 
 
 class RegisteredTask:
+    """Base class to register tasks available in the admin panel."""
 
     arguments_schema = None
     task = None
     id = None
     title = None
     description = None
+
     @classmethod
-    def factory(cls, job_cls_name, arguments_schema, id_, task, description, title, attrs=None):
+    def factory(
+        cls, job_cls_name, arguments_schema, id_, task, description, title, attrs=None
+    ):
         """Create a new instance of a job."""
         if not attrs:
             attrs = {}
@@ -34,6 +41,7 @@ def factory(cls, job_cls_name, arguments_schema, id_, task, description, title,
 
     @classmethod
     def build_task_arguments(cls, job_obj, since=None, custom_args=None, **kwargs):
+        """Build task arguments."""
         if custom_args:
             return custom_args
         return {}
diff --git a/invenio_jobs/models.py b/invenio_jobs/models.py
index 4a985ed..6e40c3b 100644
--- a/invenio_jobs/models.py
+++ b/invenio_jobs/models.py
@@ -8,6 +8,7 @@
 """Models."""
 
 import enum
+import json
 import uuid
 from copy import deepcopy
 from datetime import timedelta
@@ -23,10 +24,8 @@
 from sqlalchemy_utils import Timestamp
 from sqlalchemy_utils.types import ChoiceType, JSONType, UUIDType
 from werkzeug.utils import cached_property
-from invenio_jobs.proxies import current_jobs
-
 
-from .utils import eval_tpl_str, walk_values
+from invenio_jobs.proxies import current_jobs
 
 JSON = (
     db.JSON()
@@ -36,11 +35,6 @@
 )
 
 
-class AttrDict(dict):
-    def __init__(self, *args, **kwargs):
-        super(AttrDict, self).__init__(*args, **kwargs)
-        self.__dict__ = self
-
 def _dump_dict(model):
     """Dump a model to a dictionary."""
     return {c.key: getattr(model, c.key) for c in sa.inspect(model).mapper.column_attrs}
@@ -49,14 +43,15 @@ def _dump_dict(model):
 class Job(db.Model, Timestamp):
     """Job model."""
 
+    __tablename__ = "jobs_job"
+
     id = db.Column(UUIDType, primary_key=True, default=uuid.uuid4)
     active = db.Column(db.Boolean, default=True, nullable=False)
     title = db.Column(db.String(255), nullable=False)
     description = db.Column(db.Text)
-
+    # default_args = db.Column(JSON, default=lambda: dict(), nullable=True)
     task = db.Column(db.String(255))
     default_queue = db.Column(db.String(64))
-    # default_args = db.Column(JSON, default=lambda: dict(), nullable=True)
     schedule = db.Column(JSON, nullable=True)
 
     @property
@@ -70,12 +65,15 @@ def last_runs(self):
         """Last run of the job."""
         _runs = {}
         for status in RunStatusEnum:
-            run = self.runs.filter_by(status=status).order_by(Run.created.desc()).first()
+            run = (
+                self.runs.filter_by(status=status).order_by(Run.created.desc()).first()
+            )
             _runs[status.name.lower()] = run if run else {}
         return _runs
 
     @property
     def default_args(self):
+        """Compute default job arguments."""
         return Task.get(self.task).build_task_arguments(job_obj=self)
 
     @property
@@ -111,6 +109,8 @@ class RunStatusEnum(enum.Enum):
 class Run(db.Model, Timestamp):
     """Run model."""
 
+    __tablename__ = "jobs_run"
+
     id = db.Column(UUIDType, primary_key=True, default=uuid.uuid4)
 
     job_id = db.Column(UUIDType, db.ForeignKey(Job.id))
@@ -161,26 +161,18 @@ def generate_args(cls, job):
         execute arbitrary code, or perform harmful DB operations (e.g. delete rows).
         """
         args = deepcopy(job.default_args)
-
-        # ctx = {"job": job.dump()}
-        # Add last runs
-        # last_runs = {}
-        # for status in RunStatusEnum:
-        #     run = job.runs.filter_by(status=status).order_by(cls.created.desc()).first()
-        #     last_runs[status.name.lower()] = run.dump() if run else None
-        # ctx["last_runs"] = last_runs
-        # ctx["last_run"] = job.last_run.dump() if job.last_run else None
-        import json
         args = json.dumps(args, indent=4, sort_keys=True, default=str)
         args = json.loads(args)
-        # walk_values(args, lambda val: eval_tpl_str(val, ctx))
         return args
 
     def dump(self):
         """Dump the run as a dictionary."""
-        dict_run = _dump_dict(self)
         from invenio_jobs.services.schema import RegisteredTaskArgumentsSchema
-        serialized_args = RegisteredTaskArgumentsSchema().load({"args": dict_run["args"]})
+
+        dict_run = _dump_dict(self)
+        serialized_args = RegisteredTaskArgumentsSchema().load(
+            {"args": dict_run["args"]}
+        )
 
         dict_run["args"] = serialized_args
         return dict_run
@@ -207,12 +199,6 @@ def description(self):
             return ""
         return self._obj.__doc__.split("\n")[0]
 
-    # @cached_property
-    # def parameters(self):
-    #     """Return the task's parameters."""
-    #     TODO: Make this result more user friendly or enhance with type information
-        # return signature(self._obj).parameters
-
     @classmethod
     def all(cls):
         """Return all tasks."""
@@ -220,4 +206,5 @@ def all(cls):
 
     @classmethod
     def get(cls, id_):
+        """Get registered task by id."""
         return cls(current_jobs.registry.get(id_))
diff --git a/invenio_jobs/registry.py b/invenio_jobs/registry.py
index c19c764..c06c524 100644
--- a/invenio_jobs/registry.py
+++ b/invenio_jobs/registry.py
@@ -5,6 +5,9 @@
 # Invenio-Jobs is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
+"""Registry of jobs."""
+
+
 class JobsRegistry:
     """A simple class to register jobs."""
 
@@ -17,9 +20,7 @@ def register(self, job_instance, job_id=None):
         if job_id is None:
             job_id = job_instance.id
         if job_id in self._jobs:
-            raise RuntimeError(
-                f"Job with job id '{job_id}' is already registered."
-            )
+            raise RuntimeError(f"Job with job id '{job_id}' is already registered.")
         self._jobs[job_id] = job_instance
 
     def get(self, job_id):
@@ -37,10 +38,8 @@ def all_registered_jobs(self):
         """Return a list of available tasks."""
         return self._jobs
 
-    def all_arguments(self):
-        return [task.arguments_schema for task_id, task in self._jobs.items()]
-
     def registered_schemas(self):
+        """Return all schemas registered for tasks."""
         schemas = {}
         for id_, registered_task in self._jobs.items():
             schema = registered_task.arguments_schema
diff --git a/invenio_jobs/resources/config.py b/invenio_jobs/resources/config.py
index 28bb1b4..dffbd56 100644
--- a/invenio_jobs/resources/config.py
+++ b/invenio_jobs/resources/config.py
@@ -52,7 +52,6 @@ class TasksResourceConfig(ResourceConfig, ConfiguratorMixin):
     url_prefix = "/tasks"
     routes = {"list": "", "arguments": "/<registered_task_id>/args"}
 
-
     # Request handling
     request_search_args = SearchRequestArgsSchema
     request_body_parsers = request_body_parsers
diff --git a/invenio_jobs/resources/resources.py b/invenio_jobs/resources/resources.py
index 0ce3f35..28f23b9 100644
--- a/invenio_jobs/resources/resources.py
+++ b/invenio_jobs/resources/resources.py
@@ -33,7 +33,7 @@ def create_url_rules(self):
         routes = self.config.routes
         url_rules = [
             route("GET", routes["list"], self.search),
-            route("GET", routes["arguments"], self.read_arguments)
+            route("GET", routes["arguments"], self.read_arguments),
         ]
 
         return url_rules
@@ -54,9 +54,12 @@ def search(self):
 
     @request_view_args
     def read_arguments(self):
+        """Read arguments schema of task resource."""
         identity = g.identity
         registered_task_id = resource_requestctx.view_args["registered_task_id"]
-        arguments_schema = self.service.read_registered_task_arguments(identity, registered_task_id)
+        arguments_schema = self.service.read_registered_task_arguments(
+            identity, registered_task_id
+        )
         return jsonify_schema(arguments_schema) if arguments_schema else {}
 
 
diff --git a/invenio_jobs/services/config.py b/invenio_jobs/services/config.py
index 27e0e88..1bd048d 100644
--- a/invenio_jobs/services/config.py
+++ b/invenio_jobs/services/config.py
@@ -34,11 +34,11 @@ class TasksSearchOptions(SearchOptionsBase):
     sort_direction_options = {
         "asc": dict(
             title=_("Ascending"),
-            fn=partial(sorted, key=lambda t: t.name),
+            fn=partial(sorted, key=lambda t: t.title),
         ),
         "desc": dict(
             title=_("Descending"),
-            fn=partial(sorted, key=lambda t: t.name, reverse=True),
+            fn=partial(sorted, key=lambda t: t.title, reverse=True),
         ),
     }
     sort_options = {"name": dict(title=_("Name"), fields=["name"])}
diff --git a/invenio_jobs/services/results.py b/invenio_jobs/services/results.py
index 5083657..43fd75d 100644
--- a/invenio_jobs/services/results.py
+++ b/invenio_jobs/services/results.py
@@ -16,11 +16,7 @@
     RecordList,
 )
 
-
-class AttrDict(dict):
-    def __init__(self, *args, **kwargs):
-        super(AttrDict, self).__init__(*args, **kwargs)
-        self.__dict__ = self
+from ..api import AttrDict
 
 
 class Item(RecordItem):
@@ -37,6 +33,7 @@ class JobItem(Item):
 
     @property
     def data(self):
+        """Data representation of job result item."""
         if self._data:
             return self._data
 
diff --git a/invenio_jobs/services/schema.py b/invenio_jobs/services/schema.py
index ca90534..f3696a5 100644
--- a/invenio_jobs/services/schema.py
+++ b/invenio_jobs/services/schema.py
@@ -13,7 +13,7 @@
 
 from invenio_i18n import lazy_gettext as _
 from invenio_users_resources.services import schemas as user_schemas
-from marshmallow import EXCLUDE, Schema, fields, validate, types, post_load, pre_dump
+from marshmallow import EXCLUDE, Schema, fields, post_load, pre_dump, types, validate
 from marshmallow_oneofschema import OneOfSchema
 from marshmallow_utils.fields import SanitizedUnicode, TZDateTime
 from marshmallow_utils.permissions import FieldPermissionsMixin
@@ -92,6 +92,8 @@ class CrontabScheduleSchema(Schema):
 
 
 class CustomArgsSchema(Schema):
+    """Custom arguments schema."""
+
     args = fields.Raw(load_default=dict, allow_none=True)
 
 
@@ -111,21 +113,25 @@ def get_obj_type(self, obj):
 
 
 class RegisteredTaskArgumentsSchema(OneOfSchema):
+    """Base schema for tasks with arguments."""
 
     type_field_remove = False
 
     def __init__(self, *args, **kwargs):
+        """Constructor."""
         self.type_schemas = deepcopy(current_jobs.registry.registered_schemas())
         self.type_schemas["custom"] = CustomArgsSchema
         super().__init__(*args, **kwargs)
 
     def get_obj_type(self, obj):
+        """Return object type."""
         if isinstance(obj, dict) and "type" in obj:
             return obj["type"]
         if isinstance(obj, dict) and "type" not in obj:
             return "custom"
 
     def get_data_type(self, data):
+        """Get data type. Defaults to custom if no type is provided."""
         data_type = super().get_data_type(data)
         if data_type is None:
             return "custom"
@@ -151,7 +157,7 @@ class Meta:
 
     task = fields.String(
         required=True,
-        validate=LazyOneOf(choices=lambda: [name for name, t in Task.all().items()])
+        validate=LazyOneOf(choices=lambda: [name for name, t in Task.all().items()]),
     )
     default_queue = fields.String(
         validate=LazyOneOf(choices=lambda: current_jobs.queues.keys()),
@@ -167,6 +173,7 @@ class Meta:
 
     @pre_dump
     def dump_last_runs(self, obj, many=False, **kwargs):
+        """Dump last runs of a job."""
         last_runs = obj.get("last_runs", {})
         for key, value in last_runs.items():
             if value:
@@ -238,6 +245,7 @@ class Meta:
 
     @post_load
     def pick_args(self, obj, many, **kwargs):
+        """Choose custom or default args."""
         custom_args = obj.pop("custom_args")
         if custom_args:
             obj["args"] = custom_args
diff --git a/invenio_jobs/services/services.py b/invenio_jobs/services/services.py
index 7533cfd..6680999 100644
--- a/invenio_jobs/services/services.py
+++ b/invenio_jobs/services/services.py
@@ -24,6 +24,7 @@
 
 from invenio_jobs.tasks import execute_run
 
+from ..api import AttrDict
 from ..models import Job, Run, RunStatusEnum, Task
 from ..proxies import current_jobs
 from .errors import JobNotFoundError, RunNotFoundError, RunStatusChangeError
@@ -44,35 +45,35 @@ def rebuild_index(self, identity, uow=None):
 class TasksService(BaseService):
     """Tasks service."""
 
-    def search(self, identity, params):
-        """Search for tasks."""
-        self.require_permission(identity, "search")
-
-        # TODO change this to .jobs
-        tasks = current_jobs.tasks.values()
-
-        search_params = map_search_params(self.config.search, params)
-        query_param = search_params["q"]
-        if query_param:
-            tasks = [
-                task
-                for task in tasks
-                if (
-                    query_param in task.name.lower()
-                    or query_param in task.description.lower()
-                )
-            ]
-        sort_direction = search_params["sort_direction"]
-        tasks = sort_direction(tasks)
-
-        return self.result_list(
-            service=self,
-            identity=identity,
-            results=tasks,
-            params=search_params,
-            links_tpl=LinksTemplate(self.config.links_search, context={"args": params}),
-            links_item_tpl=self.links_item_tpl,
-        )
+    # def search(self, identity, params):
+    #     """Search for tasks."""
+    #     self.require_permission(identity, "search")
+    #
+    #     # TODO change this to .jobs
+    #     tasks = current_jobs.tasks.values()
+    #
+    #     search_params = map_search_params(self.config.search, params)
+    #     query_param = search_params["q"]
+    #     if query_param:
+    #         tasks = [
+    #             task
+    #             for task in tasks
+    #             if (
+    #                 query_param in task.title.lower()
+    #                 or query_param in task.description.lower()
+    #             )
+    #         ]
+    #     sort_direction = search_params["sort_direction"]
+    #     tasks = sort_direction(tasks)
+    #
+    #     return self.result_list(
+    #         service=self,
+    #         identity=identity,
+    #         results=tasks,
+    #         params=search_params,
+    #         links_tpl=LinksTemplate(self.config.links_search, context={"args": params}),
+    #         links_item_tpl=self.links_item_tpl,
+    #     )
 
     def read_registered_task_arguments(self, identity, registered_task_id):
         """Return arguments allowed for given task."""
@@ -81,7 +82,6 @@ def read_registered_task_arguments(self, identity, registered_task_id):
             return task.arguments_schema()
 
 
-
 def get_job(job_id):
     """Get a job by id."""
     job = Job.query.get(job_id)
@@ -98,12 +98,6 @@ def get_run(run_id, job_id=None):
     return run
 
 
-class AttrDict(dict):
-    def __init__(self, *args, **kwargs):
-        super(AttrDict, self).__init__(*args, **kwargs)
-        self.__dict__ = self
-
-
 class JobsService(BaseService):
     """Jobs service."""
 
@@ -246,7 +240,9 @@ def read(self, identity, job_id, run_id):
         run = get_run(job_id=job_id, run_id=run_id)
         run_dict = run.dump()
         run_record = AttrDict(run_dict)
-        return self.result_item(self, identity, run_record, links_tpl=self.links_item_tpl)
+        return self.result_item(
+            self, identity, run_record, links_tpl=self.links_item_tpl
+        )
 
     @unit_of_work()
     def create(self, identity, job_id, data, uow=None):
diff --git a/invenio_jobs/services/ui_schema.py b/invenio_jobs/services/ui_schema.py
index 675d635..5710b4b 100644
--- a/invenio_jobs/services/ui_schema.py
+++ b/invenio_jobs/services/ui_schema.py
@@ -11,7 +11,6 @@
 from marshmallow_oneofschema import OneOfSchema
 
 
-
 class IntervalScheduleUISchema(Schema):
     """Schema for an interval schedule based on ``datetime.timedelta``."""
 
diff --git a/invenio_jobs/tasks.py b/invenio_jobs/tasks.py
index a041880..365e37c 100644
--- a/invenio_jobs/tasks.py
+++ b/invenio_jobs/tasks.py
@@ -46,7 +46,7 @@ def execute_run(self, run_id, kwargs=None):
             run,
             status=RunStatusEnum.FAILED,
             finished_at=datetime.now(timezone.utc),
-            message=f"{e.__class__.__name__}: {str(e)}"
+            message=f"{e.__class__.__name__}: {str(e)}",
         )
         return
 
diff --git a/invenio_jobs/webpack.py b/invenio_jobs/webpack.py
index 7dafa87..ed84d19 100644
--- a/invenio_jobs/webpack.py
+++ b/invenio_jobs/webpack.py
@@ -22,7 +22,7 @@
             dependencies={
                 "react-invenio-forms": "^4.0.0",
                 "react-searchkit": "^2.0.0",
-                "react-json-view": "^1.21.3",
+                "@microlink/react-json-view": "^1.21.3",
             },
             aliases={
                 "@less/invenio_jobs": "less/invenio_jobs",
diff --git a/tests/conftest.py b/tests/conftest.py
index 1e445a5..7a91c3b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -23,6 +23,20 @@
 from invenio_jobs.proxies import current_jobs_service
 
 
+@pytest.fixture(scope="module")
+def extra_entry_points():
+    """Extra entry points to load the mock_module features."""
+    # __import__("ipdb").set_trace()
+    return {
+        "invenio_jobs.jobs": [
+            "mock_module = mock_module.jobs:mock_job",
+        ],
+        "invenio_celery.tasks": [
+            "mock_module = mock_module.tasks",
+        ],
+    }
+
+
 @pytest.fixture(scope="module")
 def app_config(app_config):
     """Application config override."""
@@ -44,22 +58,11 @@ class MockPermissionPolicy(BasePermissionPolicy):
 
 
 @pytest.fixture(scope="module")
-def create_app(instance_path):
+def create_app(instance_path, entry_points):
     """Application factory fixture."""
     return create_api
 
 
-@pytest.fixture(scope="module")
-def extra_entry_points():
-    """Extra entry points to load the mock_module features."""
-    __import__("ipdb").set_trace()
-    return {
-        "invenio_celery.tasks": [
-            "mock_module = mock_module.tasks",
-        ],
-    }
-
-
 #
 # Users and identities
 #
@@ -93,7 +96,7 @@ def user(UserFixture, app, db):
 def jobs(db, anon_identity):
     """Job fixtures."""
     common_data = {
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "default_queue": "low",
         "default_args": {
             "arg1": "value1",
diff --git a/tests/mock_module/__init__.py b/tests/mock_module/__init__.py
new file mode 100644
index 0000000..9e131ee
--- /dev/null
+++ b/tests/mock_module/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2024 CERN.
+#
+# Invenio-Jobs is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Mock module."""
diff --git a/tests/mock_module/jobs.py b/tests/mock_module/jobs.py
new file mode 100644
index 0000000..93cbbdb
--- /dev/null
+++ b/tests/mock_module/jobs.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2024 CERN.
+#
+# Invenio-Jobs is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Mock module jobs."""
+
+from invenio_jobs.jobs import RegisteredTask
+
+from .tasks import mock_task
+
+mock_job = RegisteredTask.factory(
+    arguments_schema=None,
+    job_cls_name="MockJob",
+    id_="update_expired_embargos",
+    task=mock_task,
+    description="Updates expired embargos",
+    title="Update expired embargoes",
+)
diff --git a/tests/resources/test_resources.py b/tests/resources/test_resources.py
index 4ef1f66..cb4ecbf 100644
--- a/tests/resources/test_resources.py
+++ b/tests/resources/test_resources.py
@@ -6,9 +6,11 @@
 # under the terms of the MIT License; see LICENSE file for more details.
 
 """Resource tests."""
-
+from copy import deepcopy
 from unittest.mock import patch
 
+import pytest
+
 from invenio_jobs.tasks import execute_run
 
 
@@ -18,15 +20,10 @@ def test_simple_flow(mock_apply_async, app, db, client, user):
     client = user.login(client)
     job_paylod = {
         "title": "Test job",
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "description": "Test description",
         "active": False,
         "default_queue": "low",
-        "default_args": {
-            "arg1": "value1",
-            "arg2": "value2",
-            "kwarg1": "value3",
-        },
         "schedule": {"type": "interval", "hours": 4},
     }
 
@@ -39,20 +36,16 @@ def test_simple_flow(mock_apply_async, app, db, client, user):
         "title": "Test job",
         "description": "Test description",
         "active": False,
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "default_queue": "low",
-        "default_args": {
-            "arg1": "value1",
-            "arg2": "value2",
-            "kwarg1": "value3",
-        },
+        "default_args": "{}",
         "schedule": {"type": "interval", "hours": 4},
-        "last_run": None,
         "created": res.json["created"],
         "updated": res.json["updated"],
         "links": {
             "self": f"https://127.0.0.1:5000/api/jobs/{job_id}",
             "runs": f"https://127.0.0.1:5000/api/jobs/{job_id}/runs",
+            "self_admin_html": f"https://127.0.0.1:5000/administration/jobs/{job_id}",
         },
     }
 
@@ -65,11 +58,27 @@ def test_simple_flow(mock_apply_async, app, db, client, user):
     expected_job["updated"] = res.json["updated"]
     assert res.json == expected_job
 
+    list_repr = deepcopy(expected_job)
+    list_repr.update(
+        {
+            "last_run": {"queue": "celery", "title": "Manual run"},
+            "last_runs": {
+                "cancelled": {},
+                "cancelling": {},
+                "failed": {},
+                "queued": {},
+                "running": {},
+                "success": {},
+                "warning": {},
+            },
+        }
+    )
+
     # List jobs
     res = client.get("/jobs")
     assert res.status_code == 200
     assert res.json["hits"]["total"] == 1
-    assert res.json["hits"]["hits"][0] == expected_job
+    assert res.json["hits"]["hits"][0] == list_repr
 
     # Get job
     res = client.get(f"/jobs/{job_id}")
@@ -81,11 +90,7 @@ def test_simple_flow(mock_apply_async, app, db, client, user):
         f"/jobs/{job_id}/runs",
         json={
             "title": "Manually triggered run",
-            "args": {
-                "arg1": "manual_value1",
-                "arg2": "manual_value2",
-                "kwarg2": "manual_value3",
-            },
+            "args": {},
             "queue": "celery",
         },
     )
@@ -111,11 +116,7 @@ def test_simple_flow(mock_apply_async, app, db, client, user):
         "status": "QUEUED",
         "message": None,
         "title": "Manually triggered run",
-        "args": {
-            "arg1": "manual_value1",
-            "arg2": "manual_value2",
-            "kwarg2": "manual_value3",
-        },
+        "args": {"args": {}, "type": "custom"},
         "queue": "celery",
         "created": res.json["created"],
         "updated": res.json["updated"],
@@ -130,16 +131,19 @@ def test_simple_flow(mock_apply_async, app, db, client, user):
     expected_run["task_id"] = res.json["task_id"]
     assert res.json == expected_run
 
+    list_expected_run = deepcopy(expected_run)
+    list_expected_run.pop("started_by")
+    list_expected_run["args"] = {"args": {"args": {}}, "type": "custom"}
     # List runs
     res = client.get(f"/jobs/{job_id}/runs")
     assert res.status_code == 200
     assert res.json["hits"]["total"] == 1
-    assert res.json["hits"]["hits"][0] == expected_run
+    assert res.json["hits"]["hits"][0] == list_expected_run
 
     # Get run
     res = client.get(f"/jobs/{job_id}/runs/{run_id}")
     assert res.status_code == 200
-    assert res.json == expected_run
+    assert res.json == list_expected_run
 
     # Stop run
     res = client.post(f"/jobs/{job_id}/runs/{run_id}/actions/stop")
@@ -147,10 +151,11 @@ def test_simple_flow(mock_apply_async, app, db, client, user):
     assert res.json["status"] == "CANCELLING"
 
 
+@pytest.mark.skip("Tasks search not needed.")
 def test_tasks_search(client):
     """Test tasks search."""
     mock_task_res = {
-        "name": "tasks.mock_task",
+        "name": "update_expired_embargos",
         "description": "Mock task description.",
         "links": {},
         "parameters": {
@@ -202,7 +207,7 @@ def test_jobs_create(db, client):
         "/jobs",
         json={
             "title": "Test minimal job",
-            "task": "tasks.mock_task",
+            "task": "update_expired_embargos",
         },
     )
     assert res.status_code == 201
@@ -211,16 +216,16 @@ def test_jobs_create(db, client):
         "title": "Test minimal job",
         "description": None,
         "active": True,
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "default_queue": "celery",
-        "default_args": {},
+        "default_args": "{}",
         "schedule": None,
-        "last_run": None,
         "created": res.json["created"],
         "updated": res.json["updated"],
         "links": {
             "runs": f"https://127.0.0.1:5000/api/jobs/{res.json['id']}/runs",
             "self": f"https://127.0.0.1:5000/api/jobs/{res.json['id']}",
+            "self_admin_html": f"https://127.0.0.1:5000/administration/jobs/{res.json['id']}",
         },
     }
 
@@ -229,15 +234,11 @@ def test_jobs_create(db, client):
         "/jobs",
         json={
             "title": "Test full job",
-            "task": "tasks.mock_task",
+            "task": "update_expired_embargos",
             "description": "Test description",
             "active": False,
             "default_queue": "low",
-            "default_args": {
-                "arg1": "value1",
-                "arg2": "value2",
-                "kwarg1": "value3",
-            },
+            "default_args": "{}",
             "schedule": {"type": "interval", "hours": 4},
         },
     )
@@ -247,20 +248,16 @@ def test_jobs_create(db, client):
         "title": "Test full job",
         "description": "Test description",
         "active": False,
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "default_queue": "low",
-        "default_args": {
-            "arg1": "value1",
-            "arg2": "value2",
-            "kwarg1": "value3",
-        },
+        "default_args": "{}",
         "schedule": {"type": "interval", "hours": 4},
-        "last_run": None,
         "created": res.json["created"],
         "updated": res.json["updated"],
         "links": {
             "runs": f"https://127.0.0.1:5000/api/jobs/{res.json['id']}/runs",
             "self": f"https://127.0.0.1:5000/api/jobs/{res.json['id']}",
+            "self_admin_html": f"https://127.0.0.1:5000/administration/jobs/{res.json['id']}",
         },
     }
 
@@ -272,16 +269,12 @@ def test_jobs_update(db, client, jobs):
         f"/jobs/{jobs.simple.id}",
         json={
             "title": "Test updated job",
-            "task": "tasks.mock_task",
+            "task": "update_expired_embargos",
             "description": "Test updated description",
             "schedule": {"type": "interval", "hours": 2},
             "active": False,
             "default_queue": "celery",
-            "default_args": {
-                "arg1": "new_value1",
-                "arg2": "new_value2",
-                "kwarg2": False,
-            },
+            "default_args": "{}",
         },
     )
     assert res.status_code == 200
@@ -290,20 +283,16 @@ def test_jobs_update(db, client, jobs):
         "title": "Test updated job",
         "description": "Test updated description",
         "active": False,
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "default_queue": "celery",
-        "default_args": {
-            "arg1": "new_value1",
-            "arg2": "new_value2",
-            "kwarg2": False,
-        },
+        "default_args": "{}",
         "schedule": {"type": "interval", "hours": 2},
-        "last_run": None,
         "created": jobs.simple["created"],
         "updated": res.json["updated"],
         "links": {
             "runs": f"https://127.0.0.1:5000/api/jobs/{jobs.simple.id}/runs",
             "self": f"https://127.0.0.1:5000/api/jobs/{jobs.simple.id}",
+            "self_admin_html": f"https://127.0.0.1:5000/administration/jobs/{res.json['id']}",
         },
     }
     assert res.json == updated_job
@@ -328,23 +317,29 @@ def test_jobs_search(client, jobs):
         "title": "Test interval job",
         "description": None,
         "active": True,
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "default_queue": "low",
-        "default_args": {
-            "arg1": "value1",
-            "arg2": "value2",
-            "kwarg1": "value3",
-        },
+        "default_args": "{}",
         "schedule": {
             "type": "interval",
             "hours": 4,
         },
-        "last_run": None,
+        "last_run": {"queue": "celery", "title": "Manual run"},
+        "last_runs": {
+            "cancelled": {},
+            "cancelling": {},
+            "failed": {},
+            "queued": {},
+            "running": {},
+            "success": {},
+            "warning": {},
+        },
         "created": jobs.interval["created"],
         "updated": jobs.interval["updated"],
         "links": {
             "runs": f"https://127.0.0.1:5000/api/jobs/{jobs.interval.id}/runs",
             "self": f"https://127.0.0.1:5000/api/jobs/{jobs.interval.id}",
+            "self_admin_html": f"https://127.0.0.1:5000/administration/jobs/{jobs.interval.id}",
         },
     }
 
@@ -354,13 +349,9 @@ def test_jobs_search(client, jobs):
         "title": "Test crontab job",
         "description": None,
         "active": True,
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "default_queue": "low",
-        "default_args": {
-            "arg1": "value1",
-            "arg2": "value2",
-            "kwarg1": "value3",
-        },
+        "default_args": "{}",
         "schedule": {
             "type": "crontab",
             "minute": "0",
@@ -369,12 +360,22 @@ def test_jobs_search(client, jobs):
             "day_of_month": "*",
             "month_of_year": "*",
         },
-        "last_run": None,
+        "last_run": {"queue": "celery", "title": "Manual run"},
+        "last_runs": {
+            "cancelled": {},
+            "cancelling": {},
+            "failed": {},
+            "queued": {},
+            "running": {},
+            "success": {},
+            "warning": {},
+        },
         "created": jobs.crontab["created"],
         "updated": jobs.crontab["updated"],
         "links": {
             "runs": f"https://127.0.0.1:5000/api/jobs/{jobs.crontab.id}/runs",
             "self": f"https://127.0.0.1:5000/api/jobs/{jobs.crontab.id}",
+            "self_admin_html": f"https://127.0.0.1:5000/administration/jobs/{jobs.crontab.id}",
         },
     }
 
@@ -384,20 +385,26 @@ def test_jobs_search(client, jobs):
         "title": "Test unscheduled job",
         "description": None,
         "active": True,
-        "task": "tasks.mock_task",
+        "task": "update_expired_embargos",
         "default_queue": "low",
-        "default_args": {
-            "arg1": "value1",
-            "arg2": "value2",
-            "kwarg1": "value3",
-        },
+        "default_args": "{}",
         "schedule": None,
-        "last_run": None,
+        "last_run": {"queue": "celery", "title": "Manual run"},
+        "last_runs": {
+            "cancelled": {},
+            "cancelling": {},
+            "failed": {},
+            "queued": {},
+            "running": {},
+            "success": {},
+            "warning": {},
+        },
         "created": jobs.simple["created"],
         "updated": jobs.simple["updated"],
         "links": {
             "runs": f"https://127.0.0.1:5000/api/jobs/{jobs.simple.id}/runs",
             "self": f"https://127.0.0.1:5000/api/jobs/{jobs.simple.id}",
+            "self_admin_html": f"https://127.0.0.1:5000/administration/jobs/{jobs.simple.id}",
         },
     }
 
@@ -430,6 +437,7 @@ def test_jobs_delete(db, client, jobs):
     assert all(j["id"] != jobs.simple.id for j in hits)
 
 
+@pytest.mark.skip()
 @patch.object(execute_run, "apply_async")
 def test_job_template_args(mock_apply_async, app, db, client, user):
     client = user.login(client)
diff --git a/tests/test_alembic.py b/tests/test_alembic.py
index e4aaad9..0a9e66e 100644
--- a/tests/test_alembic.py
+++ b/tests/test_alembic.py
@@ -22,8 +22,8 @@ def test_alembic(base_app, database):
 
     # Check that this package's SQLAlchemy models have been properly registered
     tables = [x.name for x in db.get_tables_for_bind()]
-    assert "run" in tables
-    assert "job" in tables
+    assert "jobs_run" in tables
+    assert "jobs_job" in tables
 
     # Check that Alembic agrees that there's no further tables to create.
     assert len(ext.alembic.compare_metadata()) == 0
@@ -36,7 +36,7 @@ def test_alembic(base_app, database):
 
     # Try to upgrade and downgrade
     ext.alembic.stamp()
-    ext.alembic.downgrade(target="356496a01197")
+    ext.alembic.downgrade(target="1f896f6990b8")
     ext.alembic.upgrade()
     assert len(ext.alembic.compare_metadata()) == 0