Skip to content

Only show empty states if loaded #1831

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
merged 2 commits into from
Nov 12, 2025
Merged

Only show empty states if loaded #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9539fe
Only show empty state if loaded
jacbn Nov 11, 2025
2ef80c1
Hide "no results" while searching on user search
jacbn Nov 12, 2025
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
4 changes: 2 additions & 2 deletions src/app/components/pages/AdminUserManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {skipToken} from "@reduxjs/toolkit/query";
export const AdminUserManager = () => {
const dispatch = useAppDispatch();

const [searchUsers, {isUninitialized: searchNotRequested}] = useAdminSearchUsersMutation();
const [searchUsers, {isUninitialized: searchNotRequested, isLoading: searchLoading}] = useAdminSearchUsersMutation();
const searchResults = useAppSelector(selectors.admin.userSearch);
const [searchQuery, setSearchQuery] = useState<AdminSearchEndpointParams>({
postcodeRadius: "FIVE_MILES",
Expand Down Expand Up @@ -312,7 +312,7 @@ export const AdminUserManager = () => {
{/* Results */}
{!searchNotRequested &&
<ShowLoading
until={searchResults}
until={searchLoading ? undefined : searchResults}
thenRender={searchResults => {
return searchResults.length > 0 ?
<div className="overflow-auto">
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/pages/SetAssignments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ export const SetAssignments = () => {
boardTitleFilter, setBoardTitleFilter
} = useGameboards(isAda && above["lg"](deviceSize) ? BoardViews.table : BoardViews.card, BoardLimit.six);

const isGroupsEmptyState = !(groups && groups.length > 0);
const isBoardsEmptyState = !(boards && boards.boards?.length > 0);
const isGroupsEmptyState = groups && groups.length === 0;
const isBoardsEmptyState = boards && boards.boards?.length === 0;
const switchView = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
setBoardView(e.target.value as BoardViews);
}, [setBoardView]);
Expand Down Expand Up @@ -438,9 +438,9 @@ export const SetAssignments = () => {
<h3>Your quizzes</h3>
<div
className={classNames("mb-4", "d-flex", "flex-column", "flex-lg-row", "align-items-center", {"justify-content-start": isBoardsEmptyState}, {"justify-content-between": !isBoardsEmptyState})}>
{!(boards && boards.totalResults === 0) &&
{boards && boards.totalResults > 0 &&
<div>
<p className={"d-none d-lg-block my-auto"}>{`You have ${boards?.boards.length} created quiz${boards && boards.boards?.length > 1 ? "zes" : ""}.`}</p>
<p className={"d-none d-lg-block my-auto"}>{`You have ${boards.boards.length} created quiz${boards.boards.length > 1 ? "zes" : ""}.`}</p>
</div>
}
<div className={"w-100 w-lg-auto"}>
Expand Down