From 96baab2f50c9372ebf8a300077873599f6918d33 Mon Sep 17 00:00:00 2001 From: matej <60509086+matej-vavrek@users.noreply.github.com> Date: Tue, 4 Feb 2025 09:41:25 +0100 Subject: [PATCH] #1552 (#476) * removed SGC column from target list * #1540 added preferred alias functionality * #1540 added edit column to target list and use target settings modal * #1540 updated "Open" label and read only version of display name * Squashed commit of the following: commit c5bba583d5cea4c6a24e40511ee7828e20256a17 Author: Boris Kovar Date: Tue Dec 10 08:13:00 2024 +0100 #1603 - fixes * Squashed commit of the following: commit 9d9bf8c7b810540f71e9ca8c9fae5de146fd1a5f Author: Boris Kovar Date: Wed Dec 11 15:20:54 2024 +0100 fixed frontend part of the ticket. Now properly resolves target based on the target name and target access string * - fixed issue when the template protein is missing * Squashed commit of the following: commit 2fd529e84c3969768ff7a595046a4a4fc134a4ad Author: Boris Kovar Date: Mon Dec 16 10:44:15 2024 +0100 - changes labels in searchSettingsDialog commit 12499a9630db29a29e26235c8dc9f75dce559d54 Author: Boris Kovar Date: Mon Dec 16 09:47:05 2024 +0100 -small fix commit cbf95f1ee181dbfe3a6675fb684705e3e84840f8 Merge: 5bd77562 900d8518 Author: Boris Kovar Date: Thu Dec 12 13:34:14 2024 +0100 Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis-frontend into #1563-LHS-search commit 5bd7756253160fe06b61cc6c2062cf982a5397ce Author: Boris Kovar Date: Thu Dec 12 13:30:00 2024 +0100 - search aliases commit 3e7540f0e6c7478e14e83fb3da4c4b9e41bb35bb Author: Boris Kovar Date: Tue Dec 10 12:12:03 2024 +0100 - checkpoint commit 6631373d07e2efc2ba48e5f237fc3a92c708b68d Author: Boris Kovar Date: Fri Dec 6 10:05:51 2024 +0100 - #1563 - all the UI and infrastructure and search by shortcode and compound id is done commit 900d851868384a6efe36a7e48d2877bf3bcacdbd Author: Boris Kovar Date: Thu Dec 12 13:30:00 2024 +0100 - search aliases commit a72f427e90e3ef3c88f9b1d3e32828bfe3c11ca5 Author: Boris Kovar Date: Tue Dec 10 12:12:03 2024 +0100 - checkpoint commit 4b7d69940fbb19214b7c258c7be59552e580e14e Merge: 4579a9de 32c837dc Author: Boris Kovar Date: Tue Dec 10 10:26:34 2024 +0100 Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis-frontend into #1563-LHS-search commit 4579a9de85c4491442e38933b57822510ae5ab1c Author: Boris Kovar Date: Fri Dec 6 10:05:51 2024 +0100 - #1563 - all the UI and infrastructure and search by shortcode and compound id is done commit 32c837dcf295b71836e028ea7750fa9bc8ead28c Author: Boris Kovar Date: Fri Dec 6 10:05:51 2024 +0100 - #1563 - all the UI and infrastructure and search by shortcode and compound id is done * - fixes #1622 and changes defaults for search settings * Squashed commit of the following: commit 021d6f2ab4f46346918cb51de66a63e766ad67f4 Merge: a5fb9016 182a10a7 Author: boriskovar-m2ms Date: Thu Dec 19 13:49:43 2024 +0100 Merge branch '#1533-direct-links' of https://github.com/m2ms/fragalysis-frontend into #1533-direct-links commit a5fb90161a01db52d1e439c41c212812f1952d72 Author: Boris Kovar Date: Tue Dec 17 16:56:49 2024 +0100 - implements #1533 commit 182a10a7a930d0d83a3a6d75e2cf5b85d03c1475 Author: Boris Kovar Date: Tue Dec 17 16:56:49 2024 +0100 - implements #1533 * #1606 pose properties table from tooltip to separate icon * added button to menu for getting session token * #1552 use id for filtering datasets --------- Co-authored-by: boriskovar-m2ms --- .../datasetMoleculeView/datasetMoleculeView.js | 10 +++++----- js/components/datasets/redux/dispatchActions.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/js/components/datasets/datasetMoleculeView/datasetMoleculeView.js b/js/components/datasets/datasetMoleculeView/datasetMoleculeView.js index f6bd1c1e0..debb859f0 100644 --- a/js/components/datasets/datasetMoleculeView/datasetMoleculeView.js +++ b/js/components/datasets/datasetMoleculeView/datasetMoleculeView.js @@ -1077,7 +1077,7 @@ const DatasetMoleculeView = memo( {/* Title label */} )) || ( - - - - - )} + + - + + )} ); })} diff --git a/js/components/datasets/redux/dispatchActions.js b/js/components/datasets/redux/dispatchActions.js index 0f3a0dcc5..2262df2bc 100644 --- a/js/components/datasets/redux/dispatchActions.js +++ b/js/components/datasets/redux/dispatchActions.js @@ -225,7 +225,7 @@ export const loadDataSets = targetId => async dispatch => { dispatch( setDataset( response.data.results.map(ds => ({ - id: ds.name, + id: ds.id, title: ds.name, // previously unique_name ($submitter-$method format) url: ds.method_url, version: ds.spec_version, @@ -272,10 +272,10 @@ export const loadDatasetCompoundsWithScores = (datasetsToLoad = null) => (dispat const compondMoleculesMap = {}; compondMolecules.data.results.forEach( molecule => - (compondMoleculesMap[molecule.name] = { - site_observation_code: molecule.site_observation_code, - pdb_info: molecule.pdb_info - }) + (compondMoleculesMap[molecule.name] = { + site_observation_code: molecule.site_observation_code, + pdb_info: molecule.pdb_info + }) ); response.data.results.forEach(molecule => { if (compondMoleculesMap.hasOwnProperty(molecule.name)) {