Merge pull request #905 from Arnei/remove-dead-code-in-video-header

Remove dead code in video header
opencast · Mar 31, 2023 · bebe42b · bebe42b
2 parents ff05558 + c5579b3
commit bebe42b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 29 deletions.
diff --git a/src/cssStyles.tsx b/src/cssStyles.tsx
@@ -173,7 +173,7 @@ export const titleStyle = css(({
   overflow: 'hidden',
   whiteSpace: "nowrap",
   textOverflow: 'ellipsis',
-  maxWidth: '500px',
+  maxWidth: '100%',
 }))
 
 /**

diff --git a/src/main/SubtitleSelect.tsx b/src/main/SubtitleSelect.tsx
@@ -226,12 +226,12 @@ const SubtitleAddButton: React.FC<{languages: {subFlavor: string, title: string}
                   >
                   </Select>
                 </ThemeProvider>
-                
-                {/* "By default disabled elements like <button> do not trigger user interactions 
-                 * so a Tooltip will not activate on normal events like hover. To accommodate 
+
+                {/* "By default disabled elements like <button> do not trigger user interactions
+                 * so a Tooltip will not activate on normal events like hover. To accommodate
                  * disabled elements, add a simple wrapper element, such as a span."
                  * see: https://mui.com/material-ui/react-tooltip/#disabled-elements */}
-                <ThemedTooltip title={t("subtitles.createSubtitleButton-createButton-tooltip")}> 
+                <ThemedTooltip title={t("subtitles.createSubtitleButton-createButton-tooltip")}>
                   <span>
                     <button css={[basicButtonStyle(theme), createButtonStyle, { width:"100%" } ]}
                       type="submit"
@@ -241,7 +241,7 @@ const SubtitleAddButton: React.FC<{languages: {subFlavor: string, title: string}
                     </button>
                   </span>
                 </ThemedTooltip>
-                
+
             </form>
           )}
         />

diff --git a/src/main/SubtitleVideoArea.tsx b/src/main/SubtitleVideoArea.tsx
@@ -209,13 +209,13 @@ const VideoSelectDropdown : React.FC<{
         handleSubmit(event)
       }} css={subtitleAddFormStyle}>
 
-            <ThemeProvider theme={subtitleSelectStyle(theme)}>
-              <Select
-                label={t("subtitleVideoArea.selectVideoLabel") ?? undefined}
-                name={dropdownName}
-                data={selectData()}
-              />
-            </ThemeProvider>
+          <ThemeProvider theme={subtitleSelectStyle(theme)}>
+            <Select
+              label={t("subtitleVideoArea.selectVideoLabel") ?? undefined}
+              name={dropdownName}
+              data={selectData()}
+            />
+          </ThemeProvider>
 
           <OnChange name={dropdownName}>
             {(value, previous) => {

diff --git a/src/main/Video.tsx b/src/main/Video.tsx
@@ -10,7 +10,7 @@ import { faPlay, faPause, faToggleOn, faToggleOff, faGears} from "@fortawesome/f
 import { useSelector, useDispatch } from 'react-redux';
 import {
   selectIsPlaying, selectCurrentlyAt, selectCurrentlyAtInSeconds, setIsPlaying,
-  fetchVideoInformation, selectVideoURL, selectVideoCount, selectDurationInSeconds, selectTitle, selectPresenters,
+  fetchVideoInformation, selectVideoURL, selectVideoCount, selectDurationInSeconds, selectTitle,
   setPreviewTriggered, selectPreviewTriggered, selectIsPlayPreview, setIsPlayPreview, setAspectRatio, selectAspectRatio, selectDuration, setClickTriggered, selectClickTriggered, setCurrentlyAt
 } from '../redux/videoSlice'
 
@@ -673,22 +673,12 @@ const TimeDisplay: React.FC<{
  */
 const VideoHeader: React.FC<{}> = () => {
 
-  const { t } = useTranslation();
-
   const title = useSelector(selectTitle)
   const metadataTitle = useSelector(selectTitleFromEpisodeDc)
-  const presenters = useSelector(selectPresenters)
 
-  let presenter_header;
-  if (presenters && presenters.length) {
-      presenter_header = <div css={titleStyle} title={t("video.presenter-tooltip")}>by {presenters.join(", ")}</div>
-  }
   return (
-    <div css={{fontSize: '16px'}}>
-      <div css={[titleStyle, titleStyleBold]} title={t("video.title-tooltip")}>
+    <div css={[titleStyle, titleStyleBold]}>
         {metadataTitle ? metadataTitle : title}
-      </div>
-      {presenter_header}
     </div>
   );
 }

diff --git a/src/redux/__tests__/videoSlice.test.ts b/src/redux/__tests__/videoSlice.test.ts
@@ -1,7 +1,7 @@
 import reducer, { initialState, setIsPlaying, selectIsPlaying, setCurrentlyAt,
   selectCurrentlyAt, selectActiveSegmentIndex, selectPreviewTriggered,
   selectDuration, video, cut, selectSegments, markAsDeletedOrAlive, mergeRight,
-  fetchVideoInformation, selectVideoURL, selectTitle, selectPresenters,
+  fetchVideoInformation, selectVideoURL, selectTitle,
   selectTracks, selectWorkflows } from '../videoSlice'
 import cloneDeep from 'lodash/cloneDeep';
 import { httpRequestState } from '../../types';
@@ -334,7 +334,6 @@ describe('Video reducer', () => {
     expect(selectVideoURL(rootState)).toMatchObject(videoURLs);
     expect(selectDuration(rootState)).toEqual(dur);
     expect(selectTitle(rootState)).toEqual(title);
-    expect(selectPresenters(rootState)).toEqual([]);
     expect(selectTracks(rootState)).toMatchObject(tracks);
     expect(selectWorkflows(rootState)).toMatchObject(workflows);
   })

diff --git a/src/redux/videoSlice.ts b/src/redux/videoSlice.ts
@@ -203,7 +203,6 @@ const videoSlice = createSlice({
         state.captions = action.payload.subtitles ? state.captions = action.payload.subtitles : []
         state.duration = action.payload.duration
         state.title = action.payload.title
-        state.presenters = []
         state.segments = parseSegments(action.payload.segments, action.payload.duration)
         state.workflows = action.payload.workflows.sort((n1: { displayOrder: number; },n2: { displayOrder: number; }) => {
           return n1.displayOrder - n2.displayOrder;
@@ -371,7 +370,6 @@ export const selectVideoCount = (state: { videoState: { videoCount: video["video
 export const selectDuration = (state: { videoState: { duration: video["duration"] } }) => state.videoState.duration
 export const selectDurationInSeconds = (state: { videoState: { duration: video["duration"] } }) => state.videoState.duration / 1000
 export const selectTitle = (state: { videoState: { title: video["title"] } }) => state.videoState.title
-export const selectPresenters = (state: { videoState: { presenters: video["presenters"] } }) => state.videoState.presenters
 export const selectTracks = (state: { videoState: { tracks: video["tracks"] } }) => state.videoState.tracks
 export const selectWorkflows = (state: { videoState: { workflows: video["workflows"] } }) => state.videoState.workflows
 export const selectAspectRatio = (state: { videoState: { aspectRatios: video["aspectRatios"] } }) =>