Applying same console fix for the subpath issue

api/configure_operator.go

@@ -276,7 +276,8 @@ var (
 	subPathOnce sync.Once
 )
 
-func getSubPath() string {
+// GetSubPath is the sub-path where Operator UI will run
+func GetSubPath() string {
 	subPathOnce.Do(func() {
 		subPath = parseSubPath(env.Get(SubPath, ""))
 	})
@@ -317,7 +318,7 @@ func replaceBaseInIndex(indexPageBytes []byte, basePath string) []byte {
 
 // handleSPA handles the serving of the React Single Page Application
 func handleSPA(w http.ResponseWriter, r *http.Request) {
-	basePath := "/"
+	basePath := GetSubPath()
 	// For SPA mode we will replace root base with a sub path if configured unless we received cp=y and cpb=/NEW/BASE
 	if v := r.URL.Query().Get("cp"); v == "y" {
 		if base := r.URL.Query().Get("cpb"); base != "" {
@@ -344,11 +345,11 @@ func handleSPA(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// if we have a seeded basePath. This should override CONSOLE_SUBPATH every time, thus the `if else`
-	if basePath != "/" {
+	if basePath != GetSubPath() {
 		indexPageBytes = replaceBaseInIndex(indexPageBytes, basePath)
 		// if we have a custom subpath replace it in
-	} else if getSubPath() != "/" {
-		indexPageBytes = replaceBaseInIndex(indexPageBytes, getSubPath())
+	} else if GetSubPath() != "/" {
+		indexPageBytes = replaceBaseInIndex(indexPageBytes, GetSubPath())
 	}
 	indexPageBytes = replaceLicense(indexPageBytes)
 
@@ -365,7 +366,7 @@ func handleSPA(w http.ResponseWriter, r *http.Request) {
 // wrapHandlerSinglePageApplication handles a http.FileServer returning a 404 and overrides it with index.html
 func wrapHandlerSinglePageApplication(h http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path == "/" {
+		if match, _ := regexp.MatchString(fmt.Sprintf("^%s/?$", GetSubPath()), r.URL.Path); match {
 			handleSPA(w, r)
 			return
 		}
@@ -383,15 +384,16 @@ func wrapHandlerSinglePageApplication(h http.Handler) http.HandlerFunc {
 func FileServerMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Server", globalAppName) // do not add version information
+		basePath := GetSubPath()
 		switch {
-		case strings.HasPrefix(r.URL.Path, "/api"):
+		case strings.HasPrefix(r.URL.Path, basePath+"api"):
 			next.ServeHTTP(w, r)
 		default:
 			buildFs, err := fs.Sub(webApp.GetStaticAssets(), "build")
 			if err != nil {
 				panic(err)
 			}
-			wrapHandlerSinglePageApplication(requestBounce(http.FileServer(http.FS(buildFs)))).ServeHTTP(w, r)
+			wrapHandlerSinglePageApplication(requestBounce(http.StripPrefix(basePath, http.FileServer(http.FS(buildFs))))).ServeHTTP(w, r)
 		}
 	})
 }

cmd/operator/ui.go

@@ -103,6 +103,10 @@ func buildOperatorServer() (*api.Server, error) {
 		return nil, err
 	}
 
+	subPath := api.GetSubPath()
+	swaggerSpec.Spec().BasePath = subPath + swaggerSpec.Spec().BasePath
+	swaggerSpec.OrigSpec().BasePath = subPath + swaggerSpec.OrigSpec().BasePath
+
 	operatorapi := operations.NewOperatorAPI(swaggerSpec)
 	operatorapi.Logger = api.LogInfo
 	server := api.NewServer(operatorapi)

web-app/src/api/index.ts

@@ -2,6 +2,7 @@ import { Api, Error, FullRequestParams, HttpResponse } from "./operatorApi";
 
 export let api = new Api();
 const internalRequestFunc = api.request;
+api.baseUrl = `${new URL(document.baseURI).pathname}api/v1`;
 api.request = async <T = any, E = any>({
   body,
   secure,