Prefetch related models in FPR views

pyproject.toml

@@ -64,6 +64,7 @@ module = [
     "src.MCPClient.lib.clientScripts.policy_check",
     "src.MCPClient.lib.clientScripts.transcribe_file",
     "src.MCPClient.lib.clientScripts.validate_file",
+    "tests.dashboard.fpr.test_views",
     "tests.MCPClient.conftest",
     "tests.MCPClient.test_characterize_file",
     "tests.MCPClient.test_has_packages",

src/dashboard/src/fpr/forms.py

@@ -79,8 +79,14 @@ class IDRuleForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # Limit to only enabled formats/commands
-        self.fields["format"].queryset = fprmodels.FormatVersion.active.all()
-        self.fields["command"].queryset = fprmodels.IDCommand.active.all()
+        self.fields[
+            "format"
+        ].queryset = fprmodels.FormatVersion.active.all().prefetch_related(
+            "format__group"
+        )
+        self.fields[
+            "command"
+        ].queryset = fprmodels.IDCommand.active.all().prefetch_related("tool")
 
     class Meta:
         model = fprmodels.IDRule
@@ -110,7 +116,11 @@ def __init__(self, *args, **kwargs):
             self.fields["command"].initial = self.instance.command.uuid
 
         # Show only active format versions in the format dropdown
-        self.fields["format"].queryset = fprmodels.FormatVersion.active.all()
+        self.fields[
+            "format"
+        ].queryset = fprmodels.FormatVersion.active.all().prefetch_related(
+            "format__group"
+        )
 
     def clean(self):
         cleaned_data = super().clean()
@@ -168,6 +178,12 @@ class FPCommandForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        self.fields[
+            "output_format"
+        ].queryset = fprmodels.FormatVersion.active.all().prefetch_related(
+            "format__group"
+        )
+
         verification_commands = fprmodels.FPCommand.active.filter(
             command_usage="verification"
         )

src/dashboard/src/fpr/views.py

@@ -317,7 +317,9 @@ def idrule_list(request):
             "replaces_id"
         )
     ]
-    idrules = fprmodels.IDRule.objects.exclude(uuid__in=replacing_rules)
+    idrules = fprmodels.IDRule.objects.exclude(
+        uuid__in=replacing_rules
+    ).prefetch_related("format__format__group", "command")
     return render(request, "fpr/idrule/list.html", context(locals()))
 
 
@@ -391,7 +393,9 @@ def idcommand_list(request):
             "replaces_id"
         )
     ]
-    idcommands = fprmodels.IDCommand.objects.exclude(uuid__in=replacing_commands)
+    idcommands = fprmodels.IDCommand.objects.exclude(
+        uuid__in=replacing_commands
+    ).prefetch_related("tool")
     return render(request, "fpr/idcommand/list.html", context(locals()))
 
 
@@ -493,7 +497,11 @@ def fprule_list(request, usage=None):
     else:
         opts = {}
     # Display disabled rules as long as they aren't replaced by another rule
-    fprules = fprmodels.FPRule.objects.filter(**opts).exclude(uuid__in=replacing_rules)
+    fprules = (
+        fprmodels.FPRule.objects.filter(**opts)
+        .exclude(uuid__in=replacing_rules)
+        .prefetch_related("format__format__group", "command")
+    )
     return render(request, "fpr/fprule/list.html", context(locals()))
 
 
@@ -621,8 +629,10 @@ def fpcommand_list(request, usage=None):
             "replaces_id"
         )
     ]
-    fpcommands = fprmodels.FPCommand.objects.filter(**opts).exclude(
-        uuid__in=replacing_commands
+    fpcommands = (
+        fprmodels.FPCommand.objects.filter(**opts)
+        .exclude(uuid__in=replacing_commands)
+        .prefetch_related("tool")
     )
     return render(request, "fpr/fpcommand/list.html", context(locals()))
 
@@ -641,7 +651,7 @@ def fpcommand_edit(request, uuid=None):
         title = _("Replace command %(name)s") % {"name": fpcommand.description}
     else:
         fpcommand = None
-        title = _("Create format version")
+        title = _("Create format policy command")
     if request.method == "POST":
         form = fprforms.FPCommandForm(request.POST, instance=fpcommand)
         if form.is_valid():