Support serving diag ui from subfolders

cschleiden · web-flow · commit de2eff03928e · 2022-05-05T22:28:37.000Z
diff --git a/samples/web/web.go b/samples/web/web.go
@@ -33,7 +33,10 @@ func main() {
 	// }
 
 	// Start diagnostic server
-	go http.ListenAndServe(":8080", web.NewMux(b))
+	m := http.NewServeMux()
+	// m.Handle("/diag", http.StripPrefix("/diag", web.NewMux(b)))
+	m.Handle("/", web.NewMux(b))
+	go http.ListenAndServe(":8080", m)
 
 	// Run worker
 	w := RunWorker(ctx, b)
diff --git a/web/app/build/asset-manifest.json b/web/app/build/asset-manifest.json
@@ -1,13 +1,13 @@
 {
   "files": {
-    "main.css": "/static/css/main.8b0db0ad.css",
-    "main.js": "/static/js/main.b40cb526.js",
-    "index.html": "/index.html",
-    "main.8b0db0ad.css.map": "/static/css/main.8b0db0ad.css.map",
-    "main.b40cb526.js.map": "/static/js/main.b40cb526.js.map"
+    "main.css": "./static/css/main.8b0db0ad.css",
+    "main.js": "./static/js/main.99032ea1.js",
+    "index.html": "./index.html",
+    "main.8b0db0ad.css.map": "./static/css/main.8b0db0ad.css.map",
+    "main.99032ea1.js.map": "./static/js/main.99032ea1.js.map"
   },
   "entrypoints": [
     "static/css/main.8b0db0ad.css",
-    "static/js/main.b40cb526.js"
+    "static/js/main.99032ea1.js"
   ]
 }
diff --git a/web/app/build/index.html b/web/app/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>go-workflows</title><script defer="defer" src="/static/js/main.b40cb526.js"></script><link href="/static/css/main.8b0db0ad.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>go-workflows</title><script defer="defer" src="./static/js/main.99032ea1.js"></script><link href="./static/css/main.8b0db0ad.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/web/app/build/static/js/main.99032ea1.js b/web/app/build/static/js/main.99032ea1.js
diff --git a/web/app/build/static/js/main.99032ea1.js.LICENSE.txt b/web/app/build/static/js/main.99032ea1.js.LICENSE.txt
diff --git a/web/app/build/static/js/main.99032ea1.js.map b/web/app/build/static/js/main.99032ea1.js.map
diff --git a/web/app/build/static/js/main.b40cb526.js.map b/web/app/build/static/js/main.b40cb526.js.map
diff --git a/web/app/package.json b/web/app/package.json
@@ -47,6 +47,7 @@
     ]
   },
   "proxy": "http://localhost:8080",
+  "homepage": ".",
   "devDependencies": {
     "@types/react-router-bootstrap": "^0.24.5",
     "rimraf": "3.0.2"
diff --git a/web/app/public/index.html b/web/app/public/index.html
@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <title>go-workflows</title>
diff --git a/web/app/src/Home.tsx b/web/app/src/Home.tsx
@@ -1,10 +1,9 @@
-import { Link, useLocation } from "react-router-dom";
+import React from "react";
 import { Pagination, Table } from "react-bootstrap";
-
+import useFetch from "react-fetch-hook";
 import { LinkContainer } from "react-router-bootstrap";
-import React from "react";
+import { Link, useLocation } from "react-router-dom";
 import { WorkflowInstanceRef } from "./client";
-import useFetch from "react-fetch-hook";
 
 function useQuery() {
   const { search } = useLocation();
@@ -20,7 +19,9 @@ function Home() {
   const previousId = query.get("previous");
 
   const { isLoading, data, error } = useFetch<WorkflowInstanceRef[]>(
-    `/api?count=${count}` + (afterId ? `&after=${afterId || previousId}` : "")
+    document.location.pathname +
+      `api/?count=${count}` +
+      (afterId ? `&after=${afterId || previousId}` : "")
   );
 
   return (
diff --git a/web/app/src/Instance.tsx b/web/app/src/Instance.tsx
@@ -21,7 +21,7 @@ function Instance() {
   const instanceId = params.instanceId;
 
   const { isLoading, data: instance } = useFetch<WorkflowInstanceInfo>(
-    "/api/" + instanceId
+    document.location.pathname + "api/" + instanceId
   );
 
   if (isLoading || !instance) {
diff --git a/web/app/src/index.tsx b/web/app/src/index.tsx
@@ -1,16 +1,16 @@
 import "bootstrap/dist/css/bootstrap.css";
 import React from "react";
 import ReactDOM from "react-dom/client";
-import { BrowserRouter } from "react-router-dom";
+import { HashRouter } from "react-router-dom";
 import App from "./App";
 
 const root = ReactDOM.createRoot(
   document.getElementById("root") as HTMLElement
 );
 root.render(
   <React.StrictMode>
-    <BrowserRouter>
+    <HashRouter>
       <App />
-    </BrowserRouter>
+    </HashRouter>
   </React.StrictMode>
 );

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>go-workflows</title><script defer="defer" src="/static/js/main.b40cb526.js"></script><link href="/static/css/main.8b0db0ad.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>`
	`1`	`+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>go-workflows</title><script defer="defer" src="./static/js/main.99032ea1.js"></script><link href="./static/css/main.8b0db0ad.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@`
`47`	`47`	`]`
`48`	`48`	`},`
`49`	`49`	`"proxy": "http://localhost:8080",`
	`50`	`+ "homepage": ".",`
`50`	`51`	`"devDependencies": {`
`51`	`52`	`"@types/react-router-bootstrap": "^0.24.5",`
`52`	`53`	`"rimraf": "3.0.2"`