front: select op with map when add train #9790

theocrsb · 2024-11-20T12:51:13Z

-bold pr on hover (for PRs on same track)
-select pr on map and choose track

depends: #9800 and #10157
closes https://github.com/osrd-project/osrd-confidential/issues/777

codecov-commenter · 2024-11-25T08:04:56Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.50%. Comparing base (41e05a4) to head (549d3a7).

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@             Coverage Diff             @@
##              dev    #9790       +/-   ##
===========================================
+ Coverage   79.94%   87.50%    +7.56%     
===========================================
  Files        1057       31     -1026     
  Lines      106302     1537   -104765     
  Branches      724        0      -724     
===========================================
- Hits        84982     1345    -83637     
+ Misses      21278      192    -21086     
+ Partials       42        0       -42

Flag	Coverage Δ
editoast	`?`
front	`?`
gateway	`?`
osrdyne	`?`
railjson_generator	`87.50% <ø> (ø)`
tests	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

front/src/modules/pathfinding/helpers/getStepLocation.ts

Uriel-Sautron · 2024-12-23T11:23:23Z

.../modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx

+import {
+  osrdEditoastApi,
+  type OperationalPoint,
+  type OperationalPointReference,


OperationalPointReference is not used

.../modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx

clarani · 2024-12-20T10:30:02Z

front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx

@@ -144,12 +145,12 @@ const Map = ({

  const onFeatureClick = (e: MapLayerMouseEvent) => {
    if (preventPointSelection) return;
-    const result = getMapMouseEventNearestFeature(e, { layersId: ['chartis/tracks-geo/main'] });
+    const result = getMapMouseEventNearestFeature(e);


As you have removed the layers which are clickable, I can select all lines and points (signals, dectectors etc)

clarani · 2024-12-20T10:35:27Z

front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx

@@ -103,6 +103,7 @@ const Map = ({

  const [mapIsLoaded, setMapIsLoaded] = useState(false);

+  const [operationnalPointId, setOperationnalPointId] = useState<string | undefined>(undefined);


add hovered in the name

operational has only 1 n 😉

Suggested change

const [operationnalPointId, setOperationnalPointId] = useState<string | undefined>(undefined);

const [hoveredOperationalPointId, setHoveredOperationalPointId] = useState<string | undefined>(undefined);

clarani · 2024-12-23T16:05:24Z

...les/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/AddPathStepPopup.tsx

+      if (isOperationalPoint) {
+        const trackId = featureInfoClick.feature.properties?.track_id;
+
+        const clickedTrack = await getTrackEntity({


Can you remove getTrackEntity by getInfraObjectEntity since you use it to fetch operational points and track sections ?

clarani · 2024-12-23T16:07:37Z

...les/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/AddPathStepPopup.tsx

+          body: [trackId],
+        }).unwrap();
+
+        const { parts } = result[0].railjson as OperationalPoint;


You can reuse this const l115 and 116 (we should avoid anys ;) )

Suggested change

const { parts } = result[0].railjson as OperationalPoint;

const operationalPoint = result[0].railjson as OperationalPoint;

You're right, it's done

clarani · 2024-12-23T16:09:23Z

...les/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/AddPathStepPopup.tsx

+          tracks: trackPartCoordinates,
+        });
+      } else {
+        setClickedOp(undefined);


I think it would be nice to reset clickedOp and offset before calling calculateOffset in the hook.

Can you rename the function by the way ?

-bold pr on hover (for PRs on same track) -select pr on map and choose track Signed-off-by: theocrsb <[email protected]>

theocrsb assigned younesschrifi and theocrsb Nov 20, 2024

theocrsb force-pushed the tce/select-op-on-map branch 2 times, most recently from 5f47a24 to 3de78a8 Compare November 25, 2024 08:02

github-actions bot added the area:front Work on Standard OSRD Interface modules label Nov 25, 2024

theocrsb force-pushed the tce/select-op-on-map branch 3 times, most recently from 635d7fa to b1c1b48 Compare November 29, 2024 14:59

theocrsb force-pushed the tce/select-op-on-map branch 8 times, most recently from c0f0025 to 8bdbaf3 Compare December 10, 2024 16:27

theocrsb force-pushed the tce/select-op-on-map branch 3 times, most recently from 1030168 to b4648bb Compare December 17, 2024 09:29

theocrsb requested review from SharglutDev and Uriel-Sautron December 17, 2024 09:32

theocrsb force-pushed the tce/select-op-on-map branch 5 times, most recently from f323ca1 to 9a2eea0 Compare December 19, 2024 10:08

theocrsb requested a review from clarani December 19, 2024 10:08

theocrsb marked this pull request as ready for review December 20, 2024 08:02

theocrsb requested a review from a team as a code owner December 20, 2024 08:02

theocrsb mentioned this pull request Dec 20, 2024

front: refacto before selecting a PR #10157

Merged

3 tasks

Uriel-Sautron reviewed Dec 23, 2024

View reviewed changes

theocrsb force-pushed the tce/select-op-on-map branch from 9a2eea0 to 425029f Compare December 23, 2024 14:02

clarani reviewed Dec 23, 2024

View reviewed changes

clarani reviewed Dec 24, 2024

View reviewed changes

front: select op with map when add train

192380d

-bold pr on hover (for PRs on same track) -select pr on map and choose track Signed-off-by: theocrsb <[email protected]>

theocrsb force-pushed the tce/select-op-on-map branch from 48a5197 to 192380d Compare December 24, 2024 09:14

theocrsb added 2 commits December 24, 2024 10:54

fixup! front: select op with map when add train

0c38cde

fixup! front: select op with map when add train

549d3a7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

front: select op with map when add train #9790

front: select op with map when add train #9790

theocrsb commented Nov 20, 2024 •

edited

Loading

codecov-commenter commented Nov 25, 2024 •

edited

Loading

Uriel-Sautron Dec 23, 2024

theocrsb Dec 23, 2024

clarani Dec 20, 2024

clarani Dec 20, 2024

theocrsb Dec 23, 2024

clarani Dec 23, 2024

theocrsb Dec 24, 2024

clarani Dec 23, 2024

theocrsb Dec 24, 2024

clarani Dec 23, 2024

		@@ -103,6 +103,7 @@ const Map = ({

		const [mapIsLoaded, setMapIsLoaded] = useState(false);

		const [operationnalPointId, setOperationnalPointId] = useState<string \| undefined>(undefined);

	const [operationnalPointId, setOperationnalPointId] = useState<string \| undefined>(undefined);
	const [hoveredOperationalPointId, setHoveredOperationalPointId] = useState<string \| undefined>(undefined);

	const { parts } = result[0].railjson as OperationalPoint;
	const operationalPoint = result[0].railjson as OperationalPoint;

front: select op with map when add train #9790

Are you sure you want to change the base?

front: select op with map when add train #9790

Conversation

theocrsb commented Nov 20, 2024 • edited Loading

codecov-commenter commented Nov 25, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theocrsb commented Nov 20, 2024 •

edited

Loading

codecov-commenter commented Nov 25, 2024 •

edited

Loading