fix: adjust ProjectFlockDetail styling and content

src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx

@@ -4,12 +4,7 @@ import Card from '@/components/Card';
 import { RadioGroup, RadioGroupItem } from '@/components/input/RadioInput';
 import Tooltip from '@/components/Tooltip';
 import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
-import {
+import { cn, formatCurrency, formatDate, formatNumber } from '@/lib/helper';
-  formatCurrency,
-  formatDate,
-  formatNumber,
-  formatTitleCase,
-} from '@/lib/helper';
 import { ProjectFlock } from '@/types/api/production/project-flock';
 import { Icon } from '@iconify/react';
 import Link from 'next/link';
@@ -20,16 +15,15 @@ import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import toast from 'react-hot-toast';
-import ApprovalSteps, {
-  useApprovalSteps,
-} from '@/components/pages/ApprovalSteps';
-import {
-  PROJECT_FLOCK_APPROVAL_LINE,
-  PROJECT_FLOCK_KANDANGS_APPROVAL_LINE,
-} from '@/config/approval-line';
 import useSWR from 'swr';
-import { ProjectFlockKandangApi } from '@/services/api/production';
 import RequirePermission from '@/components/helper/RequirePermission';
+import ApprovalStepsV2 from '@/components/helper/ApprovalStepsV2';
+import { APPROVAL_WORKFLOWS } from '@/config/constant';
+import Table from '@/components/Table';
+import { ProjectFlockFormConfirmationTableType } from '../form/ProjectFlockForm';
+import { ColumnDef } from '@tanstack/react-table';
+import StatusBadge from '@/components/helper/StatusBadge';
+import { ProjectFlockKandangApi } from '@/services/api/production/project-flock-kandang';
 
 const ProjectFlockDetail = ({
   projectFlock,
@@ -40,7 +34,7 @@ const ProjectFlockDetail = ({
   const deleteModal = useModal();
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
   const [openBudgets, setOpenBudget] = useState(false);
-  const [selectedKandangId, setSelectedKamdangId] = useState<string | null>(
+  const [selectedKandangId, setSelectedKandangId] = useState<string | null>(
     null
   );
 
@@ -61,30 +55,94 @@ const ProjectFlockDetail = ({
         : null
     );
 
-  const {
+  const { data: projectFlockApprovalResponse } = useSWR(
-    approvals,
+    projectFlock.id ? ['approval-project-flock', projectFlock.id] : undefined,
-    isLoading: approvalsLoading,
+    ([, id]) => ProjectFlockApi.getApprovalLineHistory(Number(id))
-    refresh: refreshApprovals,
+  );
-  } = useApprovalSteps({
-    latestApproval: projectFlock?.approval,
-    approvalLines: PROJECT_FLOCK_APPROVAL_LINE,
-    moduleName: 'PROJECT_FLOCKS',
-    moduleId: projectFlock?.id?.toString() ?? '',
-  });
 
-  const { approvals: kandangApprovals, isLoading: kandangApprovalsLoading } =
+  const projectFlockApproval = isResponseSuccess(projectFlockApprovalResponse)
-    useApprovalSteps({
+    ? projectFlockApprovalResponse.data
-      latestApproval:
+    : undefined;
-        selectedKandangId && isResponseSuccess(projectFlockKandang)
+
-          ? projectFlockKandang?.data?.approval
+  const { data: projectFlockKandangApprovalResponse } = useSWR(
+    selectedKandang?.project_flock_kandang_id
+      ? [
+          'approval-project-flock-kandang',
+          selectedKandang?.project_flock_kandang_id,
+        ]
       : undefined,
-      approvalLines: PROJECT_FLOCK_KANDANGS_APPROVAL_LINE,
+    ([, id]) => ProjectFlockKandangApi.getApprovalLineHistory(Number(id))
-      moduleName: 'PROJECT_FLOCK_KANDANGS',
+  );
-      moduleId:
+
-        selectedKandangId && isResponseSuccess(projectFlockKandang)
+  const projectFlockKandangApproval = isResponseSuccess(
-          ? projectFlockKandang?.data?.id?.toString()
+    projectFlockKandangApprovalResponse
-          : '',
+  )
-    });
+    ? projectFlockKandangApprovalResponse.data
+    : undefined;
+
+  const confirmationTableColumns: ColumnDef<ProjectFlockFormConfirmationTableType>[] =
+    [
+      {
+        header: 'Label',
+        accessorKey: 'label',
+        enableSorting: false,
+        cell: ({ row }) => {
+          const isSubRow = row.depth > 0;
+
+          return (
+            <>
+              {!isSubRow && row.original.label}
+
+              {isSubRow && (
+                <div
+                  className={cn('w-full min-h-full flex items-stretch gap-0')}
+                >
+                  <div className='w-px mx-4 bg-base-content/10' />
+                  <span className='p-3'>{row.original.label}</span>
+                </div>
+              )}
+            </>
+          );
+        },
+      },
+      {
+        header: 'Value',
+        accessorKey: 'value',
+        enableSorting: false,
+        cell: ({ row }) => row.original.value,
+      },
+    ];
+
+  const confirmationTableData: ProjectFlockFormConfirmationTableType[] = [
+    {
+      label: 'Tanggal',
+      value: formatDate(projectFlock.created_at, 'DD MMMM YYYY'),
+    },
+    {
+      label: 'Area',
+      value: projectFlock.area.name ?? '-',
+    },
+    {
+      label: 'Lokasi',
+      value: projectFlock.location.name ?? '-',
+    },
+    {
+      label: 'Flock',
+      value: projectFlock.flock_name ?? '-',
+    },
+    {
+      label: 'Kategori',
+      value: projectFlock.category ?? '-',
+    },
+    {
+      label: 'Standar Produksi',
+      value: projectFlock.production_standard.name ?? '-',
+    },
+    {
+      label: 'Periode',
+      value: projectFlock.period ?? '-',
+    },
+  ];
 
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
@@ -104,12 +162,14 @@ const ProjectFlockDetail = ({
 
   return (
     <>
-      <div className='h-full w-full flex flex-col gap-4'>
+      <div className='h-full w-full flex flex-col overflow-x-hidden overflow-y-auto'>
         {/* Header */}
         <DrawerHeader
-          leftIcon='mdi:close'
+          leftIcon='heroicons:chevron-left'
           leftIconHref='/production/project-flock'
-          subtitle={`Created On ${formatDate(projectFlock.created_at, 'MMM DD, YYYY')}`}
+          leftIconClassName='hover:text-gray-400'
+          subtitle='Detail Flock'
+          className='sticky top-0 z-10 bg-base-100'
         >
           <RequirePermission permissions='lti.production.project_flocks.update'>
             <Link
@@ -118,7 +178,7 @@ const ProjectFlockDetail = ({
             >
               <Tooltip content='Edit' position='bottom'>
                 <Button variant='link' className='p-0 text-neutral'>
-                  <Icon icon='mdi:square-edit-outline' width={20} height={20} />
+                  <Icon icon='heroicons:pencil-square' width={20} height={20} />
                 </Button>
               </Tooltip>
             </Link>
@@ -132,169 +192,57 @@ const ProjectFlockDetail = ({
               }}
             >
               <Tooltip content='Hapus' position='bottom'>
-                <Icon icon='mdi:trash-can-outline' width={20} height={20} />
+                <Icon icon='heroicons:trash' width={20} height={20} />
               </Tooltip>
             </Button>
           </RequirePermission>
         </DrawerHeader>
 
-        {/* Informasi Umum */}
+        <ApprovalStepsV2
-        <div className='border-t-1 border-gray-300'>
+          approvals={projectFlockApproval}
-          <div className='p-4 flex flex-col gap-4'>
+          steps={APPROVAL_WORKFLOWS.PROJECT_FLOCKS}
-            <h2 className='text-2xl font-semibold'>Informasi Umum</h2>
+        />
-            {/* Status Approval */}
+
-            {approvals && !approvalsLoading && (
+        <div className='w-full p-4 flex flex-col gap-3 border-b border-base-content/10'>
-              <div className='text-sm my-3'>
+          <h4 className='text-base font-medium text-base-content/50 font-roboto'>
-                <ApprovalSteps approvals={approvals} />
+            Informasi Umum
+          </h4>
+
+          <Table<ProjectFlockFormConfirmationTableType>
+            columns={confirmationTableColumns}
+            data={confirmationTableData}
+            withPagination={false}
+            pageSize={10000}
+            expanded={true}
+            getSubRows={(row) => row.subRows}
+            className={{
+              headerRowClassName: 'border-b border-base-content/10',
+              bodyRowClassName: 'border-none',
+              bodySubRowClassName: () => 'border-none',
+              bodySubRowColumnClassName: () => 'first:p-0',
+            }}
+          />
         </div>
-            )}
+
-            {/* Badge Row  */}
+        <div className='w-full p-4 flex flex-col gap-3 border-b border-base-content/10'>
+          <h4 className='text-base font-medium text-base-content/50 font-roboto'>
+            Kandang Aktif
+          </h4>
+
           <div className='flex flex-row gap-2'>
-              <Badge
+            <StatusBadge
-                variant='soft'
+              color='info'
-                color={
+              text={`Kandang Aktif (${projectFlock.kandangs?.length})`}
-                  projectFlock.approval?.step_number == 1
+              className={{ badge: 'w-fit text-nowrap' }}
-                    ? 'neutral'
+            />
-                    : projectFlock.approval?.step_number == 2
+
-                      ? 'primary'
+            <StatusBadge
-                      : projectFlock.approval?.step_number == 3
-                        ? 'success'
-                        : undefined
-                }
-                className={{
-                  badge: 'rounded-lg px-2',
-                }}
-              >
-                <Icon
-                  icon='mdi:circle'
-                  width={12}
-                  height={12}
-                  color={
-                    projectFlock.approval?.step_number == 1
-                      ? 'neutral'
-                      : projectFlock.approval?.step_number == 2
-                        ? 'primary'
-                        : projectFlock.approval?.step_number == 3
-                          ? 'success'
-                          : undefined
-                  }
-                />{' '}
-                {projectFlock.approval?.step_name}
-              </Badge>
-              <div className='divider divider-horizontal p-0 m-0'></div>
-              <Badge
               color='neutral'
-                variant='soft'
-                className={{ badge: 'rounded-lg px-2' }}
-              >
-                <Icon icon='mdi:bookmark' width={12} height={12} />
-                {` ${formatTitleCase(projectFlock.category ?? '')}`}
-              </Badge>
-            </div>
-            {/* Information Grid */}
-            <div className='grid grid-cols-3 gap-4'>
-              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
-                <Icon width={14} height={14} icon='mdi:account' /> Submitted
-              </div>
-              <div className='col-span-2'>
-                <Badge
-                  variant='soft'
-                  color='neutral'
-                  className={{
-                    badge: 'rounded-lg px-2',
-                  }}
-                >
-                  <Icon icon='mdi:account-circle' width={14} height={14} />{' '}
-                  {projectFlock.created_user?.name}
-                </Badge>
-              </div>
-
-              {/* BARIS 1 */}
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
-              </div>
-              <div className='col-span-2'>{projectFlock?.area?.name}</div>
-
-              {/* BARIS 2 */}
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi
-              </div>
-              <div className='col-span-2'>{projectFlock?.location?.name}</div>
-
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> FCR
-              </div>
-              <div className='col-span-2'>{projectFlock?.fcr?.name}</div>
-
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' />{' '}
-                Standard
-              </div>
-              <div className='col-span-2'>
-                {projectFlock?.production_standard?.name ?? '-'}
-              </div>
-
-              {/* BARIS 3 (Terakhir - TIDAK PERLU garis di bawahnya) */}
-              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' />{' '}
-                Kategori
-              </div>
-              <div className='col-span-2'>
-                {formatTitleCase(projectFlock.category ?? '')}
-              </div>
-            </div>
-          </div>
-        </div>
-
-        {/* Kandang Aktif */}
-        <div className='border-t-1 border-gray-300'>
-          <div className='p-4 flex flex-col gap-4'>
-            <h2 className='text-2xl font-semibold'>Kandang Aktif</h2>
-            {kandangApprovals && !kandangApprovalsLoading && (
-              <ApprovalSteps approvals={kandangApprovals} />
-            )}
-            {/* Badge Row  */}
-            <div className='flex flex-row gap-2'>
-              <Badge
-                variant='soft'
-                color={'primary'}
-                className={{
-                  badge: 'rounded-lg px-2',
-                }}
-              >
-                <Icon
-                  icon='mdi:circle'
-                  width={12}
-                  height={12}
-                  color={'primary'}
-                />{' '}
-                Kandang Aktif ({projectFlock.kandangs?.length})
-              </Badge>
-              <div className='divider divider-horizontal p-0 m-0'></div>
-              <Badge
-                color='neutral'
-                variant='soft'
-                className={{ badge: 'rounded-lg px-2 cursor-pointer' }}
               onClick={() => {
                 setOpenBudget(!openBudgets);
               }}
-              >
+              text={
+                <>
                   {` ${formatCurrency(
                     (projectFlock.project_budgets ?? []).reduce(
                       (acc, curr) => acc + curr.price * curr.qty,
@@ -306,7 +254,10 @@ const ProjectFlockDetail = ({
                     width={12}
                     height={12}
                   />
-              </Badge>
+                </>
+              }
+              className={{ badge: 'w-fit text-nowrap cursor-pointer' }}
+            />
           </div>
 
           {/* Card List Project Budgets */}
@@ -316,7 +267,7 @@ const ProjectFlockDetail = ({
                 key={budget.id}
                 variant='bordered'
                 className={{
-                    wrapper: 'w-full',
+                  wrapper: 'w-full rounded-lg',
                   body: 'p-3',
                 }}
               >
@@ -341,11 +292,7 @@ const ProjectFlockDetail = ({
                   </div>
                   <div className='flex flex-row justify-between items-center'>
                     <div className='flex flex-row gap-2 items-center text-gray-400'>
-                        <Icon
+                      <Icon icon={'mdi:file-multiple'} width={14} height={14} />{' '}
-                          icon={'mdi:file-multiple'}
-                          width={14}
-                          height={14}
-                        />{' '}
                       <span>Jumlah Pembelian</span>
                     </div>
                     <div className='text-end text-gray-500'>
@@ -378,7 +325,7 @@ const ProjectFlockDetail = ({
           <Card
             variant='bordered'
             className={{
-                wrapper: 'w-full',
+              wrapper: 'w-full rounded-lg',
               body: 'p-3',
             }}
           >
@@ -387,7 +334,7 @@ const ProjectFlockDetail = ({
               className={{
                 radioWrapper: 'grid grid-cols-1 gap-6',
               }}
-                onChange={(e) => setSelectedKamdangId(e.target.value)}
+              onChange={(e) => setSelectedKandangId(e.target.value)}
               value={selectedKandangId?.toString()}
               size='md'
               color='neutral'
@@ -399,7 +346,7 @@ const ProjectFlockDetail = ({
                   className={`grid grid-cols-2 gap-6 cursor-pointer hover:text-gray-800`}
                   onClick={() =>
                     projectFlock?.approval?.step_number > 1 &&
-                      setSelectedKamdangId(kandang?.id?.toString())
+                    setSelectedKandangId(kandang?.id?.toString())
                   }
                 >
                   <RadioGroupItem
@@ -420,6 +367,12 @@ const ProjectFlockDetail = ({
               ))}
             </RadioGroup>
           </Card>
+
+          <ApprovalStepsV2
+            approvals={projectFlockKandangApproval}
+            steps={APPROVAL_WORKFLOWS.PROJECT_FLOCK_KANDANGS}
+          />
+
           <div className='grid grid-cols-4 gap-3'>
             <RequirePermission permissions='lti.production.chickins.detail'>
               <Link
@@ -460,7 +413,6 @@ const ProjectFlockDetail = ({
           </div>
         </div>
       </div>
-      </div>
 
       <ConfirmationModal
         ref={deleteModal.ref}