nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/extras/tables.py

@@ -3,16 +3,13 @@ from textwrap import dedent
 
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import QuerySet
 from django.utils.html import format_html, format_html_join
 import django_tables2 as tables
-from django_tables2.data import TableData
-from django_tables2.rows import BoundRows
 from django_tables2.utils import Accessor
 from jsonschema.exceptions import ValidationError as JSONSchemaValidationError
 
-from nautobot.core.models.querysets import count_related
 from nautobot.core.tables import (
+    ApprovalButtonsColumn,
     BaseTable,
     BooleanColumn,
     ButtonsColumn,
@@ -24,11 +21,16 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
-from nautobot.core.templatetags.helpers import render_boolean, render_json, render_markdown
+from nautobot.core.templatetags.helpers import HTML_NONE, render_boolean, render_json, render_markdown
 from nautobot.tenancy.tables import TenantColumn
 
-from .choices import LogLevelChoices, MetadataTypeDataTypeChoices
+from .choices import JobResultStatusChoices, MetadataTypeDataTypeChoices
 from .models import (
+    ApprovalWorkflow,
+    ApprovalWorkflowDefinition,
+    ApprovalWorkflowStage,
+    ApprovalWorkflowStageDefinition,
+    ApprovalWorkflowStageResponse,
     ComputedField,
     ConfigContext,
     ConfigContextSchema,
@@ -73,6 +75,14 @@ from .registry import registry
 
 logger = logging.getLogger(__name__)
 
+APPROVAL_WORKFLOW_OBJECT = """
+{% if record.object_under_review and record.object_under_review.get_absolute_url %}
+    <a href="{{ record.object_under_review.get_absolute_url }}">{{ record.object_under_review }}</a>
+{% else %}
+    {{ record.object_under_review }}
+{% endif %}
+"""
+
 ASSIGNED_OBJECT = """
 {% load helpers %}
 {{ record.assigned_object|hyperlinked_object }}
@@ -110,14 +120,23 @@ GITREPOSITORY_PROVIDES = """
 <span class="text-nowrap">
 {% for entry in datasource_contents %}
 <span style="display: inline-block" title="{{ entry.name|title }}"
-class="label label-{% if entry.content_identifier in record.provided_contents %}success{% else %}default{% endif %}">
+class="badge bg-{% if entry.content_identifier in record.provided_contents %}success{% else %}secondary{% endif %}">
 <i class="mdi {{ entry.icon }}"></i></span>
 {% endfor %}
 </span>
 """
 
 GITREPOSITORY_BUTTONS = """
-<button data-url="{% url 'extras:gitrepository_sync' pk=record.pk %}" type="submit" class="btn btn-primary btn-xs sync-repository" title="Sync" {% if not perms.extras.change_gitrepository %}disabled="disabled"{% endif %}><i class="mdi mdi-source-branch-sync" aria-hidden="true"></i></button>
+<li>
+    <button
+        data-url="{% url 'extras:gitrepository_sync' pk=record.pk %}"
+        type="submit"
+        class="dropdown-item sync-repository{% if perms.extras.change_gitrepository %} text-primary"{% else %}" disabled{% endif %}
+    >
+        <span class="mdi mdi-source-branch-sync" aria-hidden="true"></span>
+        Sync
+    </button>
+</li>
 """
 
 IMAGEATTACHMENT_NAME = """
@@ -128,33 +147,40 @@ IMAGEATTACHMENT_NAME = """
 IMAGEATTACHMENT_SIZE = """{{ value|filesizeformat }}"""
 
 JOB_BUTTONS = """
-<a href="{% url 'extras:job' pk=record.pk %}" class="btn btn-default btn-xs" title="Details"><i class="mdi mdi-information-outline" aria-hidden="true"></i></a>
-<a href="{% url 'extras:jobresult_list' %}?job_model={{ record.name | urlencode }}" class="btn btn-default btn-xs" title="Job Results"><i class="mdi mdi-format-list-bulleted" aria-hidden="true"></i></a>
+<li><a href="{% url 'extras:job' pk=record.pk %}" class="dropdown-item"><span class="mdi mdi-information-outline" aria-hidden="true"></span>Details</a>
+<li><a href="{% url 'extras:jobresult_list' %}?job_model={{ record.name | urlencode }}" class="dropdown-item"><span class="mdi mdi-format-list-bulleted" aria-hidden="true"></span>Job Results</a>
 """
 
 JOB_RESULT_BUTTONS = """
 {% load helpers %}
 {% if perms.extras.run_job %}
     {% if record.job_model and record.task_kwargs %}
-        <a href="{% url 'extras:job_run' pk=record.job_model.pk %}?kwargs_from_job_result={{ record.pk }}"
-           class="btn btn-xs btn-success" title="Re-run job with same arguments.">
-            <i class="mdi mdi-repeat"></i>
-        </a>
+        <li>
+            <a href="{% url 'extras:job_run' pk=record.job_model.pk %}?kwargs_from_job_result={{ record.pk }}" class="dropdown-item text-success">
+                <span class="mdi mdi-repeat" aria-hidden="true"></span>
+                Re-run job with same arguments
+            </a>
+        </li>
     {% elif record.job_model is not None %}
-        <a href="{% url 'extras:job_run' pk=record.job_model.pk %}" class="btn btn-primary btn-xs"
-           title="Run job">
-            <i class="mdi mdi-play"></i>
-        </a>
+        <li>
+            <a href="{% url 'extras:job_run' pk=record.job_model.pk %}" class="dropdown-item text-primary">
+                <span class="mdi mdi-play" aria-hidden="true"></span>
+                Run job
+            </a>
+        </li>
     {% else %}
-        <a href="#" class="btn btn-xs btn-default disabled" title="Job is not available, cannot be re-run">
-            <i class="mdi mdi-repeat-off"></i>
-        </a>
+        <li>
+            <a class="dropdown-item disabled" aria-disabled="true">
+                <span class="mdi mdi-repeat-off" aria-hidden="true"></span>
+                Job is not available, cannot be re-run
+            </a>
+        </li>
     {% endif %}
 {% endif %}
 """
 
 SCHEDULED_JOB_BUTTONS = """
-<a href="{% url 'extras:jobresult_list' %}?scheduled_job={{ record.name | urlencode }}" class="btn btn-default btn-xs" title="Job Results"><i class="mdi mdi-format-list-bulleted" aria-hidden="true"></i></a>
+<li><a href="{% url 'extras:jobresult_list' %}?scheduled_job={{ record.name | urlencode }}" class="dropdown-item"><span class="mdi mdi-format-list-bulleted" aria-hidden="true"></span>Job Results</a></li>
 """
 
 OBJECTCHANGE_OBJECT = """
@@ -186,26 +212,335 @@ WEBHOOK_CONTENT_TYPES = """
 """
 
 SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS = """
-<button type="button"
-        onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_dry_run')"
-        title="Dry Run"
-        class="btn btn-primary btn-xs"{% if not perms.extras.run_job or not record.job_model.supports_dryrun %} disabled="disabled"{% endif %}>
-    <i class="mdi mdi-play"></i>
-</button>
-<button type="button"
-        onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_approve')"
-        title="Approve"
-        class="btn btn-success btn-xs"{% if not perms.extras.run_job %} disabled="disabled"{% endif %}>
-    <i class="mdi mdi-check"></i>
-</button>
-<button type="button"
-        onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_deny')"
-        title="Deny"
-        class="btn btn-danger btn-xs"{% if not perms.extras.run_job %} disabled="disabled"{% endif %}>
-    <i class="mdi mdi-close"></i>
-</button>
+<div class="dropdown">
+    <button class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+        <span class="mdi mdi-dots-vertical" aria-hidden="true"></span>
+        <span class="visually-hidden">Toggle Dropdown</span>
+    </button>
+    <ul class="dropdown-menu dropdown-menu-end">
+        <li>
+            <button
+                type="button"
+                onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_dry_run')"
+                class="dropdown-item{% if perms.extras.run_job and record.job_model.supports_dryrun %} text-primary"{% else %}" disabled{% endif %}
+            >
+                <span class="mdi mdi-play" aria-hidden="true"></span>
+                Dry Run
+            </button>
+        </li>
+        <li>
+            <button
+                type="button"
+                onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_approve')"
+                class="dropdown-item{% if perms.extras.run_job %} text-success"{% else %}" disabled{% endif %}
+            >
+                <span class="mdi mdi-check" aria-hidden="true"></span>
+                Approve
+            </button>
+        </li>
+        <li>
+            <button
+                type="button"
+                onClick="handleDetailPostAction('{% url 'extras:scheduledjob_approval_request_view' pk=record.pk %}', '_deny')"
+                class="dropdown-item{% if perms.extras.run_job %} text-danger"{% else %}" disabled{% endif %}
+            >
+                <span class="mdi mdi-close" aria-hidden="true"></span>
+                Deny
+            </button>
+        </li>
+    </ul>
+</div>
 """
 
+#
+# Approval Workflow
+#
+
+
+class ApprovalWorkflowDefinitionTable(BaseTable):
+    """Table for ApprovalWorkflowDefinitionTable list view."""
+
+    pk = ToggleColumn()
+    name = tables.Column(linkify=True)
+    actions = ButtonsColumn(ApprovalWorkflowDefinition)
+
+    class Meta(BaseTable.Meta):
+        """Meta attributes."""
+
+        model = ApprovalWorkflowDefinition
+        fields = (
+            "pk",
+            "name",
+            "model_content_type",
+        )
+        default_columns = (
+            "pk",
+            "name",
+            "model_content_type",
+            "actions",
+        )
+
+
+class ApprovalWorkflowStageDefinitionTable(BaseTable):
+    """Table for ApprovalWorkflowStageDefinition list view."""
+
+    pk = ToggleColumn()
+    approval_workflow_definition = tables.Column(linkify=True)
+    name = tables.Column(linkify=True)
+    actions = ButtonsColumn(ApprovalWorkflowStageDefinition)
+
+    class Meta(BaseTable.Meta):
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStageDefinition
+        fields = (
+            "pk",
+            "approval_workflow_definition",
+            "sequence",
+            "name",
+            "min_approvers",
+            "denial_message",
+            "approver_group",
+        )
+        default_columns = (
+            "pk",
+            "approval_workflow_definition",
+            "sequence",
+            "name",
+            "min_approvers",
+            "denial_message",
+            "approver_group",
+            "actions",
+        )
+
+
+class ApprovalWorkflowTable(BaseTable):
+    """Table for ApprovalWorkflow list view."""
+
+    pk = ToggleColumn()
+    approval_workflow_definition = tables.Column(linkify=True)
+    object_under_review_content_type = tables.Column(verbose_name="Object Type Under Review")
+    object_under_review = tables.TemplateColumn(
+        template_code=APPROVAL_WORKFLOW_OBJECT, verbose_name="Object Under Review"
+    )
+    user = tables.TemplateColumn(
+        template_code="{% if record.user %}{{record.user}}{% else %}{{ record.user_name }}{% endif %}",
+        verbose_name="User",
+    )
+    current_state = ChoiceFieldColumn()
+    actions = ApprovalButtonsColumn(ApprovalWorkflow, buttons=("detail", "changelog"))
+
+    class Meta(BaseTable.Meta):
+        """Meta attributes."""
+
+        model = ApprovalWorkflow
+        fields = (
+            "pk",
+            "approval_workflow_definition",
+            "object_under_review_content_type",
+            "object_under_review",
+            "current_state",
+            "user",
+        )
+        default_columns = (
+            "pk",
+            "approval_workflow_definition",
+            "object_under_review_content_type",
+            "object_under_review",
+            "current_state",
+            "user",
+            "actions",
+        )
+
+
+class ApprovalChoiceFieldColumn(ChoiceFieldColumn):
+    """
+    Render a ChoiceField value just like ChoiceFieldColumn, but only if the record should be rendered.
+    Otherwise, render a muted dash.
+    """
+
+    def render(self, *, record, bound_column, value):  # pylint: disable=arguments-differ  # tables2 varies its kwargs
+        if record.should_render_state:
+            return super().render(record=record, bound_column=bound_column, value=value)
+        return HTML_NONE
+
+
+class ApprovalWorkflowStageTable(BaseTable):
+    """Table for ApprovalWorkflowStage list view."""
+
+    pk = ToggleColumn()
+    approval_workflow = tables.Column(linkify=True)
+    approval_workflow_stage_definition = tables.Column(linkify=True)
+    actions_needed = tables.TemplateColumn(
+        template_code="""
+        {% if record.remaining_approvals == 1 %}
+        {{ record.remaining_approvals }} more approval needed
+        {% elif record.remaining_approvals == 0 %}
+        <span class="text-secondary">&mdash;</span>
+        {% else %}
+        {{ record.remaining_approvals }} more approvals needed
+        {% endif %}
+        """,
+        orderable=False,
+        verbose_name="Actions Needed",
+    )
+    state = ApprovalChoiceFieldColumn()
+    actions = ApprovalButtonsColumn(ApprovalWorkflowStage, buttons=("detail", "changelog", "approve", "deny"))
+
+    class Meta(BaseTable.Meta):
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStage
+        fields = (
+            "pk",
+            "approval_workflow",
+            "approval_workflow_stage_definition",
+            "actions_needed",
+            "state",
+            "decision_date",
+        )
+        default_columns = (
+            "pk",
+            "approval_workflow",
+            "approval_workflow_stage_definition",
+            "actions_needed",
+            "state",
+            "decision_date",
+            "actions",
+        )
+
+
+class ApproverDashboardTable(ApprovalWorkflowStageTable):
+    """
+    ApprovalWorkflowStageTable modified for the approver dashboard.
+    """
+
+    pk = ToggleColumn()
+    approval_workflow = tables.TemplateColumn(
+        template_code="<a href={{record.approval_workflow.get_absolute_url}}>{{ record.approval_workflow.approval_workflow_definition.name }}</a>",
+        verbose_name="Workflow",
+    )
+    approval_workflow_stage = tables.TemplateColumn(
+        template_code="<a href={{record.approval_workflow.get_absolute_url}}>{{ record.approval_workflow_stage_definition.name }}</a>",
+        verbose_name="Current Stage",
+    )
+    object_under_review = tables.TemplateColumn(
+        template_code="<a href={{record.approval_workflow.object_under_review.get_absolute_url }}>{{ record.approval_workflow.object_under_review }}</a>"
+    )
+    actions = ApprovalButtonsColumn(ApprovalWorkflowStage, buttons=("approve", "deny"))
+
+    class Meta(BaseTable.Meta):
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStage
+        fields = (
+            "pk",
+            "object_under_review",
+            "approval_workflow",
+            "approval_workflow_stage",
+            "actions_needed",
+            "state",
+            "decision_date",
+        )
+        default_columns = (
+            "pk",
+            "approval_workflow_stage",
+            "approval_workflow",
+            "object_under_review",
+            "actions_needed",
+            "state",
+            "actions",
+        )
+
+
+class RelatedApprovalWorkflowStageTable(ApprovalWorkflowStageTable):
+    """
+    ApprovalWorkflowStageTable used in the detail view of ApprovalWorkflow detail view.
+    """
+
+    approval_workflow_stage = tables.TemplateColumn(
+        template_code="<a href={{record.get_absolute_url}}>{{ record.approval_workflow_stage_definition.name }}</a>",
+        verbose_name="Stage",
+    )
+    actions = ApprovalButtonsColumn(ApprovalWorkflowStage, buttons=("approve", "deny"))
+
+    class Meta(BaseTable.Meta):
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStage
+        fields = (
+            "pk",
+            "approval_workflow",
+            "approval_workflow_stage",
+            "actions_needed",
+            "state",
+            "decision_date",
+        )
+        default_columns = (
+            "pk",
+            "approval_workflow",
+            "approval_workflow_stage",
+            "actions_needed",
+            "state",
+            "decision_date",
+            "actions",
+        )
+
+
+class ApprovalWorkflowStageResponseTable(BaseTable):
+    """Table for ApprovalWorkflowStageResponse list view."""
+
+    pk = ToggleColumn()
+    state = ChoiceFieldColumn()
+
+    class Meta(BaseTable.Meta):
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStageResponse
+        fields = (
+            "pk",
+            "approval_workflow_stage",
+            "user",
+            "comments",
+            "state",
+        )
+        default_columns = (
+            "pk",
+            "approval_workflow_stage",
+            "user",
+            "comments",
+            "state",
+        )
+
+
+class RelatedApprovalWorkflowStageResponseTable(ApprovalWorkflowStageResponseTable):
+    """Table for ApprovalWorkflowStageResponse list view."""
+
+    approval_workflow_stage = tables.TemplateColumn(
+        template_code="<a href={{record.approval_workflow_stage.get_absolute_url}}>{{ record.approval_workflow_stage.approval_workflow_stage_definition.name }}</a>",
+        verbose_name="Stage",
+    )
+
+    class Meta(BaseTable.Meta):
+        """Meta attributes."""
+
+        model = ApprovalWorkflowStageResponse
+        fields = (
+            "pk",
+            "approval_workflow_stage",
+            "user",
+            "comments",
+            "state",
+        )
+        default_columns = (
+            "pk",
+            "approval_workflow_stage",
+            "user",
+            "comments",
+            "state",
+            "actions",
+        )
+
 
 class ComputedFieldTable(BaseTable):
     pk = ToggleColumn()
@@ -633,10 +968,11 @@ class GitRepositoryTable(BaseTable):
 
     class JobResultColumn(tables.TemplateColumn):
         def render(self, record, table, value, bound_column, **kwargs):
-            if str(record.pk) in table.context.get("job_results", {}):
-                table.context.update({"result": table.context["job_results"][str(record.pk)]})
-            else:
-                table.context.update({"result": None})
+            if hasattr(table, "context"):
+                if str(record.pk) in table.context.get("job_results", {}):
+                    table.context.update({"result": table.context["job_results"][str(record.pk)]})
+                else:
+                    table.context.update({"result": None})
             return super().render(record, table, value, bound_column, **kwargs)
 
     last_sync_status = JobResultColumn(template_name="extras/inc/job_label.html", verbose_name="Sync Status")
@@ -669,14 +1005,16 @@ class GitRepositoryTable(BaseTable):
         )
 
     def render_last_sync_time(self, record):
-        if record.name in self.context["job_results"]:  # pylint: disable=no-member
-            return self.context["job_results"][record.name].date_done  # pylint: disable=no-member
+        if hasattr(self, "context"):
+            if record.name in self.context.get("job_results", {}):
+                return self.context["job_results"][record.name].date_done
         return self.default
 
     def render_last_sync_user(self, record):
-        if record.name in self.context["job_results"]:  # pylint: disable=no-member
-            user = self.context["job_results"][record.name].user  # pylint: disable=no-member
-            return user
+        if hasattr(self, "context"):
+            if record.name in self.context.get("job_results", {}):
+                user = self.context["job_results"][record.name].user
+                return user
         return self.default
 
 
@@ -729,8 +1067,8 @@ def log_object_link(value, record):
 
 def log_entry_color_css(record):
     if record.log_level.lower() in ("failure", "error", "critical"):
-        return "danger"
-    return record.log_level.lower()
+        return "table-danger"
+    return "table-" + record.log_level.lower()
 
 
 class JobTable(BaseTable):
@@ -748,7 +1086,6 @@ class JobTable(BaseTable):
     dryrun_default = BooleanColumn()
     hidden = BooleanColumn()
     read_only = BooleanColumn()
-    approval_required = BooleanColumn()
     is_job_hook_receiver = BooleanColumn()
     is_job_button_receiver = BooleanColumn()
     supports_dryrun = BooleanColumn()
@@ -764,7 +1101,7 @@ class JobTable(BaseTable):
             {% if value %}
                 {{ value.date_created|date:SHORT_DATETIME_FORMAT }} by {{ value.user }}
             {% else %}
-                <span class="text-muted">Never</span>
+                <span class="text-secondary">Never</span>
             {% endif %}
         """,
         extra_context={"SHORT_DATETIME_FORMAT": settings.SHORT_DATETIME_FORMAT},
@@ -801,7 +1138,6 @@ class JobTable(BaseTable):
             "read_only",
             "is_job_hook_receiver",
             "is_job_button_receiver",
-            "approval_required",
             "supports_dryrun",
             "soft_time_limit",
             "time_limit",
@@ -859,18 +1195,18 @@ class JobLogEntryTable(BaseTable):
     )
     log_object = tables.Column(verbose_name="Object", linkify=log_object_link)
     message = tables.Column(
-        attrs={"td": {"class": "rendered-markdown"}},
+        attrs={"td": {"class": "nb-rendered-markdown"}},
     )
 
     def render_log_level(self, value):
         log_level = value.lower()
-        # The css is label-danger for failure items.
+        # The css is bg-danger for failure items.
         if log_level in ["failure", "error", "critical"]:
             log_level = "danger"
         elif log_level == "debug":
-            log_level = "default"
+            log_level = "secondary"
 
-        return format_html('<label class="label label-{}">{}</label>', log_level, value)
+        return format_html('<label class="badge bg-{}">{}</label>', log_level, value)
 
     def render_message(self, value):
         return render_markdown(value)
@@ -883,7 +1219,7 @@ class JobLogEntryTable(BaseTable):
             "class": log_entry_color_css,
         }
         attrs = {
-            "class": "table table-hover table-headings",
+            "class": "table table-hover nb-table-headings",
             "id": "logs",
         }
 
@@ -936,50 +1272,27 @@ class JobResultTable(BaseTable):
     duration = tables.Column(orderable=False)
     actions = ButtonsColumn(JobResult, buttons=("delete",), prepend_template=JOB_RESULT_BUTTONS)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # Only calculate log counts for "summary" column if it's actually visible.
-        if "summary" in self.columns and self.columns["summary"].visible and isinstance(self.data.data, QuerySet):
-            self.data = TableData.from_data(
-                self.data.data.annotate(
-                    debug_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_DEBUG}
-                    ),
-                    success_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_SUCCESS}
-                    ),
-                    info_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_INFO}
-                    ),
-                    warning_log_count=count_related(
-                        JobLogEntry, "job_result", filter_dict={"log_level": LogLevelChoices.LOG_WARNING}
-                    ),
-                    error_log_count=count_related(
-                        JobLogEntry,
-                        "job_result",
-                        filter_dict={
-                            "log_level__in": [
-                                LogLevelChoices.LOG_FAILURE,
-                                LogLevelChoices.LOG_ERROR,
-                                LogLevelChoices.LOG_CRITICAL,
-                            ],
-                        },
-                    ),
-                )
-            )
-            self.data.set_table(self)
-            self.rows = BoundRows(data=self.data, table=self, pinned_data=self.pinned_data)
-
     def render_summary(self, record):
         """
         Define custom rendering for the summary column.
         """
+        # The *_log_count attributes will be calculated and updated at the end of a Job run when JobResult is saved.
+        # If the values are not present due to a running Job or are missing in any field, skip display.
+        if record.status not in JobResultStatusChoices.READY_STATES or None in [
+            record.debug_log_count,
+            record.success_log_count,
+            record.info_log_count,
+            record.warning_log_count,
+            record.error_log_count,
+        ]:
+            return ""
+
         return format_html(
-            """<label class="label label-default">{}</label>
-            <label class="label label-success">{}</label>
-            <label class="label label-info">{}</label>
-            <label class="label label-warning">{}</label>
-            <label class="label label-danger">{}</label>""",
+            """<label class="badge bg-secondary">{}</label>
+            <label class="badge bg-success">{}</label>
+            <label class="badge bg-info">{}</label>
+            <label class="badge bg-warning">{}</label>
+            <label class="badge bg-danger">{}</label>""",
             record.debug_log_count,
             record.success_log_count,
             record.info_log_count,
@@ -1011,6 +1324,7 @@ class JobResultTable(BaseTable):
             "job_model",
             "user",
             "status",
+            "summary",
             "actions",
         )
 
@@ -1201,7 +1515,14 @@ class ScheduledJobApprovalQueueTable(BaseTable):
     interval = tables.Column(verbose_name="Execution Type")
     start_time = tables.Column(verbose_name="Requested")
     user = tables.Column(verbose_name="Requestor")
-    actions = tables.TemplateColumn(SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS)
+    actions = tables.TemplateColumn(
+        SCHEDULED_JOB_APPROVAL_QUEUE_BUTTONS,
+        attrs={
+            "td": {"class": "d-print-none text-end text-nowrap nb-actions nb-w-0"},
+            "tf": {"class": "nb-w-0"},
+            "th": {"class": "nb-actionable nb-w-0"},
+        },
+    )
 
     class Meta(BaseTable.Meta):
         model = ScheduledJob