Skip to content

OF-570 - Fixed to display a single loader initially on encounter #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wsdt merged 1 commit into from
Jan 8, 2025
Merged

OF-570 - Fixed to display a single loader initially on encounter #376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 49 additions & 41 deletions mobile/components/OEncounterList/OEncounterList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,46 +34,56 @@ export const OEncounterList = (props: IOEncounterListProps) => {
const navigation = useNavigation();
const { state: encounterState, dispatch } = useEncountersContext();
const { state: userState } = useUserContext();
const [refreshing, setRefreshing] = useState(true);
const [refreshing, setRefreshing] = useState(false);
const [initialLoading, setInitialLoading] = useState(true);

const fetchEncounters = useCallback(async () => {
try {
if (!userState.id) {
Sentry.captureMessage(
`fetchEncounters: UserId undefined. Not making request. User maybe logging out or so?`,
);
return;
}
setRefreshing(true);
const encounters =
await API.encounter.encounterControllerGetEncountersByUser({
userId: userState.id,
startDate: metStartDateFilter,
endDate: metEndDateFilter,
});
const fetchEncounters = useCallback(
async (isInitialLoad = false) => {
try {
if (!userState.id) {
Sentry.captureMessage(
`fetchEncounters: UserId undefined. Not making request. User maybe logging out or so?`,
);
return;
}
if (isInitialLoad) {
setRefreshing(false);
setInitialLoading(true);
} else {
setRefreshing(true);
}
const encounters =
await API.encounter.encounterControllerGetEncountersByUser({
userId: userState.id,
startDate: metStartDateFilter,
endDate: metEndDateFilter,
});

dispatch({
type: EACTION_ENCOUNTERS.PUSH_MULTIPLE,
payload: encounters,
});
} catch (error) {
console.error(error);
Sentry.captureException(error, {
tags: {
encounters: "fetch",
},
});
} finally {
setRefreshing(false);
}
}, [userState.id, dispatch, metStartDateFilter, metEndDateFilter]);
dispatch({
type: EACTION_ENCOUNTERS.PUSH_MULTIPLE,
payload: encounters,
});
} catch (error) {
console.error(error);
Sentry.captureException(error, {
tags: {
encounters: "fetch",
},
});
} finally {
setRefreshing(false);
setInitialLoading(false);
}
},
[userState.id, dispatch, metStartDateFilter, metEndDateFilter],
);

useEffect(() => {
fetchEncounters();
fetchEncounters(true);
}, [fetchEncounters, metStartDateFilter, metEndDateFilter]);

const onRefresh = useCallback(async () => {
await fetchEncounters();
await fetchEncounters(false);
}, [fetchEncounters]);

const handleTourOnStop = async () => {
Expand Down Expand Up @@ -133,7 +143,11 @@ export const OEncounterList = (props: IOEncounterListProps) => {
}
};

return (
return initialLoading ? (
<View style={styles.loadingContainer}>
<ActivityIndicator size="large" color={Color.gray} />
</View>
) : (
<ScrollView
style={styles.encountersList}
refreshControl={
Expand All @@ -145,13 +159,7 @@ export const OEncounterList = (props: IOEncounterListProps) => {
styles.emptyListContainer
}
>
{refreshing && encounterState.encounters.length === 0 ? (
<View style={styles.loadingContainer}>
<ActivityIndicator size="large" color={Color.gray} />
</View>
) : (
getEncounterList()
)}
{getEncounterList()}
</ScrollView>
);
};
Expand Down
Loading