Merge branch 'fix/inventory-adjustment' into 'development'

[FIX/FE] Inventory Adjustment

See merge request mbugroup/lti-web-client!349

src/components/pages/inventory/adjustment/form/InventoryAdjustmentForm.tsx

@@ -15,7 +15,7 @@ import {
   InventoryAdjustmentFormSchema,
   InventoryAdjustmentFormValues,
 } from '@/components/pages/inventory/adjustment/form/InventoryAdjustmentForm.schema';
-import { KandangApi, LocationApi } from '@/services/api/master-data';
+import { LocationApi } from '@/services/api/master-data';
 import {
   ProjectFlockApi,
   ProjectFlockKandangApi,
@@ -32,8 +32,6 @@ import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
 import AlertErrorList from '@/components/helper/form/FormErrors';
 import { Location } from '@/types/api/master-data/location';
 import { ProjectFlock } from '@/types/api/production/project-flock';
-import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
-import { Kandang } from '@/types/api/master-data/kandang';
 import { Product } from '@/types/api/master-data/product';
 import { ProjectFlockKandangLookup } from '@/types/api/production/project-flock';
 import { BaseApiResponse } from '@/types/api/api-general';
@@ -119,40 +117,19 @@ const InventoryAdjustmentForm = ({
     }
   );
 
-  const { rawData: approvedProjectFlockKandangsRawData } =
+  const {
-    useSelect<ProjectFlockKandang>(
+    options: projectFlockKandangOptions,
-      ProjectFlockKandangApi.basePath,
+    loadMore: loadMoreProjectFlockKandangs,
-      'id',
+    setInputValue: setProjectFlockKandangInputValue,
-      'id',
+    isLoadingOptions: isLoadingProjectFlockKandangOptions,
+  } = useSelect(
+    selectedProjectFlock ? ProjectFlockKandangApi.basePath : '',
+    'kandang.id',
+    'kandang.name',
     'search',
     {
       step_name: 'Disetujui',
-        limit: '100',
+      project_flock_id: String(selectedProjectFlock?.value),
-      }
-    );
-
-  const approvedProjectFlockKandangs = useMemo(() => {
-    if (
-      approvedProjectFlockKandangsRawData &&
-      'data' in approvedProjectFlockKandangsRawData
-    ) {
-      return approvedProjectFlockKandangsRawData.data as ProjectFlockKandang[];
-    }
-    return [];
-  }, [approvedProjectFlockKandangsRawData]);
-
-  const {
-    setInputValue: setKandangInputValue,
-    options: kandangOptionsFromApi,
-    isLoadingOptions: isLoadingKandangOptions,
-    loadMore: loadMoreKandangs,
-  } = useSelect<Kandang>(
-    selectedProjectFlock ? KandangApi.basePath : '',
-    'id',
-    'name',
-    'search',
-    {
-      location_id: selectedProjectFlockLocationId,
     }
   );
 
@@ -222,26 +199,6 @@ const InventoryAdjustmentForm = ({
     return (product?.flags as string[]) || [];
   }, [selectedProduct, productOptions]);
 
-  const kandangOptions = useMemo(() => {
-    let options: OptionType[] = [];
-
-    if (selectedProjectFlock) {
-      const approvedKandangIds = approvedProjectFlockKandangs
-        .filter((pfk) => pfk.project_flock_id === selectedProjectFlock.value)
-        .map((pfk) => pfk.kandang_id);
-
-      options = kandangOptionsFromApi.filter((kandang) =>
-        approvedKandangIds.includes(kandang.value as number)
-      );
-    }
-
-    return options;
-  }, [
-    selectedProjectFlock,
-    kandangOptionsFromApi,
-    approvedProjectFlockKandangs,
-  ]);
-
   const formikInitialValues = useMemo<Partial<InventoryAdjustmentFormValues>>(
     () => ({
       location: null,
@@ -693,10 +650,10 @@ const InventoryAdjustmentForm = ({
                 label='Kandang'
                 value={selectedKandang}
                 onChange={kandangChangeHandler}
-                onInputChange={setKandangInputValue}
+                onInputChange={setProjectFlockKandangInputValue}
-                options={kandangOptions}
+                options={projectFlockKandangOptions}
-                onMenuScrollToBottom={loadMoreKandangs}
+                onMenuScrollToBottom={loadMoreProjectFlockKandangs}
-                isLoading={isLoadingKandangOptions}
+                isLoading={isLoadingProjectFlockKandangOptions}
                 isError={
                   formik.touched.kandang_id && Boolean(formik.errors.kandang_id)
                 }