diff --git a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx index 8c1a1414a6..4c99f913ce 100644 --- a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx +++ b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx @@ -140,8 +140,8 @@ const DashboardChartComponentElement: FunctionComponent = ( props.component.arguments.metricQueryConfigs, ]); - if (isLoading) { - // Skeleton loading for chart + if (isLoading && metricResults.length === 0) { + // Skeleton loading for chart - only on initial load return (
@@ -241,7 +241,13 @@ const DashboardChartComponentElement: FunctionComponent = ( }; return ( -
+
= ( } }, [props.component.arguments.metricQueryConfig]); - if (isLoading) { - // Skeleton loading for gauge + if (isLoading && metricResults.length === 0) { + // Skeleton loading for gauge - only on initial load return (
@@ -318,7 +318,13 @@ const DashboardGaugeComponentElement: FunctionComponent = ( const percentDisplay: number = Math.round(percentage * 100); return ( -
+
{props.component.arguments.gaugeTitle && (
= ( props.component.arguments.maxRows, ]); - if (isLoading) { + if (isLoading && logs.length === 0) { return (
@@ -208,7 +208,13 @@ const DashboardLogStreamComponentElement: FunctionComponent = ( } return ( -
+
{props.component.arguments.title && (
diff --git a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTableComponent.tsx b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTableComponent.tsx index 856138732e..5c4076fabf 100644 --- a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTableComponent.tsx +++ b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTableComponent.tsx @@ -112,8 +112,8 @@ const DashboardTableComponentElement: FunctionComponent = ( } }, [props.component.arguments.metricQueryConfig]); - if (isLoading) { - // Skeleton loading for table + if (isLoading && metricResults.length === 0) { + // Skeleton loading for table - only on initial load return (
@@ -174,7 +174,13 @@ const DashboardTableComponentElement: FunctionComponent = ( : 1; return ( -
+
{props.component.arguments.tableTitle && (
diff --git a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTraceListComponent.tsx b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTraceListComponent.tsx index 6bfb70b6fc..e0ab9a0e66 100644 --- a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTraceListComponent.tsx +++ b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTraceListComponent.tsx @@ -150,7 +150,7 @@ const DashboardTraceListComponentElement: FunctionComponent = ( props.component.arguments.maxRows, ]); - if (isLoading) { + if (isLoading && spans.length === 0) { return (
@@ -192,7 +192,13 @@ const DashboardTraceListComponentElement: FunctionComponent = ( } return ( -
+
{props.component.arguments.title && (
diff --git a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx index b4e036c58b..7deee74478 100644 --- a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx +++ b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx @@ -177,8 +177,8 @@ const DashboardValueComponentElement: FunctionComponent = ( } }, [props.component.arguments.metricQueryConfig]); - if (isLoading) { - // Skeleton loading state + if (isLoading && metricResults.length === 0) { + // Skeleton loading state - only on initial load return (
@@ -359,7 +359,11 @@ const DashboardValueComponentElement: FunctionComponent = ( return (
{/* Title */}