From 6970a2334cbd584dfd811d76946fe47d683e025c Mon Sep 17 00:00:00 2001
From: Szymon Oleksy <soleksy@splunk.com>
Date: Fri, 21 Jun 2024 16:52:15 +0200
Subject: [PATCH] test: fix rebase, dashbaord structure

---
 ui/src/pages/Dashboard/DashboardPage.tsx | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/ui/src/pages/Dashboard/DashboardPage.tsx b/ui/src/pages/Dashboard/DashboardPage.tsx
index bc80be5b3..605424008 100644
--- a/ui/src/pages/Dashboard/DashboardPage.tsx
+++ b/ui/src/pages/Dashboard/DashboardPage.tsx
@@ -92,6 +92,11 @@ function DashboardPage() {
                         id="dashboardTable"
                         style={{ minHeight: '98vh' }}
                     >
+                        {dataIngestionDef && (
+                            <TabLayout.Panel label="Data ingestion" panelId="dataIngestionTabPanel">
+                                <DataIngestionDashboard dashboardDefinition={dataIngestionDef} />
+                            </TabLayout.Panel>
+                        )}
                         {errorDef && (
                             <TabLayout.Panel label="Errors" panelId="errorsTabPanel">
                                 <ErrorDashboard dashboardDefinition={errorDef} />
@@ -116,23 +121,6 @@ function DashboardPage() {
                                 <CustomDashboard dashboardDefinition={customDef} />
                             </TabLayout.Panel>
                         )}
-
-                        {dataIngestionDef && (
-                            <TabLayout.Panel label="Data ingestion" panelId="dataIngestionTabPanel">
-                                <DataIngestionDashboard dashboardDefinition={dataIngestionDef} />
-                            </TabLayout.Panel>
-                        )}
-
-                        {errorDef && (
-                            <TabLayout.Panel label="Errors" panelId="errorsTabPanel">
-                                <ErrorDashboard dashboardDefinition={errorDef} />
-                            </TabLayout.Panel>
-                        )}
-                        {customDef && (
-                            <TabLayout.Panel label="Custom" panelId="customTabPanel">
-                                <CustomDashboard dashboardDefinition={customDef} />
-                            </TabLayout.Panel>
-                        )}
                     </TabLayout>
                 ) : (
                     // if overview is null then custom tab is the only displayed component