From 9009a21a329cb5b35c480fe416ce1a70717827e1 Mon Sep 17 00:00:00 2001
From: rakesh561 <rakesh561@gmail.com>
Date: Mon, 5 Jun 2023 11:46:12 -0400
Subject: [PATCH] Update Mesh.js to allow for running AWX at non-root path (URL
 prefixing) (#14020)

Co-authored-by: Michael Abashian <mabashia@redhat.com>
---
 awx/ui/src/api/models/JobEvents.js | 2 +-
 awx/ui/src/api/models/Mesh.js      | 2 +-
 awx/ui/src/api/models/Root.js      | 2 +-
 awx/ui/src/api/models/Root.test.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/ui/src/api/models/JobEvents.js b/awx/ui/src/api/models/JobEvents.js
index dad879af8963..b4640e388721 100644
--- 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
index d7ad08067c68..0dc201f8e316 100644
--- 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
index 4fe6384d8339..543bf130edd5 100644
--- 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
index dd2d820c4f38..6107ead67c8d 100644
--- 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'