Add check for cluster loading to datastore dashboard (#4203)

porter-dev · Jan 26, 2024 · 5438783 · 5438783
1 parent bc54821
commit 5438783
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/dashboard/src/main/home/database-dashboard/DatabaseDashboard.tsx b/dashboard/src/main/home/database-dashboard/DatabaseDashboard.tsx
@@ -38,7 +38,7 @@ import EngineTag from "./tags/EngineTag";
 
 const DatabaseDashboard: React.FC = () => {
   const { currentCluster } = useContext(Context);
-  const { clusters } = useClusterList();
+  const { clusters, isLoading: isLoadingClusters } = useClusterList();
 
   const [searchValue, setSearchValue] = useState("");
   const [view, setView] = useState<"grid" | "list">("grid");
@@ -81,6 +81,10 @@ const DatabaseDashboard: React.FC = () => {
   }, [datastores, searchValue, typeFilter, engineFilter]);
 
   const renderContents = (): JSX.Element => {
+    if (datastores === undefined || isLoading || isLoadingClusters) {
+      return <Loading offset="-150px" />;
+    }
+
     if (clusters.filter(isAWSCluster).length === 0) {
       return (
         <Fieldset>
@@ -107,10 +111,6 @@ const DatabaseDashboard: React.FC = () => {
       return <ClusterProvisioningPlaceholder />;
     }
 
-    if (datastores === undefined || isLoading) {
-      return <Loading offset="-150px" />;
-    }
-
     if (datastores.length === 0) {
       return (
         <DashboardPlaceholder>