Implemented test run editor's test case selection

This commit is contained in:
Takeshi Kimata
2024-04-13 23:36:52 +09:00
parent f78308343e
commit aa35d28801
3 changed files with 106 additions and 15 deletions

View File

@@ -0,0 +1,31 @@
function defineRunCase(sequelize, DataTypes) {
const RunCase = sequelize.define("RunCase", {
runId: {
type: DataTypes.INTEGER,
allowNull: false,
},
caseId: {
type: DataTypes.INTEGER,
allowNull: false,
},
status: {
type: DataTypes.INTEGER,
allowNull: false,
},
});
RunCase.associate = (models) => {
RunCase.belongsTo(models.Run, {
foreignKey: "runId",
onDelete: "CASCADE",
});
RunCase.belongsTo(models.Case, {
foreignKey: "caseId",
onDelete: "CASCADE",
});
};
return RunCase;
}
module.exports = defineRunCase;

View File

@@ -1,10 +1,14 @@
const express = require("express"); const express = require("express");
const router = express.Router(); const router = express.Router();
const defineRun = require("../../models/runs"); const defineRun = require("../../models/runs");
const defineCase = require("../../models/cases");
const { DataTypes } = require("sequelize"); const { DataTypes } = require("sequelize");
module.exports = function (sequelize) { module.exports = function (sequelize) {
const Run = defineRun(sequelize, DataTypes); const Run = defineRun(sequelize, DataTypes);
const Case = defineCase(sequelize, DataTypes);
Run.belongsToMany(Case, { through: "runCases" });
Case.belongsToMany(Run, { through: "runCases" });
router.get("/:runId", async (req, res) => { router.get("/:runId", async (req, res) => {
const runId = req.params.runId; const runId = req.params.runId;
@@ -14,7 +18,13 @@ module.exports = function (sequelize) {
} }
try { try {
const project = await Run.findByPk(runId); const project = await Run.findByPk(runId, {
include: [
{
model: Case,
},
],
});
if (!project) { if (!project) {
return res.status(404).send("Run not found"); return res.status(404).send("Run not found");
} }

View File

@@ -8,12 +8,18 @@ import {
Select, Select,
SelectItem, SelectItem,
Tooltip, Tooltip,
Listbox,
ListboxItem,
Divider,
} from "@nextui-org/react"; } from "@nextui-org/react";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import { Save, ArrowLeft, Plus } from "lucide-react"; import { Save, ArrowLeft, Folder } from "lucide-react";
import { testRunStatus } from "@/config/selection"; import { testRunStatus } from "@/config/selection";
import { RunType } from "@/types/run"; import { RunType } from "@/types/run";
import { FolderType } from "@/types/folder";
import { fetchRun, updateRun } from "../runsControl"; import { fetchRun, updateRun } from "../runsControl";
import { fetchFolders } from "../../folders/foldersControl";
import { fetchCases } from "../../folders/[folderId]/cases/caseControl";
const defaultTestRun = { const defaultTestRun = {
id: 0, id: 0,
@@ -31,6 +37,9 @@ type Props = {
export default function RunEditor({ projectId, runId }: Props) { export default function RunEditor({ projectId, runId }: Props) {
const [testRun, setTestRun] = useState<RunType>(defaultTestRun); const [testRun, setTestRun] = useState<RunType>(defaultTestRun);
const [folders, setFolders] = useState([]);
const [testcases, setTestCases] = useState([]);
const [selectedFolder, setSelectedFolder] = useState<FolderType>({});
const [isNameInvalid, setIsNameInvalid] = useState<boolean>(false); const [isNameInvalid, setIsNameInvalid] = useState<boolean>(false);
const [isUpdating, setIsUpdating] = useState<boolean>(false); const [isUpdating, setIsUpdating] = useState<boolean>(false);
const router = useRouter(); const router = useRouter();
@@ -38,8 +47,10 @@ export default function RunEditor({ projectId, runId }: Props) {
useEffect(() => { useEffect(() => {
async function fetchDataEffect() { async function fetchDataEffect() {
try { try {
const data = await fetchRun(runId); const caseData = await fetchRun(runId);
setTestRun(data); setTestRun(caseData);
const foldersData = await fetchFolders(projectId);
setFolders(foldersData);
} catch (error) { } catch (error) {
console.error("Error in effect:", error.message); console.error("Error in effect:", error.message);
} }
@@ -48,6 +59,24 @@ export default function RunEditor({ projectId, runId }: Props) {
fetchDataEffect(); fetchDataEffect();
}, []); }, []);
useEffect(() => {
async function fetchCasesData() {
if (selectedFolder && selectedFolder.id) {
try {
const testCasesData = await fetchCases(selectedFolder.id);
setTestCases(testCasesData);
} catch (error) {
console.error("Error fetching cases data:", error.message);
}
}
}
fetchCasesData();
}, [selectedFolder]);
const baseClass = "";
const selectedClass = `${baseClass} bg-neutral-200 dark:bg-neutral-700`;
return ( return (
<> <>
<div className="border-b-1 dark:border-neutral-700 w-full p-3 flex items-center justify-between"> <div className="border-b-1 dark:border-neutral-700 w-full p-3 flex items-center justify-between">
@@ -80,6 +109,7 @@ export default function RunEditor({ projectId, runId }: Props) {
</div> </div>
<div className="container mx-auto max-w-3xl pt-6 px-6 flex-grow"> <div className="container mx-auto max-w-3xl pt-6 px-6 flex-grow">
<h6>Basic</h6>
<Input <Input
size="sm" size="sm"
type="text" type="text"
@@ -94,16 +124,6 @@ export default function RunEditor({ projectId, runId }: Props) {
className="mt-3" className="mt-3"
/> />
<Button
startContent={<Plus size={16} />}
size="sm"
color="primary"
onPress={async () => {}}
className="mt-3"
>
Select test case
</Button>
<Textarea <Textarea
size="sm" size="sm"
variant="bordered" variant="bordered"
@@ -128,7 +148,7 @@ export default function RunEditor({ projectId, runId }: Props) {
); );
setTestRun({ ...testRun, state: index }); setTestRun({ ...testRun, state: index });
}} }}
label="template" label="status"
className="mt-3 max-w-xs" className="mt-3 max-w-xs"
> >
{testRunStatus.map((state, index) => ( {testRunStatus.map((state, index) => (
@@ -138,6 +158,36 @@ export default function RunEditor({ projectId, runId }: Props) {
))} ))}
</Select> </Select>
</div> </div>
<Divider className="my-6" />
<h6>Select test cases</h6>
<div className="mt-3 flex rounded-small border-2 dark:border-neutral-700">
<div className="w-3/12 border-r-1 dark:border-neutral-700">
<Listbox aria-label="Listbox Variants" variant="light">
{folders.map((folder, index) => (
<ListboxItem
key={index}
onClick={() => setSelectedFolder(folder)}
startContent={
<Folder size={20} color="#F7C24E" fill="#F7C24E" />
}
className={
selectedFolder && folder.id === selectedFolder.id
? selectedClass
: baseClass
}
>
{folder.name}
</ListboxItem>
))}
</Listbox>
</div>
<div className="">
{testcases.map((testcase, index) => (
<div key={index}>{testcase.title}</div>
))}
</div>
</div>
</div> </div>
</> </>
); );