diff --git a/awx/ui/src/api/models/ActivityStream.js b/awx/ui/src/api/models/ActivityStream.js index 99b65bc634..68f748dc18 100644 --- a/awx/ui/src/api/models/ActivityStream.js +++ b/awx/ui/src/api/models/ActivityStream.js @@ -3,7 +3,7 @@ import Base from '../Base'; class ActivityStream extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/activity_stream/'; + this.baseUrl = 'api/v2/activity_stream/'; } } diff --git a/awx/ui/src/api/models/AdHocCommands.js b/awx/ui/src/api/models/AdHocCommands.js index 2db8e7ddf8..0bec670de9 100644 --- a/awx/ui/src/api/models/AdHocCommands.js +++ b/awx/ui/src/api/models/AdHocCommands.js @@ -4,7 +4,7 @@ import RunnableMixin from '../mixins/Runnable.mixin'; class AdHocCommands extends RunnableMixin(Base) { constructor(http) { super(http); - this.baseUrl = '/api/v2/ad_hoc_commands/'; + this.baseUrl = 'api/v2/ad_hoc_commands/'; } readCredentials(id) { diff --git a/awx/ui/src/api/models/Applications.js b/awx/ui/src/api/models/Applications.js index a8fe15f694..d53f911dbc 100644 --- a/awx/ui/src/api/models/Applications.js +++ b/awx/ui/src/api/models/Applications.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Applications extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/applications/'; + this.baseUrl = 'api/v2/applications/'; } readTokens(appId, params) { diff --git a/awx/ui/src/api/models/Auth.js b/awx/ui/src/api/models/Auth.js index 5743b4f3d5..cae34f8fc3 100644 --- a/awx/ui/src/api/models/Auth.js +++ b/awx/ui/src/api/models/Auth.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Auth extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/auth/'; + this.baseUrl = 'api/v2/auth/'; } } diff --git a/awx/ui/src/api/models/Config.js b/awx/ui/src/api/models/Config.js index 704bb518ed..ae73f88d65 100644 --- a/awx/ui/src/api/models/Config.js +++ b/awx/ui/src/api/models/Config.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Config extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/config/'; + this.baseUrl = 'api/v2/config/'; this.read = this.read.bind(this); } diff --git a/awx/ui/src/api/models/CredentialInputSources.js b/awx/ui/src/api/models/CredentialInputSources.js index ec09cba267..c82f27a22e 100644 --- a/awx/ui/src/api/models/CredentialInputSources.js +++ b/awx/ui/src/api/models/CredentialInputSources.js @@ -3,7 +3,7 @@ import Base from '../Base'; class CredentialInputSources extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/credential_input_sources/'; + this.baseUrl = 'api/v2/credential_input_sources/'; } } diff --git a/awx/ui/src/api/models/CredentialTypes.js b/awx/ui/src/api/models/CredentialTypes.js index 2af0cd7d97..1c28c56478 100644 --- a/awx/ui/src/api/models/CredentialTypes.js +++ b/awx/ui/src/api/models/CredentialTypes.js @@ -3,7 +3,7 @@ import Base from '../Base'; class CredentialTypes extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/credential_types/'; + this.baseUrl = 'api/v2/credential_types/'; } async loadAllTypes( diff --git a/awx/ui/src/api/models/CredentialTypes.test.js b/awx/ui/src/api/models/CredentialTypes.test.js index d68ff06a0c..885c68a47a 100644 --- a/awx/ui/src/api/models/CredentialTypes.test.js +++ b/awx/ui/src/api/models/CredentialTypes.test.js @@ -20,7 +20,7 @@ describe('CredentialTypesAPI', () => { expect(mockHttp.get).toHaveBeenCalledTimes(1); expect(mockHttp.get.mock.calls[0]).toEqual([ - `/api/v2/credential_types/`, + `api/v2/credential_types/`, { params: { page_size: 200 } }, ]); expect(types).toEqual(typesData); @@ -41,11 +41,11 @@ describe('CredentialTypesAPI', () => { expect(mockHttp.get).toHaveBeenCalledTimes(2); expect(mockHttp.get.mock.calls[0]).toEqual([ - `/api/v2/credential_types/`, + `api/v2/credential_types/`, { params: { page_size: 200 } }, ]); expect(mockHttp.get.mock.calls[1]).toEqual([ - `/api/v2/credential_types/`, + `api/v2/credential_types/`, { params: { page_size: 200, page: 2 } }, ]); expect(types).toHaveLength(4); diff --git a/awx/ui/src/api/models/Credentials.js b/awx/ui/src/api/models/Credentials.js index 1560357bd1..44bfbb9d0a 100644 --- a/awx/ui/src/api/models/Credentials.js +++ b/awx/ui/src/api/models/Credentials.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Credentials extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/credentials/'; + this.baseUrl = 'api/v2/credentials/'; this.readAccessList = this.readAccessList.bind(this); this.readAccessOptions = this.readAccessOptions.bind(this); diff --git a/awx/ui/src/api/models/Dashboard.js b/awx/ui/src/api/models/Dashboard.js index aa1d86340a..06c00f191c 100644 --- a/awx/ui/src/api/models/Dashboard.js +++ b/awx/ui/src/api/models/Dashboard.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Dashboard extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/dashboard/'; + this.baseUrl = 'api/v2/dashboard/'; } readJobGraph(params) { diff --git a/awx/ui/src/api/models/ExecutionEnvironments.js b/awx/ui/src/api/models/ExecutionEnvironments.js index ae3d128ed3..8c2fff9a0c 100644 --- a/awx/ui/src/api/models/ExecutionEnvironments.js +++ b/awx/ui/src/api/models/ExecutionEnvironments.js @@ -3,7 +3,7 @@ import Base from '../Base'; class ExecutionEnvironments extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/execution_environments/'; + this.baseUrl = 'api/v2/execution_environments/'; } readUnifiedJobTemplates(id, params) { diff --git a/awx/ui/src/api/models/Groups.js b/awx/ui/src/api/models/Groups.js index 3f9aa928e0..6677a9e273 100644 --- a/awx/ui/src/api/models/Groups.js +++ b/awx/ui/src/api/models/Groups.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Groups extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/groups/'; + this.baseUrl = 'api/v2/groups/'; this.associateHost = this.associateHost.bind(this); this.createHost = this.createHost.bind(this); diff --git a/awx/ui/src/api/models/Hosts.js b/awx/ui/src/api/models/Hosts.js index ae90bf2826..5fa8cee698 100644 --- a/awx/ui/src/api/models/Hosts.js +++ b/awx/ui/src/api/models/Hosts.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Hosts extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/hosts/'; + this.baseUrl = 'api/v2/hosts/'; this.readFacts = this.readFacts.bind(this); this.readAllGroups = this.readAllGroups.bind(this); diff --git a/awx/ui/src/api/models/InstanceGroups.js b/awx/ui/src/api/models/InstanceGroups.js index 82704c95d1..e28a1694e4 100644 --- a/awx/ui/src/api/models/InstanceGroups.js +++ b/awx/ui/src/api/models/InstanceGroups.js @@ -3,7 +3,7 @@ import Base from '../Base'; class InstanceGroups extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/instance_groups/'; + this.baseUrl = 'api/v2/instance_groups/'; this.associateInstance = this.associateInstance.bind(this); this.disassociateInstance = this.disassociateInstance.bind(this); diff --git a/awx/ui/src/api/models/Instances.js b/awx/ui/src/api/models/Instances.js index 6109f5cbc2..78ea59d1dd 100644 --- a/awx/ui/src/api/models/Instances.js +++ b/awx/ui/src/api/models/Instances.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Instances extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/instances/'; + this.baseUrl = 'api/v2/instances/'; this.readHealthCheckDetail = this.readHealthCheckDetail.bind(this); this.healthCheck = this.healthCheck.bind(this); diff --git a/awx/ui/src/api/models/Inventories.js b/awx/ui/src/api/models/Inventories.js index bf049f911b..d7bd16efce 100644 --- a/awx/ui/src/api/models/Inventories.js +++ b/awx/ui/src/api/models/Inventories.js @@ -4,7 +4,7 @@ import InstanceGroupsMixin from '../mixins/InstanceGroups.mixin'; class Inventories extends InstanceGroupsMixin(Base) { constructor(http) { super(http); - this.baseUrl = '/api/v2/inventories/'; + this.baseUrl = 'api/v2/inventories/'; this.readAccessList = this.readAccessList.bind(this); this.readAccessOptions = this.readAccessOptions.bind(this); diff --git a/awx/ui/src/api/models/InventoryScripts.js b/awx/ui/src/api/models/InventoryScripts.js index 17214cd5fd..030238e67f 100644 --- a/awx/ui/src/api/models/InventoryScripts.js +++ b/awx/ui/src/api/models/InventoryScripts.js @@ -3,7 +3,7 @@ import Base from '../Base'; class InventoryScripts extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/inventory_scripts/'; + this.baseUrl = 'api/v2/inventory_scripts/'; } } diff --git a/awx/ui/src/api/models/InventorySources.js b/awx/ui/src/api/models/InventorySources.js index 479978db13..66ad6dbc91 100644 --- a/awx/ui/src/api/models/InventorySources.js +++ b/awx/ui/src/api/models/InventorySources.js @@ -8,7 +8,7 @@ class InventorySources extends LaunchUpdateMixin( ) { constructor(http) { super(http); - this.baseUrl = '/api/v2/inventory_sources/'; + this.baseUrl = 'api/v2/inventory_sources/'; this.createSchedule = this.createSchedule.bind(this); this.createSyncStart = this.createSyncStart.bind(this); diff --git a/awx/ui/src/api/models/InventoryUpdates.js b/awx/ui/src/api/models/InventoryUpdates.js index 0d917b0aeb..3d2e218720 100644 --- a/awx/ui/src/api/models/InventoryUpdates.js +++ b/awx/ui/src/api/models/InventoryUpdates.js @@ -4,7 +4,7 @@ import RunnableMixin from '../mixins/Runnable.mixin'; class InventoryUpdates extends RunnableMixin(Base) { constructor(http) { super(http); - this.baseUrl = '/api/v2/inventory_updates/'; + this.baseUrl = 'api/v2/inventory_updates/'; this.createSyncCancel = this.createSyncCancel.bind(this); } diff --git a/awx/ui/src/api/models/JobTemplates.js b/awx/ui/src/api/models/JobTemplates.js index da0af7cff5..969ef8c8c3 100644 --- a/awx/ui/src/api/models/JobTemplates.js +++ b/awx/ui/src/api/models/JobTemplates.js @@ -8,7 +8,7 @@ class JobTemplates extends SchedulesMixin( ) { constructor(http) { super(http); - this.baseUrl = '/api/v2/job_templates/'; + this.baseUrl = 'api/v2/job_templates/'; this.createSchedule = this.createSchedule.bind(this); this.launch = this.launch.bind(this); diff --git a/awx/ui/src/api/models/Jobs.js b/awx/ui/src/api/models/Jobs.js index ae3b94cc31..8a064e6251 100644 --- a/awx/ui/src/api/models/Jobs.js +++ b/awx/ui/src/api/models/Jobs.js @@ -4,7 +4,7 @@ import RunnableMixin from '../mixins/Runnable.mixin'; class Jobs extends RunnableMixin(Base) { constructor(http) { super(http); - this.baseUrl = '/api/v2/jobs/'; + this.baseUrl = 'api/v2/jobs/'; this.jobEventSlug = '/job_events/'; } diff --git a/awx/ui/src/api/models/Labels.js b/awx/ui/src/api/models/Labels.js index 0c0126b898..ecc9d078fa 100644 --- a/awx/ui/src/api/models/Labels.js +++ b/awx/ui/src/api/models/Labels.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Labels extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/labels/'; + this.baseUrl = 'api/v2/labels/'; } } diff --git a/awx/ui/src/api/models/Me.js b/awx/ui/src/api/models/Me.js index 77663567e9..b9f7c6c03b 100644 --- a/awx/ui/src/api/models/Me.js +++ b/awx/ui/src/api/models/Me.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Me extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/me/'; + this.baseUrl = 'api/v2/me/'; } } diff --git a/awx/ui/src/api/models/Metrics.js b/awx/ui/src/api/models/Metrics.js index f4451aefd9..8fd7426645 100644 --- a/awx/ui/src/api/models/Metrics.js +++ b/awx/ui/src/api/models/Metrics.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Metrics extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/metrics/'; + this.baseUrl = 'api/v2/metrics/'; } } export default Metrics; diff --git a/awx/ui/src/api/models/NotificationTemplates.js b/awx/ui/src/api/models/NotificationTemplates.js index 69cd5f4022..6b83a46ed1 100644 --- a/awx/ui/src/api/models/NotificationTemplates.js +++ b/awx/ui/src/api/models/NotificationTemplates.js @@ -3,7 +3,7 @@ import Base from '../Base'; class NotificationTemplates extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/notification_templates/'; + this.baseUrl = 'api/v2/notification_templates/'; } test(id) { diff --git a/awx/ui/src/api/models/Notifications.js b/awx/ui/src/api/models/Notifications.js index 68405c0986..6aca721085 100644 --- a/awx/ui/src/api/models/Notifications.js +++ b/awx/ui/src/api/models/Notifications.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Notifications extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/notifications/'; + this.baseUrl = 'api/v2/notifications/'; } } diff --git a/awx/ui/src/api/models/Organizations.js b/awx/ui/src/api/models/Organizations.js index a2baa4f9c8..ac4266d411 100644 --- a/awx/ui/src/api/models/Organizations.js +++ b/awx/ui/src/api/models/Organizations.js @@ -5,7 +5,7 @@ import InstanceGroupsMixin from '../mixins/InstanceGroups.mixin'; class Organizations extends InstanceGroupsMixin(NotificationsMixin(Base)) { constructor(http) { super(http); - this.baseUrl = '/api/v2/organizations/'; + this.baseUrl = 'api/v2/organizations/'; } readAccessList(id, params) { diff --git a/awx/ui/src/api/models/Organizations.test.js b/awx/ui/src/api/models/Organizations.test.js index 7461e53d59..728aa6f365 100644 --- a/awx/ui/src/api/models/Organizations.test.js +++ b/awx/ui/src/api/models/Organizations.test.js @@ -20,7 +20,7 @@ describe('OrganizationsAPI', () => { const testParams = { foo: 'bar' }; const testParamsDuplicates = { foo: ['bar', 'baz'] }; - const mockBaseURL = `/api/v2/organizations/${orgId}/access_list/`; + const mockBaseURL = `api/v2/organizations/${orgId}/access_list/`; await OrganizationsAPI.readAccessList(orgId); await OrganizationsAPI.readAccessList(orgId, testParams); @@ -41,7 +41,7 @@ describe('OrganizationsAPI', () => { const testParams = { foo: 'bar' }; const testParamsDuplicates = { foo: ['bar', 'baz'] }; - const mockBaseURL = `/api/v2/organizations/${orgId}/teams/`; + const mockBaseURL = `api/v2/organizations/${orgId}/teams/`; await OrganizationsAPI.readTeams(orgId); await OrganizationsAPI.readTeams(orgId, testParams); diff --git a/awx/ui/src/api/models/ProjectUpdates.js b/awx/ui/src/api/models/ProjectUpdates.js index 3925ae95e9..aead3b5d0a 100644 --- a/awx/ui/src/api/models/ProjectUpdates.js +++ b/awx/ui/src/api/models/ProjectUpdates.js @@ -4,7 +4,7 @@ import RunnableMixin from '../mixins/Runnable.mixin'; class ProjectUpdates extends RunnableMixin(Base) { constructor(http) { super(http); - this.baseUrl = '/api/v2/project_updates/'; + this.baseUrl = 'api/v2/project_updates/'; } readCredentials(id) { diff --git a/awx/ui/src/api/models/Projects.js b/awx/ui/src/api/models/Projects.js index 1810bb33e5..437da8caca 100644 --- a/awx/ui/src/api/models/Projects.js +++ b/awx/ui/src/api/models/Projects.js @@ -8,7 +8,7 @@ class Projects extends SchedulesMixin( ) { constructor(http) { super(http); - this.baseUrl = '/api/v2/projects/'; + this.baseUrl = 'api/v2/projects/'; this.readAccessList = this.readAccessList.bind(this); this.readAccessOptions = this.readAccessOptions.bind(this); diff --git a/awx/ui/src/api/models/Roles.js b/awx/ui/src/api/models/Roles.js index 3f89c8eb5f..70195891e4 100644 --- a/awx/ui/src/api/models/Roles.js +++ b/awx/ui/src/api/models/Roles.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Roles extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/roles/'; + this.baseUrl = 'api/v2/roles/'; } disassociateUserRole(roleId, userId) { diff --git a/awx/ui/src/api/models/Root.js b/awx/ui/src/api/models/Root.js index e930d3cc59..4fe6384d83 100644 --- a/awx/ui/src/api/models/Root.js +++ b/awx/ui/src/api/models/Root.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Root extends Base { constructor(http) { super(http); - this.baseUrl = '/api/'; + this.baseUrl = 'api/'; this.redirectURL = '/api/v2/config/'; } @@ -31,7 +31,7 @@ class Root extends Base { // automation etc. should relocate this variable file to an importable // location in src prior to building. That said, a raw http call // works for now. - return this.http.get('/static/media/default.strings.json'); + return this.http.get('static/media/default.strings.json'); } } diff --git a/awx/ui/src/api/models/Schedules.js b/awx/ui/src/api/models/Schedules.js index 14b982ba0d..40655c0349 100644 --- a/awx/ui/src/api/models/Schedules.js +++ b/awx/ui/src/api/models/Schedules.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Schedules extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/schedules/'; + this.baseUrl = 'api/v2/schedules/'; } createPreview(data) { diff --git a/awx/ui/src/api/models/Settings.js b/awx/ui/src/api/models/Settings.js index 440013037a..89aad94c00 100644 --- a/awx/ui/src/api/models/Settings.js +++ b/awx/ui/src/api/models/Settings.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Settings extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/settings/'; + this.baseUrl = 'api/v2/settings/'; } readAllOptions() { diff --git a/awx/ui/src/api/models/SystemJobTemplates.js b/awx/ui/src/api/models/SystemJobTemplates.js index f9bd96d661..f99fbb71d7 100644 --- a/awx/ui/src/api/models/SystemJobTemplates.js +++ b/awx/ui/src/api/models/SystemJobTemplates.js @@ -7,7 +7,7 @@ const Mixins = SchedulesMixin(NotificationsMixin(Base)); class SystemJobTemplates extends Mixins { constructor(http) { super(http); - this.baseUrl = '/api/v2/system_job_templates/'; + this.baseUrl = 'api/v2/system_job_templates/'; } launch(id, data) { diff --git a/awx/ui/src/api/models/SystemJobs.js b/awx/ui/src/api/models/SystemJobs.js index 8365f6f65b..aadbfabeb2 100644 --- a/awx/ui/src/api/models/SystemJobs.js +++ b/awx/ui/src/api/models/SystemJobs.js @@ -5,7 +5,7 @@ import RunnableMixin from '../mixins/Runnable.mixin'; class SystemJobs extends RunnableMixin(Base) { constructor(http) { super(http); - this.baseUrl = '/api/v2/system_jobs/'; + this.baseUrl = 'api/v2/system_jobs/'; } readCredentials(id) { diff --git a/awx/ui/src/api/models/Teams.js b/awx/ui/src/api/models/Teams.js index 180c59032c..031718a078 100644 --- a/awx/ui/src/api/models/Teams.js +++ b/awx/ui/src/api/models/Teams.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Teams extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/teams/'; + this.baseUrl = 'api/v2/teams/'; } associateRole(teamId, roleId) { diff --git a/awx/ui/src/api/models/Teams.test.js b/awx/ui/src/api/models/Teams.test.js index 89d8e1caa2..0cfbf652f2 100644 --- a/awx/ui/src/api/models/Teams.test.js +++ b/awx/ui/src/api/models/Teams.test.js @@ -23,7 +23,7 @@ describe('TeamsAPI', () => { expect(mockHttp.post).toHaveBeenCalledTimes(1); expect(mockHttp.post.mock.calls[0]).toContainEqual( - `/api/v2/teams/${teamId}/roles/`, + `api/v2/teams/${teamId}/roles/`, { id: roleId } ); }); @@ -33,7 +33,7 @@ describe('TeamsAPI', () => { expect(mockHttp.post).toHaveBeenCalledTimes(1); expect(mockHttp.post.mock.calls[0]).toContainEqual( - `/api/v2/teams/${teamId}/roles/`, + `api/v2/teams/${teamId}/roles/`, { id: roleId, disassociate: true, diff --git a/awx/ui/src/api/models/Tokens.js b/awx/ui/src/api/models/Tokens.js index 5dd490808d..2b1027d2a2 100644 --- a/awx/ui/src/api/models/Tokens.js +++ b/awx/ui/src/api/models/Tokens.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Tokens extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/tokens/'; + this.baseUrl = 'api/v2/tokens/'; } } diff --git a/awx/ui/src/api/models/UnifiedJobTemplates.js b/awx/ui/src/api/models/UnifiedJobTemplates.js index 79d70610eb..24ea77a0e6 100644 --- a/awx/ui/src/api/models/UnifiedJobTemplates.js +++ b/awx/ui/src/api/models/UnifiedJobTemplates.js @@ -3,7 +3,7 @@ import Base from '../Base'; class UnifiedJobTemplates extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/unified_job_templates/'; + this.baseUrl = 'api/v2/unified_job_templates/'; } } diff --git a/awx/ui/src/api/models/UnifiedJobs.js b/awx/ui/src/api/models/UnifiedJobs.js index 4ba18fdd00..23337f0baf 100644 --- a/awx/ui/src/api/models/UnifiedJobs.js +++ b/awx/ui/src/api/models/UnifiedJobs.js @@ -3,7 +3,7 @@ import Base from '../Base'; class UnifiedJobs extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/unified_jobs/'; + this.baseUrl = 'api/v2/unified_jobs/'; } } diff --git a/awx/ui/src/api/models/Users.js b/awx/ui/src/api/models/Users.js index 22f8f24d32..8fa84ca7a3 100644 --- a/awx/ui/src/api/models/Users.js +++ b/awx/ui/src/api/models/Users.js @@ -3,7 +3,7 @@ import Base from '../Base'; class Users extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/users/'; + this.baseUrl = 'api/v2/users/'; } associateRole(userId, roleId) { diff --git a/awx/ui/src/api/models/Users.test.js b/awx/ui/src/api/models/Users.test.js index bb8c4b4f63..42af942423 100644 --- a/awx/ui/src/api/models/Users.test.js +++ b/awx/ui/src/api/models/Users.test.js @@ -20,7 +20,7 @@ describe('UsersAPI', () => { expect(mockHttp.post).toHaveBeenCalledTimes(1); expect(mockHttp.post.mock.calls[0]).toContainEqual( - `/api/v2/users/${userId}/roles/`, + `api/v2/users/${userId}/roles/`, { id: roleId } ); }); @@ -30,7 +30,7 @@ describe('UsersAPI', () => { expect(mockHttp.post).toHaveBeenCalledTimes(1); expect(mockHttp.post.mock.calls[0]).toContainEqual( - `/api/v2/users/${userId}/roles/`, + `api/v2/users/${userId}/roles/`, { id: roleId, disassociate: true, diff --git a/awx/ui/src/api/models/WorkflowApprovalTemplates.js b/awx/ui/src/api/models/WorkflowApprovalTemplates.js index 83b14784ab..53ca7a74c2 100644 --- a/awx/ui/src/api/models/WorkflowApprovalTemplates.js +++ b/awx/ui/src/api/models/WorkflowApprovalTemplates.js @@ -3,7 +3,7 @@ import Base from '../Base'; class WorkflowApprovalTemplates extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/workflow_approval_templates/'; + this.baseUrl = 'api/v2/workflow_approval_templates/'; } } diff --git a/awx/ui/src/api/models/WorkflowApprovals.js b/awx/ui/src/api/models/WorkflowApprovals.js index 4674d338c5..fc0581f8ce 100644 --- a/awx/ui/src/api/models/WorkflowApprovals.js +++ b/awx/ui/src/api/models/WorkflowApprovals.js @@ -3,7 +3,7 @@ import Base from '../Base'; class WorkflowApprovals extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/workflow_approvals/'; + this.baseUrl = 'api/v2/workflow_approvals/'; } approve(id) { diff --git a/awx/ui/src/api/models/WorkflowJobTemplateNodes.js b/awx/ui/src/api/models/WorkflowJobTemplateNodes.js index b628312d03..eab9c1ddca 100644 --- a/awx/ui/src/api/models/WorkflowJobTemplateNodes.js +++ b/awx/ui/src/api/models/WorkflowJobTemplateNodes.js @@ -3,7 +3,7 @@ import Base from '../Base'; class WorkflowJobTemplateNodes extends Base { constructor(http) { super(http); - this.baseUrl = '/api/v2/workflow_job_template_nodes/'; + this.baseUrl = 'api/v2/workflow_job_template_nodes/'; } createApprovalTemplate(id, data) { diff --git a/awx/ui/src/api/models/WorkflowJobTemplates.js b/awx/ui/src/api/models/WorkflowJobTemplates.js index 9f868534b6..4ec2758653 100644 --- a/awx/ui/src/api/models/WorkflowJobTemplates.js +++ b/awx/ui/src/api/models/WorkflowJobTemplates.js @@ -5,7 +5,7 @@ import NotificationsMixin from '../mixins/Notifications.mixin'; class WorkflowJobTemplates extends SchedulesMixin(NotificationsMixin(Base)) { constructor(http) { super(http); - this.baseUrl = '/api/v2/workflow_job_templates/'; + this.baseUrl = 'api/v2/workflow_job_templates/'; this.createSchedule = this.createSchedule.bind(this); } diff --git a/awx/ui/src/api/models/WorkflowJobs.js b/awx/ui/src/api/models/WorkflowJobs.js index f2799973b0..1214368401 100644 --- a/awx/ui/src/api/models/WorkflowJobs.js +++ b/awx/ui/src/api/models/WorkflowJobs.js @@ -4,7 +4,7 @@ import RunnableMixin from '../mixins/Runnable.mixin'; class WorkflowJobs extends RunnableMixin(Base) { constructor(http) { super(http); - this.baseUrl = '/api/v2/workflow_jobs/'; + this.baseUrl = 'api/v2/workflow_jobs/'; } readNodes(id, params) { diff --git a/awx/ui/src/components/About/About.js b/awx/ui/src/components/About/About.js index 5425c3dd9c..b58c880b51 100644 --- a/awx/ui/src/components/About/About.js +++ b/awx/ui/src/components/About/About.js @@ -41,7 +41,7 @@ function About({ version, isOpen, onClose }) { onClose={onClose} productName={brandName} trademark={`${copyright} ${new Date().getFullYear()} ${redHatInc}`} - brandImageSrc="/static/media/logo-header.svg" + brandImageSrc="static/media/logo-header.svg" brandImageAlt={t`Brand Image`} >
diff --git a/awx/ui/src/components/AppContainer/BrandLogo.js b/awx/ui/src/components/AppContainer/BrandLogo.js
index 1c8667b65d..b3bb8efdfb 100644
--- a/awx/ui/src/components/AppContainer/BrandLogo.js
+++ b/awx/ui/src/components/AppContainer/BrandLogo.js
@@ -14,7 +14,7 @@ const BrandImg = styled.img`
 `;
 
 const BrandLogo = ({ alt }) => (
-  
+  
 );
 
 export default BrandLogo;
diff --git a/awx/ui/src/hooks/useWebsocket.js b/awx/ui/src/hooks/useWebsocket.js
index d57906078d..8010471250 100644
--- a/awx/ui/src/hooks/useWebsocket.js
+++ b/awx/ui/src/hooks/useWebsocket.js
@@ -8,7 +8,7 @@ export default function useWebsocket(subscribeGroups) {
     ws.current = new WebSocket(
       `${window.location.protocol === 'http:' ? 'ws:' : 'wss:'}//${
         window.location.host
-      }/websocket/`
+      }${window.location.pathname}websocket/`
     );
 
     const connect = () => {
diff --git a/awx/ui/src/screens/Job/JobOutput/connectJobSocket.js b/awx/ui/src/screens/Job/JobOutput/connectJobSocket.js
index 58c6fb4ac6..238e890805 100644
--- a/awx/ui/src/screens/Job/JobOutput/connectJobSocket.js
+++ b/awx/ui/src/screens/Job/JobOutput/connectJobSocket.js
@@ -4,7 +4,7 @@ export default function connectJobSocket({ type, id }, onMessage) {
   ws = new WebSocket(
     `${window.location.protocol === 'http:' ? 'ws:' : 'wss:'}//${
       window.location.host
-    }/websocket/`
+    }${window.location.pathname}websocket/`
   );
 
   ws.onopen = () => {
diff --git a/awx/ui/src/screens/Login/Login.js b/awx/ui/src/screens/Login/Login.js
index 19ac8b0b09..d507b7f0fe 100644
--- a/awx/ui/src/screens/Login/Login.js
+++ b/awx/ui/src/screens/Login/Login.js
@@ -32,7 +32,7 @@ import ErrorDetail from 'components/ErrorDetail';
 import { useSession } from 'contexts/Session';
 import { SESSION_REDIRECT_URL } from '../../constants';
 
-const loginLogoSrc = '/static/media/logo-login.svg';
+const loginLogoSrc = 'static/media/logo-login.svg';
 
 const Login = styled(PFLogin)`
   & .pf-c-brand {
diff --git a/awx/ui/src/screens/Login/Login.test.js b/awx/ui/src/screens/Login/Login.test.js
index 7320451b9e..bc168b5e3f 100644
--- a/awx/ui/src/screens/Login/Login.test.js
+++ b/awx/ui/src/screens/Login/Login.test.js
@@ -121,7 +121,7 @@ describe('', () => {
     });
     const { loginHeaderLogo } = await findChildren(wrapper);
     const { alt, src } = loginHeaderLogo.props();
-    expect([alt, src]).toEqual(['AWX', '/static/media/logo-login.svg']);
+    expect([alt, src]).toEqual(['AWX', 'static/media/logo-login.svg']);
   });
 
   test('custom login info handled correctly', async () => {
@@ -152,7 +152,7 @@ describe('', () => {
     });
     const { loginHeaderLogo } = await findChildren(wrapper);
     const { alt, src } = loginHeaderLogo.props();
-    expect([alt, src]).toEqual([null, '/static/media/logo-login.svg']);
+    expect([alt, src]).toEqual([null, 'static/media/logo-login.svg']);
     expect(wrapper.find('AlertModal').length).toBe(1);
   });
 
diff --git a/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.js b/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.js
index 5064646304..e14baa1ae9 100644
--- a/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.js
+++ b/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.js
@@ -107,7 +107,7 @@ function AnalyticsStep() {
       
         {t`Insights