This commit is contained in:
Abin Toppo
2026-03-27 11:40:00 +05:30
parent 84d609d4ac
commit ac9e7772b9
+24 -9
View File
@@ -36,9 +36,10 @@ import { RootTabParamList } from '../../navigation/BottomTabs';
type ManagementRouteProp = RouteProp<RootTabParamList, 'Management'>; type ManagementRouteProp = RouteProp<RootTabParamList, 'Management'>;
type ActiveTab = 'My Groups' | 'Joined Groups' | 'Requests' | 'Your Requests'; type ActiveTab = 'My Groups' | 'Joined Groups' | 'Requests' | 'Your Requests';
type GroupStatusFilter = 'PENDING' | 'APPROVED' | 'ACTIVE' | 'DELAY' | 'COMPLETED' | 'REJECTED' | 'CANCELLED'; type GroupStatusFilter = 'ALL' | 'PENDING' | 'APPROVED' | 'ACTIVE' | 'DELAY' | 'COMPLETED' | 'REJECTED' | 'CANCELLED';
const GROUP_STATUS_FILTERS: GroupStatusFilter[] = [ const GROUP_STATUS_FILTERS: GroupStatusFilter[] = [
'ALL',
'PENDING', 'PENDING',
'APPROVED', 'APPROVED',
'ACTIVE', 'ACTIVE',
@@ -49,6 +50,7 @@ const GROUP_STATUS_FILTERS: GroupStatusFilter[] = [
]; ];
const JOINED_GROUP_STATUS_FILTERS: GroupStatusFilter[] = [ const JOINED_GROUP_STATUS_FILTERS: GroupStatusFilter[] = [
'ALL',
'ACTIVE', 'ACTIVE',
'DELAY', 'DELAY',
'COMPLETED', 'COMPLETED',
@@ -80,15 +82,28 @@ const ManagementScreen: React.FC = () => {
setActiveTab(routeTab); setActiveTab(routeTab);
}, [route.params?.actionTab]); }, [route.params?.actionTab]);
const myGroupsParams = useMemo( const myGroupsParams = useMemo(() => {
() => ({ status: myGroupStatusFilter, page: 0, size: 10 }), return {
[myGroupStatusFilter] ...(myGroupStatusFilter && myGroupStatusFilter !== 'ALL'
); ? { status: myGroupStatusFilter }
: {}),
page: 0,
size: 10,
};
}, [myGroupStatusFilter]);
const joinedGroupsParams = useMemo(() => {
return {
...(joinedGroupStatusFilter && joinedGroupStatusFilter !== 'ALL'
? { status: joinedGroupStatusFilter }
: {}),
page: 0,
size: 10,
};
}, [joinedGroupStatusFilter]);
console.log('joinedGroupsParams:', joinedGroupsParams);
const joinedGroupsParams = useMemo(
() => ({ status: joinedGroupStatusFilter, page: 0, size: 10 }),
[joinedGroupStatusFilter]
);
// Data Fetching // Data Fetching
const { data: myGroupsRes, isLoading: myLoading, refetch: refetchMy } = useFetch<any>( const { data: myGroupsRes, isLoading: myLoading, refetch: refetchMy } = useFetch<any>(