From f6686c6bcb6d28dafd52d8269f4f5b4e9b21e39e Mon Sep 17 00:00:00 2001
From: Marco polo <salazarm@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:13:14 -0500
Subject: [PATCH] Fix asset catalog loading state showing "No assets found"
 while asset 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
---
 .../dagster-ui/packages/ui-core/src/assets/AssetTable.tsx       | 2 +-
 .../packages/ui-core/src/assets/AssetsCatalogTable.tsx          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetTable.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetTable.tsx
index 304516ab19e27..6413116eecf6a 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetTable.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetTable.tsx
@@ -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}}>
diff --git a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetsCatalogTable.tsx b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetsCatalogTable.tsx
index 11edeff067ce3..040f0d3dfe570 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/assets/AssetsCatalogTable.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/assets/AssetsCatalogTable.tsx
@@ -255,7 +255,7 @@ export const AssetsCatalogTable = ({
     <AssetTable
       view={view}
       assets={displayed}
-      isLoading={filteredAssetsLoading}
+      isLoading={filteredAssetsLoading || fetchResult.loading}
       isFiltered={isFiltered}
       actionBarComponents={
         <div