Display information of project on home tab

This commit is contained in:
Takeshi Kimata
2024-05-06 13:35:32 +09:00
parent ac9af2d604
commit 3de1bd2d42
15 changed files with 323 additions and 36 deletions

View File

@@ -103,6 +103,10 @@ app.use("/runcases", runCaseBuldNewRoute);
app.use("/runcases", runCaseDeleteRoute);
app.use("/runcases", runCaseBulkDeleteRoute);
// "/home"
const homeIndexRoute = require("./routes/home/index")(sequelize);
app.use("/home", homeIndexRoute);
const PORT = process.env.PORT || 3001;
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);

View File

@@ -0,0 +1,49 @@
const express = require("express");
const router = express.Router();
const defineProject = require("../../models/projects");
const defineFolder = require("../../models/folders");
const defineCase = require("../../models/cases");
const defineRun = require("../../models/runs");
const defineRunCase = require("../../models/runCases");
const { DataTypes } = require("sequelize");
module.exports = function (sequelize) {
const Project = defineProject(sequelize, DataTypes);
const Folder = defineFolder(sequelize, DataTypes);
const Case = defineCase(sequelize, DataTypes);
const Run = defineRun(sequelize, DataTypes);
const RunCase = defineRunCase(sequelize, DataTypes);
Project.hasMany(Folder, { foreignKey: "projectId" });
Folder.hasMany(Case, { foreignKey: "folderId" });
Project.hasMany(Run, { foreignKey: "projectId" });
Run.hasMany(RunCase, { foreignKey: "runId" });
router.get("/:projectId", async (req, res) => {
const projectId = req.params.projectId;
if (!projectId) {
return res.status(400).json({ error: "projectId is required" });
}
try {
const project = await Project.findByPk(projectId, {
include: [
{
model: Folder,
include: [{ model: Case }],
},
{ model: Run, include: [{ model: RunCase }] },
],
});
if (!project) {
return res.status(404).send("Project not found");
}
res.json(project);
} catch (error) {
console.error(error);
res.status(500).send("Internal Server Error");
}
});
return router;
};

View File

