DBC22-6524: removed debugging console logs and warnings as possible

DBC22-6524: fixed null geo saving for advisory

DBC22-6524: reverted to pre version

DBC22-6524: validate geo field before post request

Author: bcgov-brwang

src/backend/apps/cms/models.py

@@ -17,6 +17,9 @@
 from django.contrib.gis.forms import MultiPolygonField
 from django.contrib.gis.geos import MultiPolygon, Polygon, GEOSGeometry
 from wagtail.admin.forms import WagtailAdminPageForm
+from wagtail.admin.panels import Panel
+from django.core.exceptions import ValidationError
+
 
 TABLE_OPTIONS = {'rowHeaders': True,
                  'colHeaders': True, }
@@ -168,6 +171,24 @@ class RichContent(blocks.StreamBlock):
     callout = blocks.RichTextBlock(help_text=CALLOUT_HELP_TEXT,
                                    template='cms/callout.html')
 
+class ReadOnlyPanel(Panel):
+    def __init__(self, field_name, **kwargs):
+        self.field_name = field_name
+        super().__init__(**kwargs)
+
+    def clone(self):
+        return self.__class__(
+            field_name=self.field_name,
+            heading=self.heading,
+        )
+
+    class BoundPanel(Panel.BoundPanel):
+        template_name = 'cms/read_only_panel.html'
+
+        def get_context_data(self, parent_context=None):
+            ctx = super().get_context_data(parent_context)
+            ctx['value'] = getattr(self.instance, self.panel.field_name, '')
+            return ctx
 
 class AdvisoryIndexPage(Page):
     parent_page_types = ["wagtailcore.Page"]
@@ -198,6 +219,14 @@ def rendered_body(self):
 
     last_notified_at = models.DateTimeField(null=True, blank=True)
 
+    def clean(self):
+        super().clean()
+
+        if self.geometry is None or self.geometry.empty:
+            raise ValidationError({
+                "geometry": "Please draw at least one polygon."
+            })
+
     # Editor panels configuration
     content_panels = [
         FieldPanel("title", help_text=HelpText.GENERIC_TITLE),
@@ -209,9 +238,9 @@ def rendered_body(self):
             heading="Area",
         ),
         FieldPanel("body", help_text=HelpText.GENERIC_BODY),
-        FieldPanel('created_at', read_only=True, heading="Created"),
-        FieldPanel('first_published_at', read_only=True, heading="Published"),
-        FieldPanel('last_notified_at', read_only=True, heading="Updated"),
+        ReadOnlyPanel('created_at', heading="Created"),
+        ReadOnlyPanel('first_published_at', heading="Published"),
+        ReadOnlyPanel('last_published_at', heading="Updated"),
     ]
     promote_panels = []
 
@@ -242,6 +271,7 @@ def save(self, *args, **kwargs):
         super().save(log_action=None, *args, **kwargs)
         cache.delete(CacheKey.ADVISORY_LIST)
 
+
 class BulletinIndexPage(Page):
     parent_page_types = ["wagtailcore.Page"]
     subpage_types = ["cms.Bulletin"]
@@ -281,9 +311,9 @@ def save(self, *args, **kwargs):
                    heading="Newsfeed Image"),
         FieldPanel("image_alt_text", help_text=HelpText.BULLETIN_IMAGE_ALT_TEXT),
         FieldPanel("body", help_text=HelpText.GENERIC_BODY),
-        FieldPanel('created_at', read_only=True, heading="Created"),
-        FieldPanel('first_published_at', read_only=True, heading="Published"),
-        FieldPanel('last_notified_at', read_only=True, heading="Updated"),
+        ReadOnlyPanel('created_at', heading="Created"),
+        ReadOnlyPanel('first_published_at', heading="Published"),
+        ReadOnlyPanel('last_published_at', heading="Updated"),
     ]
     promote_panels = []
 
@@ -447,9 +477,9 @@ def save(self, *args, **kwargs):
     content_panels = [
         FieldPanel("title", help_text=HelpText.GENERIC_TITLE),
         FieldPanel("body", help_text=HelpText.GENERIC_BODY),
-        FieldPanel('created_at', read_only=True, heading="Created"),
-        FieldPanel('first_published_at', read_only=True, heading="Published"),
-        FieldPanel('last_published_at', read_only=True, heading="Updated"),
+        ReadOnlyPanel('created_at', heading="Created"),
+        ReadOnlyPanel('first_published_at', heading="Published"),
+        ReadOnlyPanel('last_published_at', heading="Updated"),
     ]
 
     promote_panels = []

src/backend/apps/cms/static/js/map-widget.js

@@ -28,8 +28,6 @@
         setupKeyboardShortcuts();
         setupSaveHook();
         enterDrawMode(); // default mode on load
-
-        console.log('map-widget initialized');
     }
 
     // Styles
@@ -418,8 +416,6 @@ function enterSelectedMode() {
             if (form) {
                 // Force our correct geometry value into the field before FormData reads it
                 updateHiddenField();
-                console.log('FormData intercepted, geometry:', 
-                    document.getElementById('id_geometry')?.value?.substring(0, 80));
             }
             return new originalFormData(form);
         };

src/backend/apps/cms/templates/cms/read_only_panel.html

@@ -0,0 +1,6 @@
+<div class="w-field">
+  <div class="w-field__wrapper">
+    <input type="text" value="{{ value }}" readonly 
+           style="width:100%; padding: 0.5rem 0.75rem; border: 1px solid #e0e0e0 !important; border-radius: 4px; background: #f6f6f8; color: #333; font-size: 0.95rem; outline: none !important; box-shadow: none !important; cursor: default;" />
+  </div>
+</div>