From 4ac02710d0dd4ebaa738afc54bdb8f6df7fcceb6 Mon Sep 17 00:00:00 2001
From: Charles Tapley Hoyt <cthoyt@gmail.com>
Date: Fri, 17 Jan 2025 16:02:18 +0100
Subject: [PATCH] Improve static site generation

---
 src/pyobo/ssg/__init__.py | 10 +++-------
 src/pyobo/ssg/index.html  | 39 ++++++++++++++++++++++++++-------------
 src/pyobo/ssg/term.html   | 14 ++++++++++++--
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/pyobo/ssg/__init__.py b/src/pyobo/ssg/__init__.py
index e8fbb61f..327e68af 100644
--- a/src/pyobo/ssg/__init__.py
+++ b/src/pyobo/ssg/__init__.py
@@ -1,6 +1,5 @@
 """Static site generator."""
 
-import itertools as itt
 from collections import defaultdict
 from collections.abc import Sequence
 from operator import attrgetter
@@ -64,15 +63,12 @@ def make_site(
     if resource is None:
         raise KeyError
 
+    terms = [term for term in obo if term.prefix == obo.ontology]
+
     if not manifest:
         _manifest = None
     else:
-        _manifest = sorted(
-            (term for term in itt.chain(obo, obo.typedefs or []) if term.prefix == obo.ontology),
-            key=attrgetter("identifier"),
-        )
-
-    terms = [term for term in obo if term.prefix == obo.ontology]
+        _manifest = sorted(terms, key=attrgetter("identifier"))
 
     directory.joinpath("index.html").write_text(
         index_template.render(
diff --git a/src/pyobo/ssg/index.html b/src/pyobo/ssg/index.html
index 18adc4d3..32b6a9ec 100644
--- a/src/pyobo/ssg/index.html
+++ b/src/pyobo/ssg/index.html
@@ -8,7 +8,7 @@ <h5 class="card-header">
             Metadata
         </h5>
         <div class="card-body">
-            <p>{{ resource.get_description() }}</p>
+            <p>{{ resource.get_description(use_markdown=True) }}</p>
             <dl>
                 {% if obo.data_version %}
                     <dt>Data Version</dt>
@@ -64,6 +64,30 @@ <h5 class="card-header">
         </div>
     {% endif %}
 
+    {% if obo.typedefs %}
+        <div class="card" style="margin-top: 1em;">
+            <h5 class="card-header">
+                Type Definitions
+            </h5>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>CURIE</th>
+                    <th>Name</th>
+                </tr>
+                </thead>
+                <tbody>
+                    {%- for typedef in obo.typedefs %}
+                    <tr>
+                        <td>{{ typedef.curie }}</td>
+                        <td>{% if typedef.name %}{{ typedef.name }}{% endif %}</td>
+                    </tr>
+                    {%- endfor %}
+                </tbody>
+            </table>
+        </div>
+    {% endif %}
+
     {% if manifest %}
         <div class="card" style="margin-top: 1em;">
             <h5 class="card-header">
@@ -85,7 +109,7 @@ <h5 class="card-header">
                             {% if term.is_metadata_tag %}
                                 Property
                             {% else %}
-                                {{ term.__class__.__name__ }}
+                                {{ term.type }}
                             {% endif %}
                         </td>
                         <td align="right"><a href="{{ term.identifier }}">{{ term.identifier }}</a></td>
@@ -96,16 +120,5 @@ <h5 class="card-header">
                 </tbody>
             </table>
         </div>
-    {% elif obo.typedefs %}
-        <div class="card" style="margin-top: 1em;">
-            <h5 class="card-header">
-                Relation Definitions
-            </h5>
-            <ul class="list-group list-group-flush">
-                {% for typedef in obo.typedefs %}
-                    <li class="list-group-item">{{ typedef }}</li>
-                {% endfor %}
-            </ul>
-        </div>
     {% endif %}
 {%- endblock content %}
diff --git a/src/pyobo/ssg/term.html b/src/pyobo/ssg/term.html
index 60fa53c5..e6bde377 100644
--- a/src/pyobo/ssg/term.html
+++ b/src/pyobo/ssg/term.html
@@ -2,6 +2,16 @@
 
 {% block title %}{{ term.name or term.identifier }}{% endblock title %}
 
+{% macro display_value(v) %}
+    {% if v.prefix %}
+        <a href="{{ v.bioregistry_link }}">{{ v.curie }}</a>
+    {% elif v.datatype.identifier == "anyURI" %}
+        <a href="{{ v.value }}">{{ v.value }}</a>
+    {% else %}
+        {{ v.value }}
+    {% endif %}
+{% endmacro %}
+
 {% block content -%}
     <div class="card">
         <h5 class="card-header">
@@ -69,11 +79,11 @@ <h5 class="card-header">
                     </dt>
                     <dd>
                         {% if values|length == 1 %}
-                            {{ values[0] }}
+                            {{ display_value(values[0]) }}
                         {% else %}
                             <ul>
                                 {% for value in values %}
-                                    <li>{{ value }}</li>
+                                    <li>{{ display_value(value) }}</li>
                                 {% endfor %}
                             </ul>
                         {% endif %}