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

Show error if could not load space hierarchy #7399

Merged
merged 1 commit into from
Dec 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 13 additions & 7 deletions src/components/structures/SpaceHierarchy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -477,17 +477,19 @@ export const useRoomHierarchy = (space: Room): {
loading: boolean;
rooms: IHierarchyRoom[];
hierarchy: RoomHierarchy;
loadMore(pageSize?: number): Promise <void>;
error: Error;
loadMore(pageSize?: number): Promise<void>;
} => {
const [rooms, setRooms] = useState<IHierarchyRoom[]>([]);
const [hierarchy, setHierarchy] = useState<RoomHierarchy>();
const [error, setError] = useState<Error>();

const resetHierarchy = useCallback(() => {
const hierarchy = new RoomHierarchy(space, INITIAL_PAGE_SIZE);
hierarchy.load().then(() => {
if (space !== hierarchy.root) return; // discard stale results
setRooms(hierarchy.rooms);
});
}, setError);
setHierarchy(hierarchy);
}, [space]);
useEffect(resetHierarchy, [resetHierarchy]);
Expand All @@ -501,12 +503,12 @@ export const useRoomHierarchy = (space: Room): {

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

const loading = hierarchy?.loading ?? true;
return { loading, rooms, hierarchy, loadMore };
return { loading, rooms, hierarchy, loadMore, error };
};

const useIntersectionObserver = (callback: () => void) => {
Expand Down Expand Up @@ -649,7 +651,7 @@ const SpaceHierarchy = ({

const [selected, setSelected] = useState(new Map<string, Set<string>>()); // Map<parentId, Set<childId>>

const { loading, rooms, hierarchy, loadMore } = useRoomHierarchy(space);
const { loading, rooms, hierarchy, loadMore, error: hierarchyError } = useRoomHierarchy(space);

const filteredRoomSet = useMemo<Set<IHierarchyRoom>>(() => {
if (!rooms?.length) return new Set();
Expand Down Expand Up @@ -677,6 +679,10 @@ const SpaceHierarchy = ({
}, [rooms, hierarchy, query]);

const [error, setError] = useState("");
let errorText = error;
if (!error && hierarchyError) {
errorText = _t("Failed to load list of rooms.");
}

const loaderRef = useIntersectionObserver(loadMore);

Expand Down Expand Up @@ -759,8 +765,8 @@ const SpaceHierarchy = ({
) }
</span>
</div>
{ error && <div className="mx_SpaceHierarchy_error">
{ error }
{ errorText && <div className="mx_SpaceHierarchy_error">
{ errorText }
</div> }
<ul
className="mx_SpaceHierarchy_list"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -3075,6 +3075,7 @@
"Removing...": "Removing...",
"Mark as not suggested": "Mark as not suggested",
"Mark as suggested": "Mark as suggested",
"Failed to load list of rooms.": "Failed to load list of rooms.",
"Your server does not support showing space hierarchies.": "Your server does not support showing space hierarchies.",
"No results found": "No results found",
"You may want to try a different search or check for typos.": "You may want to try a different search or check for typos.",
Expand Down