From 9ef0b99963588b27eb2773a759f3b5623097915d Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Fri, 23 Aug 2024 09:24:02 +0200
Subject: [PATCH 1/9] feat: add additional filtering

---
 src/api/agileLive/ingest.ts                   | 39 +++++++++-
 .../manager/sources/resources/[id]/route.ts   | 21 +++++
 .../api/manager/sources/resources/route.ts    | 18 +++++
 src/components/filter/FilterDropdown.tsx      | 77 ++++++++++++++++++-
 src/components/filter/FilterOptions.tsx       | 61 +++++++++++++--
 src/hooks/sources/useResources.tsx            | 59 ++++++++++++++
 6 files changed, 264 insertions(+), 11 deletions(-)
 create mode 100644 src/app/api/manager/sources/resources/[id]/route.ts
 create mode 100644 src/app/api/manager/sources/resources/route.ts
 create mode 100644 src/hooks/sources/useResources.tsx

diff --git a/src/api/agileLive/ingest.ts b/src/api/agileLive/ingest.ts
index dc3b1012..baf28e66 100644
--- a/src/api/agileLive/ingest.ts
+++ b/src/api/agileLive/ingest.ts
@@ -5,6 +5,7 @@ import {
 } from '../../../types/agile-live';
 import { AGILE_BASE_API_PATH } from '../../constants';
 import { getAuthorizationHeader } from './utils/authheader';
+import { ResourcesSourceResponse } from '../../../types/agile-live';
 
 // TODO: create proper cache...
 const INGEST_UUID_CACHE: Map<string, string> = new Map();
@@ -77,6 +78,27 @@ export async function getIngests(): Promise<ResourcesCompactIngestResponse[]> {
   throw await response.json();
 }
 
+export async function getCompleteIngests(): Promise<ResourcesIngestResponse[]> {
+  const response = await fetch(
+    new URL(
+      AGILE_BASE_API_PATH + `/ingests?expand=true`,
+      process.env.AGILE_URL
+    ),
+    {
+      headers: {
+        authorization: getAuthorizationHeader()
+      },
+      next: {
+        revalidate: 0
+      }
+    }
+  );
+  if (response.ok) {
+    return response.json();
+  }
+  throw await response.json();
+}
+
 export async function getIngest(
   uuid: string
 ): Promise<ResourcesIngestResponse> {
@@ -123,7 +145,22 @@ export async function getSourceThumbnail(
   );
   if (response.ok) {
     const json = (await response.json()) as ResourcesThumbnailResponse;
-    return json?.data;
+    return json.data;
+  }
+  throw await response.json();
+}
+
+export async function getIngestSources(uuid: string) {
+  const response = await fetch(
+    new URL(AGILE_BASE_API_PATH + `/ingests/${uuid}/sources?expand=true`, process.env.AGILE_URL),
+    {
+      headers: {
+        authorization: getAuthorizationHeader()
+      }
+    }
+  );
+  if (response.ok) {
+    return response.json();
   }
   throw await response.json();
 }
