Extended CA API - Add field cameraPosition

Author: Arnei

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

@@ -69,6 +69,7 @@ export type InitialValues = {
 	stream: string;
 	record: string;
 	layout: string;
+	cameraPosition: string;
 }
 
 /**
@@ -179,6 +180,19 @@ const EventDetailsSchedulingTab = ({
 		}
 	};
 
+	const getCameraPosition = (deviceId: Recording["id"]) => {
+		if (deviceId === source.device.id) {
+			return source.device.parsedCapabilities.cameraPosition ? source.device.parsedCapabilities.cameraPosition : [];
+		} else {
+			for (const agent of filterDevicesForAccess(user, captureAgents)) {
+				if (agent.id === deviceId) {
+					return agent.parsedCapabilities.cameraPosition ? agent.parsedCapabilities.cameraPosition : [];
+				}
+			}
+			return [];
+		}
+	};
+
 	const getInputForAgent = (deviceId: Recording["id"], input: string) => {
 		const inputs = getInputs(deviceId);
 		const value = inputs.find(agent => agent.id === input)?.value;
@@ -203,6 +217,12 @@ const EventDetailsSchedulingTab = ({
 		return value ? t(value as ParseKeys) : "";
 	};
 
+	const getCameraPositionForAgent = (deviceId: Recording["id"], s: string) => {
+		const cameraPosition = getCameraPosition(deviceId);
+		const value = cameraPosition.find(agent => agent.id === s)?.value;
+		return value ? t(value as ParseKeys) : "";
+	};
+
 	// changes the inputs in the formik
 	const changeInputs = (deviceId: Recording["id"], setFieldValue: (field: string, value: any) => Promise<void | FormikErrors<any>>) => {
 		setFieldValue("captureAgent", deviceId);
@@ -315,6 +335,9 @@ const EventDetailsSchedulingTab = ({
 		const layout = source.device.capabilitiesMethods.layout && source.device.capabilitiesMethods.layout.length > 0
 			? source.device.capabilitiesMethods.layout[0]
 			: "";
+		const cameraPosition = source.device.capabilitiesMethods.cameraPosition && source.device.capabilitiesMethods.cameraPosition.length > 0
+			? source.device.capabilitiesMethods.cameraPosition[0]
+			: "";
 
 		startDate.setHours(0, 0, 0);
 		endDate.setHours(0, 0, 0);
@@ -333,6 +356,7 @@ const EventDetailsSchedulingTab = ({
 			stream: stream,
 			record: record,
 			layout: layout,
+			cameraPosition: cameraPosition,
 		};
 	};
 
@@ -701,6 +725,33 @@ const EventDetailsSchedulingTab = ({
 														)}
 												</td>
 											</tr>
+
+											{/* cameraPosition */}
+											<tr>
+												<td>
+													{t(
+														"EVENTS.EVENTS.DETAILS.SOURCE.PLACEHOLDER.CAMERA_POSITION",
+													)}
+												</td>
+												<td>
+													{!!formik.values.captureAgent &&
+														!!getCameraPosition(formik.values.captureAgent) &&
+														getCameraPosition(formik.values.captureAgent).length >
+															0 &&
+														(hasAccessRole &&
+														accessAllowed(formik.values.captureAgent)
+															? <SchedulingRadio
+																	name="cameraPosition"
+																	inputs={getCameraPosition(formik.values.captureAgent)}
+																/>
+															:
+																<span>
+																	{getCameraPositionForAgent(formik.values.captureAgent, formik.values.cameraPosition)}
+																	<br />
+																</span>
+														)}
+												</td>
+											</tr>
 										</tbody>
 									</table>
 								</div>

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

@@ -543,6 +543,26 @@ const Schedule = <T extends {
 		}
 	};
 
