Merge branch 'tobira-urls-improvement' of wsmirnow/opencast-admin-interface into r/17.x

Pull request #1322

  Direct link to the Tobira video/series

Author: gregorydlogan

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

@@ -58,7 +58,7 @@ const DetailsTobiraTab = ({ kind, id }: DetailsTobiraTabProps) => {
 
 	const i18nKey = kind === "series" ? "SERIES" : "EVENTS";
 	const prefix = kind === "series" ? "s" : "v";
-	const directTobiraLink = tobiraData.baseURL + `/!${prefix}/:` + id;
+	const directTobiraLink = tobiraData.baseURL + `/!${prefix}/` + (tobiraData.id.length > 2 ? tobiraData.id.substring(2) : `:${id}`);
 
 	const getBreadcrumbs = (currentPage: TobiraPage) => {
 		const homepage = {
@@ -204,6 +204,7 @@ type TobiraTableProps = {
 const TobiraTable = ({ tobiraData, i18nKey, openSubTab, handleDelete }: TobiraTableProps) => {
 	const { t } = useTranslation();
 	const deleteConfirmationModalRef = useRef<ModalHandle>(null);
+	const prefix = i18nKey === "SERIES" ? 's' : 'v';
 
 	return <div className="obj">
 		<header>{t(`EVENTS.${i18nKey}.DETAILS.TOBIRA.PAGES`)}</header>
@@ -222,7 +223,8 @@ const TobiraTable = ({ tobiraData, i18nKey, openSubTab, handleDelete }: TobiraTa
 				</tr>}
 				{tobiraData.hostPages.map(hostPage => <tr key={hostPage.path}>
 					<td>
-						<a href={tobiraData.baseURL + hostPage.path}>
+						<a href={tobiraData.baseURL + hostPage.path +
+							(tobiraData.id.length > 2 ? `/${prefix}/${tobiraData.id.substring(2)}` : '')}>
 							{hostPage.path !== '/' && <>
 								<span className="tobira-page-separator">/</span>
 								{hostPage.ancestors.map((ancestor, key) => (

src/slices/eventDetailsSlice.ts

@@ -597,6 +597,7 @@ const initialState: EventDetailsState = {
 	hasStatisticsError: false,
 	tobiraData: {
 		baseURL: "",
+		id: "",
 		hostPages: [],
 	},
 };

src/slices/seriesDetailsSlice.ts

@@ -30,6 +30,7 @@ import { handleTobiraError } from './shared/tobiraErrors';
  */
 export type TobiraData = {
 	baseURL: string,
+	id: string,
 	hostPages: TobiraPage[],
 };
 
@@ -91,6 +92,7 @@ const initialState: SeriesDetailsState = {
 	tobiraTab: "main",
 	tobiraData: {
 		baseURL: "",
+		id: "",
 		hostPages: [],
 	},
 };