feat: step to all authors, with debug level an dsome minor changes in memo
This commit is contained in:
parent
59885486eb
commit
b677cb3493
|
@ -21,44 +21,55 @@ type Props = {
|
||||||
authorsByShouts?: Author[]
|
authorsByShouts?: Author[]
|
||||||
isLoaded: boolean
|
isLoaded: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export const AUTHORS_PER_PAGE = 20
|
export const AUTHORS_PER_PAGE = 20
|
||||||
export const ABC = {
|
export const ABC = {
|
||||||
ru: 'АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ#',
|
ru: 'АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ#',
|
||||||
en: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ#'
|
en: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ#'
|
||||||
}
|
}
|
||||||
|
|
||||||
// useAuthors sorted from context, set filter/sort
|
|
||||||
|
|
||||||
export const AllAuthors = (props: Props) => {
|
export const AllAuthors = (props: Props) => {
|
||||||
const { t, lang } = useLocalize()
|
const { t, lang } = useLocalize()
|
||||||
const alphabet = createMemo(() => ABC[lang()] || ABC['ru'])
|
const alphabet = createMemo(() => ABC[lang()] || ABC['ru'])
|
||||||
const [searchParams, changeSearchParams] = useSearchParams<{ by?: string }>()
|
const [searchParams, changeSearchParams] = useSearchParams<{ by?: string }>()
|
||||||
const { authorsSorted, setAuthorsSort, loadAuthors } = useAuthors()
|
const { authorsSorted, setAuthorsSort, loadAuthors } = useAuthors()
|
||||||
const authors = createMemo(() => props.authors || authorsSorted())
|
|
||||||
const [loading, setLoading] = createSignal<boolean>(false)
|
const [loading, setLoading] = createSignal<boolean>(false)
|
||||||
|
|
||||||
|
const authors = createMemo(() => {
|
||||||
|
let sortedAuthors = [...(props.authors || authorsSorted())] // Clone the array to avoid mutating the original
|
||||||
|
console.log('Before Sorting:', sortedAuthors)
|
||||||
|
if (searchParams.by === 'name') {
|
||||||
|
sortedAuthors = sortedAuthors.sort((a, b) => a.name.localeCompare(b.name))
|
||||||
|
console.log('Sorted by Name:', sortedAuthors)
|
||||||
|
} else if (searchParams.by === 'shouts') {
|
||||||
|
sortedAuthors = sortedAuthors.sort((a, b) => (b.stat?.shouts || 0) - (a.stat?.shouts || 0))
|
||||||
|
console.log('Sorted by Shouts:', sortedAuthors)
|
||||||
|
}
|
||||||
|
console.log('After Sorting:', sortedAuthors)
|
||||||
|
return sortedAuthors
|
||||||
|
})
|
||||||
|
|
||||||
|
// Log authors data and searchParams for debugging
|
||||||
|
createEffect(() => {
|
||||||
|
console.log('Authors:', props.authors)
|
||||||
|
console.log('Sorted Authors:', authors())
|
||||||
|
console.log('Search Params "by":', searchParams.by)
|
||||||
|
})
|
||||||
|
|
||||||
// filter
|
// filter
|
||||||
const [searchQuery, setSearchQuery] = createSignal('')
|
const [searchQuery, setSearchQuery] = createSignal('')
|
||||||
const [filteredAuthors, setFilteredAuthors] = createSignal<Author[]>([])
|
const [filteredAuthors, setFilteredAuthors] = createSignal<Author[]>([])
|
||||||
createEffect(
|
createEffect(() =>
|
||||||
() =>
|
authors() && setFilteredAuthors(dummyFilter(authors(), searchQuery(), lang()) as Author[])
|
||||||
authors() &&
|
|
||||||
setFilteredAuthors((_prev: Author[]) => dummyFilter(authors(), searchQuery(), lang()) as Author[])
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// sort by
|
|
||||||
onMount(() => !searchParams?.by && changeSearchParams({ by: 'name' }))
|
|
||||||
createEffect(on(() => searchParams?.by || 'name', setAuthorsSort || ((_) => null), {}))
|
|
||||||
|
|
||||||
// store by first char
|
// store by first char
|
||||||
const byLetterFiltered = createMemo<{ [letter: string]: Author[] }>(() => {
|
const byLetterFiltered = createMemo<{ [letter: string]: Author[] }>(() => {
|
||||||
if (!(filteredAuthors()?.length > 0)) return {}
|
if (!(filteredAuthors()?.length > 0)) return {}
|
||||||
console.debug('[components.AllAuthors] update byLetterFiltered', filteredAuthors()?.length)
|
console.debug('[components.AllAuthors] update byLetterFiltered', filteredAuthors()?.length)
|
||||||
return (
|
return filteredAuthors().reduce(
|
||||||
filteredAuthors()?.reduce(
|
(acc, author: Author) => authorLetterReduce(acc, author, lang()),
|
||||||
(acc, author: Author) => authorLetterReduce(acc, author, lang()),
|
{} as { [letter: string]: Author[] }
|
||||||
{} as { [letter: string]: Author[] }
|
|
||||||
) || {}
|
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -91,6 +102,7 @@ export const AllAuthors = (props: Props) => {
|
||||||
followers: 0,
|
followers: 0,
|
||||||
shouts: 0
|
shouts: 0
|
||||||
})
|
})
|
||||||
|
|
||||||
const loadMoreAuthors = () => {
|
const loadMoreAuthors = () => {
|
||||||
const by = searchParams?.by as 'followers' | 'shouts' | undefined
|
const by = searchParams?.by as 'followers' | 'shouts' | undefined
|
||||||
if (!by) return
|
if (!by) return
|
||||||
|
@ -116,14 +128,14 @@ export const AllAuthors = (props: Props) => {
|
||||||
['view-switcher__item--selected']: searchParams?.by === 'followers'
|
['view-switcher__item--selected']: searchParams?.by === 'followers'
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<a href="/author?by=followers">{t('By popularity')}</a>
|
<a href="#" onClick={() => changeSearchParams({ by: 'followers' })}>{t('By popularity')}</a>
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
class={clsx({
|
class={clsx({
|
||||||
['view-switcher__item--selected']: searchParams?.by === 'name'
|
['view-switcher__item--selected']: searchParams?.by === 'name'
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<a href="/author?by=name">{t('By name')}</a>
|
<a href="#" onClick={() => changeSearchParams({ by: 'name' })}>{t('By name')}</a>
|
||||||
</li>
|
</li>
|
||||||
<Show when={searchParams?.by === 'name'}>
|
<Show when={searchParams?.by === 'name'}>
|
||||||
<li class="view-switcher__search">
|
<li class="view-switcher__search">
|
||||||
|
@ -193,7 +205,7 @@ export const AllAuthors = (props: Props) => {
|
||||||
|
|
||||||
const AuthorsSortedList = () => (
|
const AuthorsSortedList = () => (
|
||||||
<div class={clsx(stylesAuthorList.AuthorsList)}>
|
<div class={clsx(stylesAuthorList.AuthorsList)}>
|
||||||
<For each={authorsSorted?.()}>
|
<For each={authors()}>
|
||||||
{(author) => (
|
{(author) => (
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-20 col-xl-18">
|
<div class="col-lg-20 col-xl-18">
|
||||||
|
@ -205,7 +217,7 @@ export const AllAuthors = (props: Props) => {
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-20 col-xl-18">
|
<div class="col-lg-20 col-xl-18">
|
||||||
<div class={stylesAuthorList.action}>
|
<div class={stylesAuthorList.action}>
|
||||||
<Show when={!loading() && ((authorsSorted?.() || []).length || 0) > 0}>
|
<Show when={!loading() && ((authors() || []).length || 0) > 0}>
|
||||||
<Button value={t('Load more')} onClick={loadMoreAuthors} aria-live="polite" />
|
<Button value={t('Load more')} onClick={loadMoreAuthors} aria-live="polite" />
|
||||||
</Show>
|
</Show>
|
||||||
<Show when={loading()}>
|
<Show when={loading()}>
|
||||||
|
@ -221,7 +233,6 @@ export const AllAuthors = (props: Props) => {
|
||||||
<Show when={props.isLoaded} fallback={<Loading />}>
|
<Show when={props.isLoaded} fallback={<Loading />}>
|
||||||
<div class="offset-md-5">
|
<div class="offset-md-5">
|
||||||
<TabNavigator />
|
<TabNavigator />
|
||||||
|
|
||||||
<Show when={searchParams?.by === 'name'} fallback={<AuthorsSortedList />}>
|
<Show when={searchParams?.by === 'name'} fallback={<AuthorsSortedList />}>
|
||||||
<AbcNavigator />
|
<AbcNavigator />
|
||||||
<AbcAuthorsList />
|
<AbcAuthorsList />
|
||||||
|
|
Loading…
Reference in New Issue
Block a user