Merge pull request #1632 from topcoder-platform/PM-4702

PM-4702: return challenge saves to view mode

Author: jmgasper

src/apps/work/src/pages/challenges/ChallengeEditorPage/README.md

@@ -10,7 +10,8 @@
   an `Edit` action only when the challenge is not completed.
 - `components/ChallengeEditorForm.tsx`: React Hook Form container with autosave and manual save.
   In view mode it renders the existing challenge data in a disabled fieldset and omits save/launch
-  footer actions.
+  footer actions. Manual saves from an existing `/edit` route navigate back to the matching `/view`
+  route after the update succeeds.
 - `components/*Field.tsx`: field-level components for each challenge section.
 - `components/ReviewersField/*`: tabbed human/AI review configuration. Human reviewers stay on the challenge form, while AI reviewer configs load/save through the review API and sync saved AI workflows back into the challenge `reviewers` array. Existing AI configs are reloaded only when the challenge already has synced AI reviewer entries or the challenge changes, which avoids empty-config lookups on new challenges and prevents ordinary parent rerenders from refetching the same config in edit mode. Removing an AI config also detaches the synced AI workflow reviewers from the challenge. When AI reviewers exist without a persisted AI screening phase, the schedule editor injects a virtual `AI Screening` row after submission phases. This `Review` section is hidden for `Task` and `Marathon Match` challenges because those flows use dedicated reviewer assignment UIs.
 - `ChallengeEditorPage.module.scss` and `components/ChallengeEditorForm.module.scss`: page and form layout styling, including the grouped `Prizes & Billing` layout that keeps the editable inputs together at fixed widths on larger screens and moves the billing summary underneath them.

src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.spec.tsx

@@ -8,7 +8,10 @@ import {
 } from '@testing-library/react'
 import '@testing-library/jest-dom'
 import userEvent from '@testing-library/user-event'
