Skip to content

Commit c700f75

Browse files
fix(request-form): show children in user select (#280)
1 parent 2f20634 commit c700f75

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

components/user/request-form.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,13 @@ export default function RequestForm({
183183
]
184184
);
185185

186-
const i18nPrefix = useMemo(() => (
187-
students.length === 1 &&
188-
students[0].name === 'Me' &&
189-
!creating ? '' : 'for-others-'
190-
), [students, creating]);
186+
const i18nPrefix = useMemo(
187+
() =>
188+
students.length === 1 && students[0].name === 'Me' && !creating
189+
? ''
190+
: 'for-others-',
191+
[students, creating]
192+
);
191193
const messagePlaceholder = useMemo(() => {
192194
const studentIsMe = students.length === 1 && students[0].id === user.id;
193195
const studentFirstNames = join(students.map((s) => s.firstName));
@@ -208,8 +210,8 @@ export default function RequestForm({
208210
const userSelectQuery = useMemo(
209211
() =>
210212
org && org.members.includes(user.id)
211-
? { orgs: [org.id] }
212-
: { parents: [user.id] },
213+
? { orgs: [org.id], visible: undefined }
214+
: { parents: [user.id], visible: undefined },
213215
[org, user.id]
214216
);
215217

lib/api/db/user.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ export async function getUsers(
140140
: supabase.from<DBViewUser>('view_users');
141141
select = select
142142
.select('*', { count: 'exact' })
143-
.neq('bio', '')
144143
.contains('tags', query.tags)
145144
.contains('langs', query.langs)
146145
.contains(
@@ -155,6 +154,7 @@ export async function getUsers(
155154
);
156155
if (typeof query.visible === 'boolean')
157156
select = select.eq('visible', query.visible);
157+
if (query.visible === true) select = select.neq('bio', '');
158158
if (query.parents.length) select = select.overlaps('parents', query.parents);
159159
if (query.orgs.length) select = select.overlaps('orgs', query.orgs);
160160
// Filtering by availability shows volunteers that the student can book. In

0 commit comments

Comments
 (0)