Merge pull request #207 from adobecom/revert-203-fix/event-form-wizard-step-reset

Revert "fix(event-form): stop page-3 sub-resource 403s from resetting the wizard to step 1"

Author: qiyundai

web-src/src/components/shared/FormWizard.tsx

@@ -2,7 +2,7 @@
 * <license header>
 */
 
-import React, { useState, useCallback, useEffect } from 'react'
+import React, { useState, useCallback } from 'react'
 import { AlertDialog, Badge, Button, DialogTrigger, Heading, ProgressBar, StatusLight, Text } from '@react-spectrum/s2'
 import { style, iconStyle } from '@react-spectrum/s2/style' with { type: 'macro' }
 import { useNavigate } from 'react-router-dom'
@@ -19,7 +19,6 @@ import {
   TYPOGRAPHY
 } from '../../styles/designSystem'
 import { formatEventFormStatusLabel, getEventFormStatusLightVariant } from './eventFormStatusBadge'
-import { loadFormStep, saveFormStep } from '../../utils/formPersistence'
 
 export interface WizardStep {
   id: string
@@ -81,8 +80,6 @@ interface FormWizardProps {
   sessionContent?: React.ReactNode
   /** True when an inline session form (add or edit) is currently open */
   sessionHasOpenForm?: boolean
-  /** Key to persist the current step under (sessionStorage) so it survives a remount. Omit to disable persistence. */
-  stepPersistKey?: string
 }
 
 /** Side nav: Dashboard row hover */
@@ -115,18 +112,8 @@ export const FormWizard: React.FC<FormWizardProps> = ({
   testIds,
   sessionContent,
   sessionHasOpenForm = false,
-  stepPersistKey,
 }) => {
-  const [currentStepIndex, setCurrentStepIndex] = useState(() => {
-    if (!stepPersistKey) return 0
-    const persisted = loadFormStep(stepPersistKey)
-    if (persisted === null) return 0
-    // Never restore past a step the user has actually unlocked — a stale
-    // persisted step (e.g. from an abandoned draft under a shared "new
-    // event" key) must not open an inaccessible step with no data.
-    const highestUnlocked = hasEventId ? maxStepReached : 0
-    return Math.min(persisted, highestUnlocked, steps.length - 1)
-  })
+  const [currentStepIndex, setCurrentStepIndex] = useState(0)
   const [isNavigating, setIsNavigating] = useState(false)
   const [showSessionView, setShowSessionView] = useState(false)
   const [pendingAction, setPendingAction] = useState<'save' | 'publish' | 'next' | null>(null)
@@ -140,14 +127,6 @@ export const FormWizard: React.FC<FormWizardProps> = ({
   const isFirstStep = currentStepIndex === 0
   const progress = ((currentStepIndex + 1) / steps.length) * 100
 
-  // Persist the current step so it survives a remount of the wizard
-  // (e.g. a background auth/group refresh) instead of resetting to step 1.
-  useEffect(() => {
-    if (stepPersistKey) {
-      saveFormStep(stepPersistKey, currentStepIndex)
-    }
-  }, [stepPersistKey, currentStepIndex])
-
   // Determine if a step is accessible
   const isStepAccessible = useCallback((stepIndex: number): boolean => {
     if (stepIndex === 0) return true

web-src/src/contexts/EventFormContext.tsx

@@ -171,8 +171,6 @@ export interface EventFormContextValue {
   getRegisteredComponents: () => RegisteredComponent[]
 
   // Persistence
-  /** Draft storage key for this form instance (eventId, or `new-<eventType>-<seriesId>`) */
-  storageKey: string
   persistToStorage: () => void
   loadFromStorage: () => boolean
   clearStorage: () => void
@@ -238,39 +236,22 @@ export const createDefaultFormData = (): EventFormData => ({
   sponsors: []
 })
 
-interface InitialStateSeed extends Partial<EventFormData> {
-  eventId?: string | null
-}
-
-/**
- * Seeds eventId/seriesId/isEditMode synchronously from the provider's initial
- * props (rather than only via a post-mount effect), so that on a remount —
- * e.g. a background auth/group refresh — dependents like the form's
- * sessionStorage key are correct from the very first render instead of
- * transiently pointing at the "new event" key for one render pass.
- */
-const createInitialState = (initialData?: InitialStateSeed): EventFormState => {
-  const { eventId, ...formDataSeed } = initialData ?? {}
-  return {
-    eventId: eventId ?? null,
-    seriesId: formDataSeed?.seriesId ?? '',
-    isEditMode: !!eventId,
-    locale: DEFAULT_LOCALE,
-    eventDataResp: null,
-    formData: { ...createDefaultFormData(), ...formDataSeed },
-    isDirty: false,
-    saveStatus: 'idle',
-    saveError: null,
-    isLoading: false,
-    loadError: null,
-    isPublished: false,
-    // loadEvent() unconditionally unlocks all steps (maxStepReached: 3) for any
-    // existing event; seed the same value synchronously so a remount doesn't
-    // transiently re-lock the wizard down to step 1 while loadEvent re-fetches.
-    maxStepReached: eventId ? 3 : 0,
-    isFormatConfirmed: false,
-  }
-}
+const createInitialState = (initialData?: Partial<EventFormData>): EventFormState => ({
+  eventId: null,
+  seriesId: '',
+  isEditMode: false,
+  locale: DEFAULT_LOCALE,
+  eventDataResp: null,
+  formData: { ...createDefaultFormData(), ...initialData },
+  isDirty: false,
+  saveStatus: 'idle',
+  saveError: null,
+  isLoading: false,
+  loadError: null,
+  isPublished: false,
+  maxStepReached: 0,
+  isFormatConfirmed: false,
+})
 
 // ============================================================================
 // REDUCER
@@ -421,7 +402,7 @@ export const EventFormProvider: React.FC<EventFormProviderProps> = ({
   // Initialize state
   const [state, dispatch] = useReducer(
     eventFormReducer,
-    { eventType: initialEventType, seriesId: initialSeriesId, eventId: initialEventId },
+    { eventType: initialEventType, seriesId: initialSeriesId },
     createInitialState
   )
 
@@ -647,7 +628,6 @@ export const EventFormProvider: React.FC<EventFormProviderProps> = ({
     getRegisteredComponents,
 
     // Persistence
-    storageKey,
     persistToStorage,
     loadFromStorage,
     clearStorage,
@@ -688,7 +668,6 @@ export const EventFormProvider: React.FC<EventFormProviderProps> = ({
     registerComponent,
     unregisterComponent,
     getRegisteredComponents,
-    storageKey,
     persistToStorage,
     loadFromStorage,
     clearStorage,

web-src/src/pages/EventForm/CustomAttributesComponent.tsx

@@ -154,7 +154,7 @@ export const CustomAttributesComponent: React.FC = () => {
     const load = async () => {
       setLoading(true)
       try {
-        const result = await cachedApi.getEventConfigs(eventId, undefined, { skipStaleGroupRecovery: true })
+        const result = await cachedApi.getEventConfigs(eventId)
         if (cancelled) return
         if (!('error' in result)) {
           const config = result.find(c => hasAttributesSlice(c)) ?? null

web-src/src/pages/EventForm/EventForm.tsx

@@ -496,7 +496,6 @@ const EventFormInner: React.FC<EventFormInnerProps> = ({ ims: _ims }) => {
     setSeriesCustomTagsUrl,
     loadFromStorage,
     persistToStorage,
-    storageKey,
     state,
     scopeLocales,
   } = useEventFormContext()
@@ -1111,7 +1110,6 @@ const EventFormInner: React.FC<EventFormInnerProps> = ({ ims: _ims }) => {
         testIds={EVENT_FORM_WIZARD_TEST_IDS}
         sessionContent={sessionManagementComponent}
         sessionHasOpenForm={sessionHasOpenForm}
-        stepPersistKey={storageKey}
       />
 
       {/* Format Selection Overlay — frosted glass + dialog */}

web-src/src/pages/EventForm/EventInfoComponent.tsx

@@ -165,7 +165,7 @@ export const EventInfoComponent: React.FC = () => {
     const load = async () => {
       try {
         if (eventId) {
-          const result = await cachedApi.getEventConfigs(eventId, undefined, { skipStaleGroupRecovery: true })
+          const result = await cachedApi.getEventConfigs(eventId)
           if (cancelled) return
           if ('error' in result) {
             setLocaleOptions(DEFAULT_LOCALE_PICKER_OPTIONS)
@@ -174,7 +174,7 @@ export const EventInfoComponent: React.FC = () => {
           }
           applyLocales(result.find((c) => hasLocalesSlice(c)) ?? null)
         } else if (scopeId) {
-          const result = await cachedApi.getConfig(scopeId, { skipStaleGroupRecovery: true })
+          const result = await cachedApi.getConfig(scopeId)
           if (cancelled) return
           if (result === null || 'error' in result) {
             setLocaleOptions(DEFAULT_LOCALE_PICKER_OPTIONS)

web-src/src/pages/EventForm/PageMetadataComponent.tsx

@@ -147,7 +147,7 @@ export const PageMetadataComponent: React.FC = () => {
       if (!eventResponse?.eventId) return
 
       try {
-        const profileResponse = await cachedApi.getEventPublishingProfile(eventResponse.eventId, { skipStaleGroupRecovery: true })
+        const profileResponse = await cachedApi.getEventPublishingProfile(eventResponse.eventId)
 
         // Response could be an array or single object
         const profiles = Array.isArray(profileResponse) ? profileResponse : [profileResponse]
@@ -268,7 +268,7 @@ export const PageMetadataComponent: React.FC = () => {
     if (!targetEventId) return
 
     try {
-      const profileResponse = await cachedApi.getEventPublishingProfile(targetEventId, { skipStaleGroupRecovery: true })
+      const profileResponse = await cachedApi.getEventPublishingProfile(targetEventId)
 
       // Response could be an array or single object
       const profiles = Array.isArray(profileResponse) ? profileResponse : [profileResponse]

web-src/src/pages/EventForm/RegistrationFieldsComponent.tsx

@@ -99,7 +99,7 @@ export const RegistrationFieldsComponent: React.FC<RegistrationFieldsComponentPr
         let mode: RsvpFieldSourceMode = 'legacy'
 
         if (eventId) {
-          const result = await cachedApi.getEventConfigs(eventId, undefined, { skipStaleGroupRecovery: true })
+          const result = await cachedApi.getEventConfigs(eventId)
           if (cancelled) return
           if (!('error' in result)) {
             const config = result.find(c => hasRsvpSlice(c)) ?? null

web-src/src/pages/EventForm/SessionManagement/SessionForm.tsx

@@ -265,7 +265,7 @@ export const SessionForm: React.FC<SessionFormProps> = ({
   useEffect(() => {
     if (!session?.id) return;
     let cancelled = false;
-    apiService.getSessionSpeakers(session.id, { skipStaleGroupRecovery: true }).then((res) => {
+    apiService.getSessionSpeakers(session.id).then((res) => {
       if (cancelled) return;
       if (res && !("error" in res)) {
         const list = (res as any)?.speakers ?? [];
@@ -312,7 +312,7 @@ export const SessionForm: React.FC<SessionFormProps> = ({
     setDetailError(null);
 
     // Only fetch session detail — session-time data is already cached on session.sessionTime
-    apiService.getSingleSession(session.id, { skipStaleGroupRecovery: true }).then((res) => {
+    apiService.getSingleSession(session.id).then((res) => {
       if (cancelled) return;
       setLoadingDetails(false);
       if (res && "error" in res) {

web-src/src/pages/EventForm/SessionManagement/Sessions.tsx

@@ -127,7 +127,7 @@ function sortSessionsByDate(sessions: Session[]): Session[] {
 }
 
 async function hydrateSessionWithTime(session: Session): Promise<Session> {
-  const timesRes = await apiService.getSessionTimes(session.id, { skipStaleGroupRecovery: true });
+  const timesRes = await apiService.getSessionTimes(session.id);
   if (timesRes && "error" in timesRes) return session;
 
   const times = Array.isArray((timesRes as any)?.sessionTimes)
@@ -278,7 +278,7 @@ export const Sessions: React.FC<SessionsProps> = ({ onOpenFormChange }) => {
     if (!seriesId) return;
     if (seriesSpeakers.length > 0) return;
     try {
-      const response = await cachedApi.getSpeakers(seriesId, { skipStaleGroupRecovery: true });
+      const response = await cachedApi.getSpeakers(seriesId);
       if (response && !("error" in response)) {
         const speakers = response.speakers || response || [];
         setSeriesSpeakers(Array.isArray(speakers) ? speakers : []);
@@ -291,9 +291,9 @@ export const Sessions: React.FC<SessionsProps> = ({ onOpenFormChange }) => {
   const loadVenueLocationsIfNeeded = useCallback(async () => {
     if (!eventId || venueLocations.length > 0) return
     try {
-      const venueRes = await apiService.getEventVenue(eventId, { skipStaleGroupRecovery: true })
+      const venueRes = await apiService.getEventVenue(eventId)
       if (!venueRes || 'error' in venueRes || !venueRes.venueId) return
-      const locRes = await apiService.listVenueLocations(venueRes.venueId, { skipStaleGroupRecovery: true })
+      const locRes = await apiService.listVenueLocations(venueRes.venueId)
       if (locRes && !('error' in locRes)) {
         const list = (locRes as any).locations ?? locRes ?? []
         setVenueLocations(Array.isArray(list) ? list : [])
@@ -306,7 +306,7 @@ export const Sessions: React.FC<SessionsProps> = ({ onOpenFormChange }) => {
   const refreshSeriesSpeakers = useCallback(async () => {
     if (!seriesId) return;
     try {
-      const response = await cachedApi.getSpeakers(seriesId, { skipStaleGroupRecovery: true });
+      const response = await cachedApi.getSpeakers(seriesId);
       if (response && !("error" in response)) {
         const speakers = response.speakers || response || [];
         setSeriesSpeakers(Array.isArray(speakers) ? speakers : []);
@@ -323,7 +323,7 @@ export const Sessions: React.FC<SessionsProps> = ({ onOpenFormChange }) => {
     }
     setIsLoading(true);
     try {
-      const response = await apiService.getAllEventSessions(eventId, { skipStaleGroupRecovery: true });
+      const response = await apiService.getAllEventSessions(eventId);
       if (response && "error" in response) {
         toast.error(response.error?.message || String(response.error), { duration: 8000 });
         setSessions([]);

web-src/src/pages/EventForm/SpeakersComponent.tsx

@@ -117,7 +117,7 @@ export const SpeakersComponent: React.FC = () => {
 
       let savedSpeakers: any[] = []
       try {
-        const speakersResponse = await cachedApi.getEventSpeakers(savedEventId, { skipStaleGroupRecovery: true })
+        const speakersResponse = await cachedApi.getEventSpeakers(savedEventId)
         if (speakersResponse && !('error' in speakersResponse)) {
           savedSpeakers = speakersResponse.speakers || speakersResponse || []
           if (!Array.isArray(savedSpeakers)) {
@@ -265,7 +265,7 @@ export const SpeakersComponent: React.FC = () => {
     const loadSeriesSpeakers = async () => {
       setIsLoadingSpeakers(true)
       try {
-        const response = await cachedApi.getSpeakers(seriesId, { skipStaleGroupRecovery: true })
+        const response = await cachedApi.getSpeakers(seriesId)
         if (isMounted && response && !('error' in response)) {
           const speakers = response.speakers || response || []
           setSeriesSpeakers(Array.isArray(speakers) ? speakers : [])
@@ -290,7 +290,7 @@ export const SpeakersComponent: React.FC = () => {
 
   const refreshSeriesSpeakers = useCallback(async () => {
     if (!seriesId) return
-    const response = await cachedApi.getSpeakers(seriesId, { skipStaleGroupRecovery: true })
+    const response = await cachedApi.getSpeakers(seriesId)
     if (response && !('error' in response)) {
       const speakers = response.speakers || response || []
       setSeriesSpeakers(Array.isArray(speakers) ? speakers : [])