From 89cf58e8c7b3dba7aa370926999910008e0ddf8c Mon Sep 17 00:00:00 2001
From: Richard Bowman <richard.bowman@cantab.net>
Date: Fri, 1 Dec 2023 01:45:22 +0000
Subject: [PATCH] Prepend thing description base URL

---
 webapp/src/wot-client.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/webapp/src/wot-client.js b/webapp/src/wot-client.js
index d5aa375d..3f3ff923 100644
--- a/webapp/src/wot-client.js
+++ b/webapp/src/wot-client.js
@@ -53,11 +53,13 @@ export const wotStoreModule = {
     }
   },
   getters: {
+    thingDescriptions: state => {
+      return state.thingDescriptions;
+    },
     thingDescription: state => thingName => {
       return state.thingDescriptions[thingName];
     },
     thingAvailable: state => thingName => {
-      console.log("thingAvailable", thingName, state.thingDescriptions)
       return thingName in state.thingDescriptions;
     },
     thingFormUrl: state => (thing, affordanceType, affordance, op) => {
@@ -65,7 +67,19 @@ export const wotStoreModule = {
       let td = state.thingDescriptions[thing];
       if (!td) return null;
       let affordances = td[affordanceType];
-      return findForm(affordances[affordance], op);
+      let href = findFormHref(affordances[affordance], op);
+      if (href == undefined) return undefined;
+
+      // If we've found an href, prepend the `base` URL if appropriate
+      if (href.startsWith("http")) return href;
+      if ("base" in td) {
+        let base = td.base;
+        if (href.startsWith("/")) href = href.slice(1);
+        if (!base.endsWith("/"))
+          base += "/";
+        return base + href;
+      }
+      return href;
     },
     thingPropertyUrl: (_state, getters) => (thing, property, op) => {
       // Find the URL for a particular property
@@ -78,7 +92,7 @@ export const wotStoreModule = {
   }
 };
 
-export function findForm(affordance, op) {
+export function findFormHref(affordance, op) {
   // Find the form in the affordance that matches the given operation type
   let forms = affordance.forms;
   let matchingForm = forms.find(f => f.op == op || f.op.includes(op));