diff --git a/src/app/api/manager/sources/resources/[id]/route.ts b/src/app/api/manager/sources/resources/[id]/route.ts
new file mode 100644
index 00000000..da6c2357
--- /dev/null
+++ b/src/app/api/manager/sources/resources/[id]/route.ts
@@ -0,0 +1,21 @@
+import { NextResponse, NextRequest } from "next/server";
+import { getIngestSources } from "../../../../../../api/agileLive/ingest";
+import { isAuthenticated } from "../../../../../../api/manager/auth";
+
+type Params = {
+  id: string;
+};
+
+export async function GET(request: NextRequest, { params }: { params: Params }): Promise<NextResponse> {
+  if (!(await isAuthenticated())) {
+      return new NextResponse(`Not Authorized!`, {
+          status: 403
+          });
+    }
+  
+  try {
+    return NextResponse.json(await getIngestSources(params.id));
+  } catch (e) {
+    return new NextResponse(e?.toString(), { status: 404 });
+  }
+}
diff --git a/src/app/api/manager/sources/resources/route.ts b/src/app/api/manager/sources/resources/route.ts
new file mode 100644
index 00000000..5a942676
--- /dev/null
+++ b/src/app/api/manager/sources/resources/route.ts
@@ -0,0 +1,18 @@
+import { NextResponse } from 'next/server';
+import { isAuthenticated } from '../../../../../api/manager/auth';
+import { getCompleteIngests } from '../../../../../api/agileLive/ingest';
+
+
+export async function GET(): Promise<NextResponse> {
+  if (!(await isAuthenticated())) {
+      return new NextResponse(`Not Authorized!`, {
+          status: 403
+        });
+    }
+  
+  try {
+      return NextResponse.json(await getCompleteIngests());
+    } catch (e) {
+        return new NextResponse(e?.toString(), { status: 404 })
+    }
+}
diff --git a/src/components/filter/FilterDropdown.tsx b/src/components/filter/FilterDropdown.tsx
index 6d874d0e..9bc2e617 100644
--- a/src/components/filter/FilterDropdown.tsx
+++ b/src/components/filter/FilterDropdown.tsx
@@ -10,10 +10,16 @@ function FilterDropdown({
   isLocationHidden,
   showConfigSources,
   selectedTags,
+  showConfigNdiType,
+  showConfigBmdType,
+  showConfigSrtType,
   setIsTypeHidden,
   setIsLocationHidden,
   setSelectedTags,
-  setOnlyShowActiveSources: setOnlyShowConfigSources
+  setOnlyShowActiveSources: setOnlyShowConfigSources,
+  setOnlyShowNdiSources: setOnlyShowNdiSources,
+  setOnlyShowBmdSources: setOnlyShowBmdSources,
+  setOnlyShowSrtSources: setOnlyShowSrtSources
 }: {
   close: () => void;
   types: string[];
@@ -23,10 +29,16 @@ function FilterDropdown({
   isLocationHidden: boolean;
   showConfigSources: boolean;
   selectedTags: Set<string>;
+  showConfigNdiType: boolean;
+  showConfigSrtType: boolean;
+  showConfigBmdType: boolean;
   setIsTypeHidden: React.Dispatch<React.SetStateAction<boolean>>;
   setIsLocationHidden: React.Dispatch<React.SetStateAction<boolean>>;
   setOnlyShowActiveSources: React.Dispatch<React.SetStateAction<boolean>>;
   setSelectedTags: React.Dispatch<React.SetStateAction<Set<string>>>;
+  setOnlyShowNdiSources: React.Dispatch<React.SetStateAction<boolean>>;
+  setOnlyShowBmdSources: React.Dispatch<React.SetStateAction<boolean>>;
+  setOnlyShowSrtSources: React.Dispatch<React.SetStateAction<boolean>>;
 }) {
   const [searchedTypes, setSearchedTypes] = useState<string[]>([]);
   const [searchedLocations, setSearchedLocations] = useState<string[]>([]);
@@ -48,6 +60,18 @@ function FilterDropdown({
     setOnlyShowConfigSources(!showConfigSources);
   };
 
+  const showSelectedConfigNdiType = () => {
+    setOnlyShowNdiSources(!showConfigNdiType);
+  };
+
+  const showSelectedConfigBmdType = () => {
+    setOnlyShowBmdSources(!showConfigBmdType);
+  };
+
+  const showSelectedConfigSrtType = () => {
+    setOnlyShowSrtSources(!showConfigSrtType);
+  };
+
   const deleteTag = (value: string) => {
     const temp = selectedTags;
     temp.delete(value);
@@ -222,17 +246,64 @@ function FilterDropdown({
               <input
                 id="showSelectedCheckbox"
                 type="checkbox"
-                className="flex ml-2 mb-2 w-4 justify-center rounded-lg text-zinc-300"
+                className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
                 checked={showConfigSources}
                 onChange={showSelectedConfigSources}
               />
               <label
-                className="ml-2 mt-2 text-left text-zinc-300"
+                className="ml-2 mt-1 text-left text-zinc-300"
                 htmlFor="showSelectedCheckbox"
               >
                 {t('inventory_list.active_sources')}
               </label>
             </div>
+            <div className="flex flex-row">
+              <input
+                id="showNdiCheckbox"
+                type="checkbox"
+                className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
+                checked={showConfigNdiType}
+                onChange={showSelectedConfigNdiType}
+              />
+              <label
+                className="ml-2 mt-1 text-left text-zinc-300"
+                htmlFor="showNdiCheckbox"
+              >
+                NDI
+              </label>
+            </div>
+            <div className="flex flex-row">
+              <input
+                id="showSelectedCheckbox"
+                type="checkbox"
+                className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
+                checked={showConfigSrtType}
+                onChange={showSelectedConfigSrtType}
+              />
+              <label
+                className="ml-2 mt-1 text-left text-zinc-300"
+                htmlFor="showSelectedCheckbox"
+              >
+                SRT
+              </label>
+            </div>
+            <div className="flex flex-row">
+              <input
+                id="showSelectedCheckbox"
+                type="checkbox"
+                className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
+                checked={showConfigBmdType}
+                onChange={showSelectedConfigBmdType}
+              />
+              <label
+                className="ml-2 mt-1 text-left text-zinc-300"
+                htmlFor="showSelectedCheckbox"
+              >
+                SDI/HTML
+              </label>
+            </div>
+          </div>
+          <div className="flex self-end justify-end mt-4">
             <button
               onClick={handleClear}
               id="dropdownCheckboxButton"
diff --git a/src/components/filter/FilterOptions.tsx b/src/components/filter/FilterOptions.tsx
index 48dbe9c0..285e5f02 100644
--- a/src/components/filter/FilterOptions.tsx
+++ b/src/components/filter/FilterOptions.tsx
@@ -5,14 +5,20 @@ import FilterDropdown from './FilterDropdown';
 import { ClickAwayListener } from '@mui/base';
 import { SourceWithId } from '../../interfaces/Source';
 import { FilterContext } from '../inventory/FilterContext';
+import { useResources } from '../../hooks/sources/useResources';
 
-function FilterOptions({
-  onFilteredSources
-}: {
+type FilterOptionsProps = {
   onFilteredSources: (sources: Map<string, SourceWithId>) => void;
-}) {
+};
+
+function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
   const { locations, types, sources } = useContext(FilterContext);
+  const [resources] = useResources();
+
   const [onlyShowActiveSources, setOnlyShowActiveSources] = useState(false);
+  const [onlyShowNdiSources, setOnlyShowNdiSources] = useState(false);
+  const [onlyShowBmdSources, setOnlyShowBmdSources] = useState(false);
+  const [onlyShowSrtSources, setOnlyShowSrtSources] = useState(false);
   const [isFilterHidden, setIsFilterHidden] = useState(true);
   const [isTypeHidden, setIsTypeHidden] = useState(true);
   const [isLocationHidden, setIsLocationHidden] = useState(true);
@@ -20,14 +26,16 @@ function FilterOptions({
   const [selectedTags, setSelectedTags] = useState<Set<string>>(
     new Set<string>()
   );
-
   let tempSet = new Map<string, SourceWithId>(sources);
 
   useEffect(() => {
     if (
       selectedTags.size === 0 &&
       searchString.length === 0 &&
-      !onlyShowActiveSources
+      !onlyShowActiveSources &&
+      !onlyShowNdiSources &&
+      !onlyShowBmdSources &&
+      !onlyShowSrtSources
     ) {
       resetFilter();
       return;
@@ -36,11 +44,19 @@ function FilterOptions({
     handleSearch();
     handleTags();
     handleShowActiveSources();
+    filterOnSourceType();
 
     onFilteredSources(tempSet);
     tempSet.clear();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [searchString, selectedTags, onlyShowActiveSources]);
+  }, [
+    searchString,
+    selectedTags,
+    onlyShowActiveSources,
+    onlyShowNdiSources,
+    onlyShowBmdSources,
+    onlyShowSrtSources
+  ]);
 
   const resetFilter = () => {
     tempSet = new Map<string, SourceWithId>(sources);
@@ -100,6 +116,31 @@ function FilterOptions({
     }
   };
 
+  const filterOnSourceType = async () => {
+    for (const source of tempSet.values()) {
+      const correspondingResource = resources.find(
+        (resource) => resource.name === source.ingest_source_name
+      );
+      if (correspondingResource) {
+        if (onlyShowNdiSources) {
+          if (correspondingResource.type.toUpperCase() !== 'NDI') {
+            tempSet.delete(source._id.toString());
+          }
+        }
+        if (onlyShowBmdSources) {
+          if (correspondingResource.type.toUpperCase() !== 'BMD') {
+            tempSet.delete(source._id.toString());
+          }
+        }
+        if (onlyShowSrtSources) {
+          if (correspondingResource.type.toUpperCase() !== 'SRT') {
+            tempSet.delete(source._id.toString());
+          }
+        }
+      }
+    }
+  };
+
   return (
     <ClickAwayListener
       onClickAway={() => {
@@ -127,6 +168,12 @@ function FilterOptions({
           setIsLocationHidden={setIsLocationHidden}
           setSelectedTags={setSelectedTags}
           setOnlyShowActiveSources={setOnlyShowActiveSources}
+          setOnlyShowNdiSources={setOnlyShowNdiSources}
+          setOnlyShowBmdSources={setOnlyShowBmdSources}
+          setOnlyShowSrtSources={setOnlyShowSrtSources}
+          showConfigBmdType={onlyShowBmdSources}
+          showConfigNdiType={onlyShowNdiSources}
+          showConfigSrtType={onlyShowSrtSources}
         />
       </div>
     </ClickAwayListener>
diff --git a/src/hooks/sources/useResources.tsx b/src/hooks/sources/useResources.tsx
new file mode 100644
index 00000000..d6b37b71
--- /dev/null
+++ b/src/hooks/sources/useResources.tsx
@@ -0,0 +1,59 @@
+import {
+  ResourcesIngestResponse,
+  ResourcesSourceResponse
+} from '../../../types/agile-live';
+import { useState, useEffect } from 'react';
+
+export function useResources() {
+  const [ingests, setIngests] = useState<ResourcesIngestResponse[]>([]);
+  const [resources, setResources] = useState<ResourcesSourceResponse[]>([]);
+
+  useEffect(() => {
+    let isMounted = true;
+
+    const fetchSources = async () => {
+      try {
+        const response = await fetch(`/api/manager/sources/resourceSource`, {
+          method: 'GET',
+          headers: [['x-api-key', `Bearer apisecretkey`]]
+        });
+
+        if (!response.ok) {
+          throw new Error('Error');
+        }
+
+        const ing = await response.json();
+        if (isMounted) {
+          setIngests(ing);
+        }
+      } catch (e) {
+        console.log('ERROR');
+      }
+    };
+    fetchSources();
+
+    return () => {
+      isMounted = false;
+    };
+  }, []);
+
+  useEffect(() => {
+    if (ingests) {
+      for (let i = 0; i < ingests.length; i++) {
+        const id = ingests[i].uuid;
+        if (id) {
+          fetch(`/api/manager/resources/${id}`, {
+            method: 'GET',
+            headers: [['x-api-key', `Bearer apisecretkey`]]
+          }).then(async (response) => {
+            console.log('RESPONSE: ', response);
+            const sources = await response.json();
+            setResources(sources);
+          });
+        }
+      }
+    }
+  }, [ingests]);
+
+  return [resources];
+}

From 4b6d3edb14c7f23d21563d9463965f57ee8cecbd Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Fri, 23 Aug 2024 11:00:58 +0200
Subject: [PATCH 2/9] fix: handle active + source filter, reduce code

---
 src/api/agileLive/ingest.ts                   | 21 -------
 .../api/manager/sources/resources/route.ts    |  4 +-
 src/components/filter/FilterDropdown.tsx      | 57 +++++++++++++------
 src/components/filter/FilterOptions.tsx       | 57 ++++++++++---------
 src/hooks/sources/useResources.tsx            | 33 ++++-------
 5 files changed, 81 insertions(+), 91 deletions(-)

diff --git a/src/api/agileLive/ingest.ts b/src/api/agileLive/ingest.ts
index baf28e66..733164ef 100644
--- a/src/api/agileLive/ingest.ts
+++ b/src/api/agileLive/ingest.ts
@@ -78,27 +78,6 @@ export async function getIngests(): Promise<ResourcesCompactIngestResponse[]> {
   throw await response.json();
 }
 
-export async function getCompleteIngests(): Promise<ResourcesIngestResponse[]> {
-  const response = await fetch(
-    new URL(
-      AGILE_BASE_API_PATH + `/ingests?expand=true`,
-      process.env.AGILE_URL
-    ),
-    {
-      headers: {
-        authorization: getAuthorizationHeader()
-      },
-      next: {
-        revalidate: 0
-      }
-    }
-  );
-  if (response.ok) {
-    return response.json();
-  }
-  throw await response.json();
-}
-
 export async function getIngest(
   uuid: string
 ): Promise<ResourcesIngestResponse> {
diff --git a/src/app/api/manager/sources/resources/route.ts b/src/app/api/manager/sources/resources/route.ts
index 5a942676..8932a0df 100644
--- a/src/app/api/manager/sources/resources/route.ts
+++ b/src/app/api/manager/sources/resources/route.ts
@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server';
 import { isAuthenticated } from '../../../../../api/manager/auth';
-import { getCompleteIngests } from '../../../../../api/agileLive/ingest';
+import { getIngests } from '../../../../../api/agileLive/ingest';
 
 
 export async function GET(): Promise<NextResponse> {
@@ -11,7 +11,7 @@ export async function GET(): Promise<NextResponse> {
     }
   
   try {
-      return NextResponse.json(await getCompleteIngests());
+      return NextResponse.json(await getIngests());
     } catch (e) {
         return new NextResponse(e?.toString(), { status: 404 })
     }
diff --git a/src/components/filter/FilterDropdown.tsx b/src/components/filter/FilterDropdown.tsx
index 9bc2e617..ac03f7c0 100644
--- a/src/components/filter/FilterDropdown.tsx
+++ b/src/components/filter/FilterDropdown.tsx
@@ -10,9 +10,9 @@ function FilterDropdown({
   isLocationHidden,
   showConfigSources,
   selectedTags,
-  showConfigNdiType,
-  showConfigBmdType,
-  showConfigSrtType,
+  showNdiType,
+  showBmdType,
+  showSrtType,
   setIsTypeHidden,
   setIsLocationHidden,
   setSelectedTags,
@@ -29,9 +29,9 @@ function FilterDropdown({
   isLocationHidden: boolean;
   showConfigSources: boolean;
   selectedTags: Set<string>;
-  showConfigNdiType: boolean;
-  showConfigSrtType: boolean;
-  showConfigBmdType: boolean;
+  showNdiType: boolean;
+  showSrtType: boolean;
+  showBmdType: boolean;
   setIsTypeHidden: React.Dispatch<React.SetStateAction<boolean>>;
   setIsLocationHidden: React.Dispatch<React.SetStateAction<boolean>>;
   setOnlyShowActiveSources: React.Dispatch<React.SetStateAction<boolean>>;
@@ -60,16 +60,34 @@ function FilterDropdown({
     setOnlyShowConfigSources(!showConfigSources);
   };
 
-  const showSelectedConfigNdiType = () => {
-    setOnlyShowNdiSources(!showConfigNdiType);
+  const showSelectedNdiType = () => {
+    if (!showNdiType) {
+      setOnlyShowNdiSources(true);
+      setOnlyShowBmdSources(false);
+      setOnlyShowSrtSources(false);
+    } else {
+      setOnlyShowNdiSources(false);
+    }
   };
 
-  const showSelectedConfigBmdType = () => {
-    setOnlyShowBmdSources(!showConfigBmdType);
+  const showSelectedSrtType = () => {
+    if (!showSrtType) {
+      setOnlyShowSrtSources(true);
+      setOnlyShowNdiSources(false);
+      setOnlyShowBmdSources(false);
+    } else {
+      setOnlyShowSrtSources(false);
+    }
   };
 
-  const showSelectedConfigSrtType = () => {
-    setOnlyShowSrtSources(!showConfigSrtType);
+  const showSelectedBmdType = () => {
+    if (!showBmdType) {
+      setOnlyShowBmdSources(true);
+      setOnlyShowNdiSources(false);
+      setOnlyShowSrtSources(false);
+    } else {
+      setOnlyShowBmdSources(false);
+    }
   };
 
   const deleteTag = (value: string) => {
@@ -122,6 +140,9 @@ function FilterDropdown({
   const handleClear = () => {
     setSelectedTags(new Set<string>());
     setOnlyShowConfigSources(false);
+    setOnlyShowBmdSources(false);
+    setOnlyShowNdiSources(false);
+    setOnlyShowSrtSources(false);
   };
 
   const typesSearch = (event: ChangeEvent<HTMLInputElement>) => {
@@ -262,8 +283,8 @@ function FilterDropdown({
                 id="showNdiCheckbox"
                 type="checkbox"
                 className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
-                checked={showConfigNdiType}
-                onChange={showSelectedConfigNdiType}
+                checked={showNdiType}
+                onChange={showSelectedNdiType}
               />
               <label
                 className="ml-2 mt-1 text-left text-zinc-300"
@@ -277,8 +298,8 @@ function FilterDropdown({
                 id="showSelectedCheckbox"
                 type="checkbox"
                 className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
-                checked={showConfigSrtType}
-                onChange={showSelectedConfigSrtType}
+                checked={showSrtType}
+                onChange={showSelectedSrtType}
               />
               <label
                 className="ml-2 mt-1 text-left text-zinc-300"
@@ -292,8 +313,8 @@ function FilterDropdown({
                 id="showSelectedCheckbox"
                 type="checkbox"
                 className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
-                checked={showConfigBmdType}
-                onChange={showSelectedConfigBmdType}
+                checked={showBmdType}
+                onChange={showSelectedBmdType}
               />
               <label
                 className="ml-2 mt-1 text-left text-zinc-300"
diff --git a/src/components/filter/FilterOptions.tsx b/src/components/filter/FilterOptions.tsx
index 285e5f02..2e0f3bb3 100644
--- a/src/components/filter/FilterOptions.tsx
+++ b/src/components/filter/FilterOptions.tsx
@@ -43,8 +43,7 @@ function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
 
     handleSearch();
     handleTags();
-    handleShowActiveSources();
-    filterOnSourceType();
+    filterSources();
 
     onFilteredSources(tempSet);
     tempSet.clear();
@@ -106,36 +105,38 @@ function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
     }
   };
 
-  const handleShowActiveSources = () => {
-    if (onlyShowActiveSources) {
-      for (const source of tempSet.values()) {
-        if (source.status === 'gone') {
-          tempSet.delete(source._id.toString());
-        }
-      }
-    }
-  };
-
-  const filterOnSourceType = async () => {
+  const filterSources = async () => {
     for (const source of tempSet.values()) {
       const correspondingResource = resources.find(
         (resource) => resource.name === source.ingest_source_name
       );
       if (correspondingResource) {
-        if (onlyShowNdiSources) {
-          if (correspondingResource.type.toUpperCase() !== 'NDI') {
-            tempSet.delete(source._id.toString());
-          }
+        let shouldDelete = false;
+        if (
+          onlyShowNdiSources &&
+          correspondingResource.type.toUpperCase() !== 'NDI'
+        ) {
+          shouldDelete = true;
         }
-        if (onlyShowBmdSources) {
-          if (correspondingResource.type.toUpperCase() !== 'BMD') {
-            tempSet.delete(source._id.toString());
-          }
+        if (
+          onlyShowBmdSources &&
+          correspondingResource.type.toUpperCase() !== 'BMD'
+        ) {
+          shouldDelete = true;
+        }
+        if (
+          onlyShowSrtSources &&
+          correspondingResource.type.toUpperCase() !== 'SRT'
+        ) {
+          shouldDelete = true;
         }
-        if (onlyShowSrtSources) {
-          if (correspondingResource.type.toUpperCase() !== 'SRT') {
-            tempSet.delete(source._id.toString());
-          }
+
+        if (onlyShowActiveSources && source.status === 'gone') {
+          shouldDelete = true;
+        }
+
+        if (shouldDelete) {
+          tempSet.delete(source._id.toString());
         }
       }
     }
@@ -171,9 +172,9 @@ function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
           setOnlyShowNdiSources={setOnlyShowNdiSources}
           setOnlyShowBmdSources={setOnlyShowBmdSources}
           setOnlyShowSrtSources={setOnlyShowSrtSources}
-          showConfigBmdType={onlyShowBmdSources}
-          showConfigNdiType={onlyShowNdiSources}
-          showConfigSrtType={onlyShowSrtSources}
+          showBmdType={onlyShowBmdSources}
+          showNdiType={onlyShowNdiSources}
+          showSrtType={onlyShowSrtSources}
         />
       </div>
     </ClickAwayListener>
diff --git a/src/hooks/sources/useResources.tsx b/src/hooks/sources/useResources.tsx
index d6b37b71..607c34a4 100644
--- a/src/hooks/sources/useResources.tsx
+++ b/src/hooks/sources/useResources.tsx
@@ -1,37 +1,27 @@
 import {
-  ResourcesIngestResponse,
-  ResourcesSourceResponse
+  ResourcesSourceResponse,
+  ResourcesCompactIngestResponse
 } from '../../../types/agile-live';
 import { useState, useEffect } from 'react';
 
 export function useResources() {
-  const [ingests, setIngests] = useState<ResourcesIngestResponse[]>([]);
+  const [ingests, setIngests] = useState<ResourcesCompactIngestResponse[]>([]);
   const [resources, setResources] = useState<ResourcesSourceResponse[]>([]);
 
   useEffect(() => {
     let isMounted = true;
 
-    const fetchSources = async () => {
-      try {
-        const response = await fetch(`/api/manager/sources/resourceSource`, {
-          method: 'GET',
-          headers: [['x-api-key', `Bearer apisecretkey`]]
-        });
-
-        if (!response.ok) {
-          throw new Error('Error');
-        }
-
+    const getIngests = async () =>
+      await fetch(`/api/manager/sources/resources`, {
+        method: 'GET',
+        headers: [['x-api-key', `Bearer apisecretkey`]]
+      }).then(async (response) => {
         const ing = await response.json();
         if (isMounted) {
           setIngests(ing);
         }
-      } catch (e) {
-        console.log('ERROR');
-      }
-    };
-    fetchSources();
-
+      });
+    getIngests();
     return () => {
       isMounted = false;
     };
@@ -42,11 +32,10 @@ export function useResources() {
       for (let i = 0; i < ingests.length; i++) {
         const id = ingests[i].uuid;
         if (id) {
-          fetch(`/api/manager/resources/${id}`, {
+          fetch(`/api/manager/sources/resources/${id}`, {
             method: 'GET',
             headers: [['x-api-key', `Bearer apisecretkey`]]
           }).then(async (response) => {
-            console.log('RESPONSE: ', response);
             const sources = await response.json();
             setResources(sources);
           });

From 9b40bab8d7de60c7a52b2f0868ea24ed268b08fb Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Fri, 23 Aug 2024 11:29:13 +0200
Subject: [PATCH 3/9] fix: allow multiple source type selection

---
 src/components/filter/FilterDropdown.tsx | 26 ++++--------------------
 src/components/filter/FilterOptions.tsx  | 25 ++++++++++++-----------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/components/filter/FilterDropdown.tsx b/src/components/filter/FilterDropdown.tsx
index ac03f7c0..ccfebb63 100644
--- a/src/components/filter/FilterDropdown.tsx
+++ b/src/components/filter/FilterDropdown.tsx
@@ -61,33 +61,15 @@ function FilterDropdown({
   };
 
   const showSelectedNdiType = () => {
-    if (!showNdiType) {
-      setOnlyShowNdiSources(true);
-      setOnlyShowBmdSources(false);
-      setOnlyShowSrtSources(false);
-    } else {
-      setOnlyShowNdiSources(false);
-    }
+    setOnlyShowNdiSources(!showNdiType);
   };
 
   const showSelectedSrtType = () => {
-    if (!showSrtType) {
-      setOnlyShowSrtSources(true);
-      setOnlyShowNdiSources(false);
-      setOnlyShowBmdSources(false);
-    } else {
-      setOnlyShowSrtSources(false);
-    }
+    setOnlyShowSrtSources(!showSrtType);
   };
 
   const showSelectedBmdType = () => {
-    if (!showBmdType) {
-      setOnlyShowBmdSources(true);
-      setOnlyShowNdiSources(false);
-      setOnlyShowSrtSources(false);
-    } else {
-      setOnlyShowBmdSources(false);
-    }
+    setOnlyShowBmdSources(!showBmdType);
   };
 
   const deleteTag = (value: string) => {
@@ -320,7 +302,7 @@ function FilterDropdown({
                 className="ml-2 mt-1 text-left text-zinc-300"
                 htmlFor="showSelectedCheckbox"
               >
-                SDI/HTML
+                SDI/HDMI
               </label>
             </div>
           </div>
diff --git a/src/components/filter/FilterOptions.tsx b/src/components/filter/FilterOptions.tsx
index 2e0f3bb3..5eaeb81c 100644
--- a/src/components/filter/FilterOptions.tsx
+++ b/src/components/filter/FilterOptions.tsx
@@ -110,23 +110,24 @@ function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
       const correspondingResource = resources.find(
         (resource) => resource.name === source.ingest_source_name
       );
+
       if (correspondingResource) {
         let shouldDelete = false;
-        if (
+        const isNdiSelected =
           onlyShowNdiSources &&
-          correspondingResource.type.toUpperCase() !== 'NDI'
-        ) {
-          shouldDelete = true;
-        }
-        if (
+          correspondingResource.type.toUpperCase() === 'NDI';
+        const isBmdSelected =
           onlyShowBmdSources &&
-          correspondingResource.type.toUpperCase() !== 'BMD'
-        ) {
-          shouldDelete = true;
-        }
-        if (
+          correspondingResource.type.toUpperCase() === 'BMD';
+        const isSrtSelected =
           onlyShowSrtSources &&
-          correspondingResource.type.toUpperCase() !== 'SRT'
+          correspondingResource.type.toUpperCase() === 'SRT';
+
+        if (
+          (onlyShowNdiSources || onlyShowBmdSources || onlyShowSrtSources) &&
+          !isNdiSelected &&
+          !isBmdSelected &&
+          !isSrtSelected
         ) {
           shouldDelete = true;
         }

From fd69578d83627d9aecbbc4e732178b502e0e7028 Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Fri, 23 Aug 2024 11:39:23 +0200
Subject: [PATCH 4/9] fix: linting

---
 src/api/agileLive/ingest.ts                   |  6 ++++--
 .../manager/sources/resources/[id]/route.ts   | 21 +++++++++++--------
 .../api/manager/sources/resources/route.ts    | 19 ++++++++---------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/api/agileLive/ingest.ts b/src/api/agileLive/ingest.ts
index 733164ef..4b8afadd 100644
--- a/src/api/agileLive/ingest.ts
+++ b/src/api/agileLive/ingest.ts
@@ -5,7 +5,6 @@ import {
 } from '../../../types/agile-live';
 import { AGILE_BASE_API_PATH } from '../../constants';
 import { getAuthorizationHeader } from './utils/authheader';
-import { ResourcesSourceResponse } from '../../../types/agile-live';
 
 // TODO: create proper cache...
 const INGEST_UUID_CACHE: Map<string, string> = new Map();
@@ -131,7 +130,10 @@ export async function getSourceThumbnail(
 
 export async function getIngestSources(uuid: string) {
   const response = await fetch(
-    new URL(AGILE_BASE_API_PATH + `/ingests/${uuid}/sources?expand=true`, process.env.AGILE_URL),
+    new URL(
+      AGILE_BASE_API_PATH + `/ingests/${uuid}/sources?expand=true`,
+      process.env.AGILE_URL
+    ),
     {
       headers: {
         authorization: getAuthorizationHeader()
diff --git a/src/app/api/manager/sources/resources/[id]/route.ts b/src/app/api/manager/sources/resources/[id]/route.ts
index da6c2357..e1b68b78 100644
--- a/src/app/api/manager/sources/resources/[id]/route.ts
+++ b/src/app/api/manager/sources/resources/[id]/route.ts
@@ -1,18 +1,21 @@
-import { NextResponse, NextRequest } from "next/server";
-import { getIngestSources } from "../../../../../../api/agileLive/ingest";
-import { isAuthenticated } from "../../../../../../api/manager/auth";
+import { NextResponse, NextRequest } from 'next/server';
+import { getIngestSources } from '../../../../../../api/agileLive/ingest';
+import { isAuthenticated } from '../../../../../../api/manager/auth';
 
 type Params = {
   id: string;
 };
 
-export async function GET(request: NextRequest, { params }: { params: Params }): Promise<NextResponse> {
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Params }
+): Promise<NextResponse> {
   if (!(await isAuthenticated())) {
-      return new NextResponse(`Not Authorized!`, {
-          status: 403
-          });
-    }
-  
+    return new NextResponse(`Not Authorized!`, {
+      status: 403
+    });
+  }
+
   try {
     return NextResponse.json(await getIngestSources(params.id));
   } catch (e) {
diff --git a/src/app/api/manager/sources/resources/route.ts b/src/app/api/manager/sources/resources/route.ts
index 8932a0df..64200693 100644
--- a/src/app/api/manager/sources/resources/route.ts
+++ b/src/app/api/manager/sources/resources/route.ts
@@ -2,17 +2,16 @@ import { NextResponse } from 'next/server';
 import { isAuthenticated } from '../../../../../api/manager/auth';
 import { getIngests } from '../../../../../api/agileLive/ingest';
 
-
 export async function GET(): Promise<NextResponse> {
   if (!(await isAuthenticated())) {
-      return new NextResponse(`Not Authorized!`, {
-          status: 403
-        });
-    }
-  
+    return new NextResponse(`Not Authorized!`, {
+      status: 403
+    });
+  }
+
   try {
-      return NextResponse.json(await getIngests());
-    } catch (e) {
-        return new NextResponse(e?.toString(), { status: 404 })
-    }
+    return NextResponse.json(await getIngests());
+  } catch (e) {
+    return new NextResponse(e?.toString(), { status: 404 });
+  }
 }

From f31a8a84d275fb58db50b558653147f4f7fd918f Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Fri, 23 Aug 2024 12:54:19 +0200
Subject: [PATCH 5/9] fixup!

---
 src/components/filter/FilterDropdown.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/filter/FilterDropdown.tsx b/src/components/filter/FilterDropdown.tsx
index ccfebb63..c8dd677b 100644
--- a/src/components/filter/FilterDropdown.tsx
+++ b/src/components/filter/FilterDropdown.tsx
@@ -277,7 +277,7 @@ function FilterDropdown({
             </div>
             <div className="flex flex-row">
               <input
-                id="showSelectedCheckbox"
+                id="showSrtCheckbox"
                 type="checkbox"
                 className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
                 checked={showSrtType}
@@ -285,14 +285,14 @@ function FilterDropdown({
               />
               <label
                 className="ml-2 mt-1 text-left text-zinc-300"
-                htmlFor="showSelectedCheckbox"
+                htmlFor="showSrtCheckbox"
               >
                 SRT
               </label>
             </div>
             <div className="flex flex-row">
               <input
-                id="showSelectedCheckbox"
+                id="showBmdCheckbox"
                 type="checkbox"
                 className="flex ml-2 w-4 justify-center rounded-lg text-zinc-300"
                 checked={showBmdType}
@@ -300,7 +300,7 @@ function FilterDropdown({
               />
               <label
                 className="ml-2 mt-1 text-left text-zinc-300"
-                htmlFor="showSelectedCheckbox"
+                htmlFor="showBmdCheckbox"
               >
                 SDI/HDMI
               </label>

From 6d3062539961c881858d10d29acaf16788c0c068 Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Mon, 26 Aug 2024 10:40:02 +0200
Subject: [PATCH 6/9] fix: add ingest type to database

---
 src/api/manager/job/syncInventory.ts          |  7 ++-
 .../manager/sources/resources/[id]/route.ts   | 24 ----------
 .../api/manager/sources/resources/route.ts    | 17 -------
 src/components/filter/FilterOptions.tsx       | 30 +++++-------
 src/hooks/sources/useResources.tsx            | 48 -------------------
 src/interfaces/Source.ts                      |  1 +
 6 files changed, 17 insertions(+), 110 deletions(-)
 delete mode 100644 src/app/api/manager/sources/resources/[id]/route.ts
 delete mode 100644 src/app/api/manager/sources/resources/route.ts
 delete mode 100644 src/hooks/sources/useResources.tsx

diff --git a/src/api/manager/job/syncInventory.ts b/src/api/manager/job/syncInventory.ts
index e5635670..1e225469 100644
--- a/src/api/manager/job/syncInventory.ts
+++ b/src/api/manager/job/syncInventory.ts
@@ -27,6 +27,7 @@ async function getSourcesFromAPI() {
           },
           ingest_name: ingest.name,
           ingest_source_name: source.name,
+          ingest_type: source.type,
           video_stream: {
             width: source?.video_stream?.width,
             height: source?.video_stream?.height,
@@ -60,7 +61,8 @@ export async function runSyncInventory() {
     const apiSource = apiSources.find((source) => {
       return (
         source.ingest_name === inventorySource.ingest_name &&
-        source.ingest_source_name === inventorySource.ingest_source_name
+        source.ingest_source_name === inventorySource.ingest_source_name &&
+        source.ingest_type === inventorySource.type
       );
     });
     if (!apiSource) {
@@ -81,7 +83,8 @@ export async function runSyncInventory() {
       (inventorySource) => {
         return (
           source.ingest_name === inventorySource.ingest_name &&
-          source.ingest_source_name === inventorySource.ingest_source_name
+          source.ingest_source_name === inventorySource.ingest_source_name &&
+          source.ingest_type === inventorySource.ingest_type
         );
       }
     );
diff --git a/src/app/api/manager/sources/resources/[id]/route.ts b/src/app/api/manager/sources/resources/[id]/route.ts
deleted file mode 100644
index e1b68b78..00000000
--- a/src/app/api/manager/sources/resources/[id]/route.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NextResponse, NextRequest } from 'next/server';
-import { getIngestSources } from '../../../../../../api/agileLive/ingest';
-import { isAuthenticated } from '../../../../../../api/manager/auth';
-
-type Params = {
-  id: string;
-};
-
-export async function GET(
-  request: NextRequest,
-  { params }: { params: Params }
-): Promise<NextResponse> {
-  if (!(await isAuthenticated())) {
-    return new NextResponse(`Not Authorized!`, {
-      status: 403
-    });
-  }
-
-  try {
-    return NextResponse.json(await getIngestSources(params.id));
-  } catch (e) {
-    return new NextResponse(e?.toString(), { status: 404 });
-  }
-}
diff --git a/src/app/api/manager/sources/resources/route.ts b/src/app/api/manager/sources/resources/route.ts
deleted file mode 100644
index 64200693..00000000
--- a/src/app/api/manager/sources/resources/route.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NextResponse } from 'next/server';
-import { isAuthenticated } from '../../../../../api/manager/auth';
-import { getIngests } from '../../../../../api/agileLive/ingest';
-
-export async function GET(): Promise<NextResponse> {
-  if (!(await isAuthenticated())) {
-    return new NextResponse(`Not Authorized!`, {
-      status: 403
-    });
-  }
-
-  try {
-    return NextResponse.json(await getIngests());
-  } catch (e) {
-    return new NextResponse(e?.toString(), { status: 404 });
-  }
-}
diff --git a/src/components/filter/FilterOptions.tsx b/src/components/filter/FilterOptions.tsx
index 5eaeb81c..af8aa674 100644
--- a/src/components/filter/FilterOptions.tsx
+++ b/src/components/filter/FilterOptions.tsx
@@ -5,7 +5,6 @@ import FilterDropdown from './FilterDropdown';
 import { ClickAwayListener } from '@mui/base';
 import { SourceWithId } from '../../interfaces/Source';
 import { FilterContext } from '../inventory/FilterContext';
-import { useResources } from '../../hooks/sources/useResources';
 
 type FilterOptionsProps = {
   onFilteredSources: (sources: Map<string, SourceWithId>) => void;
@@ -13,7 +12,6 @@ type FilterOptionsProps = {
 
 function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
   const { locations, types, sources } = useContext(FilterContext);
-  const [resources] = useResources();
 
   const [onlyShowActiveSources, setOnlyShowActiveSources] = useState(false);
   const [onlyShowNdiSources, setOnlyShowNdiSources] = useState(false);
@@ -107,21 +105,15 @@ function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
 
   const filterSources = async () => {
     for (const source of tempSet.values()) {
-      const correspondingResource = resources.find(
-        (resource) => resource.name === source.ingest_source_name
-      );
+      let shouldDelete = false;
 
-      if (correspondingResource) {
-        let shouldDelete = false;
+      if (source.ingest_type) {
         const isNdiSelected =
-          onlyShowNdiSources &&
-          correspondingResource.type.toUpperCase() === 'NDI';
+          onlyShowNdiSources && source.ingest_type.toUpperCase() === 'NDI';
         const isBmdSelected =
-          onlyShowBmdSources &&
-          correspondingResource.type.toUpperCase() === 'BMD';
+          onlyShowBmdSources && source.ingest_type.toUpperCase() === 'BMD';
         const isSrtSelected =
-          onlyShowSrtSources &&
-          correspondingResource.type.toUpperCase() === 'SRT';
+          onlyShowSrtSources && source.ingest_type.toUpperCase() === 'SRT';
 
         if (
           (onlyShowNdiSources || onlyShowBmdSources || onlyShowSrtSources) &&
@@ -131,14 +123,14 @@ function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
         ) {
           shouldDelete = true;
         }
+      }
 
-        if (onlyShowActiveSources && source.status === 'gone') {
-          shouldDelete = true;
-        }
+      if (onlyShowActiveSources && source.status === 'gone') {
+        shouldDelete = true;
+      }
 
-        if (shouldDelete) {
-          tempSet.delete(source._id.toString());
-        }
+      if (shouldDelete) {
+        tempSet.delete(source._id.toString());
       }
     }
   };
diff --git a/src/hooks/sources/useResources.tsx b/src/hooks/sources/useResources.tsx
deleted file mode 100644
index 607c34a4..00000000
--- a/src/hooks/sources/useResources.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import {
-  ResourcesSourceResponse,
-  ResourcesCompactIngestResponse
-} from '../../../types/agile-live';
-import { useState, useEffect } from 'react';
-
-export function useResources() {
-  const [ingests, setIngests] = useState<ResourcesCompactIngestResponse[]>([]);
-  const [resources, setResources] = useState<ResourcesSourceResponse[]>([]);
-
-  useEffect(() => {
-    let isMounted = true;
-
-    const getIngests = async () =>
-      await fetch(`/api/manager/sources/resources`, {
-        method: 'GET',
-        headers: [['x-api-key', `Bearer apisecretkey`]]
-      }).then(async (response) => {
-        const ing = await response.json();
-        if (isMounted) {
-          setIngests(ing);
-        }
-      });
-    getIngests();
-    return () => {
-      isMounted = false;
-    };
-  }, []);
-
-  useEffect(() => {
-    if (ingests) {
-      for (let i = 0; i < ingests.length; i++) {
-        const id = ingests[i].uuid;
-        if (id) {
-          fetch(`/api/manager/sources/resources/${id}`, {
-            method: 'GET',
-            headers: [['x-api-key', `Bearer apisecretkey`]]
-          }).then(async (response) => {
-            const sources = await response.json();
-            setResources(sources);
-          });
-        }
-      }
-    }
-  }, [ingests]);
-
-  return [resources];
-}
diff --git a/src/interfaces/Source.ts b/src/interfaces/Source.ts
index 99e57042..abf5c995 100644
--- a/src/interfaces/Source.ts
+++ b/src/interfaces/Source.ts
@@ -26,6 +26,7 @@ export interface Source {
   };
   ingest_name: string;
   ingest_source_name: string;
+  ingest_type: string;
   video_stream: VideoStream;
   audio_stream: AudioStream;
 }

From f7796aca28a2c0e1db6b9c7e318d71fa1a43c1d2 Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Fri, 30 Aug 2024 14:20:19 +0200
Subject: [PATCH 7/9] fix: remove unused function

---
 src/api/agileLive/ingest.ts | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/api/agileLive/ingest.ts b/src/api/agileLive/ingest.ts
index 4b8afadd..3ff9d207 100644
--- a/src/api/agileLive/ingest.ts
+++ b/src/api/agileLive/ingest.ts
@@ -127,21 +127,3 @@ export async function getSourceThumbnail(
   }
   throw await response.json();
 }
-
-export async function getIngestSources(uuid: string) {
-  const response = await fetch(
-    new URL(
-      AGILE_BASE_API_PATH + `/ingests/${uuid}/sources?expand=true`,
-      process.env.AGILE_URL
-    ),
-    {
-      headers: {
-        authorization: getAuthorizationHeader()
-      }
-    }
-  );
-  if (response.ok) {
-    return response.json();
-  }
-  throw await response.json();
-}

From 35c62072733baad1f5479b9f8f68ab7f5cb82efc Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Wed, 4 Sep 2024 09:33:38 +0200
Subject: [PATCH 8/9] fix: correct filtering

---
 src/api/manager/job/syncInventory.ts    |  2 +-
 src/components/filter/FilterOptions.tsx | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/api/manager/job/syncInventory.ts b/src/api/manager/job/syncInventory.ts
index 17a2381f..078760ef 100644
--- a/src/api/manager/job/syncInventory.ts
+++ b/src/api/manager/job/syncInventory.ts
@@ -94,7 +94,7 @@ export async function runSyncInventory() {
       }
     );
     return !existingSource;
-  });
+  }).map((source) => ({ ...source, lastConnected: new Date() }));
 
   const sourcesToUpsert = [
     ...newSourcesToUpsert,
diff --git a/src/components/filter/FilterOptions.tsx b/src/components/filter/FilterOptions.tsx
index 2426d067..67574c05 100644
--- a/src/components/filter/FilterOptions.tsx
+++ b/src/components/filter/FilterOptions.tsx
@@ -107,16 +107,20 @@ function FilterOptions({ onFilteredSources }: FilterOptionsProps) {
     for (const source of tempSet.values()) {
       let shouldDelete = false;
 
-      if (source.ingest_type) {
-        const isNdiSelected =
-          onlyShowNdiSources && source.ingest_type.toUpperCase() === 'NDI';
-        const isBmdSelected =
-          onlyShowBmdSources && source.ingest_type.toUpperCase() === 'BMD';
-        const isSrtSelected =
-          onlyShowSrtSources && source.ingest_type.toUpperCase() === 'SRT';
+      const isFilteringByType =
+        onlyShowNdiSources || onlyShowBmdSources || onlyShowSrtSources;
+
+      if (isFilteringByType && !source.ingest_type) {
+        shouldDelete = true;
+      } else if (source.ingest_type) {
+        const ingestType = source.ingest_type.toUpperCase();
+
+        const isNdiSelected = onlyShowNdiSources && ingestType === 'NDI';
+        const isBmdSelected = onlyShowBmdSources && ingestType === 'BMD';
+        const isSrtSelected = onlyShowSrtSources && ingestType === 'SRT';
 
         if (
-          (onlyShowNdiSources || onlyShowBmdSources || onlyShowSrtSources) &&
+          isFilteringByType &&
           !isNdiSelected &&
           !isBmdSelected &&
           !isSrtSelected

From 7d020e2fe2c30bc952f10a05db00d4ea2487e4bd Mon Sep 17 00:00:00 2001
From: Saelmala <sandra.larsson@eyevinn.se>
Date: Wed, 4 Sep 2024 09:44:52 +0200
Subject: [PATCH 9/9] fix: lint test fail

---
 src/api/manager/job/syncInventory.ts | 82 +++++++++++++++-------------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/src/api/manager/job/syncInventory.ts b/src/api/manager/job/syncInventory.ts
index 078760ef..4bba9b59 100644
--- a/src/api/manager/job/syncInventory.ts
+++ b/src/api/manager/job/syncInventory.ts
@@ -18,33 +18,35 @@ async function getSourcesFromAPI() {
         result.status === 'fulfilled'
     )
     .map((result) => result.value);
-  const sources: SourceWithoutLastConnected[] = resolvedIngests.flatMap((ingest) => {
-    return ingest.sources.map(
-      (source) =>
-        ({
-          status: source.active ? 'new' : 'gone',
-          name: source.name,
-          type: 'camera',
-          tags: {
-            location: 'Unknown'
-          },
-          ingest_name: ingest.name,
-          ingest_source_name: source.name,
-          ingest_type: source.type,
-          video_stream: {
-            width: source?.video_stream?.width,
-            height: source?.video_stream?.height,
-            frame_rate:
-              source?.video_stream?.frame_rate_n /
-              source?.video_stream?.frame_rate_d
-          },
-          audio_stream: {
-            number_of_channels: source?.audio_stream?.number_of_channels,
-            sample_rate: source?.audio_stream?.sample_rate
-          }
-        } satisfies SourceWithoutLastConnected)
-    );
-  });
+  const sources: SourceWithoutLastConnected[] = resolvedIngests.flatMap(
+    (ingest) => {
+      return ingest.sources.map(
+        (source) =>
+          ({
+            status: source.active ? 'new' : 'gone',
+            name: source.name,
+            type: 'camera',
+            tags: {
+              location: 'Unknown'
+            },
+            ingest_name: ingest.name,
+            ingest_source_name: source.name,
+            ingest_type: source.type,
+            video_stream: {
+              width: source?.video_stream?.width,
+              height: source?.video_stream?.height,
+              frame_rate:
+                source?.video_stream?.frame_rate_n /
+                source?.video_stream?.frame_rate_d
+            },
+            audio_stream: {
+              number_of_channels: source?.audio_stream?.number_of_channels,
+              sample_rate: source?.audio_stream?.sample_rate
+            }
+          } satisfies SourceWithoutLastConnected)
+      );
+    }
+  );
   return sources;
 }
 
@@ -83,18 +85,20 @@ export async function runSyncInventory() {
 
   // Look for new sources that doesn't already exist in the inventory,
   // these should all be added to the inventory, status of these are set in getSourcesFromAPI.
-  const newSourcesToUpsert = apiSources.filter((source) => {
-    const existingSource = dbInventoryWithCorrectStatus.find(
-      (inventorySource) => {
-        return (
-          source.ingest_name === inventorySource.ingest_name &&
-          source.ingest_source_name === inventorySource.ingest_source_name &&
-          source.ingest_type === inventorySource.ingest_type
-        );
-      }
-    );
-    return !existingSource;
-  }).map((source) => ({ ...source, lastConnected: new Date() }));
+  const newSourcesToUpsert = apiSources
+    .filter((source) => {
+      const existingSource = dbInventoryWithCorrectStatus.find(
+        (inventorySource) => {
+          return (
+            source.ingest_name === inventorySource.ingest_name &&
+            source.ingest_source_name === inventorySource.ingest_source_name &&
+            source.ingest_type === inventorySource.ingest_type
+          );
+        }
+      );
+      return !existingSource;
+    })
+    .map((source) => ({ ...source, lastConnected: new Date() }));
 
   const sourcesToUpsert = [
     ...newSourcesToUpsert,