mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-25 07:45:47 +00:00
feat(FE-438): Load uniformity details on demand
This commit is contained in:
@@ -49,6 +49,7 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
|
|||||||
uniformity_details={initialValues.uniformity_details}
|
uniformity_details={initialValues.uniformity_details}
|
||||||
sampling={initialValues.sampling}
|
sampling={initialValues.sampling}
|
||||||
result={initialValues.result}
|
result={initialValues.result}
|
||||||
|
uniformityId={initialValues.id}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
'use client';
|
'use client';
|
||||||
|
|
||||||
import React, { useMemo } from 'react';
|
import React, { useMemo, useState } from 'react';
|
||||||
import { Icon } from '@iconify/react';
|
import { Icon } from '@iconify/react';
|
||||||
import { ColumnDef } from '@tanstack/react-table';
|
import { ColumnDef } from '@tanstack/react-table';
|
||||||
import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
|
import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
|
||||||
@@ -21,26 +21,51 @@ import {
|
|||||||
getWeightStatusText,
|
getWeightStatusText,
|
||||||
} from '@/components/pages/uniformity/uniformity-utils';
|
} from '@/components/pages/uniformity/uniformity-utils';
|
||||||
import { BodyWeightData } from '@/types/api/uniformity/uniformity';
|
import { BodyWeightData } from '@/types/api/uniformity/uniformity';
|
||||||
|
import Button from '@/components/Button';
|
||||||
|
import { UniformityApi } from '@/services/api/uniformity';
|
||||||
|
import useSWR from 'swr';
|
||||||
|
import { isResponseSuccess } from '@/lib/api-helper';
|
||||||
|
|
||||||
interface UniformityDetailsPreviewProps {
|
interface UniformityDetailsPreviewProps {
|
||||||
info_umum: UniformityInfoUmum;
|
info_umum: UniformityInfoUmum;
|
||||||
uniformity_details: UniformityDetailItem[];
|
|
||||||
sampling: UniformitySampling;
|
sampling: UniformitySampling;
|
||||||
result: UniformityResult;
|
result: UniformityResult;
|
||||||
|
uniformity_details?: UniformityDetailItem[];
|
||||||
|
uniformityId: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
const UniformityDetailsPreview = ({
|
const UniformityDetailsPreview = ({
|
||||||
info_umum,
|
info_umum,
|
||||||
uniformity_details,
|
uniformity_details: initialUniformityDetails,
|
||||||
sampling,
|
sampling,
|
||||||
result,
|
result,
|
||||||
|
uniformityId,
|
||||||
}: UniformityDetailsPreviewProps) => {
|
}: UniformityDetailsPreviewProps) => {
|
||||||
const setExpandedDrawerOpen = useUiStore((s) => s.setExpandedDrawerOpen);
|
const setExpandedDrawerOpen = useUiStore((s) => s.setExpandedDrawerOpen);
|
||||||
|
const [shouldFetchDetails, setShouldFetchDetails] = useState(false);
|
||||||
|
|
||||||
|
const { data: uniformityDetailResponse, isLoading } = useSWR(
|
||||||
|
shouldFetchDetails
|
||||||
|
? `uniformity-detail-${uniformityId}-with-details`
|
||||||
|
: null,
|
||||||
|
() => UniformityApi.getUniformityDetail(uniformityId, true)
|
||||||
|
);
|
||||||
|
|
||||||
|
const uniformity_details = useMemo(() => {
|
||||||
|
if (shouldFetchDetails && isResponseSuccess(uniformityDetailResponse)) {
|
||||||
|
return uniformityDetailResponse.data.uniformity_details;
|
||||||
|
}
|
||||||
|
return initialUniformityDetails;
|
||||||
|
}, [shouldFetchDetails, uniformityDetailResponse, initialUniformityDetails]);
|
||||||
|
|
||||||
const handleClose = () => {
|
const handleClose = () => {
|
||||||
setExpandedDrawerOpen(false);
|
setExpandedDrawerOpen(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const fetchWeightData = () => {
|
||||||
|
setShouldFetchDetails(true);
|
||||||
|
};
|
||||||
|
|
||||||
const samplingTableData: DetailOptionType[] = useMemo(() => {
|
const samplingTableData: DetailOptionType[] = useMemo(() => {
|
||||||
if (!sampling) return [];
|
if (!sampling) return [];
|
||||||
|
|
||||||
@@ -219,7 +244,6 @@ const UniformityDetailsPreview = ({
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Result */}
|
{/* Result */}
|
||||||
<div className=''>
|
<div className=''>
|
||||||
<p className='text-sm font-medium mb-5'>Result</p>
|
<p className='text-sm font-medium mb-5'>Result</p>
|
||||||
@@ -234,15 +258,32 @@ const UniformityDetailsPreview = ({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Body Weight Details */}
|
{/* Body Weight Details Button */}
|
||||||
<div className='mt-4'>
|
<div className='mt-4'>
|
||||||
<Table<BodyWeightData>
|
<Button
|
||||||
data={tableData}
|
type='button'
|
||||||
columns={columnsUniformity}
|
onClick={fetchWeightData}
|
||||||
pageSize={15}
|
disabled={isLoading}
|
||||||
className={{ containerClassName: 'mb-5' }}
|
className='w-full'
|
||||||
/>
|
>
|
||||||
|
{isLoading ? 'Loading...' : 'Show Body Weight Details'}
|
||||||
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
{/*{!uniformity_details || uniformity_details.length === 0 ? (
|
||||||
|
<></>
|
||||||
|
) : null}*/}
|
||||||
|
|
||||||
|
{/* Body Weight Details */}
|
||||||
|
{uniformity_details && uniformity_details.length > 0 && (
|
||||||
|
<div className='mt-4'>
|
||||||
|
<Table<BodyWeightData>
|
||||||
|
data={tableData}
|
||||||
|
columns={columnsUniformity}
|
||||||
|
pageSize={15}
|
||||||
|
className={{ containerClassName: 'mb-5' }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className='flex flex-col items-center justify-center py-10 text-gray-400'>
|
<div className='flex flex-col items-center justify-center py-10 text-gray-400'>
|
||||||
|
|||||||
@@ -22,10 +22,17 @@ export class UniformityApiService extends BaseApiService<
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getUniformityDetail(
|
async getUniformityDetail(
|
||||||
id: number
|
id: number,
|
||||||
|
with_details = false
|
||||||
): Promise<BaseApiResponse<UniformityDetail> | undefined> {
|
): Promise<BaseApiResponse<UniformityDetail> | undefined> {
|
||||||
return await this.customRequest<BaseApiResponse<UniformityDetail>>(
|
return await this.customRequest<BaseApiResponse<UniformityDetail>>(
|
||||||
`/${id}`
|
`/${id}`,
|
||||||
|
{
|
||||||
|
method: 'GET',
|
||||||
|
params: {
|
||||||
|
with_details: with_details,
|
||||||
|
},
|
||||||
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -62,7 +62,7 @@ export type UniformityDetail = BaseMetadata & {
|
|||||||
info_umum: UniformityInfoUmum;
|
info_umum: UniformityInfoUmum;
|
||||||
sampling: UniformitySampling;
|
sampling: UniformitySampling;
|
||||||
result: UniformityResult;
|
result: UniformityResult;
|
||||||
uniformity_details: UniformityDetailItem[];
|
uniformity_details?: UniformityDetailItem[];
|
||||||
latest_approval?: BaseApproval;
|
latest_approval?: BaseApproval;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user