Refactor imports (#470)

src/features/Events/AttendanceValidation/AttendanceValidation.tsx

@@ -1,8 +1,8 @@
+import { Calendar } from "@/features/Calendars/CalendarTypes";
+import { userData } from "@/features/User/userDataTypes";
 import { Box, Typography } from "@linagora/twake-mui";
 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";
 

src/features/Events/AttendanceValidation/RSVPButton.tsx

@@ -1,10 +1,10 @@
+import { useAppDispatch } from "@/app/hooks";
+import { Calendar } from "@/features/Calendars/CalendarTypes";
+import { PartStat } from "@/features/User/models/attendee";
+import { userData } from "@/features/User/userDataTypes";
 import { Button } from "@linagora/twake-mui";
 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";
 

src/features/Events/AttendanceValidation/handleRSVPClick.tsx

@@ -1,9 +1,9 @@
+import { AppDispatch } from "@/app/store";
+import { handleRSVP } from "@/components/Event/eventHandlers/eventHandlers";
+import { Calendar } from "@/features/Calendars/CalendarTypes";
+import { PartStat } from "@/features/User/models/attendee";
+import { userData } from "@/features/User/userDataTypes";
 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(

src/features/Events/EventApi.ts

@@ -1,5 +1,10 @@
-import { api } from "../../utils/apiUtils";
-import { TIMEZONES } from "../../utils/timezone-data";
+import { detectDateTimeFormat } from "@/components/Event/utils/dateTimeHelpers";
+import { api } from "@/utils/apiUtils";
+import { extractEventBaseUuid } from "@/utils/extractEventBaseUuid";
+import { TIMEZONES } from "@/utils/timezone-data";
+import ICAL from "ical.js";
+import moment from "moment-timezone";
+import { CalDavItem } from "../Calendars/api/types";
 import { CalendarEvent } from "./EventsTypes";
 import {
   calendarEventToJCal,
@@ -7,11 +12,6 @@ import {
   makeVevent,
   parseCalendarEvent,
 } from "./eventUtils";
-import ICAL from "ical.js";
-import moment from "moment-timezone";
-import { detectDateTimeFormat } from "../../components/Event/utils/dateTimeHelpers";
-import { CalDavItem } from "../Calendars/api/types";
-import { extractEventBaseUuid } from "../../utils/extractEventBaseUuid";
 
 function resolveTimezoneId(tzid?: string): string | undefined {
   if (!tzid) return undefined;

src/features/Events/EventDisplayPreview.tsx

@@ -1,4 +1,30 @@
+import { useAppDispatch, useAppSelector } from "@/app/hooks";
+import { CalendarName } from "@/components/Calendar/CalendarName";
+import { getTimezoneOffset } from "@/components/Calendar/TimezoneSelector";
+import {
+  formatEventChipTitle,
+  updateTempCalendar,
+} from "@/components/Calendar/utils/calendarUtils";
+import ResponsiveDialog from "@/components/Dialog/ResponsiveDialog";
+import { EditModeDialog } from "@/components/Event/EditModeDialog";
+import EventDuplication from "@/components/Event/EventDuplicate";
+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";
+import { browserDefaultTimeZone } from "@/utils/timezone";
 import { DateSelectArg } from "@fullcalendar/core";
+import {
+  AvatarGroup,
+  Box,
+  Button,
+  Chip,
+  IconButton,
+  Menu,
+  MenuItem,
+  Tooltip,
+  Typography,
+} from "@linagora/twake-mui";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
 import CircleIcon from "@mui/icons-material/Circle";
 import CloseIcon from "@mui/icons-material/Close";
@@ -13,42 +39,16 @@ import PeopleAltOutlinedIcon from "@mui/icons-material/PeopleAltOutlined";
 import RepeatIcon from "@mui/icons-material/Repeat";
 import SubjectIcon from "@mui/icons-material/Subject";
 import VideocamOutlinedIcon from "@mui/icons-material/VideocamOutlined";
-import { Box, Typography } from "@linagora/twake-mui";
-import EventPopover from "./EventModal";
-import {
-  Button,
-  Chip,
-  IconButton,
-  Menu,
-  MenuItem,
-  Tooltip,
-} from "@linagora/twake-mui";
-import { AvatarGroup } from "@linagora/twake-mui";
-import { useEffect, useState, useRef } from "react";
-import { useAppDispatch, useAppSelector } from "../../app/hooks";
-import { CalendarName } from "../../components/Calendar/CalendarName";
-import { getTimezoneOffset } from "../../components/Calendar/TimezoneSelector";
-import {
-  formatEventChipTitle,
-  updateTempCalendar,
-} from "../../components/Calendar/utils/calendarUtils";
-import ResponsiveDialog from "../../components/Dialog/ResponsiveDialog";
-import { EditModeDialog } from "../../components/Event/EditModeDialog";
-import EventDuplication from "../../components/Event/EventDuplicate";
-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";
-import { deleteEventAsync } from "../Calendars/CalendarSlice";
+import { useEffect, useRef, useState } from "react";
+import { useI18n } from "twake-i18n";
+import { deleteEventAsync } from "../Calendars/services";
+import { userAttendee } from "../User/models/attendee";
+import { AttendanceValidation } from "./AttendanceValidation/AttendanceValidation";
+import { createEventContext } from "./createEventContext";
 import { dlEvent } from "./EventApi";
+import EventPopover from "./EventModal";
 import { CalendarEvent } from "./EventsTypes";
 import EventUpdateModal from "./EventUpdateModal";
-import { useI18n } from "twake-i18n";
-import { userAttendee } from "../User/models/attendee";
-import { browserDefaultTimeZone } from "../../utils/timezone";
-import { AttendanceValidation } from "./AttendanceValidation/AttendanceValidation";
-import { Calendar } from "../Calendars/CalendarTypes";
-import { createEventContext } from "./createEventContext";
 
 export default function EventPreviewModal({
   eventId,

src/features/Events/EventModal.tsx

@@ -1,47 +1,47 @@
-import { CalendarApi, DateSelectArg } from "@fullcalendar/core";
-import { Box, Button } from "@linagora/twake-mui";
-import AddIcon from "@mui/icons-material/Add";
-import React, {
-  useEffect,
-  useState,
-  useMemo,
-  useCallback,
-  useRef,
-  startTransition,
-} from "react";
-import { useAppDispatch, useAppSelector } from "../../app/hooks";
-import { ResponsiveDialog } from "../../components/Dialog";
-import { putEventAsync } from "../Calendars/CalendarSlice";
-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";
-import { addVideoConferenceToDescription } from "../../utils/videoConferenceUtils";
+import { useAppDispatch, useAppSelector } from "@/app/hooks";
 import {
   getTimezoneOffset,
   resolveTimezone,
-} from "../../components/Calendar/TimezoneSelector";
-import { getCalendarRange } from "../../utils/dateUtils";
-import { updateTempCalendar } from "../../components/Calendar/utils/calendarUtils";
-import EventFormFields from "../../components/Event/EventFormFields";
+} from "@/components/Calendar/TimezoneSelector";
+import { updateTempCalendar } from "@/components/Calendar/utils/calendarUtils";
+import { ResponsiveDialog } from "@/components/Dialog";
+import EventFormFields from "@/components/Event/EventFormFields";
+import { addDays } from "@/components/Event/utils/dateRules";
 import {
-  formatLocalDateTime,
   formatDateTimeInTimezone,
-} from "../../components/Event/utils/dateTimeFormatters";
-import { convertFormDateTimeToISO } from "../../components/Event/utils/dateTimeHelpers";
-import { addDays } from "../../components/Event/utils/dateRules";
-import { useI18n } from "twake-i18n";
+  formatLocalDateTime,
+} from "@/components/Event/utils/dateTimeFormatters";
+import { convertFormDateTimeToISO } from "@/components/Event/utils/dateTimeHelpers";
+import { getCalendarRange } from "@/utils/dateUtils";
 import {
-  saveEventFormDataToTemp,
-  restoreEventFormDataFromTemp as restoreEventFormDataFromStorage,
-  clearEventFormTempData,
-  showErrorNotification,
   buildEventFormTempData,
-  restoreFormDataFromTemp,
+  clearEventFormTempData,
   EventFormState,
-} from "../../utils/eventFormTempStorage";
-import { browserDefaultTimeZone } from "../../utils/timezone";
+  restoreEventFormDataFromTemp as restoreEventFormDataFromStorage,
+  restoreFormDataFromTemp,
+  saveEventFormDataToTemp,
+  showErrorNotification,
+} from "@/utils/eventFormTempStorage";
+import { browserDefaultTimeZone } from "@/utils/timezone";
+import { TIMEZONES } from "@/utils/timezone-data";
+import { addVideoConferenceToDescription } from "@/utils/videoConferenceUtils";
+import { CalendarApi, DateSelectArg } from "@fullcalendar/core";
+import { Box, Button } from "@linagora/twake-mui";
+import AddIcon from "@mui/icons-material/Add";
+import { createSelector } from "@reduxjs/toolkit";
+import React, {
+  startTransition,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { useI18n } from "twake-i18n";
+import { Calendar } from "../Calendars/CalendarTypes";
+import { putEventAsync } from "../Calendars/services";
+import { userAttendee } from "../User/models/attendee";
+import { CalendarEvent, RepetitionObject } from "./EventsTypes";
 
 function EventPopover({
   open,

src/features/Events/EventUpdateModal.tsx

@@ -1,48 +1,50 @@
-import { Box, Button } from "@linagora/twake-mui";
-import AddIcon from "@mui/icons-material/Add";
-import { useEffect, useState, useMemo, useCallback, useRef } from "react";
-import { useAppDispatch, useAppSelector } from "../../app/hooks";
-import { ResponsiveDialog } from "../../components/Dialog";
+import { useAppDispatch, useAppSelector } from "@/app/hooks";
+import { updateAttendeesAfterTimeChange } from "@/components/Calendar/handlers/eventHandlers";
+import { updateTempCalendar } from "@/components/Calendar/utils/calendarUtils";
+import { ResponsiveDialog } from "@/components/Dialog";
+import EventFormFields from "@/components/Event/EventFormFields";
+import { addDays } from "@/components/Event/utils/dateRules";
+import { formatDateTimeInTimezone } from "@/components/Event/utils/dateTimeFormatters";
+import { convertFormDateTimeToISO } from "@/components/Event/utils/dateTimeHelpers";
+import { refreshCalendars } from "@/components/Event/utils/eventUtils";
 import {
-  putEventAsync,
-  removeEvent,
   moveEventAsync,
+  putEventAsync,
   updateEventInstanceAsync,
   updateSeriesAsync,
-  updateEventLocal,
+} from "@/features/Calendars/services";
+import { getCalendarRange } from "@/utils/dateUtils";
+import {
+  buildEventFormTempData,
+  clearEventFormTempData,
+  EventFormContext,
+  EventFormState,
+  restoreEventFormDataFromTemp as restoreEventFormDataFromStorage,
+  restoreFormDataFromTemp,
+  saveEventFormDataToTemp,
+  showErrorNotification,
+} from "@/utils/eventFormTempStorage";
+import { extractEventBaseUuid } from "@/utils/extractEventBaseUuid";
+import { browserDefaultTimeZone } from "@/utils/timezone";
+import { TIMEZONES } from "@/utils/timezone-data";
+import { addVideoConferenceToDescription } from "@/utils/videoConferenceUtils";
+import { Box, Button } from "@linagora/twake-mui";
+import AddIcon from "@mui/icons-material/Add";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useI18n } from "twake-i18n";
+import {
   clearFetchCache,
+  removeEvent,
+  updateEventLocal,
 } from "../Calendars/CalendarSlice";
 import { Calendar } from "../Calendars/CalendarTypes";
 import { userAttendee } from "../User/models/attendee";
+import { deleteEvent, getEvent, putEvent } from "./EventApi";
 import { CalendarEvent, RepetitionObject } from "./EventsTypes";
-import { TIMEZONES } from "../../utils/timezone-data";
-import { addVideoConferenceToDescription } from "../../utils/videoConferenceUtils";
-import EventFormFields from "../../components/Event/EventFormFields";
-import { formatDateTimeInTimezone } from "../../components/Event/utils/dateTimeFormatters";
-import { addDays } from "../../components/Event/utils/dateRules";
-import { getEvent, deleteEvent, putEvent } from "./EventApi";
-import { refreshCalendars } from "../../components/Event/utils/eventUtils";
-import { getCalendarRange } from "../../utils/dateUtils";
 import {
   combineMasterDateWithFormTime,
   detectRecurringEventChanges,
 } from "./eventUtils";
-import { updateTempCalendar } from "../../components/Calendar/utils/calendarUtils";
-import { useI18n } from "twake-i18n";
-import { updateAttendeesAfterTimeChange } from "../../components/Calendar/handlers/eventHandlers";
-import { convertFormDateTimeToISO } from "../../components/Event/utils/dateTimeHelpers";
-import {
-  saveEventFormDataToTemp,
-  restoreEventFormDataFromTemp as restoreEventFormDataFromStorage,
-  clearEventFormTempData,
-  showErrorNotification,
-  buildEventFormTempData,
-  restoreFormDataFromTemp,
-  EventFormState,
-  EventFormContext,
-} from "../../utils/eventFormTempStorage";
-import { browserDefaultTimeZone } from "../../utils/timezone";
-import { extractEventBaseUuid } from "../../utils/extractEventBaseUuid";
 
 function EventUpdateModal({
   eventId,

src/features/Events/EventsTypes.ts

@@ -18,7 +18,7 @@ export interface CalendarEvent {
   organizer?: userOrganiser;
   attendee: userAttendee[];
   stamp?: string;
-  sequence?: Number;
+  sequence?: number;
   color?: Record<string, string>;
   allday?: boolean;
   error?: string;

src/features/Events/ImportAlert.tsx

@@ -1,6 +1,6 @@
-import { useState, useMemo, useEffect } from "react";
-import { useAppSelector } from "../../app/hooks";
-import { EventErrorSnackbar } from "../../components/Error/ErrorSnackbar";
+import { useAppSelector } from "@/app/hooks";
+import { EventErrorSnackbar } from "@/components/Error/ErrorSnackbar";
+import { useMemo, useState } from "react";
 
 export default function ImportAlert() {
   const calendars = useAppSelector((state) => state.calendars.list);

src/features/Events/eventUtils.ts

@@ -1,14 +1,14 @@
-import { userAttendee } from "../User/models/attendee";
-import { AlarmObject, CalendarEvent, RepetitionObject } from "./EventsTypes";
-import ICAL from "ical.js";
-import { TIMEZONES } from "../../utils/timezone-data";
-import moment from "moment-timezone";
 import {
   convertFormDateTimeToISO,
   detectDateTimeFormat,
-} from "../../components/Event/utils/dateTimeHelpers";
+} from "@/components/Event/utils/dateTimeHelpers";
+import { extractEventBaseUuid } from "@/utils/extractEventBaseUuid";
+import { TIMEZONES } from "@/utils/timezone-data";
+import ICAL from "ical.js";
+import moment from "moment-timezone";
+import { userAttendee } from "../User/models/attendee";
 import { createAttendee } from "../User/models/attendee.mapper";
-import { extractEventBaseUuid } from "../../utils/extractEventBaseUuid";
+import { AlarmObject, CalendarEvent, RepetitionObject } from "./EventsTypes";
 type RawEntry = [string, Record<string, string>, string, any];
 
 function resolveTimezoneId(tzid?: string): string | undefined {

src/features/Events/formHelpers.ts

@@ -1,11 +1,11 @@
-import { TIMEZONES } from "../../utils/timezone-data";
-import { resolveTimezone } from "../../components/Calendar/TimezoneSelector";
-import { CalendarEvent, RepetitionObject } from "./EventsTypes";
+import { resolveTimezone } from "@/components/Calendar/TimezoneSelector";
+import { formatDateTimeInTimezone } from "@/components/Event/utils/dateTimeFormatters";
+import { extractEventBaseUuid } from "@/utils/extractEventBaseUuid";
+import { browserDefaultTimeZone } from "@/utils/timezone";
+import { TIMEZONES } from "@/utils/timezone-data";
+import { addVideoConferenceToDescription } from "@/utils/videoConferenceUtils";
 import { userAttendee } from "../User/models/attendee";
-import { formatDateTimeInTimezone } from "../../components/Event/utils/dateTimeFormatters";
-import { addVideoConferenceToDescription } from "../../utils/videoConferenceUtils";
-import { browserDefaultTimeZone } from "../../utils/timezone";
-import { extractEventBaseUuid } from "../../utils/extractEventBaseUuid";
+import { CalendarEvent, RepetitionObject } from "./EventsTypes";
 
 export interface TimezoneListResult {
   zones: string[];