Merge branch 'main' into remove-feeds

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,10 +6,9 @@
   "homepage": "/admin-ui",
   "dependencies": {
     "@hello-pangea/dnd": "^17.0.0",
-    "@mui/material": "^6.3.0",
-    "@mui/x-date-pickers": "^7.23.1",
-    "@reduxjs/toolkit": "^2.5.0",
-    "@types/dompurify": "^3.2.0",
+    "@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.9",
     "bourbon": "^7.3.0",
@@ -19,27 +18,27 @@
     "font-awesome": "^4.7.0",
     "formik": "^2.4.6",
     "http-proxy-middleware": "^3.0.3",
-    "i18next": "^24.2.0",
+    "i18next": "^24.2.2",
     "i18next-browser-languagedetector": "^8.0.2",
-    "i18next-http-backend": "^3.0.1",
+    "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.4.0",
-    "react-icons": "^5.3.0",
+    "react-icons": "^5.4.0",
     "react-redux": "^9.2.0",
-    "react-router": "^7.1.1",
-    "react-select": "^5.8.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",
+    "styled-components": "^6.1.14",
     "yup": "^1.6.1"
   },
   "scripts": {
@@ -63,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",
@@ -75,11 +74,11 @@
     "eslint-config-react-app": "^7.0.1",
     "prop-types": "^15.8.1",
     "rollup-preserve-directives": "^1.1.3",
-    "sass": "^1.83.0",
-    "typescript": "^5.7.2",
-    "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,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 */}

src/components/configuration/partials/ThemesActionsCell.tsx

@@ -1,6 +1,4 @@
 import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import cn from "classnames";
 import { Formik } from "formik";
 import GeneralPage from "./GeneralPage";
 import BumperPage from "./BumperPage";
@@ -15,17 +13,17 @@ import ModalNavigation from "../../../shared/modals/ModalNavigation";
 import { NewThemeSchema } from "../../../../utils/validate";
 import { useAppDispatch, useAppSelector } from "../../../../store";
 import { updateThemeDetails } from "../../../../slices/themeDetailsSlice";
+import WizardNavigationButtons from "../../../shared/wizard/WizardNavigationButtons";
 import { ThemeDetailsInitialValues } from "../../../../slices/themeSlice";
 
 /**
  * This component manages the pages of the theme details
  */
-const ThemeDetails : React.FC<{
+const ThemeDetails = ({
+	close,
+}: {
 	close: () => void,
-}> = ({
-  close,
 }) => {
-	const { t } = useTranslation();
 	const dispatch = useAppDispatch();
 
 	const [page, setPage] = useState(0);
@@ -116,21 +114,13 @@ const ThemeDetails : React.FC<{
 						{page === 4 && <WatermarkPage formik={formik} isEdit />}
 						{page === 5 && <UsagePage themeUsage={themeUsage} />}
 						{/* submit and cancel button */}
-						<footer>
-							<button
-								className={cn("submit", {
-									active: formik.dirty && formik.isValid,
-									inactive: !(formik.dirty && formik.isValid),
-								})}
-								disabled={!(formik.dirty && formik.isValid)}
-								onClick={() => formik.handleSubmit()}
-							>
-								{t("SUBMIT")}
-							</button>
-							<button className="cancel" onClick={() => close()}>
-								{t("CANCEL")}
-							</button>
-						</footer>
+						<WizardNavigationButtons
+							isLast
+							formik={formik}
+							previousPage={() => close()}
+							createTranslationString={"SUBMIT"}
+							cancelTranslationString={"CANCEL"}
+						/>
 
 						<div className="btm-spacer" />
 					</div>

src/components/configuration/partials/wizard/ThemeDetails.tsx

@@ -315,7 +315,7 @@ const Events = () => {
 
 				{/*Include table component*/}
 				{/* <Table templateMap={eventsTemplateMap} resourceType="events" /> */}
-        <Table templateMap={eventsTemplateMap} />
+				<Table templateMap={eventsTemplateMap} />
 			</MainView>
 			<Footer />
 		</>

src/components/configuration/partials/wizard/ThemeDetailsModal.tsx

@@ -49,7 +49,7 @@ const Series = () => {
 	const [displayNewSeriesModal, setNewSeriesModal] = useState(false);
 	const [displayDeleteSeriesModal, setDeleteSeriesModal] = useState(false);
 
-  const user = useAppSelector(state => getUserInformation(state));
+	const user = useAppSelector(state => getUserInformation(state));
 	const currentFilterType = useAppSelector(state => getCurrentFilterResource(state));
 
 	let location = useLocation();
@@ -142,18 +142,18 @@ const Series = () => {
 	};
 
 	useHotkeys(
-    availableHotkeys.general.NEW_SERIES.sequence,
-    () => showNewSeriesModal(),
+		availableHotkeys.general.NEW_SERIES.sequence,
+		() => showNewSeriesModal(),
 		{ description: t(availableHotkeys.general.NEW_SERIES.description) ?? undefined },
-    [showNewSeriesModal]
-  );
+		[showNewSeriesModal]
+	);
 
 	return (
 		<>
 			<Header />
 			<NavBar>
 				{/* Display modal for new series if add series button is clicked */}
-				{ displayNewSeriesModal &&
+				{displayNewSeriesModal &&
 					<NewResourceModal
 						handleClose={hideNewSeriesModal}
 						resource={"series"}