discours.io/webapp
5
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

Merge pull request #487 from Discours/hotfix/sv-artical-component

Browse Source 
Fix slug updating in ArticlePage component by managing currentSlug signal
This commit is contained in:
Tony 2024-10-02 23:10:32 +03:00 committed by GitHub
commit 04878bec0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 113 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
src/routes/[slug]/[...tab].tsx
View File

@ -1,6 +1,16 @@
import { RouteDefinition, RouteSectionProps, createAsync, useLocation } from '@solidjs/router'
import { HttpStatusCode } from '@solidjs/start'
import { ErrorBoundary, Show, Suspense, createEffect, on, onMount } from 'solid-js'
import {
ErrorBoundary,
Match,
Show,
Suspense,
Switch,
createEffect,
createSignal,
on,
onMount
} from 'solid-js'
import { FourOuFourView } from '~/components/Views/FourOuFour'
import { Loading } from '~/components/_shared/Loading'
import { gaIdentity } from '~/config'
@ -43,90 +53,111 @@ export type SlugPageProps = {
topics: Topic[]
}
export default function ArticlePage(props: RouteSectionProps<SlugPageProps>) {
if (props.params.slug.startsWith('@')) {
console.debug('[routes] [slug]/[...tab] starts with @, render as author page')
const patchedProps = {
...props,
params: {
...props.params,
slug: props.params.slug.slice(1, props.params.slug.length)
function ArticlePageContent(props: RouteSectionProps<ArticlePageProps>) {
const loc = useLocation()
const { t } = useLocalize()
const data = createAsync(async () => {
const result = props.data?.article || (await fetchShout(props.params.slug))
return result
})
onMount(async () => {
if (gaIdentity && data()?.id) {
try {
await loadGAScript(gaIdentity)
initGA(gaIdentity)
} catch (error) {
console.warn('[routes] [slug]/[...tab] Failed to connect Google Analytics:', error)
}
} as RouteSectionProps<AuthorPageProps>
return <AuthorPage {...patchedProps} />
}
}
})
if (props.params.slug.startsWith('!')) {
console.debug('[routes] [slug]/[...tab] starts with !, render as topic page')
const patchedProps = {
...props,
params: {
...props.params,
slug: props.params.slug.slice(1, props.params.slug.length)
}
} as RouteSectionProps<TopicPageProps>
return <TopicPage {...patchedProps} />
}
function ArticlePage(props: RouteSectionProps<ArticlePageProps>) {
const loc = useLocation()
const { t } = useLocalize()
const data = createAsync(async () => props.data?.article || (await fetchShout(props.params.slug)))
onMount(async () => {
if (gaIdentity && data()?.id) {
try {
await loadGAScript(gaIdentity)
initGA(gaIdentity)
} catch (error) {
console.warn('[routes] [slug]/[...tab] Failed to connect Google Analytics:', error)
}
}
})
createEffect(
on(
data,
(a?: Shout) => {
if (!a?.id) return
window?.gtag?.('event', 'page_view', {
page_title: a.title,
page_location: window?.location.href || '',
page_path: loc.pathname
})
},
{ defer: true }
)
createEffect(
on(
data,
(a?: Shout) => {
if (!a?.id) return
window?.gtag?.('event', 'page_view', {
page_title: a.title,
page_location: window?.location.href || '',
page_path: loc.pathname
})
},
{ defer: true }
)
)
return (
<ErrorBoundary fallback={() => <HttpStatusCode code={500} />}>
<Suspense fallback={<Loading />}>
<Show
when={data()?.id}
fallback={
<PageLayout isHeaderFixed={false} hideFooter={true} title={t('Nothing is here')}>
<FourOuFourView />
<HttpStatusCode code={404} />
</PageLayout>
}
>
<PageLayout
title={`${t('Discours')}${data()?.title ? ' :: ' : ''}${data()?.title || ''}`}
desc={descFromBody(data()?.body || '')}
keywords={keywordsFromTopics(data()?.topics as { title: string }[])}
headerTitle={data()?.title || ''}
slug={data()?.slug}
cover={data()?.cover || ''}
>
<ReactionsProvider>
<FullArticle article={data() as Shout} />
</ReactionsProvider>
return (
<ErrorBoundary fallback={() => <HttpStatusCode code={500} />}>
<Suspense fallback={<Loading />}>
<Show
when={data()?.id}
fallback={
<PageLayout isHeaderFixed={false} hideFooter={true} title={t('Nothing is here')}>
<FourOuFourView />
<HttpStatusCode code={404} />
</PageLayout>
</Show>
</Suspense>
</ErrorBoundary>
)
}
return <ArticlePage {...props} />
}
>
<PageLayout
title={`${t('Discours')}${data()?.title ? ' :: ' : ''}${data()?.title || ''}`}
desc={descFromBody(data()?.body || '')}
keywords={keywordsFromTopics(data()?.topics as { title: string }[])}
headerTitle={data()?.title || ''}
slug={data()?.slug}
cover={data()?.cover || ''}
>
<ReactionsProvider>
<FullArticle article={data() as Shout} />
</ReactionsProvider>
</PageLayout>
</Show>
</Suspense>
</ErrorBoundary>
)
}
export default function ArticlePage(props: RouteSectionProps<SlugPageProps>) {
const [currentSlug, setCurrentSlug] = createSignal(props.params.slug)
createEffect(() => {
const newSlug = props.params.slug
if (newSlug !== currentSlug()) {
setCurrentSlug(newSlug)
}
})
return (
<Switch fallback={<div>Loading...</div>}>
<Match when={currentSlug().startsWith('@')}>
<AuthorPage
{...({
...props,
params: {
...props.params,
slug: currentSlug().slice(1)
}
} as RouteSectionProps<AuthorPageProps>)}
/>
</Match>
<Match when={currentSlug().startsWith('!')}>
<TopicPage
{...({
...props,
params: {
...props.params,
slug: currentSlug().slice(1)
}
} as RouteSectionProps<TopicPageProps>)}
/>
</Match>
<Match when={!['@', '!'].some((prefix) => currentSlug().startsWith(prefix))}>
<ArticlePageContent {...props} />
</Match>
<Match when={true}>
<ErrorBoundary fallback={() => <HttpStatusCode code={404} />}>
<FourOuFourView />
</ErrorBoundary>
</Match>
</Switch>
)
}