eduvia/workavia-calendar-front
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#397 bis] added participation management on event from thunderbird (#432)

Browse Source 
Co-authored-by: Camille Moussu <cmoussu@linagora.com>
This commit is contained in:
Camille Moussu
2026-01-07 11:45:17 +01:00
committed by GitHub
parent e59d878e6c
commit 9ff75056c7
47 changed files with 550 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__test__/features/Calendars/CalendarModal.test.tsx
+3 -3
View File
@@ -2,7 +2,7 @@ import { screen, fireEvent, waitFor } from "@testing-library/react";
import CalendarPopover from "../../../src/components/Calendar/CalendarModal";
import { renderWithProviders } from "../../utils/Renderwithproviders";
import * as eventThunks from "../../../src/features/Calendars/CalendarSlice";
import { Calendars } from "../../../src/features/Calendars/CalendarTypes";
import { Calendar } from "../../../src/features/Calendars/CalendarTypes";
import { getSecretLink } from "../../../src/features/Calendars/CalendarApi";
jest.mock("../../../src/features/Calendars/CalendarApi", () => ({
@@ -103,7 +103,7 @@ describe("CalendarPopover (editing mode)", () => {
},
};
const existingCalendar: Calendars = {
const existingCalendar: Calendar = {
id: "user1/cal1",
link: "/calendars/user/cal1",
name: "Work Calendar",
@@ -208,7 +208,7 @@ describe("CalendarPopover - Tabs Scenarios", () => {
},
});
const existingCalendar: Calendars = {
const existingCalendar: Calendar = {
id: "user1/cal1",
link: "/calendars/user1/cal1.json",
name: "Work Calendar",
__test__/features/Calendars/CalendarSlice.test.tsx
+7 -7
View File
@@ -22,7 +22,7 @@ import * as calAPI from "../../../src/features/Calendars/CalendarApi";
import * as userAPI from "../../../src/features/User/userAPI";
import { configureStore } from "@reduxjs/toolkit";
import { Calendars } from "../../../src/features/Calendars/CalendarTypes";
import { Calendar } from "../../../src/features/Calendars/CalendarTypes";
import { CalendarEvent } from "../../../src/features/Events/EventsTypes";
jest.mock("../../../src/features/Calendars/CalendarApi");
@@ -79,7 +79,7 @@ describe("CalendarSlice", () => {
[calId]: {
id: calId,
events: { e1: { uid: "e1" } },
} as unknown as Calendars,
} as unknown as Calendar,
},
};
const state = reducer(
@@ -97,7 +97,7 @@ describe("CalendarSlice", () => {
[calId]: {
id: calId,
events: { e1: { uid: "e1", title: "Old" } },
} as unknown as Calendars,
} as unknown as Calendar,
},
};
const state = reducer(
@@ -276,7 +276,7 @@ describe("CalendarSlice", () => {
id: "u1/cal1",
name: "Existing Calendar",
events: {},
} as Calendars,
} as Calendar,
};
const store = storeFactory();
@@ -447,7 +447,7 @@ describe("CalendarSlice", () => {
[calId]: {
id: calId,
events: { e1: { uid: "e1" } },
} as unknown as Calendars,
} as unknown as Calendar,
},
};
const state = reducer(
@@ -473,7 +473,7 @@ describe("CalendarSlice", () => {
ownerEmails: ["o@o.com"],
link: "/calendars/t1.json",
description: "desc",
} as Calendars,
} as Calendar,
};
const state = reducer(
initialState,
@@ -533,7 +533,7 @@ describe("CalendarSlice", () => {
["c1"]: {
id: "c1",
events: {},
} as unknown as Calendars,
} as unknown as Calendar,
},
},
getCalendarDetailAsync.fulfilled(payload, "req11", {
__test__/features/Events/EventDisplay.test.tsx
+13 -11
View File
@@ -300,13 +300,13 @@ describe("Event Preview Display", () => {
screen.getByText("eventPreview.attendingQuestion")
).toBeInTheDocument();
expect(
screen.getByRole("button", { name: "eventPreview.accept" })
screen.getByRole("button", { name: "eventPreview.ACCEPTED" })
).toBeInTheDocument();
expect(
screen.getByRole("button", { name: "eventPreview.maybe" })
screen.getByRole("button", { name: "eventPreview.TENTATIVE" })
).toBeInTheDocument();
expect(
screen.getByRole("button", { name: "eventPreview.decline" })
screen.getByRole("button", { name: "eventPreview.DECLINED" })
).toBeInTheDocument();
});
it("doesnt renders RSVP buttons when user isnt an attendee", () => {
@@ -354,13 +354,13 @@ describe("Event Preview Display", () => {
screen.queryByText("eventPreview.attendingQuestion")
).not.toBeInTheDocument();
expect(
screen.queryByRole("button", { name: "eventPreview.accept" })
screen.queryByRole("button", { name: "eventPreview.ACCEPTED" })
).not.toBeInTheDocument();
expect(
screen.queryByRole("button", { name: "eventPreview.maybe" })
screen.queryByRole("button", { name: "eventPreview.TENTATIVE" })
).not.toBeInTheDocument();
expect(
screen.queryByRole("button", { name: "eventPreview.decline" })
screen.queryByRole("button", { name: "eventPreview.DECLINED" })
).not.toBeInTheDocument();
});
@@ -414,7 +414,7 @@ describe("Event Preview Display", () => {
);
fireEvent.click(
screen.getByRole("button", { name: "eventPreview.accept" })
screen.getByRole("button", { name: "eventPreview.ACCEPTED" })
);
await waitFor(() => {
@@ -474,7 +474,9 @@ describe("Event Preview Display", () => {
rsvpState
);
fireEvent.click(screen.getByRole("button", { name: "eventPreview.maybe" }));
fireEvent.click(
screen.getByRole("button", { name: "eventPreview.TENTATIVE" })
);
await waitFor(() => {
expect(spy).toHaveBeenCalled();
@@ -534,7 +536,7 @@ describe("Event Preview Display", () => {
);
fireEvent.click(
screen.getByRole("button", { name: "eventPreview.decline" })
screen.getByRole("button", { name: "eventPreview.DECLINED" })
);
await waitFor(() => {
@@ -1020,7 +1022,7 @@ describe("Event Preview Display", () => {
).not.toBeInTheDocument();
});
it("displays only maybe count when all attendees tentative", () => {
it("displays only TENTATIVE count when all attendees tentative", () => {
const attendees = [
{
cn: "organizer",
@@ -1262,7 +1264,7 @@ describe("Event Preview Display", () => {
).toBeInTheDocument();
});
it("displays correct counts with multiple yes and maybe", () => {
it("displays correct counts with multiple yes and TENTATIVE", () => {
const attendees = [
{
cn: "Guest 1",
__test__/features/Events/EventModal.test.tsx
+1 -1
View File
@@ -258,7 +258,7 @@ describe("EventPopover", () => {
{
cn: "John Doe",
cal_address: "john@example.com",
partstat: "NEED_ACTION",
partstat: "NEEDS-ACTION",
rsvp: "FALSE",
role: "REQ-PARTICIPANT",
cutype: "INDIVIDUAL",
__test__/features/Events/EventRepetition.test.tsx
+4 -5
View File
@@ -315,7 +315,7 @@ describe("EventPreviewModal - Recurring Event Interactions", () => {
);
fireEvent.click(
screen.getByRole("button", { name: "eventPreview.accept" })
screen.getByRole("button", { name: "eventPreview.ACCEPTED" })
);
await waitFor(() => {
@@ -505,7 +505,7 @@ describe("RSVP to Recurring Event", () => {
);
fireEvent.click(
screen.getByRole("button", { name: "eventPreview.accept" })
screen.getByRole("button", { name: "eventPreview.ACCEPTED" })
);
await waitFor(() => {
@@ -543,7 +543,7 @@ describe("RSVP to Recurring Event", () => {
);
fireEvent.click(
screen.getByRole("button", { name: "eventPreview.accept" })
screen.getByRole("button", { name: "eventPreview.ACCEPTED" })
);
await waitFor(() => {
@@ -975,8 +975,7 @@ describe("handleRSVP function", () => {
basePreloadedState.calendars.list["667037022b752d0026472254/cal1"],
basePreloadedState.user,
nonRecurringEvent,
"ACCEPTED",
mockOnClose
"ACCEPTED"
);
expect(mockDispatch).toHaveBeenCalled();
__test__/features/Events/TempUpdate.test.tsx
+4 -4
View File
@@ -13,7 +13,7 @@ import EventUpdateModal from "../../../src/features/Events/EventUpdateModal";
import CalendarLayout from "../../../src/components/Calendar/CalendarLayout";
import { renderWithProviders } from "../../utils/Renderwithproviders";
import { SpiedFunction } from "jest-mock";
import { Calendars } from "../../../src/features/Calendars/CalendarTypes";
import { Calendar } from "../../../src/features/Calendars/CalendarTypes";
import { CalendarEvent } from "../../../src/features/Events/EventsTypes";
import { DateSelectArg } from "@fullcalendar/core";
@@ -27,7 +27,7 @@ describe("Update tempcalendars called with correct params", () => {
let refreshCalendarsSpy: SpiedFunction<
(
dispatch: ThunkDispatch<any, any, any>,
calendars: Calendars[],
calendars: Calendar[],
calendarRange: { start: Date; end: Date },
calType?: "temp"
) => Promise<void>
@@ -35,14 +35,14 @@ describe("Update tempcalendars called with correct params", () => {
let refreshSingularCalendarSpy: SpiedFunction<
(
dispatch: ThunkDispatch<any, any, any>,
calendar: Calendars,
calendar: Calendar,
calendarRange: { start: Date; end: Date },
calType?: "temp"
) => Promise<void>
>;
let updateTempCalendarSpy: SpiedFunction<
(
tempcalendars: Record<string, Calendars>,
tempcalendars: Record<string, Calendar>,
event: CalendarEvent,
dispatch: ThunkDispatch<any, any, any>,
calendarRange: { start: Date; end: Date }
__test__/features/Events/eventUtils.test.ts
+10 -10
View File
@@ -71,9 +71,9 @@ describe("parseCalendarEvent", () => {
cn: "Bob",
cal_address: "bob@example.com",
partstat: "ACCEPTED",
rsvp: "",
role: "",
cutype: "",
cutype: "INDIVIDUAL",
role: "REQ-PARTICIPANT",
rsvp: "FALSE",
},
]);
});
@@ -133,9 +133,9 @@ describe("parseCalendarEvent", () => {
cn: "Bob",
cal_address: "bob@example.com",
partstat: "ACCEPTED",
rsvp: "",
role: "",
cutype: "",
cutype: "INDIVIDUAL",
role: "REQ-PARTICIPANT",
rsvp: "FALSE",
},
]);
});
@@ -285,10 +285,10 @@ describe("parseCalendarEvent", () => {
{
cn: "",
cal_address: "john@example.com",
partstat: "",
rsvp: "",
role: "",
cutype: "",
partstat: "NEEDS-ACTION",
cutype: "INDIVIDUAL",
role: "REQ-PARTICIPANT",
rsvp: "FALSE",
},
]);
src/components/Attendees/AttendeeSearch.tsx
+14 -15
View File
@@ -1,5 +1,6 @@
import { useEffect, useState } from "react";
import { userAttendee } from "../../features/User/userDataTypes";
import { userAttendee } from "../../features/User/models/attendee";
import { createAttendee } from "../../features/User/models/attendee.mapper";
import {
PeopleSearch,
User,
@@ -20,18 +21,18 @@ export default function UserSearch({
) => React.ReactNode;
}) {
const [selectedUsers, setSelectedUsers] = useState(
attendees.map((a) => ({
email: a.cal_address,
displayName: a.cn ?? "",
attendees.map((attendee) => ({
email: attendee.cal_address,
displayName: attendee.cn ?? "",
avatarUrl: "",
openpaasId: "",
})) ?? []
);
useEffect(() => {
setSelectedUsers(
attendees.map((a) => ({
email: a.cal_address,
displayName: a.cn ?? "",
attendees.map((attendee) => ({
email: attendee.cal_address,
displayName: attendee.cn ?? "",
avatarUrl: "",
openpaasId: "",
}))
@@ -45,14 +46,12 @@ export default function UserSearch({
inputSlot={inputSlot}
onChange={(event: any, value: User[]) => {
setAttendees(
value.map((a: User) => ({
cn: a.displayName,
cal_address: a.email,
partstat: "NEED_ACTION",
rsvp: "FALSE",
role: "REQ-PARTICIPANT",
cutype: "INDIVIDUAL",
}))
value.map((attendee: User) =>
createAttendee({
cal_address: attendee.email,
cn: attendee.displayName,
})
)
);
setSelectedUsers(value);
}}
src/components/Calendar/AccessTab.tsx
+2 -2
View File
@@ -15,13 +15,13 @@ import {
exportCalendar,
getSecretLink,
} from "../../features/Calendars/CalendarApi";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import { FieldWithLabel } from "../Event/components/FieldWithLabel";
import { SnackbarAlert } from "../Loading/SnackBarAlert";
import { useI18n } from "twake-i18n";
import { ErrorSnackbar } from "../Error/ErrorSnackbar";
export function AccessTab({ calendar }: { calendar: Calendars }) {
export function AccessTab({ calendar }: { calendar: Calendar }) {
const { t } = useI18n();
const calDAVLink = `${(window as any).CALENDAR_BASE_URL}${calendar.link.replace(".json", "")}`;
src/components/Calendar/CalendarItemList.tsx
+2 -2
View File
@@ -1,10 +1,10 @@
import React from "react";
import { MenuItem } from "@mui/material";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import { CalendarName } from "./CalendarName";
export function CalendarItemList(
userPersonalCalendars: Calendars[]
userPersonalCalendars: Calendar[]
): React.ReactNode {
return Object.values(userPersonalCalendars).map((calendar) => (
<MenuItem key={calendar.id} value={calendar.id}>
src/components/Calendar/CalendarModal.tsx
+2 -2
View File
@@ -7,7 +7,7 @@ import {
patchACLCalendarAsync,
patchCalendarAsync,
} from "../../features/Calendars/CalendarSlice";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import { ResponsiveDialog } from "../Dialog";
import { AccessTab } from "./AccessTab";
import { ImportTab } from "./ImportTab";
@@ -25,7 +25,7 @@ function CalendarPopover({
event: object | null,
reason: "backdropClick" | "escapeKeyDown"
) => void;
calendar?: Calendars;
calendar?: Calendar;
}) {
const { t } = useI18n();
const dispatch = useAppDispatch();
src/components/Calendar/CalendarName.tsx
+2 -2
View File
@@ -1,7 +1,7 @@
import { Box, Typography } from "@mui/material";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import SquareRoundedIcon from "@mui/icons-material/SquareRounded";
export function CalendarName({ calendar }: { calendar: Calendars }) {
export function CalendarName({ calendar }: { calendar: Calendar }) {
return (
<Box style={{ display: "flex", flexDirection: "row", gap: 8 }}>
<SquareRoundedIcon
src/components/Calendar/CalendarSearch.tsx
+2 -2
View File
@@ -10,7 +10,7 @@ import { useState } from "react";
import { useAppDispatch, useAppSelector } from "../../app/hooks";
import { getCalendars } from "../../features/Calendars/CalendarApi";
import { addSharedCalendarAsync } from "../../features/Calendars/CalendarSlice";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import TextField from "@mui/material/TextField";
import { PeopleSearch, User } from "../Attendees/PeopleSearch";
import { ResponsiveDialog } from "../Dialog";
@@ -93,7 +93,7 @@ function SelectedCalendarsList({
onRemove,
onColorChange,
}: {
calendars: Record<string, Calendars>;
calendars: Record<string, Calendar>;
selectedCal: CalendarWithOwner[];
onRemove: (cal: CalendarWithOwner) => void;
onColorChange: (
src/components/Calendar/CalendarSelection.tsx
+2 -2
View File
@@ -6,7 +6,7 @@ import { useAppDispatch, useAppSelector } from "../../app/hooks";
import AddIcon from "@mui/icons-material/Add";
import { useState, useMemo, useEffect } from "react";
import CalendarPopover from "./CalendarModal";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import MoreVertIcon from "@mui/icons-material/MoreVert";
import IconButton from "@mui/material/IconButton";
import Checkbox from "@mui/material/Checkbox";
@@ -206,7 +206,7 @@ function CalendarSelector({
handleCalendarToggle,
setOpen,
}: {
calendars: Record<string, Calendars>;
calendars: Record<string, Calendar>;
id: string;
isPersonal: boolean;
selectedCalendars: string[];
src/components/Calendar/DeleteCalendarDialog.tsx
+2 -2
View File
@@ -1,5 +1,5 @@
import Dialog from "@mui/material/Dialog";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import DialogTitle from "@mui/material/DialogTitle";
import DialogContent from "@mui/material/DialogContent";
import DialogContentText from "@mui/material/DialogContentText";
@@ -17,7 +17,7 @@ export function DeleteCalendarDialog({
}: {
deletePopupOpen: boolean;
setDeletePopupOpen: (e: boolean) => void;
calendars: Record<string, Calendars>;
calendars: Record<string, Calendar>;
id: string;
isPersonal: boolean;
handleDeleteConfirm: () => void;
src/components/Calendar/SettingsTab.tsx
+2 -2
View File
@@ -12,7 +12,7 @@ import {
import { useI18n } from "twake-i18n";
import { useState, useEffect } from "react";
import { useAppSelector } from "../../app/hooks";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import { AddDescButton } from "../Event/AddDescButton";
import { ColorPicker } from "./CalendarColorPicker";
@@ -35,7 +35,7 @@ export function SettingsTab({
setColor: Function;
visibility: "public" | "private";
setVisibility: Function;
calendar?: Calendars;
calendar?: Calendar;
}) {
const { t } = useI18n();
const [toggleDesc, setToggleDesc] = useState(Boolean(description));
src/components/Calendar/TempCalendarsInput.tsx
+2 -2
View File
@@ -6,7 +6,7 @@ import {
getTempCalendarsListAsync,
removeTempCal,
} from "../../features/Calendars/CalendarSlice";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import { setView } from "../../features/Settings/SettingsSlice";
import TextField from "@mui/material/TextField";
import { User, PeopleSearch } from "../Attendees/PeopleSearch";
@@ -134,7 +134,7 @@ function getCalendarsFromUsersDelta(
return { calendarsToImport, calendarsToToggle };
}
function buildEmailToCalendarMap(calRecord: Record<string, Calendars>) {
function buildEmailToCalendarMap(calRecord: Record<string, Calendar>) {
const map = new Map<string, string[]>();
for (const [id, cal] of Object.entries(calRecord)) {
cal.ownerEmails?.forEach((email) => {
src/components/Calendar/handlers/eventHandlers.ts
+12 -12
View File
@@ -1,7 +1,7 @@
import { DateSelectArg } from "@fullcalendar/core";
import { CalendarApi } from "@fullcalendar/core";
import { CalendarEvent } from "../../../features/Events/EventsTypes";
import { Calendars } from "../../../features/Calendars/CalendarTypes";
import { Calendar } from "../../../features/Calendars/CalendarTypes";
import { getDeltaInMilliseconds } from "../../../utils/dateUtils";
import {
getCalendarDetailAsync,
@@ -17,21 +17,22 @@ import { refreshCalendars } from "../../Event/utils/eventUtils";
import { updateTempCalendar } from "../utils/calendarUtils";
import { User } from "../../Attendees/PeopleSearch";
import { formatLocalDateTime } from "../../Event/utils/dateTimeFormatters";
import { userAttendee } from "../../../features/User/userDataTypes";
import { userAttendee } from "../../../features/User/models/attendee";
import { createAttendee } from "../../../features/User/models/attendee.mapper";
export interface EventHandlersProps {
setSelectedRange: (range: DateSelectArg | null) => void;
setAnchorEl: (el: HTMLElement | null) => void;
calendarRef: React.RefObject<CalendarApi | null>;
selectedCalendars: string[];
tempcalendars: Record<string, Calendars>;
tempcalendars: Record<string, Calendar>;
calendarRange: { start: Date; end: Date };
dispatch: any;
setOpenEventDisplay: (open: boolean) => void;
setEventDisplayedId: (id: string) => void;
setEventDisplayedCalId: (id: string) => void;
setEventDisplayedTemp: (temp: boolean) => void;
calendars: Record<string, Calendars>;
calendars: Record<string, Calendar>;
setSelectedEvent: (event: CalendarEvent) => void;
setAfterChoiceFunc: (func: Function) => void;
setOpenEditModePopup: (open: string) => void;
@@ -72,14 +73,13 @@ export const createEventHandlers = (props: EventHandlersProps) => {
end: selectInfo?.end
? formatLocalDateTime(selectInfo?.end, timezone)
: "",
attendee: tempUsers.map((u) => ({
cn: u.displayName,
cal_address: u.email,
partstat: "NEED-ACTION",
role: "REQ-PARTICIPANT",
rsvp: "TRUE",
cutype: "INDIVIDUAL",
})),
attendee: tempUsers.map((user) =>
createAttendee({
cal_address: user.email,
cn: user.displayName,
rsvp: "TRUE",
})
),
} as CalendarEvent;
setTempEvent(newEvent);
src/components/Calendar/handlers/viewHandlers.ts
+4 -4
View File
@@ -1,8 +1,8 @@
import React from "react";
import { CalendarApi, NowIndicatorContentArg } from "@fullcalendar/core";
import { createMouseHandlers } from "./mouseHandlers";
import { userAttendee } from "../../../features/User/userDataTypes";
import { Calendars } from "../../../features/Calendars/CalendarTypes";
import { userAttendee } from "../../../features/User/models/attendee";
import { Calendar } from "../../../features/Calendars/CalendarTypes";
import { EventErrorHandler } from "../../Error/EventErrorHandler";
import { EventChip } from "../../Event/EventChip/EventChip";
@@ -11,8 +11,8 @@ export interface ViewHandlersProps {
setSelectedDate: (date: Date) => void;
setSelectedMiniDate: (date: Date) => void;
onViewChange?: (view: string) => void;
calendars: Record<string, Calendars>;
tempcalendars: Record<string, Calendars>;
calendars: Record<string, Calendar>;
tempcalendars: Record<string, Calendar>;
errorHandler: EventErrorHandler;
}
src/components/Calendar/utils/calendarColorsUtils.tsx
+2 -2
View File
@@ -1,10 +1,10 @@
import { darken, getContrastRatio, lighten, Theme } from "@mui/material";
import { ThunkDispatch } from "@reduxjs/toolkit";
import { updateCalColor } from "../../../features/Calendars/CalendarSlice";
import { Calendars } from "../../../features/Calendars/CalendarTypes";
import { Calendar } from "../../../features/Calendars/CalendarTypes";
export function updateDarkColor(
calendars: Record<string, Calendars>,
calendars: Record<string, Calendar>,
theme: Theme,
dispatch: ThunkDispatch<any, any, any>
) {
src/components/Calendar/utils/calendarUtils.ts
+3 -3
View File
@@ -1,5 +1,5 @@
import { CalendarEvent } from "../../../features/Events/EventsTypes";
import { Calendars } from "../../../features/Calendars/CalendarTypes";
import { Calendar } from "../../../features/Calendars/CalendarTypes";
import { formatDateToYYYYMMDDTHHMMSS } from "../../../utils/dateUtils";
import { getCalendarDetailAsync } from "../../../features/Calendars/CalendarSlice";
import { SlotLabelContentArg } from "@fullcalendar/core";
@@ -140,7 +140,7 @@ export const eventToFullCalendarFormat = (
export const extractEvents = (
selectedCalendars: string[],
calendars: Record<string, Calendars>,
calendars: Record<string, Calendar>,
userAddress?: string,
hideDeclinedEvents?: boolean | null
) => {
@@ -272,7 +272,7 @@ export function getCalendarVisibility(acl: AclEntry[]): "private" | "public" {
}
export async function updateTempCalendar(
tempcalendars: Record<string, Calendars>,
tempcalendars: Record<string, Calendar>,
event: CalendarEvent,
dispatch: ThunkDispatch<any, any, any>,
calendarRange: { start: Date; end: Date }
src/components/Event/EventChip/EventChipUtils.tsx
+4 -4
View File
@@ -4,8 +4,8 @@ import LockOutlineIcon from "@mui/icons-material/LockOutline";
import { Box, getContrastRatio } from "@mui/material";
import moment from "moment";
import React, { useLayoutEffect, useState } from "react";
import { Calendars } from "../../../features/Calendars/CalendarTypes";
import { userAttendee } from "../../../features/User/userDataTypes";
import { Calendar } from "../../../features/Calendars/CalendarTypes";
import { userAttendee } from "../../../features/User/models/attendee";
import { EventErrorHandler } from "../../Error/EventErrorHandler";
import { EVENT_DURATION } from "./EventChip";
@@ -13,8 +13,8 @@ const COMPACT_WIDTH_THRESHOLD = 100;
export interface EventChipProps {
arg: any;
calendars: Record<string, Calendars>;
tempcalendars: Record<string, Calendars>;
calendars: Record<string, Calendar>;
tempcalendars: Record<string, Calendar>;
errorHandler: EventErrorHandler;
}
export interface IconDisplayConfig {
src/components/Event/EventFormFields.tsx
+3 -3
View File
@@ -25,8 +25,8 @@ import {
import AttendeeSelector from "../Attendees/AttendeeSearch";
import RepeatEvent from "./EventRepeat";
import { RepetitionObject } from "../../features/Events/EventsTypes";
import { userAttendee } from "../../features/User/userDataTypes";
import { Calendars } from "../../features/Calendars/CalendarTypes";
import { userAttendee } from "../../features/User/models/attendee";
import { Calendar } from "../../features/Calendars/CalendarTypes";
import {
generateMeetingLink,
addVideoConferenceToDescription,
@@ -87,7 +87,7 @@ interface EventFormFieldsProps {
isOpen?: boolean;
// Data
userPersonalCalendars: Calendars[];
userPersonalCalendars: Calendar[];
timezoneList: {
zones: string[];
browserTz: string;
src/components/Event/eventHandlers/eventHandlers.ts
+102 -25
View File
@@ -1,51 +1,128 @@
import { ThunkDispatch } from "@reduxjs/toolkit";
import { useAppSelector } from "../../../app/hooks";
import {
updateEventInstanceAsync,
updateSeriesAsync,
putEventAsync,
deleteEventInstanceAsync,
deleteEventAsync,
} from "../../../features/Calendars/CalendarSlice";
import { Calendars } from "../../../features/Calendars/CalendarTypes";
import {
getEvent,
updateSeriesPartstat,
} from "../../../features/Events/EventApi";
import { Calendar } from "../../../features/Calendars/CalendarTypes";
import { updateSeriesPartstat } from "../../../features/Events/EventApi";
import { CalendarEvent } from "../../../features/Events/EventsTypes";
import { PartStat } from "../../../features/User/models/attendee";
import { createAttendee } from "../../../features/User/models/attendee.mapper";
import { userData } from "../../../features/User/userDataTypes";
import { buildFamilyName } from "../../../utils/buildFamilyName";
import { getCalendarRange } from "../../../utils/dateUtils";
import { refreshCalendars } from "../utils/eventUtils";
function updateEventAttendees(
event: CalendarEvent,
user: userData | undefined,
rsvp: PartStat
) {
if (!user) {
throw new Error("Cannot update attendees without user data");
}
const eventHasNoAttendees = !event?.attendee || event.attendee.length === 0;
const isOrganizer =
!event.organizer ||
event.organizer.cal_address?.toLowerCase() === user.email?.toLowerCase();
if (eventHasNoAttendees) {
const userdata = createAttendee({
cal_address: user.email,
cn: buildFamilyName(user.given_name, user.family_name, user.email),
role: isOrganizer ? "CHAIR" : "REQ-PARTICIPANT",
partstat: rsvp,
});
return {
organizer: isOrganizer ? userdata : event.organizer,
attendee: [userdata],
};
}
return {
attendee: (() => {
const userEmailLower = user.email?.toLowerCase();
const userExists = event.attendee.some(
(attendee) => attendee.cal_address?.toLowerCase() === userEmailLower
);
const updatedAttendees = event.attendee.map((attendeeData) =>
attendeeData.cal_address?.toLowerCase() === userEmailLower
? { ...attendeeData, partstat: rsvp }
: attendeeData
);
if (!userExists) {
const newUserAttendee = createAttendee({
cal_address: user.email,
cn: buildFamilyName(user.given_name, user.family_name, user.email),
role: "REQ-PARTICIPANT",
partstat: rsvp,
});
return [...updatedAttendees, newUserAttendee];
}
return updatedAttendees;
})(),
};
}
async function handleSoloRSVP(
dispatch: ThunkDispatch<any, any, any>,
calendar: Calendar,
event: CalendarEvent
) {
dispatch(updateEventInstanceAsync({ cal: calendar, event }));
}
async function handleAllRSVP(
dispatch: ThunkDispatch<any, any, any>,
event: CalendarEvent,
userEmail: string,
rsvp: PartStat,
calendars: Calendar[]
) {
const calendarRange = getCalendarRange(new Date(event.start));
await updateSeriesPartstat(event, userEmail, rsvp);
await refreshCalendars(dispatch, calendars, calendarRange);
}
async function handleDefaultRSVP(
dispatch: ThunkDispatch<any, any, any>,
calendar: Calendar,
newEvent: CalendarEvent
) {
dispatch(putEventAsync({ cal: calendar, newEvent }));
}
export async function handleRSVP(
dispatch: ThunkDispatch<any, any, any>,
calendar: Calendars,
user: { userData: userData },
calendar: Calendar,
user: userData | undefined,
event: CalendarEvent,
rsvp: string,
onClose?: (event: {}, reason: "backdropClick" | "escapeKeyDown") => void,
rsvp: PartStat,
typeOfAction?: string,
calendars?: Calendars[]
calendars?: Calendar[]
) {
const newEvent = {
...event,
attendee: event.attendee?.map((a) =>
a.cal_address === user.userData?.email ? { ...a, partstat: rsvp } : a
),
...updateEventAttendees(event, user, rsvp),
};
if (typeOfAction === "solo") {
dispatch(updateEventInstanceAsync({ cal: calendar, event: newEvent }));
await handleSoloRSVP(dispatch, calendar, newEvent);
} else if (typeOfAction === "all") {
const calendarRange = getCalendarRange(new Date(event.start));
// Update PARTSTAT on ALL VEVENTs (master + exceptions)
await updateSeriesPartstat(event, user.userData?.email, rsvp);
if (calendars) {
await refreshCalendars(dispatch, calendars, calendarRange);
if (!calendars || calendars.length === 0) {
throw new Error("Cannot update all occurrences without calendar list");
}
if (!user?.email) {
throw new Error("Cannot update all occurrences without user email");
}
await handleAllRSVP(dispatch, event, user.email, rsvp, calendars);
} else {
dispatch(putEventAsync({ cal: calendar, newEvent }));
await handleDefaultRSVP(dispatch, calendar, newEvent);
}
}
@@ -54,7 +131,7 @@ export function handleDelete(
typeOfAction: "solo" | "all" | undefined,
onClose: (event: {}, reason: "backdropClick" | "escapeKeyDown") => void,
dispatch: Function,
calendar: Calendars,
calendar: Calendar,
event: CalendarEvent,
calId: string,
eventId: string
src/components/Event/utils/eventUtils.tsx
+4 -4
View File
@@ -10,8 +10,8 @@ import {
getCalendarDetailAsync,
getCalendarsListAsync,
} from "../../../features/Calendars/CalendarSlice";
import { Calendars } from "../../../features/Calendars/CalendarTypes";
import { userAttendee } from "../../../features/User/userDataTypes";
import { Calendar } from "../../../features/Calendars/CalendarTypes";
import { userAttendee } from "../../../features/User/models/attendee";
import { formatDateToYYYYMMDDTHHMMSS } from "../../../utils/dateUtils";
export function renderAttendeeBadge(
@@ -111,7 +111,7 @@ export function stringAvatar(name: string) {
export async function refreshCalendars(
dispatch: ThunkDispatch<any, any, any>,
calendars: Calendars[],
calendars: Calendar[],
calendarRange: { start: Date; end: Date },
calType?: "temp"
) {
@@ -163,7 +163,7 @@ export async function refreshCalendars(
export async function refreshSingularCalendar(
dispatch: ThunkDispatch<any, any, any>,
calendar: Calendars,
calendar: Calendar,
calendarRange: { start: Date; end: Date },
calType?: "temp"
) {
src/components/Menubar/EventSearchBar.tsx
+14 -17
View File
@@ -24,10 +24,11 @@ import { useI18n } from "twake-i18n";
import { useAppDispatch, useAppSelector } from "../../app/hooks";
import { searchEventsAsync } from "../../features/Search/SearchSlice";
import { setView } from "../../features/Settings/SettingsSlice";
import { userAttendee } from "../../features/User/userDataTypes";
import { userAttendee } from "../../features/User/models/attendee";
import UserSearch from "../Attendees/AttendeeSearch";
import { CalendarItemList } from "../Calendar/CalendarItemList";
import { PeopleSearch, User } from "../Attendees/PeopleSearch";
import { createAttendee } from "../../features/User/models/attendee.mapper";
export default function SearchBar() {
const { t } = useI18n();
@@ -151,14 +152,12 @@ export default function SearchBar() {
if (contacts.length > 0) {
handleSearch("", {
...filters,
organizers: contacts.map((c) => ({
cal_address: c.email || c.displayName || "",
cutype: "INDIVIDUAL",
cn: c.displayName || c.email,
role: "Participant",
rsvp: "TRUE",
partstat: "",
})),
organizers: contacts.map((contact) =>
createAttendee({
cal_address: contact.email,
cn: contact.displayName,
})
),
});
}
};
@@ -334,14 +333,12 @@ export default function SearchBar() {
handleFilterChange("keywords", query);
handleFilterChange(
"organizers",
selectedContacts.map((a: User) => ({
cn: a.displayName,
cal_address: a.email || "",
partstat: "NEEDS-ACTION",
rsvp: "FALSE",
role: "REQ-PARTICIPANT",
cutype: "INDIVIDUAL",
}))
selectedContacts.map((attendee: User) =>
createAttendee({
cal_address: attendee.email,
cn: attendee.displayName,
})
)
);
}}
>
src/features/Calendars/CalendarSlice.ts
+22 -22
View File
@@ -1,5 +1,5 @@
import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
import { Calendars } from "./CalendarTypes";
import { Calendar } from "./CalendarTypes";
import { CalendarEvent } from "../Events/EventsTypes";
import {
addSharedCalendar,
@@ -39,7 +39,7 @@ interface RejectedError {
}
export const getCalendarsListAsync = createAsyncThunk<
{ importedCalendars: Record<string, Calendars>; errors: string }, // Return type
{ importedCalendars: Record<string, Calendar>; errors: string }, // Return type
void, // Arg type
{ rejectValue: RejectedError; state: any } // ThunkAPI config
>("calendars/getCalendars", async (_, { rejectWithValue, getState }) => {
@@ -52,7 +52,7 @@ export const getCalendarsListAsync = createAsyncThunk<
}
try {
const importedCalendars: Record<string, Calendars> = {};
const importedCalendars: Record<string, Calendar> = {};
const user = (await getOpenPaasUser()) as Record<string, string>;
const calendars = (await getCalendars(user.id)) as Record<string, any>;
const rawCalendars = calendars._embedded["dav:calendar"] as Record<
@@ -159,12 +159,12 @@ export const getCalendarsListAsync = createAsyncThunk<
});
export const getTempCalendarsListAsync = createAsyncThunk<
Record<string, Calendars>,
Record<string, Calendar>,
User,
{ rejectValue: RejectedError }
>("calendars/getTempCalendars", async (tempUser, { rejectWithValue }) => {
try {
const importedCalendars: Record<string, Calendars> = {};
const importedCalendars: Record<string, Calendar> = {};
const calendars = (await getCalendars(
tempUser.openpaasId ?? "",
@@ -267,7 +267,7 @@ export const getCalendarDetailAsync = createAsyncThunk<
export const putEventAsync = createAsyncThunk<
{ calId: string; events: CalendarEvent[]; calType?: "temp" },
{ cal: Calendars; newEvent: CalendarEvent; calType?: "temp" },
{ cal: Calendar; newEvent: CalendarEvent; calType?: "temp" },
{ rejectValue: RejectedError }
>(
"calendars/putEvent",
@@ -395,7 +395,7 @@ export const removeCalendarAsync = createAsyncThunk<
export const moveEventAsync = createAsyncThunk<
{ calId: string; events: CalendarEvent[] },
{ cal: Calendars; newEvent: CalendarEvent; newURL: string },
{ cal: Calendar; newEvent: CalendarEvent; newURL: string },
{ rejectValue: RejectedError }
>(
"calendars/moveEvent",
@@ -490,7 +490,7 @@ export const deleteEventAsync = createAsyncThunk<
export const deleteEventInstanceAsync = createAsyncThunk<
{ calId: string; eventId: string },
{ cal: Calendars; event: CalendarEvent },
{ cal: Calendar; event: CalendarEvent },
{ rejectValue: RejectedError }
>("calendars/delEventInstance", async ({ cal, event }, { rejectWithValue }) => {
try {
@@ -506,7 +506,7 @@ export const deleteEventInstanceAsync = createAsyncThunk<
export const updateEventInstanceAsync = createAsyncThunk<
{ calId: string; event: CalendarEvent },
{ cal: Calendars; event: CalendarEvent },
{ cal: Calendar; event: CalendarEvent },
{ rejectValue: RejectedError }
>(
"calendars/updateEventInstance",
@@ -525,7 +525,7 @@ export const updateEventInstanceAsync = createAsyncThunk<
export const updateSeriesAsync = createAsyncThunk<
void,
{ cal: Calendars; event: CalendarEvent; removeOverrides?: boolean },
{ cal: Calendar; event: CalendarEvent; removeOverrides?: boolean },
{ rejectValue: RejectedError }
>(
"calendars/updateSeries",
@@ -659,13 +659,13 @@ export const importEventFromFileAsync = createAsyncThunk<
const CalendarSlice = createSlice({
name: "calendars",
initialState: {
list: {} as Record<string, Calendars>,
templist: {} as Record<string, Calendars>,
list: {} as Record<string, Calendar>,
templist: {} as Record<string, Calendar>,
pending: false,
error: null as string | null,
} as {
list: Record<string, Calendars>;
templist: Record<string, Calendars>;
list: Record<string, Calendar>;
templist: Record<string, Calendar>;
pending: boolean;
error: string | null;
},
@@ -675,7 +675,7 @@ const CalendarSlice = createSlice({
action: PayloadAction<Record<string, string | Record<string, string>>>
) => {
const id = Date.now().toString(36);
state.list[id] = {} as Calendars;
state.list[id] = {} as Calendar;
state.list[id].name = action.payload.name as string;
state.list[id].color = action.payload.color as Record<string, string>;
state.list[id].description = action.payload.description as string;
@@ -753,7 +753,7 @@ const CalendarSlice = createSlice({
(
state,
action: PayloadAction<{
importedCalendars: Record<string, Calendars>;
importedCalendars: Record<string, Calendar>;
errors: string;
}>
) => {
@@ -766,7 +766,7 @@ const CalendarSlice = createSlice({
)
.addCase(
getTempCalendarsListAsync.fulfilled,
(state, action: PayloadAction<Record<string, Calendars>>) => {
(state, action: PayloadAction<Record<string, Calendar>>) => {
state.pending = false;
Object.keys(action.payload).forEach(
(id) => (state.templist[id] = action.payload[id])
@@ -823,7 +823,7 @@ const CalendarSlice = createSlice({
state[type][action.payload.calId] = {
id: action.payload.calId,
events: {},
} as Calendars;
} as Calendar;
}
action.payload.events.forEach((event) => {
state[type][action.payload.calId].events[event.uid] = event;
@@ -853,7 +853,7 @@ const CalendarSlice = createSlice({
state.list[action.payload.calId] = {
id: action.payload.calId,
events: {},
} as Calendars;
} as Calendar;
}
state.list[action.payload.calId].events[action.payload.event.uid] =
@@ -871,7 +871,7 @@ const CalendarSlice = createSlice({
state.list[action.payload.calId] = {
id: action.payload.calId,
events: {},
} as Calendars;
} as Calendar;
}
action.payload.events.forEach((event) => {
state.list[action.payload.calId].events[event.uid] = event;
@@ -932,7 +932,7 @@ const CalendarSlice = createSlice({
owner: action.payload.owner,
ownerEmails: action.payload.ownerEmails,
events: {},
} as Calendars;
} as Calendar;
state.error = null;
})
.addCase(patchCalendarAsync.fulfilled, (state, action) => {
@@ -973,7 +973,7 @@ const CalendarSlice = createSlice({
events: {},
owner: action.payload.owner,
ownerEmails: action.payload.ownerEmails,
} as Calendars;
} as Calendar;
state.error = null;
})
.addCase(removeCalendarAsync.fulfilled, (state, action) => {
src/features/Calendars/CalendarTypes.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { CalendarEvent } from "../Events/EventsTypes";
export interface Calendars {
export interface Calendar {
id: string;
link: string;
name: string;
src/features/Events/AttendanceValidation/AttendanceValidation.tsx
+56
View File
@@ -0,0 +1,56 @@
import { Box, Typography } from "@mui/material";
import { Dispatch, SetStateAction } from "react";
import { useI18n } from "twake-i18n";
import { Calendar } from "../../Calendars/CalendarTypes";
import { userData } from "../../User/userDataTypes";
import { ContextualizedEvent } from "../EventsTypes";
import { RSVPButton } from "./RSVPButton";
interface AttendanceValidationProps {
contextualizedEvent: ContextualizedEvent;
calendarList: Calendar[];
user: userData | undefined;
setAfterChoiceFunc: Dispatch<SetStateAction<Function | undefined>>;
setOpenEditModePopup: Dispatch<SetStateAction<string | null>>;
}
export function AttendanceValidation({
contextualizedEvent,
calendarList,
user,
setAfterChoiceFunc,
setOpenEditModePopup,
}: AttendanceValidationProps) {
const { currentUserAttendee, isOwn } = contextualizedEvent;
const { t } = useI18n();
// Check if we should show RSVP buttons
const hasNoAttendeesOrOrganizer =
!(contextualizedEvent.event?.attendee?.length > 0) &&
!contextualizedEvent.event?.organizer;
if (!((currentUserAttendee || hasNoAttendeesOrOrganizer) && isOwn)) {
return null;
}
const commonButtonProps = {
contextualizedEvent,
user,
calendarList,
setAfterChoiceFunc,
setOpenEditModePopup,
};
return (
<>
<Typography sx={{ marginRight: 2 }}>
{t("eventPreview.attendingQuestion")}
</Typography>
<Box display="flex" gap="15px" alignItems="center">
<RSVPButton rsvpValue="ACCEPTED" {...commonButtonProps} />
<RSVPButton rsvpValue="TENTATIVE" {...commonButtonProps} />
<RSVPButton rsvpValue="DECLINED" {...commonButtonProps} />
</Box>
</>
);
}
src/features/Events/AttendanceValidation/RSVPButton.tsx
+67
View File
@@ -0,0 +1,67 @@
import { Button } from "@mui/material";
import { Dispatch, SetStateAction } from "react";
import { useI18n } from "twake-i18n";
import { useAppDispatch } from "../../../app/hooks";
import { Calendar } from "../../Calendars/CalendarTypes";
import { PartStat } from "../../User/models/attendee";
import { userData } from "../../User/userDataTypes";
import { ContextualizedEvent } from "../EventsTypes";
import { handleRSVPClick } from "./handleRSVPClick";
const rsvpColor: Record<PartStat, "success" | "error" | "warning" | "primary"> =
{
ACCEPTED: "success",
DECLINED: "error",
TENTATIVE: "warning",
"NEEDS-ACTION": "primary",
} as const;
interface RSVPButtonProps {
rsvpValue: PartStat;
contextualizedEvent: ContextualizedEvent;
user: userData | undefined;
calendarList: Calendar[];
setAfterChoiceFunc: Dispatch<SetStateAction<Function | undefined>>;
setOpenEditModePopup: Dispatch<SetStateAction<string | null>>;
}
export function RSVPButton({
rsvpValue,
contextualizedEvent,
user,
calendarList,
setAfterChoiceFunc,
setOpenEditModePopup,
}: RSVPButtonProps) {
const { t } = useI18n();
const dispatch = useAppDispatch();
const { currentUserAttendee } = contextualizedEvent;
return (
<Button
variant={
currentUserAttendee?.partstat === rsvpValue ? "contained" : "outlined"
}
color={
currentUserAttendee?.partstat === rsvpValue
? rsvpColor[rsvpValue]
: "primary"
}
size="large"
sx={{ borderRadius: "50px" }}
onClick={() =>
handleRSVPClick(
rsvpValue,
contextualizedEvent,
user,
calendarList,
setAfterChoiceFunc,
setOpenEditModePopup,
dispatch
)
}
>
{t(`eventPreview.${rsvpValue}`)}
</Button>
);
}
src/features/Events/AttendanceValidation/handleRSVPClick.tsx
+43
View File
@@ -0,0 +1,43 @@
import { Dispatch, SetStateAction } from "react";
import { AppDispatch } from "../../../app/store";
import { handleRSVP } from "../../../components/Event/eventHandlers/eventHandlers";
import { Calendar } from "../../Calendars/CalendarTypes";
import { PartStat } from "../../User/models/attendee";
import { userData } from "../../User/userDataTypes";
import { ContextualizedEvent } from "../EventsTypes";
export async function handleRSVPClick(
rsvp: PartStat,
contextualizedEvent: ContextualizedEvent,
user: userData | undefined,
calendarList: Calendar[],
setAfterChoiceFunc: Dispatch<SetStateAction<Function | undefined>>,
setOpenEditModePopup: Dispatch<SetStateAction<string | null>>,
dispatch: AppDispatch
) {
const { isRecurring, calendar, event } = contextualizedEvent;
if (isRecurring) {
setAfterChoiceFunc(() => async (type: string) => {
try {
await handleRSVP(
dispatch,
calendar,
user,
event,
rsvp,
type,
calendarList
);
} catch (error) {
console.error("Error handling RSVP:", error);
}
});
setOpenEditModePopup("attendance");
} else {
try {
await handleRSVP(dispatch, calendar, user, event, rsvp);
} catch (error) {
console.error("Error handling RSVP:", error);
}
}
}
src/features/Events/EventDisplayPreview.tsx
+20 -151
View File
@@ -36,10 +36,7 @@ import {
import ResponsiveDialog from "../../components/Dialog/ResponsiveDialog";
import { EditModeDialog } from "../../components/Event/EditModeDialog";
import EventDuplication from "../../components/Event/EventDuplicate";
import {
handleDelete,
handleRSVP,
} from "../../components/Event/eventHandlers/eventHandlers";
import { handleDelete } from "../../components/Event/eventHandlers/eventHandlers";
import { InfoRow } from "../../components/Event/InfoRow";
import { renderAttendeeBadge } from "../../components/Event/utils/eventUtils";
import { getCalendarRange } from "../../utils/dateUtils";
@@ -48,8 +45,12 @@ import { dlEvent } from "./EventApi";
import { CalendarEvent } from "./EventsTypes";
import EventUpdateModal from "./EventUpdateModal";
import { useI18n } from "twake-i18n";
import { userAttendee } from "../User/userDataTypes";
import { userAttendee } from "../User/models/attendee";
import { browserDefaultTimeZone } from "../../utils/timezone";
import { AttendanceValidation } from "./AttendanceValidation/AttendanceValidation";
import { Calendar } from "../Calendars/CalendarTypes";
import { userData } from "../User/userDataTypes";
import { createEventContext } from "./createEventContext";
export default function EventPreviewModal({
eventId,
@@ -77,12 +78,13 @@ export default function EventPreviewModal({
? calendars.templist[calId]
: calendars.list[calId];
const event = calendar.events[eventId];
const user = useAppSelector((state) => state.user);
const user = useAppSelector((state) => state.user.userData);
if (!user) return null;
const isRecurring = event?.uid?.includes("/");
const isOwn = calendar.ownerEmails?.includes(user.userData?.email);
const isOwn = calendar.ownerEmails?.includes(user.email);
const isOrganizer = event.organizer
? user.userData?.email === event.organizer.cal_address
? user.email === event.organizer.cal_address
: isOwn;
const [showAllAttendees, setShowAllAttendees] = useState(false);
const [openUpdateModal, setOpenUpdateModal] = useState(false);
@@ -274,8 +276,9 @@ export default function EventPreviewModal({
: attendees.slice(0, attendeeDisplayLimit);
const currentUserAttendee = event.attendee?.find(
(person) => person.cal_address === user.userData?.email
(person) => person.cal_address === user.email
);
const contextualizedEvent = createEventContext(event, calendar, user);
const organizer = event.attendee?.find(
(a) => a.cal_address === event.organizer?.cal_address
@@ -365,7 +368,7 @@ export default function EventPreviewModal({
window.open(
`${mailSpaUrl}/mailto/?uri=mailto:${event.attendee
.map((a) => a.cal_address)
.filter((mail) => mail !== user.userData?.email)
.filter((mail) => mail !== user.email)
.join(",")}?subject=${event.title}`
)
}
@@ -467,147 +470,13 @@ export default function EventPreviewModal({
</>
}
actions={
currentUserAttendee &&
isOwn && (
<>
<>
<Typography sx={{ marginRight: 2 }}>
{t("eventPreview.attendingQuestion")}
</Typography>
<Box display="flex" gap="15px" alignItems="center">
<Button
variant={
currentUserAttendee?.partstat === "ACCEPTED"
? "contained"
: "outlined"
}
color={
currentUserAttendee?.partstat === "ACCEPTED"
? "success"
: "primary"
}
size="large"
sx={{ borderRadius: "50px" }}
onClick={() => {
if (isRecurring) {
setAfterChoiceFunc(
() => (type: string) =>
handleRSVP(
dispatch,
calendar,
user,
event,
"ACCEPTED",
onClose,
type,
calendarList
)
);
setOpenEditModePopup("attendance");
} else {
handleRSVP(
dispatch,
calendar,
user,
event,
"ACCEPTED",
onClose
);
}
}}
>
{t("eventPreview.accept")}
</Button>
<Button
variant={
currentUserAttendee?.partstat === "TENTATIVE"
? "contained"
: "outlined"
}
color={
currentUserAttendee?.partstat === "TENTATIVE"
? "warning"
: "primary"
}
size="large"
sx={{ borderRadius: "50px" }}
onClick={() => {
if (isRecurring) {
setAfterChoiceFunc(
() => (type: string) =>
handleRSVP(
dispatch,
calendar,
user,
event,
"TENTATIVE",
onClose,
type,
calendarList
)
);
setOpenEditModePopup("attendance");
} else {
handleRSVP(
dispatch,
calendar,
user,
event,
"TENTATIVE",
onClose
);
}
}}
>
{t("eventPreview.maybe")}
</Button>
<Button
variant={
currentUserAttendee?.partstat === "DECLINED"
? "contained"
: "outlined"
}
color={
currentUserAttendee?.partstat === "DECLINED"
? "error"
: "primary"
}
size="large"
sx={{ borderRadius: "50px" }}
onClick={() => {
if (isRecurring) {
setAfterChoiceFunc(
() => (type: string) =>
handleRSVP(
dispatch,
calendar,
user,
event,
"DECLINED",
onClose,
type,
calendarList
)
);
setOpenEditModePopup("attendance");
} else {
handleRSVP(
dispatch,
calendar,
user,
event,
"DECLINED",
onClose
);
}
}}
>
{t("eventPreview.decline")}
</Button>
</Box>
</>
</>
)
<AttendanceValidation
contextualizedEvent={contextualizedEvent}
calendarList={calendarList}
user={user}
setAfterChoiceFunc={setAfterChoiceFunc}
setOpenEditModePopup={setOpenEditModePopup}
/>
}
>
{((event.class !== "PRIVATE" && !isOwn) || isOwn) && (
src/features/Events/EventModal.tsx
+6 -6
View File
@@ -12,8 +12,8 @@ import React, {
import { useAppDispatch, useAppSelector } from "../../app/hooks";
import { ResponsiveDialog } from "../../components/Dialog";
import { putEventAsync } from "../Calendars/CalendarSlice";
import { Calendars } from "../Calendars/CalendarTypes";
import { userAttendee } from "../User/userDataTypes";
import { Calendar } from "../Calendars/CalendarTypes";
import { userAttendee } from "../User/models/attendee";
import { CalendarEvent, RepetitionObject } from "./EventsTypes";
import { createSelector } from "@reduxjs/toolkit";
import { TIMEZONES } from "../../utils/timezone-data";
@@ -75,11 +75,11 @@ function EventPopover({
if (id.split("/")[0] === userId) {
return calendars.list?.[id];
}
return {} as Calendars;
return {} as Calendar;
})
.filter((calendar) => calendar.id)
);
const userPersonalCalendars: Calendars[] = useAppSelector(
const userPersonalCalendars: Calendar[] = useAppSelector(
selectPersonalCalendars
);
@@ -722,10 +722,10 @@ function EventPopover({
const newEventUID = crypto.randomUUID();
// Resolve target calendar safely
const targetCalendar: Calendars | undefined =
const targetCalendar: Calendar | undefined =
calList[calendarid] ||
userPersonalCalendars[0] ||
(Object.values(calList)[0] as Calendars | undefined);
(Object.values(calList)[0] as Calendar | undefined);
if (!targetCalendar || !targetCalendar.id) {
console.error("No target calendar available to save event");
return;
src/features/Events/EventUpdateModal.tsx
+5 -5
View File
@@ -12,8 +12,8 @@ import {
updateEventLocal,
clearFetchCache,
} from "../Calendars/CalendarSlice";
import { Calendars } from "../Calendars/CalendarTypes";
import { userAttendee } from "../User/userDataTypes";
import { Calendar } from "../Calendars/CalendarTypes";
import { userAttendee } from "../User/models/attendee";
import { CalendarEvent, RepetitionObject } from "./EventsTypes";
import { TIMEZONES } from "../../utils/timezone-data";
import { addVideoConferenceToDescription } from "../../utils/videoConferenceUtils";
@@ -95,10 +95,10 @@ function EventUpdateModal({
const calendarsList = useAppSelector((state) => state.calendars.list);
const userPersonalCalendars: Calendars[] = useMemo(() => {
const allCalendars = Object.values(calendarsList) as Calendars[];
const userPersonalCalendars: Calendar[] = useMemo(() => {
const allCalendars = Object.values(calendarsList) as Calendar[];
return allCalendars.filter(
(c: Calendars) => c.id?.split("/")[0] === user.userData?.openpaasId
(c: Calendar) => c.id?.split("/")[0] === user.userData?.openpaasId
);
}, [calendarsList, user.userData?.openpaasId]);
src/features/Events/EventsTypes.ts
+12 -1
View File
@@ -1,4 +1,6 @@
import { userAttendee, userOrganiser } from "../User/userDataTypes";
import { Calendar } from "../Calendars/CalendarTypes";
import { userAttendee } from "../User/models/attendee";
import { userOrganiser } from "../User/userDataTypes";
export interface CalendarEvent {
URL: string;
@@ -39,3 +41,12 @@ export interface AlarmObject {
trigger: string;
action: string;
}
export interface ContextualizedEvent {
event: CalendarEvent;
calendar: Calendar;
currentUserAttendee: userAttendee | undefined;
isOwn: boolean;
isRecurring: boolean;
isOrganizer: boolean;
}
src/features/Events/createEventContext.ts
+27
View File
@@ -0,0 +1,27 @@
import { Calendar } from "../Calendars/CalendarTypes";
import { userData } from "../User/userDataTypes";
import { CalendarEvent, ContextualizedEvent } from "./EventsTypes";
export function createEventContext(
event: CalendarEvent,
calendar: Calendar,
user: userData
): ContextualizedEvent {
const isOwn = calendar.ownerEmails?.includes(user.email) ?? false;
const isRecurring = event?.uid?.includes("/") ?? false;
const isOrganizer = event.organizer
? user?.email === event.organizer.cal_address
: isOwn;
const currentUserAttendee = event.attendee?.find(
(person) => person.cal_address === user.email
);
return {
event,
calendar,
currentUserAttendee,
isOwn,
isRecurring,
isOrganizer,
};
}
src/features/Events/eventUtils.ts
+12 -9
View File
@@ -1,4 +1,4 @@
import { userAttendee } from "../User/userDataTypes";
import { userAttendee } from "../User/models/attendee";
import { AlarmObject, CalendarEvent, RepetitionObject } from "./EventsTypes";
import ICAL from "ical.js";
import { TIMEZONES } from "../../utils/timezone-data";
@@ -7,6 +7,7 @@ import {
convertFormDateTimeToISO,
detectDateTimeFormat,
} from "../../components/Event/utils/dateTimeHelpers";
import { createAttendee } from "../User/models/attendee.mapper";
type RawEntry = [string, Record<string, string>, string, any];
function resolveTimezoneId(tzid?: string): string | undefined {
@@ -119,14 +120,16 @@ export function parseCalendarEvent(
};
break;
case "attendee":
(event.attendee as userAttendee[]).push({
cn: params?.cn ?? "",
cal_address: value.replace(/^mailto:/i, ""),
partstat: params?.partstat ?? "",
rsvp: params?.rsvp ?? "",
role: params?.role ?? "",
cutype: params?.cutype ?? "",
});
(event.attendee as userAttendee[]).push(
createAttendee({
cn: params?.cn,
cal_address: value.replace(/^mailto:/i, ""),
partstat: params?.partstat as userAttendee["partstat"],
rsvp: params?.rsvp as userAttendee["rsvp"],
role: params?.role as userAttendee["role"],
cutype: params?.cutype as userAttendee["cutype"],
})
);
break;
case "dtstamp":
event.stamp = value;
src/features/Events/formHelpers.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import { TIMEZONES } from "../../utils/timezone-data";
import { resolveTimezone } from "../../components/Calendar/TimezoneSelector";
import { CalendarEvent, RepetitionObject } from "./EventsTypes";
import { userAttendee } from "../User/userDataTypes";
import { userAttendee } from "../User/models/attendee";
import { formatDateTimeInTimezone } from "../../components/Event/utils/dateTimeFormatters";
import { addVideoConferenceToDescription } from "../../utils/videoConferenceUtils";
import { browserDefaultTimeZone } from "../../utils/timezone";
src/features/User/models/attendee.mapper.ts
+19
View File
@@ -0,0 +1,19 @@
import { userAttendee } from "./attendee";
export function createAttendee(options?: {
cal_address?: string;
cn?: string;
role?: userAttendee["role"];
partstat?: userAttendee["partstat"];
rsvp?: userAttendee["rsvp"];
cutype?: userAttendee["cutype"];
}): userAttendee {
return {
cal_address: options?.cal_address ?? "",
cn: options?.cn ?? "",
cutype: options?.cutype ?? "INDIVIDUAL",
role: options?.role ?? "REQ-PARTICIPANT",
partstat: options?.partstat ?? "NEEDS-ACTION",
rsvp: options?.rsvp ?? "FALSE",
};
}
src/features/User/models/attendee.ts
+12
View File
@@ -0,0 +1,12 @@
export type AttendeeRole = "CHAIR" | "REQ-PARTICIPANT" | "OPT-PARTICIPANT";
export type CuType = "INDIVIDUAL" | "GROUP";
export type PartStat = "ACCEPTED" | "DECLINED" | "TENTATIVE" | "NEEDS-ACTION";
export interface userAttendee {
cal_address: string;
partstat: PartStat;
role: AttendeeRole;
cutype: CuType;
rsvp: "TRUE" | "FALSE";
cn: string;
}
src/features/User/userDataTypes.ts
-9
View File
@@ -33,12 +33,3 @@ export interface userOrganiser {
cn: string;
cal_address: string;
}
export interface userAttendee {
cn?: string;
cal_address: string;
partstat: string;
rsvp: string;
role: string;
cutype: string;
}
src/locales/en.json
+3 -3
View File
@@ -245,9 +245,9 @@
"tooltip": "Others see you as available during the time range of this event."
},
"attendingQuestion": "Attending?",
"accept": "Accept",
"maybe": "Maybe",
"decline": "Decline",
"ACCEPTED": "Accept",
"TENTATIVE": "Maybe",
"DECLINED": "Decline",
"showMore": "Show more",
"showLess": "Show less",
"joinVideo": "Join the video conference",
src/locales/fr.json
+3 -3
View File
@@ -247,9 +247,9 @@
"tooltip": "Les autres vous voient comme disponible pendant la plage horaire de cet événement."
},
"attendingQuestion": "Vous participez ?",
"accept": "Accepter",
"maybe": "Peut-être",
"decline": "Décliner",
"ACCEPTED": "Accepter",
"TENTATIVE": "Peut-être",
"DECLINED": "Décliner",
"showMore": "Afficher plus",
"showLess": "Afficher moins",
"joinVideo": "Rejoindre la visioconférence",
src/locales/ru.json
+3 -3
View File
@@ -247,9 +247,9 @@
"tooltip": "Другие видят вас свободным."
},
"attendingQuestion": "Присоединитесь?",
"accept": "Да",
"maybe": "Возможно",
"decline": "Нет",
"ACCEPTED": "Да",
"TENTATIVE": "Возможно",
"DECLINED": "Нет",
"showMore": "Показать больше",
"showLess": "Показать меньше",
"joinVideo": "Присоединиться к видеоконференции",
src/locales/vi.json
+3 -3
View File
@@ -245,9 +245,9 @@
"tooltip": "Người khác sẽ thấy bạn rảnh trong khoảng thời gian này."
},
"attendingQuestion": "Tham gia?",
"accept": "Chấp nhận",
"maybe": "Có thể",
"decline": "Từ chối",
"ACCEPTED": "Chấp nhận",
"TENTATIVE": "Có thể",
"DECLINED": "Từ chối",
"showMore": "Xem thêm",
"showLess": "Thu gọn",
"joinVideo": "Tham gia cuộc họp video",
src/utils/buildFamilyName.ts
+12
View File
@@ -0,0 +1,12 @@
export function buildFamilyName(
firstName: string | undefined,
lastName: string | undefined,
email: string
): string {
const trimmedFirstName = firstName?.trim() || "";
const trimmedLastName = lastName?.trim() || "";
const fullName = [trimmedFirstName, trimmedLastName]
.filter(Boolean)
.join(" ");
return fullName || email;
}
src/utils/eventFormTempStorage.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import { RepetitionObject } from "../features/Events/EventsTypes";
import { userAttendee } from "../features/User/userDataTypes";
import { userAttendee } from "../features/User/models/attendee";
export interface EventFormTempData {
// Form fields