Skip to content

Disable Digma metrics in private environments #1126

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

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Disable Digma metrics in private environments #1126

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
1f80dd0
Disable Digma Metrics for private environments
kshmidt-digma Oct 22, 2024
13ef5a0
Add tooltip, fix styles
kshmidt-digma Oct 22, 2024
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 src/components/Navigation/KebabMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ import { KebabMenuProps } from "./types";

export const KebabMenu = ({ onClose }: KebabMenuProps) => {
const { backendInfo, digmaStatus, environment } = useConfigSelector();
const isDigmaMetricsEnabled =
const isDigmaMetricsVisible =
backendInfo?.centralize &&
getFeatureFlagValue(backendInfo, FeatureFlag.IS_METRICS_REPORT_ENABLED);
const isDigmaMetricsEnabled =
isDigmaMetricsVisible && environment?.type === "Public";

const handleOnboardingClick = () => {
sendUserActionTrackingEvent(trackingEvents.ONBOARDING_LINK_CLICKED);
Expand Down Expand Up @@ -129,12 +131,16 @@ export const KebabMenu = ({ onClose }: KebabMenuProps) => {
});
}

if (isDigmaMetricsEnabled) {
if (isDigmaMetricsVisible) {
items.push({
id: "metrics",
label: "Digma Metrics",
icon: <MetricsIcon size={16} color={"currentColor"} />,
onClick: handleReportClick
icon: <MetricsIcon color={"currentColor"} />,
onClick: handleReportClick,
tooltip: !isDigmaMetricsEnabled
? "Available for CI/Prod environments only"
: undefined,
isDisabled: !isDigmaMetricsEnabled
});
}

Expand Down
13 changes: 10 additions & 3 deletions src/components/Navigation/common/MenuList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,17 @@ export const MenuList = ({
return item.customContent ? (
<li key={item.id}>{item.customContent}</li>
) : (
<Tooltip title={item.label} key={item.id}>
<s.ListItem $isHighlighted={isHighlighted} onClick={item.onClick}>
<Tooltip title={item.tooltip ?? item.label} key={item.id}>
<s.ListItem
$isHighlighted={isHighlighted}
onClick={item.onClick}
$isDisabled={item.isDisabled}
>
{item.icon && (
<s.ListItemIconContainer $isHighlighted={isHighlighted}>
<s.ListItemIconContainer
$isHighlighted={isHighlighted}
$isDisabled={item.isDisabled}
>
{item.icon}
</s.ListItemIconContainer>
)}
Expand Down
24 changes: 14 additions & 10 deletions src/components/Navigation/common/MenuList/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,23 @@ export const ListItem = styled.li<ListItemProps>`

export const ListItemIconContainer = styled.div<ListItemIconContainerProps>`
display: flex;
color: ${({ theme, $isHighlighted }) =>
$isHighlighted
align-items: center;
justify-content: center;
width: 16px;
height: 16px;
color: ${({ theme, $isHighlighted, $isDisabled }) =>
$isDisabled
? theme.colors.v3.icon.disabled
: $isHighlighted
? theme.colors.v3.icon.brandTertiary
: theme.colors.v3.icon.tertiary};

&:disabled {
color: ${({ theme }) => theme.colors.v3.icon.disabled};
}

&:hover:enabled,
&:active:enabled {
color: ${({ theme, $isHighlighted }) =>
$isHighlighted
&:hover,
&:active {
color: ${({ theme, $isHighlighted, $isDisabled }) =>
$isDisabled
? theme.colors.v3.icon.disabled
: $isHighlighted
? theme.colors.v3.icon.brandTertiary
: theme.colors.v3.icon.primary};
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/Navigation/common/MenuList/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface MenuListProps {
showGroupDividers?: boolean;
highlightSelected?: boolean;
header?: ReactNode;
isDisabled?: boolean;
}

export interface ListItemProps {
Expand All @@ -15,6 +16,7 @@ export interface ListItemProps {

export interface ListItemIconContainerProps {
$isHighlighted?: boolean;
$isDisabled?: boolean;
}

export interface MenuItem {
Expand All @@ -26,4 +28,5 @@ export interface MenuItem {
isDisabled?: boolean;
groupName?: string;
isSelected?: boolean;
tooltip?: string;
}
2 changes: 1 addition & 1 deletion src/components/common/icons/12px/MetricsIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const MetricsIconComponent = (props: IconProps) => {
const { size, color } = useIconProps(props);

return (
<svg width={size} height={size} fill="none">
<svg width={size} height={size} fill="none" viewBox="0 0 12 12">
<path
stroke={color}
strokeLinecap="round"
Expand Down
Loading