Skip to content

Fixes mutlti-tenancy popup toggle due to hard-coded default state #1417

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

Closed
DarshitChanpura wants to merge 1 commit into from
Closed

Fixes mutlti-tenancy popup toggle due to hard-coded default state #1417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions public/apps/account/account-nav-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ export function AccountNavButton(props: {
const [modal, setModal] = React.useState<React.ReactNode>(null);
const horizontalRule = <EuiHorizontalRule margin="xs" />;
const username = props.username;
const [isMultiTenancyEnabled, setIsMultiTenancyEnabled] = React.useState<boolean>(true);
const propsMultiTenancyToggle = props.config.multitenancy.enabled;
const [isMultiTenancyEnabled, setIsMultiTenancyEnabled] = React.useState<boolean>(
propsMultiTenancyToggle || false
);
const shouldDisplaySwitchTenantsPanel = isMultiTenancyEnabled && propsMultiTenancyToggle;

const showTenantSwitchPanel = useCallback(
() =>
Expand All @@ -72,9 +76,11 @@ export function AccountNavButton(props: {
React.useEffect(() => {
const fetchData = async () => {
try {
setIsMultiTenancyEnabled(
(await getDashboardsInfo(props.coreStart.http)).multitenancy_enabled
// defaults to true if for some reason the multitenancy_enabled flag is undefined. This should ideally never happen.
const { multitenancy_enabled: isEnabled = true } = await getDashboardsInfo(
props.coreStart.http
);
setIsMultiTenancyEnabled(isEnabled);
} catch (e) {
// TODO: switch to better error display.
console.error(e);
Copy link
Member

@seraphjiang seraphjiang May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should have default behavior instead of print error into browser console which will notice nothing to customer and not actonable

Expand Down Expand Up @@ -128,7 +134,7 @@ export function AccountNavButton(props: {
>
View roles and identities
</EuiButtonEmpty>
{isMultiTenancyEnabled && (
{shouldDisplaySwitchTenantsPanel && (
<>
{horizontalRule}
<EuiButtonEmpty data-test-subj="switch-tenants" size="xs" onClick={showTenantSwitchPanel}>
Expand Down