Эх сурвалжийг харах

Convert track changes to proper format when reviewer role is enabled (#23683)

GitOrigin-RevId: 2ac696804491f61e52b4645dff7f64339c47afc5
Domagoj Kriskovic 1 жил өмнө
parent
commit
d8b850f740

+ 1 - 0
services/web/app/src/Features/Collaborators/CollaboratorsHandler.js

@@ -25,6 +25,7 @@ module.exports = {
     addUserIdToProject,
     transferProjects,
     setCollaboratorPrivilegeLevel,
+    convertTrackChangesToExplicitFormat,
   },
 }
 

+ 33 - 14
services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx

@@ -17,6 +17,7 @@ import { postJSON } from '@/infrastructure/fetch-json'
 import useEventListener from '@/shared/hooks/use-event-listener'
 import { ProjectContextValue } from '@/shared/context/types/project-context'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
+import getMeta from '@/utils/meta'
 
 export type TrackChangesState = {
   onForEveryone: boolean
@@ -96,13 +97,22 @@ export const TrackChangesStateProvider: FC = ({ children }) => {
   const saveTrackChangesForCurrentUser = useCallback(
     async (trackChanges: boolean) => {
       if (user.id) {
-        saveTrackChanges({
-          on_for: {
-            ...onForMembers,
-            [user.id]: trackChanges,
-          },
-          on_for_guests: onForGuests,
-        })
+        if (getMeta('ol-isReviewerRoleEnabled')) {
+          saveTrackChanges({
+            on_for: {
+              ...onForMembers,
+              [user.id]: trackChanges,
+            },
+          })
+        } else {
+          saveTrackChanges({
+            on_for: {
+              ...onForMembers,
+              [user.id]: trackChanges,
+            },
+            on_for_guests: onForGuests,
+          })
+        }
       }
     },
     [onForMembers, onForGuests, user.id, saveTrackChanges]
@@ -126,13 +136,22 @@ export const TrackChangesStateProvider: FC = ({ children }) => {
         !onForEveryone
       ) {
         const value = onForMembers[user.id]
-        actions.saveTrackChanges({
-          on_for: {
-            ...onForMembers,
-            [user.id]: !value,
-          },
-          on_for_guests: onForGuests,
-        })
+        if (getMeta('ol-isReviewerRoleEnabled')) {
+          actions.saveTrackChanges({
+            on_for: {
+              ...onForMembers,
+              [user.id]: !value,
+            },
+          })
+        } else {
+          actions.saveTrackChanges({
+            on_for: {
+              ...onForMembers,
+              [user.id]: !value,
+            },
+            on_for_guests: onForGuests,
+          })
+        }
       }
     }, [
       actions,