Refactor identifiers page

Author: jochenklar

config/urls.py

@@ -21,6 +21,7 @@
 from isimip_data.metadata.views import (
     dataset,
     file,
+    identifier,
     identifiers,
     metadata,
     resource,
@@ -99,6 +100,7 @@ def location(self, item):
     re_path(r'^(?P<doi>\d{2}\.\d+\/[A-Za-z0-9_.\-\/]+)', resource, name='resource'),
 
     path('identifiers/', identifiers, name='identifiers'),
+    path('identifiers/<str:identifier>', identifier, name='identifier'),
 
     path('search/', search, name='search'),
     path('search/<path:path>/', search, name='search'),

isimip_data/metadata/models.py

@@ -427,6 +427,9 @@ class Meta:
     def __str__(self):
         return self.identifier
 
+    def get_absolute_url(self):
+        return reverse('identifier', kwargs={'identifier': self.identifier})
+
 
 class Specifier(models.Model):
 

isimip_data/metadata/templates/metadata/identifier.html

@@ -0,0 +1,39 @@
+{% extends 'core/base.html' %}
+{% load i18n %}
+{% load static %}
+
+{% block style %}
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static 'metadata.css' %}" />
+{% endblock %}
+
+{% block main %}
+
+<div class="container">
+    <header>
+        <h1>{% trans 'Identifier statistics' %}</h1>
+    </header>
+
+    <div class="card identifier">
+        <div class="card-header">
+            <strong>{{ identifier.identifier }}</strong>
+        </div>
+        <ul class="list-group list-group-flush">
+            {% for specifier, count in histogram %}
+            {% if count > 0 %}
+            <li class="list-group-item">
+                <div class="d-flex gap-2 align-items-center">
+                    <strong>{{ specifier }}</strong>
+                    <div class="badge rounded-pill text-bg-secondary">
+                        {{ count }}
+                    </div>
+                </div>
+            </li>
+            {% endif %}
+            {% endfor %}
+            </div>
+        </ul>
+    </div>
+</div>
+
+{% endblock %}

isimip_data/metadata/templates/metadata/identifiers.html

@@ -11,30 +11,25 @@
 
 <div class="container">
     <header>
-        <h1>{% trans 'Identifier statistics' %}</h1>
+        <h1>{% trans 'Identifiers' %}</h1>
     </header>
 
-    {% for identifier, rows in identifiers %}
     <div class="card identifiers">
-        <div class="card-header">
-            <strong>{{ identifier }}</strong>
-        </div>
-        <div class="card-body">
-            <div class="d-flex flex-wrap row-gap-1 column-gap-2">
-            {% for specifier, count in rows %}
-            {% if count > 0 %}
-            <div class="d-flex gap-2 align-items-center border border-gray rounded ps-2 pe-2">
-                <strong>{{ specifier }}</strong>
-                <div class="badge rounded-pill text-bg-secondary">
-                    {{ count }}
+        <ul class="list-group list-group-flush">
+            {% for identifier in identifiers %}
+            <li class="list-group-item">
+                <div class="row">
+                    <div class="col-3">
+                        <a href="{{ identifier.get_absolute_url }}">{{ identifier.identifier }}</a>
+                    </div>
+                    <div class="col-9">
+                        <p>{{ identifier.specifiers|join:', ' }}</p>
+                    </div>
                 </div>
-            </div>
-            {% endif %}
+            </li>
             {% endfor %}
-            </div>
-        </div>
+        </ul>
     </div>
-    {% endfor %}
 </div>
 
 {% endblock %}

isimip_data/metadata/views.py

@@ -194,11 +194,16 @@ def resource_json(request, doi=None):
 
 
 def identifiers(request):
-    identifiers_list = []
-    for identifier in Identifier.objects.using('metadata').identifiers():
-        identifiers_list.append((identifier, Dataset.objects.using('metadata').histogram(identifier)))
-
     return render(request, 'metadata/identifiers.html', {
         'title': 'Identifiers',
-        'identifiers': identifiers_list
+        'identifiers': Identifier.objects.using('metadata').all()
+    })
+
+
+def identifier(request, identifier=None):
+    identifier_instance = get_object_or_404(Identifier.objects.using('metadata'), identifier=identifier)
+    return render(request, 'metadata/identifier.html', {
+        'title': 'Identifiers',
+        'identifier': identifier_instance,
+        'histogram': Dataset.objects.using('metadata').histogram(identifier)
     })