Merge Metadata

This patch removes the special recording metadata section and merges it
into the default metadata to avoid the appearance that these are
separate metadata catalogs.

Author: lkiesow

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

@@ -71,39 +71,27 @@ const NewMetadataPage = <T extends RequiredFormProps>({
 													</td>
 												</tr>
 											))}
+											{formik.values.sourceMode === "UPLOAD"
+												&& sourceMetadata.UPLOAD
+												&& sourceMetadata.UPLOAD.metadata.map((field, key) => (
+												<tr key={key}>
+													<td>
+														<span>{t(field.label)}</span>
+														{field.required && <i className="required">*</i>}
+													</td>
+													<td className="editable">
+														<Field
+															name={field.id}
+															metadataField={field}
+															component={RenderField}
+														/>
+													</td>
+												</tr>
+											))}
 									</tbody>
 								</table>
 							</div>
 						</div>
-						{formik.values.sourceMode === "UPLOAD" && (
-						<div className="obj list-obj">
-							<header className="no-expand">
-								{t("EVENTS.EVENTS.NEW.SOURCE.UPLOAD.RECORDING_METADATA")}
-							</header>
-							<div className="obj-container">
-								<table className="main-tbl">
-									<tbody>
-										{/* One row for each metadata field*/}
-										{sourceMetadata.UPLOAD && sourceMetadata.UPLOAD.metadata.map((field, key) => (
-											<tr key={key}>
-												<td>
-													<span>{t(field.label)}</span>
-													{field.required && <i className="required">*</i>}
-												</td>
-												<td className="editable">
-													<Field
-														name={field.id}
-														metadataField={field}
-														component={RenderField}
-													/>
-												</td>
-											</tr>
-										))}
-									</tbody>
-								</table>
-							</div>
-						</div>
-						)}
 					</div>
 				</div>
 			</div>

src/i18n/org/opencastproject/adminui/languages/lang-en_US.json

@@ -484,7 +484,6 @@
 					"UPLOAD": {
 						"CAPTION": "Upload",
 						"RECORDING_ELEMENTS": "Recording elements",
-						"RECORDING_METADATA": "Recording metadata",
 						"SEGMENTABLE": {
 							"SHORT": "Presentation",
 							"DETAIL": "The file contains a recording of a what is shown to an audience (Keynote, Powerpoint, etc)."

src/utils/validate.ts

@@ -69,10 +69,10 @@ export const NewEventSchema = [
 			then: () => Yup.string().required("Required"),
 		}),
 	}),
+	Yup.object().shape({}),
 	Yup.object().shape({
 		title: Yup.string().required("Title is required"),
 	}),
-	Yup.object().shape({}),
 	Yup.object().shape({
 		processingWorkflow: Yup.string().required("Workflow is required"),
 	}),