Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: [UIE-6952] - DBaaS menu flickers on page load #9808

Merged
merged 2 commits into from
Oct 19, 2023
Merged

fix: [UIE-6952] - DBaaS menu flickers on page load #9808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e51d4c
fix [UIE-6952]: dbaas menu flickers on page load
corya-akamai Oct 17, 2023
967f0a7
Added changeset: Primary nav DBaaS menuitem flicker on page load
abailly-akamai Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-9808-fixed-1697722511987.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Fixed
---

Primary nav DBaaS menuitem flicker on page load ([#9808](https://github.com/linode/manager/pull/9808))
11 changes: 7 additions & 4 deletions packages/manager/src/MainContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,18 @@ 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(
'Managed Databases',
Boolean(flags.databases),
account?.capabilities ?? []
) ||
(checkRestrictedUser && !enginesError);
(checkRestrictedUser && !enginesLoading && !enginesError);

const showVPCs = isFeatureEnabled(
'VPCs',
Expand Down Expand Up @@ -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
);
};

Expand Down
7 changes: 5 additions & 2 deletions packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,18 @@ 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(
'Managed Databases',
Boolean(flags.databases),
account?.capabilities ?? []
) ||
(checkRestrictedUser && !enginesError);
(checkRestrictedUser && !enginesLoading && !enginesError);

const showVPCs = isFeatureEnabled(
'VPCs',
Expand Down
7 changes: 5 additions & 2 deletions packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,18 @@ 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(
'Managed Databases',
Boolean(flags.databases),
account?.capabilities ?? []
) ||
(checkRestrictedUser && !enginesError);
(checkRestrictedUser && !enginesLoading && !enginesError);

const showVPCs = isFeatureEnabled(
'VPCs',
Expand Down