fix: route home for missing problems
This commit is contained in:
+3
-3
@@ -40,10 +40,10 @@ type HeuristicStateUpdater<S> = StateUpdater<S>
|
||||
type ResourceHookFunction = <T>(
|
||||
url: string | (() => string),
|
||||
initialValue: T,
|
||||
onError?: () => void
|
||||
onValue?: (value: T) => void
|
||||
) => [T, RefreshFunction, HeuristicStateUpdater<T>]
|
||||
|
||||
export const useResource: ResourceHookFunction = (url, initialValue, onError) => {
|
||||
export const useResource: ResourceHookFunction = (url, initialValue, onValue) => {
|
||||
const [value, setValue] = useState(initialValue)
|
||||
|
||||
function refresh() {
|
||||
@@ -55,11 +55,11 @@ export const useResource: ResourceHookFunction = (url, initialValue, onError) =>
|
||||
if (res.ok) {
|
||||
return res.json()
|
||||
} else {
|
||||
onError?.()
|
||||
return initialValue
|
||||
}
|
||||
})
|
||||
.then(newValue => {
|
||||
onValue?.(newValue)
|
||||
setValue(newValue)
|
||||
})
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { route } from 'preact-router'
|
||||
import { useContext, useState } from 'preact/hooks'
|
||||
import { isAdministrator, Solution as SolutionModel } from '../../shared/model'
|
||||
import { isAdministrator, Problem as ProblemModel, Solution as SolutionModel } from '../../shared/model'
|
||||
import { prependBaseUrl, server } from '../api'
|
||||
import { Header } from '../components/Header'
|
||||
import { MarkdownEditor } from '../components/MarkdownEditor'
|
||||
@@ -21,15 +21,13 @@ export const ProblemPage = ({ id }: RouteProps) => {
|
||||
|
||||
const [source, setSource] = useState('')
|
||||
|
||||
const [{ content }] = useResource<{ content?: string }>(
|
||||
`/api/problem/${id}`,
|
||||
{
|
||||
content: '',
|
||||
},
|
||||
() => {
|
||||
const [problem] = useResource<ProblemModel | null>(`/api/problem/${id}`, null, problem => {
|
||||
if (problem === null) {
|
||||
route(prependBaseUrl('/'))
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
const content = problem?.content ?? ''
|
||||
|
||||
const [solutions, refreshSolutions, setSolutionHeuristic] = useListResource<SolutionModel>(
|
||||
`/api/solutions?problem=${id}`
|
||||
|
||||
Reference in New Issue
Block a user