Release: Merge release into master from: release/2.33.6

.dryrunsecurity.yaml

@@ -66,7 +66,7 @@ allowedAuthors:
     - kiblik
     - dsever
     - dogboat
-    - FelixHernandez
+    - hblankenship
 notificationList:
   - '@mtesauro'
   - '@grendel513'

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.33.5",
+  "version": "2.33.6",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

docs/content/en/usage/performance.md

@@ -5,6 +5,16 @@ draft: false
 weight: 4
 ---
 
+## Filter String Matching Optimization
+
+IN the UI, many of the filters for a given object will also query related objects
+for an easy visual match of an item to filter on. For instances with many objects,
+this could lead to a considerable performance hit. To alleviate this constriction,
+enable the "Filter String Matching Optimization" setting in the System Settings to
+change many filters to only search on names, rather than the objects themselves.
+This change will save many large queries, and will improve the performance of UI
+based interactions.
+
 ## Asynchronous Import
 
 DefectDojo offers an experimental feature to aynschronously import security reports. 

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa: F401
 
-__version__ = '2.33.5'
+__version__ = '2.33.6'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://documentation.defectdojo.com'

dojo/db_migrations/0210_system_settings_filter_string_matching.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.13 on 2024-04-25 18:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dojo', '0209_alter_finding_severity'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='system_settings',
+            name='filter_string_matching',
+            field=models.BooleanField(default=False, help_text='When turned on, all filter operations in the UI will require string matches rather than ID. This is a performance enhancement to avoid fetching objects unnecessarily.', verbose_name='Filter String Matching Optimization'),
+        ),
+    ]