Merge branch 'api-to-diff' into 'main'

Send update_text events with text diff when updating text fields via API See merge request reportcreator/reportcreator!558
Syslifters · May 23, 2024 · 6649e4d · 6649e4d
2 parents 1c87849 + 513e3e9
commit 6649e4d
Show file tree

Hide file tree

Showing 10 changed files with 666 additions and 549 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Collaborative editing in project history diff views
 * Project history diff views: add revert changes button to markdown editor
 * Fix MDE preview layout break on zoom out
+* Send update_text events with text diff when updating text fields via API instead of overwriting the whole text
 
 
 ## v2024.040 - 2024-05-15

diff --git a/api/src/reportcreator_api/conf/settings.py b/api/src/reportcreator_api/conf/settings.py
@@ -666,10 +666,12 @@ def __bool__(self):
             'formatter': 'default',
             'class': 'logging.StreamHandler',
         },
-        'elasticapm': {
-            'level': 'WARNING',
-            'class': 'elasticapm.contrib.django.handlers.LoggingHandler',
-        },
+        **({
+            'elasticapm': {
+                'level': 'WARNING',
+                'class': 'elasticapm.contrib.django.handlers.LoggingHandler',
+            },
+        } if ELASTIC_APM_ENABLED else {}),
     },
     'root': {
         'level': 'INFO',

diff --git a/api/src/reportcreator_api/conf/urls.py b/api/src/reportcreator_api/conf/urls.py
@@ -10,6 +10,7 @@
 
 from reportcreator_api.api_utils.views import UtilsViewSet
 from reportcreator_api.notifications.views import NotificationViewSet
+from reportcreator_api.pentests.collab.channels import ConsumerHttpFallbackView
 from reportcreator_api.pentests.consumers import ProjectNotesConsumer, ProjectReportingConsumer, UserNotesConsumer
 from reportcreator_api.pentests.views import (
     ArchivedProjectKeyPartViewSet,
@@ -40,7 +41,6 @@
     MFAMethodViewSet,
     PentestUserViewSet,
 )
-from reportcreator_api.utils.channels import ConsumerHttpFallbackView
 
 router = DefaultRouter()
 # Make trailing slash in URL optional to support loading images and assets by fielname

diff --git a/api/src/reportcreator_api/pentests/collab/__init__.py b/api/src/reportcreator_api/pentests/collab/__init__.py
diff --git a/api/src/reportcreator_api/utils/channels.py → ...rtcreator_api/pentests/collab/channels.py b/api/src/reportcreator_api/utils/channels.py → ...rtcreator_api/pentests/collab/channels.py