Skip to content

Grants: make need found for fields mandatory #4178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
estyxx merged 2 commits into from
Nov 27, 2024
Merged

Grants: make need found for fields mandatory #4178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b6f520
Refactor locales: Remove 'Select Option' from grant form translation …
estyxx Nov 24, 2024
1fe2d5e
Make grant form options required with no default selection
estyxx Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions frontend/src/components/grant-form/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,7 @@ export const GrantForm = ({
const inputPlaceholderText = useTranslatedMessage("input.placeholder");
const { user, loading: loadingUser } = useCurrentUser({});
const [formState, formOptions] = useFormState<GrantFormFields>(
{
needsFundsForTravel: "false",
},
{},
{
withIds: true,
},
Expand Down Expand Up @@ -480,8 +478,12 @@ export const GrantForm = ({
description={
<FormattedMessage id="grants.form.fields.needsFundsForTravel.description" />
}
required={true}
>
<Select {...select("needsFundsForTravel")}>
<Select {...select("needsFundsForTravel")} required={true}>
<FormattedMessage id="global.selectOption">
{(msg) => <option value="">{msg}</option>}
</FormattedMessage>
<FormattedMessage id="global.no">
{(msg) => <option value="false">{msg}</option>}
</FormattedMessage>
Expand All @@ -496,8 +498,12 @@ export const GrantForm = ({
description={
<FormattedMessage id="grants.form.fields.needVisa.description" />
}
required={true}
>
<Select {...select("needVisa")}>
<Select {...select("needVisa")} required={true}>
<FormattedMessage id="global.selectOption">
{(msg) => <option value="">{msg}</option>}
</FormattedMessage>
<FormattedMessage id="global.no">
{(msg) => <option value="false">{msg}</option>}
</FormattedMessage>
Expand All @@ -514,8 +520,12 @@ export const GrantForm = ({
description={
<FormattedMessage id="grants.form.fields.needAccommodation.description" />
}
required={true}
>
<Select {...select("needAccommodation")}>
<Select {...select("needAccommodation")} required={true}>
<FormattedMessage id="global.selectOption">
{(msg) => <option value="">{msg}</option>}
</FormattedMessage>
<FormattedMessage id="global.no">
{(msg) => <option value="false">{msg}</option>}
</FormattedMessage>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/grant-form/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const OCCUPATION_OPTIONS = [
{
value: "",
disabled: true,
messageId: "grants.form.fields.occupation.values.selectOption",
messageId: "global.selectOption",
},
{
disabled: false,
Expand Down Expand Up @@ -65,7 +65,7 @@ export const GRANT_TYPE_OPTIONS = [
{
value: "",
disabled: true,
messageId: "grants.form.fields.grantType.values.selectOption",
messageId: "global.selectOption",
},
{
disabled: false,
Expand All @@ -88,7 +88,7 @@ export const AGE_GROUPS_OPTIONS = [
{
value: "" as AgeGroup,
disabled: true,
messageId: "grants.form.fields.ageGroup.values.selectOption",
messageId: "global.selectOption",
},
{
value: AgeGroup.RangeLessThan_10,
Expand Down
8 changes: 2 additions & 6 deletions frontend/src/locale/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const messages = {
"global.here": "here",
"global.yes": "Yes",
"global.no": "No",
"global.selectOption": "Select Option",
"profile.tickets.size": "Size",
"tickets.productsList.guidedToursTitle": "Guided Tours",
"checkout.billing.businessInvoice": "Do you need an invoice?",
Expand Down Expand Up @@ -701,7 +702,6 @@ We look forward to reading about you and hope to see you at PyCon Italia 2024!
"grants.form.fields.ageGroup": "Age group",
"grants.form.fields.ageGroup.description":
"Select your age group. This helps us understand the demographic distribution of our applicants.",
"grants.form.fields.ageGroup.values.selectOption": "Select Option",
"grants.form.fields.ageGroup.values.range_less_than_10":
"10 years old or under",
"grants.form.fields.ageGroup.values.range_11_18": "11 - 18 years old",
Expand All @@ -715,7 +715,6 @@ We look forward to reading about you and hope to see you at PyCon Italia 2024!
"grants.form.fields.occupation": "Occupation",
"grants.form.fields.occupation.description":
"Select your current occupation.",
"grants.form.fields.occupation.values.selectOption": "Select Option",
"grants.form.fields.occupation.values.developer": "Developer",
"grants.form.fields.occupation.values.student": "Student",
"grants.form.fields.occupation.values.researcher": "Researcher",
Expand All @@ -724,7 +723,6 @@ We look forward to reading about you and hope to see you at PyCon Italia 2024!
"grants.form.fields.grantType": "What type of grant are you applying for?",
"grants.form.fields.grantType.description":
"Note: If you have submitted a talk/workshop proposal, you do not need to apply for a grant to receive a refund. If your proposal is accepted, we will contact you regarding the ticket refund.",
"grants.form.fields.grantType.values.selectOption": "Select Option",
"grants.form.fields.grantType.values.diversity": "Diversity",
"grants.form.fields.grantType.values.unemployed": "Unemployed",
"grants.form.fields.grantType.values.speaker": "Speaker",
Expand Down Expand Up @@ -1075,6 +1073,7 @@ The sooner you buy your ticket, the more you save!`,
"global.somethingWentWrong": "Qualcosa è andato male, prova di nuovo",
"global.loadMore": "Carica altri",
"global.tryAgain": "Si è verificato un errore: {error}",
"global.selectOption": "Seleziona un'opzione",

"home.title": "Home",
"home.deadline.begins": "Inizio",
Expand Down Expand Up @@ -1425,7 +1424,6 @@ Non vediamo l'ora di leggere la tua storia e speriamo di vederti a PyCon Italia
"grants.form.fields.ageGroup": "Fascia d'età",
"grants.form.fields.ageGroup.description":
"Seleziona la tua fascia d'età. Questo ci aiuta a comprendere la distribuzione demografica dei nostri candidati.",
"grants.form.fields.ageGroup.values.selectOption": "Seleziona un'opzione",
"grants.form.fields.ageGroup.values.range_less_than_10": "meno di 10 anni",
"grants.form.fields.ageGroup.values.range_11_18": "11 - 18 anni",
"grants.form.fields.ageGroup.values.range_19_24": "19 - 24 anni",
Expand All @@ -1437,7 +1435,6 @@ Non vediamo l'ora di leggere la tua storia e speriamo di vederti a PyCon Italia
"grants.form.fields.occupation": "Occupazione",
"grants.form.fields.occupation.description":
"Seleziona la propria attuale occupazione.",
"grants.form.fields.occupation.values.selectOption": "Seleziona un'opzione",
"grants.form.fields.occupation.values.developer":
"Sviluppatore/Sviluppatrice",
"grants.form.fields.occupation.values.student": "Studente/Studentessa",
Expand All @@ -1447,7 +1444,6 @@ Non vediamo l'ora di leggere la tua storia e speriamo di vederti a PyCon Italia
"grants.form.fields.grantType": "Che tipo di grant stai richiedendo?",
"grants.form.fields.grantType.description":
"Nota: Se hai inviato una proposta di talk/workshop, non è necessario fare domanda per un grant per ricevere un rimborso. Se la tua proposta viene accettata, ti contatteremo riguardo al rimborso del biglietto.",
"grants.form.fields.grantType.values.selectOption": "Seleziona un'opzione",
"grants.form.fields.grantType.values.diversity": "Diversity",
"grants.form.fields.grantType.values.unemployed": "Disoccupato",
"grants.form.fields.grantType.values.speaker": "Speaker",
Expand Down
30 changes: 14 additions & 16 deletions frontend/src/pages/grants/edit/my-grant.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,21 @@ query MyGrant($conference: String!) {
notes
travellingFrom

participant {
id
photo
bio
website
twitterHandle
instagramHandle
linkedinUrl
facebookUrl
mastodonHandle


participant {
id
photo
bio
website
twitterHandle
instagramHandle
linkedinUrl
facebookUrl
mastodonHandle

fullname
publicProfile
userId
}
fullname
publicProfile
userId
}
}
}
}