From c8f596ad2af436f37ccd47eb41e3d2b28e5232fc Mon Sep 17 00:00:00 2001
From: rstubryan <restubumirr@gmail.com>
Date: Mon, 27 Oct 2025 05:54:14 +0700
Subject: [PATCH] refactor(FE-137): update RecordingForm to improve project
 flock handling and label formatting

---
 .../recording/form/RecordingForm.schema.ts     |  2 +-
 .../recording/form/RecordingForm.tsx           | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/components/pages/production/recording/form/RecordingForm.schema.ts b/src/components/pages/production/recording/form/RecordingForm.schema.ts
index 59afbd61..4abee337 100644
--- a/src/components/pages/production/recording/form/RecordingForm.schema.ts
+++ b/src/components/pages/production/recording/form/RecordingForm.schema.ts
@@ -93,7 +93,7 @@ export const getRecordingFormInitialValues = (
   project_flock_kandang: initialValues?.project_flock_kandang_id
     ? {
         value: initialValues.project_flock_kandang_id,
-        label: `Project Flock Kandang #${initialValues.project_flock_kandang_id}`,
+        label: `Project Flock #${initialValues.project_flock_kandang_id}`,
       }
     : null,
   project_flock_kandang_id: initialValues?.project_flock_kandang_id ?? 0,
diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx
index 0a117f3a..ffee70ae 100644
--- a/src/components/pages/production/recording/form/RecordingForm.tsx
+++ b/src/components/pages/production/recording/form/RecordingForm.tsx
@@ -107,7 +107,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
     projectFlocks?.data.forEach((projectFlock) => {
       projectFlock.kandangs.forEach((kandang) => {
         options.push({
-          value: kandang.id,
+          value: projectFlock.id,
           label: `${projectFlock.flock.name} - ${projectFlock.area.name} - ${kandang.name}`,
         });
       });
@@ -242,15 +242,13 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
     if (!formik.values.project_flock_kandang || !isResponseSuccess(projectFlocks)) {
       return selectedLocation;
     }
-    const kandangId = formik.values.project_flock_kandang.value;
-    for (const projectFlock of projectFlocks.data) {
-      const kandang = projectFlock.kandangs.find(k => k.id === kandangId);
-      if (kandang && projectFlock.location) {
-        return {
-          value: projectFlock.location.id,
-          label: projectFlock.location.name
-        };
-      }
+    const projectFlockId = formik.values.project_flock_kandang.value;
+    const projectFlock = projectFlocks.data.find(pf => pf.id === projectFlockId);
+    if (projectFlock && projectFlock.location) {
+      return {
+        value: projectFlock.location.id,
+        label: projectFlock.location.name
+      };
     }
     return selectedLocation;
   }, [formik.values.project_flock_kandang, projectFlocks, selectedLocation]);