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-13571-changed-1775819280655.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Changed
---

IAM: remove LA badge and add only New badge, text update for User's Account Delegation search result ([#13571](https://github.com/linode/manager/pull/13571))
3 changes: 1 addition & 2 deletions packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
const { isDatabasesEnabled, isDatabasesV2Beta } = useIsDatabasesEnabled();

const { isIAMEnabled } = useIsIAMEnabled();
const showLimitedAvailabilityBadges = flags.iamLimitedAvailabilityBadges;

const { isNetworkLoadBalancerEnabled } = useIsNetworkLoadBalancerEnabled();

Expand Down Expand Up @@ -314,7 +313,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
display: 'Identity & Access',
hide: !isIAMEnabled,
to: '/iam',
isNew: isIAMEnabled && showLimitedAvailabilityBadges,
isNew: isIAMEnabled && flags.iamNewBadge,
},
{
display: 'Quotas',
Expand Down
4 changes: 2 additions & 2 deletions packages/manager/src/dev-tools/FeatureFlagTool.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ const options: { flag: keyof Flags; label: string }[] = [
{ flag: 'apicliButtonCopy', label: 'APICLI Button Copy' },
{ flag: 'iam', label: 'IAM enabled & Beta' },
{
flag: 'iamLimitedAvailabilityBadges',
label: 'IAM Limited Availability Badges',
flag: 'iamNewBadge',
label: 'IAM New Badge',
},
{ flag: 'iamDelegation', label: 'IAM Delegation (Parent/Child)' },
{
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/src/featureFlags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export interface Flags {
hostnameEndpoints: boolean;
iam: BaseFeatureFlag;
iamDelegation: BaseFeatureFlag;
iamLimitedAvailabilityBadges: boolean;
iamNewBadge: boolean;
ipv6Sharing: boolean;
kubernetesBlackwellPlans: boolean;
limitsEvolution: LimitsEvolution;
Expand Down
29 changes: 3 additions & 26 deletions packages/manager/src/features/IAM/IAMLanding.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Chip, NewFeatureChip, styled } from '@linode/ui';
import { NewFeatureChip } from '@linode/ui';
import { Outlet, useLocation, useNavigate } from '@tanstack/react-router';
import * as React from 'react';

Expand All @@ -20,8 +20,7 @@ import { IAM_DOCS_LINK, ROLES_LEARN_MORE_LINK } from './Shared/constants';
export const IdentityAccessLanding = React.memo(() => {
const flags = useFlags();
const { isIAMEnabled } = useIsIAMEnabled();
const showLimitedAvailabilityBadges =
flags.iamLimitedAvailabilityBadges && isIAMEnabled;
const showNewBadge = flags.iamNewBadge && isIAMEnabled;
const location = useLocation();
const navigate = useNavigate();
const { isParentUserType } = useDelegationRole();
Expand Down Expand Up @@ -62,12 +61,7 @@ export const IdentityAccessLanding = React.memo(() => {
{...landingHeaderProps}
breadcrumbProps={{
labelOptions: {
suffixComponent: showLimitedAvailabilityBadges ? (
<>
<NewFeatureChip />
<StyledLimitedAvailabilityChip label="Limited availability" />
</>
) : null,
suffixComponent: showNewBadge ? <NewFeatureChip /> : null,
},
removeCrumbX: 1,
}}
Expand All @@ -84,20 +78,3 @@ export const IdentityAccessLanding = React.memo(() => {
</>
);
});

const StyledLimitedAvailabilityChip = styled(Chip, {
label: 'StyledLimitedAvailabilityChip',
shouldForwardProp: (prop) => prop !== 'color',
})(({ theme }) => ({
'& .MuiChip-label': {
padding: 0,
},
background: theme.tokens.component.Badge.Informative.Subtle.Background,
color: theme.tokens.component.Badge.Informative.Subtle.Text,
font: theme.font.bold,
fontSize: '12px',
lineHeight: '12px',
height: 16,
letterSpacing: '.22px',
padding: theme.spacingFunction(4),
}));
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ export const DefaultsLanding = () => {
const navigate = useNavigate();
const flags = useFlags();
const { isIAMEnabled } = useIsIAMEnabled();
const showLimitedAvailabilityBadges =
flags.iamLimitedAvailabilityBadges && isIAMEnabled;
const showNewBadge = flags.iamNewBadge && isIAMEnabled;

const { tabs, tabIndex, handleTabChange } = useTabs([
{
Expand All @@ -46,7 +45,7 @@ export const DefaultsLanding = () => {
label: (
<>
{IAM_LABEL}
{showLimitedAvailabilityBadges ? (
{showNewBadge ? (
<NewFeatureChip sx={{ position: 'relative', top: -1 }} />
) : null}
</>
Expand Down
1 change: 0 additions & 1 deletion packages/manager/src/features/IAM/Shared/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export const ERROR_STATE_TEXT =

// Delegation error messages
export const NO_ITEMS_TO_DISPLAY_TEXT = 'No items to display.';
export const NO_DELEGATED_USERS_TEXT = 'No users added.';

// Links
export const IAM_DOCS_LINK =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { TableRow } from 'src/components/TableRow';
import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
import { TableSortCell } from 'src/components/TableSortCell';
import { useIsIAMDelegationEnabled } from 'src/features/IAM/hooks/useIsIAMEnabled';
import { NO_DELEGATED_USERS_TEXT } from 'src/features/IAM/Shared/constants';
import { NO_ITEMS_TO_DISPLAY_TEXT } from 'src/features/IAM/Shared/constants';
import { useOrderV2 } from 'src/hooks/useOrderV2';
import { usePaginationV2 } from 'src/hooks/usePaginationV2';

Expand Down Expand Up @@ -130,7 +130,7 @@ export const UserDelegationsTable = () => {
</TableHead>
<TableBody>
{childAccounts?.data.length === 0 && (
<TableRowEmpty colSpan={1} message={NO_DELEGATED_USERS_TEXT} />
<TableRowEmpty colSpan={1} message={NO_ITEMS_TO_DISPLAY_TEXT} />
)}
{childAccounts?.data?.map((childAccount) => (
<TableRow key={childAccount.euuid}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ export const UserDetailsLanding = () => {
const flags = useFlags();
const theme = useTheme();
const { isIAMEnabled } = useIsIAMEnabled();
const showLimitedAvailabilityBadges =
flags.iamLimitedAvailabilityBadges && isIAMEnabled;
const showNewBadge = flags.iamNewBadge && isIAMEnabled;
const { username } = useParams({ from: '/iam/users/$username' });
const { isIAMDelegationEnabled } = useIsIAMDelegationEnabled();
const { isParentUserType } = useDelegationRole();
Expand Down Expand Up @@ -68,7 +67,7 @@ export const UserDetailsLanding = () => {
label: (
<>
{IAM_LABEL}
{showLimitedAvailabilityBadges ? (
{showNewBadge ? (
<NewFeatureChip
component="span"
sx={{ position: 'relative', top: -1 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ interface MenuLink {
export const UserMenuPopover = (props: UserMenuPopoverProps) => {
const { anchorEl, isDrawerOpen, onClose, onDrawerOpen } = props;
const sessionContext = React.useContext(switchAccountSessionContext);
const { limitsEvolution, iamLimitedAvailabilityBadges } = useFlags();
const { limitsEvolution, iamNewBadge } = useFlags();
const {
isProxyOrDelegateUserType,
isParentUserType,
Expand Down Expand Up @@ -142,7 +142,7 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
{
display: isIAMEnabled ? 'Identity & Access' : 'Users & Grants',
to: isIAMEnabled ? '/iam' : '/users',
isNew: isIAMEnabled && iamLimitedAvailabilityBadges,
isNew: isIAMEnabled && iamNewBadge,
},
{
display: 'Quotas',
Expand All @@ -166,7 +166,7 @@ export const UserMenuPopover = (props: UserMenuPopoverProps) => {
to: '/account-settings',
},
],
[isIAMEnabled, limitsEvolution, iamLimitedAvailabilityBadges]
[isIAMEnabled, limitsEvolution, iamNewBadge]
);

const renderLink = (link: MenuLink) => {
Expand Down
Loading