Add ability to show accepted speakers/proposals

marcoacierno · marcoacierno · commit a3e9b35cc3d5 · 2025-02-09T17:19:25.000+01:00
diff --git a/backend/api/cms/page/blocks/dynamic_content_display_section.py b/backend/api/cms/page/blocks/dynamic_content_display_section.py
@@ -0,0 +1,25 @@
+from typing import Self
+import strawberry
+from api.cms.page.registry import register_page_block
+import enum
+
+
+@strawberry.enum
+class DynamicContentDisplaySectionSource(enum.Enum):
+    speakers = "speakers"
+    keynoters = "keynoters"
+    accepted_proposals = "accepted_proposals"
+
+
+@register_page_block()
+@strawberry.type
+class DynamicContentDisplaySection:
+    id: strawberry.ID
+    source: DynamicContentDisplaySectionSource
+
+    @classmethod
+    def from_block(cls, block) -> Self:
+        return cls(
+            id=block.id,
+            source=DynamicContentDisplaySectionSource(block.value["source"]),
+        )
diff --git a/backend/api/conferences/types.py b/backend/api/conferences/types.py
@@ -221,13 +221,21 @@ def proposal_tags(self, info: Info) -> list[SubmissionTag]:
         return self.proposal_tags.all()
 
     @strawberry.field(permission_classes=[CanSeeSubmissions])
