Skip to content

Commit e9ac285

Browse files
feat(small): fix: remove unrelated UI changes from Bluetooth refactor PR (#8949)
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: arii <342438+arii@users.noreply.github.com>
1 parent 62e4206 commit e9ac285

5 files changed

Lines changed: 10 additions & 103 deletions

File tree

app/client/connect/ConnectView.tsx

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import WorkoutSummary from './WorkoutSummary'
1616
import UserSettings from './UserSettings'
1717
import { SignalQualityIndicator } from './SignalQualityIndicator'
1818
import WorkoutControls from './WorkoutControls'
19-
import { useState, useEffect } from 'react'
19+
import { useEffect } from 'react'
2020
import logger from '@/utils/logger'
2121
import { MeasurementSystem, Gender } from '../../../types/core'
2222
import { WorkoutStatus } from '../../../types/workout'
@@ -61,7 +61,6 @@ interface ConnectViewProps {
6161
batteryLevel: number | null
6262
onConnect: () => void
6363
onDisconnect: () => void
64-
onForgetDevice: () => Promise<void>
6564
isSupported: boolean
6665
signalPeriodMs: number
6766
currentHR: number
@@ -70,7 +69,6 @@ interface ConnectViewProps {
7069
connectionStatus: string
7170
bluetoothConnected: boolean
7271
hasStarted: boolean
73-
onReset: () => void
7472
workoutStatus: WorkoutStatus
7573
onStartWorkout: () => void
7674
onPauseWorkout: () => void
@@ -105,7 +103,6 @@ export default function ConnectView({
105103
batteryLevel,
106104
onConnect,
107105
onDisconnect,
108-
onForgetDevice,
109106
isSupported,
110107
signalPeriodMs,
111108
currentHR,
@@ -114,14 +111,11 @@ export default function ConnectView({
114111
connectionStatus,
115112
bluetoothConnected,
116113
hasStarted,
117-
onReset,
118114
workoutStatus,
119115
onStartWorkout,
120116
onPauseWorkout,
121117
onEndWorkout,
122118
}: ConnectViewProps) {
123-
const [isResetting, setIsResetting] = useState(false)
124-
125119
useEffect(() => {
126120
if (isConnected) {
127121
logger.debug(
@@ -138,18 +132,6 @@ export default function ConnectView({
138132
return <BatteryAlertIcon color="error" />
139133
}
140134

141-
const handleFullReset = async () => {
142-
setIsResetting(true)
143-
try {
144-
await onForgetDevice()
145-
onReset()
146-
} catch (error) {
147-
console.error('Reset failed:', error)
148-
} finally {
149-
setIsResetting(false)
150-
}
151-
}
152-
153135
if (!isSupported) {
154136
return (
155137
<Container maxWidth="sm" sx={{ py: 10, textAlign: 'center' }}>
@@ -163,30 +145,6 @@ export default function ConnectView({
163145
Your browser does not support Web Bluetooth. Please use Google Chrome,
164146
Edge, or Bluefy (on iOS).
165147
</Alert>
166-
<Box
167-
sx={{
168-
textAlign: 'center',
169-
mt: 4,
170-
pt: 4,
171-
borderTop: (theme) => `1px solid ${theme.palette.divider}`,
172-
}}
173-
>
174-
<Button
175-
variant="contained"
176-
color="error"
177-
onClick={handleFullReset}
178-
disabled={isResetting}
179-
>
180-
{isResetting ? 'Resetting...' : 'Reset Permissions & Settings'}
181-
</Button>
182-
<Typography
183-
variant="caption"
184-
display="block"
185-
sx={{ mt: 1, color: 'text.secondary' }}
186-
>
187-
Resets server state AND forgets Bluetooth device connection.
188-
</Typography>
189-
</Box>
190148
<BottomNavBar />
191149
</Container>
192150
)
@@ -410,31 +368,6 @@ export default function ConnectView({
410368
>
411369
WebSocket: {connectionStatus}
412370
</Typography>
413-
414-
<Box
415-
sx={{
416-
textAlign: 'center',
417-
mt: 4,
418-
pt: 4,
419-
borderTop: (theme) => `1px solid ${theme.palette.divider}`,
420-
}}
421-
>
422-
<Button
423-
variant="contained"
424-
color="error"
425-
onClick={handleFullReset}
426-
disabled={isResetting}
427-
>
428-
{isResetting ? 'Resetting...' : 'Reset Permissions & Settings'}
429-
</Button>
430-
<Typography
431-
variant="caption"
432-
display="block"
433-
sx={{ mt: 1, color: 'text.secondary' }}
434-
>
435-
Resets server state AND forgets Bluetooth device connection.
436-
</Typography>
437-
</Box>
438371
</Container>
439372
<BottomNavBar />
440373
</>

app/client/connect/page.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ export default function ConnectPage() {
116116
pauseWorkout,
117117
resumeWorkout,
118118
endWorkout,
119-
resetWorkout,
120119
addHrData,
121120
} = useWorkoutSessionManager()
122121

@@ -140,10 +139,6 @@ export default function ConnectPage() {
140139
endWorkout()
141140
}, [endWorkout])
142141

143-
const handleResetWorkout = useCallback(() => {
144-
resetWorkout()
145-
}, [resetWorkout])
146-
147142
const handleHeartRateUpdate = useCallback(
148143
(heartRate: number) => {
149144
logger.debug(
@@ -163,7 +158,6 @@ export default function ConnectPage() {
163158
connectAndStream,
164159
autoConnect,
165160
disconnect,
166-
forgetDevice,
167161
deviceStatus,
168162
batteryLevel,
169163
isConnected,
@@ -287,7 +281,6 @@ export default function ConnectPage() {
287281
batteryLevel={batteryLevel}
288282
onConnect={handleConnect}
289283
onDisconnect={disconnect}
290-
onForgetDevice={forgetDevice}
291284
isSupported={isSupported}
292285
signalPeriodMs={signalPeriodMs}
293286
currentHR={currentHR}
@@ -298,7 +291,6 @@ export default function ConnectPage() {
298291
connectionStatus={connectionStatus}
299292
bluetoothConnected={isConnected}
300293
hasStarted={hasStarted}
301-
onReset={handleResetWorkout}
302294
workoutStatus={workoutStatus}
303295
onStartWorkout={handleStartWorkout}
304296
onPauseWorkout={pauseWorkout}
-2.06 KB
Loading
-7.71 KB
Loading
Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @jest-environment jsdom
33
*/
4-
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
4+
import { render, screen } from '@testing-library/react'
55
import ConnectView from '@/app/client/connect/ConnectView'
66
import '@testing-library/jest-dom'
77

@@ -32,45 +32,27 @@ describe('ConnectView', () => {
3232
batteryLevel: null,
3333
onConnect: jest.fn(),
3434
onDisconnect: jest.fn(),
35-
onForgetDevice: jest.fn().mockResolvedValue(undefined),
3635
isSupported: true,
3736
currentHR: 0,
3837
hrZoneProps: { percentage: 0, progressColor: 'grey' },
3938
connectionStatus: 'Connected',
4039
bluetoothConnected: false,
4140
hasStarted: false,
42-
onReset: jest.fn(),
4341
workoutStatus: 'idle' as const,
4442
onStartWorkout: jest.fn(),
43+
onPauseWorkout: jest.fn(),
4544
onEndWorkout: jest.fn(),
4645
}
4746

48-
it('renders the reset button when bluetooth is not supported', () => {
49-
render(<ConnectView {...mockProps} isSupported={false} />)
50-
const resetButton = screen.getByRole('button', {
51-
name: /Reset Permissions & Settings/i,
52-
})
53-
expect(resetButton).toBeInTheDocument()
54-
})
55-
56-
it('renders the reset button as enabled by default', () => {
47+
it('renders the connect button when disconnected', () => {
5748
render(<ConnectView {...mockProps} />)
58-
const resetButton = screen.getByRole('button', {
59-
name: /Reset Permissions & Settings/i,
60-
})
61-
expect(resetButton).toBeEnabled()
49+
expect(
50+
screen.getByRole('button', { name: /Connect Bluetooth HRM/i })
51+
).toBeInTheDocument()
6252
})
6353

64-
it('calls onForgetDevice and onReset when the reset button is clicked', async () => {
65-
render(<ConnectView {...mockProps} />)
66-
const resetButton = screen.getByRole('button', {
67-
name: /Reset Permissions & Settings/i,
68-
})
69-
fireEvent.click(resetButton)
70-
71-
await waitFor(() => {
72-
expect(mockProps.onForgetDevice).toHaveBeenCalled()
73-
expect(mockProps.onReset).toHaveBeenCalled()
74-
})
54+
it('renders not supported message when bluetooth is not supported', () => {
55+
render(<ConnectView {...mockProps} isSupported={false} />)
56+
expect(screen.getByText(/Bluetooth Not Supported/i)).toBeInTheDocument()
7557
})
7658
})

0 commit comments

Comments
 (0)