From fba5f7df8be1c6bea001b292c074d22a154e4382 Mon Sep 17 00:00:00 2001
From: "Claudio Maggioni (maggicl)" <maggicl@kolabnow.ch>
Date: Fri, 20 Nov 2020 23:58:45 +0100
Subject: [PATCH] Clustering now filters the results

---
 ui/index.html |  8 +++++---
 ui/search.js  | 47 +++++++++++++++++++++++++++++++----------------
 ui/style.css  | 14 +++++++++++---
 3 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 3b76618..daa32da 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -24,8 +24,9 @@
     <main>
       <div id="visualization"></div>
       <div id="docs">
-        <div style="grid-column: 1 / 5; text-align: center; padding: 2em;
-          background: #CCC;">
+        <div style="grid-column: 1 / calc(var(--columns) + 1);
+                    text-align: center; padding: 2em;
+                    background: #CCC;">
           Input your query in the search box above and then press Enter.
           Result clustering will appear on the left sidebar.
         </div>
@@ -34,9 +35,10 @@
         <div class="document" id="doc{{ id }}">
           <a class="img_box" href="{{ url }}" target="_blank"
             style="background-image: url({{ url }})"/></a>
+          <div class="description">
           <h2><a href="{{ site_url }}">{{ title }}</a></h2>
           <h3>By {{ author }}</h3>
-          {{ description }}
+          {{ description }}</div>
         </div>
       </template>
     </div>
diff --git a/ui/search.js b/ui/search.js
index fabbdca..e4a2d45 100644
--- a/ui/search.js
+++ b/ui/search.js
@@ -1,13 +1,17 @@
 // vim: set ts=2 sw=2 et tw=80:
 
+const solr = "http://localhost:8983/solr/photo";
+
+const q =            document.querySelector("#q");
+const docs =         document.querySelector("#docs");
+const templateHTML = document.querySelector("#document").innerHTML;
+
 const urlParams = new URLSearchParams(window.location.search);
 const query = urlParams.get('q');
-const solr = "http://localhost:8983/solr/photo";
-const q = document.querySelector("#q");
-const templateHTML = document.querySelector("#document").innerHTML;
-const docs = document.querySelector("#docs");
+
 let foamtree = null;
 let queryResult = null;
+let docMap = {}
 
 function buildCard(docData) {
   const emptyOr = s => s ? s : "";
@@ -20,21 +24,31 @@ function buildCard(docData) {
     .replaceAll("{{ site_url }}", "#");
 }
 
-function updateResults() {
-	docs.innerHTML = queryResult.response.docs.map(d => {
+function updateResults(docList) {
+	docs.innerHTML = docList.map(d => {
 	  return buildCard(d);
-	}).reduce((a, b) => a + b, "");
+	}).reduce((a, b) => a.trim() + b.trim(), "");
+  //docs.innerHTML += "<div class='document white'></div>".repeat(28);
+}
+
+function filterGroup(info) {
+  if (info.groups.length == 0) {
+    updateResults(queryResult.response.docs);
+    return;
+  }
+
+  const list = [].concat(...info.groups.map(e => e.docs)).map(id => docMap[id]);
+  updateResults(list);
 }
 
 async function buildQuery(e) {
   if (e) e.preventDefault();
-  let docMap = {}
 
   let list = await fetch(solr + "/clustering?q=" + q.value);
   queryResult = await list.json();
   console.log(queryResult);
 
-  updateResults();
+  updateResults(queryResult.response.docs);
   for (const e of queryResult.response.docs) {
     docMap[e.id] = e;
   }
@@ -43,20 +57,18 @@ async function buildQuery(e) {
     return {
       label: e.labels[0],
       weight: e.score,
-      groups: e.docs.map(id => {
-        return { id, label: docMap[id].t_title };
-      })
+      docs: e.docs,
     };
   });
 
+
   if (foamtree === null) {
     foamtree = new CarrotSearchFoamTree({
       id: "visualization",
       layout: "squarified",
       groupLabelFontFamily: "Fira Sans",
-      dataObject: {
-        groups: clusters
-      }
+      dataObject: { groups: clusters },
+      onGroupSelectionChanged: [filterGroup],
     });
   } else {
     foamtree.set({ dataObject: { groups: clusters }});
@@ -65,7 +77,10 @@ async function buildQuery(e) {
 
 if (query) {
   q.value = query;
-  buildQuery().catch(console.error);
+  window.addEventListener("load", () => buildQuery().catch(console.error));
 }
 
 document.querySelector("#form").addEventListener("submit", buildQuery);
+window.addEventListener('resize', () => {
+  if (foamtree) foamtree.resize()
+});
diff --git a/ui/style.css b/ui/style.css
index 756fd70..8e6fe33 100644
--- a/ui/style.css
+++ b/ui/style.css
@@ -52,7 +52,7 @@ main {
   flex: 2;
   display: grid;
   grid-template-columns: repeat(var(--columns),1fr);
-  overflow-y: scroll;
+  overflow-y: auto;
 }
 
 .title {
@@ -77,15 +77,16 @@ main {
 }
 
 .document {
-  float: left;
   margin: .25rem;
   background: #CCC;
   border-radius: .125rem;
   text-align: center;
   max-width: calc((100vw - 16rem - 20px) / var(--columns) + 1rem);
-  max-width: calc((100vw - 16rem - 20px) / var(--columns) + 1rem);
+  max-height: calc((100vw - 16rem - 20px) / var(--columns) + 20rem);
 }
 
+.document.white { background: white; height: 1rem; }
+
 .document .img_box {
   background: #222;
   padding: .5rem;
@@ -98,6 +99,13 @@ main {
   background-size: cover;
 }
 
+.document .description {
+  bottom: 0;
+  margin-top: .5rem;
+  max-height: 20rem;
+  overflow-y: auto;
+}
+
 .document p {
   word-wrap: break-word;
 }