utils update

Author: omursahin

web-report/src-e2e/App.test.tsx

@@ -4,14 +4,14 @@ import {resolve} from "path";
 import {readFileSync} from "fs";
 import {vi} from "vitest";
 import App from "../src/App";
-import {fetchFileContent, getFaultCounts} from "../src/utils";
+import {fetchFileContent, getFaultCounts} from "@/lib/utils";
 
 // Read the report.json file
 const reportJsonPath = resolve(__dirname, './static/report.json');
 const reportData = JSON.parse(readFileSync(reportJsonPath, 'utf-8'));
 
 // Mock the fetchFileContent function to return the content of the report.json file
-vi.mock('@/utils.tsx', async (importOriginal) => {
+vi.mock('@/lib/utils.tsx', async (importOriginal) => {
     const originalModule = await importOriginal();
     return{
         ...originalModule as typeof importOriginal,

web-report/src/App.tsx

@@ -3,7 +3,7 @@ import {Dashboard} from "@/components/Dashboard.tsx";
 import {useEffect, useState} from "react";
 import {WebFuzzingReport} from "@/types/GeneratedTypes.tsx";
 import {LoadingScreen} from "@/components/LoadingScreen.tsx";
-import {fetchFileContent} from "@/utils.tsx";
+import {fetchFileContent} from "@/lib/utils";
 import {ITestFiles} from "@/types/General.tsx";
 
 function App() {

web-report/src/components/EndpointAccordion.tsx

@@ -2,7 +2,7 @@ import {AccordionContent, AccordionItem, AccordionTrigger} from "@/components/ui
 import {Badge} from "@/components/ui/badge.tsx";
 import React, {useState} from "react";
 import {TestCases} from "@/components/TestCases.tsx";
-import {getColor} from "@/utils.tsx";
+import {getColor} from "@/lib/utils";
 
 interface IStatusType {
     code: number | string;

web-report/src/components/FaultsComponent.tsx

@@ -2,7 +2,7 @@ import {Card} from "@/components/ui/card.tsx";
 import {ShieldAlert} from "lucide-react";
 import React, {useState} from "react";
 import {Faults} from "@/types/GeneratedTypes.tsx";
-import {getFaultCounts} from "@/utils.tsx";
+import {getFaultCounts} from "@/lib/utils";
 import info from "@/assets/info.json";
 import {StatusCodeModal} from "@/components/StatusCodeModal.tsx";
 import {ReportTooltip} from "@/components/ui/report-tooltip.tsx";

web-report/src/components/GeneratedTests.tsx

@@ -1,7 +1,7 @@
 import {Card} from "@/components/ui/card.tsx";
 import {Target} from "lucide-react";
 import type React from "react";
-import {getFileColor} from "@/utils.tsx";
+import {getFileColor} from "@/lib/utils";
 import info from "@/assets/info.json";
 import {ReportTooltip} from "@/components/ui/report-tooltip.tsx";
 

web-report/src/components/RestReports.tsx

@@ -2,7 +2,7 @@ import {Card} from "@/components/ui/card.tsx";
 import type React from "react";
 import {CoveragePieChart} from "@/components/CoveragePieChart.tsx";
 import {RESTReport} from "@/types/GeneratedTypes.tsx";
-import {calculateAllStatusCounts} from "@/utils.tsx";
+import {calculateAllStatusCounts} from "@/lib/utils";
 import info from "@/assets/info.json";
 import {ReportTooltip} from "@/components/ui/report-tooltip.tsx";
 

web-report/src/components/TestCases.tsx

@@ -1,6 +1,6 @@
 import {Card} from "@/components/ui/card.tsx";
 import type React from "react";
-import {getColor} from "@/utils.tsx";
+import {getColor} from "@/lib/utils";
 import {ReportTooltip} from "@/components/ui/report-tooltip.tsx";
 
 interface ITestCaseProps {

web-report/src/lib/utils.ts

@@ -1,4 +1,10 @@
 import {CoveredEndpoint, FoundFault} from "@/types/GeneratedTypes.tsx";
+import {ClassValue, clsx} from "clsx";
+import {twMerge} from "tailwind-merge";
+
+export function cn(...inputs: ClassValue[]) {
+    return twMerge(clsx(inputs))
+}
 
 export const getColor = (code: string | number, isBackground: boolean, isFault: boolean) => {
     if (isFault) {

web-report/src/utils.tsx web-report/src/lib/utils.tsxweb-report/src/utils.tsx renamed to web-report/src/lib/utils.tsx

@@ -3,7 +3,7 @@ import type React from "react";
 import {Badge} from "@/components/ui/badge.tsx";
 import {CodeBlock} from "@/components/CodeBlock.tsx";
 import {FoundFault, RESTReport, TestCase} from "@/types/GeneratedTypes.tsx";
-import {extractCodeLines, getColor} from "@/utils.tsx";
+import {extractCodeLines, getColor} from "@/lib/utils";
 import {ITestFiles} from "@/types/General.tsx";