Merge pull request #212 from GeoinformationSystems/feature_Add_article_permalink_to_notifications-103

Author: nuest

.claude/temp.md

@@ -0,0 +1,6 @@
+# OPTIMAP
+
+
+
+# geoextent
+

CHANGELOG.md

@@ -26,6 +26,42 @@
 
 - ...
 
+## [0.2.0] - 2025-10-09
+
+### Added
+
+- Work landing page improvements:
+  - Clickable DOI links to https://doi.org resolver
+  - Clickable source links to journal homepages
+  - Link to raw JSON API response
+  - Publication title and DOI in HTML `<title>` tag
+- Map enhancements on work landing page:
+  - Fullscreen control using Leaflet Fullscreen plugin
+  - Custom "Zoom to All Features" button
+  - Scroll wheel zoom enabled
+- Comprehensive test suite for work landing page (9 tests)
+- Comprehensive test suite for geoextent API (24 tests)
+
+### Changed
+
+- None.
+
+### Fixed
+
+- None.
+
+### Deprecated
+
+- None.
+
+### Removed
+
+- None.
+
+### Security
+
+- External links (DOI, source, API) now use `target="_blank"` with `rel="noopener"` for security
+
 ## [0.1.0] - 2025-04-16
 
 ### Added

README.md

@@ -229,6 +229,9 @@ python -m smtpd -c DebuggingServer -n localhost:5587
 OPTIMAP_EMAIL_HOST=localhost
 OPTIMAP_EMAIL_PORT=5587
 ```
+### Accessing list of article links
+
+Visit the URL - http://127.0.0.1:8000/articles/links/
 
 ### Create Superusers/Admin
 

optimap/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.2"
+__version__ = "0.2.0"
 VERSION = __version__

publications/admin.py

@@ -2,6 +2,9 @@
 logger = logging.getLogger(__name__)
 
 from django.contrib import admin, messages
+from django.utils.html import format_html
+from django.conf import settings
+from django.core.mail import send_mail
 from leaflet.admin import LeafletGeoAdmin
 from publications.models import Publication, Source, HarvestingEvent, BlockedEmail, BlockedDomain, GlobalRegion
 from import_export.admin import ImportExportModelAdmin
@@ -12,6 +15,8 @@
 from publications.models import CustomUser
 from publications.tasks import regenerate_geojson_cache
 from publications.tasks import regenerate_geopackage_cache
+from django.test import Client
+from django.http import HttpResponse
 
 @admin.action(description="Mark selected publications as published")
 def make_public(modeladmin, request, queryset):
@@ -133,30 +138,68 @@ def regenerate_all_exports(modeladmin, request, queryset):
         messages.success(request, "GeoJSON & GeoPackage caches were regenerated.")
     except Exception as e:
         messages.error(request, f"Error during export regeneration: {e}")
-
+ 
 @admin.register(Publication)
 class PublicationAdmin(LeafletGeoAdmin, ImportExportModelAdmin):
-    """Publication Admin."""
-    list_display = ("title", "doi", "creationDate", "lastUpdate", "created_by", "updated_by", "status", "provenance", "source")
-    search_fields = ("title", "doi", "abstract", "source")
-    list_filter = ("status", "creationDate")
-    actions = [make_public, make_draft, regenerate_all_exports]
-
-    fields = (
-        "title", "doi", "status", "source", "abstract",
-        "geometry", "timeperiod_startdate", "timeperiod_enddate",
-        "created_by", "updated_by", "provenance"
-    )
+    list_display  = ("title", "doi", "has_permalink", "permalink_link",
+                     "creationDate", "lastUpdate", "created_by", "updated_by",
+                     "status", "provenance", "source")
+    search_fields = ("title", "doi", "abstract", "source__name")
+    list_filter   = ("status", "creationDate")
+    fields        = ("title", "doi", "status", "source", "abstract",
+                     "geometry", "timeperiod_startdate", "timeperiod_enddate",
+                     "created_by", "updated_by", "provenance")
     readonly_fields = ("created_by", "updated_by")
- 
+    actions = ["make_public", "make_draft", "regenerate_all_exports",
+               "export_permalinks_csv", "email_permalinks_preview"]
+
+    @admin.display(boolean=True, description="Has DOI")
+    def has_permalink(self, obj):
+        return bool(obj.doi)
+
+    @admin.display(description="Permalink")
+    def permalink_link(self, obj):
+        url = obj.permalink()
+        return format_html('<a href="{}" target="_blank">{}</a>', url, url) if url else "—"
+
+    def export_permalinks_csv(self, request, queryset):
+        rows = [("title", "doi", "permalink")]
+        rows += [(p.title or "", p.doi, p.permalink() or "")
+                 for p in queryset.only("title", "doi") if p.doi]
+        if len(rows) == 1:
+            self.message_user(request, "No items with DOI in selection.", level=messages.WARNING)
+            return
+        #esc = lambda v: f"\"{(v or '').replace('\"','\"\"')}\""
+        escape_row = lambda v: '"{}"'.format((v or '').replace('"', '""'))
+        csv = "\n".join(",".join(map(escape_row, r)) for r in rows)
+        resp = HttpResponse(csv, content_type="text/csv; charset=utf-8")
+        resp["Content-Disposition"] = 'attachment; filename="publication_permalinks.csv"'
+        return resp
+    export_permalinks_csv.short_description = "Export permalinks (CSV)"
+
+    def email_permalinks_preview(self, request, queryset):
+        base = settings.BASE_URL.rstrip("/")
+        c = Client()
+        lines, ok, bad = [], 0, 0
+        for p in queryset.only("title", "doi"):
+            if not p.doi:
+                continue
+            url = p.permalink()
+            path = url[len(base):] if url and url.startswith(base) else url
+            status = c.get(path).status_code
+            ok += (status == 200); bad += (status != 200)
+            lines.append(f"{'✅' if status == 200 else '❌'} {p.title} — {url} (HTTP {status})")
+        if not lines:
+            self.message_user(request, "No items with DOI in selection.", level=messages.WARNING)
+            return
+        send_mail(
+            "OPTIMAP — Permalink preview",
+            "Selected publication permalinks:\n\n" + "\n".join(lines) + f"\n\nSummary: {ok} OK, {bad} not OK",
+            settings.EMAIL_HOST_USER, [request.user.email]
+        )
+        self.message_user(request, f"Emailed preview to {request.user.email}.", level=messages.INFO)
+    email_permalinks_preview.short_description = "Email permalinks preview to me"
 
-@admin.register(Source)
-class SourceAdmin(admin.ModelAdmin):
-    list_display = ("id", "url_field", "harvest_interval_minutes", "last_harvest", "collection_name", "tags")
-    list_filter = ("harvest_interval_minutes", "collection_name")
-    search_fields = ("url_field", "collection_name", "tags")
-    actions = [trigger_harvesting_for_specific, trigger_harvesting_for_all, schedule_harvesting]
-
 @admin.register(HarvestingEvent)
 class HarvestingEventAdmin(admin.ModelAdmin):
     list_display = ("id", "source", "status", "started_at", "completed_at")

publications/models.py

@@ -9,6 +9,7 @@
 from django.utils.timezone import now
 from django.contrib.auth.models import AbstractUser, Group, Permission
 from import_export import fields, resources
+from django.urls import reverse
 from import_export.widgets import ForeignKeyWidget
 from django.core.exceptions import ValidationError
 from stdnum.issn import is_valid as is_valid_issn
@@ -24,6 +25,11 @@
     ("h", "Harvested"),
 )
 
+EMAIL_STATUS_CHOICES = [
+    ("success", "Success"),
+    ("failed", "Failed"),
+]
+
 class CustomUser(AbstractUser):
     groups = models.ManyToManyField(Group, related_name="publications_users", blank=True)
     user_permissions = models.ManyToManyField(Permission, related_name="publications_users_permissions", blank=True)
@@ -53,20 +59,31 @@ class Publication(models.Model):
         verbose_name='Publication geometry/ies', srid=4326, null=True, blank=True
     )
     timeperiod_startdate = ArrayField(models.CharField(max_length=1024, null=True), null=True, blank=True)
-    timeperiod_enddate = ArrayField(models.CharField(max_length=1024, null=True), null=True, blank=True)
+    timeperiod_enddate   = ArrayField(models.CharField(max_length=1024, null=True), null=True, blank=True)
     job = models.ForeignKey(
         'HarvestingEvent', on_delete=models.CASCADE, related_name='publications', null=True, blank=True
     )
 
     class Meta:
         ordering = ['-id']
         constraints = [
-            models.UniqueConstraint(fields=['doi', 'url'], name='unique_publication_entry')
+            models.UniqueConstraint(fields=['doi', 'url'], name='unique_publication_entry'),
         ]
 
     def __str__(self):
         return self.title
 
+    def permalink(self) -> str | None:
+        """
+        Return the absolute OPTIMAP permalink (/work/<doi>) if a DOI exists; otherwise None.
+        """
+        if not getattr(self, "doi", None):
+            return None
+        base = settings.BASE_URL.rstrip("/")
+        rel = reverse("optimap:article-landing", args=[self.doi])
+        return f"{base}{rel}"
+    permalink.short_description = "Permalink"
+
 class Subscription(models.Model):
     user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name="subscriptions", null=True, blank=True)
     name = models.CharField(max_length=4096, default="default_subscription")

publications/static/css/main.css

@@ -181,3 +181,75 @@ main {
   word-wrap: break-word;
   overflow-wrap: break-word;
 }
+
+/* Work landing page styles */
+h1.page-title {
+  margin-top: 2rem;
+  margin-bottom: .5rem;
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+  hyphens: auto;
+}
+
+.muted {
+  color: #666;
+  font-size: .92rem;
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+}
+
+.meta {
+  margin: 1rem 0 1.5rem;
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+}
+
+.meta a {
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+  word-break: break-all;
+}
+
+#mini-map {
+  height: 280px;
+  border-radius: 8px;
+  margin: 1.5rem 0;
+}
+
+/* Custom zoom to all features button */
+.leaflet-control-zoom-all {
+  background-color: white;
+  border: 2px solid rgba(0,0,0,0.2);
+  border-radius: 4px;
+  width: 26px;
+  height: 26px;
+  line-height: 26px;
+  text-align: center;
+  cursor: pointer;
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.leaflet-control-zoom-all:hover {
+  background-color: #f4f4f4;
+}
+
+/* Works page styles */
+.works-page h2 {
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+  hyphens: auto;
+}
+
+.works-page ul li {
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+  hyphens: auto;
+}
+
+/* General text wrapping for paragraphs in content pages */
+.work-landing-page p {
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+  hyphens: auto;
+}