Skip to content

refactor: event category display #103

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

Open
gxnca wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: event category display #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
95 changes: 56 additions & 39 deletions src/components/calendarOptions/events/display-categories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,39 +31,54 @@ export default function DisplayCategories({
label={`${ordinalNumbers[yearGroup.year - 1]} Year`}
key={`${ordinalNumbers[yearGroup.year - 1]} Year`}
>
<div className="divide-dark/8 bg-light w-full space-y-3 divide-y rounded-lg pt-3 pl-4">
{yearGroup.categories.map((category) => (
<EventHeader
key={category.id}
name={category.name}
eventId={category.id}
color={category.color}
isEditing={isEditing}
state={state}
onAction={
category.type === "optional" ? onAction : undefined
}
/>
))}
<div className="mt-1 ml-2 h-full w-full">
{Object.entries(yearGroup.semesters).map(
([semesterKey, categories]) => (
<CustomDisclosure
label={`${ordinalNumbers[Number(semesterKey) - 1]} Semester`}
key={`${ordinalNumbers[Number(semesterKey) - 1]} Semester`}
>
<div className="divide-dark/8 bg-light w-full space-y-3 divide-y rounded-lg pt-3 pl-4">
{categories.map((category) => (
<EventHeader
key={category.id}
name={category.name}
eventId={category.id}
color={category.color}
isEditing={isEditing}
state={state}
onAction={
category.type === "optional"
? onAction
: undefined
}
/>
))}
</div>
</CustomDisclosure>
),
)}
</div>
</CustomDisclosure>
) : (
yearGroup.categories.length > 0 && (
!yearGroup.year && (
<CustomDisclosure label="Other" key="Other">
<div className="divide-dark/8 bg-light w-full space-y-3 divide-y rounded-lg pt-3 pl-4">
{yearGroup.categories.map((category) => (
<EventHeader
key={category.id}
name={category.name}
eventId={category.id}
color={category.color}
isEditing={isEditing}
state={state}
onAction={
category.type === "optional" ? onAction : undefined
}
/>
))}
{Object.values(yearGroup.semesters).flatMap((categories) =>
categories.map((category) => (
<EventHeader
key={category.id}
name={category.name}
eventId={category.id}
color={category.color}
isEditing={isEditing}
state={state}
onAction={
category.type === "optional" ? onAction : undefined
}
/>
)),
)}
</div>
</CustomDisclosure>
)
Expand All @@ -75,17 +90,19 @@ export default function DisplayCategories({
return (
<ScrollableContainer items={items}>
{items.flatMap((yearGroup) =>
yearGroup.categories.map((category) => (
<EventHeader
key={category.id}
name={category.name}
eventId={category.id}
color={category.color}
isEditing={isEditing}
state={state}
onAction={category.type === "optional" ? onAction : undefined}
/>
)),
Object.values(yearGroup.semesters).flatMap((categories) =>
categories.map((category) => (
<EventHeader
key={category.id}
name={category.name}
eventId={category.id}
color={category.color}
isEditing={isEditing}
state={state}
onAction={category.type === "optional" ? onAction : undefined}
/>
)),
),
)}
</ScrollableContainer>
);
Expand Down
20 changes: 15 additions & 5 deletions src/contexts/events-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ function sortCategoriesByYear(
{ otherCategories: [], courseCategories: [] },
);

const otherFormatted = { categories: otherCategories };
const otherFormatted = {
year: undefined,
semesters: { 0: otherCategories },
};

const courseCategoriesMap = courseCategories.reduce(
(acc, category) => {
Expand All @@ -65,15 +68,22 @@ function sortCategoriesByYear(
if (!acc[yearKey]) {
acc[yearKey] = {
year: category.course ? Number(category.course.year) : 0,
categories: [category],
semesters: {},
};
} else {
acc[yearKey].categories.push(category);
}

const semesterKey = category.course?.semester ?? 0;
if (!acc[yearKey].semesters[semesterKey]) {
acc[yearKey].semesters[semesterKey] = [];
}
acc[yearKey].semesters[semesterKey].push(category);

return acc;
},
{} as Record<string, { year: number; categories: IEventCategory[] }>,
{} as Record<
string,
{ year: number; semesters: Record<number, IEventCategory[]> }
>,
);

const courseCategoriesFormatted = Object.values(courseCategoriesMap);
Expand Down
4 changes: 2 additions & 2 deletions src/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export type IShiftsSorted = {
semesters: Record<
number,
Record<
string,
number,
{
courseName: string;
color: string;
Expand Down Expand Up @@ -122,7 +122,7 @@ export interface IEventCategory {

export type IEventCategoriesSorted = {
year?: number;
categories: IEventCategory[];
semesters: Record<number, IEventCategory[]>;
}[];

export interface IItemProps {
Expand Down