Cached
,{' '}
refreshCache()}>refresh.
@@ -195,15 +181,24 @@ function Event() {
{loadedOwners > 0
?
: (
- loadedInCommonProgress != null
+ loadedInCommon != null
? (
-
- )
- :
+
+ )
+ : (
+ loadedInCommonDownload != null
+ ? (
+
+ )
+ :
+ )
)
}
diff --git a/src/pages/Events.tsx b/src/pages/Events.tsx
index 71c355a..797b7cd 100644
--- a/src/pages/Events.tsx
+++ b/src/pages/Events.tsx
@@ -78,14 +78,20 @@ function Events() {
completedInCommonEvents,
loadingInCommonEvents,
eventsInCommonErrors,
+ loadedEventsInCommon,
loadedEventsProgress,
loadedEventsOwners,
eventsInCommon,
- cachingEvents,
- cachingEventsErrors,
fetchEventsInCommon,
retryEventAddressInCommon,
- } = useEventsInCommon(eventIds, eventsOwners, all, force)
+ } = useEventsInCommon(
+ eventIds,
+ eventsOwners,
+ all,
+ /*refresh*/force,
+ /*local*/false,
+ /*stream*/true
+ )
const {
loadingCollections,
@@ -123,7 +129,7 @@ function Events() {
useEffect(
() => {
- let cancelEventsInCommon
+ let cancelEventsInCommon: () => void | undefined
if (completedEventsOwnersAndMetrics) {
cancelEventsInCommon = fetchEventsInCommon()
}
@@ -138,7 +144,7 @@ function Events() {
useEffect(
() => {
- let cancelEventsCollections
+ let cancelEventsCollections: () => void | undefined
if (completedEventsInCommon) {
cancelEventsCollections = fetchEventsCollections()
}
@@ -338,13 +344,9 @@ function Events() {
loading={
loadingInCommonEvents[event.id]
}
- caching={
- cachingEvents[event.id]
- }
error={
eventsOwnersAndMetricsErrors[event.id] != null ||
- eventsInCommonErrors[event.id] != null ||
- cachingEventsErrors[event.id] != null
+ eventsInCommonErrors[event.id] != null
}
/>
{eventsOwnersAndMetricsErrors[event.id] != null && (
@@ -369,6 +371,7 @@ function Events() {
{(
loadingInCommonEvents[event.id] != null &&
+ loadedEventsInCommon[event.id] == null &&
loadedEventsProgress[event.id] == null &&
loadedEventsOwners[event.id] != null &&
eventsOwners[event.id] != null
@@ -379,7 +382,20 @@ function Events() {
showValue={loadedEventsOwners[event.id] > 0}
/>
)}
- {loadedEventsProgress[event.id] != null && (
+ {(
+ loadedEventsInCommon[event.id] != null &&
+ loadedEventsProgress[event.id] == null
+ ) && (
+ |