From f6b45d6d55bd1aa5a1c362792cd74fb9572178ff Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Mon, 25 Apr 2022 13:04:55 -0500 Subject: [PATCH] Select tenant popup only appears when mutli-tenacy is enabled (#965) The current behavoir is that all users will see a message to switch tenants and if multi-tenancy is disabled, that message will be prompting the user to ask the admin to enable the feature. This is causing users pain that are not interested in using the tenancy features. Signed-off-by: Peter Nied (cherry picked from commit ec59de0edfc30ecc12219c3259f8869fc609d803) --- public/apps/account/account-nav-button.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/apps/account/account-nav-button.tsx b/public/apps/account/account-nav-button.tsx index 0b95f928c..1100e9f31 100644 --- a/public/apps/account/account-nav-button.tsx +++ b/public/apps/account/account-nav-button.tsx @@ -66,7 +66,8 @@ export function AccountNavButton(props: { [props.config, props.coreStart] ); - if (getShouldShowTenantPopup()) { + // Check if the tenant modal should be shown on load + if (props.config.multitenancy.enabled && getShouldShowTenantPopup()) { setShouldShowTenantPopup(false); showTenantSwitchPanel(); }