Merge branch 'develop' into release

urfit-tech · Oct 19, 2023 · 786656f · 786656f
2 parents 6083d41 + c45f5e4
commit 786656f
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 27 deletions.
diff --git a/src/components/package/ProgramPackageCollectionBlock.tsx b/src/components/package/ProgramPackageCollectionBlock.tsx
@@ -20,7 +20,6 @@ import {
 import dayjs from 'dayjs'
 import { CommonTitleMixin, MultiLineTruncationMixin } from 'lodestar-app-element/src/components/common'
 import { useApp } from 'lodestar-app-element/src/contexts/AppContext'
-import { useAuth } from 'lodestar-app-element/src/contexts/AuthContext'
 import React, { Fragment, useState } from 'react'
 import { BiSearch, BiSort } from 'react-icons/bi'
 import { FiGrid, FiList } from 'react-icons/fi'
@@ -137,6 +136,7 @@ const sortOptions = [
 ]
 
 const ProgramPackageCollectionBlock: React.VFC<{
+  memberId: string
   onProgramTabClick: (tab: string) => void
   programTab: string
   programPackageEnrollment: ProgramPackageEnrollment[]
@@ -146,6 +146,7 @@ const ProgramPackageCollectionBlock: React.VFC<{
   loading: boolean
   isError: boolean
 }> = ({
+  memberId,
   programTab,
   onProgramTabClick,
   programPackageEnrollment,
@@ -155,7 +156,6 @@ const ProgramPackageCollectionBlock: React.VFC<{
   loading,
   isError,
 }) => {
-  const { currentMemberId } = useAuth()
   const { formatMessage } = useIntl()
   const { settings } = useApp()
   const [isExpired, setIsExpired] = useState(false)
@@ -368,7 +368,7 @@ const ProgramPackageCollectionBlock: React.VFC<{
                       to={
                         isExpired
                           ? `/program-packages/${programPackage.id}`
-                          : `/program-packages/${programPackage.id}/contents?memberId=${currentMemberId}`
+                          : `/program-packages/${programPackage.id}/contents?memberId=${memberId}`
                       }
                     >
                       <StyledCard>
@@ -399,7 +399,7 @@ const ProgramPackageCollectionBlock: React.VFC<{
                       to={
                         isExpired
                           ? `/program-packages/${programPackage.id}`
-                          : `/program-packages/${programPackage.id}/contents?memberId=${currentMemberId}`
+                          : `/program-packages/${programPackage.id}/contents?memberId=${memberId}`
                       }
                     >
                       <StyledCard>

diff --git a/src/containers/podcast/PodcastProgramTimeline.tsx b/src/containers/podcast/PodcastProgramTimeline.tsx
@@ -29,14 +29,13 @@ export type PodcastProgramProps = PodcastProgramPopoverProps &
     supportLocales?: string[] | null
   }
 const PodcastProgramTimeline: React.VFC<{
-  memberId: string | null
   podcastPrograms: PodcastProgramProps[]
   renderItem?: (item: {
     podcastProgram: PodcastProgramProps
     isEnrolled: boolean
     isSubscribed: boolean
   }) => React.ReactElement
-}> = ({ memberId, podcastPrograms, renderItem }) => {
+}> = ({ podcastPrograms, renderItem }) => {
   const { data: podcastEnrollment } = useProductEnrollment('podcast')
   const { data: podcastPlanEnrollment } = useProductEnrollment('podcast-plan')
 

diff --git a/src/containers/program/EnrolledProgramCollectionBlock.tsx b/src/containers/program/EnrolledProgramCollectionBlock.tsx
@@ -18,7 +18,6 @@ import {
   useRadioGroup,
 } from '@chakra-ui/react'
 import { useApp } from 'lodestar-app-element/src/contexts/AppContext'
-import { useAuth } from 'lodestar-app-element/src/contexts/AuthContext'
 import React, { Fragment, useState } from 'react'
 import { BiSearch, BiSort } from 'react-icons/bi'
 import { FiGrid, FiList } from 'react-icons/fi'
@@ -102,6 +101,7 @@ const filterOptions = [
 ]
 
 const EnrolledProgramCollectionBlock: React.VFC<{
+  memberId: string
   onProgramTabClick: (tab: string) => void
   programTab: string
   programEnrollment: ProgramEnrollment[]
@@ -111,6 +111,7 @@ const EnrolledProgramCollectionBlock: React.VFC<{
   isError: boolean
   loading: boolean
 }> = ({
+  memberId,
   onProgramTabClick,
   programTab,
   programEnrollment,
@@ -120,7 +121,6 @@ const EnrolledProgramCollectionBlock: React.VFC<{
   isError,
   loading,
 }) => {
-  const { currentMemberId } = useAuth()
   const { formatMessage } = useIntl()
   const [isExpired, setIsExpired] = useState(false)
   const localStorageView = localStorage.getItem('programView')
@@ -434,7 +434,7 @@ const EnrolledProgramCollectionBlock: React.VFC<{
                       viewRate={program.viewRate}
                       withProgress={!isExpired}
                       isExpired={isExpired}
-                      previousPage={`members_${currentMemberId}`}
+                      previousPage={`members_${memberId}`}
                     />
                   </Box>
                 )}
@@ -454,7 +454,7 @@ const EnrolledProgramCollectionBlock: React.VFC<{
                       viewRate={program.viewRate}
                       withProgress={!isExpired}
                       isExpired={isExpired}
-                      previousPage={`members_${currentMemberId}`}
+                      previousPage={`members_${memberId}`}
                     />
                   </Box>
                 )}

diff --git a/src/helpers/index.ts b/src/helpers/index.ts
@@ -493,12 +493,19 @@ const getLodestarRoute = (product: MemberPageProductType) => {
   }
 }
 
-export const getProductEnrollmentFromLodestar = async (product: MemberPageProductType, authToken: string) => {
+export const getProductEnrollmentFromLodestar = async (
+  product: MemberPageProductType,
+  authToken: string,
+  memberId?: string,
+) => {
   const route = getLodestarRoute(product)
   if (route) {
-    const { data } = await axios.get(`${process.env.REACT_APP_LODESTAR_SERVER_ENDPOINT}${route}`, {
-      headers: { authorization: `Bearer ${authToken}` },
-    })
+    const { data } = await axios.get(
+      `${process.env.REACT_APP_LODESTAR_SERVER_ENDPOINT}${route}${memberId ? `/?memberId=${memberId}` : ''}`,
+      {
+        headers: { authorization: `Bearer ${authToken}` },
+      },
+    )
 
     return data
   }

diff --git a/src/hooks/common.ts b/src/hooks/common.ts
@@ -759,7 +759,7 @@ export const useMemberPageEnrollmentsCounts = (memberId: string) => {
   }
 }
 
-export const useProductEnrollment = <T extends MemberPageProductType>(product: T) => {
+export const useProductEnrollment = <T extends MemberPageProductType>(product: T, memberId?: string) => {
   const { authToken } = useAuth()
   const [loading, setLoading] = useState(false)
   const [error, setError] = useState<any>()
@@ -769,7 +769,7 @@ export const useProductEnrollment = <T extends MemberPageProductType>(product: T
     if (authToken) {
       try {
         setLoading(true)
-        const programEnrollmentData = await getProductEnrollmentFromLodestar(product, authToken)
+        const programEnrollmentData = await getProductEnrollmentFromLodestar(product, authToken, memberId)
         setData(programEnrollmentData)
       } catch (err) {
         console.log(err)

diff --git a/src/pages/CreatorPage.tsx b/src/pages/CreatorPage.tsx
@@ -162,7 +162,7 @@ const CreatorTabs: React.VFC<{
   })
 
   const { posts } = usePostPreviewCollection({ authorId: creatorId })
-  const { data: podcastPlanEnrollment } = useProductEnrollment('podcast-plan')
+  const { data: podcastPlanEnrollment } = useProductEnrollment('podcast-plan', currentMemberId || undefined)
 
   const { podcastPrograms } = usePodcastProgramCollection(creatorId)
   const { appointmentPlans } = useAppointmentPlanCollection(
@@ -329,7 +329,6 @@ const CreatorTabs: React.VFC<{
           <div className="row">
             <div className="col-12 col-lg-8 mb-3">
               <PodcastProgramTimeline
-                memberId={currentMemberId}
                 podcastPrograms={podcastPrograms}
                 renderItem={({ podcastProgram, isEnrolled, isSubscribed }) => {
                   const elem = (

diff --git a/src/pages/MemberPage/PodcastProgramCollectionBlock.tsx b/src/pages/MemberPage/PodcastProgramCollectionBlock.tsx
@@ -46,9 +46,9 @@ const PodcastProgramCollectionBlock: React.VFC<{
   const { formatMessage } = useIntl()
   const history = useHistory()
   const { setup } = useContext(PodcastPlayerContext)
-  const { data: podcastPlanEnrollment } = useProductEnrollment('podcast-plan')
+  const { data: podcastPlanEnrollment } = useProductEnrollment('podcast-plan', memberId)
 
-  const { playlists, totalPodcastProgramCount, refetchPlaylists } = usePlaylistCollection(memberId)
+  const { playlists, totalPodcastProgramCount, refetchPlaylists } = usePlaylistCollection(memberId || '')
   const updatePlaylist = useUpdatePlaylist()
   const deletePlaylist = useDeletePlaylist()
 
@@ -59,7 +59,6 @@ const PodcastProgramCollectionBlock: React.VFC<{
           <StyledTitle>{formatMessage(productMessages.podcast.title.podcast)}</StyledTitle>
 
           <PodcastProgramTimeline
-            memberId={memberId}
             podcastPrograms={podcastEnrollment}
             renderItem={({ podcastProgram, isEnrolled }) => (
               <Link to={`/podcasts/${podcastProgram.id}`} key={podcastProgram.id}>

diff --git a/src/pages/MemberPage/index.tsx b/src/pages/MemberPage/index.tsx
@@ -72,33 +72,34 @@ const MemberPage: React.VFC<{ renderText?: (member: MemberPublicProps) => React.
   } = useMemberPageEnrollmentsCounts(memberId)
   const [activeKey, setActiveKey] = useQueryParam('tabkey', StringParam)
   const [programTab, setProgramTab] = useState('program')
+
   const {
     fetch: fetchProgramEnrollment,
     data: programEnrollment,
     error: programEnrollmentError,
     loading: programEnrollmentLoading,
-  } = useProductEnrollment('program')
+  } = useProductEnrollment('program', memberId)
   const {
     fetch: fetchExpiredProgramEnrollment,
     data: expiredProgramEnrollment,
     error: expiredProgramEnrollmentError,
     loading: expiredProgramEnrollmentLoading,
-  } = useProductEnrollment('expiredProgram')
+  } = useProductEnrollment('expiredProgram', memberId)
   const {
     data: programPackageEnrollment,
     loading: programPackageEnrollmentLoading,
     error: programPackageEnrollmentError,
-  } = useProductEnrollment('programPackage')
+  } = useProductEnrollment('programPackage', memberId)
   const {
     data: expiredProgramPackageEnrollment,
     loading: expiredProgramPackageEnrollmentLoading,
     error: expiredProgramPackageEnrollmentError,
-  } = useProductEnrollment('expiredProgramPackage')
+  } = useProductEnrollment('expiredProgramPackage', memberId)
   const {
     data: podcastEnrollment,
     loading: podcastEnrollmentLoading,
     error: podcastEnrollmentError,
-  } = useProductEnrollment('podcast')
+  } = useProductEnrollment('podcast', memberId)
   const programCounts = programEnrollment.length + expiredProgramEnrollment.length
   const programPackageCounts = programPackageEnrollment.length + expiredProgramPackageEnrollment.length
   let content = null
@@ -124,6 +125,7 @@ const MemberPage: React.VFC<{ renderText?: (member: MemberPublicProps) => React.
         <>
           {programTab === 'program' && (
             <EnrolledProgramCollectionBlock
+              memberId={memberId}
               onProgramTabClick={tab => setProgramTab(tab)}
               programTab={programTab}
               programEnrollment={programEnrollment}
@@ -136,6 +138,7 @@ const MemberPage: React.VFC<{ renderText?: (member: MemberPublicProps) => React.
           )}
           {programTab === 'programPackage' && (
             <ProgramPackageCollectionBlock
+              memberId={memberId}
               onProgramTabClick={tab => setProgramTab(tab)}
               programTab={programTab}
               programPackageEnrollment={programPackageEnrollment}

diff --git a/src/pages/PodcastProgramCollectionPage.tsx b/src/pages/PodcastProgramCollectionPage.tsx
@@ -96,7 +96,6 @@ const PodcastProgramCollectionPage: React.VFC = () => {
             <div className="row">
               <div className="col-12 col-lg-8 mb-5">
                 <PodcastProgramTimeline
-                  memberId={currentMemberId}
                   podcastPrograms={podcastPrograms
                     .filter(
                       podcastProgram =>