feat(FE-316): Support multi-select filters in UniformityTable

src/components/pages/uniformity/UniformityTable.tsx

@@ -185,10 +185,11 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
   const filterModal = useModal();
 
   // ===== FILTER STATE =====
-  const [filterLocation, setFilterLocation] = useState<OptionType | null>(null);
+  const [filterLocation, setFilterLocation] = useState<OptionType[]>([]);
-  const [filterProjectFlock, setFilterProjectFlock] =
+  const [filterProjectFlock, setFilterProjectFlock] = useState<OptionType[]>(
-    useState<OptionType | null>(null);
+    []
-  const [filterKandang, setFilterKandang] = useState<OptionType | null>(null);
+  );
+  const [filterKandang, setFilterKandang] = useState<OptionType[]>([]);
   const [filterStartDate, setFilterStartDate] = useState('');
   const [filterEndDate, setFilterEndDate] = useState('');
   const [projectFlockSearchValue, setProjectFlockSearchValue] = useState('');
@@ -205,8 +206,9 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
       search: projectFlockSearchValue || '',
       limit: '100',
     });
-    if (filterLocation) {
+    if (filterLocation.length > 0) {
-      params.append('location_id', filterLocation.value.toString());
+      const locationIds = filterLocation.map((loc) => loc.value).join(',');
+      params.append('location_id', locationIds);
     }
     return `${ProjectFlockApi.basePath}?${params.toString()}`;
   }, [projectFlockSearchValue, filterLocation]);
@@ -243,20 +245,21 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
   const filterKandangOptions = useMemo(() => {
     let options: OptionType[] = [];
 
-    if (filterProjectFlock && filterProjectFlocksDataList) {
+    if (filterProjectFlock.length > 0 && filterProjectFlocksDataList) {
-      const selectedProjectFlockData = filterProjectFlocksDataList.find(
+      const selectedProjectFlockIds = filterProjectFlock.map((pf) => pf.value);
-        (pf) => pf.id === filterProjectFlock.value
-      );
 
-      if (selectedProjectFlockData?.kandangs) {
+      filterProjectFlocksDataList.forEach((projectFlock) => {
-        const kandangOpts = selectedProjectFlockData.kandangs.map(
+        if (
-          (kandang: Kandang) => ({
+          selectedProjectFlockIds.includes(projectFlock.id) &&
+          projectFlock.kandangs
+        ) {
+          const kandangOpts = projectFlock.kandangs.map((kandang: Kandang) => ({
             value: kandang.id,
             label: kandang.name || '',
-          })
+          }));
-        );
           options = options.concat(kandangOpts);
         }
+      });
     }
 
     return options;
@@ -267,17 +270,17 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
     const basePath = UniformityApi.basePath;
     const queryParams = new URLSearchParams();
 
-    if (filterLocation) {
+    if (filterLocation.length > 0) {
-      queryParams.append('location_id', filterLocation.value.toString());
+      const locationIds = filterLocation.map((loc) => loc.value).join(',');
+      queryParams.append('location_id', locationIds);
     }
-    if (filterProjectFlock) {
+    if (filterProjectFlock.length > 0) {
-      queryParams.append(
+      const flockIds = filterProjectFlock.map((pf) => pf.value).join(',');
-        'project_flock_id',
+      queryParams.append('project_flock_id', flockIds);
-        filterProjectFlock.value.toString()
-      );
     }
-    if (filterKandang) {
+    if (filterKandang.length > 0) {
-      queryParams.append('kandang_id', filterKandang.value.toString());
+      const kandangIds = filterKandang.map((k) => k.value).join(',');
+      queryParams.append('kandang_id', kandangIds);
     }
     if (filterStartDate) {
       queryParams.append('start_date', filterStartDate);
@@ -315,29 +318,32 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
   // ===== FILTER HANDLERS =====
   const handleFilterLocationChange = useCallback(
     (val: OptionType | OptionType[] | null) => {
-      setFilterLocation(val as OptionType | null);
+      const arr = Array.isArray(val) ? val : val ? [val] : [];
+      setFilterLocation(arr);
     },
     []
   );
 
   const handleFilterProjectFlockChange = useCallback(
     (val: OptionType | OptionType[] | null) => {
-      setFilterProjectFlock(val as OptionType | null);
+      const arr = Array.isArray(val) ? val : val ? [val] : [];
+      setFilterProjectFlock(arr);
     },
     []
   );
 
   const handleFilterKandangChange = useCallback(
     (val: OptionType | OptionType[] | null) => {
-      setFilterKandang(val as OptionType | null);
+      const arr = Array.isArray(val) ? val : val ? [val] : [];
+      setFilterKandang(arr);
     },
     []
   );
 
   const handleResetFilters = useCallback(() => {
-    setFilterLocation(null);
+    setFilterLocation([]);
-    setFilterProjectFlock(null);
+    setFilterProjectFlock([]);
-    setFilterKandang(null);
+    setFilterKandang([]);
     setFilterStartDate('');
     setFilterEndDate('');
   }, []);
@@ -893,6 +899,7 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
                 onInputChange={setFilterLocationInputValue}
                 isLoading={isLoadingFilterLocations}
                 isClearable
+                isMulti
                 className={{ wrapper: 'w-full' }}
               />
 
@@ -904,8 +911,9 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
                 options={filterProjectFlockOptions}
                 onInputChange={setProjectFlockSearchValue}
                 isLoading={isLoadingFilterProjectFlocks}
-                isDisabled={!filterLocation}
+                isDisabled={filterLocation.length === 0}
                 isClearable
+                isMulti
                 className={{ wrapper: 'w-full' }}
               />
 
@@ -915,8 +923,9 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
                 value={filterKandang}
                 onChange={handleFilterKandangChange}
                 options={filterKandangOptions}
-                isDisabled={!filterProjectFlock}
+                isDisabled={filterProjectFlock.length === 0}
                 isClearable
+                isMulti
                 className={{ wrapper: 'w-full' }}
               />
             </div>

src/services/api/uniformity.ts

@@ -18,12 +18,14 @@ export class UniformityApiService extends BaseApiService<
   }
 
   async getUniformity(
-    location_id?: number,
+    location_id?: string,
-    project_flock_id?: number,
+    project_flock_id?: string,
-    kandang_id?: number,
+    kandang_id?: string,
-    project_flock_kandang_id?: number,
+    project_flock_kandang_id?: string,
     start_date?: string,
-    end_date?: string
+    end_date?: string,
+    page?: number,
+    limit?: number
   ): Promise<BaseApiResponse<Uniformity> | undefined> {
     return await this.customRequest<BaseApiResponse<Uniformity>>('', {
       method: 'GET',
@@ -34,6 +36,8 @@ export class UniformityApiService extends BaseApiService<
         project_flock_kandang_id: project_flock_kandang_id,
         start_date: start_date,
         end_date: end_date,
+        page: page,
+        limit: limit,
       },
     });
   }