chore: update twake-mui dependency and use radius.lg for create event button

__test__/components/Calendar.test.tsx

@@ -443,11 +443,14 @@ describe("calendar Availability search", () => {
         screen.getByRole("button", { name: "event.createEvent" })
       );
     });
-    await waitFor(() => {
+    await waitFor(
-      expect(screen.getAllByText("event.createEvent")).toHaveLength(2);
+      () => {
-      expect(screen.getAllByText(/New User/i)).toHaveLength(2);
+        expect(screen.getAllByText("event.createEvent")).toHaveLength(2);
-    });
+        expect(screen.getAllByText(/New User/i)).toHaveLength(2);
-  });
+      },
+      { timeout: 10000 }
+    );
+  }, 15000);
 
   it("open window with attendees filled after temp search on enter in temp input", async () => {
     const spy = jest
@@ -482,11 +485,14 @@ describe("calendar Availability search", () => {
       fireEvent.keyDown(input, { key: "Enter" });
     });
 
-    await waitFor(() => {
+    await waitFor(
-      expect(screen.getAllByText("event.createEvent")).toHaveLength(2);
+      () => {
-      expect(screen.getAllByText(/New User/i)).toHaveLength(2);
+        expect(screen.getAllByText("event.createEvent")).toHaveLength(2);
-    });
+        expect(screen.getAllByText(/New User/i)).toHaveLength(2);
-  });
+      },
+      { timeout: 10000 }
+    );
+  }, 15000);
 
   it("BUGFIX: can untoggle all calendar.personal", async () => {
     await act(async () =>

__test__/components/RepeatEvent.test.tsx

@@ -199,6 +199,8 @@ describe("RepeatEvent Component", () => {
 });
 
 describe("Repeat Event Integration Tests", () => {
+  // Increase timeout for all tests in this describe block
+  jest.setTimeout(30000);
   beforeEach(() => {
     jest.clearAllMocks();
     jest.restoreAllMocks();

__test__/components/ResponsiveDialog.test.tsx

@@ -1,8 +1,8 @@
 import { fireEvent, render, screen } from "@testing-library/react";
 import React from "react";
 import { ResponsiveDialog } from "../../src/components/Dialog";
-import { Button, TextField } from "twake-mui";
+import { Button, TextField } from "@linagora/twake-mui";
-import { TwakeMuiThemeProvider } from "twake-mui";
+import { TwakeMuiThemeProvider } from "@linagora/twake-mui";
 
 describe("ResponsiveDialog", () => {
   const mockOnClose = jest.fn();

__test__/features/Events/EventRepetition.test.tsx

@@ -296,7 +296,7 @@ describe("EventPreviewModal - Recurring Event Interactions", () => {
 
     await waitFor(() => {
       expect(
-        screen.getByText("editModeDialog.updateRecurrentEvent")
+        screen.getByText("editModeDialog.deleteRecurrentEvent")
       ).toBeInTheDocument();
     });
   });
@@ -381,7 +381,7 @@ describe("EventPreviewModal - Recurring Event Interactions", () => {
     });
 
     expect(
-      screen.queryByText("editModeDialog.updateRecurrentEvent")
+      screen.queryByText("editModeDialog.deleteRecurrentEvent")
     ).not.toBeInTheDocument();
   });
 });
@@ -416,7 +416,7 @@ describe("Delete Recurring Event Instance", () => {
 
     await waitFor(() => {
       expect(
-        screen.getByText("editModeDialog.updateRecurrentEvent")
+        screen.getByText("editModeDialog.deleteRecurrentEvent")
       ).toBeInTheDocument();
     });
 
@@ -463,7 +463,7 @@ describe("Delete Recurring Event Instance", () => {
 
     await waitFor(() => {
       expect(
-        screen.getByText("editModeDialog.updateRecurrentEvent")
+        screen.getByText("editModeDialog.deleteRecurrentEvent")
       ).toBeInTheDocument();
     });
 

__test__/utils/Renderwithproviders.tsx

@@ -4,7 +4,7 @@ import React, { PropsWithChildren } from "react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
 import { I18nContext } from "twake-i18n";
-import { TwakeMuiThemeProvider } from "twake-mui";
+import { TwakeMuiThemeProvider } from "@linagora/twake-mui";
 import type { AppStore, RootState } from "../../src/app/store";
 import { setupStore } from "../../src/app/store";
 interface ExtendedRenderOptions extends Omit<RenderOptions, "queries"> {

jest.config.ts

@@ -23,6 +23,7 @@ const config: Config = {
       ],
       testEnvironment: "jsdom",
       testMatch: ["**/*.test.tsx"],
+      testTimeout: 15000,
       transform: {
         "^.+\\.tsx?$": ["ts-jest", { tsconfig: "tsconfig.json" }],
         "^.+\\.(js|jsx|mjs)$": "babel-jest",
@@ -59,6 +60,7 @@ const config: Config = {
       ],
       testEnvironment: "node",
       testMatch: ["**/*.test.ts"],
+      testTimeout: 15000,
       transform: {
         "^.+\\.tsx?$": ["ts-jest", { tsconfig: "tsconfig.json" }],
         "^.+\\.(js|jsx|mjs)$": "babel-jest",

package.json

@@ -12,6 +12,7 @@
     "@fullcalendar/moment-timezone": "^6.1.19",
     "@fullcalendar/react": "^6.1.17",
     "@fullcalendar/timegrid": "^6.1.17",
+    "@linagora/twake-mui": "1.1.0",
     "@mui/icons-material": "^7.1.2",
     "@mui/material": "^7.1.2",
     "@mui/x-date-pickers": "^8.14.0",
@@ -30,7 +31,6 @@
     "react-router-dom": "^6.23.1",
     "redux-first-history": "^5.2.0",
     "twake-i18n": "^0.3.0",
-    "twake-mui": "file:../twake-ui/packages/twake-mui",
     "web-vitals": "^2.1.4"
   },
   "scripts": {
@@ -90,6 +90,7 @@
     "jest-preview": "^0.3.1",
     "prettier": "^3.6.2",
     "ts-jest": "^29.4.6",
+    "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   }
 }

src/App.tsx

@@ -8,7 +8,7 @@ import { Loading } from "./components/Loading/Loading";
 import HandleLogin from "./features/User/HandleLogin";
 import CalendarLayout from "./components/Calendar/CalendarLayout";
 import { Error } from "./components/Error/Error";
-import { TwakeMuiThemeProvider } from "twake-mui";
+import { TwakeMuiThemeProvider } from "@linagora/twake-mui";
 import { useAppDispatch, useAppSelector } from "./app/hooks";
 import { push } from "redux-first-history";
 import { ErrorSnackbar } from "./components/Error/ErrorSnackbar";

src/components/Attendees/PeopleSearch.tsx

@@ -7,7 +7,7 @@ import {
   ListItemAvatar,
   ListItemText,
   TextField,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import {
   type ReactNode,
   useCallback,
@@ -17,11 +17,11 @@ import {
 } from "react";
 import { searchUsers } from "../../features/User/userAPI";
 import PeopleOutlineOutlinedIcon from "@mui/icons-material/PeopleOutlineOutlined";
-import { Chip, useTheme } from "twake-mui";
+import { Chip, useTheme } from "@linagora/twake-mui";
 import { getAccessiblePair } from "../Calendar/utils/calendarColorsUtils";
 import { useI18n } from "twake-i18n";
 import { SnackbarAlert } from "../Loading/SnackBarAlert";
-import { PopperProps, PaperProps } from "twake-mui";
+import { PopperProps, PaperProps } from "@linagora/twake-mui";
 
 export interface User {
   email: string;

src/components/Calendar/AccessTab.tsx

@@ -9,7 +9,7 @@ import {
   InputAdornment,
   Backdrop,
   CircularProgress,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import { useState, useEffect } from "react";
 import {
   exportCalendar,

src/components/Calendar/Calendar.tsx

@@ -20,7 +20,7 @@ import { push } from "redux-first-history";
 import EventPreviewModal from "../../features/Events/EventDisplayPreview";
 import AddIcon from "@mui/icons-material/Add";
 import { TempCalendarsInput } from "./TempCalendarsInput";
-import { Button, Box } from "twake-mui";
+import { Button, Box, radius } from "@linagora/twake-mui";
 import {
   updateSlotLabelVisibility,
   eventToFullCalendarFormat,
@@ -35,7 +35,7 @@ import momentTimezonePlugin from "@fullcalendar/moment-timezone";
 import { TimezoneSelector } from "./TimezoneSelector";
 import { MiniCalendar } from "./MiniCalendar";
 import { User } from "../Attendees/PeopleSearch";
-import { useTheme } from "twake-mui";
+import { useTheme } from "@linagora/twake-mui";
 import { updateDarkColor } from "./utils/calendarColorsUtils";
 import { useI18n } from "twake-i18n";
 import frLocale from "@fullcalendar/core/locales/fr";
@@ -618,6 +618,9 @@ export default function CalendarApp({
             onClick={() =>
               eventHandlers.handleDateSelect(null as unknown as DateSelectArg)
             }
+            sx={{
+              borderRadius: radius.lg,
+            }}
           >
             <AddIcon /> <p>{t("event.createEvent")}</p>
           </Button>

src/components/Calendar/CalendarColorPicker.tsx

@@ -7,7 +7,7 @@ import {
   TextField,
   Typography,
   useTheme,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import { useState } from "react";
 import { HexColorPicker } from "react-colorful";
 import { useI18n } from "twake-i18n";

src/components/Calendar/CalendarModal.tsx

@@ -1,4 +1,4 @@
-import { Button, Tab, Tabs } from "twake-mui";
+import { Button, Tab, Tabs } from "@linagora/twake-mui";
 import { useEffect, useState } from "react";
 import { useAppDispatch, useAppSelector } from "../../app/hooks";
 import {

src/components/Calendar/CalendarSelection.tsx

@@ -9,7 +9,7 @@ import {
   ListItem,
   Menu,
   MenuItem,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import { useAppDispatch, useAppSelector } from "../../app/hooks";
 import AddIcon from "@mui/icons-material/Add";
 import { useState, useMemo, useEffect } from "react";

src/components/Calendar/ImportTab.tsx

@@ -9,7 +9,7 @@ import {
   ToggleButton,
   ToggleButtonGroup,
   Typography,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import { useEffect, useState } from "react";
 import { useAppSelector } from "../../app/hooks";
 import { CalendarItemList } from "./CalendarItemList";

src/components/Calendar/SettingsTab.tsx

@@ -8,7 +8,7 @@ import {
   ToggleButton,
   ToggleButtonGroup,
   Typography,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import { useI18n } from "twake-i18n";
 import { useState, useEffect } from "react";
 import { useAppSelector } from "../../app/hooks";

src/components/Calendar/TempCalendarsInput.tsx

@@ -1,4 +1,4 @@
-import { useTheme } from "twake-mui";
+import { useTheme } from "@linagora/twake-mui";
 import { useRef } from "react";
 import { useI18n } from "twake-i18n";
 import { useAppDispatch, useAppSelector } from "../../app/hooks";
@@ -8,7 +8,7 @@ import {
 } from "../../features/Calendars/CalendarSlice";
 import { Calendar } from "../../features/Calendars/CalendarTypes";
 import { setView } from "../../features/Settings/SettingsSlice";
-import { TextField } from "twake-mui";
+import { TextField } from "@linagora/twake-mui";
 import { User, PeopleSearch } from "../Attendees/PeopleSearch";
 import { getAccessiblePair } from "./utils/calendarColorsUtils";
 

src/components/Calendar/TimezoneSelector.tsx

@@ -1,4 +1,4 @@
-import { Button, Popover } from "twake-mui";
+import { Button, Popover } from "@linagora/twake-mui";
 import { useI18n } from "twake-i18n";
 import moment from "moment";
 import { MouseEvent, useMemo, useState } from "react";

src/components/Calendar/utils/calendarColorsUtils.tsx

@@ -1,4 +1,4 @@
-import { darken, getContrastRatio, lighten, Theme } from "twake-mui";
+import { darken, getContrastRatio, lighten, Theme } from "@linagora/twake-mui";
 import { ThunkDispatch } from "@reduxjs/toolkit";
 import { updateCalColor } from "../../../features/Calendars/CalendarSlice";
 import { Calendar } from "../../../features/Calendars/CalendarTypes";

src/components/Dialog/ResponsiveDialog.tsx

@@ -11,7 +11,7 @@ import {
   SxProps,
   Theme,
   Box,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import CloseIcon from "@mui/icons-material/Close";
 import OpenInFullIcon from "@mui/icons-material/OpenInFull";

src/components/Error/Error.tsx

@@ -1,6 +1,13 @@
 import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
 import ReplayIcon from "@mui/icons-material/Replay";
-import { Box, Button, Fade, Paper, Stack, Typography } from "twake-mui";
+import {
+  Box,
+  Button,
+  Fade,
+  Paper,
+  Stack,
+  Typography,
+} from "@linagora/twake-mui";
 import { useEffect, useRef } from "react";
 import { push } from "redux-first-history";
 import { useAppDispatch, useAppSelector } from "../../app/hooks";

src/components/Error/ErrorSnackbar.tsx

@@ -1,4 +1,4 @@
-import { Snackbar, Alert, Button } from "twake-mui";
+import { Snackbar, Alert, Button } from "@linagora/twake-mui";
 import { useAppDispatch } from "../../app/hooks";
 import { clearError as calendarClearError } from "../../features/Calendars/CalendarSlice";
 import { clearError as userClearError } from "../../features/User/userSlice";

src/components/Event/AddDescButton.tsx

@@ -1,4 +1,4 @@
-import { Box, Button, TextField } from "twake-mui";
+import { Box, Button, TextField } from "@linagora/twake-mui";
 import { useI18n } from "twake-i18n";
 import { FieldWithLabel } from "./components/FieldWithLabel";
 import { Description as DescriptionIcon } from "@mui/icons-material";

src/components/Event/EditModeDialog.tsx

@@ -8,7 +8,7 @@ import {
   FormControlLabel,
   Radio,
   RadioGroup,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import { CalendarEvent } from "../../features/Events/EventsTypes";
 import { useState } from "react";
 import { useI18n } from "twake-i18n";
@@ -40,6 +40,7 @@ export function EditModeDialog({
     <Dialog open={Boolean(type)} onClose={handleClose}>
       <DialogTitle>
         {type === "edit" && t("editModeDialog.updateRecurrentEvent")}
+        {type === "delete" && t("editModeDialog.deleteRecurrentEvent")}
         {type === "attendance" && t("editModeDialog.updateParticipationStatus")}
       </DialogTitle>
       <DialogContent>

src/components/Event/EventChip/ErrorEventChip.tsx

@@ -1,4 +1,4 @@
-import { Card, Typography } from "twake-mui";
+import { Card, Typography } from "@linagora/twake-mui";
 import { useRef, useEffect } from "react";
 import { EventErrorHandler } from "../../Error/EventErrorHandler";
 

src/components/Event/EventChip/EventChip.tsx

@@ -5,7 +5,7 @@ import {
   CardContent,
   CardHeader,
   Typography,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import React, { useEffect, useRef, useState } from "react";
 import { stringAvatar } from "../utils/eventUtils";
 import { ErrorEventChip } from "./ErrorEventChip";

src/components/Event/EventChip/EventChipUtils.tsx

@@ -1,7 +1,7 @@
 import CancelIcon from "@mui/icons-material/Cancel";
 import HelpOutlineIcon from "@mui/icons-material/HelpOutline";
 import LockOutlineIcon from "@mui/icons-material/LockOutline";
-import { Box, getContrastRatio } from "twake-mui";
+import { Box, getContrastRatio } from "@linagora/twake-mui";
 import moment from "moment";
 import React, { useLayoutEffect, useState } from "react";
 import { Calendar } from "../../../features/Calendars/CalendarTypes";

src/components/Event/EventChip/SimpleEventChip.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Card, Typography } from "twake-mui";
+import { Card, Typography } from "@linagora/twake-mui";
 
 export function SimpleEventChip({ title }: { title: string }) {
   return (

src/components/Event/EventDuplicate.tsx

@@ -1,4 +1,4 @@
-import { MenuItem } from "twake-mui";
+import { MenuItem } from "@linagora/twake-mui";
 import { CalendarEvent } from "../../features/Events/EventsTypes";
 import { useI18n } from "twake-i18n";
 

src/components/Event/EventFormFields.tsx

@@ -13,7 +13,7 @@ import {
   TextField,
   ToggleButtonGroup,
   ToggleButton,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import {
   Description as DescriptionIcon,
   Public as PublicIcon,

src/components/Event/EventRepeat.tsx

@@ -12,7 +12,7 @@ import {
   FormGroup,
   Radio,
   RadioGroup,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import { useEffect, useState } from "react";
 import { RepetitionObject } from "../../features/Events/EventsTypes";
 import { useI18n } from "twake-i18n";

src/components/Event/InfoRow.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Box, Typography, Link } from "twake-mui";
+import { Box, Typography, Link } from "@linagora/twake-mui";
 
 type InfoRowProps = {
   icon: React.ReactNode;

src/components/Event/components/DateTimeFields.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from "react";
-import { Box, Typography } from "twake-mui";
+import { Box, Typography } from "@linagora/twake-mui";
-import { TextFieldProps } from "twake-mui";
+import { TextFieldProps } from "@linagora/twake-mui";
 import { DatePicker } from "@mui/x-date-pickers/DatePicker";
 import { DatePickerFieldProps } from "@mui/x-date-pickers/DatePicker";
 import { TimePicker } from "@mui/x-date-pickers/TimePicker";

src/components/Event/components/EditableTimeField.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect, useCallback } from "react";
-import { TextField } from "twake-mui";
+import { TextField } from "@linagora/twake-mui";
 import {
   PickerFieldAdapter,
   PickerValidationScope,

src/components/Event/components/FieldWithLabel.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Box, Typography } from "twake-mui";
+import { Box, Typography } from "@linagora/twake-mui";
 
 /**
  * Helper component for field with label

src/components/Event/components/ReadOnlyPickerField.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { TextField } from "twake-mui";
+import { TextField } from "@linagora/twake-mui";
 import {
   PickerFieldAdapter,
   PickerValidationScope,

src/components/Event/utils/eventUtils.tsx

@@ -1,6 +1,6 @@
 import CancelIcon from "@mui/icons-material/Cancel";
 import CheckCircleIcon from "@mui/icons-material/CheckCircle";
-import { Avatar, Badge, Box, Typography } from "twake-mui";
+import { Avatar, Badge, Box, Typography } from "@linagora/twake-mui";
 import { ThunkDispatch } from "@reduxjs/toolkit";
 import {
   emptyEventsCal,

src/components/Loading/SnackBarAlert.tsx

@@ -1,5 +1,5 @@
-import { Alert, Snackbar } from "twake-mui";
+import { Alert, Snackbar } from "@linagora/twake-mui";
-import type { AlertColor } from "twake-mui";
+import type { AlertColor } from "@linagora/twake-mui";
 
 export function SnackbarAlert({
   open,

src/components/Menubar/EventSearchBar.tsx

@@ -14,8 +14,8 @@ import {
   Stack,
   TextField,
   Typography,
-} from "twake-mui";
+} from "@linagora/twake-mui";
-import { type AutocompleteRenderInputParams } from "twake-mui";
+import { type AutocompleteRenderInputParams } from "@linagora/twake-mui";
 import { useRef, useState, useEffect } from "react";
 import HighlightOffIcon from "@mui/icons-material/HighlightOff";
 import SearchIcon from "@mui/icons-material/Search";

src/components/Menubar/Menubar.tsx

@@ -22,7 +22,7 @@ import {
   Typography,
   Box,
   Divider,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import { push } from "redux-first-history";
 import { CalendarApi } from "@fullcalendar/core";
 import { useI18n } from "twake-i18n";

src/components/Timezone/TimezoneAutocomplete.tsx

@@ -1,4 +1,4 @@
-import { Autocomplete, TextField } from "twake-mui";
+import { Autocomplete, TextField } from "@linagora/twake-mui";
 import { PublicOutlined as TimezoneIcon } from "@mui/icons-material";
 import { useMemo } from "react";
 

src/features/Events/EventDisplayPreview.tsx

@@ -381,6 +381,7 @@ export default function EventPreviewModal({
                     onOpenDuplicate={() => {
                       setToggleActionMenu(null);
                       setHidePreview(true);
+<<<<<<< HEAD
                       setOpenDuplicateModal(true);
                     }}
                   />
@@ -625,6 +626,7 @@ export default function EventPreviewModal({
                 }
                 text={t("eventPreview.alarmText", {
                   trigger: t(`event.form.notifications.${event.alarm.trigger}`),
+<<<<<<< HEAD
                   action: (() => {
                     if (!event.alarm.action) return "";
                     const translationKey = `event.form.notifications.${event.alarm.action}`;
@@ -634,6 +636,9 @@ export default function EventPreviewModal({
                       ? event.alarm.action
                       : translated;
                   })(),
+=======
+                  action: event.alarm.action || "",
+>>>>>>> 4ddc44d (chore: update twake-mui dependency and use radius.lg for create event button)
                 })}
                 style={{
                   fontSize: "16px",

src/features/Events/EventModal.tsx

@@ -1,5 +1,5 @@
 import { CalendarApi, DateSelectArg } from "@fullcalendar/core";
-import { Box, Button } from "twake-mui";
+import { Box, Button } from "@linagora/twake-mui";
 import AddIcon from "@mui/icons-material/Add";
 import React, {
   useEffect,

src/features/Events/EventUpdateModal.tsx

@@ -1,4 +1,4 @@
-import { Box, Button } from "twake-mui";
+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";

src/features/Search/SearchResultsPage.tsx

@@ -2,7 +2,14 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import RepeatIcon from "@mui/icons-material/Repeat";
 import SquareRoundedIcon from "@mui/icons-material/SquareRounded";
 import VideocamIcon from "@mui/icons-material/Videocam";
-import { Box, Button, IconButton, Stack, Typography, CircularProgress } from "twake-mui";
+import {
+  Box,
+  Button,
+  IconButton,
+  Stack,
+  Typography,
+  CircularProgress,
+} from "@linagora/twake-mui";
 import { useI18n } from "twake-i18n";
 import { useState } from "react";
 import { useAppDispatch, useAppSelector } from "../../app/hooks";

src/features/Settings/SettingsPage.tsx

@@ -15,7 +15,7 @@ import {
   Snackbar,
   Switch,
   FormControlLabel,
-} from "twake-mui";
+} from "@linagora/twake-mui";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import SettingsIcon from "@mui/icons-material/Settings";
 // import SyncIcon from "@mui/icons-material/Sync";

src/locales/en.json

@@ -188,6 +188,7 @@
   "editModeDialog": {
     "updateRecurrentEvent": "Update the recurrent event",
     "updateParticipationStatus": "Update the participation status",
+    "deleteRecurrentEvent": "Delete the recurrent event",
     "thisEvent": "This event",
     "allEvents": "All the events"
   },