diff --git a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx index 2dfff34f..4013e25c 100644 --- a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx +++ b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx @@ -261,7 +261,7 @@ const ProjectFlockForm = ({ isLoadingOptions: isLoadingFlocks, options: optionsFlock, loadMore: loadMoreFlock, - } = useSelect(FlockApi.basePath, 'id', 'name', '', { + } = useSelect(FlockApi.basePath, 'id', 'name', 'search', { project_category: selectedCategory, location_id: selectedLocation, area_id: selectedArea, @@ -279,7 +279,7 @@ const ProjectFlockForm = ({ isLoadingOptions: isLoadingLocations, setInputValue: setInputValueLocation, loadMore: loadMoreLocation, - } = useSelect(LocationApi.basePath, 'id', 'name', '', { + } = useSelect(LocationApi.basePath, 'id', 'name', 'search', { area_id: selectedArea != '' ? selectedArea @@ -291,7 +291,7 @@ const ProjectFlockForm = ({ isLoadingOptions: isLoadingProductionStandards, setInputValue: setInputValueProductionStandard, loadMore: loadMoreProductionStandard, - } = useSelect(ProductionStandardApi.basePath, 'id', 'name', '', { + } = useSelect(ProductionStandardApi.basePath, 'id', 'name', 'search', { project_category: selectedCategory, }); @@ -307,7 +307,7 @@ const ProjectFlockForm = ({ } = useSWR(kandangUrl, KandangApi.getAllFetcher); const { data: periodFlocks, mutate: refreshPeriodFlocks } = useSWR( - `${selectedFlock?.toString()}/periods`, + selectedFlock ? `${selectedFlock?.toString()}/periods` : undefined, () => ProjectFlockApi.getNextPeriod(parseInt(selectedLocation as string)) ); @@ -793,6 +793,7 @@ const ProjectFlockForm = ({ formik.values.kandang_ids?.includes(kandang.id) )?.period : undefined; + const inputPeriod = (initialValues?.period ?? selectedPeriod == 0) ? 1 : selectedPeriod;