From 7eb1daada4581116602c3283de35f11d0e1829b2 Mon Sep 17 00:00:00 2001
From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:21:54 -0300
Subject: [PATCH] fix: Required native filter message wrongfully appearing
 (#29643)

(cherry picked from commit 9487d6c9d6b3231b1bf31752c76fc50066be0014)
---
 .../DashboardBuilder/DashboardBuilder.tsx     | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
index bb9afbfe5966f..bd4286b556c8f 100644
--- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
+++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
@@ -682,31 +682,33 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => {
             editMode={editMode}
             marginLeft={dashboardContentMarginLeft}
           >
-            {missingInitialFilters.length > 0 ? (
-              <div
-                css={css`
-                  display: flex;
-                  flex-direction: row;
-                  align-items: center;
-                  justify-content: center;
-                  flex: 1;
-                  & div {
-                    width: 500px;
-                  }
-                `}
-              >
-                <BasicErrorAlert
-                  title={t('Unable to load dashboard')}
-                  body={t(
-                    `The following filters have the 'Select first filter value by default'
+            {showDashboard ? (
+              missingInitialFilters.length > 0 ? (
+                <div
+                  css={css`
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: center;
+                    flex: 1;
+                    & div {
+                      width: 500px;
+                    }
+                  `}
+                >
+                  <BasicErrorAlert
+                    title={t('Unable to load dashboard')}
+                    body={t(
+                      `The following filters have the 'Select first filter value by default'
                     option checked and could not be loaded, which is preventing the dashboard
                     from rendering: %s`,
-                    missingInitialFilters.join(', '),
-                  )}
-                />
-              </div>
-            ) : showDashboard ? (
-              <DashboardContainer topLevelTabs={topLevelTabs} />
+                      missingInitialFilters.join(', '),
+                    )}
+                  />
+                </div>
+              ) : (
+                <DashboardContainer topLevelTabs={topLevelTabs} />
+              )
             ) : (
               <Loading />
             )}