Switches to correct ID on page load

Signed-off-by: James Cocker <james.s.earth@gmail.com>

Author: James-Cocker

galasa-ui/src/components/test-runs/test-run-details/3270Tab/TabFor3270.tsx

@@ -47,18 +47,6 @@ export default function TabFor3270({
     // eslint-disable-next-line
   }, [highlightedRowId, is3270CurrentlySelected]);
 
-  // Get the 'terminalScreen' parameter
-  useEffect(() => {
-    if (is3270CurrentlySelected && highlightedRowId === '') {
-      const url = new URL(window.location.href);
-      console.log('Hello Set to ' + url.searchParams.get('terminalScreen'));
-      setHighlightedRowId(url.searchParams.get('terminalScreen') || '');
-    }
-
-    // If you're adding extra state to this hook, make sure to review the dependency array due to the warning suppression:
-    // eslint-disable-next-line
-  }, [is3270CurrentlySelected, isLoading]);
-
   if (isError) {
     return <ErrorPage />;
   }

galasa-ui/src/components/test-runs/test-run-details/3270Tab/TableOfScreenshots.tsx

@@ -78,7 +78,6 @@ export default function TableOfScreenshots({
   const [searchTerm, setSearchTerm] = useState('');
   const [selectedTerminal, setSelectedTerminal] = useState<DropdownOption | null>(null);
   const [allImageData, setAllImageData] = useState<TerminalImage[]>([]);
-  const [initialHighlightedRowSet, setInitialHighlightedRowSet] = useState<boolean>(false);
 
   const screenshotsCollected = useRef<boolean | null>(false);
 
@@ -116,12 +115,14 @@ export default function TableOfScreenshots({
   useEffect(() => {
     // Highlight and display first element when the page loads, unless already set.
     const highlightFirstRowOnPageLoad = () => {
-      if (!initialHighlightedRowSet && filteredRows[0]) {
-        setInitialHighlightedRowSet(true);
-        if (
-          highlightedRowId === '' ||
-          !filteredRows.find((filteredRow) => filteredRow.id === highlightedRowId)
-        ) {
+      if (!highlightedRowId && filteredRows[0]) {
+
+        const url = new URL(window.location.href);
+        const terminalScreen = url.searchParams.get('terminalScreen');
+
+        if (terminalScreen && filteredRows.find((filteredRow) => filteredRow.id === terminalScreen)) {
+          setHighlightedRowId(terminalScreen);
+        } else {
           setHighlightedRowId(filteredRows[0].id);
         }
       }