From c4500946594e4688e6b89586df5bc8f6eecea9ac Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 22 May 2025 13:27:31 +0100
Subject: [PATCH] Merge pull request #25804 from overleaf/dp-on-for-guests

Remove references to removed track changes onForGuests option

GitOrigin-RevId: c251ad41633df33f0d963dbc3c2e5cb62920a5e1
---
 .../context/track-changes-state-context.tsx        | 14 +++++---------
 .../js/shared/context/types/project-context.tsx    |  2 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
index 73ffe78b5d..b621ac8ed8 100644
--- a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
@@ -20,7 +20,6 @@ import { usePermissionsContext } from '@/features/ide-react/context/permissions-
 
 export type TrackChangesState = {
   onForEveryone: boolean
-  onForGuests: boolean
   onForMembers: Record<UserId, boolean | undefined>
 }
 
@@ -31,7 +30,6 @@ export const TrackChangesStateContext = createContext<
 type SaveTrackChangesRequestBody = {
   on?: boolean
   on_for?: Record<UserId, boolean | undefined>
-  on_for_guests?: boolean
 }
 
 type TrackChangesStateActions = {
@@ -62,22 +60,20 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
   useEffect(() => {
     setWantTrackChanges(
       trackChangesValue === true ||
-        (trackChangesValue !== false &&
-          trackChangesValue[user.id ?? '__guests__'])
+        (trackChangesValue !== false && !!user.id && trackChangesValue[user.id])
     )
   }, [setWantTrackChanges, trackChangesValue, user.id])
 
   const trackChangesIsObject =
     trackChangesValue !== true && trackChangesValue !== false
   const onForEveryone = trackChangesValue === true
-  const onForGuests =
-    onForEveryone ||
-    (trackChangesIsObject && trackChangesValue.__guests__ === true)
 
   const onForMembers = useMemo(() => {
     const onForMembers: Record<UserId, boolean | undefined> = {}
     if (trackChangesIsObject) {
       for (const key of Object.keys(trackChangesValue)) {
+        // TODO: Remove this check when we have converted
+        // all projects to the current format.
         if (key !== '__guests__') {
           onForMembers[key as UserId] = trackChangesValue[key as UserId]
         }
@@ -145,8 +141,8 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
   )
 
   const value = useMemo(
-    () => ({ onForEveryone, onForGuests, onForMembers }),
-    [onForEveryone, onForGuests, onForMembers]
+    () => ({ onForEveryone, onForMembers }),
+    [onForEveryone, onForMembers]
   )
 
   return (
diff --git a/services/web/frontend/js/shared/context/types/project-context.tsx b/services/web/frontend/js/shared/context/types/project-context.tsx
index 4e1abdc420..9f68f5e7a3 100644
--- a/services/web/frontend/js/shared/context/types/project-context.tsx
+++ b/services/web/frontend/js/shared/context/types/project-context.tsx
@@ -45,6 +45,8 @@ export type ProjectContextValue = {
     signUpDate: string
   }
   tags: Tag[]
+  // TODO: Remove __guests__ and boolean options when we have converted
+  // all projects to the current format.
   trackChangesState: boolean | Record<UserId | '__guests__', boolean>
   projectSnapshot: ProjectSnapshot
   joinedOnce: boolean