Merge branch 'main' into fix/delete-many-fail-silently

rocky/assets/css/main.scss

@@ -56,7 +56,6 @@
 @import "components/ooi-summary";
 @import "components/page-meta";
 @import "components/plugins";
-@import "components/pre";
 @import "components/qr-code";
 @import "components/report";
 @import "components/report-name-table";

rocky/assets/css/manon-components.scss

@@ -78,6 +78,7 @@
 @use "@minvws/manon/breadcrumb-bar";
 @use "@minvws/manon/breadcrumb-bar-content-block";
 @use "@minvws/manon/code-base";
+@use "@minvws/manon/code-block";
 @use "@minvws/manon/description-list";
 @use "@minvws/manon/filter";
 @use "@minvws/manon/language-selector-list";

rocky/assets/css/themes/soft/manon/code-base.scss

@@ -0,0 +1,10 @@
+/* code base */
+
+:root {
+  --code-base-background-color: var(--colors-purrple-100);
+}
+
+code {
+  padding: 0.125rem 0.5rem;
+  white-space: nowrap;
+}

rocky/assets/css/themes/soft/manon/code-block.scss

@@ -0,0 +1,6 @@
+/* code base */
+
+:root {
+  --code-block-background-color: var(--colors-purrple-100);
+  --code-block-code-padding: 0;
+}

rocky/assets/css/themes/soft/soft.scss

@@ -47,6 +47,8 @@
 @import "manon/button-ghost";
 @import "manon/checkbox";
 @import "manon/collapsible";
+@import "manon/code-base";
+@import "manon/code-block";
 @import "manon/de-emphasized";
 @import "manon/emphasized";
 @import "manon/expando-rows";

rocky/reports/views/base.py

@@ -183,13 +183,18 @@ def get_ooi_pks(self) -> list[str]:
     def get_total_oois(self):
         return len(self.selected_oois)
 
-    def get_ooi_types(self):
+    def get_report_ooi_types(self):
         if self.report_type == AggregateOrganisationReport:
             return get_ooi_types_from_aggregate_report(AggregateOrganisationReport)
         if self.report_type == MultiOrganizationReport:
             return MultiOrganizationReport.input_ooi_types
         return get_ooi_types_with_report()
 
+    def get_ooi_types(self):
+        if self.filtered_ooi_types:
+            return super().get_ooi_types()
+        return self.get_report_ooi_types()
+
     def get_oois(self) -> list[OOI]:
         if self.all_oois_selected():
             return self.octopoes_api_connector.list_objects(
@@ -205,7 +210,7 @@ def get_oois(self) -> list[OOI]:
     def get_ooi_filter_forms(self) -> dict[str, Form]:
         return {
             "ooi_type_form": OOITypeMultiCheckboxForReportForm(
-                sorted([ooi_class.get_ooi_type() for ooi_class in self.ooi_types]), self.request.GET
+                sorted([ooi_class.get_ooi_type() for ooi_class in self.get_report_ooi_types()]), self.request.GET
             )
         }
 

rocky/rocky/views/mixins.py

@@ -205,6 +205,8 @@ def __init__(
 
     @cached_property
     def count(self) -> int:
+        if not self.ooi_types:
+            return 0
         return self.octopoes_connector.list_objects(
             self.ooi_types,
             valid_time=self.valid_time,
@@ -218,6 +220,8 @@ def __len__(self):
         return self.count
 
     def __getitem__(self, key: int | slice) -> list[OOI]:
+        if not self.ooi_types:
+            return []
         if isinstance(key, slice):
             offset = key.start or 0
             limit = OOIList.HARD_LIMIT