refactor: test run status messages duplication

This commit is contained in:
Takeshi Kimata
2024-07-21 15:46:06 +09:00
parent 1da19ed43c
commit 32ee0231b0
11 changed files with 79 additions and 45 deletions

View File

@@ -38,7 +38,7 @@ import { TokenContext } from '@/utils/TokenProvider';
import { useTheme } from 'next-themes';
import { useFormGuard } from '@/utils/formGuard';
import { PriorityMessages } from '@/types/priority';
import { TestRunCaseStatusMessages } from '@/types/testRunCaseStatus';
import { RunStatusMessages, TestRunCaseStatusMessages } from '@/types/status';
const defaultTestRun = {
id: 0,
@@ -55,6 +55,7 @@ type Props = {
projectId: string;
runId: string;
messages: RunMessages;
runStatusMessages: RunStatusMessages;
testRunCaseStatusMessages: TestRunCaseStatusMessages;
priorityMessages: PriorityMessages;
locale: string;
@@ -64,6 +65,7 @@ export default function RunEditor({
projectId,
runId,
messages,
runStatusMessages,
testRunCaseStatusMessages,
priorityMessages,
locale,
@@ -261,7 +263,7 @@ export default function RunEditor({
>
{testRunStatus.map((status, index) => (
<SelectItem key={status.uid} value={index}>
{messages[status.uid]}
{runStatusMessages[status.uid]}
</SelectItem>
))}
</Select>

View File

@@ -3,7 +3,7 @@ import { useState, useEffect } from 'react';
import dynamic from 'next/dynamic';
import { testRunCaseStatus } from '@/config/selection';
import { RunStatusCountType } from '@/types/run';
import { TestRunCaseStatusMessages } from '@/types/testRunCaseStatus';
import { TestRunCaseStatusMessages } from '@/types/status';
const Chart = dynamic(() => import('react-apexcharts'), { ssr: false });
type Props = {

View File

@@ -2,7 +2,7 @@ import RunEditor from './RunEditor';
import { useTranslations } from 'next-intl';
import { RunMessages } from '@/types/run';
import { PriorityMessages } from '@/types/priority';
import { TestRunCaseStatusMessages } from '@/types/testRunCaseStatus';
import { RunStatusMessages, TestRunCaseStatusMessages } from '@/types/status';
export default function Page({ params }: { params: { projectId: string; runId: string; locale: string } }) {
const t = useTranslations('Run');
@@ -16,12 +16,6 @@ export default function Page({ params }: { params: { projectId: string; runId: s
title: t('title'),
pleaseEnter: t('please_enter'),
description: t('description'),
new: t('new'),
inProgress: t('inProgress'),
underReview: t('underReview'),
rejected: t('rejected'),
done: t('done'),
closed: t('closed'),
priority: t('priority'),
actions: t('actions'),
status: t('status'),
@@ -38,6 +32,16 @@ export default function Page({ params }: { params: { projectId: string; runId: s
close: t('close'),
};
const rst = useTranslations('RunStatus');
const runStatusMessages: RunStatusMessages = {
new: rst('new'),
inProgress: rst('inProgress'),
underReview: rst('underReview'),
rejected: rst('rejected'),
done: rst('done'),
closed: rst('closed'),
};
const rcst = useTranslations('RunCaseStatus');
const testRunCaseStatusMessages: TestRunCaseStatusMessages = {
untested: rcst('untested'),
@@ -60,6 +64,7 @@ export default function Page({ params }: { params: { projectId: string; runId: s
projectId={params.projectId}
runId={params.runId}
messages={messages}
runStatusMessages={runStatusMessages}
testRunCaseStatusMessages={testRunCaseStatusMessages}
priorityMessages={priorityMessages}
locale={params.locale}