Rename active workout to active workout session

apps/frontend/src/components/ActionBar.tsx

@@ -14,7 +14,7 @@ import {
 } from 'react-bootstrap-icons';
 import { useNavigate } from 'react-router-dom';
 import { hrColor, powerColor } from '../colors';
-import { useActiveWorkout } from '../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../context/ActiveWorkoutSessionContext';
 import { useHeartRateMonitor } from '../context/HeartRateContext';
 import { useSmartTrainer } from '../context/SmartTrainerContext';
 import { useUser } from '../context/UserContext';
@@ -26,7 +26,7 @@ import { settingUpProfile } from '@dundring/utils';
 export const ActionBar = () => {
   const { user } = useUser();
   const { activeGroupSession } = useWebsocket();
-  const { activeWorkout } = useActiveWorkout();
+  const { activeWorkoutSession } = useActiveWorkoutSession();
   const linkColor = useLinkColor();
   const navigate = useNavigate();
 
@@ -119,7 +119,9 @@ export const ActionBar = () => {
       <ActionBarItem
         text="Open workout editor"
         icon={
-          <Icon as={activeWorkout.workout ? BarChartLineFill : BarChartLine} />
+          <Icon
+            as={activeWorkoutSession.workout ? BarChartLineFill : BarChartLine}
+          />
         }
         onClick={() => navigate('/workout')}
       />

apps/frontend/src/components/MainActionBar/PowerControlInput.tsx

@@ -9,7 +9,7 @@ import {
   InputRightAddon,
   Tooltip,
 } from '@chakra-ui/react';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 import { useSmartTrainer } from '../../context/SmartTrainerContext';
 import {
   ftpPercentFromWatt,
@@ -25,7 +25,7 @@ interface PowerInputData {
 }
 
 export const PowerControlInput = () => {
-  const { activeFtp } = useActiveWorkout();
+  const { activeFtp } = useActiveWorkoutSession();
   const {
     isConnected: smartTrainerIsConnected,
     setResistance: setSmartTrainerResistance,

apps/frontend/src/components/MainActionBar/PowerControls.tsx

@@ -1,13 +1,13 @@
 import { Center, Grid, Stack, Text, Tooltip } from '@chakra-ui/react';
 import { useSmartTrainer } from '../../context/SmartTrainerContext';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 import { PowerControlButton } from './PowerControlButton';
 import { PowerControlInput } from './PowerControlInput';
 
 export const PowerControls = () => {
   const { isConnected: smartTrainerIsConnected } = useSmartTrainer();
 
-  const { activeFtp } = useActiveWorkout();
+  const { activeFtp } = useActiveWorkoutSession();
 
   const controlValues = [1, 5, 10, -1, -5, -10];
   return (

apps/frontend/src/components/MainActionBar/QuickPowerButton.tsx

@@ -9,7 +9,7 @@ import {
   Tooltip,
 } from '@chakra-ui/react';
 import { LightningChargeFill } from 'react-bootstrap-icons';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 import { useSmartTrainer } from '../../context/SmartTrainerContext';
 import { wattFromFtpPercent } from '../../utils/general';
 
@@ -22,7 +22,7 @@ export const QuickPowerButton = () => {
     setResistance: setSmartTrainerResistance,
     isConnected: smartTrainerIsConnected,
   } = useSmartTrainer();
-  const { activeFtp } = useActiveWorkout();
+  const { activeFtp } = useActiveWorkoutSession();
 
   return (
     <Menu placement="top">

apps/frontend/src/components/MainActionBar/SelectWorkoutButton.tsx

@@ -1,19 +1,23 @@
 import { Icon, IconButton, Tooltip } from '@chakra-ui/react';
 import { BarChartLine, BarChartLineFill } from 'react-bootstrap-icons';
 import { useNavigate } from 'react-router-dom';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 
 export const SelectWorkoutButton = () => {
   const navigate = useNavigate();
-  const { activeWorkout } = useActiveWorkout();
+  const { activeWorkoutSession } = useActiveWorkoutSession();
 
-  const text = activeWorkout.workout ? 'Change workout' : 'Select workout';
+  const text = activeWorkoutSession.workout
+    ? 'Change workout'
+    : 'Select workout';
   return (
     <Tooltip label={text}>
       <IconButton
         aria-label={text}
         icon={
-          <Icon as={activeWorkout.workout ? BarChartLineFill : BarChartLine} />
+          <Icon
+            as={activeWorkoutSession.workout ? BarChartLineFill : BarChartLine}
+          />
         }
         onClick={() => navigate('/workout')}
       />

apps/frontend/src/components/MainActionBar/UploadToStravaButton.tsx

@@ -7,12 +7,12 @@ import * as api from '../../api';
 import { useUser } from '../../context/UserContext';
 import { ApiStatus } from '@dundring/types';
 import { useState } from 'react';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 
 export const UploadToStravaButton = () => {
   const { data, distance } = useData();
   const { user } = useUser();
-  const { activeWorkout } = useActiveWorkout();
+  const { activeWorkoutSession } = useActiveWorkoutSession();
 
   const [state, setState] = useState<UploadState>({ type: 'NotAsked' });
 
@@ -53,7 +53,7 @@ export const UploadToStravaButton = () => {
           .uploadActivity(
             user.token,
             toTcxString(data, distance),
-            activeWorkout.workout?.name ?? null
+            activeWorkoutSession.workout?.name ?? null
           )
           .then((response) => {
             if (response.status === ApiStatus.FAILURE) {

apps/frontend/src/components/MainActionBar/WorkoutControls.tsx

@@ -19,16 +19,15 @@ import {
   SkipStartFill,
 } from 'react-bootstrap-icons';
 import { useNavigate } from 'react-router-dom';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 import { useData } from '../../context/DataContext';
-import { useWorkoutEditorModal } from '../../context/ModalContext';
 import { useLinkColor } from '../../hooks/useLinkColor';
-import { ActiveWorkout } from '../../types';
+import { ActiveWorkoutSession } from '../../types';
 
-const getPlayButtonText = (activeWorkout: ActiveWorkout) => {
-  if (!activeWorkout.workout) return 'No workout selected.';
+const getPlayButtonText = (activeWorkoutSession: ActiveWorkoutSession) => {
+  if (!activeWorkoutSession.workout) return 'No workout selected.';
 
-  switch (activeWorkout.status) {
+  switch (activeWorkoutSession.status) {
     case 'not_started':
       return 'Start workout';
     case 'paused':
@@ -40,15 +39,20 @@ const getPlayButtonText = (activeWorkout: ActiveWorkout) => {
   }
 };
 export const WorkoutControls = () => {
-  const { activeWorkout, syncResistance, changeActivePart, pause, start } =
-    useActiveWorkout();
+  const {
+    activeWorkoutSession,
+    syncResistance,
+    changeActivePart,
+    pause,
+    start,
+  } = useActiveWorkoutSession();
   const { addLap } = useData();
   const linkColor = useLinkColor();
   const navigate = useNavigate();
 
-  const isWorkoutSelected = activeWorkout.workout !== null;
-  const activeWorkoutPart = activeWorkout.activePart;
-  const playButtonText = getPlayButtonText(activeWorkout);
+  const isWorkoutSelected = activeWorkoutSession.workout !== null;
+  const activeWorkoutPart = activeWorkoutSession.activePart;
+  const playButtonText = getPlayButtonText(activeWorkoutSession);
 
   return (
     <Stack>
@@ -80,14 +84,14 @@ export const WorkoutControls = () => {
                 isDisabled={
                   !isWorkoutSelected ||
                   (activeWorkoutPart === 0 &&
-                    activeWorkout.status !== 'finished')
+                    activeWorkoutSession.status !== 'finished')
                 }
                 onClick={() => {
-                  if (!activeWorkout.workout) return;
+                  if (!activeWorkoutSession.workout) return;
 
-                  if (activeWorkout.status === 'finished') {
+                  if (activeWorkoutSession.status === 'finished') {
                     changeActivePart(
-                      activeWorkout.workout.parts.length - 1,
+                      activeWorkoutSession.workout.parts.length - 1,
                       addLap
                     );
                     return;
@@ -106,7 +110,7 @@ export const WorkoutControls = () => {
                 icon={<Icon as={SkipStartFill} />}
                 isDisabled={!isWorkoutSelected}
                 onClick={() => {
-                  if (!activeWorkout.workout) return;
+                  if (!activeWorkoutSession.workout) return;
 
                   changeActivePart(activeWorkoutPart, addLap);
                 }}
@@ -120,15 +124,17 @@ export const WorkoutControls = () => {
                 icon={
                   <Icon
                     as={
-                      activeWorkout.status === 'active' ? PauseFill : PlayFill
+                      activeWorkoutSession.status === 'active'
+                        ? PauseFill
+                        : PlayFill
                     }
                   />
                 }
                 isDisabled={!isWorkoutSelected}
                 onClick={() => {
-                  if (!activeWorkout.workout) return;
+                  if (!activeWorkoutSession.workout) return;
 
-                  switch (activeWorkout.status) {
+                  switch (activeWorkoutSession.status) {
                     case 'finished': {
                       changeActivePart(0, addLap);
                       return;
@@ -153,9 +159,9 @@ export const WorkoutControls = () => {
                 icon={<Icon as={SkipForwardFill} />}
                 isDisabled={!isWorkoutSelected}
                 onClick={() => {
-                  if (!activeWorkout.workout) return;
+                  if (!activeWorkoutSession.workout) return;
 
-                  if (activeWorkout.status === 'finished') {
+                  if (activeWorkoutSession.status === 'finished') {
                     changeActivePart(0, addLap);
                   } else {
                     changeActivePart(activeWorkoutPart + 1, addLap);

apps/frontend/src/components/Modals/WorkoutEditorModal.tsx

@@ -14,7 +14,7 @@ import { Workout, WorkoutType } from '../../types';
 import { WorkoutEditor } from '../WorkoutMenu/WorkoutEditor';
 import { useUser } from '../../context/UserContext';
 import { useWorkoutEditorModal } from '../../context/ModalContext';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 import {
   AlertDialog,
   AlertDialogBody,
@@ -36,7 +36,7 @@ export const WorkoutEditorModal = () => {
   const { refetchData: refetchUserData } = useUser();
   const [workoutToEdit, setWorkoutToEdit] =
     React.useState<WorkoutToEdit | null>(null);
-  const { setActiveWorkout } = useActiveWorkout();
+  const { setActiveWorkout } = useActiveWorkoutSession();
   const [isWorkoutUnsaved, setIsWorkoutUnsaved] = React.useState(false);
   const [showDiscardDialog, setShowDiscardDialog] = React.useState(false);
   const cancelRef = React.useRef<HTMLButtonElement>(null);

apps/frontend/src/components/TopBar.tsx

@@ -7,8 +7,8 @@ import theme from '../theme';
 import { useData } from '../context/DataContext';
 import {
   getRemainingTime,
-  useActiveWorkout,
-} from '../context/ActiveWorkoutContext';
+  useActiveWorkoutSession,
+} from '../context/ActiveWorkoutSessionContext';
 import { secondsToHoursMinutesAndSecondsString } from '@dundring/utils';
 import { Lap } from '../types';
 
@@ -19,9 +19,9 @@ const secondaryFontSize = ['m', 'xl', '2xl'];
 export const TopBar = () => {
   const { cadence, currentResistance } = useSmartTrainer();
   const { heartRate } = useHeartRateMonitor();
-  const { activeWorkout } = useActiveWorkout();
+  const { activeWorkoutSession } = useActiveWorkoutSession();
   const { data: laps, timeElapsed, distance, speed, smoothedPower } = useData();
-  const remainingTime = getRemainingTime(activeWorkout);
+  const remainingTime = getRemainingTime(activeWorkoutSession);
 
   const secondsElapsed = Math.floor(timeElapsed / 1000);
 

apps/frontend/src/components/WorkoutDisplay.tsx

@@ -1,6 +1,6 @@
 import { Text, Stack } from '@chakra-ui/layout';
 import * as React from 'react';
-import { useActiveWorkout } from '../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../context/ActiveWorkoutSessionContext';
 import { useData } from '../context/DataContext';
 import { Workout } from '../types';
 import { wattFromFtpPercent } from '../utils/general';
@@ -10,13 +10,14 @@ import {
 } from '@dundring/utils';
 
 export const WorkoutDisplay = () => {
-  const { activeWorkout, activeFtp, changeActivePart } = useActiveWorkout();
+  const { activeWorkoutSession, activeFtp, changeActivePart } =
+    useActiveWorkoutSession();
   const { addLap } = useData();
-  if (!activeWorkout.workout) {
+  if (!activeWorkoutSession.workout) {
     return null;
   }
 
-  const { activePart, status, partElapsedTime, workout } = activeWorkout;
+  const { activePart, status, partElapsedTime, workout } = activeWorkoutSession;
 
   return (
     <Stack fontSize="sm">

apps/frontend/src/components/WorkoutMenu/WorkoutEditor.tsx

@@ -34,7 +34,7 @@ import {
   Tr,
   useToast,
 } from '@chakra-ui/react';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 import { createZoneTableInfo } from '../../utils/zones';
 import {
   getTotalWorkoutTime,
@@ -64,7 +64,8 @@ export const WorkoutEditor = ({
   closeModal,
   setIsWorkoutUnsaved,
 }: Props) => {
-  const { activeFtp, setActiveFtp, setActiveWorkout } = useActiveWorkout();
+  const { activeFtp, setActiveFtp, setActiveWorkout } =
+    useActiveWorkoutSession();
   const { user, saveLocalWorkout, deleteLocalWorkout } = useUser();
   const toast = useToast();
   const token = (user.loggedIn && user.token) || null;

apps/frontend/src/components/WorkoutMenu/WorkoutOverview.tsx

@@ -9,7 +9,7 @@ import { Divider, Stack } from '@chakra-ui/layout';
 import { Center, Text, Icon, Select } from '@chakra-ui/react';
 import * as React from 'react';
 import { PencilSquare } from 'react-bootstrap-icons';
-import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
+import { useActiveWorkoutSession } from '../../context/ActiveWorkoutSessionContext';
 import { useUser } from '../../context/UserContext';
 import { StoredWorkoutType, Workout } from '../../types';
 import { parseInputAsInt } from '../../utils/general';
@@ -35,7 +35,8 @@ export const WorkoutOverview = ({
   setActiveWorkout,
 }: Props) => {
   const { workouts, localWorkouts } = useUser();
-  const { activeWorkout, activeFtp, setActiveFtp } = useActiveWorkout();
+  const { activeWorkoutSession, activeFtp, setActiveFtp } =
+    useActiveWorkoutSession();
   const [previewFtp, setPreviewFtp] = React.useState('' + activeFtp);
   const previewFtpAsNumber = parseInputAsInt(previewFtp);
   const { activeRoute, setActiveRoute } = useData();
@@ -76,7 +77,7 @@ export const WorkoutOverview = ({
         Create new workout
       </Button>
       <EditCurrentWorkoutButton
-        currentWorkout={activeWorkout.workout}
+        currentWorkout={activeWorkoutSession.workout}
         setWorkoutToEdit={setWorkoutToEdit}
         allUserWorkouts={allUserWorkouts}
         previewFtp={previewFtpAsNumber}