From e332a8a674092ba5090ba3b639a6802bc485fadf Mon Sep 17 00:00:00 2001
From: Igor Lobanov <igor.lobanov@onetwotrip.com>
Date: Tue, 6 Dec 2022 17:03:55 +0100
Subject: [PATCH] article page. & comments fix

---
 src/components/Article/CommentsTree.tsx | 11 +++----
 src/components/Article/FullArticle.tsx  |  2 +-
 src/components/Author/Card.tsx          |  3 +-
 src/components/Nav/HeaderAuth.tsx       |  4 +--
 src/components/Topic/Card.tsx           |  3 +-
 src/components/Views/Feed.tsx           |  2 +-
 src/context/session.tsx                 | 43 ++++++++++++++-----------
 src/graphql/types.gen.ts                |  4 +--
 src/stores/zine/reactions.ts            |  6 +---
 9 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/components/Article/CommentsTree.tsx b/src/components/Article/CommentsTree.tsx
index a15facad..44938ae2 100644
--- a/src/components/Article/CommentsTree.tsx
+++ b/src/components/Article/CommentsTree.tsx
@@ -1,11 +1,10 @@
-import { For, Show } from 'solid-js'
+import { For, Show, createMemo, createSignal, onMount } from 'solid-js'
 import { useSession } from '../../context/session'
 import Comment from './Comment'
 import { t } from '../../utils/intl'
 import { showModal } from '../../stores/ui'
 import styles from '../../styles/Article.module.scss'
 import { useReactionsStore } from '../../stores/zine/reactions'
-import { createMemo, createSignal, onMount } from 'solid-js'
 import type { Reaction } from '../../graphql/types.gen'
 import { clsx } from 'clsx'
 import { byCreated, byStat } from '../../utils/sortby'
@@ -14,17 +13,17 @@ import { Loading } from '../Loading'
 const ARTICLE_COMMENTS_PAGE_SIZE = 50
 const MAX_COMMENT_LEVEL = 6
 