+		const renderCameraPositionDeviceOptions = () => {
+		if (formik.values.location) {
+			const inputDevice = inputDevices.find(
+				({ name }) => name === formik.values.location,
+			);
+			if (!inputDevice) {
+				return <></>;
+			}
+			return (
+				<>
+					<SchedulingRadio
+						name="cameraPosition"
+						inputs={inputDevice.parsedCapabilities.cameraPosition}
+						// formik={formik}
+					/>
+				</>
+			);
+		}
+	};
+
 	return (
 		<div className="obj">
 			<header>{t("EVENTS.EVENTS.NEW.SOURCE.DATE_TIME.CAPTION")}</header>
@@ -854,6 +874,12 @@ const Schedule = <T extends {
 								{renderLayoutDeviceOptions()}
 							</td>
 						</tr>
+						<tr>
+							<td>{t("EVENTS.EVENTS.NEW.SOURCE.PLACEHOLDER.CAMERA_POSITION")}</td>
+							<td>
+								{renderCameraPositionDeviceOptions()}
+							</td>
+						</tr>
 					</tbody>
 				</table>
 			</div>

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

@@ -539,7 +539,8 @@
 						"END_DATE_FORMAT": "yyyy-mm-dd",
 						"STREAM": "Stream",
 						"RECORD": "Record",
-						"LAYOUT": "Layout"
+						"LAYOUT": "Layout",
+						"CAMERA_POSITION": "Camera position"
 					},
 					"UPLOAD": {
 						"CAPTION": "Upload",
@@ -773,7 +774,8 @@
 						"END_DATE": "yyyy-mm-dd",
 						"STREAM": "Stream",
 						"RECORD": "Record",
-						"LAYOUT": "Layout"
+						"LAYOUT": "Layout",
+						"CAMERA_POSITION": "Camera position"
 					},
 					"UPLOAD": {
 						"CAPTION": "Upload",

src/slices/eventDetailsSlice.ts

@@ -119,12 +119,14 @@ type Device = {
 		stream: { id: string, value: string }[],
 		record: { id: string, value: string }[],
 		layout: { id: string, value: string }[],
+		cameraPosition: { id: string, value: string }[],
 	},
 	capabilitiesMethods: {
 		inputs: string[],
 		stream: string[],
 		record: string[],
 		layout: string[],
+		cameraPosition: string[],
 	}
 	name: string,
 	// Fields we add to "device" from recordings but don't actually care about?
@@ -559,12 +561,14 @@ const initialState: EventDetailsState = {
 				stream: [],
 				record: [],
 				layout: [],
+				cameraPosition: [],
 			},
 			capabilitiesMethods: {
 				inputs: [],
 				stream: [],
 				record: [],
 				layout: [],
+				cameraPosition: [],
 			},
 		},
 		agentId: undefined,
@@ -1037,6 +1041,7 @@ export const fetchSchedulingInfo = createAppAsyncThunk("eventDetails/fetchSchedu
 				"capture.device.stream": string,
 				"capture.device.record": string,
 				"capture.device.layout": string,
+				"capture.device.cameraPosition": string,
 			},
 			presenters: string[],
 			start: string,
@@ -1069,12 +1074,14 @@ export const fetchSchedulingInfo = createAppAsyncThunk("eventDetails/fetchSchedu
 				stream: [],
 				record: [],
 				layout: [],
+				cameraPosition: [],
 			},
 			capabilitiesMethods: {
 				inputs: [],
 				stream: [],
 				record: [],
 				layout: [],
+				cameraPosition: [],
 			},
 		};
 
@@ -1118,13 +1125,23 @@ export const fetchSchedulingInfo = createAppAsyncThunk("eventDetails/fetchSchedu
 				}
 			}
 
+			const cameraPositionMethods = [];
+
+			if (schedulingResponse.agentConfiguration["capture.device.cameraPosition"] !== undefined) {
+				const cameraPosition = schedulingResponse.agentConfiguration["capture.device.cameraPosition"].split(",");
+				for (const s of cameraPosition) {
+					cameraPositionMethods.push(s);
+				}
+			}
+
 			device = {
 				...agent,
 				capabilitiesMethods: {
 					inputs: inputMethods,
 					stream: streamMethods,
 					record: recordMethods,
 					layout: layoutMethods,
+					cameraPosition: cameraPositionMethods,
 				},
 			};
 		}
