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.

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

Add group filters to attendance modal #5298

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions app/components/UserAttendance/AttendanceModalContent.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,27 @@
transition: opacity var(--linear-fast);
opacity: 0.4;
}

.groupFilters {
position: relative;
flex-shrink: 0;
overflow: hidden;
}

.collapsedIndicator {
position: absolute;
right: 0;
left: 0;
bottom: 0;
height: 50%;
background: linear-gradient(to bottom, transparent, var(--color-white) 90%);
}

.groupFilterButton {
cursor: pointer;

&.selected {
background-color: var(--lego-font-color);
color: var(--inverted-font-color);
}
}
48 changes: 35 additions & 13 deletions app/components/UserAttendance/AttendanceModalContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@ import { Flex } from '@webkom/lego-bricks';
import cx from 'classnames';
import { flatMap } from 'lodash';
import { Send } from 'lucide-react';
import { useState, useMemo } from 'react';
import { useMemo, useState } from 'react';
import { Link } from 'react-router-dom';
import { TextInput } from 'app/components/Form';
import { ProfilePicture } from 'app/components/Image';
import { GroupFilter } from 'app/components/UserAttendance/GroupFilter';
import EmptyState from '../EmptyState';
import styles from './AttendanceModalContent.module.css';
import type { EntityId } from '@reduxjs/toolkit';
import type { PublicUser } from 'app/store/models/User';
import type {
PublicUser,
PublicUserWithAbakusGroups,
} from 'app/store/models/User';

export type AttendanceModalRegistration = {
id: EntityId;
user: PublicUser;
user: PublicUser | PublicUserWithAbakusGroups;
pool?: EntityId;
};

Expand Down Expand Up @@ -66,18 +70,28 @@ const AttendanceModalContent = ({
selectedPool,
isMeeting,
}: Props) => {
const [filter, setFilter] = useState<string>('');
const [search, setSearch] = useState<string>('');
const [groupFilter, setGroupFilter] = useState<EntityId | null>(null);

const amendedPools = useMemo(() => generateAmendedPools(pools), [pools]);

const registrations = useMemo(
() => amendedPools[selectedPool]?.registrations,
[amendedPools, selectedPool],
);

const filteredRegistrations = useMemo(
() =>
amendedPools[selectedPool]?.registrations.filter((registration) => {
return registration.user.fullName
.toLowerCase()
.includes(filter.toLowerCase());
}),
[filter, amendedPools, selectedPool],
registrations.filter(
(registration) =>
registration.user.fullName
.toLowerCase()
.includes(search.toLowerCase()) &&
(groupFilter && 'abakusGroups' in registration.user
? registration.user.abakusGroups.includes(groupFilter)
: true),
),
[registrations, search, groupFilter],
);

return (
Expand All @@ -86,13 +100,21 @@ const AttendanceModalContent = ({
type="text"
prefix="search"
placeholder="Søk etter navn"
onChange={(e) => setFilter(e.target.value)}
onChange={(e) => setSearch(e.target.value)}
className={styles.searchInput}
/>

{!isMeeting && (
<GroupFilter
registrations={registrations}
groupFilter={groupFilter}
setGroupFilter={setGroupFilter}
/>
)}

<ul className={styles.list}>
{registrations.length > 0 ? (
registrations?.map((registration) => (
{filteredRegistrations.length > 0 ? (
filteredRegistrations?.map((registration) => (
<li key={registration.id}>
<Flex
alignItems="center"
Expand Down
89 changes: 89 additions & 0 deletions app/components/UserAttendance/GroupFilter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import { Flex } from '@webkom/lego-bricks';
import { useMemo, useState } from 'react';
import Pill from 'app/components/Pill';
import styles from 'app/components/UserAttendance/AttendanceModalContent.module.css';
import { selectCurrentUser } from 'app/reducers/auth';
import { selectAllGroups } from 'app/reducers/groups';
import { useAppSelector } from 'app/store/hooks';
import type { EntityId } from '@reduxjs/toolkit';
import type { AttendanceModalRegistration } from 'app/components/UserAttendance/AttendanceModalContent';
import cx from 'classnames';

const excludeFilterGroups: EntityId[] = [
1, // Users
2, // Abakus
47, // Formaterte
eikhr marked this conversation as resolved.
Show resolved Hide resolved
227, // Baksida-Komite
228, // Baksida-Revy
92, // Kasserere
242, // Klassetillitsvalgt
];

type Props = {
registrations: AttendanceModalRegistration[];
groupFilter: EntityId | null;
setGroupFilter: (group: EntityId | null) => void;
};

export const GroupFilter = ({
registrations,
groupFilter,
setGroupFilter,
}: Props) => {
const currentUser = useAppSelector(selectCurrentUser);
const allGroups = useAppSelector(selectAllGroups);
const [hovered, setHovered] = useState(false);
const expanded = hovered || groupFilter !== null;

const topGroups = useMemo(
() =>
allGroups
.filter(
(group) =>
currentUser?.abakusGroups.includes(group.id) &&
!excludeFilterGroups.includes(group.id),
)
.map(
(group) =>
[
group,
registrations.filter(
(reg) =>
'abakusGroups' in reg.user &&
reg.user.abakusGroups.includes(group.id),
).length,
] as const,
)
.sort((a, b) => b[1] - a[1]),
[allGroups, currentUser?.abakusGroups, registrations],
);

return (
<Flex
wrap
gap="var(--spacing-sm)"
style={{ maxHeight: expanded ? undefined : '3rem' }}
className={styles.groupFilters}
onMouseEnter={() => setHovered(true)}
onMouseLeave={() => setHovered(false)}
>
{topGroups.map(([group]) => (
<Pill
key={group.id}
onClick={() =>
groupFilter === group.id
? setGroupFilter(null)
: setGroupFilter(group.id)
}
className={cx(
styles.groupFilterButton,
groupFilter === group.id && styles.selected,
)}
>
{group.name}
</Pill>
))}
{!expanded && <div className={styles.collapsedIndicator} />}
</Flex>
);
};