* Show activity indicator when search grid is revalidating

* improve frigate+ button title grammar
This commit is contained in:
Josh Hawkins 2024-11-01 07:37:52 -05:00 committed by GitHub
parent 9e1a50c3be
commit 8c2c07fd18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 8 deletions

View File

@ -655,7 +655,9 @@ function ObjectSnapshotTab({
onSubmitToPlus(false); onSubmitToPlus(false);
}} }}
> >
This is a {search?.label} This is{" "}
{/^[aeiou]/i.test(search?.label || "") ? "an" : "a"}{" "}
{search?.label}
</Button> </Button>
<Button <Button
className="text-white" className="text-white"
@ -666,7 +668,9 @@ function ObjectSnapshotTab({
onSubmitToPlus(true); onSubmitToPlus(true);
}} }}
> >
This is not a {search?.label} This is not{" "}
{/^[aeiou]/i.test(search?.label || "") ? "an" : "a"}{" "}
{search?.label}
</Button> </Button>
</> </>
)} )}

View File

@ -144,7 +144,8 @@ export function FrigatePlusDialog({
onSubmitToPlus(false); onSubmitToPlus(false);
}} }}
> >
This is a {upload?.label} This is {/^[aeiou]/i.test(upload?.label || "") ? "an" : "a"}{" "}
{upload?.label}
</Button> </Button>
<Button <Button
className="text-white" className="text-white"
@ -155,7 +156,8 @@ export function FrigatePlusDialog({
onSubmitToPlus(true); onSubmitToPlus(true);
}} }}
> >
This is not a {upload?.label} This is not {/^[aeiou]/i.test(upload?.label || "") ? "an" : "a"}{" "}
{upload?.label}
</Button> </Button>
</> </>
)} )}

View File

@ -428,7 +428,9 @@ export default function Explore() {
searchTerm={searchTerm} searchTerm={searchTerm}
searchFilter={searchFilter} searchFilter={searchFilter}
searchResults={searchResults} searchResults={searchResults}
isLoading={(isLoadingInitialData || isLoadingMore) ?? true} isLoading={
(isLoadingInitialData || isLoadingMore || isValidating) ?? true
}
hasMore={!isReachingEnd} hasMore={!isReachingEnd}
columns={gridColumns} columns={gridColumns}
defaultView={defaultView} defaultView={defaultView}

View File

@ -397,11 +397,10 @@ export default function SearchView({
</div> </div>
)} )}
{uniqueResults?.length == 0 && {isLoading &&
isLoading &&
(searchTerm || (searchTerm ||
(searchFilter && Object.keys(searchFilter).length !== 0)) && ( (searchFilter && Object.keys(searchFilter).length !== 0)) && (
<ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" /> <ActivityIndicator className="absolute left-1/2 top-1/2 z-50 -translate-x-1/2 -translate-y-1/2 rounded-2xl bg-background/80 p-3 dark:bg-background/50" />
)} )}
{uniqueResults && ( {uniqueResults && (