Skip to content

Commit dc3f5ee

Browse files
authored
fix: do not spam navigate() method (#3673)
Closes #3670.
1 parent b66b91f commit dc3f5ee

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

client/src/features/sessionsV2/PauseOrDeleteSessionModal.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,11 @@ function AnonymousDeleteSessionModal({
127127
}, [error, notifications]);
128128

129129
useEffect(() => {
130-
if (isSuccess && !isWaiting) {
130+
if (isStopping && isSuccess && !isWaiting) {
131+
setIsStopping(false);
131132
navigate(backUrl);
132133
}
133-
}, [backUrl, isSuccess, isWaiting, navigate]);
134+
}, [backUrl, isStopping, isSuccess, isWaiting, navigate]);
134135

135136
return (
136137
<Modal className={styles.sessionModal} isOpen={isOpen} toggle={toggleModal}>
@@ -249,10 +250,11 @@ function PauseSessionModalContent({
249250
}, [error, notifications]);
250251

251252
useEffect(() => {
252-
if (isSuccess && !isWaiting) {
253+
if (isStopping && isSuccess && !isWaiting) {
254+
setIsStopping(false);
253255
navigate(backUrl);
254256
}
255-
}, [backUrl, isSuccess, isWaiting, navigate]);
257+
}, [backUrl, isStopping, isSuccess, isWaiting, navigate]);
256258

257259
// TODO: Uncomment when hibernatedSecondsThreshold is available
258260
// const now = DateTime.utc();
@@ -358,10 +360,11 @@ function DeleteSessionModalContent({
358360
}, [error, notifications]);
359361

360362
useEffect(() => {
361-
if (isSuccess && !isWaiting) {
363+
if (isStopping && isSuccess && !isWaiting) {
364+
setIsStopping(false);
362365
navigate(backUrl);
363366
}
364-
}, [backUrl, isSuccess, isWaiting, navigate]);
367+
}, [backUrl, isStopping, isSuccess, isWaiting, navigate]);
365368

366369
return (
367370
<>

client/src/features/sessionsV2/SessionList/SessionLauncherCard.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ export default function SessionLauncherCard({
115115

116116
return (
117117
<Card
118-
action
119118
className={cx(
120119
styles.SessionLauncherCard,
121120
"mt-2",

client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,12 @@ export default function ActiveSessionButton({
118118
skip: !isResuming,
119119
});
120120
useEffect(() => {
121-
if (isSuccessResumeSession && !isWaitingForResumedSession) {
121+
if (isResuming && isSuccessResumeSession && !isWaitingForResumedSession) {
122+
setIsResuming(false);
122123
navigate(showSessionUrl);
123124
}
124125
}, [
126+
isResuming,
125127
isSuccessResumeSession,
126128
isWaitingForResumedSession,
127129
navigate,

0 commit comments

Comments
 (0)