From 92d6340ddc96c8a0a061e29a2745165f9cf5bd8e Mon Sep 17 00:00:00 2001
From: Mucahit Bilal GOKER <51519350+bimgeek@users.noreply.github.com>
Date: Thu, 27 Nov 2025 16:13:04 +0300
Subject: [PATCH 1/6] feat: bulk test case creation (#346)

---
 frontend/messages/en.json                     |  5 ++-
 frontend/messages/ja.json                     |  5 ++-
 frontend/messages/pt-BR.json                  |  5 ++-
 .../folders/[folderId]/cases/CaseDialog.tsx   | 41 +++++++++++++++----
 .../folders/[folderId]/cases/CasesPane.tsx    |  6 ++-
 .../folders/[folderId]/cases/page.tsx         |  1 +
 frontend/types/case.ts                        |  1 +
 7 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index eee362c..cb599d3 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -217,7 +217,7 @@
     "delete": "Delete",
     "close": "Close",
     "are_you_sure": "Are you sure you want to delete test cases?",
-    "new_test_case": "New Test Case",
+    "new_test_case": "New",
     "export": "Export",
     "status": "Status",
     "no_cases_found": "No test cases found",
@@ -248,7 +248,8 @@
     "click_to_upload": "Click to upload",
     "or_drag_and_drop": " or drag and drop",
     "max_file_size": "Max. file size",
-    "cases_imported": "Test cases imported"
+    "cases_imported": "Test cases imported",
+    "create_more": "Create more"
   },
   "Case": {
     "back_to_cases": "Back to test cases",
diff --git a/frontend/messages/ja.json b/frontend/messages/ja.json
index 53229ec..8285ad3 100644
--- a/frontend/messages/ja.json
+++ b/frontend/messages/ja.json
@@ -217,7 +217,7 @@
     "delete": "削除",
     "close": "閉じる",
     "are_you_sure": "テストケースを削除してもよろしいですか?",
-    "new_test_case": "新規テストケース",
+    "new_test_case": "新規",
     "export": "エクスポート",
     "status": "ステータス",
     "no_cases_found": "テストケースがありません",
@@ -248,7 +248,8 @@
     "click_to_upload": "クリックしてアップロード",
     "or_drag_and_drop": "またはドラッグアンドドロップ",
     "max_file_size": "最大ファイルサイズ",
-    "cases_imported": "テストケースがインポートされました"
+    "cases_imported": "テストケースがインポートされました",
+    "create_more": "さらに作成"
   },
   "Case": {
     "back_to_cases": "テストケース一覧に戻る",
diff --git a/frontend/messages/pt-BR.json b/frontend/messages/pt-BR.json
index 3f3b767..da1dcf8 100644
--- a/frontend/messages/pt-BR.json
+++ b/frontend/messages/pt-BR.json
@@ -217,7 +217,7 @@
     "delete": "Excluir",
     "close": "Fechar",
     "are_you_sure": "Tem certeza de que deseja excluir os casos de teste?",
-    "new_test_case": "Novo Caso de Teste",
+    "new_test_case": "Novo",
     "export": "Exportar",
     "status": "Status",
     "no_cases_found": "Nenhum caso de teste encontrado",
@@ -248,7 +248,8 @@
     "click_to_upload": "Clique para enviar",
     "or_drag_and_drop": " ou arraste e solte",
     "max_file_size": "Tamanho máx. do arquivo",
-    "cases_imported": "Casos de teste importados"
+    "cases_imported": "Casos de teste importados",
+    "create_more": "Criar mais"
   },
   "Case": {
     "back_to_cases": "Voltar para os casos de teste",
diff --git a/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CaseDialog.tsx b/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CaseDialog.tsx
index e718d96..9d261fe 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CaseDialog.tsx
+++ b/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CaseDialog.tsx
@@ -1,12 +1,22 @@
 'use client';
 import { useState } from 'react';
-import { Button, Input, Textarea, Modal, ModalContent, ModalHeader, ModalBody, ModalFooter } from '@heroui/react';
+import {
+  Button,
+  Input,
+  Textarea,
+  Modal,
+  ModalContent,
+  ModalHeader,
+  ModalBody,
+  ModalFooter,
+  Switch,
+} from '@heroui/react';
 import { CasesMessages } from '@/types/case';
 
 type Props = {
   isOpen: boolean;
   onCancel: () => void;
-  onSubmit: (title: string, description: string) => void;
+  onSubmit: (title: string, description: string, createMore: boolean) => void;
   messages: CasesMessages;
 };
 
@@ -23,6 +33,8 @@ export default function CaseDialog({ isOpen, onCancel, onSubmit, messages }: Pro
     errorMessage: '',
   });
 
