Update Mesh.js to allow for running AWX at non-root path (URL prefixi…

…ng) (#14020) Co-authored-by: Michael Abashian <[email protected]>
ansible · Jun 5, 2023 · 9009a21 · 9009a21
1 parent aafd4df
commit 9009a21
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/awx/ui/src/api/models/JobEvents.js b/awx/ui/src/api/models/JobEvents.js
@@ -3,7 +3,7 @@ import Base from '../Base';
 class JobEvents extends Base {
   constructor(http) {
     super(http);
-    this.baseUrl = '/api/v2/job_events/';
+    this.baseUrl = 'api/v2/job_events/';
   }
 
   readChildren(id, params) {

diff --git a/awx/ui/src/api/models/Mesh.js b/awx/ui/src/api/models/Mesh.js
@@ -3,7 +3,7 @@ import Base from '../Base';
 class Mesh extends Base {
   constructor(http) {
     super(http);
-    this.baseUrl = '/api/v2/mesh_visualizer/';
+    this.baseUrl = 'api/v2/mesh_visualizer/';
   }
 }
 export default Mesh;
diff --git a/awx/ui/src/api/models/Root.js b/awx/ui/src/api/models/Root.js
@@ -4,7 +4,7 @@ class Root extends Base {
   constructor(http) {
     super(http);
     this.baseUrl = 'api/';
-    this.redirectURL = '/api/v2/config/';
+    this.redirectURL = 'api/v2/config/';
   }
 
   async login(username, password, redirect = this.redirectURL) {

diff --git a/awx/ui/src/api/models/Root.test.js b/awx/ui/src/api/models/Root.test.js
@@ -35,7 +35,7 @@ describe('RootAPI', () => {
 
     expect(mockHttp.post).toHaveBeenCalledTimes(2);
     expect(mockHttp.post.mock.calls[0]).toContainEqual(
-      'username=foo&password=bar&next=%2Fapi%2Fv2%2Fconfig%2F'
+      'username=foo&password=bar&next=api%2Fv2%2Fconfig%2F'
     );
     expect(mockHttp.post.mock.calls[1]).toContainEqual(
       'username=foo&password=bar&next=baz'