Use Participant in grant type

Author: estyxx

backend/api/grants/types.py

@@ -64,5 +64,5 @@ def from_model(cls, grant: GrantModel) -> Grant:
             notes=grant.notes,
             travelling_from=grant.travelling_from,
             applicant_reply_deadline=grant.applicant_reply_deadline,
-            participant=participant,
+            participant=Participant.from_model(participant),
         )

frontend/src/components/grant-form/index.tsx

@@ -143,12 +143,6 @@ export const GrantForm = ({
     },
   });
 
-  const { data: participantData } = useParticipantDataQuery({
-    variables: {
-      conference: conference,
-    },
-  });
-
   const inputPlaceholderText = useTranslatedMessage("input.placeholder");
   const { user, loading: loadingUser } = useCurrentUser({});
   const [formState, formOptions] = useFormState<GrantFormFields>(
@@ -208,34 +202,28 @@ export const GrantForm = ({
       formState.setField("notes", grant.notes);
       formState.setField("travellingFrom", grant.travellingFrom);
 
-      if (participantData.me.participant) {
-        formState.setField(
-          "participantBio",
-          participantData.me.participant.bio,
-        );
-        formState.setField(
-          "participantWebsite",
-          participantData.me.participant.website,
-        );
+      if (grant.participant) {
+        formState.setField("participantBio", grant.participant.bio);
+        formState.setField("participantWebsite", grant.participant.website);
         formState.setField(
           "participantTwitterHandle",
-          participantData.me.participant.twitterHandle,
+          grant.participant.twitterHandle,
         );
         formState.setField(
           "participantInstagramHandle",
-          participantData.me.participant.instagramHandle,
+          grant.participant.instagramHandle,
         );
         formState.setField(
           "participantLinkedinUrl",
-          participantData.me.participant.linkedinUrl,
+          grant.participant.linkedinUrl,
         );
         formState.setField(
           "participantFacebookUrl",
-          participantData.me.participant.facebookUrl,
+          grant.participant.facebookUrl,
         );
         formState.setField(
           "participantMastodonHandle",
-          participantData.me.participant.mastodonHandle,
+          grant.participant.mastodonHandle,
         );
       }
       formState.setField("acceptedPrivacyPolicy", true);
@@ -668,7 +656,6 @@ export const GrantForm = ({
       <Spacer size="medium" />
 
       <PublicProfileCard
-        me={participantData.me}
         formOptions={formOptions}
         photoRequired={false}
         getParticipantValidationError={(field) =>

frontend/src/components/public-profile-card/index.tsx

@@ -30,7 +30,7 @@ export type ParticipantFormFields = {
 
 type Props<T extends ParticipantFormFields> = {
   formOptions: Inputs<T>;
-  me: {
+  me?: {
     participant?: {
       photo?: string;
     };

frontend/src/components/schedule-view/types.ts

@@ -25,7 +25,7 @@ export type Keynote = {
 };
 
 type Participant = {
-  photo: string;
+  photo?: string;
 };
 
 export type Item = {

frontend/src/pages/grants/edit/index.tsx

@@ -24,7 +24,6 @@ const GrantPage = (): JSX.Element => {
     variables: {
       conference: code,
     },
-    skip: typeof window === "undefined",
   });
 
   const grant = data?.me?.grant;
@@ -97,9 +96,6 @@ export const getServerSideProps: GetServerSideProps = async ({
       queryCurrentUser(client, {
         conference: process.env.conferenceCode,
       }),
-      queryParticipantData(client, {
-        conference: process.env.conferenceCode,
-      }),
     ]);
   } catch (e) {
     return {

frontend/src/pages/grants/edit/my-grant.graphql

@@ -33,6 +33,10 @@ query MyGrant($conference: String!) {
       linkedinUrl
       facebookUrl
       mastodonHandle
+
+      fullname
+      publicProfile
+      userId
     }
     }
   }

frontend/src/pages/grants/index.tsx

@@ -120,9 +120,6 @@ export const getServerSideProps: GetServerSideProps = async ({
       queryCurrentUser(client, {
         conference: process.env.conferenceCode,
       }),
-      queryParticipantData(client, {
-        conference: process.env.conferenceCode,
-      }),
     ]);
 
     if (grant) {