1 files changed, 27 insertions, 6 deletions

diff --git a/src/client/apis/hypothesis/HypothesisApiUtils.ts b/src/client/apis/hypothesis/HypothesisApiUtils.ts
index bf9f4ea99..fe35f5831 100644
--- a/src/client/apis/hypothesis/HypothesisApiUtils.ts
+++ b/src/client/apis/hypothesis/HypothesisApiUtils.ts
@@ -1,7 +1,20 @@
 import { StrCast } from "../../../fields/Types";
 
 export namespace Hypothesis {
-    export const getAnnotation = async (username: String, searchKeyWord: String) => {
+    export const fetchAnnotation = async (annotationId: string) => {
+        const response = await fetch(`https://api.hypothes.is/api/annotations/${annotationId}`);
+        if (response.ok) {
+            return response.json();
+        } else {
+            throw new Error('DASH: Error in fetchAnnotation GET request');
+        }
+    };
+
+    /**
+     * Searches for annotations made by @param username that 
+     * contain @param searchKeyWord 
+     */
+    export const searchAnnotation = async (username: String, searchKeyWord: String) => {
         const base = 'https://api.hypothes.is/api/search';
         const request = base + `?user=acct:${username}@hypothes.is&text=${searchKeyWord}`;
         console.log("DASH Querying " + request);
@@ -9,21 +22,29 @@ export namespace Hypothesis {
         if (response.ok) {
             return response.json();
         } else {
-            throw new Error('DASH: Error in GET request');
+            throw new Error('DASH: Error in searchAnnotation GET request');
         }
     };
 
+    // Find the most recent placeholder annotation created, and return its ID
     export const getPlaceholderId = async (username: String, searchKeyWord: String) => {
-        const getResponse = await Hypothesis.getAnnotation(username, searchKeyWord);
+        const getResponse = await Hypothesis.searchAnnotation(username, searchKeyWord);
         const id = getResponse.rows.length > 0 ? getResponse.rows[0].id : undefined;
         return StrCast(id);
     };
 
     // Send request to Hypothes.is client to modify a placeholder annotation into a hyperlink to Dash
-    export const dispatchLinkRequest = (title: string, url: string, annotationId: string) => {
+    export const dispatchLinkRequest = async (title: string, url: string, annotationId: string) => {
+        const apiKey = "6879-GHmtDG_P2kmWNKM3hcHptEUZX3VMOUePkamCaOrJbSw";
+
+        const oldAnnotation = await fetchAnnotation(annotationId);
+        const oldText = StrCast(oldAnnotation.text);
+        const newHyperlink = `[${title}\n](${url})`;
+        const newText = oldText === "placeholder" ? newHyperlink : oldText + '\n\n' + newHyperlink;
+
         console.log("DASH dispatching linkRequest");
-        document.dispatchEvent(new CustomEvent<{ url: string, title: string, id: string }>("linkRequest", {
-            detail: { url: url, title: title, id: annotationId },
+        document.dispatchEvent(new CustomEvent<{ newText: string, id: string, apiKey: string }>("linkRequest", {
+            detail: { newText: newText, id: annotationId, apiKey: apiKey },
             bubbles: true
         }));
     };