Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix possible soft crash from a race condition in space hierarchies #9254

Merged
merged 2 commits into from
Sep 8, 2022
Merged

Fix possible soft crash from a race condition in space hierarchies #9254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0249f9d
Fix possible soft crash from a race condition in space hierarchies
t3chguy Sep 7, 2022
26d518b
Improve typing
t3chguy Sep 8, 2022
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
28 changes: 15 additions & 13 deletions src/components/structures/SpaceHierarchy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,12 +499,12 @@ const INITIAL_PAGE_SIZE = 20;
export const useRoomHierarchy = (space: Room): {
loading: boolean;
rooms?: IHierarchyRoom[];
hierarchy: RoomHierarchy;
error: Error;
hierarchy?: RoomHierarchy;
error?: Error;
loadMore(pageSize?: number): Promise<void>;
} => {
const [rooms, setRooms] = useState<IHierarchyRoom[]>([]);
const [roomHierarchy, setHierarchy] = useState<RoomHierarchy>();
const [hierarchy, setHierarchy] = useState<RoomHierarchy>();
const [error, setError] = useState<Error | undefined>();

const resetHierarchy = useCallback(() => {
Expand All @@ -526,19 +526,21 @@ export const useRoomHierarchy = (space: Room): {
}));

const loadMore = useCallback(async (pageSize?: number) => {
if (roomHierarchy.loading || !roomHierarchy.canLoadMore || roomHierarchy.noSupport || error) return;
await roomHierarchy.load(pageSize).catch(setError);
setRooms(roomHierarchy.rooms);
}, [error, roomHierarchy]);
if (hierarchy.loading || !hierarchy.canLoadMore || hierarchy.noSupport || error) return;
await hierarchy.load(pageSize).catch(setError);
setRooms(hierarchy.rooms);
}, [error, hierarchy]);

// Only return the hierarchy if it is for the space requested
let hierarchy = roomHierarchy;
if (hierarchy?.root !== space) {
hierarchy = undefined;
return {
loading: true,
loadMore,
};
}

return {
loading: hierarchy?.loading ?? true,
loading: hierarchy.loading,
rooms,
hierarchy,
loadMore,
Expand Down Expand Up @@ -689,7 +691,7 @@ const SpaceHierarchy = ({
const { loading, rooms, hierarchy, loadMore, error: hierarchyError } = useRoomHierarchy(space);

const filteredRoomSet = useMemo<Set<IHierarchyRoom>>(() => {
if (!rooms?.length) return new Set();
if (!rooms?.length || !hierarchy) return new Set();
const lcQuery = query.toLowerCase().trim();
if (!lcQuery) return new Set(rooms);

Expand Down Expand Up @@ -721,7 +723,7 @@ const SpaceHierarchy = ({

const loaderRef = useIntersectionObserver(loadMore);

if (!loading && hierarchy.noSupport) {
if (!loading && hierarchy!.noSupport) {
return <p>{ _t("Your server does not support showing space hierarchies.") }</p>;
}

Expand Down Expand Up @@ -755,7 +757,7 @@ const SpaceHierarchy = ({
return <RovingTabIndexProvider onKeyDown={onKeyDown} handleHomeEnd handleUpDown>
{ ({ onKeyDownHandler }) => {
let content: JSX.Element;
if (loading && !rooms?.length) {
if (!hierarchy || (loading && !rooms?.length)) {
content = <Spinner />;
} else {
const hasPermissions = space?.getMyMembership() === "join" &&
Expand Down