Merge remote-tracking branch 'origin/main' into feature/nibbles

rocky/katalogus/views/plugin_detail.py

@@ -11,6 +11,8 @@
 
 from katalogus.client import Boefje, Normalizer
 from katalogus.views.plugin_settings_list import PluginSettingsListView
+from octopoes.models import OOI
+from rocky.scheduler import ScheduleResponse
 from rocky.views.tasks import TaskListView
 
 
@@ -72,10 +74,12 @@ def get_oois(self, selected_oois: list[str]) -> dict[str, Any]:
         oois_without_clearance = []
         for ooi in selected_oois:
             ooi_object = self.get_single_ooi(pk=ooi)
+
             if ooi_object.scan_profile and ooi_object.scan_profile.level >= self.plugin.scan_level.value:
                 oois_with_clearance.append(ooi_object)
             else:
                 oois_without_clearance.append(ooi_object.primary_key)
+
         return {"oois_with_clearance": oois_with_clearance, "oois_without_clearance": oois_without_clearance}
 
     def get_context_data(self, **kwargs):
@@ -153,11 +157,29 @@ def get_context_data(self, **kwargs):
 
     def get_form_consumable_oois(self):
         """Get all available OOIS that plugin can consume."""
-        return self.octopoes_api_connector.list_objects(
+        oois = self.octopoes_api_connector.list_objects(
             self.plugin.consumes, valid_time=datetime.now(timezone.utc), limit=self.limit_ooi_list
         ).items
 
+        oois_with_schedule: list[tuple[OOI, ScheduleResponse]] = []
+
+        for ooi in oois:
+            schedules = self.scheduler_client.post_schedule_search(
+                {
+                    "filters": [
+                        {"column": "data", "field": "boefje__id", "operator": "eq", "value": self.plugin.id},
+                        {"column": "data", "field": "input_ooi", "operator": "eq", "value": ooi.primary_key},
+                    ]
+                }
+            )
+
+            if schedules.count > 0:
+                schedule: ScheduleResponse = schedules.results[0]
+
+                oois_with_schedule.append((ooi, schedule))
+        return oois_with_schedule
+
     def get_form_filtered_consumable_oois(self):
         """Return a list of oois that is filtered for oois that meets clearance level."""
-        oois = self.get_form_consumable_oois()
-        return [ooi for ooi in oois if ooi.scan_profile.level >= self.plugin.scan_level.value]
+        oois_with_schedule = self.get_form_consumable_oois()
+        return [ooi for ooi in oois_with_schedule if ooi[0].scan_profile.level >= self.plugin.scan_level.value]

rocky/pyproject.toml

@@ -52,6 +52,7 @@ opentelemetry-semantic-conventions = "^0.49b2"
 opentelemetry-util-http = "^0.49b2"
 structlog = "^24.2.0"
 django-structlog = "^8.1.0"
+cron-descriptor = "^1.4.5"
 
 
 [tool.poetry.group.dev.dependencies]

rocky/reports/serializers.py

@@ -20,7 +20,7 @@ def to_representation(self, instance):
 
 
 class ReportRecipeSerializer(serializers.Serializer):
-    id = serializers.UUIDField(source="recipe_id", read_only=True)
+    id = serializers.UUIDField(source="recipe_id", required=False)
     report_name_format = serializers.CharField()
     subreport_name_format = serializers.CharField(required=False, allow_blank=True)
 

rocky/reports/templates/report_overview/scheduled_reports_table.html

@@ -52,7 +52,7 @@
                                     {{ schedule.deadline_at }}
                                 {% endif %}
                             </td>
-                            <td class="nowrap">{{ schedule.cron }}</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>

rocky/reports/templatetags/report_extra.py

@@ -1,5 +1,6 @@
 from typing import Any
 
+from cron_descriptor import get_description
 from django import template
 
 from reports.report_types.helpers import get_report_by_id
@@ -25,3 +26,8 @@ def get_report_type_name(report_type_id: str):
 @register.filter
 def get_report_type_label_style(report_type_id: str):
     return get_report_by_id(report_type_id).label_style
+
+
+@register.filter
+def get_cron_description(cron_expression: str) -> str:
+    return get_description(cron_expression)