Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.27",
"incyclist-services": "^1.9.28",
"leaflet": "^1.9.4",
"leaflet-geosearch": "^4.4.0",
"react": "^19.2.6",
Expand Down
4 changes: 2 additions & 2 deletions src/components/atoms/Buttons/Icon/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const Label = styled(Text)`
`


export const Icon = ( {image,size,imageFormat='svg',color,margin,padding, label, id,backgroundHover, width,height, background,children,onClick, raw,logContext})=>{
export const Icon = ( {image,size,imageFormat='svg',color,margin,padding, label, id,backgroundHover, width,height, background,children,onClick, raw,logContext,ariaLabel})=>{

const src = `${image}`
const widthStr = width ? (typeof width ==='number' ? `${width}px`: width) : undefined
Expand Down Expand Up @@ -91,7 +91,7 @@ export const Icon = ( {image,size,imageFormat='svg',color,margin,padding, label,
return (

<AppThemeProvider>
<View onClick={onClick} id={id??label} no3D={true} backgroundHover={backgroundHover} width={widthStr} height={heightStr} background={background} margin={margin} padding={padding} logContext={logContext}>
<View onClick={onClick} id={id??label} no3D={true} backgroundHover={backgroundHover} width={widthStr} height={heightStr} background={background} margin={margin} padding={padding} logContext={logContext} aria-label={ariaLabel}>
{children?
renderChildren() :
<Svg src={src} fill={color} width={imageSize} height={imageSize} />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import styled from 'styled-components'
import { Button, ButtonBar, Column, Divider, ErrorBoundary, Loader, Row, Text } from '../../../atoms'
import { Dialog, FreeMap } from '../../../molecules'
import { formatDateTime, useActivityList} from 'incyclist-services'
import { Dialog, FreeMap, AttachmentChip } from '../../../molecules'
import { formatDateTime, getActivitiesPageService, useActivityList} from 'incyclist-services'
import { ActivityGraph,FilePill,UploadPill,ScreenshotPopup} from '../../../molecules/Activity'
import { EventLogger } from 'gd-eventlog'
import { useAppUI } from '../../../../bindings/native-ui'
Expand All @@ -26,8 +26,8 @@ const GraphRow = styled(Row)`

export const ActivityDetails = ({activity, units, title,started,duration, distance, elevation,logs, points,
showMap,startPos,segment,loading,
canStart, canOpen,exports, uploads,
onCancel, onStart, onOpen, onOpenUpload, onOpenExport,onDelete, onExport, onUpload}) => {
canStart, canOpen,exports, uploads, attachedWorkout,
onCancel, onStart, onAddWorkout, onClearWorkout, onOpen, onOpenUpload, onOpenExport,onDelete, onExport, onUpload}) => {

const [dialogState,setDialogState] = useState(null)
const logger = useRef(new EventLogger('ActivityDetails')).current
Expand Down Expand Up @@ -82,6 +82,14 @@ export const ActivityDetails = ({activity, units, title,started,duration, distan
}
}

const onAddWorkoutClicked = async () => {
await close();

if (typeof onAddWorkout === 'function') {
onAddWorkout()
}
}

const onDeleteClicked = async () => {
await close();

Expand Down Expand Up @@ -257,6 +265,7 @@ export const ActivityDetails = ({activity, units, title,started,duration, distan

<Dialog width='90vw' height='90vh' id='ActivityDetails' log={{title:title}} title={title} /*onOutsideClicked={onUserCancel}*/ zIndex={100} onESC={onCancelClicked}>
<ContentArea>
{canStart && attachedWorkout ? <AttachmentChip label='Workout' name={attachedWorkout.title} onClear={onClearWorkout} margin='0 1vw'/> : null}
<Row height='33%'>
<Column width='50%' margin='0 1vw 0 1vw'>
{showMap ? <FreeMap
Expand Down Expand Up @@ -332,6 +341,7 @@ export const ActivityDetails = ({activity, units, title,started,duration, distan
</ContentArea>
<ButtonBar justify='center'>
<Button text='Ride Again' onClick={onStartClicked} disabled={!canStart} />
{canStart && !attachedWorkout ? <Button text='Add Workout' onClick={onAddWorkoutClicked} /> : null}
<Button text='Open' onClick={onOpenClicked} disabled={!canOpen} />
<Button text='Close' onClick={onCancelClicked} />
<Button text='Delete' onClick={onDeleteClicked} margin='0 0 0 4vw' />
Expand All @@ -343,13 +353,14 @@ export const ActivityDetails = ({activity, units, title,started,duration, distan

}

export const ActivityDetailsDialog = ({onOpen,onStart})=> {
export const ActivityDetailsDialog = ({onOpen,onStart,onAddWorkout})=> {

const service = useActivityList()
const ui = useAppUI()

const [state,setState] = useState(null)
const [loading,setLoading] = useState(false)
const [attachedWorkout,setAttachedWorkout] = useState(null)
const mountedRef = useRef()
const observerRef = useRef()

Expand All @@ -360,8 +371,20 @@ export const ActivityDetailsDialog = ({onOpen,onStart})=> {
},[logger])


const readAttachedWorkout = useCallback( () => {
try {
const activityId = service.getSelected()?.id
return getActivitiesPageService().getActivityDetailsProps(activityId)?.attachedWorkout ?? null
}
catch(err) {
logError(err,'readAttachedWorkout')
return null
}
},[logError, service])

const init = useCallback( () => {
try {
setAttachedWorkout(readAttachedWorkout())
setState( service.openSelected() )
observerRef.current = service.getObserver()
observerRef.current.on('updated', (update) => {
Expand All @@ -371,7 +394,7 @@ export const ActivityDetailsDialog = ({onOpen,onStart})=> {
catch(err) {
logError(err,'init')
}
},[logError, service])
},[logError, readAttachedWorkout, service])

useEffect(() => {
if (mountedRef.current)
Expand Down Expand Up @@ -439,6 +462,37 @@ export const ActivityDetailsDialog = ({onOpen,onStart})=> {
}


const onAddWorkoutHandler = () => {
try {
const card = service.openRoute()
if (!card) {
logError(new Error('no route card for selected activity'),'onAddWorkout')
return
}
logger.logEvent({message:'attachment changed', action:'attach', side:'route', surface:'activity-details', eventSource:'user'})
card.addWorkout()
service.closeSelected()
setState(null)
if (typeof onAddWorkout === 'function')
onAddWorkout()
}
catch(err) {
logError(err,'onAddWorkout')
}
}

// the dialog stays open - only the attachment is re-read
const onClearWorkoutHandler = () => {
try {
logger.logEvent({message:'attachment changed', action:'clear', side:'workout', surface:'activity-details', workoutId:attachedWorkout?.id, eventSource:'user'})
getActivitiesPageService().onClearWorkoutSelection()
setAttachedWorkout(readAttachedWorkout())
}
catch(err) {
logError(err,'onClearWorkout')
}
}

const onOpenUpload = (upload) => {
try {
ui.openBrowserWindow(upload.url)
Expand Down Expand Up @@ -473,6 +527,8 @@ export const ActivityDetailsDialog = ({onOpen,onStart})=> {
if (state)
return <ActivityDetails {...state}
onCancel={onCancel} onStart={onStartHandler} onDelete={onDelete} onOpen={onOpen}
attachedWorkout={attachedWorkout} onAddWorkout={onAddWorkoutHandler} onClearWorkout={onClearWorkoutHandler}

onExport={onExport} onOpenExport={onOpenFile}
onUpload={onUpload} onOpenUpload={onOpenUpload} />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ export default {
onExport: { action: 'export' },
onUpload: { action: 'upload' },
onOpenUpload: { action: 'open upload' },
onOpenExport: { action: 'open export' }
onOpenExport: { action: 'open export' },
onAddWorkout: { action: 'add workout' },
onClearWorkout: { action: 'clear workout' }
}
};

Expand Down Expand Up @@ -47,3 +49,19 @@ Default.args = {
],

};


export const CanAddWorkout = Template.bind({});
CanAddWorkout.args = {
...Default.args,
canStart: true,
canOpen: true,
};

export const WorkoutAttached = Template.bind({});
WorkoutAttached.args = {
...Default.args,
canStart: true,
canOpen: true,
attachedWorkout: { id: 'w1', title: 'Sweet Spot 3x12' },
};
Loading
Loading