diff --git a/src/components/pages/uniformity/form/UniformityResultForm.tsx b/src/components/pages/uniformity/form/UniformityResultForm.tsx index 7be02868..a3342e9e 100644 --- a/src/components/pages/uniformity/form/UniformityResultForm.tsx +++ b/src/components/pages/uniformity/form/UniformityResultForm.tsx @@ -21,6 +21,7 @@ import { getWeightStatusIndicatorColor, getWeightStatusText, } from '@/components/pages/uniformity/uniformity-utils'; +import { DetailOptionType } from '@/components/pages/uniformity/detail/UniformityDetail'; type BodyWeightData = { id: string; @@ -29,18 +30,6 @@ type BodyWeightData = { status?: 'ideal' | 'outside'; }; -type SamplingData = { - id: string; - label: string; - value: string; -}; - -type ResultData = { - id: string; - label: string; - value: string; -}; - const UniformityResultForm = () => { const router = useRouter(); const setExpandedDrawerOpen = useUiStore((s) => s.setExpandedDrawerOpen); @@ -64,10 +53,6 @@ const UniformityResultForm = () => { setVerifyUniformityResult(null); }; - const handleBack = () => { - setUniformityStep('preview'); - }; - const handleSubmit = async () => { if (!uniformityFormData || !uniformityFormData.file) { toast.error('Form data is missing. Please try again.'); @@ -102,7 +87,7 @@ const UniformityResultForm = () => { } }; - const samplingTableData: SamplingData[] = useMemo(() => { + const samplingTableData: DetailOptionType[] = useMemo(() => { if (!verifyUniformityResult) return []; const { sampling } = verifyUniformityResult; @@ -131,7 +116,7 @@ const UniformityResultForm = () => { ]; }, [verifyUniformityResult]); - const columnsSampling: ColumnDef[] = useMemo( + const columnsSampling: ColumnDef[] = useMemo( () => [ { accessorKey: 'label', @@ -147,7 +132,7 @@ const UniformityResultForm = () => { [] ); - const resultTableData: ResultData[] = useMemo(() => { + const resultTableData: DetailOptionType[] = useMemo(() => { if (!verifyUniformityResult) return []; const { result } = verifyUniformityResult; @@ -171,7 +156,7 @@ const UniformityResultForm = () => { ]; }, [verifyUniformityResult]); - const resultColumns: ColumnDef[] = useMemo( + const resultColumns: ColumnDef[] = useMemo( () => [ { accessorKey: 'label', @@ -270,7 +255,7 @@ const UniformityResultForm = () => {

Sampling and Range

- + data={samplingTableData} columns={columnsSampling} pageSize={4} @@ -283,7 +268,7 @@ const UniformityResultForm = () => {

Result

- + data={resultTableData} columns={resultColumns} pageSize={3}