From c0a2d7c94a51920f542b2a61315ae8178e91cdbf Mon Sep 17 00:00:00 2001 From: Clara Ni Date: Wed, 5 Mar 2025 17:53:12 +0100 Subject: [PATCH 1/3] package-lock: remove viteste from ui-charts dev-dependencies Signed-off-by: Clara Ni --- package-lock.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6bcf064..c92b96b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19076,8 +19076,7 @@ "@types/d3-selection": "^3.0.0", "@types/d3-zoom": "^3.0.0", "@types/file-saver": "^2.0.7", - "file-saver": "^2.0.5", - "vitest": "^3.0.2" + "file-saver": "^2.0.5" }, "peerDependencies": { "classnames": ">=2.5", From da7637251a82723793ce2c3a46d6f9b90e7f30b0 Mon Sep 17 00:00:00 2001 From: Clara Ni Date: Wed, 5 Mar 2025 17:51:50 +0100 Subject: [PATCH 2/3] ui-charts: remove Waypoint and WaypointsList stories Signed-off-by: Clara Ni --- .../Manchette/stories/Waypoint.stories.ts | 21 ------------------- .../Manchette/stories/WaypointList.stories.ts | 21 ------------------- 2 files changed, 42 deletions(-) delete mode 100644 ui-charts/src/manchette/Manchette/stories/Waypoint.stories.ts delete mode 100644 ui-charts/src/manchette/Manchette/stories/WaypointList.stories.ts diff --git a/ui-charts/src/manchette/Manchette/stories/Waypoint.stories.ts b/ui-charts/src/manchette/Manchette/stories/Waypoint.stories.ts deleted file mode 100644 index 4d4ca776..00000000 --- a/ui-charts/src/manchette/Manchette/stories/Waypoint.stories.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { Meta, StoryObj } from '@storybook/react'; - -import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-charts/dist/theme.css'; -import { SAMPLE_WAYPOINTS } from './assets/sampleData'; -import Waypoint from '../components/Waypoint'; - -const meta: Meta = { - component: Waypoint, - title: 'Manchette/Waypoint', - tags: ['autodocs'], -}; - -export default meta; -type Story = StoryObj; - -export const Default: Story = { - args: { - waypoint: SAMPLE_WAYPOINTS[0], - }, -}; diff --git a/ui-charts/src/manchette/Manchette/stories/WaypointList.stories.ts b/ui-charts/src/manchette/Manchette/stories/WaypointList.stories.ts deleted file mode 100644 index afb42f37..00000000 --- a/ui-charts/src/manchette/Manchette/stories/WaypointList.stories.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { Meta, StoryObj } from '@storybook/react'; - -import '@osrd-project/ui-core/dist/theme.css'; -import '@osrd-project/ui-charts/dist/theme.css'; -import { SAMPLE_WAYPOINTS } from './assets/sampleData'; -import WaypointList from '../components/WaypointList'; - -const meta: Meta = { - component: WaypointList, - title: 'Manchette/WaypointList', - tags: ['autodocs'], -}; - -export default meta; -type Story = StoryObj; - -export const Default: Story = { - args: { - contents: SAMPLE_WAYPOINTS, - }, -}; From 588f947eea983d2119d057c033496332ee58a96c Mon Sep 17 00:00:00 2001 From: Clara Ni Date: Wed, 5 Mar 2025 17:52:36 +0100 Subject: [PATCH 3/3] storybook: move manchette's stories into /storybook Signed-off-by: Clara Ni --- .../stories/ManchetteSplit/sampleData.ts | 34 ------------------- .../manchette}/Manchette.stories.tsx | 2 +- .../manchette}/ManchetteSplit.stories.tsx | 10 +++--- .../ui-charts/manchette}/assets/sampleData.ts | 2 +- .../manchetteWithSpaceTimeChart}/Menu.tsx | 0 .../assets/sampleData.ts | 2 +- .../base-with-waypoint-menu.stories.tsx | 15 +++++--- .../base.stories.tsx | 18 ++++++---- .../simple.stories.tsx | 9 +++-- 9 files changed, 33 insertions(+), 59 deletions(-) delete mode 100644 storybook/stories/ManchetteSplit/sampleData.ts rename {ui-charts/src/manchette/Manchette/stories => storybook/stories/ui-charts/manchette}/Manchette.stories.tsx (92%) rename storybook/stories/{ManchetteSplit => ui-charts/manchette}/ManchetteSplit.stories.tsx (82%) rename {ui-charts/src/manchette/Manchette/stories => storybook/stories/ui-charts/manchette}/assets/sampleData.ts (91%) rename {ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories => storybook/stories/ui-charts/manchetteWithSpaceTimeChart}/Menu.tsx (100%) rename {ui-charts/src/manchette/useManchetteWithSpaceTimeChart => storybook/stories/ui-charts/manchetteWithSpaceTimeChart}/assets/sampleData.ts (98%) rename {ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories => storybook/stories/ui-charts/manchetteWithSpaceTimeChart}/base-with-waypoint-menu.stories.tsx (93%) rename {ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories => storybook/stories/ui-charts/manchetteWithSpaceTimeChart}/base.stories.tsx (85%) rename {ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories => storybook/stories/ui-charts/manchetteWithSpaceTimeChart}/simple.stories.tsx (74%) diff --git a/storybook/stories/ManchetteSplit/sampleData.ts b/storybook/stories/ManchetteSplit/sampleData.ts deleted file mode 100644 index 2bb85d51..00000000 --- a/storybook/stories/ManchetteSplit/sampleData.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { type Waypoint } from '@osrd-project/ui-charts'; - -const WAYPOINTS_DATA: Waypoint[] = [ - { - id: 'South_West_station', - name: 'South_West_station', - secondaryCode: 'BV', - position: 0, - weight: 100, - }, - { - id: 'Mid_West_station', - name: 'Mid_West_station', - secondaryCode: 'BV', - position: 13000000, - weight: 30, - }, - { - id: 'Mid_East_station', - name: 'Mid_East_station', - secondaryCode: 'BV', - position: 27550000, - weight: 50, - }, - { - id: 'North_East_station', - name: 'North_East_station', - secondaryCode: 'BV', - position: 47050000, - weight: 100, - }, -]; - -export default WAYPOINTS_DATA; diff --git a/ui-charts/src/manchette/Manchette/stories/Manchette.stories.tsx b/storybook/stories/ui-charts/manchette/Manchette.stories.tsx similarity index 92% rename from ui-charts/src/manchette/Manchette/stories/Manchette.stories.tsx rename to storybook/stories/ui-charts/manchette/Manchette.stories.tsx index 56b50e32..5ee091bd 100644 --- a/ui-charts/src/manchette/Manchette/stories/Manchette.stories.tsx +++ b/storybook/stories/ui-charts/manchette/Manchette.stories.tsx @@ -1,9 +1,9 @@ +import { Manchette } from '@osrd-project/ui-charts'; import '@osrd-project/ui-core/dist/theme.css'; import '@osrd-project/ui-charts/dist/theme.css'; import type { Meta, StoryObj } from '@storybook/react'; import { SAMPLE_WAYPOINTS } from './assets/sampleData'; -import Manchette from '../components/Manchette'; const meta: Meta = { component: Manchette, diff --git a/storybook/stories/ManchetteSplit/ManchetteSplit.stories.tsx b/storybook/stories/ui-charts/manchette/ManchetteSplit.stories.tsx similarity index 82% rename from storybook/stories/ManchetteSplit/ManchetteSplit.stories.tsx rename to storybook/stories/ui-charts/manchette/ManchetteSplit.stories.tsx index 6cf26914..e2b19302 100644 --- a/storybook/stories/ManchetteSplit/ManchetteSplit.stories.tsx +++ b/storybook/stories/ui-charts/manchette/ManchetteSplit.stories.tsx @@ -5,7 +5,7 @@ import { Manchette } from '@osrd-project/ui-charts'; import '@osrd-project/ui-core/dist/theme.css'; import type { Meta, StoryObj } from '@storybook/react'; -import WAYPOINTS_DATA from './sampleData'; +import { SAMPLE_WAYPOINTS } from './assets/sampleData'; const meta: Meta = { component: Manchette, @@ -26,12 +26,12 @@ const customDiv = ( export const Default: Story = { args: { contents: [ - WAYPOINTS_DATA[0], + SAMPLE_WAYPOINTS[0], customDiv, - WAYPOINTS_DATA[1], - WAYPOINTS_DATA[2], + SAMPLE_WAYPOINTS[1], + SAMPLE_WAYPOINTS[2], customDiv, - WAYPOINTS_DATA[3], + SAMPLE_WAYPOINTS[3], customDiv, ], }, diff --git a/ui-charts/src/manchette/Manchette/stories/assets/sampleData.ts b/storybook/stories/ui-charts/manchette/assets/sampleData.ts similarity index 91% rename from ui-charts/src/manchette/Manchette/stories/assets/sampleData.ts rename to storybook/stories/ui-charts/manchette/assets/sampleData.ts index 422a58bb..d4209415 100644 --- a/ui-charts/src/manchette/Manchette/stories/assets/sampleData.ts +++ b/storybook/stories/ui-charts/manchette/assets/sampleData.ts @@ -1,4 +1,4 @@ -import { type Waypoint } from '../../types'; +import { type Waypoint } from '@osrd-project/ui-charts'; export const SAMPLE_WAYPOINTS: Waypoint[] = [ { diff --git a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/Menu.tsx b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/Menu.tsx similarity index 100% rename from ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/Menu.tsx rename to storybook/stories/ui-charts/manchetteWithSpaceTimeChart/Menu.tsx diff --git a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/assets/sampleData.ts b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/assets/sampleData.ts similarity index 98% rename from ui-charts/src/manchette/useManchetteWithSpaceTimeChart/assets/sampleData.ts rename to storybook/stories/ui-charts/manchetteWithSpaceTimeChart/assets/sampleData.ts index 39d83624..68981220 100644 --- a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/assets/sampleData.ts +++ b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/assets/sampleData.ts @@ -1,4 +1,4 @@ -import { type ProjectPathTrainResult, type Waypoint } from '../../Manchette'; +import { type ProjectPathTrainResult, type Waypoint } from '@osrd-project/ui-charts'; export const SAMPLE_WAYPOINTS: Waypoint[] = [ { diff --git a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base-with-waypoint-menu.stories.tsx b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/base-with-waypoint-menu.stories.tsx similarity index 93% rename from ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base-with-waypoint-menu.stories.tsx rename to storybook/stories/ui-charts/manchetteWithSpaceTimeChart/base-with-waypoint-menu.stories.tsx index 62fa8cab..989a66a8 100644 --- a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base-with-waypoint-menu.stories.tsx +++ b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/base-with-waypoint-menu.stories.tsx @@ -1,5 +1,13 @@ import React, { useEffect, useRef, useState } from 'react'; +import { + PathLayer, + SpaceTimeChart, + Manchette, + type ProjectPathTrainResult, + type Waypoint, + useManchetteWithSpaceTimeChart, +} from '@osrd-project/ui-charts'; import { EyeClosed, Telescope } from '@osrd-project/ui-icons'; import type { Meta } from '@storybook/react'; import '@osrd-project/ui-core/dist/theme.css'; @@ -7,11 +15,8 @@ import '@osrd-project/ui-charts/dist/theme.css'; import cx from 'classnames'; import { createPortal } from 'react-dom'; +import { SAMPLE_PATHS_DATA, SAMPLE_WAYPOINTS } from './assets/sampleData'; import Menu, { type MenuItem } from './Menu'; -import { PathLayer, SpaceTimeChart } from '../../../spaceTimeChart'; -import Manchette, { type ProjectPathTrainResult, type Waypoint } from '../../Manchette'; -import { SAMPLE_WAYPOINTS, SAMPLE_PATHS_DATA } from '../assets/sampleData'; -import useManchettesWithSpaceTimeChart from '../hooks/useManchetteWithSpaceTimeChart'; type ManchetteWithSpaceTimeWrapperProps = { waypoints: Waypoint[]; @@ -63,7 +68,7 @@ const ManchetteWithSpaceTimeWrapper = ({ setActiveWaypointId(waypointId); }; - const { manchetteProps, spaceTimeChartProps, handleScroll } = useManchettesWithSpaceTimeChart( + const { manchetteProps, spaceTimeChartProps, handleScroll } = useManchetteWithSpaceTimeChart( waypoints, projectPathTrainResult, manchetteWithSpaceTimeChartRef, diff --git a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base.stories.tsx b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/base.stories.tsx similarity index 85% rename from ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base.stories.tsx rename to storybook/stories/ui-charts/manchetteWithSpaceTimeChart/base.stories.tsx index ffdb2f8d..e31ce94c 100644 --- a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/base.stories.tsx +++ b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/base.stories.tsx @@ -1,14 +1,18 @@ import React, { useRef } from 'react'; -import type { Meta } from '@storybook/react'; - import '@osrd-project/ui-core/dist/theme.css'; import '@osrd-project/ui-charts/dist/theme.css'; +import { + PathLayer, + SpaceTimeChart, + Manchette, + useManchetteWithSpaceTimeChart, + type ProjectPathTrainResult, + type Waypoint, +} from '@osrd-project/ui-charts'; +import type { Meta } from '@storybook/react'; -import { PathLayer, SpaceTimeChart } from '../../../spaceTimeChart'; -import Manchette, { type ProjectPathTrainResult, type Waypoint } from '../../Manchette'; -import { SAMPLE_WAYPOINTS, SAMPLE_PATHS_DATA } from '../assets/sampleData'; -import useManchettesWithSpaceTimeChart from '../hooks/useManchetteWithSpaceTimeChart'; +import { SAMPLE_WAYPOINTS, SAMPLE_PATHS_DATA } from './assets/sampleData'; type ManchetteWithSpaceTimeWrapperProps = { waypoints: Waypoint[]; @@ -25,7 +29,7 @@ const ManchetteWithSpaceTimeWrapper = ({ }: ManchetteWithSpaceTimeWrapperProps) => { const manchetteWithSpaceTimeChartRef = useRef(null); - const { manchetteProps, spaceTimeChartProps, handleScroll } = useManchettesWithSpaceTimeChart( + const { manchetteProps, spaceTimeChartProps, handleScroll } = useManchetteWithSpaceTimeChart( waypoints, projectPathTrainResult, manchetteWithSpaceTimeChartRef, diff --git a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/simple.stories.tsx b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/simple.stories.tsx similarity index 74% rename from ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/simple.stories.tsx rename to storybook/stories/ui-charts/manchetteWithSpaceTimeChart/simple.stories.tsx index 3b5c0881..331b75b6 100644 --- a/ui-charts/src/manchette/useManchetteWithSpaceTimeChart/stories/simple.stories.tsx +++ b/storybook/stories/ui-charts/manchetteWithSpaceTimeChart/simple.stories.tsx @@ -1,10 +1,9 @@ -import type { Meta } from '@storybook/react'; - -import '@osrd-project/ui-core/dist/theme.css'; +import { ManchetteWithSpaceTimeChart } from '@osrd-project/ui-charts'; import '@osrd-project/ui-charts/dist/theme.css'; +import '@osrd-project/ui-core/dist/theme.css'; +import type { Meta } from '@storybook/react'; -import { SAMPLE_WAYPOINTS, SAMPLE_PATHS_DATA } from '../assets/sampleData'; -import ManchetteWithSpaceTimeChart from '../components/ManchetteWithSpaceTimeChart'; +import { SAMPLE_WAYPOINTS, SAMPLE_PATHS_DATA } from './assets/sampleData'; const meta: Meta = { title: 'Manchette with SpaceTimeChart/simple',