diff --git a/package-lock.json b/package-lock.json index 0eff144..0917aa1 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.27", + "incyclist-services": "^1.9.28", "leaflet": "^1.9.4", "leaflet-geosearch": "^4.4.0", "react": "^19.2.6", @@ -4997,12 +4997,12 @@ } }, "node_modules/axios": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.21.0.tgz", - "integrity": "sha512-YCzXMB53Q9PZBsh7yN7wtapit4WepwcHS2fP8QhGsBxSz5YtgYobV7GGlWlAJi+RxfU77GQTQi2DSLUma42EYA==", + "version": "1.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.21.1.tgz", + "integrity": "sha512-6eI5Q/Y4u/Um9dDlsRoq5pY2rxnUTv+L4PpLitnbk/i4jb3MxLZ5CsN5Ih3IysbeRYK4pR+P7qfMsOQl9fwwFQ==", "license": "MIT", "dependencies": { - "follow-redirects": "^1.16.0", + "follow-redirects": "^1.16.2", "form-data": "^4.0.6", "https-proxy-agent": "^5.0.1", "proxy-from-env": "^2.1.0" @@ -6761,9 +6761,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.2.tgz", - "integrity": "sha512-/kVP2U8z596Ia0gwFrwyIeo74ta5aVmSeU1FfAUMAmcEP5EP7zydmag3SLiN64NaRKef3lxsq7i/g7ltJQDGow==", + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.3.tgz", + "integrity": "sha512-toOSoqN6d51Wjf1aOFJYcoVv1aND9rj/CwjLU0Vz40oDuSpWDayCeKe4JpL5NL0WdFvoOOCI3BRo69HahjbR1A==", "funding": [ { "type": "individual", @@ -7235,15 +7235,15 @@ } }, "node_modules/incyclist-services": { - "version": "1.9.27", - "resolved": "https://registry.npmjs.org/incyclist-services/-/incyclist-services-1.9.27.tgz", - "integrity": "sha512-MTQbfiX95uHyahK8jR1Jn7+TrckHaUQ8cxJrxx1VU4Ogit7zmqhKqQXtYNAtRV+VVvwvtJyyTICI6xP5sQm9JQ==", + "version": "1.9.28", + "resolved": "https://registry.npmjs.org/incyclist-services/-/incyclist-services-1.9.28.tgz", + "integrity": "sha512-qySSSQm/WHSinnvo6sJVU5hMTTWcOofLLW0ZBg2aIGClZhFShOZl6b05tqGY9jmHeYkQ4WWUim0tDIX6L1VfsQ==", "dependencies": { "@garmin/fitsdk": "^21.221.0", - "axios": "^1.21.0", + "axios": "^1.21.1", "incyclist-devices": "^3.0.46", "promise.any": "^2.0.6", - "semver": "^7.7.4", + "semver": "^7.8.6", "tcx-builder": "^1.1.1", "uuid": "^14.0.3", "xml2js": "^0.6.2" @@ -7253,9 +7253,9 @@ } }, "node_modules/incyclist-services/node_modules/semver": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz", - "integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==", + "version": "7.8.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.6.tgz", + "integrity": "sha512-9lpSSU4Mly3mrtruwLs1eLK6+gzbzqeBFwRNjIjE+9LuDpWdYctrQlQ3ej1Ilgi7gknpsTRnPoLP8DpCHqHIJw==", "license": "ISC", "bin": { "semver": "bin/semver.js" diff --git a/package.json b/package.json index bccf396..4963b06 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.27", + "incyclist-services": "^1.9.28", "leaflet": "^1.9.4", "leaflet-geosearch": "^4.4.0", "react": "^19.2.6", diff --git a/src/components/atoms/Buttons/Icon/index.jsx b/src/components/atoms/Buttons/Icon/index.jsx index 5516172..04c76d8 100644 --- a/src/components/atoms/Buttons/Icon/index.jsx +++ b/src/components/atoms/Buttons/Icon/index.jsx @@ -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 @@ -91,7 +91,7 @@ export const Icon = ( {image,size,imageFormat='svg',color,margin,padding, label, return ( - + {children? renderChildren() : diff --git a/src/components/modules/activities/ActivityDetails/ActivityDetails.jsx b/src/components/modules/activities/ActivityDetails/ActivityDetails.jsx index 208b427..3b27b83 100644 --- a/src/components/modules/activities/ActivityDetails/ActivityDetails.jsx +++ b/src/components/modules/activities/ActivityDetails/ActivityDetails.jsx @@ -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' @@ -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 @@ -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(); @@ -257,6 +265,7 @@ export const ActivityDetails = ({activity, units, title,started,duration, distan + {canStart && attachedWorkout ? : null} {showMap ?