Merge branch 'remove-feeds' of Arnei/opencast-admin-interface into main

Pull request #1070

  Remove feeds

Author: gregorydlogan

src/components/events/partials/EventActionCell.tsx

@@ -8,7 +8,6 @@ import { EventDetailsPage } from "./modals/EventDetails";
 import { useAppDispatch, useAppSelector } from "../../../store";
 import {
 	fetchSeriesDetailsAcls,
-	fetchSeriesDetailsFeeds,
 	fetchSeriesDetailsMetadata,
 	fetchSeriesDetailsTheme,
 	fetchSeriesDetailsThemeNames,
@@ -56,7 +55,6 @@ const EventActionCell = ({
 		if (!!row.series) {
 			await dispatch(fetchSeriesDetailsMetadata(row.series.id));
 			await dispatch(fetchSeriesDetailsAcls(row.series.id));
-			await dispatch(fetchSeriesDetailsFeeds(row.series.id));
 			await dispatch(fetchSeriesDetailsTheme(row.series.id));
 			await dispatch(fetchSeriesDetailsThemeNames());
 

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

@@ -4,7 +4,6 @@ import SeriesDetailsModal from "./modals/SeriesDetailsModal";
 import {
 	fetchSeriesDetailsThemeNames,
 	fetchSeriesDetailsAcls,
-	fetchSeriesDetailsFeeds,
 	fetchSeriesDetailsMetadata,
 	fetchSeriesDetailsTheme,
 	fetchSeriesDetailsTobira,
@@ -56,7 +55,6 @@ const SeriesActionsCell = ({
 	const showSeriesDetailsModal = async () => {
 		await dispatch(fetchSeriesDetailsMetadata(row.id));
 		await dispatch(fetchSeriesDetailsAcls(row.id));
-		await dispatch(fetchSeriesDetailsFeeds(row.id));
 		await dispatch(fetchSeriesDetailsTheme(row.id));
 		await dispatch(fetchSeriesDetailsThemeNames());
 		await dispatch(fetchSeriesDetailsTobira(row.id));

src/components/events/partials/SeriesActionsCell.tsx

@@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next";
 import cn from "classnames";
 import {
 	getSeriesDetailsExtendedMetadata,
-	getSeriesDetailsFeeds,
 	getSeriesDetailsMetadata,
 	getSeriesDetailsTheme,
 	getSeriesDetailsThemeNames,
@@ -16,7 +15,6 @@ import { hasAccess } from "../../../../utils/utils";
 import SeriesDetailsAccessTab from "../ModalTabsAndPages/SeriesDetailsAccessTab";
 import SeriesDetailsThemeTab from "../ModalTabsAndPages/SeriesDetailsThemeTab";
 import SeriesDetailsStatisticTab from "../ModalTabsAndPages/SeriesDetailsStatisticTab";
-import SeriesDetailsFeedsTab from "../ModalTabsAndPages/SeriesDetailsFeedsTab";
 import DetailsExtendedMetadataTab from "../ModalTabsAndPages/DetailsMetadataTab";
 import { useAppDispatch, useAppSelector } from "../../../../store";
 import {
@@ -45,7 +43,6 @@ const SeriesDetails = ({
 	const dispatch = useAppDispatch();
 
 	const extendedMetadata = useAppSelector(state => getSeriesDetailsExtendedMetadata(state));
-	const feeds = useAppSelector(state => getSeriesDetailsFeeds(state));
 	const metadataFields = useAppSelector(state => getSeriesDetailsMetadata(state));
 	const theme = useAppSelector(state => getSeriesDetailsTheme(state));
 	const themeNames = useAppSelector(state => getSeriesDetailsThemeNames(state));
@@ -122,11 +119,6 @@ const SeriesDetails = ({
 						{t(tab.tabNameTranslation)}
 					</button>
 				))}
-				{feeds.length > 0 && (
-					<button className={"button-like-anchor " + cn({ active: page === 6 })} onClick={() => openTab(6)}>
-						{"Feeds"}
-					</button>
-				)}
 			</nav>
 
 			{/* render modal content depending on current page */}
@@ -175,7 +167,6 @@ const SeriesDetails = ({
 						header={tabs[page].tabNameTranslation}
 					/>
 				)}
-				{page === 6 && <SeriesDetailsFeedsTab feeds={feeds} />}
 			</div>
 		</>
 	);

src/components/events/partials/modals/SeriesDetails.tsx

@@ -6,7 +6,6 @@ import { RootState } from "../store";
 export const getSeriesDetailsMetadata = (state: RootState) => state.seriesDetails.metadata;
 export const getSeriesDetailsExtendedMetadata = (state: RootState) => state.seriesDetails.extendedMetadata;
 export const getSeriesDetailsAcl = (state: RootState) => state.seriesDetails.acl;
-export const getSeriesDetailsFeeds = (state: RootState) => state.seriesDetails.feeds;
 export const getSeriesDetailsTheme = (state: RootState) => state.seriesDetails.theme;
 export const getSeriesDetailsThemeNames = (state: RootState) =>
 	state.seriesDetails.themeNames;

src/selectors/seriesDetailsSelectors.ts

@@ -28,12 +28,6 @@ import { handleTobiraError } from './shared/tobiraErrors';
 /**
  * This file contains redux reducer for actions affecting the state of a series
  */
-export type Feed = {
-	link: string,
-	type: string,
-	version: string,
-}
-
 export type TobiraData = {
 	baseURL: string,
 	hostPages: TobiraPage[],
@@ -44,8 +38,6 @@ type SeriesDetailsState = {
 	errorMetadata: SerializedError | null,
 	statusAcl: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
 	errorAcl: SerializedError | null,
-	statusFeeds: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
-	errorFeeds: SerializedError | null,
 	statusTheme: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
 	errorTheme: SerializedError | null,
 	statusThemeNames: 'uninitialized' | 'loading' | 'succeeded' | 'failed',
@@ -58,7 +50,6 @@ type SeriesDetailsState = {
 	errorTobiraData: SerializedError | null,
   	metadata: MetadataCatalog,
 	extendedMetadata: MetadataCatalog[],
-	feeds: Feed[],
 	acl: TransformedAcl[],
 	theme: string,
 	themeNames: { id: string, value: string }[],
@@ -75,8 +66,6 @@ const initialState: SeriesDetailsState = {
 	errorMetadata: null,
 	statusAcl: 'uninitialized',
 	errorAcl: null,
-	statusFeeds: 'uninitialized',
-	errorFeeds: null,
 	statusTheme: 'uninitialized',
 	errorTheme: null,
 	statusThemeNames: 'uninitialized',
@@ -93,7 +82,6 @@ const initialState: SeriesDetailsState = {
 		fields: [],
 	},
 	extendedMetadata: [],
-	feeds: [],
 	acl: [],
 	theme: "",
 	themeNames: [],
@@ -172,45 +160,6 @@ export const fetchSeriesDetailsAcls = createAppAsyncThunk('seriesDetails/fetchSe
 	return seriesAcls;
 });
 
-// fetch feeds of certain series from server
-export const fetchSeriesDetailsFeeds = createAppAsyncThunk('seriesDetails/fetchSeriesDetailsFeeds', async (id: string) => {
-	const res = await axios.get("/admin-ng/feeds/feeds");
-	const feedsResponse = res.data;
-
-	let seriesFeeds: any[] = [];
-	for (let i = 0; i < feedsResponse.length; i++) {
-		if (feedsResponse[i].name === "Series") {
-			let pattern =
-				feedsResponse[i].identifier.split("/series")[0] +
-				feedsResponse[i].pattern;
-			let uidLink = pattern.split("<series_id>")[0] + id;
-			let typeLink = uidLink.split("<type>");
-			let versionLink = typeLink[1].split("<version>");
-			seriesFeeds = [
-				{
-					type: "atom",
-					version: "0.3",
-					link:
-						typeLink[0] + "atom" + versionLink[0] + "0.3" + versionLink[1],
-				},
-				{
-					type: "atom",
-					version: "1.0",
-					link:
-						typeLink[0] + "atom" + versionLink[0] + "1.0" + versionLink[1],
-				},
-				{
-					type: "rss",
-					version: "2.0",
-					link: typeLink[0] + "rss" + versionLink[0] + "2.0" + versionLink[1],
-				},
-			];
-		}
-	}
-
-	return seriesFeeds;
-});
-
 // fetch theme of certain series from server
 export const fetchSeriesDetailsTheme = createAppAsyncThunk('seriesDetails/fetchSeriesDetailsTheme', async (id: Series["id"]) => {
 	const res = await axios.get(`/admin-ng/series/${id}/theme.json`);
@@ -624,20 +573,6 @@ const seriesDetailsSlice = createSlice({
 				state.statusAcl = 'failed';
 				state.errorAcl = action.error;
 			})
-			.addCase(fetchSeriesDetailsFeeds.pending, (state) => {
-				state.statusFeeds = 'loading';
-			})
-			.addCase(fetchSeriesDetailsFeeds.fulfilled, (state, action: PayloadAction<
-				SeriesDetailsState["feeds"]
-			>) => {
-				state.statusFeeds = 'succeeded';
-				const seriesDetailsFeeds = action.payload;
-				state.feeds = seriesDetailsFeeds;
-			})
-			.addCase(fetchSeriesDetailsFeeds.rejected, (state, action) => {
-				state.statusFeeds = 'failed';
-				state.errorFeeds = action.error;
-			})
 			.addCase(fetchSeriesDetailsTheme.pending, (state) => {
 				state.statusTheme = 'loading';
 			})