Skip to content

Commit

Permalink
#1552 (#476)
Browse files Browse the repository at this point in the history
* 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 c5bba58
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 10 08:13:00 2024 +0100

    #1603 - fixes

* Squashed commit of the following:

commit 9d9bf8c
Author: Boris Kovar <boris.kovar@m2ms.sk>
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 2fd529e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Dec 16 10:44:15 2024 +0100

    - changes labels in searchSettingsDialog

commit 12499a9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Dec 16 09:47:05 2024 +0100

    -small fix

commit cbf95f1
Merge: 5bd7756 900d851
Author: Boris Kovar <boris.kovar@m2ms.sk>
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 5bd7756
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 12 13:30:00 2024 +0100

    - search aliases

commit 3e7540f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 10 12:12:03 2024 +0100

    - checkpoint

commit 6631373
Author: Boris Kovar <boris.kovar@m2ms.sk>
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 900d851
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 12 13:30:00 2024 +0100

    - search aliases

commit a72f427
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 10 12:12:03 2024 +0100

    - checkpoint

commit 4b7d699
Merge: 4579a9d 32c837d
Author: Boris Kovar <boris.kovar@m2ms.sk>
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 4579a9d
Author: Boris Kovar <boris.kovar@m2ms.sk>
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 32c837d
Author: Boris Kovar <boris.kovar@m2ms.sk>
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 021d6f2
Merge: a5fb901 182a10a
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
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 a5fb901
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 17 16:56:49 2024 +0100

    - implements #1533

commit 182a10a
Author: Boris Kovar <boris.kovar@m2ms.sk>
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 <boris.kovar@m2ms.sk>
  • Loading branch information
matej-vavrek and boriskovar-m2ms authored Feb 4, 2025
1 parent 347ad82 commit 96baab2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ const DatasetMoleculeView = memo(
{/* Title label */}
<Grid
item
xs={!showCrossReferenceModal && hideFButton ? 8 : 7}
xs={!showCrossReferenceModal && hideFButton ? 7 : 6}
container
direction="column"
className={!showCrossReferenceModal && hideFButton ? classes.widthOverflow : ''}
Expand Down Expand Up @@ -1397,10 +1397,10 @@ const DatasetMoleculeView = memo(
null}
</Grid>
)) || (
<Grid item className={classes.rightBorder}>
-
</Grid>
)}
<Grid item className={classes.rightBorder}>
-
</Grid>
)}
</Tooltip>
);
})}
Expand Down
10 changes: 5 additions & 5 deletions js/components/datasets/redux/dispatchActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit 96baab2

Please sign in to comment.