@@ -6,19 +6,19 @@ const priorities = [
];
const testTypes = [
{ uid: "other" },
{ uid: "security" },
{ uid: "performance" },
{ uid: "accessibility" },
{ uid: "functional" },
{ uid: "acceptance" },
{ uid: "usability" },
{ uid: "smokeSanity" },
{ uid: "compatibility" },
{ uid: "destructive" },
{ uid: "regression" },
{ uid: "automated" },
{ uid: "manual" },
{ uid: "other", chartColor: "#688ae8" },
{ uid: "security", chartColor: "#c33d69" },
{ uid: "performance", chartColor: "#2ea597" },
{ uid: "accessibility", chartColor: "#8456ce" },
{ uid: "functional", chartColor: "#e07941" },
{ uid: "acceptance", chartColor: "#3759ce" },
{ uid: "usability", chartColor: "#962249" },
{ uid: "smokeSanity", chartColor: "#096f64" },
{ uid: "compatibility", chartColor: "#6237a7" },
{ uid: "destructive", chartColor: "#a84401" },
{ uid: "regression", chartColor: "#273ea5" },
{ uid: "automated", chartColor: "#780d35" },
{ uid: "manual", chartColor: "#03524a" },
];
const automationStatus = [

View File

@@ -1,5 +1,5 @@
{
"Home": {
"Index": {
"get_started": "Get Started",
"integrate_and_manage": "Integrate and manage all your software testing."
},
@@ -24,13 +24,33 @@
"close": "Close",
"create": "Create",
"update": "Update",
"please_enter": "Please enter project name"
"please_enter": "Please enter project name",
"no_projects_found": "No projects found"
},
"Project": {
"home": "Home",
"test_cases": "Test Cases",
"test_run": "Test Runs"
},
"Home": {
"Folders": "Folders",
"test_cases": "Test Cases",
"test_runs": "Test Runs",
"test_types": "Test types",
"other": "Other",
"security": "Security",
"performance": "Performance",
"accessibility": "Accessibility",
"functional": "Functional",
"acceptance": "Acceptance",
"usability": "Usability",
"smoke_sanity": "Smoke&Sanity",
"compatibility": "Compatibility",
"destructive": "Destructive",
"regression": "Regression",
"automated": "Automated",
"manual": "Manual"
},
"Folders": {
"folder": "Folder",
"new_folder": "New Folder",
@@ -56,7 +76,8 @@
"critical": "Critical",
"high": "High",
"medium": "Medium",
"low": "Low"
"low": "Low",
"no_cases_found": "No test cases found"
},
"Case": {
"back_to_cases": "Back to test cases",

View File

@@ -1,5 +1,5 @@
{
"Home": {
"Index": {
"get_started": "テスト管理を始める",
"integrate_and_manage": "ソフトウェア開発にかかわるすべてのテストを統合管理"
},
@@ -24,13 +24,33 @@
"close": "閉じる",
"create": "作成",
"update": "更新",
"please_enter": "プロジェクト名を入力してください"
"please_enter": "プロジェクト名を入力してください",
"no_projects_found": "プロジェクトがありません"
},
"Project": {
"home": "ホーム",
"test_cases": "テストケース",
"test_runs": "テストの実行"
},
"Home": {
"Folders": "フォルダー",
"test_cases": "テストケース",
"test_runs": "テスト実行",
"test_types": "テスト種別",
"other": "その他",
"security": "セキュリティ",
"performance": "パフォーマンス",
"accessibility": "アクセシビリティ",
"functional": "機能",
"acceptance": "受け入れ",
"usability": "ユーザビリティ",
"smoke_sanity": "スモーク/サニティ",
"compatibility": "互換性",
"destructive": "破壊",
"regression": "回帰",
"automated": "自動",
"manual": "手動"
},
"Folders": {
"folder": "フォルダー",
"new_folder": "新規フォルダー",
@@ -56,7 +76,8 @@
"critical": "致",
"high": "高",
"medium": "中",
"low": "低"
"low": "低",
"no_cases_found": "テストケースがありません"
},
"Case": {
"back_to_cases": "テストケース一覧に戻る",

View File

@@ -4,7 +4,7 @@ import { useTranslations } from "next-intl";
import { Link } from "@/src/navigation";
export default function Home() {
const t = useTranslations("Home");
const t = useTranslations("Index");
return (
<section className="flex flex-col items-center justify-center gap-4 py-8 md:py-10">

View File

@@ -151,7 +151,7 @@ export default function ProjectsTable({
</TableColumn>
)}
</TableHeader>
<TableBody emptyContent={"No cases found"} items={sortedItems}>
<TableBody emptyContent={messages.noProjectsFound} items={sortedItems}>
{(item) => (
<TableRow key={item.id}>
{(columnKey) => (

View File

@@ -211,7 +211,7 @@ export default function TestCaseTable({
</TableColumn>
)}
</TableHeader>
<TableBody emptyContent={"No cases found"} items={sortedItems}>
<TableBody emptyContent={messages.noCasesFound} items={sortedItems}>
{(item) => (
<TableRow key={item.id}>
{(columnKey) => (

View File

@@ -21,6 +21,7 @@ export default function Page({
high: t("high"),
medium: t("medium"),
low: t("low"),
noCasesFound: t("no_cases_found"),
};
return (

View File

@@ -0,0 +1,53 @@
import React from "react";
import { useState, useEffect } from "react";
import dynamic from "next/dynamic";
import { testTypes } from "@/config/selection";
import { CaseTypeCountType } from "@/types/case";
import { HomeMessages } from "./page";
const Chart = dynamic(() => import("react-apexcharts"), { ssr: false });
type Props = {
typesCounts: CaseTypeCountType[];
messages: HomeMessages;
};
export default function TestTypesDonutChart({ typesCounts, messages }: Props) {
const [chartData, setChartData] = useState({
series: [],
options: {
labels: [],
colors: [],
},
});
useEffect(() => {
const updateChartDate = () => {
if (typesCounts) {
const series = testTypes.map((entry, index) => {
const found = typesCounts.find((itr) => itr.type === index);
return found ? found.count : 0;
});
const labels = testTypes.map((entry) => messages[entry.uid]);
const colors = testTypes.map((entry) => entry.chartColor);
setChartData({
series,
options: { labels, colors },
});
}
};
updateChartDate();
}, [typesCounts]);
return (
<Chart
options={chartData.options}
series={chartData.series}
type="donut"
width={"100%"}
height={"100%"}
/>
);
}

View File

@@ -1,7 +1,15 @@
"use client";
import { useState, useEffect } from "react";
import { Divider } from "@nextui-org/react";
import { title } from "@/components/primitives";
import { Card, CardBody, Chip } from "@nextui-org/react";
import { Folder, Clipboard, FlaskConical } from "lucide-react";
import { CaseTypeCountType } from "@/types/case";
import { HomeMessages } from "./page";
import { testTypes } from "@/config/selection";
import TestTypesChart from "./TestTypesDonutChart";
import Config from "@/config/config";
const apiServer = Config.apiServer;
import { useState, useEffect } from "react";
async function fetchProject(url) {
try {
@@ -25,13 +33,21 @@ async function fetchProject(url) {
type Props = {
projectId: string;
messages: HomeMessages;
};
export function Home({ projectId }: Props) {
export function Home({ projectId, messages }: Props) {
const [project, setProject] = useState({
Folders: [],
name: "",
detail: "",
Folders: [{ Cases: [] }],
Runs: [{ RunCases: [] }],
});
const url = `${apiServer}/projects/${projectId}`;
const [folderNum, setFolderNum] = useState(0);
const [caseNum, setCaseNum] = useState(0);
const [runNum, setRunNum] = useState(0);
const [typesCounts, setTypesCounts] = useState<CaseTypeCountType[]>();
const url = `${apiServer}/home/${projectId}`;
useEffect(() => {
async function fetchDataEffect() {
@@ -47,13 +63,87 @@ export function Home({ projectId }: Props) {
fetchDataEffect();
}, [url]);
return (
<>
<h3 className="font-bold ms-2">Home</h3>
useEffect(() => {
async function aggregate() {
aggregateBasicInfo();
aggregateTestType();
}
<h4 className="font-bold ms-2 mt-5">
Folder num: {project.Folders.length}
</h4>
</>
aggregate();
}, [project]);
// aggregate folder, case, run mum
function aggregateBasicInfo() {
let num = 0;
setFolderNum(project.Folders.length);
setRunNum(project.Runs.length);
project.Folders.forEach((folder) => {
num += folder.Cases.length;
});
setCaseNum(num);
}
// aggregate test types of each case
function aggregateTestType() {
const tempTypesCounts = {};
project.Folders.forEach((folder) => {
folder.Cases.forEach((testcase) => {
const type = testcase.type;
tempTypesCounts[type] = (tempTypesCounts[type] || 0) + 1;
});
});
const result = [];
for (let type = 0; type <= testTypes.length; type++) {
result.push({ type: type, count: tempTypesCounts[type] || 0 });
}
setTypesCounts([...result]);
}
return (
<div className="container mx-auto max-w-5xl pt-6 px-6 flex-grow">
<h1 className={title({ size: "sm" })}>{project.name}</h1>
<div className="mt-4">
<Chip
variant="flat"
startContent={<Folder size={16} />}
className="px-3"
>
{folderNum} {messages.folders}
</Chip>
<Chip
variant="flat"
startContent={<Clipboard size={16} />}
className="px-3 ms-2"
>
{caseNum} {messages.testCases}
</Chip>
<Chip
variant="flat"
startContent={<FlaskConical size={16} />}
className="px-3 ms-2"
>
{runNum} {messages.testRuns}
</Chip>
</div>
<Card className="mt-3 bg-neutral-100" shadow="none">
<CardBody>{project.detail}</CardBody>
</Card>
<Divider className="my-6" />
<div className="flex">
<div style={{ width: "32rem", height: "32rem" }}>
<h3>{messages.testTypes}</h3>
<TestTypesChart typesCounts={typesCounts} messages={messages} />
</div>
<div style={{ width: "32rem", height: "32rem" }}>
<h3>{messages.testTypes}</h3>
<TestTypesChart typesCounts={typesCounts} messages={messages} />
</div>
</div>
</div>
);
}

View File

@@ -1,9 +1,50 @@
import { Home } from "./home";
import { useTranslations } from "next-intl";
export type HomeMessages = {
folders: string;
testCases: string;
testRuns: string;
testTypes: string;
other: string;
security: string;
performance: string;
accessibility: string;
functional: string;
acceptance: string;
usability: string;
smokeSanity: string;
compatibility: string;
destructive: string;
regression: string;
automated: string;
manual: string;
};
export default function Page({ params }: { params: { projectId: string } }) {
const t = useTranslations("Home");
const messages = {
folders: t("Folders"),
testCases: t("test_cases"),
testRuns: t("test_runs"),
testTypes: t("test_types"),
other: t("other"),
security: t("security"),
performance: t("performance"),
accessibility: t("accessibility"),
functional: t("functional"),
acceptance: t("acceptance"),
usability: t("usability"),
smokeSanity: t("smoke_sanity"),
compatibility: t("compatibility"),
destructive: t("destructive"),
regression: t("regression"),
automated: t("automated"),
manual: t("manual"),
};
return (
<>
<Home projectId={params.projectId} />
<Home projectId={params.projectId} messages={messages} />
</>
);
}

View File

@@ -20,6 +20,7 @@ export default function Page(params: { locale }) {
create: t("create"),
update: t("update"),
pleaseEnter: t("please_enter"),
noProjectsFound: t("no_projects_found"),
};
return (
<>

View File

@@ -49,6 +49,11 @@ type AttachmentType = {
caseAttachments: CaseAttachmentType;
};
type CaseTypeCountType = {
type: number;
count: number;
};
export type CasesMessages = {
testCaseList: string;
id: string;
@@ -63,6 +68,7 @@ export type CasesMessages = {
high: string;
medium: string;
low: string;
noCasesFound: string;
};
export type CaseMessages = {
@@ -113,4 +119,4 @@ export type CaseMessages = {
maxFileSize: string;
};
export { CaseType, StepType, AttachmentType, CasesMessages, CaseMessages };
export { CaseType, StepType, AttachmentType, CaseTypeCountType, CasesMessages, CaseMessages };

View File

@@ -8,7 +8,6 @@ export type ProjectType = {
export type ProjectsMessages = {
projectList: string;
projects: string;
newProject: string;
editProject: string;
deleteProject: string;
@@ -23,6 +22,7 @@ export type ProjectsMessages = {
create: string;
update: string;
pleaseEnter: string;
noProjectsFound: string;
};
export type ProjectMessages = {