Skip to content

Commit

Permalink
Fix asset catalog loading state showing "No assets found" while asset…
Browse files Browse the repository at this point in the history
… selection filtering is loading. (#26291)

## Summary & Motivation

We added asset selection based filtering to the catalog page but need to
make sure the page properly waits for that filtering to occurring

## How I Tested These Changes

app-proxy
  • Loading branch information
salazarm authored and cmpadden committed Dec 5, 2024
1 parent 47c94da commit 19ba901
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const AssetTable = ({
}, [checkedDisplayKeys, displayKeys, groupedByDisplayKey]);

const content = () => {
if (!assets.length) {
if (!assets.length && !isLoading) {
if (assetSelection) {
return (
<Box padding={{top: 64}}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export const AssetsCatalogTable = ({
<AssetTable
view={view}
assets={displayed}
isLoading={filteredAssetsLoading}
isLoading={filteredAssetsLoading || fetchResult.loading}
isFiltered={isFiltered}
actionBarComponents={
<div
Expand Down

0 comments on commit 19ba901

Please sign in to comment.