Skip to content
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

Remove user info in application modal #79

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+99 −94
Open

Remove user info in application modal #79

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df83078
hide user info
dag-mara Jan 5, 2025
7f4656e
delete unused imports
dag-mara Jan 5, 2025
39077d2
revert change
dag-mara Jan 6, 2025
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
135 changes: 2 additions & 133 deletions frontend/src/org/components/EventForm/steps/registration/ShowApplicationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ import type {
MembershipCategory,
User,
} from 'app/services/bisTypes'
import { EmailButton, PhoneButton, StyledModal, DataView } from 'components'
import { EmailButton, PhoneButton, StyledModal } from 'components'
import { FC } from 'react'
import styles from '../ParticipantsStep.module.scss'
import { FC, Fragment } from 'react'
import { mergeWith, omit } from 'lodash'
import { withOverwriteArray } from 'utils/helpers'
import * as combinedTranslations from 'config/static/combinedTranslations'

interface IShowApplicationModalProps {
open: boolean
Expand All @@ -37,8 +34,6 @@ export const ShowApplicationModal: FC<IShowApplicationModalProps> = ({
// setShowAddParticipantModal,
// deleteEventApplication,
userId,
categories,
administrationUnits,
currentParticipant,
participantsMap,
}) => {
Expand All @@ -64,23 +59,6 @@ export const ShowApplicationModal: FC<IShowApplicationModalProps> = ({
}
: skipToken,
)
// we'll also show last year membership till end of February
// we want to give people time to register for the new year
// and still show continuity of membership
const currentYear = new Date().getFullYear()
const currentMonth = new Date().getMonth()
const currentMemberships = (user?.memberships ?? []).filter(
membership =>
membership.year === currentYear ||
(currentMonth < 2 && membership.year === currentYear - 1),
)
// TODO consider showing historical memberships, too

const formattedUser = mergeWith(
omit(user, 'id', '_search_id', 'display_name'),
{ memberships: user?.memberships },
withOverwriteArray,
)

if (!open) return null

Expand Down Expand Up @@ -177,115 +155,6 @@ export const ShowApplicationModal: FC<IShowApplicationModalProps> = ({
</div>
</div>
)}
{userId && user && (
<div>
<div className={styles.addedUserBlock}>
<h3>Uživatel přidaný na akci: </h3>
<h4>
{user.first_name} {user.last_name}{' '}
{user.nickname && `(${user.nickname})`}{' '}
</h4>
</div>

{user.birthday && (
<div>
<span>Datum narození: </span>
<span>{user.birthday}</span>
</div>
)}
{user.pronoun?.name && (
<div>
<span>Oslovení: </span>
<span>{user.pronoun.name}</span>
</div>
)}

{user.email && (
<div>
<span>E-mail: </span>
<span>
<EmailButton>{user.email}</EmailButton>
</span>
</div>
)}
{user.phone && (
<div>
<span>Telefon: </span>
<span>
<PhoneButton>{user.phone}</PhoneButton>
</span>
</div>
)}
{user.health_issues && (
<div>
<span>Zdravotní omezení: </span>
<span>{user.health_issues}</span>
</div>
)}
{user.close_person && (
<div>
<span>Blízká osoba: </span>
<span>{`${user.close_person.first_name} ${user.close_person.last_name}`}</span>
{user.close_person.email && (
<span>
'email: ' <EmailButton>{user.close_person.email}</EmailButton>
</span>
)}
{user.close_person.phone && (
<span>
'tel: ' <PhoneButton>{user.close_person.phone}</PhoneButton>
</span>
)}
</div>
)}
{currentMemberships && currentMemberships.length !== 0 && (
<div>
<span>Členství: </span>
<div>
{currentMemberships.map(membership => {
return (
<Fragment
key={`${membership.year}-${membership.administration_unit}-${membership.category}`}
>
{administrationUnits && categories && (
<div>
{
administrationUnits.find(
unit =>
membership.administration_unit === unit.id,
)?.name
}
{' - '}
{
categories.find(
category =>
membership.category.id === category.id,
)?.name
}{' '}
({membership.year})
</div>
)}
</Fragment>
)
})}
</div>
</div>
)}
</div>
)}
{userId &&
user &&
currentApplication &&
currentApplication.email === formattedUser.email && (
<div>
<h3>Detaily uživatele:</h3>
<DataView
data={formattedUser}
translations={combinedTranslations.user}
genericTranslations={combinedTranslations.generic}
/>
</div>
)}
</StyledModal>
)
}