Activate eslint no-unsafe-return

Enable eslint rule no-unsafe-return

Author: Arnei

eslint.config.js

@@ -13,7 +13,6 @@ export default [
       // // TODO: We want to turn these on eventually
       "@typescript-eslint/no-base-to-string": "off",
       "@typescript-eslint/no-floating-promises": "off",
-      "@typescript-eslint/no-unsafe-return": "off",
       "@typescript-eslint/restrict-template-expressions": "off",
     },
   },

src/config.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */

src/main/Metadata.tsx

@@ -403,7 +403,7 @@ const Metadata: React.FC = () => {
    * @param value
    */
   // eslint-disable-next-line max-len
-  /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+  /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
   const parseValue = (field: MetadataField | null, value: any) => {
     let returnValue = value;
 
@@ -448,7 +448,7 @@ const Metadata: React.FC = () => {
     return returnValue;
   };
   // eslint-disable-next-line max-len
-  /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+  /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
 
   /**
    * Callback for when the form is submitted

src/redux/metadataSlice.ts

@@ -43,7 +43,7 @@ export const fetchMetadata = createAppAsyncThunk("metadata/fetchMetadata", async
   }
 
   const response = await client.get(`${settings.opencast.url}/editor/${settings.id}/metadata.json`);
-  return JSON.parse(response);
+  return JSON.parse(response) as metadata["catalogs"];
 });
 
 /**

src/redux/videoSlice.ts

@@ -84,14 +84,32 @@ export const initialState: video & httpRequestState = {
   errorReason: "unknown",
 };
 
+type FetchVideoInformation = {
+  segments: Omit<Segment, "id">[],
+  workflows: video["workflows"],
+  tracks: video["tracks"],
+  title: video["title"],
+  date: string, // Date string
+  duration: video["duration"],
+  workflow_active: boolean,
+  locking_active: video["lockingActive"],
+  lock_refresh: video["lockRefresh"],
+  lock_uuid: video["lock"]["uuid"],
+  lock_user: video["lock"]["user"], // username
+  waveformURIs: string[],
+  subtitles: video["subtitlesFromOpencast"],
+  local: boolean,
+  customizedTrackSelection: boolean, // TODO: Figure out if this still exists
+}
+
 export const fetchVideoInformation = createAppAsyncThunk("video/fetchVideoInformation", async () => {
   if (!settings.id) {
     throw new Error("Missing media package identifier");
   }
 
   // const response = await client.get("https://legacy.opencast.org/admin-ng/tools/ID-dual-stream-demo/editor.json")
   const response = await client.get(`${settings.opencast.url}/editor/${settings.id}/edit.json`);
-  return JSON.parse(response);
+  return JSON.parse(response) as FetchVideoInformation;
 });
 
 const updateCurrentlyAt = (state: video, milliseconds: number) => {
@@ -318,23 +336,7 @@ const videoSlice = createSlice({
         state.status = "loading";
       });
     builder.addCase(
-      fetchVideoInformation.fulfilled, (state, action: PayloadAction<{
-        segments: Omit<Segment, "id">[],
-        workflows: video["workflows"],
-        tracks: video["tracks"],
-        title: video["title"],
-        date: string, // Date string
-        duration: video["duration"],
-        workflow_active: boolean,
-        locking_active: video["lockingActive"],
-        lock_refresh: video["lockRefresh"],
-        lock_uuid: video["lock"]["uuid"],
-        lock_user: video["lock"]["user"], // username
-        waveformURIs: string[],
-        subtitles: video["subtitlesFromOpencast"],
-        local: boolean,
-        customizedTrackSelection: boolean, // TODO: Figure out if this still exists
-      }>) => {
+      fetchVideoInformation.fulfilled, (state, action: PayloadAction<FetchVideoInformation>) => {
         state.status = "success";
         const payload = action.payload;
 

src/util/utilityFunctions.ts

@@ -27,20 +27,8 @@ export const convertMsToReadableString = (ms: number): string => {
   return result.join("");
 };
 
-/**
- * Parses JSON. Returns [err, result]
- * @param str string that should be parsed
- */
-export function safeJsonParse(str: string) {
-  try {
-    return [null, JSON.parse(str)];
-  } catch (err) {
-    return [err];
-  }
-}
-
 // eslint-disable-next-line max-len
-/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
 /**
  * Converts a working subtitle representation into a string
  */
@@ -131,7 +119,7 @@ export function parseSubtitle(subtitle: string): SubtitleCue[] {
   return tree.cues;
 }
 // eslint-disable-next-line max-len
-/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
+/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
 
 /**
  * Parse language code to language name