fix: Show company name if campaign organizer is corporation

podkrepi-bg · Apr 4, 2024 · ebeae22 · ebeae22
1 parent 89e08ff
commit ebeae22
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 13 deletions.
diff --git a/src/components/admin/campaigns/grid/OrganizerSelect.tsx b/src/components/admin/campaigns/grid/OrganizerSelect.tsx
@@ -34,12 +34,16 @@ export default function OrganizerSelect({ name = 'organizerId', label = 'campaig
         options={data || []}
         getOptionLabel={(option: OrganizerResponse) => {
           if (!option.person) return ''
-          return `${option.person.firstName} ${option.person.lastName}`
+          return option.person.company
+            ? option.person.company.companyName
+            : `${option.person.firstName} ${option.person.lastName}`
         }}
         renderInput={(params) => <TextField {...params} label={t(label)} />}
         renderOption={(params, option: OrganizerResponse) => (
           <Box component="li" {...params} key={option.id}>
-            {`${option.person.firstName} ${option.person.lastName}`}
+            {option.person.company
+              ? option.person.company.companyName
+              : `${option.person.firstName} ${option.person.lastName}`}
           </Box>
         )}
         isOptionEqualToValue={(option, value) =>

diff --git a/src/components/admin/donations/grid/Grid.tsx b/src/components/admin/donations/grid/Grid.tsx
@@ -96,7 +96,6 @@ export default observer(function Grid() {
 
   const {
     data: { items: donations, total: allDonationsCount } = { items: [], total: 0 },
-    error: donationHistoryError,
     isLoading: isDonationHistoryLoading,
     refetch,
   }: UseQueryResult<CampaignDonationHistoryResponse> = useDonationsList(

diff --git a/src/components/admin/organizers/grid/Grid.tsx b/src/components/admin/organizers/grid/Grid.tsx
@@ -44,7 +44,9 @@ export default observer(function Grid() {
       editable: false,
       width: 400,
       valueGetter: (f) => {
-        return `${f.row.person.firstName} ${f.row.person.lastName}`
+        return f.row.person.company
+          ? f.row.person.company.companyName
+          : `${f.row.person.firstName} ${f.row.person.lastName}`
       },
     },
     {

diff --git a/src/components/client/campaigns/CampaignInfo/CampaignInfoOrganizer.tsx b/src/components/client/campaigns/CampaignInfo/CampaignInfoOrganizer.tsx
@@ -17,12 +17,16 @@ export default function CampaignInfoOrganizer({ campaign }: Props) {
   const { t } = useTranslation()
   const organizerAvatarSource = organizerCampaignPictureUrl(campaign)
 
+  const organizerName = campaign.organizer?.person.company
+    ? campaign.organizer.person.company.companyName
+    : `${campaign.organizer?.person.firstName} ${campaign.organizer?.person.lastName}`
+
   return (
     <BeneficiaryOrganizerRoot>
       <Grid>
         <Label variant="subtitle2">{t('campaigns:campaign.organizer.name')}</Label>
         <Typography variant="subtitle2" component="p">
-          {campaign.organizer?.person.firstName || ''} {campaign.organizer?.person.lastName || ''}
+          {organizerName}
         </Typography>
         <EmailButton
           startIcon={<EmailIcon color="action" />}
@@ -37,9 +41,7 @@ export default function CampaignInfoOrganizer({ campaign }: Props) {
       </Grid>
       <Avatar
         src={organizerAvatarSource}
-        alt={`${t('campaign.image-of')}  ${campaign.organizer?.person.firstName} ${
-          campaign.organizer?.person.lastName
-        }`}
+        alt={`${t('campaign.image-of')}  ${organizerName}`}
         width={100}
         height={100}
       />

diff --git a/src/components/common/person/PersonSelect.tsx b/src/components/common/person/PersonSelect.tsx
@@ -38,7 +38,8 @@ export default function PersonSelect({
         </MenuItem>
         {personList.map((person, index) => (
           <MenuItem key={index} value={person.id}>
-            {person.firstName} {person.lastName}
+            {/* {person.firstName} {person.lastName} */}
+            {person.company ? person.company.companyName : `${person.firstName} ${person.lastName}`}
           </MenuItem>
         ))}
       </FormTextField>

diff --git a/src/gql/campaigns.ts b/src/gql/campaigns.ts
@@ -99,16 +99,33 @@ export type CampaignResponse = BaseCampaignResponse & {
     id: UUID
     type: BeneficiaryType
     publicData: string
-    person: { id: UUID; firstName: string; lastName: string }
+    person: {
+      id: UUID
+      firstName: string
+      lastName: string
+      company: { id: string; companyName: string }
+    }
     company: { id: UUID; companyName: string }
   }
   coordinator: {
     id: UUID
-    person: { id: UUID; firstName: string; lastName: string; email: string }
+    person: {
+      id: UUID
+      firstName: string
+      lastName: string
+      email: string
+      company: { id: string; companyName: string }
+    }
   }
   organizer?: {
     id: UUID
-    person: { id: UUID; firstName: string; lastName: string; email: string }
+    person: {
+      id: UUID
+      firstName: string
+      lastName: string
+      email: string
+      company: { id: string; companyName: string }
+    }
   }
   campaignFiles: CampaignFile[] | []
   vaults?: VaultResponse[]

diff --git a/src/gql/person.d.ts b/src/gql/person.d.ts
@@ -9,14 +9,14 @@ export type PersonResponse = {
   email?: string
   phone?: string
   address: string
-  company: string
   createdAt: string
   newsletter: boolean
   emailConfirmed: boolean
   beneficiaries?: PersonBeneficiaryResponse[]
   coordinators?: PersonRoleResponse
   organizer?: PersonRoleResponse
   profileEnabled: boolean
+  company: Pick<CompanyResponse, 'id' | 'companyName'>
 }
 
 export type PersonRoleResponse = {