@@ -1158,6 +1175,7 @@ export type SchedulingInfo = {
 	stream: string,
 	record: string,
 	layout: string,
+	cameraPosition: string,
 	scheduleDurationHours: string,
 	scheduleDurationMinutes: string,
 	scheduleEndDate: string,
@@ -1204,6 +1222,7 @@ export const saveSchedulingInfo = createAppAsyncThunk("eventDetails/saveScheduli
 			"capture.device.stream": values.stream,
 			"capture.device.record": values.record,
 			"capture.device.layout": values.layout,
+			"capture.device.cameraPosition": values.cameraPosition,
 			"event.location": agent ? agent.id : "",
 		},
 	};
@@ -2338,12 +2357,14 @@ const eventDetailsSlice = createSlice({
 							stream: [],
 							record: [],
 							layout: [],
+							cameraPosition: [],
 						},
 						capabilitiesMethods: {
 							inputs: [],
 							stream: [],
 							record: [],
 							layout: [],
+							cameraPosition: [],
 						},
 					},
 					agentId: undefined,

src/slices/eventSlice.ts

@@ -443,6 +443,7 @@ export const postNewEvent = (params: {
 		stream?: string,
 		record?: string,
 		layout?: string,
+		cameraPosition?: string,
 		processingWorkflow: string,
 		repeatOn: string[],
 		scheduleDurationHours: string,
@@ -477,6 +478,7 @@ export const postNewEvent = (params: {
 			stream: string,
 			record: string,
 			layout: string,
+			cameraPosition: string,
 			end: Date,
 			duration: string,
 			rrule?: string,
@@ -556,6 +558,7 @@ export const postNewEvent = (params: {
 				stream: values.stream ?? "",
 				record: values.record ?? "",
 				layout: values.layout ?? "",
+				cameraPosition: values.cameraPosition ?? "",
 				end: endDate,
 				duration: duration.toString(),
 			},

src/slices/recordingDetailsSlice.ts

@@ -27,6 +27,7 @@ export interface RecordingDetails {
 		stream: { id: string, value: string }[],
 		record: { id: string, value: string }[],
 		layout: { id: string, value: string }[],
+		cameraPosition: { id: string, value: string }[],
 	},
 }
 
@@ -50,6 +51,7 @@ const initialState: RecordingDetailsState = {
 		stream: [],
 		record: [],
 		layout: [],
+		cameraPosition: [],
 	},
 };
 

src/slices/recordingSlice.ts

@@ -17,6 +17,7 @@ export type Recording = {
 		stream: { id: string, value: string }[],
 		record: { id: string, value: string }[],
 		layout: { id: string, value: string }[],
+		cameraPosition: { id: string, value: string }[],
 	},
 	name: string,
 	removable: boolean,
@@ -97,11 +98,13 @@ export const fetchRecordings = createAppAsyncThunk("recordings/fetchRecordings",
 			stream: [],
 			record: [],
 			layout: [],
+			cameraPosition: [],
 		};
 		parsedCapabilities.inputs = parsedCapabilities.inputs ? [...parsedCapabilities.inputs] : [];
 		parsedCapabilities.stream = parsedCapabilities.stream ? [...parsedCapabilities.stream] : [];
 		parsedCapabilities.record = parsedCapabilities.record ? [...parsedCapabilities.record] : [];
 		parsedCapabilities.layout = parsedCapabilities.layout ? [...parsedCapabilities.layout] : [];
+		parsedCapabilities.cameraPosition = parsedCapabilities.cameraPosition ? [...parsedCapabilities.cameraPosition] : [];
 
 		const transformedAgent = {
 			id: agent.Name,