Skip to content
Merged

Report #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
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
11 changes: 11 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
"react-transition-group": "^4.4.5",
"recharts": "^2.6.2",
"semver": "^7.5.4",
"squarify": "^1.1.0",
"styled-components": "^6.1.0",
"uuid": "^9.0.1",
"zustand": "^4.5.5",
Expand Down
25 changes: 25 additions & 0 deletions src/components/Dashboard/NewReport/Chart/Chart.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { Meta, StoryObj } from "@storybook/react";

import { Chart } from ".";
import { mockedReport } from "../MetricsTable/mockData";

// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
const meta: Meta<typeof Chart> = {
title: "Dashboard/NewReport/Chart",
component: Chart,
parameters: {
// More on how to position stories at: https://storybook.js.org/docs/react/configure/story-layout
layout: "fullscreen"
}
};

export default meta;

type Story = StoryObj<typeof meta>;

// More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
export const Default: Story = {
args: {
data: mockedReport.reports
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import * as s from "./styles";
import { TooltipKeyValueProps } from "./types";

export const TooltipKeyValue = ({ label, children }: TooltipKeyValueProps) => (
<s.Container>
<s.Label>{label}:</s.Label>
{children}
</s.Container>
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import styled from "styled-components";
import { footnoteRegularTypography } from "../../../../../common/App/typographies";

export const Container = styled.div`
${footnoteRegularTypography}

display: flex;
gap: 4px;
color: ${({ theme }) => theme.colors.v3.text.primary};
`;

export const Label = styled.span`
color: ${({ theme }) => theme.colors.v3.text.secondary};
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { ReactNode } from "react";

export interface TooltipKeyValueProps {
label: string;
children: ReactNode;
}
47 changes: 47 additions & 0 deletions src/components/Dashboard/NewReport/Chart/ServiceTile/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { Tile } from "../../../../common/TreeMap/Tile";
import { ReportTimeMode } from "../../ReportHeader/types";
import * as s from "./styles";
import { TooltipKeyValue } from "./TooltipKeyValue";
import { ServiceTileProps } from "./types";

const getFormattedNumber = (viewMode: ReportTimeMode, value: number) =>
`${viewMode === "changes" && value > 0 ? "+" : ""}${value}`;

export const ServiceTile = ({
name,
criticalIssuesCount,
impactScore,
severity,
viewMode,
onIssuesClick: onSeeIssuesClick
}: ServiceTileProps) => {
const formattedCriticalIssuesCount = getFormattedNumber(
viewMode,
criticalIssuesCount
);
const formattedImpactScore = getFormattedNumber(viewMode, impactScore);

return (
<Tile
title={name}
severity={severity}
tooltip={
<s.TooltipContent>
<span>{name}</span>
<TooltipKeyValue label={"Critical Issues"}>
{formattedCriticalIssuesCount}
</TooltipKeyValue>
<TooltipKeyValue label={"Impact Score"}>
{formattedImpactScore}
</TooltipKeyValue>
</s.TooltipContent>
}
>
<s.StyledLink onClick={() => onSeeIssuesClick && onSeeIssuesClick(name)}>
<span>
{formattedCriticalIssuesCount} | {formattedImpactScore}
</span>
</s.StyledLink>
</Tile>
);
};
21 changes: 21 additions & 0 deletions src/components/Dashboard/NewReport/Chart/ServiceTile/styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import styled from "styled-components";
import { Link } from "../../../../common/v3/Link";

export const StatsMainNumber = styled.span`
color: ${({ theme }) => theme.colors.v3.text.primary};
`;

export const TooltipContent = styled.div`
color: ${({ theme }) => theme.colors.v3.text.primary};
`;

export const StyledLink = styled(Link)`
color: ${({ theme }) => theme.colors.v3.text.primary};
font-size: 32px;
font-weight: 700;
line-height: normal;

:hover {
text-decoration: underline;
}
`;
11 changes: 11 additions & 0 deletions src/components/Dashboard/NewReport/Chart/ServiceTile/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Severity } from "../../MetricsTable/types";
import { ReportTimeMode } from "../../ReportHeader/types";

export interface ServiceTileProps {
name: string;
criticalIssuesCount: number;
impactScore: number;
severity: Severity;
viewMode: ReportTimeMode;
onIssuesClick?: (service: string) => void;
}
64 changes: 64 additions & 0 deletions src/components/Dashboard/NewReport/Chart/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import useDimensions from "react-cool-dimensions";
import { Input } from "squarify";
import { isNumber } from "../../../../typeGuards/isNumber";
import { sendUserActionTrackingEvent } from "../../../../utils/actions/sendUserActionTrackingEvent";
import { TreeMap } from "../../../common/TreeMap";
import { TileData } from "../../../common/TreeMap/types";
import { ReportTimeMode } from "../ReportHeader/types";
import { trackingEvents } from "../tracking";
import { getSeverity } from "../utils";
import { ServiceTile } from "./ServiceTile";
import * as s from "./styles";
import { ChartProps } from "./types";

export const Chart = ({ data, onServiceSelected }: ChartProps) => {
const { width, height, observe } = useDimensions();

const viewMode: ReportTimeMode = data.some((service) =>
isNumber(service.key.lastDays)
)
? "changes"
: "baseline";

const transformedData = data.map((service) => ({
...service,
impact: Math.round(service.impact * 100)
}));

const handSeeIssuesClick = (service: string) => {
sendUserActionTrackingEvent(trackingEvents.HEATMAP_SEE_ISSUES_LINK_CLICKED);
onServiceSelected(service);
};

const minImpactScore = Math.min(...transformedData.map((x) => x.impact));
const maxImpactScore = Math.max(...transformedData.map((x) => x.impact));

const chartData: Input<TileData>[] = transformedData.map((service) => {
const severity = getSeverity(
minImpactScore,
maxImpactScore,
service.impact
);

return {
id: service.key.service,
value: service.impact,
content: (
<ServiceTile
name={service.key.service}
criticalIssuesCount={service.issues}
impactScore={service.impact}
severity={severity}
viewMode={viewMode}
onIssuesClick={handSeeIssuesClick}
/>
)
};
});

return (
<s.Container ref={observe}>
<TreeMap data={chartData} padding={12} width={width} height={height} />
</s.Container>
);
};
6 changes: 6 additions & 0 deletions src/components/Dashboard/NewReport/Chart/styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import styled from "styled-components";

export const Container = styled.div`
width: 100%;
height: 100%;
`;
6 changes: 6 additions & 0 deletions src/components/Dashboard/NewReport/Chart/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { ServiceData } from "../types";

export interface ChartProps {
data: ServiceData[];
onServiceSelected: (name: string) => void;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { Meta, StoryObj } from "@storybook/react";

import { MetricsTable } from ".";
import { mockedReport } from "./mockData";

// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction
const meta: Meta<typeof MetricsTable> = {
title: "Dashboard/NewReport/MetricsTable",
component: MetricsTable,
parameters: {
// More on how to position stories at: https://storybook.js.org/docs/react/configure/story-layout
layout: "fullscreen"
}
};

export default meta;

type Story = StoryObj<typeof meta>;

// More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args

export const Default: Story = {
args: {
data: mockedReport.reports
}
};

export const Empty: Story = {
args: {
data: []
}
};
Loading