From a3c276020087e64ccda615044c0d5c08575e74bc Mon Sep 17 00:00:00 2001
From: Abram Booth <boothaa@gmail.com>
Date: Thu, 23 May 2024 09:01:32 -0400
Subject: [PATCH] wip

---
 trove/render/html_browse.py    | 23 ++++++++++++-----------
 trove/static/css/browse.css    | 10 ++++++++++
 trove/trovesearch_gathering.py |  4 ++++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/trove/render/html_browse.py b/trove/render/html_browse.py
index e4c799490..da48cfa3c 100644
--- a/trove/render/html_browse.py
+++ b/trove/render/html_browse.py
@@ -87,12 +87,8 @@ def __mediatype_link(self, mediatype: str):
                     _link.text = 'documented use'
                     _link.tail = ')'
 
-    def __render_subj(self, subj_iri: str, twopledict=None, start_collapsed=False):
-        _twopledict = (
-            self.data.get(subj_iri, {})
-            if twopledict is None
-            else twopledict
-        )
+    def __render_subj(self, subj_iri: str, start_collapsed=False):
+        _twopledict = self.data.get(subj_iri, {})
         with self.__visiting(subj_iri):
             with self.__h_tag() as _h_tag:
                 with self.__nest(
@@ -169,13 +165,15 @@ def __literal(self, literal: primitive_rdf.Literal):
             for _datatype in literal.datatype_iris
         )
         # TODO: checksum_iri, literal_iri
-        with self.__nest('article'):
+        with self.__nest('article', attrs={'class': 'Browse__literal'}):
             if _is_markdown:
                 # TODO: tests for safe_mode
                 _html = markdown2.markdown(literal.unicode_value, safe_mode='escape')
                 self.__current_element.append(etree_fromstring(f'<q>{_html}</q>'))
             else:
                 self.__leaf('q', text=literal.unicode_value)
+            for _datatype_iri in literal.datatype_iris:
+                self.__leaf_link(_datatype_iri, attrs={'class': 'Browse__datatype'})
 
     def __sequence(self, sequence_twoples: frozenset):
         _obj_in_order = list(primitive_rdf.sequence_objects_in_order(sequence_twoples))
@@ -262,11 +260,14 @@ def __leaf(self, tag_name, *, text=None, attrs=None):
         if text is not None:
             _leaf_element.text = text
 
-    def __nest_link(self, iri: str):
-        return self.__nest('a', attrs={'href': self.__href_for_iri(iri)})
+    def __nest_link(self, iri: str, *, attrs=None):
+        return self.__nest('a', attrs={
+            **(attrs or {}),
+            'href': self.__href_for_iri(iri),
+        })
 
-    def __leaf_link(self, iri: str):
-        with self.__nest_link(iri) as _link:
+    def __leaf_link(self, iri: str, *, attrs=None):
+        with self.__nest_link(iri, attrs=attrs) as _link:
             _link.text = self.iri_shorthand.compact_iri(iri)
 
     def __href_for_iri(self, iri: str):
diff --git a/trove/static/css/browse.css b/trove/static/css/browse.css
index fb2714c21..33448d3ed 100644
--- a/trove/static/css/browse.css
+++ b/trove/static/css/browse.css
@@ -90,6 +90,16 @@
     gap: 0.382rem;
 }
 
+.Browse__literal {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 0.191rem;
+}
+
+.Browse__datatype {
+}
+
 /*
 .Browse :focus-within {
     backdrop-filter: hue-rotate(var(--hue-rotate-step));
diff --git a/trove/trovesearch_gathering.py b/trove/trovesearch_gathering.py
index 9ab856251..ce53c38b2 100644
--- a/trove/trovesearch_gathering.py
+++ b/trove/trovesearch_gathering.py
@@ -251,6 +251,10 @@ def gather_card(focus, *, use_osfmap_json, **kwargs):
             yield (TROVE.focusIdentifier, literal(_iri))
         for _triple in iter_tripleset(_indexcard_rdf.as_rdf_tripledict()):
             yield (TROVE.resourceMetadata, QuotedTriple(*_triple))
+        yield (
+            TROVE.resourceMetadata,
+            QuotedTriple(_indexcard_rdf.focus_iri, FOAF.primaryTopicOf, _indexcard_iri)
+        )
 
 
 ###