Fix notification display in event metadata tab

Notifications were not being rendered in the metadata tab of the event details, especially the "Active Workflow"-notification. This patch fixes that. This patch also fixes: - The "Active Workflow"-notification being rendered multiple times. - The "Active Workflow"-notification being rendered even when there is no active workflow anymore.
opencast · Dec 18, 2024 · ae4fbd6 · ae4fbd6
1 parent fba544d
commit ae4fbd6
Show file tree

Hide file tree

Showing 21 changed files with 59 additions and 35 deletions.
diff --git a/src/components/configuration/Themes.tsx b/src/components/configuration/Themes.tsx
@@ -114,7 +114,7 @@ const Themes = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					{/* Include filters component */}

diff --git a/src/components/configuration/partials/wizard/GeneralPage.tsx b/src/components/configuration/partials/wizard/GeneralPage.tsx
@@ -35,7 +35,7 @@ const GeneralPage = <T,>({
 					<div className="full-col">
 						<div className="form-container">
 							<div className="row">
-								<Notifications />
+								<Notifications context={"other"}/>
 								<label className="required" style={isEdit ? editStyle: undefined}>
 									{t("CONFIGURATION.THEMES.DETAILS.GENERAL.NAME")}
 								</label>

diff --git a/src/components/events/Events.tsx b/src/components/events/Events.tsx
@@ -251,7 +251,7 @@ const Events = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					<div className="filters-container">

diff --git a/src/components/events/Series.tsx b/src/components/events/Series.tsx
@@ -200,7 +200,7 @@ const Series = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					<div className="filters-container">

diff --git a/src/components/events/partials/ModalTabsAndPages/DetailsMetadataTab.tsx b/src/components/events/partials/ModalTabsAndPages/DetailsMetadataTab.tsx
@@ -79,7 +79,7 @@ const DetailsMetadataTab = ({
 				<>
 					<div className="modal-content">
 						<div className="modal-body">
-							<Notifications context="not-corner" />
+							<Notifications context="not_corner" />
 							<div className="full-col">
 								<div className="obj tbl-list">
 									<header className="no-expand">{t(header)}</header>

diff --git a/src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx b/src/components/events/partials/ModalTabsAndPages/EventDetailsCommentsTab.tsx
@@ -111,7 +111,7 @@ const EventDetailsCommentsTab = ({
 	return (
 		<div className="modal-content">
 			<div className="modal-body">
-				<Notifications context="not-corner" />
+				<Notifications context="not_corner" />
 				<div className="full-col">
 					<div className="obj comments">
 						<header>{t(header)}</header>

diff --git a/src/components/events/partials/ModalTabsAndPages/EventDetailsPublicationTab.tsx b/src/components/events/partials/ModalTabsAndPages/EventDetailsPublicationTab.tsx
@@ -30,7 +30,7 @@ const EventDetailsPublicationTab = ({
 		<>
 			<div className="modal-content">
 				<div className="modal-body">
-					<Notifications />
+					<Notifications context={"other"}/>
 					<div className="full-col">
 						<div className="obj list-obj">
 							<header>{t("EVENTS.EVENTS.DETAILS.PUBLICATIONS.CAPTION")}</header>

diff --git a/src/components/events/partials/modals/EventDetails.tsx b/src/components/events/partials/modals/EventDetails.tsx
@@ -41,9 +41,12 @@ import {
 	fetchEventStatistics,
 	openModalTab,
 	fetchEventDetailsTobira,
+	fetchHasActiveTransactions,
 } from "../../../../slices/eventDetailsSlice";
-import { removeNotificationWizardForm } from "../../../../slices/notificationSlice";
+import { addNotification, removeNotificationByKey, removeNotificationWizardForm } from "../../../../slices/notificationSlice";
 import DetailsTobiraTab from "../ModalTabsAndPages/DetailsTobiraTab";
+import { NOTIFICATION_CONTEXT } from "../../../../configs/modalConfig";
+import { unwrapResult } from "@reduxjs/toolkit";
 
 export enum EventDetailsPage {
 	Metadata,
@@ -84,6 +87,32 @@ const EventDetails = ({
 		dispatch(fetchSchedulingInfo(eventId)).then();
 		dispatch(fetchEventStatistics(eventId)).then();
 		dispatch(fetchAssetUploadOptions()).then();
+
+		dispatch(fetchHasActiveTransactions(eventId)).then((fetchTransactionResult) => {
+			const result = unwrapResult(fetchTransactionResult)
+			if (result.active !== undefined && result.active) {
+				dispatch(
+					addNotification({
+						type: "warning",
+						key: "ACTIVE_TRANSACTION",
+						duration: -1,
+						parameter: undefined,
+						context: NOTIFICATION_CONTEXT,
+						noDuplicates: true
+					})
+				)
+			}
+			if (result.active !== undefined && !result.active) {
+				dispatch(
+					removeNotificationByKey({
+						key: "ACTIVE_TRANSACTION",
+						context: NOTIFICATION_CONTEXT
+					})
+				)
+			}
+		});
+
+
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, []);
 

diff --git a/src/components/recordings/Recordings.tsx b/src/components/recordings/Recordings.tsx
@@ -81,7 +81,7 @@ const Recordings = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					{/* Include filters component */}

diff --git a/src/components/shared/Notifications.tsx b/src/components/shared/Notifications.tsx
@@ -13,10 +13,16 @@ import {
 import { useAppDispatch, useAppSelector } from "../../store";
 import { OurNotification, setHidden } from "../../slices/notificationSlice";
 
+type Context = "not_corner" | "tobira" | "above_table" | "other"
+
 /**
  * This component renders notifications about occurred errors, warnings and info
  */
-const Notifications : React.FC<{ context?: string }> = ({ context }) => {
+const Notifications = ({
+	context,
+}: {
+	context: Context,
+}) => {
 	const { t } = useTranslation();
 	const dispatch = useAppDispatch();
 

diff --git a/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx b/src/components/shared/modals/ResourceDetailsAccessPolicyTab.tsx
@@ -107,7 +107,8 @@ const ResourceDetailsAccessPolicyTab = ({
 						key: "ACTIVE_TRANSACTION",
 						duration: -1,
 						parameter: undefined,
-						context: NOTIFICATION_CONTEXT
+						context: NOTIFICATION_CONTEXT,
+						noDuplicates: true,
 					}));
 				}
 			}

diff --git a/src/components/systems/Jobs.tsx b/src/components/systems/Jobs.tsx
@@ -131,7 +131,7 @@ const Jobs = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					{/* Include filters component */}

diff --git a/src/components/systems/Servers.tsx b/src/components/systems/Servers.tsx
@@ -131,7 +131,7 @@ const Servers = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					{/* Include filters component */}

diff --git a/src/components/systems/Services.tsx b/src/components/systems/Services.tsx
@@ -130,7 +130,7 @@ const Services = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					{/* Include filters component */}

diff --git a/src/components/users/Acls.tsx b/src/components/users/Acls.tsx
@@ -145,7 +145,7 @@ const Acls: React.FC = () => {
 						</Link>
 					)}
 				</nav>
-				
+
 				{/* Add acl button */}
 				<div className="btn-group">
 					{hasAccess("ROLE_UI_ACLS_CREATE", user) && (
@@ -159,7 +159,7 @@ const Acls: React.FC = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					{/* Include filters component */}

diff --git a/src/components/users/Groups.tsx b/src/components/users/Groups.tsx
@@ -145,7 +145,7 @@ const Groups = () => {
 						</Link>
 					)}
 				</nav>
-				
+
 				{/* Add group button */}
 				<div className="btn-group">
 					{hasAccess("ROLE_UI_GROUPS_CREATE", user) && (
@@ -159,7 +159,7 @@ const Groups = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					{/* Include filters component */}

diff --git a/src/components/users/Users.tsx b/src/components/users/Users.tsx
@@ -145,7 +145,7 @@ const Users: React.FC = () => {
 						</Link>
 					)}
 				</nav>
-				
+
 				{/* Add user button */}
 				<div className="btn-group">
 					{hasAccess("ROLE_UI_USERS_CREATE", user) && (
@@ -159,7 +159,7 @@ const Users: React.FC = () => {
 
 			<MainView open={displayNavigation}>
 				{/* Include notifications component */}
-				<Notifications />
+				<Notifications context={"other"}/>
 
 				<div className="controls-container">
 					{/* Include filters component */}

diff --git a/src/components/users/partials/wizard/NewAclSummaryPage.tsx b/src/components/users/partials/wizard/NewAclSummaryPage.tsx
@@ -24,7 +24,7 @@ const NewAclSummaryPage = <T extends RequiredFormProps>({
 			<div className="modal-content">
 				<div className="modal-body">
 					<div className="full-col">
-						<Notifications />
+						<Notifications context={"other"}/>
 						<div className="obj tbl-list">
 							<header className="no-expand">{t("")}</header>
 							<div className="obj-container">

diff --git a/src/components/users/partials/wizard/NewGroupSummaryPage.tsx b/src/components/users/partials/wizard/NewGroupSummaryPage.tsx
@@ -31,7 +31,7 @@ const NewGroupSummaryPage = <T extends typeof initialFormValuesNewGroup>({
 			<div className="modal-content">
 				<div className="modal-body">
 					<div className="full-col">
-						<Notifications />
+						<Notifications context={"other"}/>
 
 						<div className="obj">
 							<header>{t("USERS.GROUPS.DETAILS.FORM.SUMMARY")}</header>

diff --git a/src/components/users/partials/wizard/NewUserGeneralTab.tsx b/src/components/users/partials/wizard/NewUserGeneralTab.tsx
@@ -27,7 +27,7 @@ const NewUserGeneralTab = <T extends RequiredFormProps>({
 		<div className="modal-content">
 			<div className="modal-body">
 				<div className="form-container">
-					<Notifications />
+					<Notifications context={"other"}/>
 					{/* Fields for user information needed */}
 					<div className="row">
 						<label>

diff --git a/src/slices/eventDetailsSlice.ts b/src/slices/eventDetailsSlice.ts
@@ -686,18 +686,6 @@ export const fetchAssets = createAppAsyncThunk('eventDetails/fetchAssets', async
 	uploadAssetOptions =
 		uploadAssetOptions.length > 0 ? uploadAssetOptions : undefined;
 
-	if (transactionsReadOnly) {
-		dispatch(
-			addNotification({
-				type: "warning",
-				key: "ACTIVE_TRANSACTION",
-				duration: -1,
-				parameter: undefined,
-				context: NOTIFICATION_CONTEXT
-			})
-		);
-	}
-
 	return { assets, transactionsReadOnly, uploadAssetOptions }
 });