-export const CommentsTree = (props: { shout: string; reactions?: Reaction[] }) => {
+export const CommentsTree = (props: { shoutSlug: string }) => {
   const [getCommentsPage, setCommentsPage] = createSignal(0)
   const [commentsOrder, setCommentsOrder] = createSignal<'rating' | 'createdAt'>('createdAt')
   const [isCommentsLoading, setIsCommentsLoading] = createSignal(false)
   const [isLoadMoreButtonVisible, setIsLoadMoreButtonVisible] = createSignal(false)
   const { session } = useSession()
-  const { sortedReactions, loadReactionsBy } = useReactionsStore({ reactions: props.reactions })
+  const { sortedReactions, loadReactionsBy } = useReactionsStore()
   const reactions = createMemo<Reaction[]>(() =>
     sortedReactions()
       .sort(commentsOrder() === 'rating' ? byStat('rating') : byCreated)
-      .filter((r) => r.shout.slug === props.shout)
+      .filter((r) => r.shout.slug === props.shoutSlug)
   )
 
   const loadMore = async () => {
@@ -33,7 +32,7 @@ export const CommentsTree = (props: { shout: string; reactions?: Reaction[] }) =
       setIsCommentsLoading(true)
 
       const { hasMore } = await loadReactionsBy({
-        by: { shout: props.shout, comment: true },
+        by: { shout: props.shoutSlug, comment: true },
         limit: ARTICLE_COMMENTS_PAGE_SIZE,
         offset: page * ARTICLE_COMMENTS_PAGE_SIZE
       })
diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx
index f29ebde2..2783e112 100644
--- a/src/components/Article/FullArticle.tsx
+++ b/src/components/Article/FullArticle.tsx
@@ -222,7 +222,7 @@ export const FullArticle = (props: ArticleProps) => {
             )}
           </For>
         </div>
-        <CommentsTree shout={props.article?.slug} />
+        <CommentsTree shoutSlug={props.article?.slug} />
       </div>
     </div>
   )
diff --git a/src/components/Author/Card.tsx b/src/components/Author/Card.tsx
index bf7b0cec..95fa35d7 100644
--- a/src/components/Author/Card.tsx
+++ b/src/components/Author/Card.tsx
@@ -32,6 +32,7 @@ interface AuthorCardProps {
 export const AuthorCard = (props: AuthorCardProps) => {
   const {
     session,
+    isSessionLoaded,
     actions: { loadSession }
   } = useSession()
 
@@ -100,7 +101,7 @@ export const AuthorCard = (props: AuthorCardProps) => {
           </Show>
         </div>
         <ShowOnlyOnClient>
-          <Show when={session.state !== 'pending'}>
+          <Show when={isSessionLoaded()}>
             <Show when={canFollow()}>
               <div class={styles.authorSubscribe}>
                 <Show
diff --git a/src/components/Nav/HeaderAuth.tsx b/src/components/Nav/HeaderAuth.tsx
index 7100bf44..64bccb0e 100644
--- a/src/components/Nav/HeaderAuth.tsx
+++ b/src/components/Nav/HeaderAuth.tsx
@@ -21,7 +21,7 @@ export const HeaderAuth = (props: HeaderAuthProps) => {
   const [visibleWarnings, setVisibleWarnings] = createSignal(false)
   const { warnings } = useWarningsStore()
 
-  const { session, isAuthenticated } = useSession()
+  const { session, isSessionLoaded, isAuthenticated } = useSession()
 
   const toggleWarnings = () => setVisibleWarnings(!visibleWarnings())
 
@@ -38,7 +38,7 @@ export const HeaderAuth = (props: HeaderAuthProps) => {
 
   return (
     <ShowOnlyOnClient>
-      <Show when={session.state !== 'pending'}>
+      <Show when={isSessionLoaded()}>
         <div class={styles.usernav}>
           <div class={clsx(styles.userControl, styles.userControl, 'col')}>
             <div class={clsx(styles.userControlItem, styles.userControlItemVerbose)}>
diff --git a/src/components/Topic/Card.tsx b/src/components/Topic/Card.tsx
index 8dcd2f23..5dcf8c23 100644
--- a/src/components/Topic/Card.tsx
+++ b/src/components/Topic/Card.tsx
@@ -28,6 +28,7 @@ interface TopicProps {
 export const TopicCard = (props: TopicProps) => {
   const {
     session,
+    isSessionLoaded,
     actions: { loadSession }
   } = useSession()
 
@@ -89,7 +90,7 @@ export const TopicCard = (props: TopicProps) => {
         classList={{ 'col-md-3': !props.compact && !props.subscribeButtonBottom }}
       >
         <ShowOnlyOnClient>
-          <Show when={session.state !== 'pending'}>
+          <Show when={isSessionLoaded()}>
             <button
               onClick={() => subscribe(!subscribed())}
               class="button--light button--subscribe-topic"
diff --git a/src/components/Views/Feed.tsx b/src/components/Views/Feed.tsx
index 942f5566..b02f33bd 100644
--- a/src/components/Views/Feed.tsx
+++ b/src/components/Views/Feed.tsx
@@ -27,7 +27,7 @@ export const FEED_PAGE_SIZE = 20
 export const FeedView = () => {
   // state
   const { sortedArticles } = useArticlesStore()
-  const { sortedReactions: topComments, loadReactionsBy } = useReactionsStore({})
+  const { sortedReactions: topComments, loadReactionsBy } = useReactionsStore()
   const { sortedAuthors } = useAuthorsStore()
   const { topTopics } = useTopicsStore()
   const { topAuthors } = useTopAuthorsStore()
diff --git a/src/context/session.tsx b/src/context/session.tsx
index 206cf730..211fe843 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -1,11 +1,12 @@
 import type { Accessor, JSX, Resource } from 'solid-js'
-import { createContext, createMemo, createResource, onMount, useContext } from 'solid-js'
+import { createContext, createMemo, createResource, createSignal, onMount, useContext } from 'solid-js'
 import type { AuthResult } from '../graphql/types.gen'
 import { apiClient } from '../utils/apiClient'
 import { resetToken, setToken } from '../graphql/privateGraphQLClient'
 
 type SessionContextType = {
   session: Resource<AuthResult>
+  isSessionLoaded: Accessor<boolean>
   userSlug: Accessor<string>
   isAuthenticated: Accessor<boolean>
   actions: {
@@ -18,27 +19,33 @@ type SessionContextType = {
 
 const SessionContext = createContext<SessionContextType>()
 
-const getSession = async (): Promise<AuthResult> => {
-  try {
-    const authResult = await apiClient.getSession()
-    if (!authResult) {
-      return null
-    }
-    setToken(authResult.token)
-    return authResult
-  } catch (error) {
-    console.error('getSession error:', error)
-    resetToken()
-    return null
-  }
-}
-
 export function useSession() {
   return useContext(SessionContext)
 }
 
 export const SessionProvider = (props: { children: JSX.Element }) => {
-  const [session, { refetch: loadSession, mutate }] = createResource<AuthResult>(getSession)
+  const [isSessionLoaded, setIsSessionLoaded] = createSignal(false)
+
+  const getSession = async (): Promise<AuthResult> => {
+    try {
+      const authResult = await apiClient.getSession()
+      if (!authResult) {
+        return null
+      }
+      setToken(authResult.token)
+      setIsSessionLoaded(true)
+      return authResult
+    } catch (error) {
+      console.error('getSession error:', error)
+      resetToken()
+      return null
+    }
+  }
+
+  const [session, { refetch: loadSession, mutate }] = createResource<AuthResult>(getSession, {
+    ssrLoadFrom: 'initial',
+    initialValue: null
+  })
 
   const userSlug = createMemo(() => session()?.user?.slug)
 
@@ -71,7 +78,7 @@ export const SessionProvider = (props: { children: JSX.Element }) => {
     confirmEmail
   }
 
-  const value: SessionContextType = { session, userSlug, isAuthenticated, actions }
+  const value: SessionContextType = { session, isSessionLoaded, userSlug, isAuthenticated, actions }
 
   onMount(() => {
     loadSession()
diff --git a/src/graphql/types.gen.ts b/src/graphql/types.gen.ts
index 9cd49925..0239ba2e 100644
--- a/src/graphql/types.gen.ts
+++ b/src/graphql/types.gen.ts
@@ -22,8 +22,8 @@ export type AuthResult = {
 }
 
 export type Author = {
-  bio?: Maybe<Scalars['String']>
   about?: Maybe<Scalars['String']>
+  bio?: Maybe<Scalars['String']>
   caption?: Maybe<Scalars['String']>
   id: Scalars['Int']
   lastSeen?: Maybe<Scalars['DateTime']>
@@ -334,8 +334,6 @@ export type Permission = {
 export type ProfileInput = {
   about?: InputMaybe<Scalars['String']>
   bio?: InputMaybe<Scalars['String']>
-  slug?: InputMaybe<Scalars['String']>
-  about?: InputMaybe<Scalars['String']>
   links?: InputMaybe<Array<InputMaybe<Scalars['String']>>>
   name?: InputMaybe<Scalars['String']>
   slug?: InputMaybe<Scalars['String']>
diff --git a/src/stores/zine/reactions.ts b/src/stores/zine/reactions.ts
index 4e4bfd06..d757204b 100644
--- a/src/stores/zine/reactions.ts
+++ b/src/stores/zine/reactions.ts
@@ -37,11 +37,7 @@ export const deleteReaction = async (reactionId: number) => {
   console.debug(resp)
   return resp
 }
-export const useReactionsStore = (initialState: { reactions?: Reaction[] }) => {
-  if (initialState.reactions) {
-    setSortedReactions([...initialState.reactions])
-  }
-
+export const useReactionsStore = () => {
   return {
     reactionsByShout,
     sortedReactions,