Merge branch 'r/18.x' into r/19.x

gregorydlogan · gregorydlogan · commit 119e8d5707d3 · 2025-12-05T14:25:11.000-06:00
diff --git a/src/components/events/partials/ModalTabsAndPages/EventDetailsWorkflowDetails.tsx b/src/components/events/partials/ModalTabsAndPages/EventDetailsWorkflowDetails.tsx
@@ -50,9 +50,11 @@ const EventDetailsWorkflowDetails = ({
 		if (!workflowId) {
 			dispatch(fetchWorkflows(eventId)).unwrap()
 				.then(workflows => {
-					const currentWorkflow = workflows.entries[workflows.entries.length - 1];
-					dispatch(fetchWorkflowDetails({ eventId, workflowId: currentWorkflow.id }));
-					dispatch(setModalWorkflowId(currentWorkflow.id));
+					if (workflows.entries.length > 0) {
+						const currentWorkflow = workflows.entries[workflows.entries.length - 1];
+						dispatch(fetchWorkflowDetails({ eventId, workflowId: currentWorkflow.id }));
+						dispatch(setModalWorkflowId(currentWorkflow.id));
+					}
 				},
 			);
 		} else {
diff --git a/src/components/events/partials/modals/EventDetails.tsx b/src/components/events/partials/modals/EventDetails.tsx
@@ -25,6 +25,7 @@ import {
 	getModalPage,
 	getEventDetailsTobiraDataError,
 	getEventDetailsTobiraStatus,
+	getWorkflows,
 } from "../../../../selectors/eventDetailsSelectors";
 import { getUserInformation } from "../../../../selectors/userInfoSelectors";
 import EventDetailsStatisticsTab from "../ModalTabsAndPages/EventDetailsStatisticsTab";
@@ -133,6 +134,7 @@ const EventDetails = ({
 	const captureAgents = useAppSelector(state => getRecordings(state));
 	const tobiraStatus = useAppSelector(state => getEventDetailsTobiraStatus(state));
 	const tobiraError = useAppSelector(state => getEventDetailsTobiraDataError(state));
+	const workflows = useAppSelector(state => getWorkflows(state));
 
 	const tabs: {
 		tabNameTranslation: ParseKeys,
@@ -276,7 +278,7 @@ const EventDetails = ({
 						formikRef={formikRef}
 					/>
 				)}
-				{page === EventDetailsPage.Workflow && !hasSchedulingProperties &&
+				{page === EventDetailsPage.Workflow && !workflows.scheduling &&
 					((workflowTabHierarchy === "workflows" && (
 						<EventDetailsWorkflowTab
 							eventId={eventId}
@@ -300,7 +302,7 @@ const EventDetails = ({
 								eventId={eventId}
 							/>
 						)))}
-				{page === EventDetailsPage.Workflow && hasSchedulingProperties &&
+				{page === EventDetailsPage.Workflow && workflows.scheduling &&
 					<EventDetailsWorkflowSchedulingTab
 						eventId={eventId}
 						formikRef={formikRef}
diff --git a/src/components/shared/Stats.tsx b/src/components/shared/Stats.tsx
@@ -10,6 +10,7 @@ import {
 	removeTextFilter,
 } from "../../slices/tableFilterSlice";
 import { loadEventsIntoTable } from "../../thunks/tableThunks";
+import { setOffset, setPageActive } from "../../slices/tableSlice";
 import { useAppDispatch, useAppSelector } from "../../store";
 import { fetchEvents } from "../../slices/eventSlice";
 import { ParseKeys } from "i18next";
@@ -39,6 +40,9 @@ const Stats = () => {
 			const filter = filterMap.find(({ name }) => name === f.name);
 			filterValue = f.value;
 			if (filter) {
+				// go to first page without reloading all events
+				dispatch(setOffset(0));
+				dispatch(setPageActive(0));
 				dispatch(editFilterValue({ filterName: filter.name, value: filterValue, resource: "events" }));
 			}
 		});
diff --git a/src/components/shared/wizard/RenderField.tsx b/src/components/shared/wizard/RenderField.tsx
@@ -228,6 +228,15 @@ const EditableSingleSelect = (props: EditableSingleSelectProps) => {
 		metadataField={metadataField}
 		text={text}
 		form={form}
+		options={
+			metadataField.collection
+				? metadataField.collection.map(item => ({
+					label: item.label ?? item.name,
+					value: item.value,
+					order: item.order,
+				}))
+				: []
+			}
 		isFirstField={isFirstField}
 		focused={focused}
 		setFocused={setFocused}
