front: fix authentication problem for layer requests

OpenRailAssociation · Oct 4, 2023 · 343166e · 343166e
1 parent 94719b0
commit 343166e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/front/src/common/Map/WarpedMap/WarpedMap.tsx b/front/src/common/Map/WarpedMap/WarpedMap.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { useSelector } from 'react-redux';
 import React, { FC, useEffect, useMemo, useState } from 'react';
 import { groupBy, map, omit } from 'lodash';
@@ -21,7 +20,7 @@ import { EditorSource, SourcesDefinitionsIndex } from 'common/Map/Layers/GeoJSON
 import OrderedLayer, { OrderedLayerProps } from 'common/Map/Layers/OrderedLayer';
 import { genOSMLayerProps } from 'common/Map/Layers/OSM';
 import osmBlankStyle from 'common/Map/Layers/osmBlankStyle';
-import { Viewport } from 'reducers/map';
+import { transformMapRequest, Viewport } from 'reducers/map';
 import { getMap } from 'reducers/map/selectors';
 import { AllowancesSettings, Train } from 'reducers/osrdsimulation/types';
 
@@ -146,7 +145,7 @@ const WarpedMap: FC<{
       onMove={(e) => {
         setViewport({
           ...e.viewState,
-          transformMapRequest: undefined,
+          transformRequest: transformMapRequest,
           width: e.target.getContainer().offsetWidth,
           height: e.target.getContainer().offsetHeight,
         });

diff --git a/front/src/reducers/map/index.ts b/front/src/reducers/map/index.ts
@@ -25,11 +25,11 @@ export const UPDATE_LAYERS_SETTINGS = 'osrdconf/UPDATE_LAYERS_SETTINGS';
 export const UPDATE_SIGNALS_SETTINGS = 'osrdconf/UPDATE_SIGNALS_SETTINGS';
 export const UPDATE_TERRAIN_3D_EXAGGERATION = 'osrdconf/UPDATE_TERRAIN_3D_EXAGGERATION';
 
-const transformMapRequest: MapProps['transformRequest'] = (url, resourceType) =>
+export const transformMapRequest: MapProps['transformRequest'] = (url, resourceType) =>
   helperTransformRequest(url, resourceType, MAP_URL);
 
 export type Viewport = ViewState & {
-  transformMapRequest: MapProps['transformRequest'];
+  transformRequest: MapProps['transformRequest'];
   width: number;
   height: number;
 };
@@ -97,7 +97,7 @@ export const initialState: MapState = {
     padding: { top: 0, left: 0, bottom: 0, right: 0 },
     width: 0,
     height: 0,
-    transformMapRequest,
+    transformRequest: transformMapRequest,
   },
   featureInfoHoverID: undefined,
   featureInfoClickID: undefined,
@@ -136,7 +136,7 @@ export default function reducer(inputState: MapState | undefined, action: AnyAct
         draft.viewport = { ...draft.viewport, ...action.viewport };
         break;
       case UPDATE_TRANSFORM_REQUEST:
-        draft.viewport.transformMapRequest = transformMapRequest;
+        draft.viewport.transformRequest = transformMapRequest;
         break;
       case UPDATE_MAPSTYLE:
         draft.mapStyle = action.mapStyle;