@@ -37,22 +37,20 @@ export const getServerSideProps = compose<Record<'id' | 'tid', string>>(
3737 async ( { params } ) => {
3838 const activity = await new ActivityModel ( ) . getOne ( params ! . id ) ;
3939
40- // @ts -expect-error Upstream compatibility
4140 const { appId, tableIdMap } = activity . databaseSchema ;
4241
4342 const project = await new ProjectModel ( appId , tableIdMap . Project ) . getOne ( params ! . tid ) ;
4443
4544 // Get approved members for this project
46- const members = await new MemberModel ( appId , tableIdMap . Member ) . getAll ( {
47- project : project . name as string ,
48- status : 'approved' ,
49- } ) ;
50-
51- // Get products for this project
52- const products = await new ProductModel ( appId , tableIdMap . Product ) . getAll ( {
53- project : project . name as string ,
54- } ) ;
55-
45+ const [ members , products ] = await Promise . all ( [
46+ new MemberModel ( appId , tableIdMap . Member ) . getAll ( {
47+ project : project . name as string ,
48+ status : 'approved' ,
49+ } ) ,
50+ new ProductModel ( appId , tableIdMap . Product ) . getAll ( {
51+ project : project . name as string ,
52+ } ) ,
53+ ] ) ;
5654 return { props : { activity, project, members, products } } ;
5755 } ,
5856) ;
@@ -128,8 +126,7 @@ const ProjectPage: FC<ProjectPageProps> = observer(({ activity, project, members
128126 < Col as = "li" key = { id as string } >
129127 < Card className = { styles . darkCard } body >
130128 < div className = "d-flex gap-3 align-items-center" >
131- { /* @ts -expect-error Upstream compatibility */ }
132- < Avatar src = { ( person as TableCellUser ) . avatar_url } size = { 60 } />
129+ < Avatar src = { ( person as TableCellUser ) . avatar_url } />
133130 < div className = "flex-grow-1" >
134131 < h3 className = "fs-6 m-0 fw-bold text-white" >
135132 { ( person as TableCellUser ) . name }
0 commit comments