Skip to content

Commit

Permalink
fixed tests + props warning (intelowlproject#2688)
Browse files Browse the repository at this point in the history
  • Loading branch information
@carellamartina @pranjalg1331
carellamartina authored and pranjalg1331 committed Jan 25, 2025
1 parent fdc2b5d commit c01a44c
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 21 deletions.
29 changes: 29 additions & 0 deletions frontend/src/components/dashboard/charts.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import { Bar } from "recharts";
import PropTypes from "prop-types";

import { getRandomColorsArray, AnyChartWidget } from "@certego/certego-ui";

Expand Down Expand Up @@ -215,3 +216,31 @@ export const JobTopTLPBarChart = React.memo((props) => {

return <AnyChartWidget {...chartProps} />;
});

JobStatusBarChart.propTypes = {
orgName: PropTypes.string.isRequired,
};

JobTypeBarChart.propTypes = {
orgName: PropTypes.string.isRequired,
};

JobObsClassificationBarChart.propTypes = {
orgName: PropTypes.string.isRequired,
};

JobFileMimetypeBarChart.propTypes = {
orgName: PropTypes.string.isRequired,
};

JobTopPlaybookBarChart.propTypes = {
orgName: PropTypes.string.isRequired,
};

JobTopUserBarChart.propTypes = {
orgName: PropTypes.string.isRequired,
};

JobTopTLPBarChart.propTypes = {
orgName: PropTypes.string.isRequired,
};
57 changes: 36 additions & 21 deletions frontend/tests/components/dashboard/charts.test.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jest.mock("recharts", () => {
const OriginalModule = jest.requireActual("recharts");
return {
...OriginalModule,
// eslint-disable-next-line react/prop-types
ResponsiveContainer: ({ children }) => (
<OriginalModule.ResponsiveContainer width={800} height={800}>
{children}
Expand Down Expand Up @@ -72,17 +73,19 @@ describe("test dashboard's charts", () => {
// needed to support different timezones (ex: ci and local could be different)
expect(
screen.getByText(
`28/11, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-28T22:00:00Z").getDate()}/${new Date("2024-11-28T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T22:00:00Z").getDate()}/${new Date("2024-11-29T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
let hours = new Date("2024-11-29T23:00:00Z").getHours();
if (hours === 0) hours = "00";
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T23:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T23:00:00Z").getDate()}/${new Date("2024-11-29T23:00:00Z").getMonth() + 1}, ${hours}:00`,
),
).toBeInTheDocument();
expect(screen.getByText("pending")).toBeInTheDocument();
Expand Down Expand Up @@ -136,17 +139,19 @@ describe("test dashboard's charts", () => {
// needed to support different timezones (ex: ci and local could be different)
expect(
screen.getByText(
`28/11, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-28T22:00:00Z").getDate()}/${new Date("2024-11-28T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T22:00:00Z").getDate()}/${new Date("2024-11-29T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
let hours = new Date("2024-11-29T23:00:00Z").getHours();
if (hours === 0) hours = "00";
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T23:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T23:00:00Z").getDate()}/${new Date("2024-11-29T23:00:00Z").getMonth() + 1}, ${hours}:00`,
),
).toBeInTheDocument();
expect(screen.getByText("file")).toBeInTheDocument();
Expand Down Expand Up @@ -207,17 +212,19 @@ describe("test dashboard's charts", () => {
// needed to support different timezones (ex: ci and local could be different)
expect(
screen.getByText(
`28/11, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-28T22:00:00Z").getDate()}/${new Date("2024-11-28T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T22:00:00Z").getDate()}/${new Date("2024-11-29T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
let hours = new Date("2024-11-29T23:00:00Z").getHours();
if (hours === 0) hours = "00";
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T23:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T23:00:00Z").getDate()}/${new Date("2024-11-29T23:00:00Z").getMonth() + 1}, ${hours}:00`,
),
).toBeInTheDocument();
expect(screen.getByText("ip")).toBeInTheDocument();
Expand Down Expand Up @@ -275,17 +282,19 @@ describe("test dashboard's charts", () => {
// needed to support different timezones (ex: ci and local could be different)
expect(
screen.getByText(
`28/11, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-28T22:00:00Z").getDate()}/${new Date("2024-11-28T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T22:00:00Z").getDate()}/${new Date("2024-11-29T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
let hours = new Date("2024-11-29T23:00:00Z").getHours();
if (hours === 0) hours = "00";
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T23:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T23:00:00Z").getDate()}/${new Date("2024-11-29T23:00:00Z").getMonth() + 1}, ${hours}:00`,
),
).toBeInTheDocument();
expect(screen.getByText("application/json")).toBeInTheDocument();
Expand Down Expand Up @@ -343,17 +352,19 @@ describe("test dashboard's charts", () => {
// needed to support different timezones (ex: ci and local could be different)
expect(
screen.getByText(
`28/11, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-28T22:00:00Z").getDate()}/${new Date("2024-11-28T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T22:00:00Z").getDate()}/${new Date("2024-11-29T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
let hours = new Date("2024-11-29T23:00:00Z").getHours();
if (hours === 0) hours = "00";
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T23:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T23:00:00Z").getDate()}/${new Date("2024-11-29T23:00:00Z").getMonth() + 1}, ${hours}:00`,
),
).toBeInTheDocument();
expect(screen.getByText("Dns")).toBeInTheDocument();
Expand Down Expand Up @@ -412,17 +423,19 @@ describe("test dashboard's charts", () => {
// needed to support different timezones (ex: ci and local could be different)
expect(
screen.getByText(
`28/11, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-28T22:00:00Z").getDate()}/${new Date("2024-11-28T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T22:00:00Z").getDate()}/${new Date("2024-11-29T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
let hours = new Date("2024-11-29T23:00:00Z").getHours();
if (hours === 0) hours = "00";
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T23:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T23:00:00Z").getDate()}/${new Date("2024-11-29T23:00:00Z").getMonth() + 1}, ${hours}:00`,
),
).toBeInTheDocument();
expect(screen.getByText("user_a")).toBeInTheDocument();
Expand Down Expand Up @@ -481,17 +494,19 @@ describe("test dashboard's charts", () => {
// needed to support different timezones (ex: ci and local could be different)
expect(
screen.getByText(
`28/11, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-28T22:00:00Z").getDate()}/${new Date("2024-11-28T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-28T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T22:00:00Z").getDate()}/${new Date("2024-11-29T22:00:00Z").getMonth() + 1}, ${new Date("2024-11-29T22:00:00Z").getHours()}:00`,
),
).toBeInTheDocument();
let hours = new Date("2024-11-29T23:00:00Z").getHours();
if (hours === 0) hours = "00";
expect(
screen.getByText(
`29/11, ${new Date("2024-11-29T23:00:00Z").getHours()}:00`,
`${new Date("2024-11-29T23:00:00Z").getDate()}/${new Date("2024-11-29T23:00:00Z").getMonth() + 1}, ${hours}:00`,
),
).toBeInTheDocument();
expect(screen.getByText("AMBER")).toBeInTheDocument();
Expand Down

0 comments on commit c01a44c

Please # to comment.