Merge branch 'main' into edit-multifields-in-editmultipleeventsmodal

Author: Arnei

.github/dependabot.yml

@@ -17,3 +17,8 @@ updates:
     open-pull-requests-limit: 15
     labels:
       - type:dependencies
+    groups:
+      minor-and-patch:
+        update-types:
+          - minor
+          - patch

README.md

@@ -71,6 +71,7 @@ How to cut a release for Opencast
    workflow to finish
     - It will create a new [GitHub release draft](https://github.com/opencast/opencast-admin-interface/releases)
     - Review and publish the draft
+        - By selecting the previous release, Github can generate release notes automatically 
 
 5. Submit a pull request against Opencast
     - [Update the release](https://github.com/opencast/opencast/blob/542fc1f82181d1d4712ac8fc06c5ea9e16ae4033/modules/admin-ui-interface/pom.xml#L16-L17)

package-lock.json

@@ -6,42 +6,40 @@
   "homepage": "/admin-ui",
   "dependencies": {
     "@hello-pangea/dnd": "^17.0.0",
-    "@mui/material": "^6.1.9",
-    "@mui/x-date-pickers": "^7.23.1",
-    "@reduxjs/toolkit": "^2.2.6",
-    "@types/dompurify": "^3.0.5",
-    "@types/react-router-dom": "^5.3.3",
+    "@mui/material": "^6.4.1",
+    "@mui/x-date-pickers": "^7.24.1",
+    "@reduxjs/toolkit": "^2.5.1",
     "array-move": "^4.0.0",
-    "axios": "^1.7.7",
+    "axios": "^1.7.9",
     "bourbon": "^7.3.0",
     "classnames": "^2.5.1",
     "date-fns": "^3.6.0",
-    "dompurify": "^3.1.7",
+    "dompurify": "^3.2.3",
     "font-awesome": "^4.7.0",
     "formik": "^2.4.6",
     "http-proxy-middleware": "^3.0.3",
-    "i18next": "^23.16.4",
-    "i18next-browser-languagedetector": "^8.0.0",
-    "i18next-http-backend": "^2.6.1",
+    "i18next": "^24.2.2",
+    "i18next-browser-languagedetector": "^8.0.2",
+    "i18next-http-backend": "^3.0.2",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "moment-timezone": "^0.5.46",
+    "moment-timezone": "^0.5.47",
     "react": "^18.3.1",
-    "react-chartjs-2": "^5.2.0",
-    "react-datepicker": "^7.5.0",
+    "react-chartjs-2": "^5.3.0",
+    "react-datepicker": "^7.6.0",
     "react-dom": "^18.3.1",
     "react-hotkeys-hook": "^4.6.1",
-    "react-i18next": "^15.1.3",
-    "react-icons": "^5.3.0",
-    "react-redux": "^9.1.2",
-    "react-router-dom": "^6.27.0",
-    "react-select": "^5.8.0",
+    "react-i18next": "^15.4.0",
+    "react-icons": "^5.4.0",
+    "react-redux": "^9.2.0",
+    "react-router": "^7.1.3",
+    "react-select": "^5.10.0",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "redux-thunk": "^3.1.0",
     "reselect": "^5.1.1",
-    "styled-components": "^6.1.13",
-    "yup": "^1.4.0"
+    "styled-components": "^6.1.14",
+    "yup": "^1.6.1"
   },
   "scripts": {
     "start": "vite",
@@ -64,10 +62,10 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.9.1",
+    "@eslint/js": "^9.19.0",
     "@redux-devtools/extension": "^3.3.0",
-    "@types/lodash": "^4.17.13",
-    "@types/node": "^22.5.1",
+    "@types/lodash": "^4.17.15",
+    "@types/node": "^22.12.0",
     "@types/react-dom": "^18.3.0",
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^7.14.1",
@@ -76,11 +74,11 @@
     "eslint-config-react-app": "^7.0.1",
     "prop-types": "^15.8.1",
     "rollup-preserve-directives": "^1.1.3",
-    "sass": "^1.79.4",
-    "typescript": "^5.6.3",
-    "uuid": "^11.0.3",
+    "sass": "^1.83.4",
+    "typescript": "^5.7.3",
+    "uuid": "^11.0.5",
     "vite": "^5.4.10",
-    "vite-plugin-svgr": "^4.2.0",
+    "vite-plugin-svgr": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^2.1.8"
   }

package.json

@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import { HashRouter, Navigate, Route, Routes } from "react-router-dom";
+import { HashRouter, Navigate, Route, Routes } from "react-router";
 import "./App.scss";
 import Events from "./components/events/Events";
 import Recordings from "./components/recordings/Recordings";

src/App.tsx

@@ -4,7 +4,7 @@ import NavBar from "./NavBar";
 import Footer from "./Footer";
 import MainNav from "./shared/MainNav";
 import { useTranslation } from "react-i18next";
-import { Link, useLocation } from "react-router-dom";
+import { Link, useLocation } from "react-router";
 import cn from "classnames";
 import axios from 'axios';
 import i18n from "../i18n/i18n";

src/components/About.tsx

@@ -4,7 +4,7 @@ import {
 	getUserInformation,
 } from "../selectors/userInfoSelectors";
 import { useAppSelector } from "../store";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { useTranslation } from "react-i18next";
 import { Tooltip } from "./shared/Tooltip";
 

src/components/Footer.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import i18n from "../i18n/i18n";
 import languages from "../i18n/languages";
 import opencastLogo from "../img/opencast-white.svg?url";

src/components/Header.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import MainNav from "../shared/MainNav";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import cn from "classnames";
 import TableFilters from "../shared/TableFilters";
 import Table from "../shared/Table";

src/components/configuration/Themes.tsx

@@ -1,7 +1,6 @@
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import ConfirmModal from "../../shared/ConfirmModal";
-import ThemeDetailsModal from "./wizard/ThemeDetailsModal";
 import {
 	fetchThemeDetails,
 	fetchUsage,
@@ -11,6 +10,8 @@ import { hasAccess } from "../../../utils/utils";
 import { useAppDispatch, useAppSelector } from "../../../store";
 import { deleteTheme, ThemeDetailsType } from "../../../slices/themeSlice";
 import { Tooltip } from "../../shared/Tooltip";
+import ThemeDetails from "./wizard/ThemeDetails";
+import DetailsModal from "../../shared/modals/DetailsModal";
 
 /**
  * This component renders the action cells of themes in the table view
@@ -60,10 +61,13 @@ const ThemesActionsCell = ({
 			)}
 
 			{displayThemeDetails && (
-				<ThemeDetailsModal
+				<DetailsModal
 					handleClose={hideThemeDetails}
-					themeName={row.name}
-				/>
+					title={row.name}
+					prefix={"CONFIGURATION.THEMES.DETAILS.EDITCAPTION"}
+				>
+					<ThemeDetails close={hideThemeDetails} />
+				</DetailsModal>
 			)}
 
 			{/* delete themes */}