migrate to axios, front-end part of configurable ServerAddress

webUI/react/src/util/client.tsx

@@ -1,10 +1,26 @@
-import axios from 'axios';
-import storage from './storage';
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-const clientMaker = () => axios.create({
-    baseURL: storage.getItem('baseURL', 'http://127.0.0.1:4567'),
+import axios from 'axios';
+import storage from './localStorage';
+
+const { hostname, port, protocol } = window.location;
+
+// if port is 3000 it's probably running from webpack devlopment server
+let inferredPort;
+if (port === '3000') { inferredPort = '4567'; } else { inferredPort = port; }
+
+const client = axios.create({
+    // baseURL must not have traling slash
+    baseURL: storage.getItem('serverBaseURL', `${protocol}//${hostname}:${inferredPort}`),
 });
 
-const client = clientMaker();
+client.interceptors.request.use((config) => {
+    if (config.data instanceof FormData) {
+        Object.assign(config.headers, { 'Content-Type': 'multipart/form-data' });
+    }
+    return config;
+});
 
 export default client;

webUI/react/src/util/localStorage.tsx

@@ -1,14 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 function getItem<T>(key: string, defaultValue: T) : T {
     try {
         const item = window.localStorage.getItem(key);
 
-        if (item !== null) { return JSON.parse(item); }
+        if (item !== null) {
+            return JSON.parse(item);
+        }
 
         window.localStorage.setItem(key, JSON.stringify(defaultValue));
-    } finally {
-        // eslint-disable-next-line no-unsafe-finally
-        return defaultValue;
-    }
+
+        /* eslint-disable no-empty */
+    } finally { }
+    return defaultValue;
 }
 
 function setItem<T>(key: string, value: T): void {
@@ -16,7 +22,7 @@ function setItem<T>(key: string, value: T): void {
         window.localStorage.setItem(key, JSON.stringify(value));
 
         // eslint-disable-next-line no-empty
-    } catch (error) { }
+    } finally { }
 }
 
 export default { getItem, setItem };

webUI/react/src/util/useLocalStorage.tsx

@@ -3,39 +3,17 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import { useState, Dispatch, SetStateAction } from 'react';
+import storage from './localStorage';
 
 // eslint-disable-next-line max-len
-export default function useLocalStorage<T>(key: string, initialValue: T) : [T, Dispatch<SetStateAction<T>>] {
-    // State to store our value
-    // Pass initial state function to useState so logic is only executed once
-    const [storedValue, setStoredValue] = useState<T>(() => {
-        try {
-        // Get from local storage by key
-            const item = window.localStorage.getItem(key);
+export default function useLocalStorage<T>(key: string, defaultValue: T) : [T, Dispatch<SetStateAction<T>>] {
+    const [storedValue, setStoredValue] = useState<T>(storage.getItem(key, defaultValue));
 
-            // Parse stored json or if null return set and return initialValue
-            if (item !== null) { return JSON.parse(item); }
-
-            window.localStorage.setItem(key, JSON.stringify(initialValue));
-        } finally {
-            // eslint-disable-next-line no-unsafe-finally
-            return initialValue;
-        }
-    });
-
-    // Return a wrapped version of useState's setter function that ...
-    // ... persists the new value to localStorage.
     const setValue = (value: T | ((prevState: T) => T)) => {
-        try {
         // Allow value to be a function so we have same API as useState
-            const valueToStore = value instanceof Function ? value(storedValue) : value;
-            // Save state
-            setStoredValue(valueToStore);
-            // Save to local storage
-            window.localStorage.setItem(key, JSON.stringify(valueToStore));
-
-        // eslint-disable-next-line no-empty
-        } catch (error) { }
+        const valueToStore = value instanceof Function ? value(storedValue) : value;
+        setStoredValue(valueToStore);
+        storage.setItem(key, valueToStore);
     };
 
     return [storedValue, setValue];