Skip to content

Commit 802678c

Browse files
committed
Improve homepage events error and make consistent with news
1 parent 14c3411 commit 802678c

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

src/app/components/site/phy/HomepagePhy.tsx

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export const HomepagePhy = () => {
119119

120120
const user = useAppSelector(selectors.user.orNull);
121121

122-
const {data: news} = useGetNewsPodListQuery({subject: "physics"});
122+
const newsQuery = useGetNewsPodListQuery({subject: "physics"});
123123

124124
const [dashboardView, setDashboardView] = useState<"student" | "teacher" | undefined>(undefined);
125125

@@ -190,12 +190,15 @@ export const HomepagePhy = () => {
190190
</div>
191191
<ShowLoadingQuery
192192
query={eventsQuery}
193-
defaultErrorTitle={"Error loading events list"}
193+
ifError={(() => <p>There was an error loading the events list. Please try again later!</p>)}
194194
thenRender={({events}) => {
195195
return <Row className="h-100">
196-
{events.map(event => <Col key={event.id}>
197-
<EventCard event={event} />
198-
</Col>)}
196+
{events.length
197+
? events.map(event => <Col key={event.id}>
198+
<EventCard event={event} />
199+
</Col>)
200+
: <p>No events available. Check back soon!</p>}
201+
199202
</Row>;
200203
}}/>
201204
</div>
@@ -205,11 +208,20 @@ export const HomepagePhy = () => {
205208
<Link to="/news" className="news-events-link">More news</Link>
206209
<div className="section-divider-bold"/>
207210
</div>
208-
{news && <Row className="h-100">
209-
{news.slice(0, 2).map(newsItem => <Col key={newsItem.id}>
210-
<NewsCard newsItem={newsItem} />
211-
</Col>)}
212-
</Row>}
211+
<ShowLoadingQuery
212+
query={newsQuery}
213+
ifError={(() => <p>There was an error loading the news list. Please try again later!</p>)}
214+
thenRender={(news) => {
215+
return <Row className="h-100">
216+
{news.length
217+
? news.slice(0, 2).map(newsItem => <Col key={newsItem.id}>
218+
<NewsCard newsItem={newsItem} />
219+
</Col>)
220+
: <p>No news available. Check back soon!</p>
221+
}
222+
</Row>;
223+
}}
224+
/>
213225
</div>
214226
</Row>
215227
</section>

0 commit comments

Comments
 (0)