@@ -142,33 +142,39 @@ export const workspaceToInitialValues = (
142142}
143143
144144export const WorkspaceSchedulePage :React . FC = ( ) => {
145+ const { username :usernameQueryParam , workspace :workspaceQueryParam } = useParams ( )
145146const navigate = useNavigate ( )
146- const { workspace : workspaceQueryParam } = useParams ( )
147- const workspaceId = firstOrItem ( workspaceQueryParam , null )
147+ const username = firstOrItem ( usernameQueryParam , null )
148+ const workspaceName = firstOrItem ( workspaceQueryParam , null )
148149const [ scheduleState , scheduleSend ] = useMachine ( workspaceSchedule )
149150const { formErrors, getWorkspaceError, workspace} = scheduleState . context
150151
151152// Get workspace on mount and whenever workspaceId changes.
152153// scheduleSend should not change.
153154useEffect ( ( ) => {
154- workspaceId && scheduleSend ( { type :"GET_WORKSPACE" , workspaceId } )
155- } , [ workspaceId , scheduleSend ] )
155+ username && workspaceName && scheduleSend ( { type :"GET_WORKSPACE" , username , workspaceName } )
156+ } , [ username , workspaceName , scheduleSend ] )
156157
157- if ( ! workspaceId ) {
158+ if ( ! username || ! workspaceName ) {
158159navigate ( "/workspaces" )
159160return null
160161} else if ( scheduleState . matches ( "idle" ) || scheduleState . matches ( "gettingWorkspace" ) || ! workspace ) {
161162return < FullScreenLoader />
162163} else if ( scheduleState . matches ( "error" ) ) {
163- return < ErrorSummary error = { getWorkspaceError } retry = { ( ) => scheduleSend ( { type :"GET_WORKSPACE" , workspaceId} ) } />
164+ return (
165+ < ErrorSummary
166+ error = { getWorkspaceError }
167+ retry = { ( ) => scheduleSend ( { type :"GET_WORKSPACE" , username, workspaceName} ) }
168+ />
169+ )
164170} else if ( scheduleState . matches ( "presentForm" ) || scheduleState . matches ( "submittingSchedule" ) ) {
165171return (
166172< WorkspaceScheduleForm
167173fieldErrors = { formErrors }
168174initialValues = { workspaceToInitialValues ( workspace , dayjs . tz . guess ( ) ) }
169175isLoading = { scheduleState . tags . has ( "loading" ) }
170176onCancel = { ( ) => {
171- navigate ( `/workspaces /${ workspaceId } )
177+ navigate ( `/@ ${ username } ${ workspaceName } )
172178} }
173179onSubmit = { ( values ) => {
174180scheduleSend ( {
@@ -180,7 +186,7 @@ export const WorkspaceSchedulePage: React.FC = () => {
180186/>
181187)
182188} else if ( scheduleState . matches ( "submitSuccess" ) ) {
183- navigate ( `/workspaces /${ workspaceId } )
189+ navigate ( `/@ ${ username } ${ workspaceName } )
184190return < FullScreenLoader />
185191} else {
186192// Theoretically impossible - log and bail