Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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-12946-fixed-1759415335272.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Fixed
---

IAM - isIAMEnabled LA access check ([#12946](https://github.com/linode/manager/pull/12946))
12 changes: 6 additions & 6 deletions packages/manager/src/features/IAM/hooks/useIsIAMEnabled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ import type { FlagSet } from 'src/featureFlags';
export const useIsIAMEnabled = () => {
const flags = useFlags();
const { data: profile } = useProfile();
const { data: roles } = useAccountRoles(
const { data: roles, isLoading: isLoadingRoles } = useAccountRoles(
flags?.iam?.enabled === true && !profile?.restricted
);

const { data: permissions } = useUserAccountPermissions(
flags?.iam?.enabled === true
);
const { data: permissions, isLoading: isLoadingPermissions } =
useUserAccountPermissions(flags?.iam?.enabled === true);

return {
isIAMBeta: flags.iam?.beta,
isIAMEnabled: flags?.iam?.enabled && Boolean(roles || permissions?.length),
isIAMEnabled: flags?.iam?.enabled && Boolean(roles || permissions),
isLoading: isLoadingRoles || isLoadingPermissions,
};
};

Expand Down Expand Up @@ -60,7 +60,7 @@ export const checkIAMEnabled = async (
const permissions = await queryClient.ensureQueryData(
queryOptions(iamQueries.user(profile.username)._ctx.accountPermissions)
);
return Boolean(permissions.length);
return Boolean(permissions);
}

// For non-restricted users ONLY, get roles
Expand Down
10 changes: 8 additions & 2 deletions packages/manager/src/routes/IAM/IAMRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,18 @@ import { SuspenseLoader } from 'src/components/SuspenseLoader';
import { useIsIAMEnabled } from 'src/features/IAM/hooks/useIsIAMEnabled';

export const IAMRoute = () => {
const { isIAMEnabled } = useIsIAMEnabled();
const { isIAMEnabled, isLoading } = useIsIAMEnabled();
return (
<React.Suspense fallback={<SuspenseLoader />}>
<DocumentTitleSegment segment="Identity and Access" />
<ProductInformationBanner bannerLocation="Identity and Access" />
{isIAMEnabled ? <Outlet /> : <NotFound />}
{isLoading ? (
<SuspenseLoader />
) : isIAMEnabled ? (
<Outlet />
) : (
<NotFound />
)}
</React.Suspense>
);
};