Merge branch 't/fix-mismerge' of gregorydlogan/opencast-admin-interface into develop

Pull request #1371

  Fix merge conflicts

Author: gregorydlogan

src/components/events/partials/ModalTabsAndPages/EventDetailsWorkflowDetails.tsx

@@ -370,12 +370,12 @@ const OperationsPreview = ({
 			{ workflowDone && <>
 				<WorfklowOperationsTableBody
 					operations={operationsEntry
-						? [{ operation: operationsEntry.operation, operationId: operationsEntry.index}]
+						? [{ operation: operationsEntry.operation, operationId: operationsEntry.index }]
 						: []
 					}
 					openSubTab={openDetailsSubTab}
 				/>
-				<hr style={{ height: "1px", border: 0, borderTop: "1px solid #ccc", margin: "0", padding: "0"}} />
+				<hr style={{ height: "1px", border: 0, borderTop: "1px solid #ccc", margin: "0", padding: "0" }} />
 			</>}
 
 			{/* links to 'Operations' or 'Errors & Warnings' sub-Tabs */}
@@ -396,6 +396,6 @@ const OperationsPreview = ({
 			</div>
 		</div>
 	);
-}
+};
 
 export default EventDetailsWorkflowDetails;

src/components/events/partials/ModalTabsAndPages/EventDetailsWorkflowErrorDetails.tsx

@@ -29,7 +29,7 @@ const EventDetailsWorkflowErrorDetails = ({
 
 	const errorDetails = useAppSelector(state => getWorkflowErrorDetails(state));
 	const isFetching = useAppSelector(state => isFetchingWorkflowErrorDetails(state));
-	const operationsEntry = useAppSelector(state => getWorkflowByJobId(state, errorDetails.rootJobId ?? errorDetails.jobId, errorDetails.jobId))
+	const operationsEntry = useAppSelector(state => getWorkflowByJobId(state, errorDetails.rootJobId ?? errorDetails.jobId, errorDetails.jobId));
 	const workflowId = useAppSelector(state => getModalWorkflowId(state));
 
 	const openSubTab = (tabType: WorkflowTabHierarchy) => {
@@ -65,7 +65,7 @@ const EventDetailsWorkflowErrorDetails = ({
 			{/* Error operation table */}
 			<WorkflowOperationsTable
 				operations={operationsEntry
-					? [{ operation: operationsEntry.operation, operationId: operationsEntry.index}]
+					? [{ operation: operationsEntry.operation, operationId: operationsEntry.index }]
 					: []
 				}
 				openSubTab={openOperationDetailsSubTab}

src/components/events/partials/ModalTabsAndPages/EventDetailsWorkflowOperations.tsx

@@ -200,26 +200,26 @@ const OperationStatusIcon = ({
 	// Parse translation key to state
 	const state = status.split(".").pop();
 
-	const iconStyle = { marginRight: "5px"};
+	const iconStyle = { marginRight: "5px" };
 
 	switch (state) {
 		case "INSTANTIATED":
-			return <LuEllipsis style={{ ...iconStyle, color: "#666"}}/>;
+			return <LuEllipsis style={{ ...iconStyle, color: "#666" }}/>;
 		case "RUNNING":
-			return <LuLoader className="fa-spin" style={{ ...iconStyle, color: "#666"}}/>;
+			return <LuLoader className="fa-spin" style={{ ...iconStyle, color: "#666" }}/>;
 		case "PAUSED":
-			return <LuPause style={{ ...iconStyle, color: "#666"}}/>;
+			return <LuPause style={{ ...iconStyle, color: "#666" }}/>;
 		case "SUCCEEDED":
-			return <LuCheck style={{ ...iconStyle, color: "#37c180"}}/>;
+			return <LuCheck style={{ ...iconStyle, color: "#37c180" }}/>;
 		case "FAILED":
-			return <LuX style={{ ...iconStyle, color: "#fa1919"}}/>;
+			return <LuX style={{ ...iconStyle, color: "#fa1919" }}/>;
 		case "SKIPPED":
-			return <GoDash style={{ ...iconStyle, color: "#378dd4"}}/>;
+			return <GoDash style={{ ...iconStyle, color: "#378dd4" }}/>;
 		case "RETRY":
-			return <LuRotateCcw className="fa-spin" style={{ ...iconStyle, color: "#666"}}/>;
+			return <LuRotateCcw className="fa-spin" style={{ ...iconStyle, color: "#666" }}/>;
 		default:
 			return <></>;
 	}
-}
+};
 
 export default EventDetailsWorkflowOperations;

src/selectors/eventDetailsSelectors.ts

@@ -96,7 +96,7 @@ export const getWorkflowsSortedByDate = createSelector(
 			entries: [...workflows.entries].sort(
 				(a, b) => new Date(b.submitted).getTime() - new Date(a.submitted).getTime(),
 			),
-		})
+		});
 	},
 );
 export const isFetchingWorkflows = (state: RootState) =>