From: Avan Thakkar <athakkar@localhost.localdomain>
Date: Wed, 5 May 2021 18:58:46 +0000 (+0530)
Subject: mgr/dashboard: dashboard not working with a URL prefix
X-Git-Tag: v16.2.5~74^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86cd1a6e4e27c28c8ec3316bc75afd95aa6da3ff;p=ceph.git

mgr/dashboard: dashboard not working with a URL prefix

Fixes: https://tracker.ceph.com/issues/50655
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 94c9840ed094e0b63530daca0f2679095caa74fb)
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
index 2f59a0175ac7..970f3a112e16 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
@@ -1,3 +1,4 @@
+import { APP_BASE_HREF } from '@angular/common';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { ErrorHandler, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
@@ -39,6 +40,10 @@ import { SharedModule } from './shared/shared.module';
       provide: HTTP_INTERCEPTORS,
       useClass: ApiInterceptorService,
       multi: true
+    },
+    {
+      provide: APP_BASE_HREF,
+      useValue: '/' + (window.location.pathname.split('/', 1)[1] || '')
     }
   ],
   bootstrap: [AppComponent]
diff --git a/src/pybind/mgr/dashboard/frontend/src/index.html b/src/pybind/mgr/dashboard/frontend/src/index.html
index bfd6d3ecd837..183202cfed4a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/index.html
+++ b/src/pybind/mgr/dashboard/frontend/src/index.html
@@ -4,10 +4,6 @@
   <meta charset="utf-8">
   <title>Ceph</title>
 
-  <script>
-    document.write('<base href="' + document.location+ '" />');
-  </script>
-
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <link rel="icon" type="image/x-icon" id="cdFavicon" href="favicon.ico">
 </head>