From 3e51d4c16c9994341a8e55e12281f8284284eeb9 Mon Sep 17 00:00:00 2001
From: Conal Ryan <corya@akamai.com>
Date: Tue, 17 Oct 2023 15:33:40 -0400
Subject: [PATCH 1/2] fix [UIE-6952]: dbaas menu flickers on page load

---
 packages/manager/src/MainContent.tsx                  | 11 +++++++----
 .../manager/src/components/PrimaryNav/PrimaryNav.tsx  |  7 +++++--
 .../src/features/TopMenu/AddNewMenu/AddNewMenu.tsx    |  7 +++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/manager/src/MainContent.tsx b/packages/manager/src/MainContent.tsx
index 336652e5de5..a7fd8877d11 100644
--- a/packages/manager/src/MainContent.tsx
+++ b/packages/manager/src/MainContent.tsx
@@ -207,7 +207,10 @@ const MainContent = (props: CombinedProps) => {
   const [bannerDismissed, setBannerDismissed] = React.useState<boolean>(false);
 
   const checkRestrictedUser = !Boolean(flags.databases) && !!accountError;
-  const { error: enginesError } = useDatabaseEnginesQuery(checkRestrictedUser);
+  const {
+    error: enginesError,
+    isLoading: enginesLoading,
+  } = useDatabaseEnginesQuery(checkRestrictedUser);
 
   const showDatabases =
     isFeatureEnabled(
@@ -215,7 +218,7 @@ const MainContent = (props: CombinedProps) => {
       Boolean(flags.databases),
       account?.capabilities ?? []
     ) ||
-    (checkRestrictedUser && !enginesError);
+    (checkRestrictedUser && !enginesLoading && !enginesError);
 
   const showVPCs = isFeatureEnabled(
     'VPCs',
@@ -413,8 +416,8 @@ export default compose<CombinedProps, Props>(
 export const checkFlagsForMainContentBanner = (flags: FlagSet) => {
   return Boolean(
     flags.mainContentBanner &&
-    !isEmpty(flags.mainContentBanner) &&
-    flags.mainContentBanner.key
+      !isEmpty(flags.mainContentBanner) &&
+      flags.mainContentBanner.key
   );
 };
 
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
index 15602de10c3..93c3d26a686 100644
--- a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
+++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
@@ -123,7 +123,10 @@ export const PrimaryNav = (props: Props) => {
     !oneClickApps && !oneClickAppsLoading && !oneClickAppsError;
 
   const checkRestrictedUser = !Boolean(flags.databases) && !!accountError;
-  const { error: enginesError } = useDatabaseEnginesQuery(checkRestrictedUser);
+  const {
+    error: enginesError,
+    isLoading: enginesLoading,
+  } = useDatabaseEnginesQuery(checkRestrictedUser);
 
   const showDatabases =
     isFeatureEnabled(
@@ -131,7 +134,7 @@ export const PrimaryNav = (props: Props) => {
       Boolean(flags.databases),
       account?.capabilities ?? []
     ) ||
-    (checkRestrictedUser && !enginesError);
+    (checkRestrictedUser && !enginesLoading && !enginesError);
 
   const showVPCs = isFeatureEnabled(
     'VPCs',
diff --git a/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx b/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx
index 0f0e06a10ff..7a1617df939 100644
--- a/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx
+++ b/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx
@@ -46,7 +46,10 @@ export const AddNewMenu = () => {
   const open = Boolean(anchorEl);
 
   const checkRestrictedUser = !Boolean(flags.databases) && !!accountError;
-  const { error: enginesError } = useDatabaseEnginesQuery(checkRestrictedUser);
+  const {
+    error: enginesError,
+    isLoading: enginesLoading,
+  } = useDatabaseEnginesQuery(checkRestrictedUser);
 
   const showDatabases =
     isFeatureEnabled(
@@ -54,7 +57,7 @@ export const AddNewMenu = () => {
       Boolean(flags.databases),
       account?.capabilities ?? []
     ) ||
-    (checkRestrictedUser && !enginesError);
+    (checkRestrictedUser && !enginesLoading && !enginesError);
 
   const showVPCs = isFeatureEnabled(
     'VPCs',

From 967f0a790ba95ae873b7b3d1427f3a6f6f6d16f4 Mon Sep 17 00:00:00 2001
From: Alban Bailly <abailly@akamai.com>
Date: Thu, 19 Oct 2023 09:35:12 -0400
Subject: [PATCH 2/2] Added changeset: Primary nav DBaaS menuitem flicker on
 page load

---
 packages/manager/.changeset/pr-9808-fixed-1697722511987.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-9808-fixed-1697722511987.md

diff --git a/packages/manager/.changeset/pr-9808-fixed-1697722511987.md b/packages/manager/.changeset/pr-9808-fixed-1697722511987.md
new file mode 100644
index 00000000000..8b271774db0
--- /dev/null
+++ b/packages/manager/.changeset/pr-9808-fixed-1697722511987.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Fixed
+---
+
+Primary nav DBaaS menuitem flicker on page load ([#9808](https://github.com/linode/manager/pull/9808))