fix(FE-270): adjust flock_name in select input and fixing project flock approval

src/components/pages/production/project-flock/form/ProjectFlockForm.tsx

@@ -41,6 +41,7 @@ import ApprovalSteps, {
   useApprovalSteps,
 } from '@/components/pages/ApprovalSteps';
 import { PROJECT_FLOCK_APPROVAL_LINE } from '@/config/approval-line';
+import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 
 interface ProjectFlockFormProps {
   formType?: 'add' | 'edit' | 'detail';
@@ -71,8 +72,11 @@ const ProjectFlockForm = ({
   const [optionsKandang, setOptionsKandang] = useState<Kandang[]>(
     initialValues?.kandangs ?? []
   );
-  const [selectedFlock, setSelectedFlock] = useState<number | undefined>(
-    initialValues?.flock?.id ?? 0
+  const [selectedFlock, setSelectedFlock] = useState<string | undefined>(
+    initialValues?.flock_name?.slice(
+      0,
+      initialValues?.flock_name?.lastIndexOf(' ')
+    ) ?? ''
   );
 
   const deleteModal = useModal();
@@ -101,9 +105,13 @@ const ProjectFlockForm = ({
 
   useEffect(() => {
     if (initialValues?.approval?.step_name) {
-      const approvedDisabled = initialValues.approval.step_name !== 'Pengajuan';
+      const pengajuanRejected =
+        initialValues.approval.step_number == 1 &&
+        initialValues.approval.action == 'REJECTED';
+      const approvedDisabled =
+        initialValues.approval.step_number !== 1 || pengajuanRejected;
       setIsApprovedDisabled(approvedDisabled);
-      setIsRejectedDisabled(!approvedDisabled);
+      setIsRejectedDisabled(!approvedDisabled || pengajuanRejected);
       setApprovalAction(!approvedDisabled ? 'APPROVED' : 'REJECTED');
     }
   }, [initialValues]);
@@ -470,32 +478,23 @@ const ProjectFlockForm = ({
     setIsDeleteLoading(false);
   };
 
-  const confirmationModalClickHandler = async ({
-    action = 'APPROVED',
-  }: {
-    action: 'APPROVED' | 'REJECTED';
-  }) => {
+  const confirmApprovalHandler = async (
+    notes: string,
+    approvalAction: 'REJECTED' | 'APPROVED'
+  ) => {
     if (initialValues?.id === undefined) return;
     setIsApproveLoading(true);
-    const approveProjectFlockRes = await ProjectFlockApi.customRequest<
-      BaseApiResponse<ProjectFlock>,
-      ProjectFlockApprovalPayload
-    >(`/approvals`, {
-      method: 'POST',
-      payload: {
-        action: action,
-        approvable_ids: [initialValues?.id],
-      },
-    });
 
-    if (isResponseSuccess(approveProjectFlockRes)) {
-      if (refreshProjectFlocks) {
-        await refreshProjectFlocks();
-      }
-      toast.success(approveProjectFlockRes.message as string);
+    const approvalRes =
+      approvalAction == 'APPROVED'
+        ? await ProjectFlockApi.approve(initialValues?.id, notes)
+        : await ProjectFlockApi.reject(initialValues?.id, notes);
+    if (isResponseSuccess(approvalRes)) {
+      refreshProjectFlocks?.();
+      toast.success(approvalRes.message as string);
     }
-    if (isResponseError(approveProjectFlockRes)) {
-      toast.error(approveProjectFlockRes?.message as string);
+    if (isResponseError(approvalRes)) {
+      toast.error(approvalRes?.message as string);
     }
     refreshApprovals();
     confirmModal.closeModal();
@@ -600,7 +599,7 @@ const ProjectFlockForm = ({
           <div className='card bg-base-100 shadow w-full mb-6'>
             <div className='card-body'>
               <div className='card-title mb-4'>Informasi Umum</div>
-
+              {selectedFlock}
               <div className='grid sm:grid-cols-2 gap-4'>
                 <SelectInput
                   required
@@ -619,10 +618,19 @@ const ProjectFlockForm = ({
                 <SelectInput
                   required
                   label='Flock'
-                  value={formik.values.flock as OptionType}
+                  value={
+                    formik.values.flock_name
+                      ? ({
+                          label: selectedFlock,
+                          value: optionsFlock.find((flock) => {
+                            return flock.label === selectedFlock;
+                          })?.value,
+                        } as OptionType)
+                      : undefined
+                  }
                   onChange={(val) => {
                     optionChangeHandler(val, 'flock');
-                    setSelectedFlock((val as OptionType)?.value as number);
+                    setSelectedFlock((val as OptionType)?.label as string);
                     formik.setFieldValue(
                       'flock_name',
                       (val as OptionType)?.label
@@ -816,7 +824,7 @@ const ProjectFlockForm = ({
         }}
       />
 
-      <ConfirmationModal
+      <ConfirmationModalWithNotes
         ref={confirmModal.ref}
         type={approvalAction == 'APPROVED' ? 'success' : 'error'}
         text={`Apakah anda yakin ingin ${
@@ -831,10 +839,8 @@ const ProjectFlockForm = ({
           text: 'Ya',
           color: approvalAction == 'APPROVED' ? 'success' : 'error',
           isLoading: isApproveLoading,
-          onClick: () => {
-            confirmationModalClickHandler({
-              action: approvalAction,
-            });
+          onClick: (notes) => {
+            confirmApprovalHandler(notes, approvalAction);
           },
         }}
       />