refactor: priority messages duplication

This commit is contained in:
Takeshi Kimata
2024-07-21 13:59:49 +09:00
parent 63df563b87
commit 74bb379c1a
16 changed files with 84 additions and 90 deletions

View File

@@ -1,9 +1,9 @@
import { Button, Modal, ModalContent, ModalHeader, ModalBody, ModalFooter } from '@nextui-org/react';
import { testTypes, templates } from '@/config/selection';
import TestCasePriority from '@/components/TestCasePriority';
import { RunMessages } from '@/types/run';
import { CaseType } from '@/types/case';
import { PriorityMessages } from '@/types/priority';
import TestCasePriority from '@/components/TestCasePriority';
type Props = {
isOpen: boolean;

View File

@@ -26,11 +26,12 @@ import {
CircleSlash2,
} from 'lucide-react';
import { NextUiLinkClasses } from '@/src/navigation';
import { priorities, testRunCaseStatus } from '@/config/selection';
import { testRunCaseStatus } from '@/config/selection';
import { CaseType } from '@/types/case';
import { RunMessages } from '@/types/run';
import TestCaseDetailDialog from './TestCaseDetailDialog';
import { PriorityMessages } from '@/types/priority';
import TestCasePriority from '@/components/TestCasePriority';
type Props = {
cases: CaseType[];
@@ -95,7 +96,6 @@ export default function TestCaseSelector({
}, [sortDescriptor, cases]);
const notIncludedCaseClass = 'text-neutral-200 dark:text-neutral-600';
const chipBaseClass = 'flex items-center text-default-600';
const renderStatusIcon = (uid: string) => {
if (uid === 'untested') {
@@ -142,13 +142,8 @@ export default function TestCaseSelector({
);
case 'priority':
return (
<div className={isIncluded ? chipBaseClass : chipBaseClass + notIncludedCaseClass}>
<Circle
size={8}
color={isIncluded ? priorities[cellValue].color : '#d4d4d8'}
fill={isIncluded ? priorities[cellValue].color : '#d4d4d8'}
/>
<div className="ms-3">{messages[priorities[cellValue].uid]}</div>
<div className={isIncluded ? '' : notIncludedCaseClass}>
<TestCasePriority priorityValue={cellValue} priorityMessages={priorityMessages} />
</div>
);
case 'runStatus':

View File

@@ -55,12 +55,12 @@ export default function Page({ params }: { params: { projectId: string; runId: s
close: t('close'),
};
const priorityTranslation = useTranslations('Priority');
const pt = useTranslations('Priority');
const priorityMessages: PriorityMessages = {
critical: priorityTranslation('critical'),
high: priorityTranslation('high'),
medium: priorityTranslation('medium'),
low: priorityTranslation('low'),
critical: pt('critical'),
high: pt('high'),
medium: pt('medium'),
low: pt('low'),
};
return (