From e8eea8e0e3fe50da46d3ce168e21e51d66f060b2 Mon Sep 17 00:00:00 2001
From: Rieven <rsnmartis@gmail.com>
Date: Mon, 20 Jan 2025 12:14:57 +0100
Subject: [PATCH] Changes to schedule all reports, even for once  (#3840)

Co-authored-by: Peter-Paul van Gemerden <mail@ppvg.nl>
Co-authored-by: Jan Klopper <janklopper+underdark@gmail.com>
Co-authored-by: JP Bruins Slot <jpbruinsslot@gmail.com>
Co-authored-by: ammar92 <ammar.abdulamir@gmail.com>
---
 octopoes/octopoes/models/ooi/reports.py       |   2 +-
 .../step_3c_setup_scan_ooi_detail.html        |  14 +-
 rocky/onboarding/views.py                     |  74 ++++---
 rocky/reports/forms.py                        |  26 +--
 rocky/reports/runner/report_runner.py         |   8 +-
 rocky/reports/runner/worker.py                |   2 +-
 .../partials/export_report_settings.html      |  73 ++++---
 .../partials/report_names_header.html         |  35 ---
 .../report_overview/report_history_table.html |   8 +-
 .../scheduled_reports_table.html              |  24 ++-
 rocky/reports/views/base.py                   | 203 ++++++------------
 rocky/rocky/locale/django.pot                 | 126 ++++-------
 rocky/rocky/scheduler.py                      |  27 ++-
 rocky/rocky/views/scheduler.py                |  19 +-
 .../test_onboarding_organization_steps.py     |  32 ++-
 .../reports/test_aggregate_report_flow.py     |  15 +-
 .../reports/test_generate_report_flow.py      |  11 +-
 rocky/tests/reports/test_multi_report_flow.py |   8 +-
 18 files changed, 319 insertions(+), 388 deletions(-)
 delete mode 100644 rocky/reports/templates/partials/report_names_header.html

diff --git a/octopoes/octopoes/models/ooi/reports.py b/octopoes/octopoes/models/ooi/reports.py
index 525ad009b57..e13d45f34d8 100644
--- a/octopoes/octopoes/models/ooi/reports.py
+++ b/octopoes/octopoes/models/ooi/reports.py
@@ -61,6 +61,6 @@ class ReportRecipe(OOI):
     parent_report_type: str | None = None
     report_types: list[str]
 
-    cron_expression: str
+    cron_expression: str | None = None
 
     _natural_key_attrs = ["recipe_id"]
diff --git a/rocky/onboarding/templates/step_3c_setup_scan_ooi_detail.html b/rocky/onboarding/templates/step_3c_setup_scan_ooi_detail.html
index 4575db6899d..c0d589d748c 100644
--- a/rocky/onboarding/templates/step_3c_setup_scan_ooi_detail.html
+++ b/rocky/onboarding/templates/step_3c_setup_scan_ooi_detail.html
@@ -63,12 +63,14 @@ <h3>{% translate "Creating an object" %}</h3>
                     </div>
                 </dl>
             </div>
-            <div class="button-container">
-                <a href="{% url "step_report" organization.code %}?{{ request.GET.urlencode }}"
-                   class="button">{% translate "Start scanning" %}</a>
-                <a href="{% url "complete_onboarding" organization.code %}"
-                   class="button ghost">{% translate "Skip onboarding" %}</a>
-            </div>
+            <form method="post" class="inline">
+                {% csrf_token %}
+                <div class="button-container">
+                    <button type="submit">{% translate "Start scanning" %}</button>
+                    <a href="{% url "complete_onboarding" organization.code %}"
+                       class="button ghost">{% translate "Skip onboarding" %}</a>
+                </div>
+            </form>
         </section>
     </main>
 {% endblock content %}
diff --git a/rocky/onboarding/views.py b/rocky/onboarding/views.py
index 783fd0599e2..a08b413612f 100644
--- a/rocky/onboarding/views.py
+++ b/rocky/onboarding/views.py
@@ -18,13 +18,12 @@
 from katalogus.client import Plugin
 from reports.report_types.definitions import ReportPlugins
 from reports.report_types.dns_report.report import DNSReport
-from reports.views.base import get_selection
-from reports.views.generate_report import SaveGenerateReportMixin
+from reports.views.base import BaseReportView, get_selection
 from tools.models import GROUP_ADMIN, GROUP_CLIENT, GROUP_REDTEAM, Organization, OrganizationMember
 from tools.ooi_helpers import get_or_create_ooi
 from tools.view_helpers import Breadcrumb
 
-from octopoes.models import OOI
+from octopoes.models import OOI, Reference
 from octopoes.models.ooi.dns.zone import Hostname
 from octopoes.models.ooi.network import Network
 from octopoes.models.ooi.web import URL
@@ -40,8 +39,10 @@
 )
 from rocky.exceptions import RockyError
 from rocky.messaging import clearance_level_warning_dns_report
+from rocky.scheduler import scheduler_client
 from rocky.views.indemnification_add import IndemnificationAddView
 from rocky.views.ooi_view import SingleOOIMixin, SingleOOITreeMixin
+from rocky.views.scheduler import SchedulerView
 
 User = get_user_model()
 
@@ -310,9 +311,11 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
 
 class OnboardingSetupScanOOIDetailView(
     OrganizationPermissionRequiredMixin,
-    SingleOOITreeMixin,
     IntroductionStepsMixin,
     OnboardingBreadcrumbsMixin,
+    SingleOOIMixin,
+    BaseReportView,
+    SchedulerView,
     TemplateView,
 ):
     """
@@ -322,6 +325,34 @@ class OnboardingSetupScanOOIDetailView(
     template_name = "step_3c_setup_scan_ooi_detail.html"
     current_step = 3
     permission_required = "tools.can_scan_organization"
+    task_type = "report"
+
+    @staticmethod
+    def is_scheduler_enabled(organization: Organization) -> bool:
+        scheduler_id = f"report-{organization.code}"
+        return scheduler_client(organization.code).is_scheduler_ready(scheduler_id)
+
+    def post(self, request, *args, **kwargs):
+        parent_report_name_format, subreport_name_format = self.get_initial_report_names()
+        parent_report_type = self.get_parent_report_type()
+        report_recipe = self.create_report_recipe(
+            parent_report_name_format, subreport_name_format, parent_report_type, None
+        )
+        if self.is_scheduler_enabled(self.organization):
+            self.create_report_schedule(report_recipe, datetime.now(timezone.utc))
+
+        return redirect(
+            reverse("step_report", kwargs={"organization_code": self.organization.code})
+            + get_selection(self.request, {"recipe_id": report_recipe.primary_key})
+        )
+
+    def get_ooi_pks(self) -> list[str]:
+        ooi = self.get_ooi(self.request.GET.get("ooi", ""))
+        hostname_ooi = [Hostname(name=ooi.web_url.tokenized["netloc"]["name"], network=ooi.network)]
+        return [hostname_ooi[0].primary_key]
+
+    def get_report_type_ids(self) -> list[str]:
+        return [self.request.GET.get("report_type", "")]
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -330,7 +361,7 @@ def get_context_data(self, **kwargs):
 
 
 class OnboardingReportView(
-    OrganizationPermissionRequiredMixin, SaveGenerateReportMixin, IntroductionStepsMixin, SingleOOIMixin, TemplateView
+    OrganizationPermissionRequiredMixin, IntroductionStepsMixin, SingleOOIMixin, BaseReportView, TemplateView
 ):
     """
     10. The user already started the scan and is now waiting till scans are finished to generate the report.
