diff --git a/app/javascript/controllers/maps_controller.js b/app/javascript/controllers/maps_controller.js index bc3bb93f..2986b5e3 100644 --- a/app/javascript/controllers/maps_controller.js +++ b/app/javascript/controllers/maps_controller.js @@ -20,7 +20,7 @@ import "leaflet-draw"; import { initializeFogCanvas, drawFogCanvas, createFogOverlay } from "../maps/fog_of_war"; import { TileMonitor } from "../maps/tile_monitor"; import BaseController from "./base_controller"; -import { createMapLayer, createAllMapLayers } from "../maps/layers"; +import { createAllMapLayers } from "../maps/layers"; export default class extends BaseController { static targets = ["container"]; @@ -393,15 +393,7 @@ export default class extends BaseController { baseMaps() { let selectedLayerName = this.userSettings.preferred_map_layer || "OpenStreetMap"; - let maps; // Declare the variable first - - if (this.selfHostedValue) { - maps = createAllMapLayers(this.map, selectedLayerName); - } else { - maps = { - OpenStreetMap: createMapLayer(this.map, selectedLayerName, "OpenStreetMap") - }; - } + let maps; createAllMapLayers(this.map, selectedLayerName); // Add custom map if it exists in settings if (this.userSettings.maps && this.userSettings.maps.url) { diff --git a/app/javascript/maps/layers.js b/app/javascript/maps/layers.js index 87501e65..6acf3d77 100644 --- a/app/javascript/maps/layers.js +++ b/app/javascript/maps/layers.js @@ -1,6 +1,5 @@ -// Yeah I know it should be DRY but this is me doing a KISS at 21:00 on a Sunday night - // Import the maps configuration +// In non-self-hosted mode, we need to mount external maps_config.js to the container import { mapsConfig } from './maps_config'; export function createMapLayer(map, selectedLayerName, layerKey) { diff --git a/spec/requests/settings/background_jobs_spec.rb b/spec/requests/settings/background_jobs_spec.rb index 6ed203e4..01c7700e 100644 --- a/spec/requests/settings/background_jobs_spec.rb +++ b/spec/requests/settings/background_jobs_spec.rb @@ -17,7 +17,8 @@ RSpec.describe '/settings/background_jobs', type: :request do it 'redirects to sign in page' do get settings_background_jobs_url - expect(response).to redirect_to(new_user_session_url) + expect(response).to redirect_to(root_url) + expect(flash[:notice]).to eq('You are not authorized to perform this action.') end end