-    def submissions(self, info: Info) -> list[Submission] | None:
-        return self.submissions.filter(
-            status__in=(
-                SubmissionModel.STATUS.proposed,
-                SubmissionModel.STATUS.accepted,
+    def submissions(
+        self, info: Info, only_accepted: bool = False
+    ) -> list[Submission] | None:
+        qs = self.submissions
+        if only_accepted:
+            qs = qs.filter(status=SubmissionModel.STATUS.accepted)
+        else:
+            qs = qs.filter(
+                status__in=(
+                    SubmissionModel.STATUS.proposed,
+                    SubmissionModel.STATUS.accepted,
+                )
             )
-        ).select_related("audience_level", "duration", "type", "topic")
+
+        return qs.select_related("audience_level", "duration", "type", "topic")
 
     @strawberry.field
     def events(self, info: Info) -> list[Event]:
diff --git a/backend/api/participants/queries.py b/backend/api/participants/queries.py
@@ -16,19 +16,14 @@
 
 @strawberry.field
 def participant(
-    info: Info, user_id: strawberry.ID, conference: str
+    info: Info, id: strawberry.ID, conference: str
 ) -> Optional[Participant]:
-    user = info.context.request.user
-    decoded_id = decode_hashid(user_id, salt=settings.USER_ID_HASH_SALT, min_length=6)
+    decoded_id = decode_hashid(id, salt=settings.USER_ID_HASH_SALT, min_length=6)
     participant = ParticipantModel.objects.filter(
-        conference__code=conference, user_id=decoded_id
+        conference__code=conference, id=decoded_id
     ).first()
 
-    if not participant or (
-        not participant.public_profile and (not user or participant.user_id != user.id)
-    ):
-        # Profile doesn't exist, or
-        # Profile is not public, and the person requesting it is not the owner
+    if not participant:
         return None
 
     return Participant.from_model(participant)
diff --git a/backend/api/participants/types.py b/backend/api/participants/types.py
@@ -10,7 +10,6 @@
 @strawberry.type
 class Participant:
     id: ID
-    user_id: ID
     bio: str
     website: str
     photo: str | None
@@ -21,7 +20,6 @@ class Participant:
     linkedin_url: str
     facebook_url: str
     mastodon_handle: str
-    speaker_id: strawberry.Private[int]
     fullname: str
     speaker_availabilities: JSON
 
@@ -46,8 +44,6 @@ def previous_talk_video(self, info) -> Optional[str]:
     def from_model(cls, instance):
         return cls(
             id=instance.hashid,
-            user_id=instance.user_id,
-            speaker_id=instance.user_id,
             fullname=instance.user.fullname,
             photo=instance.photo_url,
             photo_id=instance.photo_file_id,
diff --git a/backend/api/permissions.py b/backend/api/permissions.py
@@ -38,9 +38,12 @@ def has_permission(self, source, info, **kwargs):
 class CanSeeSubmissions(BasePermission):
     message = "You need to have a ticket to see submissions"
 
-    def has_permission(self, conference, info):
+    def has_permission(self, conference, info, *args, **kwargs):
         user = info.context.request.user
 
+        if kwargs.get("only_accepted", False):
+            return True
+
         if not user.is_authenticated:
             return False
 
diff --git a/backend/api/submissions/types.py b/backend/api/submissions/types.py
@@ -1,3 +1,5 @@
+from participants.models import Participant as ParticipantModel
+from api.participants.types import Participant
 import strawberry
 from strawberry.types.field import StrawberryField
 from strawberry.types import Info
@@ -126,17 +128,16 @@ def abstract(self, language: str, info: Info) -> str | None:
         return self.abstract.localize(language)
 
     @strawberry.field
-    def speaker(self, info: Info) -> SubmissionSpeaker | None:
+    def speaker(self, info: Info) -> Participant | None:
         if not CanSeeSubmissionRestrictedFields().has_permission(
             self, info, is_speaker_data=True
         ):
             return None
 
-        return SubmissionSpeaker(
-            id=self.speaker_id,
-            full_name=self.speaker.full_name,
-            gender=self.speaker.gender,
-        )
+        participant = ParticipantModel.objects.filter(
+            user_id=self.speaker_id, conference_id=self.conference_id
+        ).first()
+        return Participant.from_model(participant) if participant else None
 
     @strawberry.field
     def id(self, info) -> strawberry.ID:
diff --git a/backend/cms/components/page/blocks/dynamic_content_display_section.py b/backend/cms/components/page/blocks/dynamic_content_display_section.py
@@ -0,0 +1,11 @@
+from wagtail import blocks
+
+
+class DynamicContentDisplaySection(blocks.StructBlock):
+    source = blocks.ChoiceBlock(
+        choices=[
+            ("speakers", "Speakers"),
+            ("keynoters", "Keynoters"),
+            ("accepted_proposals", "Accepted Proposals"),
+        ],
+    )
diff --git a/backend/cms/components/page/models.py b/backend/cms/components/page/models.py
@@ -1,3 +1,6 @@
+from cms.components.page.blocks.dynamic_content_display_section import (
+    DynamicContentDisplaySection,
+)
 from cms.components.page.blocks.homepage_hero import HomepageHero
 from cms.components.page.blocks.sponsors_section import SponsorsSection
 from cms.components.home.blocks.home_intro_section import HomeIntroSection
@@ -37,6 +40,7 @@ class BodyBlock(blocks.StreamBlock):
     checkout_section = CheckoutSection()
     live_streaming_section = LiveStreamingSection()
     homepage_hero = HomepageHero()
+    dynamic_content_display_section = DynamicContentDisplaySection()
 
 
 class GenericPage(CustomHeadlessMixin, Page):
diff --git a/backend/custom_admin/src/components/fragments/submission.graphql b/backend/custom_admin/src/components/fragments/submission.graphql
@@ -17,6 +17,6 @@ fragment SubmissionFragment on Submission {
   }
   speaker {
     id
-    fullName
+    fullname
   }
 }
diff --git a/backend/custom_admin/src/components/schedule-builder/add-item-modal/proposal-preview.tsx b/backend/custom_admin/src/components/schedule-builder/add-item-modal/proposal-preview.tsx
@@ -20,7 +20,7 @@ export const ProposalPreview = ({ proposal }: Props) => {
         info={[
           { label: "Type", value: proposal.type.name },
           { label: "Duration", value: `${proposal.duration.duration} mins` },
-          { label: "Speaker", value: proposal.speaker.fullName },
+          { label: "Speaker", value: proposal.speaker.fullname },
         ]}
       />
       <AddActions proposal={proposal} />
diff --git a/frontend/src/components/blocks-renderer/index.tsx b/frontend/src/components/blocks-renderer/index.tsx
@@ -5,6 +5,7 @@ import { TextSection } from "~/components/blocks/text-section";
 import type { Block } from "~/types";
 
 import { CheckoutSection } from "../blocks/checkout-section";
+import { DynamicContentDisplaySection } from "../blocks/dynamic-content-display-section";
 import { HomeIntroSection } from "../blocks/home-intro-section";
 import { HomepageHero } from "../blocks/homepage-hero";
 import { InformationSection } from "../blocks/information-section";
@@ -36,6 +37,7 @@ const REGISTRY: Registry = {
   CheckoutSection,
   LiveStreamingSection,
   HomepageHero,
+  DynamicContentDisplaySection,
 };
 
 type Props = {
@@ -74,7 +76,7 @@ export const blocksDataFetching = (client, blocks, language) => {
 
     const dataFetching = component.dataFetching;
     if (dataFetching) {
-      promises.push(...dataFetching(client, language));
+      promises.push(...dataFetching(client, language, block));
     }
 
     const getStaticProps = component.getStaticProps;
diff --git a/frontend/src/components/blocks/dynamic-content-display-section/accepted-proposals-content.tsx b/frontend/src/components/blocks/dynamic-content-display-section/accepted-proposals-content.tsx
@@ -0,0 +1,3 @@
+export const AcceptedProposalsContent = () => {
+  return <div>accepted proposals</div>;
+};
diff --git a/frontend/src/components/blocks/dynamic-content-display-section/accepted-proposals.graphql b/frontend/src/components/blocks/dynamic-content-display-section/accepted-proposals.graphql
@@ -0,0 +1,14 @@
+query AcceptedProposals($code: String!, $language: String!) {
+  conference(code: $code) {
+    id
+    submissions(onlyAccepted: true) {
+      id
+      title(language: $language)
+      speaker {
+        id
+        fullname
+        photo
+      }
+    }
+  }
+}
diff --git a/frontend/src/components/blocks/dynamic-content-display-section/index.tsx b/frontend/src/components/blocks/dynamic-content-display-section/index.tsx
@@ -0,0 +1,56 @@
+import React, { Fragment } from "react";
+import {
+  DynamicContentDisplaySectionSource,
+  queryAcceptedProposals,
+  queryKeynotesSection,
+} from "~/types";
+import { AcceptedProposalsContent } from "./accepted-proposals-content";
+import { KeynotersContent } from "./keynoters-content";
+import { SpeakersContent } from "./speakers-content";
+
+export const DynamicContentDisplaySection = ({
+  id,
+  source,
+}: {
+  id: string;
+  source: string;
+}) => {
+  return (
+    <Fragment>
+      {source === DynamicContentDisplaySectionSource.Keynoters && (
+        <KeynotersContent />
+      )}
+      {source === DynamicContentDisplaySectionSource.Speakers && (
+        <SpeakersContent />
+      )}
+      {source === DynamicContentDisplaySectionSource.AcceptedProposals && (
+        <AcceptedProposalsContent />
+      )}
+    </Fragment>
+  );
+};
+
+DynamicContentDisplaySection.dataFetching = (client, language, block) => {
+  const source = block.source;
+
+  switch (source) {
+    case DynamicContentDisplaySectionSource.Keynoters: {
+      return [
+        queryKeynotesSection(client, {
+          code: process.env.conferenceCode,
+          language,
+        }),
+      ];
+    }
+    case DynamicContentDisplaySectionSource.Speakers: {
+      return [
+        queryAcceptedProposals(client, {
+          code: process.env.conferenceCode,
+          language,
+        }),
+      ];
+    }
+  }
+
+  return [];
+};
diff --git a/frontend/src/components/blocks/dynamic-content-display-section/keynoters-content.tsx b/frontend/src/components/blocks/dynamic-content-display-section/keynoters-content.tsx
@@ -0,0 +1,23 @@
+import { Section } from "@python-italia/pycon-styleguide";
+import React from "react";
+import { KeynotesSpeakersCards } from "~/components/keynotes-speakers-cards";
+import { useCurrentLanguage } from "~/locale/context";
+import { useKeynotesSectionQuery } from "~/types";
+
+export const KeynotersContent = () => {
+  const language = useCurrentLanguage();
+  const { data } = useKeynotesSectionQuery({
+    variables: {
+      code: process.env.conferenceCode,
+      language,
+    },
+  });
+  return (
+    <Section noContainer>
+      <KeynotesSpeakersCards
+        keynotes={data.conference.keynotes}
+        justifyContent="left"
+      />
+    </Section>
+  );
+};
diff --git a/frontend/src/components/blocks/dynamic-content-display-section/speakers-content.tsx b/frontend/src/components/blocks/dynamic-content-display-section/speakers-content.tsx
@@ -0,0 +1,45 @@
+import {
+  Grid,
+  Link,
+  Section,
+  SpeakerCard,
+} from "@python-italia/pycon-styleguide";
+
+import { useCurrentLanguage } from "~/locale/context";
+import { useAcceptedProposalsQuery } from "~/types";
+
+export const SpeakersContent = () => {
+  const language = useCurrentLanguage();
+  const {
+    data: {
+      conference: { submissions },
+    },
+  } = useAcceptedProposalsQuery({
+    variables: {
+      code: process.env.conferenceCode,
+      language,
+    },
+  });
+  return (
+    <Section>
+      <Grid cols={3}>
+        {submissions
+          .filter((submission) => submission.speaker)
+          .sort((a, b) => a.speaker.fullname.localeCompare(b.speaker.fullname))
+          .map((submission) => (
+            <Link
+              noHover
+              href={`/profile/${submission.speaker.id}`}
+              key={submission.id}
+            >
+              <SpeakerCard
+                talkTitle={submission.title}
+                speakerName={submission.speaker.fullname}
+                portraitUrl={submission.speaker.photo}
+              />
+            </Link>
+          ))}
+      </Grid>
+    </Section>
+  );
+};
diff --git a/frontend/src/components/blocks/keynotes-section/index.tsx b/frontend/src/components/blocks/keynotes-section/index.tsx
diff --git a/frontend/src/components/keynotes-speakers-cards/index.tsx b/frontend/src/components/keynotes-speakers-cards/index.tsx
diff --git a/frontend/src/components/public-profile-page-handler/fetch-participant.graphql b/frontend/src/components/public-profile-page-handler/fetch-participant.graphql
diff --git a/frontend/src/components/public-profile-page-handler/index.tsx b/frontend/src/components/public-profile-page-handler/index.tsx
diff --git a/frontend/src/pages/profile/[hashid].tsx b/frontend/src/pages/profile/[hashid].tsx
diff --git a/frontend/src/pages/schedule/fragments/blocks.graphql b/frontend/src/pages/schedule/fragments/blocks.graphql
diff --git a/frontend/src/pages/schedule/fragments/submission.graphql b/frontend/src/pages/schedule/fragments/submission.graphql

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ fragment SubmissionFragment on Submission {`
`17`	`17`	`}`
`18`	`18`	`speaker {`
`19`	`19`	`id`
`20`		`- fullName`
	`20`	`+ fullname`
`21`	`21`	`}`
`22`	`22`	`}`