+  const [createMore, setCreateMore] = useState(false);
+
   const clear = () => {
     setCaseName({
       isValid: false,
@@ -47,8 +59,23 @@ export default function CaseDialog({ isOpen, onCancel, onSubmit, messages }: Pro
       return;
     }
 
-    onSubmit(caseTitle.text, caseDescription.text);
-    clear();
+    onSubmit(caseTitle.text, caseDescription.text, createMore);
+
+    if (!createMore) {
+      clear();
+    } else {
+      // Reset form fields but keep dialog open
+      setCaseName({
+        isValid: false,
+        text: 'Untitled Case',
+        errorMessage: '',
+      });
+      setCaseDescription({
+        isValid: false,
+        text: '',
+        errorMessage: '',
+      });
+    }
   };
 
   return (
@@ -88,9 +115,9 @@ export default function CaseDialog({ isOpen, onCancel, onSubmit, messages }: Pro
           />
         </ModalBody>
         <ModalFooter>
-          <Button variant="light" onPress={onCancel}>
-            {messages.close}
-          </Button>
+          <Switch size="sm" isSelected={createMore} onValueChange={setCreateMore}>
+            {messages.createMore}
+          </Switch>
           <Button color="primary" onPress={validate}>
             {messages.create}
           </Button>
diff --git a/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CasesPane.tsx b/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CasesPane.tsx
index 5be48ed..e109829 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CasesPane.tsx
+++ b/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CasesPane.tsx
@@ -112,10 +112,12 @@ export default function CasesPane({
 
   const closeDialog = () => setIsCaseDialogOpen(false);
 
-  const onSubmit = async (title: string, description: string) => {
+  const onSubmit = async (title: string, description: string, createMore: boolean) => {
     const newCase = await createCase(context.token.access_token, folderId, title, description);
     setCases([...cases, newCase]);
-    closeDialog();
+    if (!createMore) {
+      closeDialog();
+    }
   };
 
   const closeDeleteConfirmDialog = () => {
diff --git a/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/page.tsx b/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/page.tsx
index 11bf0ac..1e275d7 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/page.tsx
+++ b/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/page.tsx
@@ -57,6 +57,7 @@ export default function Page({ params }: { params: { projectId: string; folderId
     orDragAndDrop: t('or_drag_and_drop'),
     maxFileSize: t('max_file_size'),
     casesImported: t('cases_imported'),
+    createMore: t('create_more'),
   };
 
   const priorityTranslation = useTranslations('Priority');
diff --git a/frontend/types/case.ts b/frontend/types/case.ts
index 664439f..49e1ec4 100644
--- a/frontend/types/case.ts
+++ b/frontend/types/case.ts
@@ -105,6 +105,7 @@ type CasesMessages = {
   orDragAndDrop: string;
   maxFileSize: string;
   casesImported: string;
+  createMore: string;
 };
 
 type CaseMessages = {

From a2fea7a127bf319983c07c92f6d11c5c86882190 Mon Sep 17 00:00:00 2001
From: Matheus Santana <83383321+matheusfsantana@users.noreply.github.com>
Date: Sat, 29 Nov 2025 03:00:43 -0300
Subject: [PATCH 2/6] feat: add folder on export and handle steps on import
 (#352)

---
 backend/routes/cases/download.js              |   9 +
 backend/routes/cases/download.test.js         |   1 +
 backend/routes/cases/import.js                | 175 ++++++++++++------
 .../unittcms-import-template-v1.1.xlsx        | Bin 0 -> 106490 bytes
 .../[folderId]/cases/CaseImportDialog.tsx     |   2 +-
 5 files changed, 126 insertions(+), 61 deletions(-)
 create mode 100644 frontend/public/template/unittcms-import-template-v1.1.xlsx

diff --git a/backend/routes/cases/download.js b/backend/routes/cases/download.js
index ab2071d..3714968 100644
--- a/backend/routes/cases/download.js
+++ b/backend/routes/cases/download.js
@@ -4,6 +4,7 @@ import { DataTypes } from 'sequelize';
 import Papa from 'papaparse';
 import defineCase from '../../models/cases.js';
 import defineStep from '../../models/steps.js';
+import defineFolder from '../../models/folders.js';
 import authMiddleware from '../../middleware/auth.js';
 import visibilityMiddleware from '../../middleware/verifyVisible.js';
 import { testRunStatus, priorities, testTypes, automationStatus, templates } from '../../config/enums.js';
@@ -11,6 +12,8 @@ import { testRunStatus, priorities, testTypes, automationStatus, templates } fro
 export default function (sequelize) {
   const Case = defineCase(sequelize, DataTypes);
   const Step = defineStep(sequelize, DataTypes);
+  const Folder = defineFolder(sequelize, DataTypes);
+  Case.belongsTo(Folder);
   Case.belongsToMany(Step, { through: 'caseSteps' });
   Step.belongsToMany(Case, { through: 'caseSteps' });
   const { verifySignedIn } = authMiddleware(sequelize);
@@ -37,6 +40,10 @@ export default function (sequelize) {
             order: [['stepNo', 'ASC']],
             attributes: { exclude: ['createdAt', 'updatedAt'] },
           },
+          {
+            model: Folder,
+            attributes: ['name'],
+          },
         ],
         where: { folderId },
         raw: true,
@@ -90,6 +97,7 @@ const _formatRawCasesToJson = (cases) => {
       casesObject[c.id] = {
         id: c.id,
         folderId: c.folderId,
+        folder: c['Folder.name'],
         title: c.title,
         state: c.state,
         priority: c.priority,
@@ -119,6 +127,7 @@ const _formatRawCasesToCsv = (cases) => {
   return cases.map((c) => ({
     id: c.id,
     folderId: c.folderId,
+    folder: c['Folder.name'],
     title: c.title,
     state: c.state,
     priority: c.priority,
diff --git a/backend/routes/cases/download.test.js b/backend/routes/cases/download.test.js
index 06e60c2..e8a1b56 100644
--- a/backend/routes/cases/download.test.js
+++ b/backend/routes/cases/download.test.js
@@ -38,6 +38,7 @@ vi.mock('../../middleware/verifyVisible.js', () => ({
 const mockCase = {
   findAll: vi.fn(),
   belongsToMany: vi.fn(),
+  belongsTo: vi.fn(),
 };
 vi.mock('../../models/cases.js', () => ({
   default: () => mockCase,
diff --git a/backend/routes/cases/import.js b/backend/routes/cases/import.js
index 9b07cfd..894b859 100644
--- a/backend/routes/cases/import.js
+++ b/backend/routes/cases/import.js
@@ -5,6 +5,8 @@ import multer from 'multer';
 import XLSX from 'xlsx';
 import { DataTypes } from 'sequelize';
 import defineCase from '../../models/cases.js';
+import defineStep from '../../models/steps.js';
+import defineCaseStep from '../../models/caseSteps.js';
 import authMiddleware from '../../middleware/auth.js';
 import editableMiddleware from '../../middleware/verifyEditable.js';
 import { priorities, testTypes, automationStatus, templates } from '../../config/enums.js';
@@ -34,6 +36,10 @@ const upload = multer({
 
 export default function (sequelize) {
   const Case = defineCase(sequelize, DataTypes);
+  const Step = defineStep(sequelize, DataTypes);
+  const CaseStep = defineCaseStep(sequelize, DataTypes);
+  Case.belongsToMany(Step, { through: CaseStep });
+  Step.belongsToMany(Case, { through: CaseStep });
   const { verifySignedIn } = authMiddleware(sequelize);
   const { verifyProjectDeveloperFromFolderId } = editableMiddleware(sequelize);
 
@@ -60,86 +66,135 @@ export default function (sequelize) {
         return res.status(400).json({ error: 'folderId is required' });
       }
 
+      const t = await sequelize.transaction();
       try {
         const workbook = XLSX.read(req.file.buffer, { type: 'buffer' });
         const sheetName = workbook.SheetNames[0];
         const worksheet = workbook.Sheets[sheetName];
         const jsonData = XLSX.utils.sheet_to_json(worksheet);
 
-        let errorMessage = null;
+        let currentTitle = null;
+        let previousTitle = null;
+        let stepNo = 1;
         const casesToCreate = [];
-        const requiredFields = ['title', 'priority', 'type', 'template'];
+        const stepsToCreate = [];
         for (const [index, row] of jsonData.entries()) {
-          const rowNumber = index + 2;
-          for (const field of requiredFields) {
-            if (!row[field]) {
-              errorMessage = `Row ${rowNumber} is missing required field: ${field}`;
-              console.log(`Error found for field: ${errorMessage}`);
-            }
-          }
-
-          // Validate priority if provided
-          let priorityIndex = priorities.indexOf('medium'); // default to 'medium'
-          if (row['priority']) {
-            priorityIndex = priorities.indexOf(row['priority'].toLowerCase());
-            if (priorityIndex === -1) {
-              errorMessage = `Row ${rowNumber} has invalid priority: ${row['priority']}`;
-            }
-          }
-
-          // Validate type if provided
-          let typeIndex = testTypes.indexOf('other'); // default to 'other'
-          if (row['type']) {
-            typeIndex = testTypes.indexOf(row['type'].toLowerCase());
-            if (typeIndex === -1) {
-              errorMessage = `Row ${rowNumber} has invalid type: ${row['type']}`;
-            }
-          }
-
-          // Validate automationStatus if provided
-          let automationStatusIndex = automationStatus.indexOf('automation-not-required'); // default to 'automation-not-required'
-          if (row['automationStatus']) {
-            automationStatusIndex = automationStatus.indexOf(row['automationStatus'].toLowerCase());
-            if (automationStatusIndex === -1) {
-              errorMessage = `Row ${rowNumber} has invalid automationStatus: ${row['automationStatus']}`;
-            }
-          }
-
-          // Validate template if provided
-          let templateIndex = templates.indexOf('text'); // default to 'text'
-          if (row['template']) {
-            templateIndex = templates.indexOf(row['template'].toLowerCase());
-            if (templateIndex === -1) {
-              errorMessage = `Row ${rowNumber} has invalid template: ${row['template']}`;
-            }
-          }
-
+          const errorMessage = _getRowValidationError(row, index);
           if (errorMessage) {
             return res.status(400).json({ error: errorMessage });
           }
 
-          casesToCreate.push({
-            folderId: folderId,
-            title: row['title'],
-            description: row['description'] || '',
-            state: 0, // default state
-            priority: priorityIndex,
-            type: typeIndex,
-            preConditions: row['preConditions'],
-            expectedResults: row['expectedResults'],
-            automationStatus: automationStatusIndex,
-            template: templateIndex,
-          });
+          // Add step to the same case if the current row title is equal to previous row title
+          // This handle cases with multiple steps :)
+          currentTitle = row['title'].trim();
+          previousTitle = casesToCreate[casesToCreate.length - 1]?.title.trim();
+          if (casesToCreate.length > 0 && previousTitle === currentTitle) {
+            stepNo += 1;
+            stepsToCreate.push({
+              caseIndex: casesToCreate.length - 1,
+              stepNo: stepNo,
+              step: row['step'] || '',
+              result: row['expectedStepResult'] || '',
+            });
+          } else {
+            stepNo = 1;
+            casesToCreate.push({
+              folderId: folderId,
+              title: currentTitle,
+              description: row['description'] || '',
+              state: 0, // default state
+              priority: row['priority'] ? priorities.indexOf(row['priority']) : priorities.indexOf('medium'),
+              type: row['type'] ? testTypes.indexOf(row['type']) : testTypes.indexOf('other'),
+              preConditions: row['preConditions'],
+              expectedResults: row['expectedResults'],
+              automationStatus: row['automationStatus']
+                ? automationStatus.indexOf(row['automationStatus'])
+                : automationStatus.indexOf('automation-not-required'),
+              template: row['template'] ? templates.indexOf(row['template']) : templates.indexOf('text'),
+            });
+            stepsToCreate.push({
+              caseIndex: casesToCreate.length - 1,
+              stepNo: stepNo,
+              step: row['step'] || '',
+              result: row['expectedStepResult'] || '',
+            });
+          }
         }
 
-        const createdCases = await Case.bulkCreate(casesToCreate);
+        // 'Manually' create cases, steps and caseStep association.
+        const createdCases = await Case.bulkCreate(casesToCreate, { transaction: t });
+        for (const stepData of stepsToCreate) {
+          const createdCase = createdCases[stepData.caseIndex];
+          const createdStep = await Step.create(
+            {
+              step: stepData.step,
+              result: stepData.result,
+            },
+            { transaction: t }
+          );
+          await CaseStep.create(
+            {
+              caseId: createdCase.id,
+              stepId: createdStep.id,
+              stepNo: stepData.stepNo,
+            },
+            { transaction: t }
+          );
+        }
+
+        await t.commit();
         res.json(createdCases);
       } catch (error) {
+        await t.rollback();
         console.error(error);
-        res.status(500).send('Internal Server Error');
       }
     }
   );
 
   return router;
 }
+
+function _getRowValidationError(row, index) {
+  const requiredFields = ['title', 'priority', 'type', 'template'];
+  const rowNumber = index + 2;
+
+  for (const field of requiredFields) {
+    if (!row[field]) {
+      return `Row ${rowNumber} is missing required field: ${field}`;
+    }
+  }
+
+  // Validate priority if provided
+  if (row['priority']) {
+    const priorityIndex = priorities.indexOf(row['priority']?.toLowerCase());
+    if (priorityIndex === -1) {
+      return `Row ${rowNumber} has invalid priority: ${row['priority']}`;
+    }
+  }
+
+  // Validate type if provided
+  if (row['type']) {
+    const typeIndex = testTypes.indexOf(row['type']?.toLowerCase());
+    if (typeIndex === -1) {
+      return `Row ${rowNumber} has invalid type: ${row['type']}`;
+    }
+  }
+
+  // Validate automationStatus if provided
+  if (row['automationStatus']) {
+    const automationStatusIndex = automationStatus.indexOf(row['automationStatus']?.toLowerCase());
+    if (automationStatusIndex === -1) {
+      return `Row ${rowNumber} has invalid automationStatus: ${row['automationStatus']}`;
+    }
+  }
+
+  // Validate template if provided
+  if (row['template']) {
+    const templateIndex = templates.indexOf(row['template']?.toLowerCase());
+    if (templateIndex === -1) {
+      return `Row ${rowNumber} has invalid template: ${row['template']}`;
+    }
+  }
+
+  return null;
+}
diff --git a/frontend/public/template/unittcms-import-template-v1.1.xlsx b/frontend/public/template/unittcms-import-template-v1.1.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..ff6c70ee6107c7b2729c9fdc0c4cd3d220cb47af
GIT binary patch
literal 106490
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

literal 0
HcmV?d00001

diff --git a/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CaseImportDialog.tsx b/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CaseImportDialog.tsx
index 3a1167e..d771130 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CaseImportDialog.tsx
+++ b/frontend/src/app/[locale]/projects/[projectId]/folders/[folderId]/cases/CaseImportDialog.tsx
@@ -70,7 +70,7 @@ export default function CaseImportDialog({ isOpen, folderId, isDisabled, onImpor
           <div className="flex items-center justify-center w-full">
             <div className={`mt-1 text-neutral-500 dark:text-neutral-400 text-sm rounded`}>
               <div>{messages.importAvailable}</div>
-              <a href="/template/unittcms-import-template-v1.xlsx" download className="text-tiny underline">
+              <a href="/template/unittcms-import-template-v1.1.xlsx" download className="text-tiny underline">
                 {messages.downloadTemplate}
               </a>
             </div>

From 3badfb1cadd36c7da788f4d3f80b4e5222629e33 Mon Sep 17 00:00:00 2001
From: Matheus Santana <83383321+matheusfsantana@users.noreply.github.com>
Date: Sat, 29 Nov 2025 03:08:14 -0300
Subject: [PATCH 3/6] feat: add filters to run case endpoint (#353)

---
 backend/routes/cases/indexByProjectId.js | 28 ++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/backend/routes/cases/indexByProjectId.js b/backend/routes/cases/indexByProjectId.js
index c630441..d9badc7 100644
--- a/backend/routes/cases/indexByProjectId.js
+++ b/backend/routes/cases/indexByProjectId.js
@@ -1,6 +1,6 @@
 import express from 'express';
 const router = express.Router();
-import { DataTypes } from 'sequelize';
+import { DataTypes, Op } from 'sequelize';
 import defineProject from '../../models/projects.js';
 import defineFolder from '../../models/folders.js';
 import defineCase from '../../models/cases.js';
@@ -8,6 +8,7 @@ import defineTag from '../../models/tags.js';
 import defineRunCase from '../../models/runCases.js';
 import authMiddleware from '../../middleware/auth.js';
 import visibilityMiddleware from '../../middleware/verifyVisible.js';
+import { testRunCaseStatus } from '../../config/enums.js';
 
 export default function (sequelize) {
   const Project = defineProject(sequelize, DataTypes);
@@ -33,7 +34,7 @@ export default function (sequelize) {
     verifyProjectVisibleFromProjectId,
     verifyProjectVisibleFromRunId,
     async (req, res) => {
-      const { projectId, runId } = req.query;
+      const { projectId, runId, status, tag } = req.query;
 
       if (!projectId) {
         return res.status(400).json({ error: 'projectId is required' });
@@ -43,6 +44,23 @@ export default function (sequelize) {
         return res.status(400).json({ error: 'runId is required' });
       }
 
+      let errorMessage = null;
+      let statusFilter = undefined;
+      if (status) {
+        let statusIndex = testRunCaseStatus.indexOf(status.toLowerCase());
+        if (statusIndex === -1) {
+          errorMessage = `Invalid status filter: ${status}`;
+        } else {
+          statusFilter = { status: statusIndex };
+        }
+      }
+
+      let tagFilter = tag ? { name: tag } : undefined;
+
+      if (errorMessage) {
+        return res.status(400).json({ error: errorMessage });
+      }
+
       try {
         const cases = await Case.findAll({
           include: [
@@ -56,15 +74,17 @@ export default function (sequelize) {
             {
               model: RunCase,
               attributes: ['id', 'runId', 'status'],
-              required: false,
+              // Must be 'true' when filtering by status, otherwise all cases are returned.
+              required: statusFilter ? true : false,
               where: {
-                runId: runId,
+                [Op.and]: [{ runId: runId }, statusFilter],
               },
             },
             {
               model: Tags,
               attributes: ['id', 'name'],
               through: { attributes: [] },
+              ...(tagFilter ? { where: tagFilter } : {}),
             },
           ],
         });

From 805c1f50b6074f63b38d8ad8c567328dbdffd411 Mon Sep 17 00:00:00 2001
From: kimatata <117462761+kimatata@users.noreply.github.com>
Date: Sun, 7 Dec 2025 13:26:14 +0900
Subject: [PATCH 4/6] feat: Add filter on test run page (#358)

---
 backend/routes/cases/indexByProjectId.js      |  83 +++++---
 frontend/messages/en.json                     |  11 +-
 frontend/messages/ja.json                     |  11 +-
 frontend/messages/pt-BR.json                  |  11 +-
 .../runs/[runId]/RunCaseStatus.tsx            |  19 ++
 .../[projectId]/runs/[runId]/RunEditor.tsx    |  77 ++++++-
 .../runs/[runId]/TestCaseSelector.tsx         |  32 +--
 .../runs/[runId]/TestRunFilter.tsx            | 200 ++++++++++++++++++
 .../[projectId]/runs/[runId]/page.tsx         |   9 +
 .../projects/[projectId]/runs/runsControl.ts  |  27 ++-
 frontend/types/run.ts                         |   9 +
 11 files changed, 428 insertions(+), 61 deletions(-)
 create mode 100644 frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/RunCaseStatus.tsx
 create mode 100644 frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/TestRunFilter.tsx

diff --git a/backend/routes/cases/indexByProjectId.js b/backend/routes/cases/indexByProjectId.js
index d9badc7..216c027 100644
--- a/backend/routes/cases/indexByProjectId.js
+++ b/backend/routes/cases/indexByProjectId.js
@@ -8,7 +8,6 @@ import defineTag from '../../models/tags.js';
 import defineRunCase from '../../models/runCases.js';
 import authMiddleware from '../../middleware/auth.js';
 import visibilityMiddleware from '../../middleware/verifyVisible.js';
-import { testRunCaseStatus } from '../../config/enums.js';
 
 export default function (sequelize) {
   const Project = defineProject(sequelize, DataTypes);
@@ -34,7 +33,7 @@ export default function (sequelize) {
     verifyProjectVisibleFromProjectId,
     verifyProjectVisibleFromRunId,
     async (req, res) => {
-      const { projectId, runId, status, tag } = req.query;
+      const { projectId, runId, status, tag, search } = req.query;
 
       if (!projectId) {
         return res.status(400).json({ error: 'projectId is required' });
@@ -44,25 +43,62 @@ export default function (sequelize) {
         return res.status(400).json({ error: 'runId is required' });
       }
 
-      let errorMessage = null;
-      let statusFilter = undefined;
-      if (status) {
-        let statusIndex = testRunCaseStatus.indexOf(status.toLowerCase());
-        if (statusIndex === -1) {
-          errorMessage = `Invalid status filter: ${status}`;
-        } else {
-          statusFilter = { status: statusIndex };
-        }
-      }
-
-      let tagFilter = tag ? { name: tag } : undefined;
-
-      if (errorMessage) {
-        return res.status(400).json({ error: errorMessage });
-      }
-
       try {
+        // Build where clause for Case model
+        const caseWhereClause = {};
+
+        // Handle search parameter
+        if (search) {
+          const searchTerm = search.trim();
+
+          if (searchTerm.length > 100) {
+            return res.status(400).json({ error: 'too long search param' });
+          }
+
+          if (searchTerm.length >= 1) {
+            caseWhereClause[Op.or] = [
+              { title: { [Op.like]: `%${searchTerm}%` } },
+              { description: { [Op.like]: `%${searchTerm}%` } },
+            ];
+          }
+        }
+
+        // Handle status filter for RunCase
+        let statusFilter = undefined;
+        let runCaseRequired = false;
+        if (status) {
+          const statusValues = status
+            .split(',')
+            .map((t) => parseInt(t.trim(), 10))
+            .filter((t) => !isNaN(t));
+
+          if (statusValues.length > 0) {
+            statusFilter = { status: { [Op.in]: statusValues } };
+            runCaseRequired = true;
+          }
+        }
+
+        // Handle tag filter
+        const tagInclude = {
+          model: Tags,
+          attributes: ['id', 'name'],
+          through: { attributes: [] },
+        };
+
+        if (tag) {
+          const tagIds = tag
+            .split(',')
+            .map((t) => parseInt(t.trim(), 10))
+            .filter((t) => !isNaN(t));
+
+          if (tagIds.length > 0) {
+            tagInclude.where = { id: { [Op.in]: tagIds } };
+            tagInclude.required = true;
+          }
+        }
+
         const cases = await Case.findAll({
+          where: caseWhereClause,
           include: [
             {
               model: Folder,
@@ -75,17 +111,12 @@ export default function (sequelize) {
               model: RunCase,
               attributes: ['id', 'runId', 'status'],
               // Must be 'true' when filtering by status, otherwise all cases are returned.
-              required: statusFilter ? true : false,
+              required: runCaseRequired,
               where: {
                 [Op.and]: [{ runId: runId }, statusFilter],
               },
             },
-            {
-              model: Tags,
-              attributes: ['id', 'name'],
-              through: { attributes: [] },
-              ...(tagFilter ? { where: tagFilter } : {}),
-            },
+            tagInclude,
           ],
         });
         res.json(cases);
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index cb599d3..0419ca1 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -340,7 +340,16 @@
     "preconditions": "Preconditions",
     "expected_result": "Expected result",
     "details_of_the_step": "Details of the step",
-    "close": "Close"
+    "close": "Close",
+    "filter": "Filter",
+    "clear_all": "Clear all",
+    "apply": "Apply",
+    "select_status": "Select status",
+    "please_save": "Please save changes",
+    "case_title_or_description": "Test case title or description",
+    "selected": "Selected",
+    "tags": "Tags",
+    "select_tags": "Select tags"
   },
   "Members": {
     "member_management": "Member Management",
diff --git a/frontend/messages/ja.json b/frontend/messages/ja.json
index 8285ad3..d194d95 100644
--- a/frontend/messages/ja.json
+++ b/frontend/messages/ja.json
@@ -340,7 +340,16 @@
     "preconditions": "前提条件",
     "expected_result": "期待結果",
     "details_of_the_step": "ステップ詳細",
-    "close": "閉じる"
+    "close": "閉じる",
+    "filter": "フィルター",
+    "clear_all": "すべてクリア",
+    "apply": "適用",
+    "select_status": "ステータスを選択",
+    "please_save": "変更を保存してください",
+    "case_title_or_description": "テストケースのタイトルまたは説明",
+    "selected": "選択済み",
+    "tags": "タグ",
+    "select_tags": "タグを選択"
   },
   "Members": {
     "member_management": "メンバー管理",
diff --git a/frontend/messages/pt-BR.json b/frontend/messages/pt-BR.json
index da1dcf8..1d9133f 100644
--- a/frontend/messages/pt-BR.json
+++ b/frontend/messages/pt-BR.json
@@ -340,7 +340,16 @@
     "preconditions": "Pré-condições",
     "expected_result": "Resultado esperado",
     "details_of_the_step": "Detalhes do passo",
-    "close": "Fechar"
+    "close": "Fechar",
+    "filter": "Filtrar",
+    "clear_all": "Limpar tudo",
+    "apply": "Aplicar",
+    "select_status": "Selecionar status",
+    "please_save": "Por favor, salve as alterações",
+    "case_title_or_description": "Título ou descrição do caso de teste",
+    "selected": "Selecionado",
+    "tags": "Tags",
+    "select_tags": "Selecionar tags"
   },
   "Members": {
     "member_management": "Gerenciamento de Membros",
diff --git a/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/RunCaseStatus.tsx b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/RunCaseStatus.tsx
new file mode 100644
index 0000000..c49c003
--- /dev/null
+++ b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/RunCaseStatus.tsx
@@ -0,0 +1,19 @@
+import { Circle, CircleCheck, CircleDashed, CircleX, CircleSlash2 } from 'lucide-react';
+
+type Props = {
+  uid: string;
+};
+
+export default function RunCaseStatus({ uid }: Props) {
+  if (uid === 'untested') {
+    return <Circle size={16} color="#d4d4d8" />;
+  } else if (uid === 'passed') {
+    return <CircleCheck size={16} color="#17c964" />;
+  } else if (uid === 'retest') {
+    return <CircleDashed size={16} color="#f5a524" />;
+  } else if (uid === 'failed') {
+    return <CircleX size={16} color="#f31260" />;
+  } else if (uid === 'skipped') {
+    return <CircleSlash2 size={16} color="#52525b" />;
+  }
+}
diff --git a/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/RunEditor.tsx b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/RunEditor.tsx
index 1a291a8..09da940 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/RunEditor.tsx
+++ b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/RunEditor.tsx
@@ -15,6 +15,9 @@ import {
   DropdownItem,
   addToast,
   Badge,
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
 } from '@heroui/react';
 import {
   Save,
@@ -29,6 +32,7 @@ import {
   FileJson,
   ChevronRight,
   Folder,
+  Filter,
 } from 'lucide-react';
 import { useTheme } from 'next-themes';
 import { NodeApi, Tree } from 'react-arborist';
@@ -44,6 +48,7 @@ import {
 import { fetchFolders } from '../../folders/foldersControl';
 import RunProgressChart from './RunPregressDonutChart';
 import TestCaseSelector from './TestCaseSelector';
+import TestRunFilter from './TestRunFilter';
 import { useRouter } from '@/src/i18n/routing';
 import { testRunStatus } from '@/config/selection';
 import { RunType, RunStatusCountType, RunMessages } from '@/types/run';
@@ -102,6 +107,9 @@ export default function RunEditor({
   const [isNameInvalid] = useState<boolean>(false);
   const [isUpdating, setIsUpdating] = useState<boolean>(false);
   const [isDirty, setIsDirty] = useState(false);
+  const [searchFilter, setSearchFilter] = useState('');
+  const [statusFilter, setStatusFilter] = useState<number[]>([]);
+  const [tagFilter, setTagFilter] = useState<number[]>([]);
   const router = useRouter();
   useFormGuard(isDirty, messages.areYouSureLeave);
 
@@ -111,8 +119,15 @@ export default function RunEditor({
     setRunStatusCounts(statusCounts);
   };
 
-  const initTestCases = async () => {
-    const casesData = await fetchProjectCases(tokenContext.token.access_token, Number(projectId), Number(runId));
+  const initTestCases = async (search?: string, status?: string[], tag?: string[]) => {
+    const casesData = await fetchProjectCases(
+      tokenContext.token.access_token,
+      Number(projectId),
+      Number(runId),
+      search,
+      status,
+      tag
+    );
     casesData.forEach((testCase: CaseType) => {
       if (testCase.RunCases && testCase.RunCases.length > 0) {
         testCase.RunCases[0].editState = 'notChanged';
@@ -200,6 +215,29 @@ export default function RunEditor({
     setIsDirty(false);
   };
 
+  // **************************************************************************
+  // Filter
+  // **************************************************************************
+  const [showFilter, setShowFilter] = useState(false);
+  const [activeFilterNum, setActiveFilterNum] = useState(0);
+
+  const onFilterChange = async (search: string, status: number[], tag: number[]) => {
+    if (isDirty) {
+      addToast({
+        title: 'Error',
+        color: 'danger',
+        description: messages.pleaseSave,
+      });
+      return;
+    }
+
+    setSearchFilter(search);
+    setStatusFilter(status);
+    setTagFilter(tag);
+    setActiveFilterNum((search ? 1 : 0) + (status.length > 0 ? 1 : 0) + (tag.length > 0 ? 1 : 0));
+    await initTestCases(search, status.map(String), tag.map(String));
+  };
+
   return (
     <>
       <div className="border-b-1 dark:border-neutral-700 w-full p-3 flex items-center justify-between">
@@ -217,6 +255,41 @@ export default function RunEditor({
           <h3 className="font-bold ms-2">{testRun.name}</h3>
         </div>
         <div className="flex items-center">
+          <Popover placement="bottom" isOpen={showFilter} onOpenChange={(open) => setShowFilter(open)}>
+            <Badge
+              color="danger"
+              content={activeFilterNum}
+              isInvisible={activeFilterNum === 0}
+              shape="circle"
+              placement="top-left"
+            >
+              <PopoverTrigger>
+                <Button
+                  startContent={<Filter size={16} />}
+                  endContent={<ChevronDown size={16} />}
+                  size="sm"
+                  variant="bordered"
+                  className="me-2"
+                >
+                  {messages.filter}
+                </Button>
+              </PopoverTrigger>
+            </Badge>
+            <PopoverContent>
+              <TestRunFilter
+                messages={messages}
+                testRunCaseStatusMessages={testRunCaseStatusMessages}
+                activeSearchFilter={searchFilter}
+                activeStatusFilters={statusFilter}
+                activeTagFilters={tagFilter}
+                projectId={projectId}
+                onFilterChange={(newTitleFilter, newStatusFilters, newTagFilters) => {
+                  setShowFilter(false);
+                  onFilterChange(newTitleFilter, newStatusFilters, newTagFilters);
+                }}
+              />
+            </PopoverContent>
+          </Popover>
           <Dropdown placement="bottom-end">
             <DropdownTrigger>
               <Button
diff --git a/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/TestCaseSelector.tsx b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/TestCaseSelector.tsx
index 69b236c..42b81b7 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/TestCaseSelector.tsx
+++ b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/TestCaseSelector.tsx
@@ -14,19 +14,9 @@ import {
   Selection,
   SortDescriptor,
 } from '@heroui/react';
-import {
-  ChevronDown,
-  MoveDiagonal,
-  MoreVertical,
-  CopyPlus,
-  CopyMinus,
-  Circle,
-  CircleCheck,
-  CircleDashed,
-  CircleX,
-  CircleSlash2,
-} from 'lucide-react';
+import { ChevronDown, MoveDiagonal, MoreVertical, CopyPlus, CopyMinus } from 'lucide-react';
 import TestCaseDetailDialog from './TestCaseDetailDialog';
+import RunCaseStatus from './RunCaseStatus';
 import { testRunCaseStatus } from '@/config/selection';
 import { CaseType } from '@/types/case';
 import { RunMessages } from '@/types/run';
@@ -103,20 +93,6 @@ export default function TestCaseSelector({
 
   const notIncludedCaseClass = 'text-neutral-200 dark:text-neutral-600';
 
-  const renderStatusIcon = (uid: string) => {
-    if (uid === 'untested') {
-      return <Circle size={16} color="#d4d4d8" />;
-    } else if (uid === 'passed') {
-      return <CircleCheck size={16} color="#17c964" />;
-    } else if (uid === 'retest') {
-      return <CircleDashed size={16} color="#f5a524" />;
-    } else if (uid === 'failed') {
-      return <CircleX size={16} color="#f31260" />;
-    } else if (uid === 'skipped') {
-      return <CircleSlash2 size={16} color="#52525b" />;
-    }
-  };
-
   const isCaseIncluded = (testCase: CaseType) => {
     let isIncluded = false;
     if (testCase.RunCases && testCase.RunCases.length > 0) {
@@ -161,7 +137,7 @@ export default function TestCaseSelector({
                 size="sm"
                 variant="light"
                 isDisabled={!isIncluded}
-                startContent={isIncluded && renderStatusIcon(testRunCaseStatus[runStatus].uid)}
+                startContent={isIncluded && <RunCaseStatus uid={testRunCaseStatus[runStatus].uid} />}
                 endContent={isIncluded && <ChevronDown size={16} />}
               >
                 <span className="w-12">
@@ -173,7 +149,7 @@ export default function TestCaseSelector({
               {testRunCaseStatus.map((runCaseStatus, index) => (
                 <DropdownItem
                   key={runCaseStatus.uid}
-                  startContent={renderStatusIcon(runCaseStatus.uid)}
+                  startContent={<RunCaseStatus uid={runCaseStatus.uid} />}
                   onPress={() => onChangeStatus(testCase.id, index)}
                 >
                   {testRunCaseStatusMessages[runCaseStatus.uid]}
diff --git a/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/TestRunFilter.tsx b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/TestRunFilter.tsx
new file mode 100644
index 0000000..73ebb6a
--- /dev/null
+++ b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/TestRunFilter.tsx
@@ -0,0 +1,200 @@
+import { useState, useEffect, useContext } from 'react';
+import {
+  Button,
+  Dropdown,
+  DropdownTrigger,
+  DropdownMenu,
+  DropdownItem,
+  Selection,
+  Input,
+  addToast,
+} from '@heroui/react';
+import { SearchIcon, ChevronDown } from 'lucide-react';
+import RunCaseStatus from './RunCaseStatus';
+import { RunMessages } from '@/types/run';
+import { testRunCaseStatus } from '@/config/selection';
+import { TagType } from '@/types/tag';
+import { fetchTags } from '@/utils/tagsControls';
+import { TokenContext } from '@/utils/TokenProvider';
+import { logError } from '@/utils/errorHandler';
+import { TestRunCaseStatusMessages } from '@/types/status';
+
+type TestRunFilterProps = {
+  messages: RunMessages;
+  testRunCaseStatusMessages: TestRunCaseStatusMessages;
+  projectId: string;
+  activeSearchFilter: string;
+  activeStatusFilters: number[];
+  activeTagFilters: number[];
+  onFilterChange: (search: string, statusIndices: number[], tagIds: number[]) => void;
+};
+
+type Tag = Pick<TagType, 'id' | 'name'>;
+
+export default function TestRunFilter({
+  messages,
+  testRunCaseStatusMessages,
+  onFilterChange,
+  projectId,
+  activeSearchFilter = '',
+  activeStatusFilters = [],
+  activeTagFilters = [],
+}: TestRunFilterProps) {
+  const tokenContext = useContext(TokenContext);
+  const [search, setSearch] = useState<string>('');
+  const [selectedStatuses, setSelectedStatuses] = useState<Selection>(new Set([]));
+  const [selectedTags, setSelectedTags] = useState<Selection>(new Set([]));
+  const [tags, setTags] = useState<Tag[]>([]);
+
+  useEffect(() => {
+    const fetchDataEffect = async () => {
+      try {
+        const tagsResponse = (await fetchTags(tokenContext.token.access_token, projectId)) || [];
+        setTags(tagsResponse);
+      } catch (error) {
+        logError('Error fetching case tags', error);
+        addToast({ title: 'Error', description: 'Error fetching tags', color: 'danger' });
+      }
+    };
+    fetchDataEffect();
+  }, [projectId, tokenContext.token.access_token]);
+
+  useEffect(() => {
+    setSearch(activeSearchFilter || '');
+  }, [activeSearchFilter]);
+
+  useEffect(() => {
+    if (activeStatusFilters && activeStatusFilters.length > 0) {
+      const activeKeys = activeStatusFilters.map((index) => testRunCaseStatus[index]?.uid).filter((uid) => !!uid);
+      setSelectedStatuses(new Set(activeKeys as Iterable<string>));
+    } else {
+      setSelectedStatuses(new Set([]));
+    }
+  }, [activeStatusFilters]);
+
+  useEffect(() => {
+    if (activeTagFilters && activeTagFilters.length > 0) {
+      const activeKeys = activeTagFilters.map((id) => id.toString());
+      setSelectedTags(new Set(activeKeys));
+    } else {
+      setSelectedTags(new Set([]));
+    }
+  }, [activeTagFilters]);
+
+  const handleStatusSelectionChange = (keys: Selection) => {
+    setSelectedStatuses(keys);
+  };
+
+  const handleApplyFilter = () => {
+    let statusIndices: number[] = [];
+    if (selectedStatuses !== 'all' && selectedStatuses.size > 0) {
+      statusIndices = Array.from(selectedStatuses)
+        .map((key) => testRunCaseStatus.findIndex((status) => status.uid === key))
+        .filter((index) => index !== -1);
+    }
+
+    let tagIds: number[] = [];
+    if (selectedTags !== 'all' && selectedTags.size > 0) {
+      tagIds = Array.from(selectedTags)
+        .map((key) => parseInt(key as string))
+        .filter((id) => !isNaN(id));
+    }
+
+    onFilterChange(search, statusIndices, tagIds);
+  };
+
+  const handleClearFilter = () => {
+    setSearch('');
+    setSelectedStatuses(new Set([]));
+    setSelectedTags(new Set([]));
+    onFilterChange('', [], []);
+  };
+
+  return (
+    <div className="p-3">
+      <div className="mb-3 space-y-1">
+        <h3 className="text-default-500 text-small">{messages.caseTitleOrDescription}</h3>
+        <Input
+          variant="bordered"
+          classNames={{
+            base: 'max-w-full h-8',
+            mainWrapper: 'h-full',
+            input: 'text-small',
+          }}
+          size="sm"
+          startContent={<SearchIcon size={18} />}
+          type="search"
+          value={search}
+          onValueChange={setSearch}
+          maxLength={100}
+        />
+      </div>
+      <div className="mb-3 flex justify-between gap-2">
+        <div className="flex-col space-y-1">
+          <h3 className="text-default-500 text-small">{messages.status}</h3>
+          <Dropdown>
+            <DropdownTrigger>
+              <Button size="sm" variant="bordered" className="w-32" endContent={<ChevronDown size={16} />}>
+                {selectedStatuses === 'all' || selectedStatuses.size === 0
+                  ? messages.selectStatus
+                  : `${selectedStatuses.size} ${messages.selected}`}
+              </Button>
+            </DropdownTrigger>
+            <DropdownMenu
+              aria-label="Status filter"
+              selectionMode="multiple"
+              selectedKeys={selectedStatuses}
+              onSelectionChange={handleStatusSelectionChange}
+            >
+              {testRunCaseStatus.map((status) => (
+                <DropdownItem
+                  key={status.uid}
+                  textValue={testRunCaseStatusMessages[status.uid]}
+                  startContent={<RunCaseStatus uid={status.uid} />}
+                  className="flex items-center"
+                >
+                  {testRunCaseStatusMessages[status.uid]}
+                </DropdownItem>
+              ))}
+            </DropdownMenu>
+          </Dropdown>
+        </div>
+
+        <div className="flex-col space-y-1">
+          <h3 className="text-default-500 text-small">{messages.tags}</h3>
+          <Dropdown>
+            <DropdownTrigger>
+              <Button size="sm" variant="bordered" className="w-32" endContent={<ChevronDown size={16} />}>
+                {selectedTags === 'all' || selectedTags.size === 0
+                  ? messages.selectTags
+                  : `${selectedTags.size} ${messages.selected}`}
+              </Button>
+            </DropdownTrigger>
+            <DropdownMenu
+              className="max-h-[50vh] overflow-y-auto"
+              aria-label="Tag filter"
+              selectionMode="multiple"
+              selectedKeys={selectedTags}
+              onSelectionChange={setSelectedTags}
+            >
+              {tags.map((tag) => (
+                <DropdownItem key={tag.id.toString()} textValue={tag.name}>
+                  <span className="text-sm">{tag.name}</span>
+                </DropdownItem>
+              ))}
+            </DropdownMenu>
+          </Dropdown>
+        </div>
+      </div>
+
+      <div className="flex justify-end">
+        <Button className="me-2" size="sm" variant="light" onPress={handleClearFilter}>
+          {messages.clearAll}
+        </Button>
+        <Button size="sm" variant="solid" color="primary" onPress={handleApplyFilter}>
+          {messages.apply}
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/page.tsx b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/page.tsx
index 9bbeee9..f9626a9 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/page.tsx
+++ b/frontend/src/app/[locale]/projects/[projectId]/runs/[runId]/page.tsx
@@ -35,6 +35,15 @@ export default function Page({ params }: { params: { projectId: string; runId: s
     expectedResult: t('expected_result'),
     detailsOfTheStep: t('details_of_the_step'),
     close: t('close'),
+    filter: t('filter'),
+    clearAll: t('clear_all'),
+    apply: t('apply'),
+    selectStatus: t('select_status'),
+    pleaseSave: t('please_save'),
+    caseTitleOrDescription: t('case_title_or_description'),
+    selected: t('selected'),
+    tags: t('tags'),
+    selectTags: t('select_tags'),
   };
 
   const rst = useTranslations('RunStatus');
diff --git a/frontend/src/app/[locale]/projects/[projectId]/runs/runsControl.ts b/frontend/src/app/[locale]/projects/[projectId]/runs/runsControl.ts
index dd1c2ee..0a30414 100644
--- a/frontend/src/app/[locale]/projects/[projectId]/runs/runsControl.ts
+++ b/frontend/src/app/[locale]/projects/[projectId]/runs/runsControl.ts
@@ -315,8 +315,31 @@ async function updateRunCases(jwt: string, runId: number, testCases: CaseType[])
   }
 }
 
-async function fetchProjectCases(jwt: string, projectId: number, runId: number) {
-  const url = `${apiServer}/cases/byproject?projectId=${projectId}&runId=${runId}`;
+async function fetchProjectCases(
+  jwt: string,
+  projectId: number,
+  runId: number,
+  search?: string,
+  status?: string[],
+  tag?: string[]
+) {
+  const queryParams = [`projectId=${projectId}&runId=${runId}`];
+
+  if (search) {
+    queryParams.push(`search=${search}`);
+  }
+
+  if (status && status.length > 0) {
+    queryParams.push(`status=${status.join(',')}`);
+  }
+
+  if (tag && tag.length > 0) {
+    queryParams.push(`tag=${tag.join(',')}`);
+  }
+
+  const query = `?${queryParams.join('&')}`;
+
+  const url = `${apiServer}/cases/byproject${query}`;
 
   try {
     const response = await fetch(url, {
diff --git a/frontend/types/run.ts b/frontend/types/run.ts
index c696fe3..2680c75 100644
--- a/frontend/types/run.ts
+++ b/frontend/types/run.ts
@@ -80,6 +80,15 @@ type RunMessages = {
   expectedResult: string;
   detailsOfTheStep: string;
   close: string;
+  filter: string;
+  clearAll: string;
+  apply: string;
+  selectStatus: string;
+  pleaseSave: string;
+  caseTitleOrDescription: string;
+  selected: string;
+  tags: string;
+  selectTags: string;
 };
 
 export type { RunType, RunCaseType, RunStatusCountType, ProgressSeriesType, RunsMessages, RunMessages };

From 2adb24dbaabdd25baf38a57228bc923af2aac134 Mon Sep 17 00:00:00 2001
From: kimatata <117462761+kimatata@users.noreply.github.com>
Date: Sun, 7 Dec 2025 20:37:38 +0900
Subject: [PATCH 5/6] feat: password reset by admin (#360)

---
 backend/routes/users/adminResetPassword.js    | 42 ++++++++++
 backend/server.js                             |  2 +
 frontend/messages/en.json                     |  6 +-
 frontend/messages/ja.json                     |  6 +-
 frontend/messages/pt-BR.json                  |  6 +-
 frontend/src/app/[locale]/admin/AdminPage.tsx | 42 +++++++++-
 .../[locale]/admin/PasswordResetDialog.tsx    | 76 +++++++++++++++++++
 .../src/app/[locale]/admin/UsersTable.tsx     | 24 +++++-
 frontend/src/app/[locale]/admin/page.tsx      |  4 +
 frontend/types/user.ts                        |  4 +
 frontend/utils/usersControl.ts                | 41 +++++++++-
 11 files changed, 244 insertions(+), 9 deletions(-)
 create mode 100644 backend/routes/users/adminResetPassword.js
 create mode 100644 frontend/src/app/[locale]/admin/PasswordResetDialog.tsx

diff --git a/backend/routes/users/adminResetPassword.js b/backend/routes/users/adminResetPassword.js
new file mode 100644
index 0000000..e2d9370
--- /dev/null
+++ b/backend/routes/users/adminResetPassword.js
@@ -0,0 +1,42 @@
+import express from 'express';
+import bcrypt from 'bcrypt';
+import { DataTypes } from 'sequelize';
+import defineUser from '../../models/users.js';
+import authMiddleware from '../../middleware/auth.js';
+const router = express.Router();
+
+export default function (sequelize) {
+  const { verifySignedIn, verifyAdmin } = authMiddleware(sequelize);
+  const User = defineUser(sequelize, DataTypes);
+
+  // Admin resets another user's password
+  router.put('/:id/password', verifySignedIn, verifyAdmin, async (req, res) => {
+    try {
+      const { id } = req.params;
+      const { newPassword } = req.body;
+
+      if (!newPassword) {
+        return res.status(400).send('New password is required');
+      }
+
+      if (newPassword.length < 8) {
+        return res.status(400).send('New password must be at least 8 characters');
+      }
+
+      const user = await User.findByPk(id);
+      if (!user) {
+        return res.status(404).send('User not found');
+      }
+
+      const hashedPassword = await bcrypt.hash(newPassword, 10);
+      await user.update({ password: hashedPassword });
+
+      return res.json({ user: { id: user.id } });
+    } catch (error) {
+      console.error(error);
+      return res.status(500).send('Internal Server Error');
+    }
+  });
+
+  return router;
+}
diff --git a/backend/server.js b/backend/server.js
index db432b8..52bc492 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -52,6 +52,7 @@ import usersFindRoute from './routes/users/find.js';
 import usersSearchRoute from './routes/users/search.js';
 import usersUpdateUsernameRoute from './routes/users/updateUsername.js';
 import usersUpdatePasswordRoute from './routes/users/updatePassword.js';
+import usersAdminResetPasswordRoute from './routes/users/adminResetPassword.js';
 import usersUpdateAvatarRoute from './routes/users/updateAvatar.js';
 import usersUpdateRoleRoute from './routes/users/updateRole.js';
 import signUpRoute from './routes/users/signup.js';
@@ -61,6 +62,7 @@ app.use('/users', usersFindRoute(sequelize));
 app.use('/users', usersSearchRoute(sequelize));
 app.use('/users', usersUpdateUsernameRoute(sequelize));
 app.use('/users', usersUpdatePasswordRoute(sequelize));
+app.use('/users', usersAdminResetPasswordRoute(sequelize));
 app.use('/users', usersUpdateAvatarRoute(sequelize));
 app.use('/users', usersUpdateRoleRoute(sequelize));
 app.use('/users', signUpRoute(sequelize));
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 0419ca1..83c5ee4 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -159,7 +159,11 @@
     "quit_confirm": "If you relinquish your administrator privileges, you will no longer be able to access the administration page.",
     "role_changed": "Role changed",
     "lost_admin_auth": "Lost admin authority",
-    "at_least": "At least one administrator is required"
+    "at_least": "At least one administrator is required",
+    "reset_password": "Reset password",
+    "reset": "Reset",
+    "invalid_password": "Password must be at least 8 characters",
+    "password_not_match": "Pasword does not match"
   },
   "Projects": {
     "project_list": "Project List",
diff --git a/frontend/messages/ja.json b/frontend/messages/ja.json
index d194d95..9827ae1 100644
--- a/frontend/messages/ja.json
+++ b/frontend/messages/ja.json
@@ -159,7 +159,11 @@
     "quit_confirm": "管理者権限を放棄すると管理ページにアクセスできなくなります。",
     "role_changed": "ロールを更新しました",
     "lost_admin_auth": "管理者権限を失いました",
-    "at_least": "最低1人以上の管理者が必要です。"
+    "at_least": "最低1人以上の管理者が必要です。",
+    "reset_password": "パスワードをリセット",
+    "reset": "リセット",
+    "invalid_password": "パスワードは8文字以上である必要があります",
+    "password_not_match": "パスワードが一致しません"
   },
   "Projects": {
     "project_list": "プロジェクト一覧",
diff --git a/frontend/messages/pt-BR.json b/frontend/messages/pt-BR.json
index 1d9133f..f372406 100644
--- a/frontend/messages/pt-BR.json
+++ b/frontend/messages/pt-BR.json
@@ -159,7 +159,11 @@
     "quit_confirm": "Se você renunciar aos seus privilégios de administrador, não poderá mais acessar a página de administração.",
     "role_changed": "Função alterada",
     "lost_admin_auth": "Perdeu a autoridade de administrador",
-    "at_least": "É necessário pelo menos um administrador"
+    "at_least": "É necessário pelo menos um administrador",
+    "reset_password": "Redefinir senha",
+    "reset": "Redefinir",
+    "invalid_password": "A senha deve ter pelo menos 8 caracteres",
+    "password_not_match": "A senha não corresponde"
   },
   "Projects": {
     "project_list": "Lista de Projetos",
diff --git a/frontend/src/app/[locale]/admin/AdminPage.tsx b/frontend/src/app/[locale]/admin/AdminPage.tsx
index 37f8303..1946e84 100644
--- a/frontend/src/app/[locale]/admin/AdminPage.tsx
+++ b/frontend/src/app/[locale]/admin/AdminPage.tsx
@@ -2,14 +2,15 @@
 import { useState, useEffect, useContext } from 'react';
 import { Button, addToast } from '@heroui/react';
 import UsersTable from './UsersTable';
+import PasswordResetDialog from './PasswordResetDialog';
+import DeleteConfirmDialog from '@/components/DeleteConfirmDialog';
 import { UserType, AdminMessages } from '@/types/user';
 import { TokenContext } from '@/utils/TokenProvider';
 import { useRouter } from '@/src/i18n/routing';
 import Config from '@/config/config';
 import { LocaleCodeType } from '@/types/locale';
-import { updateUserRole } from '@/utils/usersControl';
+import { updateUserRole, adminResetPassword } from '@/utils/usersControl';
 import { roles } from '@/config/selection';
-import DeleteConfirmDialog from '@/components/DeleteConfirmDialog';
 import { logError } from '@/utils/errorHandler';
 const apiServer = Config.apiServer;
 
@@ -123,6 +124,28 @@ export default function AdminPage({ messages, locale }: Props) {
     }
   };
 
+  // Reset password dialog state
+  const [isResetDialogOpen, setIsResetDialogOpen] = useState(false);
+  const [resetTarget, setResetTarget] = useState<UserType | null>(null);
+
+  const openResetDialog = (user: UserType) => {
+    setResetTarget(user);
+    setIsResetDialogOpen(true);
+  };
+
+  const onReset = async (newPassword: string) => {
+    setIsResetDialogOpen(false);
+    if (!resetTarget || !resetTarget.id) return;
+
+    try {
+      await adminResetPassword(tokenContext.token.access_token, resetTarget.id, newPassword);
+      addToast({ title: 'Success', color: 'success', description: 'Password updated' });
+      setResetTarget(null);
+    } catch (error: unknown) {
+      logError('Failed to reset password', error);
+    }
+  };
+
   return (
     <>
       <div className="container mx-auto max-w-3xl pt-16 px-6 flex-grow">
@@ -130,7 +153,13 @@ export default function AdminPage({ messages, locale }: Props) {
           <h3 className="font-bold">{messages.userManagement}</h3>
         </div>
 
-        <UsersTable users={users} myself={myself} onChangeRole={handleChangeRole} messages={messages} />
+        <UsersTable
+          users={users}
+          myself={myself}
+          onChangeRole={handleChangeRole}
+          openResetDialog={openResetDialog}
+          messages={messages}
+        />
         <Button className="mt-4" color="danger" variant="bordered" onPress={() => setIsConfirmDialogOpen(true)}>
           {messages.quitAdmin}
         </Button>
@@ -144,6 +173,13 @@ export default function AdminPage({ messages, locale }: Props) {
         confirmText={messages.quitConfirm}
         deleteText={messages.quit}
       />
+
+      <PasswordResetDialog
+        isOpen={isResetDialogOpen}
+        onCancel={() => setIsResetDialogOpen(false)}
+        onReset={onReset}
+        messages={messages}
+      />
     </>
   );
 }
diff --git a/frontend/src/app/[locale]/admin/PasswordResetDialog.tsx b/frontend/src/app/[locale]/admin/PasswordResetDialog.tsx
new file mode 100644
index 0000000..c317e2c
--- /dev/null
+++ b/frontend/src/app/[locale]/admin/PasswordResetDialog.tsx
@@ -0,0 +1,76 @@
+import { Button, Modal, ModalContent, ModalHeader, ModalBody, ModalFooter, Input } from '@heroui/react';
+import { useState } from 'react';
+import { isValidPassword } from '../account/validate';
+import { AdminMessages } from '@/types/user';
+
+type Props = {
+  isOpen: boolean;
+  onCancel: () => void;
+  onReset: (newPassword: string) => void;
+  messages: AdminMessages;
+};
+
+export default function PasswordResetDialog({ isOpen, onCancel, onReset, messages }: Props) {
+  const [newPassword, setNewPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [errorMessage, setErrorMessage] = useState('');
+
+  const validate = async () => {
+    if (newPassword !== confirmPassword) {
+      setErrorMessage(messages.passwordNotMatch);
+      return;
+    }
+
+    if (!isValidPassword(newPassword)) {
+      setErrorMessage(messages.invalidPassword);
+      return;
+    }
+
+    onReset(newPassword);
+  };
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onOpenChange={() => {
+        onCancel();
+      }}
+    >
+      <ModalContent>
+        <ModalHeader className="flex flex-col gap-1">{messages.resetPassword}</ModalHeader>
+        <ModalBody>
+          <div className="space-y-3">
+            <form>
+              {errorMessage && <div className="my-3 text-danger">{errorMessage}</div>}
+              <Input
+                size="sm"
+                type="password"
+                label="New Password"
+                value={newPassword}
+                onChange={(e) => setNewPassword(e.target.value)}
+                autoComplete="new-password"
+              />
+              <Input
+                size="sm"
+                type="password"
+                label="Confirm New Password"
+                value={confirmPassword}
+                onChange={(e) => setConfirmPassword(e.target.value)}
+                autoComplete="new-password"
+                className="mt-3"
+              />
+            </form>
+          </div>
+        </ModalBody>
+        <ModalFooter>
+          <Button variant="light" onPress={onCancel}>
+            {messages.close}
+          </Button>
+          <Button color="danger" onPress={validate}>
+            {messages.reset}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+}
diff --git a/frontend/src/app/[locale]/admin/UsersTable.tsx b/frontend/src/app/[locale]/admin/UsersTable.tsx
index ea90486..11f2f88 100644
--- a/frontend/src/app/[locale]/admin/UsersTable.tsx
+++ b/frontend/src/app/[locale]/admin/UsersTable.tsx
@@ -13,7 +13,7 @@ import {
   DropdownMenu,
   DropdownItem,
 } from '@heroui/react';
-import { ChevronDown } from 'lucide-react';
+import { ChevronDown, MoreVertical } from 'lucide-react';
 import { UserType, AdminMessages } from '@/types/user';
 import { roles } from '@/config/selection';
 import UserAvatar from '@/components/UserAvatar';
@@ -22,16 +22,18 @@ type Props = {
   users: UserType[];
   myself: UserType | null;
   onChangeRole: (userEdit: UserType, role: number) => void;
+  openResetDialog: (user: UserType) => void;
   messages: AdminMessages;
 };
 
-export default function UsersTable({ users, myself, onChangeRole, messages }: Props) {
+export default function UsersTable({ users, myself, onChangeRole, openResetDialog, messages }: Props) {
   const headerColumns = [
     { name: messages.avatar, uid: 'avatar', sortable: false },
     { name: messages.id, uid: 'id', sortable: true },
     { name: messages.email, uid: 'email', sortable: true },
     { name: messages.username, uid: 'username', sortable: true },
     { name: messages.role, uid: 'role', sortable: true },
+    { name: '', uid: 'actions', sortable: false },
   ];
 
   const [sortDescriptor, setSortDescriptor] = useState<SortDescriptor>({
@@ -92,6 +94,24 @@ export default function UsersTable({ users, myself, onChangeRole, messages }: Pr
           </Dropdown>
         );
 
+      case 'actions':
+        return (
+          !isMyself(myself, user) && (
+            <Dropdown>
+              <DropdownTrigger>
+                <Button isIconOnly size="sm" className="bg-transparent rounded-full">
+                  <MoreVertical size={16} />
+                </Button>
+              </DropdownTrigger>
+              <DropdownMenu aria-label="Static Actions">
+                <DropdownItem key="edit" onPress={() => openResetDialog(user)}>
+                  {messages.resetPassword}
+                </DropdownItem>
+              </DropdownMenu>
+            </Dropdown>
+          )
+        );
+
       default:
         return cellValue;
     }
diff --git a/frontend/src/app/[locale]/admin/page.tsx b/frontend/src/app/[locale]/admin/page.tsx
index b47bf46..f71ac06 100644
--- a/frontend/src/app/[locale]/admin/page.tsx
+++ b/frontend/src/app/[locale]/admin/page.tsx
@@ -32,6 +32,10 @@ export default function Page({ params }: PageType) {
     roleChanged: t('role_changed'),
     lostAdminAuth: t('lost_admin_auth'),
     atLeast: t('at_least'),
+    resetPassword: t('reset_password'),
+    reset: t('reset'),
+    invalidPassword: t('invalid_password'),
+    passwordNotMatch: t('password_not_match'),
   };
 
   return (
diff --git a/frontend/types/user.ts b/frontend/types/user.ts
index 993b4b3..cc3e204 100644
--- a/frontend/types/user.ts
+++ b/frontend/types/user.ts
@@ -84,6 +84,10 @@ export type AdminMessages = {
   roleChanged: string;
   lostAdminAuth: string;
   atLeast: string;
+  resetPassword: string;
+  reset: string;
+  invalidPassword: string;
+  passwordNotMatch: string;
 };
 
 export type AccountDropDownMessages = {
diff --git a/frontend/utils/usersControl.ts b/frontend/utils/usersControl.ts
index cc5836c..211e69f 100644
--- a/frontend/utils/usersControl.ts
+++ b/frontend/utils/usersControl.ts
@@ -189,4 +189,43 @@ async function deleteAvatar(jwt: string) {
   }
 }
 
-export { findUser, searchUsers, updateUserRole, updateUsername, updatePassword, uploadAvatar, deleteAvatar };
+async function adminResetPassword(jwt: string, userId: number, newPassword: string) {
+  const updateData = {
+    newPassword,
+  };
+
+  const fetchOptions = {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${jwt}`,
+    },
+    body: JSON.stringify(updateData),
+  };
+
+  const url = `${apiServer}/users/${userId}/password`;
+
+  try {
+    const response = await fetch(url, fetchOptions);
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(errorText || `HTTP error! Status: ${response.status}`);
+    }
+    const data = await response.json();
+    return data;
+  } catch (error: unknown) {
+    logError('Error admin resetting password:', error);
+    throw error;
+  }
+}
+
+export {
+  findUser,
+  searchUsers,
+  updateUserRole,
+  updateUsername,
+  updatePassword,
+  uploadAvatar,
+  deleteAvatar,
+  adminResetPassword,
+};

From 8eecbce3c2ff6f752f5c7f6fdbcb3e0fa9e82ce6 Mon Sep 17 00:00:00 2001
From: kimatata <117462761+kimatata@users.noreply.github.com>
Date: Sun, 7 Dec 2025 20:39:07 +0900
Subject: [PATCH 6/6] chore: update version (#361)

---
 frontend/src/app/[locale]/health/HealthPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/[locale]/health/HealthPage.tsx b/frontend/src/app/[locale]/health/HealthPage.tsx
index cecebd5..2f8aa63 100644
--- a/frontend/src/app/[locale]/health/HealthPage.tsx
+++ b/frontend/src/app/[locale]/health/HealthPage.tsx
@@ -62,7 +62,7 @@ export default function HealthPage({ messages, locale }: Props) {
           <TableBody>
             <TableRow key="1">
               <TableCell>{messages.unittcms_version}</TableCell>
-              <TableCell>1.0.0-beta.24</TableCell>
+              <TableCell>1.0.0-beta.25</TableCell>
             </TableRow>
             <TableRow key="2">
               <TableCell>{messages.api_server}</TableCell>