From cdb3f7477bff92d5c0c0514a26b788e82de57175 Mon Sep 17 00:00:00 2001
From: Boris Kovar <boris.kovar@m2ms.sk>
Date: Thu, 19 Dec 2024 12:46:54 +0100
Subject: [PATCH] - fixes #1622 and changes defaults for search settings

---
 js/components/preview/Preview.js               |  2 +-
 .../target/withLoadingTargetIdList.js          | 18 ++++++++++++++++--
 js/reducers/selection/selectionReducers.js     |  4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/js/components/preview/Preview.js b/js/components/preview/Preview.js
index 15c05b3c2..0f05b77e9 100644
--- a/js/components/preview/Preview.js
+++ b/js/components/preview/Preview.js
@@ -354,5 +354,5 @@ const Preview = memo(({ isStateLoaded, hideProjects, isSnapshot = false }) => {
 });
 
 export default withLoadingJobSpecs(
-  withSnapshotManagement(withUpdatingTarget(withLoadingProtein(withLoadingProjects(Preview))))
+  withLoadingProjects(withSnapshotManagement(withUpdatingTarget(withLoadingProtein(Preview))))
 );
diff --git a/js/components/target/withLoadingTargetIdList.js b/js/components/target/withLoadingTargetIdList.js
index 86146bb3a..52d4bfa29 100644
--- a/js/components/target/withLoadingTargetIdList.js
+++ b/js/components/target/withLoadingTargetIdList.js
@@ -1,10 +1,13 @@
 import React, { memo, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-import { loadLegacyTargetList, loadTargetList } from './redux/dispatchActions';
+import { useDispatch, useSelector } from 'react-redux';
+import { getTargetProjectCombinations, loadLegacyTargetList, loadTargetList } from './redux/dispatchActions';
+import { setTargetIdList } from '../../reducers/api/actions';
 
 export const withLoadingTargetList = WrappedComponent => {
   return memo(() => {
     const dispatch = useDispatch();
+    const targetIdList = useSelector(state => state.apiReducers.target_id_list);
+    const projects = useSelector(state => state.targetReducers.projects);
 
     useEffect(() => {
       let onCancel = () => {};
@@ -17,6 +20,17 @@ export const withLoadingTargetList = WrappedComponent => {
       };
     }, [dispatch]);
 
+    useEffect(() => {
+      if (targetIdList && targetIdList.length > 0 && projects && projects.length > 0) {
+        const firstTarget = targetIdList[0];
+        if (typeof firstTarget.project !== 'object') {
+          const combinations = getTargetProjectCombinations(targetIdList, projects);
+          const updatedTargets = combinations.map(c => c.updatedTarget);
+          dispatch(setTargetIdList(updatedTargets));
+        }
+      }
+    }, [dispatch, targetIdList, projects]);
+
     return <WrappedComponent />;
   });
 };
diff --git a/js/reducers/selection/selectionReducers.js b/js/reducers/selection/selectionReducers.js
index 5af8eaaab..2e2a903a8 100644
--- a/js/reducers/selection/selectionReducers.js
+++ b/js/reducers/selection/selectionReducers.js
@@ -73,8 +73,8 @@ export const INITIAL_STATE = {
   searchSettings: {
     searchBy: {
       shortcode: true,
-      aliases: false,
-      compoundId: false
+      aliases: true,
+      compoundId: true
     }
   }
 };