Skip to content

Commit a006926

Browse files
committed
update available user status filters for admin directory
1 parent 85327e3 commit a006926

File tree

1 file changed

+64
-24
lines changed

1 file changed

+64
-24
lines changed

frontend/src/pages/admin/directory.tsx

Lines changed: 64 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,12 @@ export default function Directory() {
131131
volunteer: false,
132132
});
133133
const [statusFilters, setStatusFilters] = useState({
134-
notStarted: false,
135-
inProgress: false,
136-
completed: false,
134+
intakeForm: false,
135+
screenCalling: false,
136+
rankingForm: false,
137+
secondaryAppForm: false,
138+
matching: false,
139+
matched: false,
137140
rejected: false,
138141
});
139142

@@ -149,9 +152,12 @@ export default function Directory() {
149152
const handleClearFilters = () => {
150153
const clearedUserTypes = { participant: false, volunteer: false };
151154
const clearedStatuses = {
152-
notStarted: false,
153-
inProgress: false,
154-
completed: false,
155+
intakeForm: false,
156+
screenCalling: false,
157+
rankingForm: false,
158+
secondaryAppForm: false,
159+
matching: false,
160+
matched: false,
155161
rejected: false,
156162
};
157163
setUserTypeFilters(clearedUserTypes);
@@ -180,18 +186,25 @@ export default function Directory() {
180186

181187
// Status filtering
182188
const hasStatusFilter =
183-
appliedStatusFilters.notStarted ||
184-
appliedStatusFilters.inProgress ||
185-
appliedStatusFilters.completed ||
189+
appliedStatusFilters.intakeForm ||
190+
appliedStatusFilters.screenCalling ||
191+
appliedStatusFilters.rankingForm ||
192+
appliedStatusFilters.secondaryAppForm ||
193+
appliedStatusFilters.matching ||
194+
appliedStatusFilters.matched ||
186195
appliedStatusFilters.rejected;
187-
const userStatus =
188-
user.formStatus && formStatusMap[user.formStatus as FormStatus]?.status;
196+
const userStatusLabel =
197+
user.formStatus && formStatusMap[user.formStatus as FormStatus]?.label;
189198
const matchesStatus =
190199
!hasStatusFilter ||
191-
(appliedStatusFilters.notStarted && userStatus === 'Not started') ||
192-
(appliedStatusFilters.inProgress && userStatus === 'In-progress') ||
193-
(appliedStatusFilters.completed && userStatus === 'Completed') ||
194-
(appliedStatusFilters.rejected && userStatus === 'Rejected');
200+
(appliedStatusFilters.intakeForm && userStatusLabel === 'Intake form') ||
201+
(appliedStatusFilters.screenCalling && userStatusLabel === 'Screen calling') ||
202+
(appliedStatusFilters.rankingForm && userStatusLabel === 'Ranking form') ||
203+
(appliedStatusFilters.secondaryAppForm &&
204+
userStatusLabel === 'Secondary app. form') ||
205+
(appliedStatusFilters.matching && userStatusLabel === 'Matching') ||
206+
(appliedStatusFilters.matched && userStatusLabel === 'Matched') ||
207+
(appliedStatusFilters.rejected && userStatusLabel === 'Rejected');
195208

196209
return matchesSearch && matchesUserType && matchesStatus;
197210
});
@@ -348,28 +361,55 @@ export default function Directory() {
348361
</Text>
349362
<VStack align="stretch" gap={2}>
350363
<Checkbox
351-
checked={statusFilters.notStarted}
364+
checked={statusFilters.intakeForm}
352365
onCheckedChange={(e) =>
353-
setStatusFilters({ ...statusFilters, notStarted: !!e.checked })
366+
setStatusFilters({ ...statusFilters, intakeForm: !!e.checked })
354367
}
355368
>
356-
<Text fontSize="sm">Not Started</Text>
369+
<Text fontSize="sm">Intake form</Text>
357370
</Checkbox>
358371
<Checkbox
359-
checked={statusFilters.inProgress}
372+
checked={statusFilters.screenCalling}
360373
onCheckedChange={(e) =>
361-
setStatusFilters({ ...statusFilters, inProgress: !!e.checked })
374+
setStatusFilters({ ...statusFilters, screenCalling: !!e.checked })
362375
}
363376
>
364-
<Text fontSize="sm">In-progress</Text>
377+
<Text fontSize="sm">Screen calling</Text>
365378
</Checkbox>
366379
<Checkbox
367-
checked={statusFilters.completed}
380+
checked={statusFilters.rankingForm}
368381
onCheckedChange={(e) =>
369-
setStatusFilters({ ...statusFilters, completed: !!e.checked })
382+
setStatusFilters({ ...statusFilters, rankingForm: !!e.checked })
370383
}
371384
>
372-
<Text fontSize="sm">Completed</Text>
385+
<Text fontSize="sm">Ranking form</Text>
386+
</Checkbox>
387+
<Checkbox
388+
checked={statusFilters.secondaryAppForm}
389+
onCheckedChange={(e) =>
390+
setStatusFilters({
391+
...statusFilters,
392+
secondaryAppForm: !!e.checked,
393+
})
394+
}
395+
>
396+
<Text fontSize="sm">Secondary app. form</Text>
397+
</Checkbox>
398+
<Checkbox
399+
checked={statusFilters.matching}
400+
onCheckedChange={(e) =>
401+
setStatusFilters({ ...statusFilters, matching: !!e.checked })
402+
}
403+
>
404+
<Text fontSize="sm">Matching</Text>
405+
</Checkbox>
406+
<Checkbox
407+
checked={statusFilters.matched}
408+
onCheckedChange={(e) =>
409+
setStatusFilters({ ...statusFilters, matched: !!e.checked })
410+
}
411+
>
412+
<Text fontSize="sm">Matched</Text>
373413
</Checkbox>
374414
<Checkbox
375415
checked={statusFilters.rejected}

0 commit comments

Comments
 (0)