-import { MemoryRouter } from 'react-router-dom'
+import {
+    MemoryRouter,
+    useLocation,
+} from 'react-router-dom'
 
 import {
     useAutosave,
@@ -466,6 +469,12 @@ const mockedFetchResourcesService = fetchResources as jest.Mock
 const mockedShowErrorToast = showErrorToast as jest.Mock
 const mockedShowSuccessToast = showSuccessToast as jest.Mock
 
+const LocationDisplay = (): JSX.Element => {
+    const location = useLocation()
+
+    return <div data-testid='location-display'>{location.pathname}</div>
+}
+
 describe('ChallengeEditorForm', () => {
     const draftChallenge = {
         id: '12345',
@@ -1380,6 +1389,32 @@ describe('ChallengeEditorForm', () => {
         })
     })
 
+    it('returns to view mode after saving from an edit route', async () => {
+        const user = userEvent.setup()
+
+        mockedPatchChallenge.mockResolvedValue(validDraftChallenge)
+
+        render(
+            <MemoryRouter initialEntries={['/projects/100578/challenges/12345/edit']}>
+                <LocationDisplay />
+                <ChallengeEditorForm
+                    challenge={validDraftChallenge}
+                    projectId='100578'
+                />
+            </MemoryRouter>,
+        )
+
+        await user.type(screen.getByLabelText('Challenge Name'), ' updated')
+        await user.click(screen.getByRole('button', { name: 'Save Challenge' }))
+
+        await waitFor(() => {
+            expect(mockedPatchChallenge)
+                .toHaveBeenCalledTimes(1)
+            expect(screen.getByTestId('location-display'))
+                .toHaveTextContent('/projects/100578/challenges/12345/view')
+        })
+    })
+
     it('clears Marathon Match when a new challenge switches to the Design track', async () => {
         const user = userEvent.setup()
 

src/apps/work/src/pages/challenges/ChallengeEditorPage/components/ChallengeEditorForm.tsx

@@ -9,6 +9,7 @@ import {
 import { FormProvider, useForm } from 'react-hook-form'
 import {
     Link,
+    useLocation,
     useNavigate,
 } from 'react-router-dom'
 
@@ -197,6 +198,7 @@ interface ChallengeEditorFormProps {
 
 interface SaveChallengeOptions {
     isAutosave?: boolean
+    redirectToViewOnSuccess?: boolean
     statusOverride?: string
     successMessage?: string
 }
@@ -206,6 +208,14 @@ interface SaveStatusMetadata {
     payloadStatus?: string
 }
 
+interface ResolvePostSaveNavigationPathParams {
+    isEditMode?: boolean
+    isSaveAsDraft: boolean
+    redirectToViewOnSuccess?: boolean
+    savedChallengeId: string
+    viewModePath?: string
+}
+
 type SingleAssignmentFieldName = 'assignedMemberId' | 'copilot' | 'reviewer'
 
 interface SingleAssignmentConfig {
@@ -945,6 +955,29 @@ export function getTaskLaunchValidationError(
     return TASK_ASSIGNED_MEMBER_REQUIRED_FOR_LAUNCH_MESSAGE
 }
 
+/**
+ * Resolves the next route after a manual challenge save succeeds.
+ *
+ * New draft saves still enter edit mode so the full form becomes available. Existing edit-route
+ * saves return to the matching read-only challenge route when requested by the caller.
+ *
+ * @param params Save-context values needed to choose the next route.
+ * @returns The post-save route, or `undefined` when the user should stay on the current page.
+ */
+function resolvePostSaveNavigationPath(
+    params: ResolvePostSaveNavigationPathParams,
+): string | undefined {
+    if (params.isSaveAsDraft && !params.isEditMode) {
+        return `/challenges/${encodeURIComponent(params.savedChallengeId)}/edit`
+    }
+
+    if (params.redirectToViewOnSuccess && params.viewModePath) {
+        return params.viewModePath
+    }
+
+    return undefined
+}
+
 /**
  * Creates an error for launch-blocking validation paths that already surfaced a
  * specific message to the user.
@@ -983,6 +1016,7 @@ function isHandledLaunchBlockError(
 export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
     props: ChallengeEditorFormProps,
 ) => {
+    const location = useLocation()
     const navigate = useNavigate()
     const isEditMode = props.isEditMode
     const isReadOnly = props.isReadOnly === true
@@ -1001,6 +1035,16 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
             props.projectId,
         ],
     )
+    const viewModePath = useMemo(
+        (): string | undefined => {
+            if (!location.pathname.endsWith('/edit')) {
+                return undefined
+            }
+
+            return `${location.pathname.slice(0, -'/edit'.length)}/view`
+        },
+        [location.pathname],
+    )
     const projectBillingAccountResult = useFetchProjectBillingAccount(fallbackProjectId)
     const projectBillingAccount = projectBillingAccountResult.billingAccount
     const projectBillingAccountRef = useRef(projectBillingAccount)
@@ -2036,8 +2080,16 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
                     showSuccessToast(getSaveSuccessMessage(isSaveAsDraft, options))
                 }
 
-                if (isSaveAsDraft && !isEditMode) {
-                    navigate(`/challenges/${encodeURIComponent(savedChallenge.id)}/edit`)
+                const postSaveNavigationPath = resolvePostSaveNavigationPath({
+                    isEditMode,
+                    isSaveAsDraft,
+                    redirectToViewOnSuccess: options.redirectToViewOnSuccess,
+                    savedChallengeId: savedChallenge.id,
+                    viewModePath,
+                })
+
+                if (postSaveNavigationPath) {
+                    navigate(postSaveNavigationPath)
                 }
             } catch (error) {
                 if (isHandledLaunchBlockError(error)) {
@@ -2075,6 +2127,7 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
             setError,
             syncDraftSingleAssignments,
             usesManualReviewers,
+            viewModePath,
         ],
     )
 
@@ -2182,7 +2235,9 @@ export const ChallengeEditorForm: FC<ChallengeEditorFormProps> = (
             }
 
             clearErrors('reviewers')
-            await saveChallenge(formData)
+            await saveChallenge(formData, {
+                redirectToViewOnSuccess: true,
+            })
         },
         [
             clearErrors,