@@ -341,32 +372,25 @@ class OnboardingReportView(
     current_step = 4
     permission_required = "tools.can_scan_organization"
 
-    def setup(self, request, *args, **kwargs):
-        super().setup(request, *args, **kwargs)
-        self.selected_oois = self.get_ooi_pks()
-        self.selected_report_types = self.get_report_type_ids()
-
-    def get_ooi_pks(self) -> list[str]:
-        ooi = self.get_ooi(self.request.GET.get("ooi", ""))
-        hostname_ooi = [Hostname(name=ooi.web_url.tokenized["netloc"]["name"], network=ooi.network)]
-        return [hostname_ooi[0].primary_key]
-
-    def get_report_type_ids(self) -> list[str]:
-        return [self.request.GET.get("report_type", "")]
-
     def post(self, request, *args, **kwargs):
         self.set_member_onboarded()
 
-        report_ooi = self.save_report([("Onboarding Report", "Onboarding Report")])
+        recipe_id = request.GET.get("recipe_id", "")
 
-        if report_ooi:
-            return redirect(
-                reverse("view_report", kwargs={"organization_code": self.organization.code})
-                + "?"
-                + urlencode({"report_id": report_ooi.reference})
+        if recipe_id:
+            reports = self.octopoes_api_connector.query(
+                "ReportRecipe.<report_recipe[is Report]",
+                valid_time=datetime.now(timezone.utc),
+                source=Reference.from_str(recipe_id),
             )
 
-        return self.get(request, *args, **kwargs)
+            if reports:
+                return redirect(
+                    reverse("view_report", kwargs={"organization_code": self.organization.code})
+                    + "?"
+                    + urlencode({"report_id": reports[0].reference})
+                )
+        return redirect(reverse("scheduled_reports", kwargs={"organization_code": self.organization.code}))
 
     def set_member_onboarded(self):
         member = OrganizationMember.objects.get(user=self.request.user, organization=self.organization)
diff --git a/rocky/reports/forms.py b/rocky/reports/forms.py
index 7ee01c1ee1d..5aeac1b0eae 100644
--- a/rocky/reports/forms.py
+++ b/rocky/reports/forms.py
@@ -60,7 +60,7 @@ class ReportScheduleStartDateForm(BaseRockyForm):
 
     start_time = forms.TimeField(
         label=_("Start time (UTC)"),
-        widget=forms.TimeInput(format="%H:%M", attrs={"form": "generate_report"}),
+        widget=forms.TimeInput(format="%H:%M", attrs={"type": "time"}),
         initial=lambda: datetime.now(tz=timezone.utc).time(),
         required=True,
         input_formats=["%H:%M"],
@@ -70,7 +70,13 @@ class ReportScheduleStartDateForm(BaseRockyForm):
         label=_("Recurrence"),
         required=True,
         widget=forms.Select(attrs={"form": "generate_report"}),
-        choices=[("daily", _("Daily")), ("weekly", _("Weekly")), ("monthly", _("Monthly")), ("yearly", _("Yearly"))],
+        choices=[
+            ("once", _("No recurrence, just once")),
+            ("daily", _("Daily")),
+            ("weekly", _("Weekly")),
+            ("monthly", _("Monthly")),
+            ("yearly", _("Yearly")),
+        ],
     )
 
     def clean(self):
@@ -121,19 +127,3 @@ class CustomReportScheduleForm(BaseRockyForm):
     end_date = forms.DateField(
         label=_(""), widget=forms.HiddenInput(), initial=lambda: datetime.now(tz=timezone.utc).date(), required=False
     )
-
-
-class ParentReportNameForm(BaseRockyForm):
-    parent_report_name = forms.CharField(
-        label=_("Report name format"), required=False, initial="${report_type} for ${oois_count} objects"
-    )
-
-
-class ChildReportNameForm(BaseRockyForm):
-    child_report_name = forms.CharField(
-        label=_("Subreports name format"), required=True, initial="${report_type} for ${ooi}"
-    )
-
-
-class ReportNameForm(ParentReportNameForm, ChildReportNameForm):
-    pass
diff --git a/rocky/reports/runner/report_runner.py b/rocky/reports/runner/report_runner.py
index f17cb3394df..3231458f55a 100644
--- a/rocky/reports/runner/report_runner.py
+++ b/rocky/reports/runner/report_runner.py
@@ -101,9 +101,9 @@ def run(self, report_task: ReportTask) -> None:
                 for ooi in data:
                     ooi_human_readable = Reference.from_str(ooi).human_readable
                     subreport_name = now.strftime(
-                        Template(recipe.subreport_name_format).safe_substitute(
-                            ooi=ooi_human_readable, report_type=str(report_type.name)
-                        )
+                        Template(
+                            "" if recipe.subreport_name_format is None else recipe.subreport_name_format
+                        ).safe_substitute(ooi=ooi_human_readable, report_type=str(report_type.name))
                     )
                     subreport_names.append((subreport_name, subreport_name))
 
@@ -112,7 +112,7 @@ def run(self, report_task: ReportTask) -> None:
             )
 
             if "${ooi}" in parent_report_name and oois_count == 1:
-                parent_report_name = Template(parent_report_name).safe_substitute(ooi=ooi[0].human_readable)
+                parent_report_name = Template(parent_report_name).safe_substitute(ooi=ooi_human_readable)
 
             save_report_data(
                 self.bytes_client,
diff --git a/rocky/reports/runner/worker.py b/rocky/reports/runner/worker.py
index 3a8181979b4..ecdff5d3261 100644
--- a/rocky/reports/runner/worker.py
+++ b/rocky/reports/runner/worker.py
@@ -243,7 +243,7 @@ def _start_working(
         finally:
             try:
                 # The docker runner could have handled this already
-                if scheduler.get_task_details(p_item.id).status == TaskStatus.RUNNING:
+                if scheduler.get_task_details(str(p_item.id)).status == TaskStatus.RUNNING:
                     scheduler.patch_task(p_item.id, status)  # Note that implicitly, we have p_item.id == task_id
                     logger.info("Set status to %s in the scheduler for task[id=%s]", status, p_item.id)
             except HTTPError:
diff --git a/rocky/reports/templates/partials/export_report_settings.html b/rocky/reports/templates/partials/export_report_settings.html
index cc509dfb794..cf43d37323b 100644
--- a/rocky/reports/templates/partials/export_report_settings.html
+++ b/rocky/reports/templates/partials/export_report_settings.html
@@ -15,53 +15,58 @@ <h2>{% translate "Report schedule" %}</h2>
                     or monthly. If you need the report just for a single occasion, select the one-time option.
                 {% endblocktranslate %}
             </p>
-            <form class="inline" method="post" action="{{ current }}">
+            <form id="generate_report" class="inline" method="post" action="{{ next }}">
                 {% csrf_token %}
                 {% include "forms/report_form_fields.html" %}
-                {% include "partials/form/fieldset.html" with fields=report_schedule_form_recurrence_choice %}
+                {% include "partials/form/fieldset.html" with fields=report_schedule_form_start_date fieldset_parent_class="column-2" %}
 
-                {% if is_scheduled_report %}
+                <div>
+                    <h2>{% translate "Report name" %}</h2>
                     <p>
                         {% blocktranslate trimmed %}
-                            Please choose a start date, time and recurrence for scheduling your report(s).
-                            If you select a date on the 28th-31st of the month, it will always be scheduled on the last day of the month.
+                            Define a custom name format for your report(s). This format will be applied to all generated
+                            (sub)reports.
                         {% endblocktranslate %}
                     </p>
                     <p>
                         {% blocktranslate trimmed %}
-                            The date you select will be the reference date for the data set for your report.
-                            Please allow for up to 24 hours for your report to be ready.
+                            To make the report names more descriptive, you can include placeholders for the
+                            object name, the report type and/or the reference date. For subreports and reports over a single object,
+                            use the placeholder "${ooi}" for the object name, "${report_type}" for the report type and use a
+                            <a href="https://strftime.org/" target="_blank" rel="noopener">Python strftime code</a> for the reference
+                            date. For reports over multiple objects, use "${oois_count}" for the number of objects in the report.
                         {% endblocktranslate %}
                     </p>
-                    <div class="column-2">
-                        {% include "partials/form/fieldset.html" with fields=report_schedule_form_start_date %}
-
+                    <p>
+                        {% blocktranslate trimmed %}
+                            For example, the format "${report_type} for ${ooi} at %x" could generate:
+                            "DNS Report for example.com at 01/01/25".
+                        {% endblocktranslate %}
+                    </p>
+                </div>
+                <fieldset>
+                    <div>
+                        <label for="parent_report_name_format">{% translate "Report name format" %}</label>
+                        <input type="text"
+                               id="parent_report_name_format"
+                               name="parent_report_name_format"
+                               value="{{ initial_report_names.0 }}">
                     </div>
+                </fieldset>
+                {% if initial_report_names.1 %}
+                    <fieldset>
+                        <div>
+                            <label for="subreport_name_format">{% translate "Subreports name format" %}</label>
+                            <input type="text"
+                                   id="subreport_name_format"
+                                   name="subreport_name_format"
+                                   value="{{ initial_report_names.1 }}">
+                        </div>
+                    </fieldset>
                 {% endif %}
-            </form>
-            <form id="generate_report" class="inline" method="post" action="{{ next }}">
-                {% csrf_token %}
-                {% include "forms/report_form_fields.html" %}
-
-                {% if not is_scheduled_report %}
-                    {% include "partials/report_names_header.html" %}
-                    {% include "partials/report_names_form.html" %}
-
-                    <button type="submit" form="generate_report">
-                        {% translate "Generate report" %}<span class="icon ti-chevron-right" aria-hidden="true"></span>
-                    </button>
-                {% else %}
-                    {% include "partials/report_names_header.html" with recurrence=True %}
-                    {% include "partials/form/fieldset.html" with fields=report_parent_name_form %}
-
-                    {% if reports|length > 1 %}
-                        {% include "partials/form/fieldset.html" with fields=report_child_name_form %}
-
-                    {% endif %}
-                    <button type="submit" form="generate_report">
-                        {% translate "Generate report" %}<span class="icon ti-chevron-right" aria-hidden="true"></span>
-                    </button>
-                {% endif %}
+                <button type="submit">
+                    {% translate "Generate report" %}<span class="icon ti-chevron-right" aria-hidden="true"></span>
+                </button>
             </form>
         {% else %}
             {% include "partials/return_button.html" with btn_text="Go back" %}
diff --git a/rocky/reports/templates/partials/report_names_header.html b/rocky/reports/templates/partials/report_names_header.html
deleted file mode 100644
index 1616fc02f25..00000000000
--- a/rocky/reports/templates/partials/report_names_header.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% load i18n %}
-{% load static %}
-
-<h2>{% translate "Report name" %}</h2>
-{% if recurrence %}
-    <p>
-        {% blocktranslate trimmed %}
-            Define a custom name format for your report(s). This format will be applied to all generated
-            (sub)reports.
-        {% endblocktranslate %}
-    </p>
-    <p>
-        {% blocktranslate trimmed %}
-            To make the report names more descriptive, you can include placeholders for the
-            object name, the report type and/or the reference date. For subreports and reports over a single object,
-            use the placeholder "${ooi}" for the object name, "${report_type}" for the report type and use a
-            <a href="https://strftime.org/" target="_blank" rel="noopener">Python strftime code</a> for the reference
-            date. For reports over multiple objects, use "${oois_count}" for the number of objects in the report.
-        {% endblocktranslate %}
-    </p>
-    <p>
-        {% blocktranslate trimmed %}
-            For example, the format "${report_type} for ${ooi} at %x" could generate:
-            "DNS Report for example.com at 01/01/25".
-        {% endblocktranslate %}
-    </p>
-{% else %}
-    <p>
-        {% blocktranslate trimmed %}
-            Give your report(s) a custom name and optionally add the reports' reference date
-            to the name. To do so you can select a standard option or use a <a href="https://strftime.org/" target="_blank" rel="noopener">Python
-            strftime code</a> in the report name.
-        {% endblocktranslate %}
-    </p>
-{% endif %}
diff --git a/rocky/reports/templates/report_overview/report_history_table.html b/rocky/reports/templates/report_overview/report_history_table.html
index 820bca9dd41..95825463d50 100644
--- a/rocky/reports/templates/report_overview/report_history_table.html
+++ b/rocky/reports/templates/report_overview/report_history_table.html
@@ -134,8 +134,8 @@
                             </td>
                             <td class="nowrap report_reference_date">{{ report.parent_report.observed_at|date }}</td>
                             <td class="nowrap report_creation_date">{{ report.parent_report.date_generated }}</td>
-                            {% if report.children_reports %}
-                                <td class="sticky-cell">
+                            <td class="sticky-cell">
+                                {% if report.children_reports %}
                                     <button type="button"
                                             class="expando-button icon ti-chevron-down"
                                             data-icon-open-class="icon ti-chevron-down"
@@ -144,8 +144,8 @@
                                             aria-expanded="false">
                                         {% translate "Open children report object details" %}
                                     </button>
-                                </td>
-                            {% endif %}
+                                {% endif %}
+                            </td>
                         </tr>
                         {% if report.children_reports %}
                             <tr class="expando-row">
diff --git a/rocky/reports/templates/report_overview/scheduled_reports_table.html b/rocky/reports/templates/report_overview/scheduled_reports_table.html
index 8a241a53064..0adea129a2d 100644
--- a/rocky/reports/templates/report_overview/scheduled_reports_table.html
+++ b/rocky/reports/templates/report_overview/scheduled_reports_table.html
@@ -27,32 +27,36 @@
                     {% if schedule.recipe %}
                         <tr>
                             <td class="nowrap">{{ schedule.recipe.report_name_format }}</td>
-                            <td>
+                            <td class="nowrap">
                                 <ul class="tags horizontal-view">
                                     {% if schedule.recipe.parent_report_type == "aggregate-organisation-report" %}
-                                        <li class="label tags-color-{{ schedule.recipe.parent_report_type|get_report_type_label_style }}">
-                                            {{ schedule.recipe.parent_report_type|get_report_type_name }}
+                                        <li>
+                                            <span class="label tags-color-{{ schedule.recipe.parent_report_type|get_report_type_label_style }}">{{ schedule.recipe.parent_report_type|get_report_type_name }}</span>
                                         </li>
                                     {% else %}
                                         {% for report_type in schedule.recipe.report_types %}
                                             {% if forloop.counter0 < 2 %}
-                                                <li class="label tags-color-{{ report_type|get_report_type_label_style }}">{{ report_type|get_report_type_name }}</li>
+                                                <li>
+                                                    <span class="label tags-color-{{ report_type|get_report_type_label_style }}">{{ report_type|get_report_type_name }}</span>
+                                                </li>
                                             {% endif %}
                                             {% if forloop.counter0 == 2 %}
-                                                <li class="label tags-color-grey-2">+ {{ schedule.recipe.report_types|length|add:"-2" }}</li>
+                                                <li>
+                                                    <span class="label tags-color-grey-2">+ {{ schedule.recipe.report_types|length|add:"-2" }}</span>
+                                                </li>
                                             {% endif %}
                                         {% endfor %}
                                     {% endif %}
                                 </ul>
                             </td>
+                            <td class="nowrap">{{ schedule.deadline_at }}</td>
                             <td class="nowrap">
-                                {% if not schedule.enabled %}
-                                    -
+                                {% if schedule.cron is None %}
+                                    {% translate "Once" %}
                                 {% else %}
-                                    {{ schedule.deadline_at }}
+                                    {{ schedule.cron|get_cron_description }}
                                 {% endif %}
                             </td>
-                            <td class="nowrap">{{ schedule.cron|get_cron_description }}</td>
                             <td class="nowrap">
                                 {% if schedule.enabled %}
                                     <span class="label system-tag color-2">{% translate "Enabled" %}</span>
@@ -60,7 +64,7 @@
                                     <span class="label system-tag color-3">{% translate "Disabled" %}</span>
                                 {% endif %}
                             </td>
-                            <td class="actions sticky-cell">
+                            <td class="nowrap actions sticky-cell">
                                 <button class="expando-button"
                                         data-icon-open-class="icon ti-chevron-down"
                                         data-icon-close-class="icon ti-chevron-up"
diff --git a/rocky/reports/views/base.py b/rocky/reports/views/base.py
index 3eb27848bf7..901569b4901 100644
--- a/rocky/reports/views/base.py
+++ b/rocky/reports/views/base.py
@@ -15,7 +15,7 @@
 from django.urls import reverse
 from django.utils.http import urlencode
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import TemplateView
+from django.views.generic import FormView, TemplateView
 from django_weasyprint import WeasyTemplateResponseMixin
 from katalogus.client import Boefje, KATalogus, KATalogusError, Plugin
 from pydantic import RootModel, TypeAdapter
@@ -271,30 +271,40 @@ def get_available_report_types(self) -> tuple[list[dict[str, str]] | dict[str, l
     def get_observed_at(self):
         return self.observed_at if self.observed_at < datetime.now(timezone.utc) else datetime.now(timezone.utc)
 
-    def is_scheduled_report(self) -> bool:
-        recurrence_choice = self.request.POST.get("choose_recurrence", "once")
-        return recurrence_choice == "repeat"
+    def is_single_report(self) -> bool:
+        return len(self.get_report_type_ids()) == 1
+
+    def get_input_recipe(self):
+        object_selection = self.request.POST.get("object_selection", "")
+        query = {}
+
+        if object_selection == "query":
+            query = {
+                "ooi_types": [t.__name__ for t in self.get_ooi_types()],
+                "scan_level": self.get_ooi_scan_levels(),
+                "scan_type": self.get_ooi_profile_types(),
+                "search_string": self.search_string,
+                "order_by": self.order_by,
+                "asc_desc": self.sorting_order,
+            }
+
+        if not query:
+            return {"input_oois": self.get_ooi_pks()}
+
+        return {"query": query}
 
     def create_report_recipe(
         self,
         report_name_format: str,
-        subreport_name_format: str,
+        subreport_name_format: str | None,
         parent_report_type: str | None,
-        schedule: str,
-        query: dict[str, Any] | None,
+        schedule: str | None,
     ) -> ReportRecipe:
-        input_recipe: dict[str, Any] = {}
-
-        if query:
-            input_recipe = {"query": query}
-        else:
-            input_recipe = {"input_oois": self.get_ooi_pks()}
-
         report_recipe = ReportRecipe(
             recipe_id=uuid4(),
             report_name_format=report_name_format,
             subreport_name_format=subreport_name_format,
-            input_recipe=input_recipe,
+            input_recipe=self.get_input_recipe(),
             parent_report_type=parent_report_type,
             report_types=self.get_report_type_ids(),
             cron_expression=schedule,
@@ -317,12 +327,32 @@ def get_input_data(self) -> dict[str, Any]:
             }
         }
 
+    def get_initial_report_names(self) -> tuple[str, str]:
+        oois = self.get_total_oois()
+        is_single_report = self.is_single_report()
+
+        if oois == 1 and is_single_report:
+            return ("${report_type} for ${ooi}", "")
+        if oois == 1 and not is_single_report:
+            return ("${report_type} for ${ooi}", "${report_type} for ${ooi}")
+        if oois > 1:
+            return ("${report_type} for ${oois_count} objects", "${report_type} for ${ooi}")
+        return ("", "")
+
+    def get_parent_report_type(self):
+        if self.report_type is not None:
+            return self.report_type.id
+        if not self.is_single_report():
+            return ConcatenatedReport.id
+        return self.report_type
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
         context["all_oois_selected"] = self.all_oois_selected()
         context["selected_oois"] = self.selected_oois
         context["selected_report_types"] = self.selected_report_types
+        context["is_single_report"] = self.is_single_report()
         context["object_selection"] = self.request.POST.get("object_selection", "")
 
         return context
@@ -482,146 +512,55 @@ def get_context_data(self, **kwargs):
 class ReportFinalSettingsView(BaseReportView, SchedulerView, TemplateView):
     report_type: type[BaseReport] | None = None
     task_type = "report"
-    is_a_scheduled_report = False
 
     def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
         if not self.get_report_type_ids():
             messages.error(request, self.NONE_REPORT_TYPE_SELECTION_MESSAGE)
             return PostRedirect(self.get_previous())
-
-        self.is_a_scheduled_report = self.is_scheduled_report()
-
         return super().get(request, *args, **kwargs)
 
-    @staticmethod
-    def create_report_names(oois: list[OOI], report_types: list[type[BaseReport]]) -> dict[str, str]:
-        reports = {}
-        oois_count = len(oois)
-        report_types_count = len(report_types)
-        ooi = oois[0].human_readable if oois else None
-        report_type = report_types[0].name
-
-        # Create name for parent report
-        if not (report_types_count == 1 and oois_count == 1):
-            if report_types_count > 1 and oois_count != 1:
-                name = _("Concatenated Report for {oois_count} objects").format(
-                    report_type=report_type, oois_count=oois_count
-                )
-            elif report_types_count > 1 and oois_count == 1:
-                name = _("Concatenated Report for {ooi}").format(ooi=ooi)
-            elif report_types_count == 1 and oois_count != 1:
-                name = _("{report_type} for {oois_count} objects").format(
-                    report_type=report_type, oois_count=oois_count
-                )
-            reports[name] = ""
-
-        # Create name for subreports or single reports
-        for ooi in oois:
-            for report_type_ in report_types:
-                name = _("{report_type} for {ooi}").format(report_type=report_type_.name, ooi=ooi.human_readable)
-                reports[name] = ""
-
-        return reports
-
-    def get_report_names(self) -> dict[str, str] | list[str]:
-        if self.report_type is not None and self.report_type == AggregateOrganisationReport:
-            return [_("Aggregate Report")]
-        if self.report_type is not None and self.report_type == MultiOrganizationReport:
-            return [_("Sector Report")]
-
-        return self.create_report_names(self.get_oois(), self.get_report_types())
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["reports"] = self.get_report_names()
-
+        context["initial_report_names"] = self.get_initial_report_names()
         context["report_schedule_form_start_date"] = self.get_report_schedule_form_start_date_time_recurrence()
         context["report_schedule_form_recurrence_choice"] = self.get_report_schedule_form_recurrence_choice()
-
-        context["report_parent_name_form"] = self.get_report_parent_name_form()
-        context["report_child_name_form"] = self.get_report_child_name_form()
-
-        context["is_scheduled_report"] = self.is_a_scheduled_report
-
-        context["created_at"] = datetime.now()
         return context
 
 
-class SaveReportView(BaseReportView, SchedulerView):
+class SaveReportView(BaseReportView, SchedulerView, FormView):
     task_type = "report"
+    form_class = ReportScheduleStartDateForm
 
-    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        old_report_names = request.POST.getlist("old_report_name")
-        report_names = request.POST.getlist("report_name", [])
-        reference_dates = request.POST.getlist("reference_date")
-
-        if not self.is_scheduled_report() and report_names:
-            final_report_names = list(zip(old_report_names, self.finalise_report_names(report_names, reference_dates)))
-            report_ooi = self.save_report(final_report_names)
-
-            return redirect(
-                reverse("view_report", kwargs={"organization_code": self.organization.code})
-                + "?"
-                + urlencode({"report_id": report_ooi.reference})
-            )
-        elif self.is_scheduled_report():
-            report_name_format = request.POST.get("parent_report_name", "")
-            subreport_name_format = request.POST.get("child_report_name", "")
-            object_selection = request.POST.get("object_selection", "")
-
-            form = ReportScheduleStartDateForm(request.POST)
-            if form.is_valid():
-                start_datetime = form.cleaned_data["start_datetime"]
-                recurrence = form.cleaned_data["recurrence"]
-
-            query = {}
-            if object_selection == "query":
-                query = {
-                    "ooi_types": [t.__name__ for t in self.get_ooi_types()],
-                    "scan_level": self.get_ooi_scan_levels(),
-                    "scan_type": self.get_ooi_profile_types(),
-                    "search_string": self.search_string,
-                    "order_by": self.order_by,
-                    "asc_desc": self.sorting_order,
-                }
+    def form_invalid(self, form):
+        """
+        We need to overwrite this as FormView renders invalid forms with a get request,
+        we need to adapt it using Postredirect, returning invalid form.
+        """
 
-            parent_report_type = None
-            if self.report_type is not None:
-                parent_report_type = self.report_type.id
-            elif not self.report_type and subreport_name_format:
-                parent_report_type = ConcatenatedReport.id
+        return PostRedirect(self.get_current())
 
-            schedule = self.convert_recurrence_to_cron_expressions(recurrence, start_datetime)
+    def form_valid(self, form):
+        start_datetime = form.cleaned_data["start_datetime"]
+        recurrence = form.cleaned_data["recurrence"]
 
-            report_recipe = self.create_report_recipe(
-                report_name_format, subreport_name_format, parent_report_type, schedule, query
-            )
+        schedule = (
+            self.convert_recurrence_to_cron_expressions(recurrence, start_datetime)
+            if recurrence is not None and recurrence != "once"
+            else None
+        )
 
-            self.create_report_schedule(report_recipe, start_datetime)
+        parent_report_type = self.get_parent_report_type()
 
-            return redirect(reverse("scheduled_reports", kwargs={"organization_code": self.organization.code}))
+        parent_report_name_format = self.request.POST.get("parent_report_name_format", "")
+        subreport_name_format = self.request.POST.get("subreport_name_format")
 
-        messages.error(request, _("Empty name should not be possible."))
-        return PostRedirect(self.get_previous())
+        report_recipe = self.create_report_recipe(
+            parent_report_name_format, subreport_name_format, parent_report_type, schedule
+        )
 
-    @staticmethod
-    def finalise_report_names(report_names: list[str], reference_dates: list[str]) -> list[str]:
-        final_report_names = []
-
-        if len(report_names) == len(reference_dates):
-            for index, report_name in enumerate(report_names):
-                date_format = ""
-                if reference_dates[index] and reference_dates[index] != "":
-                    date_format = " - "
-                    if reference_dates[index] == "week":
-                        date_format += _("Week %W, %Y")
-                    else:
-                        date_format += reference_dates[index]
-                final_report_name = f"{report_name} {date_format}".strip()
-                final_report_names.append(final_report_name)
-        if not final_report_names:
-            return report_names
-        return final_report_names
+        self.create_report_schedule(report_recipe, start_datetime)
+
+        return redirect(reverse("scheduled_reports", kwargs={"organization_code": self.organization.code}))
 
 
 class ViewReportView(ObservedAtMixin, OrganizationView, TemplateView):
diff --git a/rocky/rocky/locale/django.pot b/rocky/rocky/locale/django.pot
index 01d345e0abc..d84326ba458 100644
--- a/rocky/rocky/locale/django.pot
+++ b/rocky/rocky/locale/django.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-03 20:02+0000\n"
+"POT-Creation-Date: 2024-12-11 11:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2441,6 +2441,10 @@ msgstr ""
 msgid "Recurrence"
 msgstr ""
 
+#: reports/forms.py
+msgid "No recurrence, just once"
+msgstr ""
+
 #: reports/forms.py
 msgid "Daily"
 msgstr ""
@@ -2485,14 +2489,6 @@ msgstr ""
 msgid "After"
 msgstr ""
 
-#: reports/forms.py
-msgid "Report name format"
-msgstr ""
-
-#: reports/forms.py
-msgid "Subreports name format"
-msgstr ""
-
 #: reports/report_types/aggregate_organisation_report/appendix.html
 #: reports/report_types/multi_organization_report/appendix.html
 #: reports/templates/partials/report_sidemenu.html
@@ -3059,6 +3055,7 @@ msgstr ""
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 #: reports/report_types/vulnerability_report/report.html
+#: reports/templates/report_overview/scheduled_reports_table.html
 #: reports/templates/summary/selected_plugins.html
 #: rocky/templates/crisis_room/crisis_room_findings_block.html
 #: rocky/templates/findings/finding_list.html
@@ -3723,17 +3720,42 @@ msgid ""
 "single occasion, select the one-time option."
 msgstr ""
 
+#: reports/templates/partials/export_report_settings.html
+#: reports/templates/report_overview/report_history_table.html
+msgid "Report name"
+msgstr ""
+
 #: reports/templates/partials/export_report_settings.html
 msgid ""
-"Please choose a start date, time and recurrence for scheduling your "
-"report(s). If you select a date on the 28th-31st of the month, it will "
-"always be scheduled on the last day of the month."
+"Define a custom name format for your report(s). This format will be applied "
+"to all generated (sub)reports."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
+#, python-brace-format
 msgid ""
-"The date you select will be the reference date for the data set for your "
-"report. Please allow for up to 24 hours for your report to be ready."
+"To make the report names more descriptive, you can include placeholders for "
+"the object name, the report type and/or the reference date. For subreports "
+"and reports over a single object, use the placeholder \"${ooi}\" for the "
+"object name, \"${report_type}\" for the report type and use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\" rel=\"noopener\">Python "
+"strftime code</a> for the reference date. For reports over multiple objects, "
+"use \"${oois_count}\" for the number of objects in the report."
+msgstr ""
+
+#: reports/templates/partials/export_report_settings.html
+#, python-format, python-brace-format
+msgid ""
+"For example, the format \"${report_type} for ${ooi} at %%x\" could generate: "
+"\"DNS Report for example.com at 01/01/25\"."
+msgstr ""
+
+#: reports/templates/partials/export_report_settings.html
+msgid "Report name format"
+msgstr ""
+
+#: reports/templates/partials/export_report_settings.html
+msgid "Subreports name format"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
@@ -3838,44 +3860,6 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: reports/templates/partials/report_names_header.html
-#: reports/templates/report_overview/report_history_table.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/report_names_header.html
-msgid ""
-"Define a custom name format for your report(s). This format will be applied "
-"to all generated (sub)reports."
-msgstr ""
-
-#: reports/templates/partials/report_names_header.html
-#, python-brace-format
-msgid ""
-"To make the report names more descriptive, you can include placeholders for "
-"the object name, the report type and/or the reference date. For subreports "
-"and reports over a single object, use the placeholder \"${ooi}\" for the "
-"object name, \"${report_type}\" for the report type and use a <a "
-"href=\"https://strftime.org/\" target=\"_blank\" rel=\"noopener\">Python "
-"strftime code</a> for the reference date. For reports over multiple objects, "
-"use \"${oois_count}\" for the number of objects in the report."
-msgstr ""
-
-#: reports/templates/partials/report_names_header.html
-#, python-format, python-brace-format
-msgid ""
-"For example, the format \"${report_type} for ${ooi} at %%x\" could generate: "
-"\"DNS Report for example.com at 01/01/25\"."
-msgstr ""
-
-#: reports/templates/partials/report_names_header.html
-msgid ""
-"Give your report(s) a custom name and optionally add the reports' reference "
-"date to the name. To do so you can select a standard option or use a <a "
-"href=\"https://strftime.org/\" target=\"_blank\" rel=\"noopener\">Python "
-"strftime code</a> in the report name."
-msgstr ""
-
 #: reports/templates/partials/report_navigation.html
 msgid "Report Navigation"
 msgstr ""
@@ -3884,7 +3868,7 @@ msgstr ""
 msgid "Generate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html reports/views/base.py
+#: reports/templates/partials/report_navigation.html
 msgid "Aggregate Report"
 msgstr ""
 
@@ -4327,6 +4311,10 @@ msgstr ""
 msgid "Schedule status"
 msgstr ""
 
+#: reports/templates/report_overview/scheduled_reports_table.html
+msgid "Once"
+msgstr ""
+
 #: reports/templates/report_overview/scheduled_reports_table.html
 msgid "Scheduled Reports:"
 msgstr ""
@@ -4480,38 +4468,6 @@ msgstr ""
 msgid "Select at least one report type to proceed."
 msgstr ""
 
-#: reports/views/base.py
-#, python-brace-format
-msgid "Concatenated Report for {oois_count} objects"
-msgstr ""
-
-#: reports/views/base.py
-#, python-brace-format
-msgid "Concatenated Report for {ooi}"
-msgstr ""
-
-#: reports/views/base.py
-#, python-brace-format
-msgid "{report_type} for {oois_count} objects"
-msgstr ""
-
-#: reports/views/base.py
-#, python-brace-format
-msgid "{report_type} for {ooi}"
-msgstr ""
-
-#: reports/views/base.py
-msgid "Sector Report"
-msgstr ""
-
-#: reports/views/base.py
-msgid "Empty name should not be possible."
-msgstr ""
-
-#: reports/views/base.py
-msgid "Week %W, %Y"
-msgstr ""
-
 #: reports/views/mixins.py
 msgid ""
 "No data could be found for %(report_types). Object(s) did not exist on "
diff --git a/rocky/rocky/scheduler.py b/rocky/rocky/scheduler.py
index 447b67d03b0..96340601feb 100644
--- a/rocky/rocky/scheduler.py
+++ b/rocky/rocky/scheduler.py
@@ -3,6 +3,7 @@
 import collections
 import datetime
 import logging
+import time
 import uuid
 from enum import Enum
 from functools import cached_property
@@ -150,7 +151,7 @@ class ScheduleRequest(BaseModel):
 
     scheduler_id: str
     data: dict
-    schedule: str
+    schedule: str | None = None
     deadline_at: str
 
 
@@ -187,6 +188,13 @@ class PaginatedSchedulesResponse(BaseModel):
     results: list[ScheduleResponse]
 
 
+class SchedulerResponse(BaseModel):
+    id: str
+    enabled: bool
+    priority_queue: dict[str, Any]
+    last_activity: str | None
+
+
 class LazyTaskList:
     HARD_LIMIT = 500
 
@@ -295,6 +303,23 @@ def post_schedule_search(self, filters: dict[str, list[dict[str, str]]]) -> Pagi
         except ConnectError:
             raise SchedulerConnectError()
 
+    def is_scheduler_ready(self, scheduler_id: str) -> bool:
+        """Max trials is 100 seconds"""
+        trials = 0
+        interval = 10  # in seconds
+        while trials < 10:
+            try:
+                res = self._client.get(f"/schedulers/{scheduler_id}")
+                res.raise_for_status()
+                break
+            except HTTPStatusError as http_error:
+                if http_error.response.status_code == codes.NOT_FOUND:
+                    trials += 1
+                    time.sleep(interval)
+                    continue
+                raise SchedulerHTTPError()
+        return SchedulerResponse.model_validate_json(res.content).enabled
+
     def patch_schedule(self, schedule_id: str, params: dict[str, Any]) -> None:
         try:
             response = self._client.patch(f"/schedules/{schedule_id}", json=params)
diff --git a/rocky/rocky/views/scheduler.py b/rocky/rocky/views/scheduler.py
index 731a114ecab..41464e27bdb 100644
--- a/rocky/rocky/views/scheduler.py
+++ b/rocky/rocky/views/scheduler.py
@@ -6,13 +6,7 @@
 from django.http import Http404, JsonResponse
 from django.utils.translation import gettext_lazy as _
 from katalogus.client import Boefje, Normalizer
-from reports.forms import (
-    ChildReportNameForm,
-    ParentReportNameForm,
-    ReportRecurrenceChoiceForm,
-    ReportScheduleStartDateChoiceForm,
-    ReportScheduleStartDateForm,
-)
+from reports.forms import ReportRecurrenceChoiceForm, ReportScheduleStartDateChoiceForm, ReportScheduleStartDateForm
 from tools.forms.scheduler import TaskFilterForm
 
 from octopoes.models import OOI
@@ -51,9 +45,6 @@ class SchedulerView(OctopoesView):
 
     report_schedule_form_recurrence_choice = ReportRecurrenceChoiceForm  # once or repeat
 
-    report_parent_name_form = ParentReportNameForm  # parent name format
-    report_child_name_form = ChildReportNameForm  # child name format
-
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
         self.scheduler_client = scheduler_client(self.organization.code)
@@ -100,12 +91,6 @@ def get_report_schedule_form_start_date_time_recurrence(self):
     def get_report_schedule_form_recurrence_choice(self):
         return self.report_schedule_form_recurrence_choice(self.request.POST)
 
-    def get_report_parent_name_form(self):
-        return self.report_parent_name_form()
-
-    def get_report_child_name_form(self):
-        return self.report_child_name_form()
-
     def get_task_details(self, task_id: str) -> Task | None:
         try:
             task = self.scheduler_client.get_task_details(task_id)
@@ -126,7 +111,7 @@ def create_report_schedule(self, report_recipe: ReportRecipe, deadline_at: datet
                 scheduler_id=self.scheduler_id,
                 data=report_task,
                 schedule=report_recipe.cron_expression,
-                deadline_at=str(deadline_at),
+                deadline_at=deadline_at.isoformat(),
             )
 
             submit_schedule = self.scheduler_client.post_schedule(schedule=schedule_request)
diff --git a/rocky/tests/onboarding/test_onboarding_organization_steps.py b/rocky/tests/onboarding/test_onboarding_organization_steps.py
index bf55d591a2e..d46b8e18475 100644
--- a/rocky/tests/onboarding/test_onboarding_organization_steps.py
+++ b/rocky/tests/onboarding/test_onboarding_organization_steps.py
@@ -279,9 +279,15 @@ def test_onboarding_select_plugins_perms(request, member, rf, url):
 
 
 @pytest.mark.parametrize("member", ["superuser_member", "admin_member", "redteam_member", "client_member"])
-def test_onboarding_ooi_detail_scan(request, member, rf, mock_organization_view_octopoes, url):
+def test_onboarding_ooi_detail_scan(
+    request, mocker, member, mock_bytes_client, rf, mock_organization_view_octopoes, url
+):
     member = request.getfixturevalue(member)
 
+    mocker.patch("account.mixins.OrganizationView.get_katalogus")
+    mock_organization_view_octopoes().get.return_value = url
+    mock_bytes_client().upload_raw.return_value = "raw_id"
+
     response = OnboardingSetupScanOOIDetailView.as_view()(
         setup_request(rf.get("step_setup_scan_ooi_detail", {"ooi": url.primary_key}), member.user),
         organization_code=member.organization.code,
@@ -297,6 +303,30 @@ def test_onboarding_ooi_detail_scan(request, member, rf, mock_organization_view_
     assertContains(response, "Start scanning")
 
 
+@pytest.mark.parametrize("member", ["superuser_member", "admin_member", "redteam_member", "client_member"])
+def test_onboarding_ooi_detail_scan_create_report_schedule(
+    request, mocker, member, mock_bytes_client, rf, mock_organization_view_octopoes, url
+):
+    member = request.getfixturevalue(member)
+
+    mocker.patch("account.mixins.OrganizationView.get_katalogus")
+    mocker.patch("onboarding.views.scheduler_client")
+    mock_organization_view_octopoes().get.return_value = url
+    mock_bytes_client().upload_raw.return_value = "raw_id"
+
+    request_url = (
+        reverse("step_setup_scan_ooi_detail", kwargs={"organization_code": member.organization.code})
+        + f"?report_type=dns-report&ooi={url.primary_key}"
+    )
+
+    response = OnboardingSetupScanOOIDetailView.as_view()(
+        setup_request(rf.post(request_url), member.user), organization_code=member.organization.code
+    )
+
+    assert response.status_code == 302
+    assert "recipe_id" in response.url
+
+
 @pytest.mark.parametrize("member", ["superuser_member", "admin_member", "redteam_member", "client_member"])
 def test_onboarding_scanning_boefjes(
     request, member, rf, mock_organization_view_octopoes, url, mocker, mock_bytes_client
diff --git a/rocky/tests/reports/test_aggregate_report_flow.py b/rocky/tests/reports/test_aggregate_report_flow.py
index bd2052ac1a8..c22e40d85d6 100644
--- a/rocky/tests/reports/test_aggregate_report_flow.py
+++ b/rocky/tests/reports/test_aggregate_report_flow.py
@@ -222,8 +222,11 @@ def test_save_aggregate_report_view(
                 "observed_at": valid_time.strftime("%Y-%m-%d"),
                 "ooi": listed_hostnames,
                 "report_type": ["systems-report", "dns-report"],
-                "old_report_name": ["Aggregate Report"],
-                "report_name": ["Testing a new name for Aggregate Report"],
+                "start_date": "2024-01-01",
+                "start_time": "10:10",
+                "recurrence": "once",
+                "parent_report_name_format": "${report_type} for ${oois_count} objects",
+                "subreport_name_format": "${report_type} for ${ooi}",
             },
         ),
         client_member.user,
@@ -232,7 +235,7 @@ def test_save_aggregate_report_view(
     response = SaveAggregateReportView.as_view()(request, organization_code=client_member.organization.code)
 
     assert response.status_code == 302  # after post follows redirect, this to first create report ID
-    assert "report_id=Report" in response.url
+    assert "/reports/scheduled-reports/" in response.url
 
 
 def test_save_aggregate_report_view_scheduled(
@@ -269,11 +272,11 @@ def test_save_aggregate_report_view_scheduled(
                 "observed_at": valid_time.strftime("%Y-%m-%d"),
                 "ooi": listed_hostnames,
                 "report_type": ["systems-report", "vulnerability-report"],
-                "choose_recurrence": "repeat",
                 "start_date": "2024-01-01",
                 "start_time": "10:10",
-                "recurrence": "weekly",
-                "parent_report_name": ["Scheduled Aggregate Report %x"],
+                "recurrence": "once",
+                "parent_report_name_format": "${report_type} for ${oois_count} objects",
+                "subreport_name_format": "${report_type} for ${ooi}",
             },
         ),
         client_member.user,
diff --git a/rocky/tests/reports/test_generate_report_flow.py b/rocky/tests/reports/test_generate_report_flow.py
index 176746a88bc..daefb5cd11f 100644
--- a/rocky/tests/reports/test_generate_report_flow.py
+++ b/rocky/tests/reports/test_generate_report_flow.py
@@ -204,8 +204,6 @@ def test_save_generate_report_view(
         count=len(listed_hostnames), items=listed_hostnames
     )
 
-    old_report_names = [f"DNS report for {ooi.name}" for ooi in listed_hostnames]
-
     request = setup_request(
         rf.post(
             "generate_report_view",
@@ -213,8 +211,11 @@ def test_save_generate_report_view(
                 "observed_at": valid_time.strftime("%Y-%m-%d"),
                 "ooi": listed_hostnames,
                 "report_type": "dns-report",
-                "old_report_name": old_report_names,
-                "report_name": [f"DNS report for {len(listed_hostnames)} objects"],
+                "start_date": "2024-01-01",
+                "start_time": "10:10",
+                "recurrence": "once",
+                "parent_report_name_format": "${report_type} for ${oois_count} objects",
+                "subreport_name_format": "${report_type} for ${ooi}",
             },
         ),
         client_member.user,
@@ -223,7 +224,7 @@ def test_save_generate_report_view(
     response = SaveGenerateReportView.as_view()(request, organization_code=client_member.organization.code)
 
     assert response.status_code == 302  # after post follows redirect, this to first create report ID
-    assert "report_id=Report" in response.url
+    assert "/reports/scheduled-reports/" in response.url
 
 
 def test_save_generate_report_view_scheduled(
diff --git a/rocky/tests/reports/test_multi_report_flow.py b/rocky/tests/reports/test_multi_report_flow.py
index a3545077cbc..4d4da3dba63 100644
--- a/rocky/tests/reports/test_multi_report_flow.py
+++ b/rocky/tests/reports/test_multi_report_flow.py
@@ -126,8 +126,10 @@ def test_save_multi_report(
                 "observed_at": valid_time.strftime("%Y-%m-%d"),
                 "ooi": oois_selection,
                 "report_type": ["multi-organization-report"],
-                "old_report_name": ["Sector Report"],
-                "report_name": ["Sector Report"],
+                "start_date": "2024-01-01",
+                "start_time": "10:10",
+                "recurrence": "once",
+                "parent_report_name_format": "${report_type} for ${oois_count} objects",
             },
         ),
         client_member.user,
@@ -136,7 +138,7 @@ def test_save_multi_report(
     response = MultiReportView.as_view()(request, organization_code=client_member.organization.code)
 
     assert response.status_code == 302  # after post follows redirect, this to first create report ID
-    assert "report_id=Report" in response.url
+    assert "/reports/scheduled-reports/" in response.url
 
 
 def test_view_multi_report(