Merge branch 'cant-go-back-from-processing' of Arnei/opencast-admin-interface into main

Pull request #1153

  Fix being unable to step back in event modal

Author: gregorydlogan

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

@@ -30,12 +30,6 @@ const NewAssetUploadPage = <T extends RequiredFormProps>({
 
 	const uploadAssetOptions = useAppSelector(state => getAssetUploadOptions(state));
 
-	// if user not chose upload in step before, the skip this step
-	if (formik.values.sourceMode !== "UPLOAD") {
-		nextPage(formik.values);
-		return null;
-	}
-
 	const handleChange = (e: React.ChangeEvent<HTMLInputElement>, assetId: string) => {
 		if (e.target.files) {
 			if (e.target.files.length === 0) {

src/components/events/partials/wizards/NewEventWizard.tsx

@@ -128,6 +128,10 @@ const NewEventWizard: React.FC<{
 		let newPage = page;
 		do {
 			newPage = newPage + 1;
+			// Skip asset upload step when scheduling
+			if (steps[newPage].name === "upload-asset" && values.sourceMode !== "UPLOAD") {
+				newPage = newPage + 1;
+			}
 		} while(steps[newPage] && steps[newPage].hidden);
 		if (steps[newPage]) {
 			setPage(newPage)
@@ -140,6 +144,10 @@ const NewEventWizard: React.FC<{
 		let newPage = page;
 		do {
 			newPage = newPage - 1;
+			// Skip asset upload step when scheduling
+			if (steps[newPage].name === "upload-asset" && values.sourceMode !== "UPLOAD") {
+				newPage = newPage - 1;
+			}
 		} while(steps[newPage] && steps[newPage].hidden);
 		if (steps[newPage]) {
 			setPage(newPage)