diff --git a/package-lock.json b/package-lock.json index 0917aa1..105b24f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@floating-ui/react": "^0.27.19", "@primer/octicons-react": "^19.27.0", "gd-eventlog": "^0.1.27", - "incyclist-services": "^1.9.28", + "incyclist-services": "^1.9.29", "leaflet": "^1.9.4", "leaflet-geosearch": "^4.4.0", "react": "^19.2.6", @@ -7235,9 +7235,9 @@ } }, "node_modules/incyclist-services": { - "version": "1.9.28", - "resolved": "https://registry.npmjs.org/incyclist-services/-/incyclist-services-1.9.28.tgz", - "integrity": "sha512-qySSSQm/WHSinnvo6sJVU5hMTTWcOofLLW0ZBg2aIGClZhFShOZl6b05tqGY9jmHeYkQ4WWUim0tDIX6L1VfsQ==", + "version": "1.9.29", + "resolved": "https://registry.npmjs.org/incyclist-services/-/incyclist-services-1.9.29.tgz", + "integrity": "sha512-hEtRjlbfz57v1lJk40mmTmKrzSd2a3arl7SFYIvdGT9Pk11pdFj/XayUNdgjppcOaPCJ3O2ADUas8tUePjJHoA==", "dependencies": { "@garmin/fitsdk": "^21.221.0", "axios": "^1.21.1", diff --git a/package.json b/package.json index 4963b06..3d5bf78 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@floating-ui/react": "^0.27.19", "@primer/octicons-react": "^19.27.0", "gd-eventlog": "^0.1.27", - "incyclist-services": "^1.9.28", + "incyclist-services": "^1.9.29", "leaflet": "^1.9.4", "leaflet-geosearch": "^4.4.0", "react": "^19.2.6", diff --git a/src/components/modules/workout/WorkoutImport/WorkoutImportDialog.jsx b/src/components/modules/workout/WorkoutImport/WorkoutImportDialog.jsx new file mode 100644 index 0000000..56d1d67 --- /dev/null +++ b/src/components/modules/workout/WorkoutImport/WorkoutImportDialog.jsx @@ -0,0 +1,78 @@ +import React, { useCallback, useEffect, useRef, useState } from 'react' +import { getWorkoutListPageService } from 'incyclist-services' +import { EventLogger } from 'gd-eventlog' +import { ErrorBoundary } from '../../../atoms' +import { WorkoutImportDialogView } from './WorkoutImportDialogView' + +const logger = new EventLogger('WorkoutImportDialog') + +/** + * Smart import dialog. The phase and its data come from the workout list page service + * (`getImportDisplayProps()`, refreshed on every 'import-update'), the dialog only reports user actions. + * + * The parent owns the open/closed state: it mounts this component to open the dialog and + * unmounts it from `onClose`. Every way out (Done, Close, Cancel, Esc, outside click, unmount) + * ends the import flow in the service exactly once. + * + * props: `source` ('button' | 'page-drop', used for logging only), `onClose` + */ +export const WorkoutImportDialog = ({ source, onClose }) => { + const service = getWorkoutListPageService() + const [displayProps, setDisplayProps] = useState(() => service.getImportDisplayProps()) + + const refPhase = useRef(displayProps?.phase) + const refClosed = useRef(false) + refPhase.current = displayProps?.phase + + useEffect(() => { + logger.logEvent({ message: 'dialog opened', source, phase: refPhase.current }) + }, [source]) + + useEffect(() => { + const observer = service.getPageObserver() + const onUpdate = () => { setDisplayProps(service.getImportDisplayProps()) } + + observer?.on('import-update', onUpdate) + return () => { observer?.off('import-update', onUpdate) } + }, [service]) + + const finish = useCallback((action) => { + if (refClosed.current) + return false + refClosed.current = true + logger.logEvent({ message: 'dialog closed', phase: refPhase.current, action }) + service.onImportClose() + return true + }, [service]) + + // unmounted by the parent without a close action (e.g. navigation) + useEffect(() => () => { finish('unmount') }, [finish]) + + const handleClose = useCallback((action) => { + if (finish(action)) + onClose?.() + }, [finish, onClose]) + + const onFiles = useCallback((files) => { service.onImportFiles(files, 'dialog') }, [service]) + const onPickAnother = useCallback(() => { service.onImportOpen() }, [service]) + const onSetGroup = useCallback((group) => { + const result = service.getImportDisplayProps()?.result ?? displayProps?.result + if (!result) + return + const isNew = !(displayProps?.knownGroups ?? []).includes(group) + logger.logEvent({ message: 'import group changed', group, isNew, eventSource: 'user' }) + service.onImportSetGroup(result.id, group) + }, [service, displayProps]) + + return ( + + + + ) +} diff --git a/src/components/modules/workout/WorkoutImport/WorkoutImportDialog.unit.test.jsx b/src/components/modules/workout/WorkoutImport/WorkoutImportDialog.unit.test.jsx new file mode 100644 index 0000000..8755432 --- /dev/null +++ b/src/components/modules/workout/WorkoutImport/WorkoutImportDialog.unit.test.jsx @@ -0,0 +1,117 @@ +import React from 'react' +import { describe, test, expect, vi, beforeEach } from 'vitest' +import { render, screen, fireEvent, act } from '@testing-library/react' +import { WorkoutImportDialog } from './WorkoutImportDialog' + +const { service, observer, state } = vi.hoisted(() => { + const listeners = {} + return { + state: { props: { phase: 'landing', knownGroups: [] } }, + observer: { + listeners, + on: vi.fn((evt, cb) => { (listeners[evt] ??= []).push(cb) }), + off: vi.fn((evt, cb) => { listeners[evt] = (listeners[evt] ?? []).filter(l => l !== cb) }), + }, + service: { + getImportDisplayProps: vi.fn(), + getPageObserver: vi.fn(), + onImportFiles: vi.fn(), + onImportOpen: vi.fn(), + onImportSetGroup: vi.fn(), + onImportClose: vi.fn(), + }, + } +}) + +vi.mock('incyclist-services', async (importOriginal) => { + const actual = await importOriginal() + return { ...actual, getWorkoutListPageService: () => service } +}) + +vi.mock('./WorkoutImportDialogView', () => ({ + WorkoutImportDialogView: ({ displayProps, onClose, onFiles, onPickAnother, onSetGroup }) => ( +
+ phase:{displayProps.phase} + + + + + +
+ ), +})) + +const emit = (evt) => act(() => { (observer.listeners[evt] ?? []).forEach(l => l()) }) + +describe('WorkoutImportDialog', () => { + + beforeEach(() => { + vi.clearAllMocks() + observer.listeners['import-update'] = [] + state.props = { phase: 'landing', knownGroups: ['Sweet', 'VO2'] } + service.getImportDisplayProps.mockImplementation(() => state.props) + service.getPageObserver.mockReturnValue(observer) + }) + + test('renders the initial phase from the service', () => { + render() + expect(screen.getByText('phase:landing')).toBeTruthy() + }) + + test('renders the phase the service is already in (drop)', () => { + state.props = { phase: 'importing', knownGroups: [] } + render() + expect(screen.getByText('phase:importing')).toBeTruthy() + }) + + test('re-reads the display props on import-update', () => { + render() + state.props = { phase: 'result', result: { id: 'w1' }, knownGroups: ['Sweet'] } + emit('import-update') + expect(screen.getByText('phase:result')).toBeTruthy() + }) + + test('onFiles and onPickAnother go to the service', () => { + render() + fireEvent.click(screen.getByText('files')) + expect(service.onImportFiles).toHaveBeenCalledWith(['f'], 'dialog') + fireEvent.click(screen.getByText('another')) + expect(service.onImportOpen).toHaveBeenCalledTimes(1) + }) + + test('onSetGroup passes the result id and the group', () => { + state.props = { phase: 'result', result: { id: 'w1', group: 'VO2' }, knownGroups: ['Sweet', 'VO2'] } + render() + fireEvent.click(screen.getByText('group')) + expect(service.onImportSetGroup).toHaveBeenCalledWith('w1', 'Sweet') + }) + + test('close ends the import, then reports onClose; unmount does not close again', () => { + const onClose = vi.fn() + const order = [] + service.onImportClose.mockImplementation(() => order.push('service')) + onClose.mockImplementation(() => order.push('parent')) + + const { unmount } = render() + fireEvent.click(screen.getByText('done')) + expect(order).toEqual(['service', 'parent']) + + unmount() + expect(service.onImportClose).toHaveBeenCalledTimes(1) + }) + + test('unmount without a close action closes the import once and does not call onClose', () => { + const onClose = vi.fn() + const { unmount } = render() + unmount() + expect(service.onImportClose).toHaveBeenCalledTimes(1) + expect(onClose).not.toHaveBeenCalled() + }) + + test('removes the import-update listener on unmount', () => { + const { unmount } = render() + const cb = observer.on.mock.calls.find(c => c[0] === 'import-update')[1] + unmount() + expect(observer.off).toHaveBeenCalledWith('import-update', cb) + }) +}) diff --git a/src/components/modules/workout/WorkoutImport/WorkoutImportDialogView.jsx b/src/components/modules/workout/WorkoutImport/WorkoutImportDialogView.jsx new file mode 100644 index 0000000..b601e80 --- /dev/null +++ b/src/components/modules/workout/WorkoutImport/WorkoutImportDialogView.jsx @@ -0,0 +1,290 @@ +import React, { useCallback } from 'react' +import styled from 'styled-components' +import { Button, ButtonBar, ErrorText, ImportIcon, Loader } from '../../../atoms' +import { Dialog, Dropzone, WorkoutGraph } from '../../../molecules' +import { WorkoutCategorySelect } from '../selection/WorkoutCategorySelect' + +// Same fixed box as the Import Routes dialog: one box for every phase, only the content changes +export const WORKOUT_IMPORT_DIALOG_WIDTH = 'min(980px, 70vw)' +export const WORKOUT_IMPORT_DIALOG_HEIGHT = 'min(660px, 75vh)' + +export const WORKOUT_IMPORT_FILTERS = [ + { name: 'Workouts', extensions: ['zwo', 'json'] }, + { name: 'Zwift Workout', extensions: ['zwo'] }, + { name: 'Incyclist Workout', extensions: ['json'] }, +] + +const TITLES = { + landing: 'Import Workout', + importing: 'Importing...', + result: 'Import Successful', + error: 'Import Failed', +} + +const TileArea = styled.div` + display: flex; + align-items: stretch; + justify-content: center; + width: 100%; + height: calc(100% - 7.7vh); + padding: 3vh 2vw 0 2vw; + box-sizing: border-box; +` + +const TileTitle = styled.div` + font-size: 2.2vh; + font-weight: bold; + color: white; +` + +const TileSubline = styled.div` + font-size: 1.5vh; + color: white; + opacity: 0.8; +` + +const TileContent = styled.div` + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 1vh; + padding: 2vh; + text-align: center; +` + +const SUCCESS_COLOR = '#4CAF50' +const ERROR_COLOR = '#D32F2F' +const DEFAULT_GROUP = 'My Workouts' + +// centred panel (importing, error, result without graph) +const Body = styled.div` + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: calc(100% - 7.7vh); + text-align: center; + padding: 2vh 2vw; + box-sizing: border-box; + gap: 2vh; + font-size: 2vh; +` + +// result with graph: header, category, graph +const ResultBody = styled.div` + display: flex; + flex-direction: column; + height: calc(100% - 7.7vh); + padding: 2vh 2vw; + box-sizing: border-box; + font-size: 2vh; +` + +const HeaderRow = styled.div` + display: flex; + flex-direction: row; + align-items: center; + gap: 1.5vw; + margin-bottom: 1.5vh; + font-size: 2vh; + color: white; +` + +const CategoryRow = styled.div` + align-self: ${props => props.$center ? 'center' : 'flex-start'}; + margin-bottom: 1vh; + text-align: left; + + /* keep the selected value readable regardless of the colour inherited from the dialog */ + select, option { + color: #000; + background-color: #fff; + } +` + +const GraphArea = styled.div` + flex: 1; + width: 100%; + min-height: 20vh; +` + +const StatusCircle = styled.div` + flex: none; + display: flex; + align-items: center; + justify-content: center; + box-sizing: border-box; + width: ${props => props.$large ? '12vh' : '2.8vh'}; + height: ${props => props.$large ? '12vh' : '2.8vh'}; + border: ${props => props.$large ? '0.6vh' : '0.2vh'} solid ${props => props.$color}; + border-radius: 50%; + color: ${props => props.$color}; + font-weight: bold; + font-size: ${props => props.$large ? '7vh' : '1.6vh'}; + line-height: 1; +` + +const StatusText = styled.div` + font-size: 2vh; + color: white; +` + +const SuccessCircle = ({ large }) => ( + + + +) + +const ErrorCircle = () => ( + ! +) + +const Landing = ({ onFiles, onCancel }) => { + const onDrop = useCallback((dropInfo) => { + const files = (Array.isArray(dropInfo) ? dropInfo : [dropInfo]).filter(Boolean) + if (files.length > 0) + onFiles?.(files) + }, [onFiles]) + + return ( + <> + + + Choose Workout File + ZWO or JSON + + } + /> + + + , +})) + vi.mock('../../hooks', async (importOriginal) => { const actual = await importOriginal() return { ...actual, useWindowDimensions: () => ({ width: 1000, height: 800 }) } @@ -96,14 +101,13 @@ describe('WorkoutsPage', () => { test('card actions and carousel callbacks are forwarded by id', () => { renderPage() const p = screenCalls.at(-1) - p.onOK('w1', ['f']) + p.onOK('w1') p.onDelete('w1') - p.onRetry('imp') p.onInitialized('myWorkouts', { item: 1, itemsInSlide: 4 }) p.onSlideChanged('myWorkouts', { item: 2, itemsInSlide: 4 }) - expect(service.onCardOK).toHaveBeenCalledWith('w1', ['f']) + expect(service.onCardOK).toHaveBeenCalledWith('w1') expect(service.onDelete).toHaveBeenCalledWith('w1') - expect(service.onRetry).toHaveBeenCalledWith('imp') + expect(screenCalls.at(-1).onRetry).toBeUndefined() expect(service.onCarouselInitialized).toHaveBeenCalledWith('myWorkouts', 1, 4) expect(service.onCarouselUpdated).toHaveBeenCalledWith('myWorkouts', 2, 4) }) @@ -152,4 +156,39 @@ describe('WorkoutsPage', () => { renderPage() expect(screen.queryByText(/steps to create a workout/)).toBeNull() }) + + test('import button opens the import flow and mounts the dialog', () => { + renderPage() + expect(screen.queryByText(/import-dialog/)).toBeNull() + act(() => { screenCalls.at(-1).onImportWorkout() }) + expect(service.onImportOpen).toHaveBeenCalledTimes(1) + expect(screen.getByText('import-dialog:button')).toBeTruthy() + expect(screenCalls.at(-1).dropEnabled).toBe(false) + }) + + test('a page drop hands the files to the service before the dialog mounts', () => { + renderPage() + expect(screenCalls.at(-1).dropEnabled).toBe(true) + service.onImportFiles.mockImplementation(() => { + expect(screen.queryByText(/import-dialog/)).toBeNull() + }) + const files = [{ type: 'url', url: 'file:///a.zwo' }] + act(() => { screenCalls.at(-1).onDropFiles(files) }) + expect(service.onImportFiles).toHaveBeenCalledWith(files, 'page-drop') + expect(screen.getByText('import-dialog:page-drop')).toBeTruthy() + }) + + test('closing the dialog unmounts it and re-enables the drop overlay', () => { + renderPage() + act(() => { screenCalls.at(-1).onImportWorkout() }) + fireEvent.click(screen.getByText('close-import')) + expect(screen.queryByText(/import-dialog/)).toBeNull() + expect(screenCalls.at(-1).dropEnabled).toBe(true) + }) + + test('create-info step 4 points at the Import Workout button', () => { + service.getPageDisplayProperties.mockReturnValue(props({ createInfo: { markAsSeenDefault: true } })) + renderPage() + expect(screen.getByText(/Import Workout button/)).toBeTruthy() + }) }) diff --git a/src/pages/workouts/screen.jsx b/src/pages/workouts/screen.jsx index 32e06c7..2a5428f 100644 --- a/src/pages/workouts/screen.jsx +++ b/src/pages/workouts/screen.jsx @@ -1,6 +1,9 @@ import React, {useEffect, useMemo, useRef, useState } from "react" import MainPage from "../../components/molecules/MainPage" -import { PageTitle,GroupTitle, Loader, Center } from "../../components/atoms" +import { PageTitle,GroupTitle, Loader, Center, Button } from "../../components/atoms" +import { ImportIcon } from "../../components/atoms/Icons/ImportIcon" +import { Dropzone } from "../../components/molecules" +import { WORKOUT_IMPORT_FILTERS } from "../../components/modules/workout/WorkoutImport/WorkoutImportDialogView" import styled from "styled-components" import { Column, Row } from "../../components/atoms/layout/View" import { useKey } from "../../hooks/ui/useKey" @@ -8,8 +11,6 @@ import { useMouseSwipe } from "../../hooks/ui/useMouseSwipe" import { Carousel } from "../../components/atoms/Carousel" import { NavigationBar } from "../../components/molecules/NavigationBar" import { AppThemeProvider } from "../../theme" -import { ActiveImportCard } from "../../components/modules/routeSelection/ActiveImportCard" -import {UploadCard} from '../../components/modules/workout/selection/UploadCard' import {WorkoutCard} from '../../components/modules/workout/selection/WorkoutCard' import { WorkoutCreateCard } from "../../components/modules/workout/selection/CreateCard" import { ScheduledWorkoutCard } from "../../components/modules/workout/selection/ScheduledWorkoutCard" @@ -34,9 +35,67 @@ const ContentArea = styled(Column)` padding-left:40px; padding-right: 40px; overflow-y: hidden; + position: relative; + box-sizing: border-box; ` +// page-level drop overlay, only rendered while a file is dragged over the page +const DropOverlay = styled(Dropzone)` + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + box-sizing: border-box; + margin: 0; + z-index: 20; + background-color: rgba(0,0,0,0.6); + border-width: 3px; + border-color: #dd9933; + border-radius: 8px; + color: white; +` + +const DropOverlayTitle = styled.div` + font-size: 2.4vh; + font-weight: bold; +` + +// title stays centred, the Import button sits on the right +const HeaderLayout = styled.div` + display: grid; + grid-template-columns: 1fr auto 1fr; + align-items: center; + width: 100%; +` + +const TitleCell = styled.div` + grid-column: 2; + white-space: nowrap; +` + +const ImportSlot = styled.div` + grid-column: 3; + justify-self: end; + display: flex; +` + +const HeaderButtonContent = styled.span` + display: inline-flex; + align-items: center; + gap: 0.4em; + flex-shrink: 0; +` + +export const WORKOUT_DROP_OVERLAY_TITLE = 'Drop a workout file (ZWO or JSON)' + +const ImportWorkoutButton = ({ onClick }) => ( + +) + const CardView= styled(Row)` justify-content:center; user-select:none; @@ -76,8 +135,6 @@ export const ListContainer = styled(View)` ` const CARD_COMPONENTS = { - WorkoutImport: UploadCard, - ActiveWorkoutImport: ActiveImportCard, WorkoutCreate: WorkoutCreateCard, Workout: WorkoutCard, ScheduledWorkout: ScheduledWorkoutCard @@ -89,7 +146,7 @@ const callback = (fn, listId, e) => { fn(listId, e) } -const WorkoutList = ({ list, cardSize, itemsFit, responsive, onOK, onDelete, onRetry, +const WorkoutList = ({ list, cardSize, itemsFit, responsive, onOK, onDelete, onInitialized, onUpdated, onSlideChange, onSlideChanged, setScrolling }) => { const [cardData, setCardData] = useState(list.cards) @@ -122,10 +179,9 @@ const WorkoutList = ({ list, cardSize, itemsFit, responsive, onOK, onDelete, onR hidden={!content.visible} onOK={onOK ? (...args) => { onOK(card.id, ...args) } : undefined} onDelete={onDelete ? () => { onDelete(card.id) } : undefined} - onRetry={onRetry ? () => { onRetry(card.id) } : undefined} /> - }).filter(Boolean), [cardData, cardSize, onOK, onDelete, onRetry]) + }).filter(Boolean), [cardData, cardSize, onOK, onDelete]) const header = list.title @@ -160,7 +216,7 @@ export const WorkoutsScreen = ({ loading, cardSize, offset = 0, responsive, itemsFit, width, height, lists, upcoming = null, // eslint-disable-next-line no-unused-vars displayType = 'tiles', - onInitialized, onUpdated, onSlideChange, onSlideChanged, onOK, closePage, onDelete, onRetry }) => { + onInitialized, onUpdated, onSlideChange, onSlideChanged, onOK, closePage, onDelete, onImportWorkout, onDropFiles, dropEnabled = true }) => { const swipeDisabled = useRef(false); // upcoming (scheduled) workouts come first; keyed by list id so the section mounts/unmounts @@ -168,6 +224,36 @@ export const WorkoutsScreen = const allLists = useMemo(() => [...(upcoming ? [upcoming] : []), ...(lists ?? [])], [upcoming, lists]) const refDiv = useRef(null); + // --- page-level drop overlay (same mechanism as the Routes page) --- + const dragDepth = useRef(0) + const [dragActive, setDragActive] = useState(false) + + const onContentDragEnterCapture = (e) => { + e.preventDefault() + dragDepth.current += 1 + if (dragDepth.current === 1) + setDragActive(true) + } + const onContentDragOverCapture = (e) => { e.preventDefault() } + const onContentDragLeaveCapture = () => { + dragDepth.current = Math.max(0, dragDepth.current - 1) + if (dragDepth.current === 0) + setDragActive(false) + } + const onContentDropCapture = (e) => { + // an unhandled drop would navigate the window to the file. Hide the overlay only after the + // event is fully dispatched, otherwise it unmounts before its own drop handler runs. + e.preventDefault() + setTimeout(() => { + dragDepth.current = 0 + setDragActive(false) + }, 0) + } + const onOverlayDrop = (dropInfo) => { + if (typeof onDropFiles === 'function') + onDropFiles(Array.isArray(dropInfo) ? dropInfo : [dropInfo]) + } + const onScrollUp = (pixels)=> { if (swipeDisabled.current===true) @@ -259,14 +345,19 @@ export const WorkoutsScreen = - - Workouts + + + Workouts + + { !loading && cardSize && lists ? allLists.map( list => ) : @@ -276,6 +367,12 @@ export const WorkoutsScreen = { (loading || !cardSize ) ?
:null } + {dragActive && dropEnabled ? + {WORKOUT_DROP_OVERLAY_TITLE}} /> + : null} +
diff --git a/src/pages/workouts/screen.stories.jsx b/src/pages/workouts/screen.stories.jsx index 0db6dc4..5f89751 100644 --- a/src/pages/workouts/screen.stories.jsx +++ b/src/pages/workouts/screen.stories.jsx @@ -7,7 +7,8 @@ export default { argTypes: { onOK: { action: 'OK' }, onDelete: { action: 'delete' }, - onRetry: { action: 'retry' }, + onImportWorkout: { action: 'import workout' }, + onDropFiles: { action: 'drop files' }, }, } @@ -30,7 +31,6 @@ const workout = (id, title, extra = {}) => ({ const myWorkouts = { id: 'myWorkouts', title: 'My Workouts', observer: noObserver, cards: [ - { id: 'Import', cardType: 'WorkoutImport', props: { title: 'Import Workout', filters: [], visible: true } }, { id: 'Create', cardType: 'WorkoutCreate', props: { title: 'Create Workout', visible: true } }, workout('w1', 'Sweet Spot'), ] diff --git a/src/pages/workouts/screen.unit.test.jsx b/src/pages/workouts/screen.unit.test.jsx index 7ded5e6..d9411b3 100644 --- a/src/pages/workouts/screen.unit.test.jsx +++ b/src/pages/workouts/screen.unit.test.jsx @@ -1,6 +1,6 @@ import React from 'react' import { describe, test, expect, vi } from 'vitest' -import { render } from '@testing-library/react' +import { render, screen, fireEvent } from '@testing-library/react' import { WorkoutsScreen } from './screen' vi.mock('../../components/molecules/MainPage', () => ({ default: ({ children }) =>
{children}
})) @@ -9,6 +9,18 @@ vi.mock('../../hooks/ui/useKey', () => ({ useKey: () => {} })) vi.mock('../../hooks/ui/useMouseSwipe', () => ({ useMouseSwipe: () => {} })) vi.mock('../../components/atoms/Carousel', () => ({ Carousel: () =>
})) +// Dropzone relies on native drag/drop internals that jsdom lacks - stubbed so a test can hand over a drop +vi.mock('../../components/molecules', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + Dropzone: (props) => ( +
props.onDrop?.([{ type: 'url', url: 'file:///w/a.zwo' }])}>{props.text}
+ ), + } +}) + const cardSize = { width: 200, height: 300, padding: 0 } const list = (id, title, observer) => ({ id, title, observer, cards: [] }) const renderScreen = (props) => render() @@ -41,4 +53,38 @@ describe('WorkoutsScreen', () => { rerender() expect(observer.on).toHaveBeenCalledTimes(2) }) + + test('renders the Import Workout button and reports clicks', () => { + const onImportWorkout = vi.fn() + renderScreen({ lists: [], onImportWorkout }) + fireEvent.click(screen.getByText('Import Workout')) + expect(onImportWorkout).toHaveBeenCalledTimes(1) + }) + + test('dragging a file over the page shows the drop overlay', () => { + const { container } = renderScreen({ lists: [], dropEnabled: true }) + expect(screen.queryByText('Drop a workout file (ZWO or JSON)')).toBeNull() + fireEvent.dragEnter(container.querySelector('.workouts-page')) + expect(screen.getByText('Drop a workout file (ZWO or JSON)')).toBeTruthy() + }) + + test('the overlay is not shown when drops are disabled', () => { + const { container } = renderScreen({ lists: [], dropEnabled: false }) + fireEvent.dragEnter(container.querySelector('.workouts-page')) + expect(screen.queryByText('Drop a workout file (ZWO or JSON)')).toBeNull() + }) + + test('dropping on the overlay reports the files', () => { + const onDropFiles = vi.fn() + const { container } = renderScreen({ lists: [], dropEnabled: true, onDropFiles }) + fireEvent.dragEnter(container.querySelector('.workouts-page')) + fireEvent.drop(container.querySelector('.workout-drop-overlay')) + expect(onDropFiles).toHaveBeenCalledWith([{ type: 'url', url: 'file:///w/a.zwo' }]) + }) + + test('no Import card is rendered even if the service passes one', () => { + const l = { id: 'myWorkouts', title: 'My Workouts', cards: [{ id: 'Import', cardType: 'WorkoutImport', props: { title: 'Import Workout', visible: true } }] } + const { container } = renderScreen({ lists: [l] }) + expect(container.querySelectorAll('.item').length).toBe(0) + }) })