Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CentroidRes missing from extended table (b/e?) #1505

Open
phraenquex opened this issue Sep 5, 2024 · 8 comments
Open

CentroidRes missing from extended table (b/e?) #1505

phraenquex opened this issue Sep 5, 2024 · 8 comments
Assignees
Labels
2024-03-13 green Data dissemination backend

Comments

@phraenquex
Copy link
Collaborator

phraenquex commented Sep 5, 2024

In this snapshot, the CentroidRes is not showing up in the extended table.

https://fragalysis.xchem.diamond.ac.uk/viewer/react/projects/47/19

Sounds like an API or F/E parsing issue?

Green for now.

@phraenquex phraenquex converted this from a draft issue Sep 5, 2024
@phraenquex phraenquex added 2024-03-13 green Data dissemination backend labels Sep 5, 2024
@matej-vavrek
Copy link
Collaborator

matej-vavrek commented Sep 5, 2024

"CentroidRes" column on F/E part is populated by centroid_res property of matched canon site to canon_site_conf property of an observation and if there is not a match then it is blank.

In this situation, for example an observation with 597 id and "Ax0486a" code has 72 canon_site_conf but there is not any canon site with 72 id

@kaliif
Copy link
Collaborator

kaliif commented Sep 5, 2024

@matej-vavrek canon_site and canon_site_conf are different objects, canon_site_conf has a foreign key to canon_site, in the API it's the canon_site attribute.

@matej-vavrek
Copy link
Collaborator

@kaliif, I am not sure if I am following this right, so observation's canon_site_conf points to api/canon_site_conf and that's canon_site points to api/canon_site?

i.e. first call to api/canon_site_conf to match $observation.canon_site_conf with $canon_site_conf.id and then second call to api/canon_site to match $canon_site_conf.canon_site with $canon_site.id and $canon_site.centroid_res is what we are looking for?

@kaliif
Copy link
Collaborator

kaliif commented Sep 5, 2024

@kaliif, I am not sure if I am following this right, so observation's canon_site_conf points to api/canon_site_conf and that's canon_site points to api/canon_site?

i.e. first call to api/canon_site_conf to match $observation.canon_site_conf with $canon_site_conf.id and then second call to api/canon_site to match $canon_site_conf.canon_site with $canon_site.id and $canon_site.centroid_res is what we are looking for?

@matej-vavrek correct, yes

@matej-vavrek matej-vavrek moved this from FragTech to Dev Done - Do review (DEV) in Fragalysis Sep 6, 2024
@matej-vavrek
Copy link
Collaborator

@phraenquex, it should be on staging now. Could you verify it, please?

@phraenquex
Copy link
Collaborator Author

@matej-vavrek it looks right now - but we'll need an upload that uses @kaliif's loader fixes - so waiting for @mwinokan to confirm that such an upload has happened.

@mwinokan
Copy link
Collaborator

mwinokan commented Sep 9, 2024

@phraenquex I have re-uploaded Flavi_Ns5_RdRp and the CentroidRes is populated in the table. I do now have some questions about the spec. Currently:

Screenshot 2024-09-09 at 09 14 16

Category Box Tooltip Table
CanonicalSite Upload name Alias + Upload name
ConformerSite Upload name Upload name
CrystalformSite Upload name Upload name
Crystalform Upload name Upload name
Quatassembly Upload name Upload name
CentroidRes N/A LongCode
LongCode N/A LongCode
  1. Hovering over the colourful site boxes shows the original upload name of the generated tags. E.g. Zika_NS5A-x0411+A+1104+1, shouldn't we show the alias assigned by the curator instead?
  2. The table only shows the original upload name and alias pair for the CanonicalSites tags, the other categories either show the only show the upload name. Should we have a toggle to decide between showing the alias or upload name for the observation table view?

@phraenquex
Copy link
Collaborator Author

phraenquex commented Sep 9, 2024

The CentroidRes now looks right - so we can close this ticket. Thanks!

@mwinokan can you move your questions into a new ticket, let's call it "Observations panel tweaks". (I have things to add too.)

@mwinokan mwinokan moved this from Dev Done - Do review (DEV) to Approved in staging - push to production in Fragalysis Sep 9, 2024
matej-vavrek added a commit that referenced this issue Sep 12, 2024
* Squashed commit of the following:

commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251

* #1482 added TagName and CentroidRes columns for expanded view of observation dialog

* #1489 show warning toast message if is defined on target load

* #1322 added longcode column

* updated general function for tag comparison

* #1505 adjusted getting of centroid_res

---------

Co-authored-by: matej <matej.vavrek@m2ms.sk>
matej-vavrek added a commit that referenced this issue Sep 12, 2024
* Squashed commit of the following:

commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251

* #1482 added TagName and CentroidRes columns for expanded view of observation dialog

* #1489 show warning toast message if is defined on target load

* #1322 added longcode column

* updated general function for tag comparison

* #1505 adjusted getting of centroid_res

* #1458 allow to tag XCA sites, temp commit

# Conflicts:
#	js/components/preview/molecule/observationsDialog.js

* #1458 adjusted functionality and styling to proper change tag

---------

Co-authored-by: matej <matej.vavrek@m2ms.sk>
matej-vavrek added a commit that referenced this issue Sep 13, 2024
* Squashed commit of the following:

commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251

* #1482 added TagName and CentroidRes columns for expanded view of observation dialog

* #1489 show warning toast message if is defined on target load

* #1322 added longcode column

* updated general function for tag comparison

* #1505 adjusted getting of centroid_res

* #1458 allow to tag XCA sites, temp commit

# Conflicts:
#	js/components/preview/molecule/observationsDialog.js

* #1458 adjusted functionality and styling to proper change tag

* #1508 removed TagName column in expanded observation dialog, changed order of columns, adjusted labels and tooltips, show observation dialog in its full height

---------

Co-authored-by: Boris Kovar <boris.kovar@m2ms.sk>
boriskovar-m2ms added a commit that referenced this issue Nov 26, 2024
* Squashed commit of the following:

commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251

* #1482 added TagName and CentroidRes columns for expanded view of observation dialog

* #1489 show warning toast message if is defined on target load

* #1322 added longcode column

* updated general function for tag comparison

* #1505 adjusted getting of centroid_res

* #1458 allow to tag XCA sites, temp commit

# Conflicts:
#	js/components/preview/molecule/observationsDialog.js

* #1458 adjusted functionality and styling to proper change tag

* #1508 removed TagName column in expanded observation dialog, changed order of columns, adjusted labels and tooltips, show observation dialog in its full height

* #1508 adjusted column order and width calculation

---------

Co-authored-by: Boris Kovar <boris.kovar@m2ms.sk>
boriskovar-m2ms added a commit that referenced this issue Nov 26, 2024
* Squashed commit of the following:

commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251

* #1482 added TagName and CentroidRes columns for expanded view of observation dialog

* #1489 show warning toast message if is defined on target load

* #1322 added longcode column

* updated general function for tag comparison

* #1505 adjusted getting of centroid_res

* #1458 allow to tag XCA sites, temp commit

# Conflicts:
#	js/components/preview/molecule/observationsDialog.js

* #1458 adjusted functionality and styling to proper change tag

* #1508 removed TagName column in expanded observation dialog, changed order of columns, adjusted labels and tooltips, show observation dialog in its full height

* #1508 adjusted column order and width calculation

* #1501 added upload links to menu

---------

Co-authored-by: Boris Kovar <boris.kovar@m2ms.sk>
boriskovar-m2ms added a commit that referenced this issue Nov 26, 2024
* Squashed commit of the following:

commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251

* #1482 added TagName and CentroidRes columns for expanded view of observation dialog

* #1489 show warning toast message if is defined on target load

* #1322 added longcode column

* updated general function for tag comparison

* #1505 adjusted getting of centroid_res

* #1458 allow to tag XCA sites, temp commit

# Conflicts:
#	js/components/preview/molecule/observationsDialog.js

* #1458 adjusted functionality and styling to proper change tag

* #1508 removed TagName column in expanded observation dialog, changed order of columns, adjusted labels and tooltips, show observation dialog in its full height

* #1508 adjusted column order and width calculation

* #1501 added upload links to menu

* #1520 show tag alias instead of upload_name on hit navigator CanonSites & ConformerSites box tooltip

* #1519 keep tag in edit window after save

---------

Co-authored-by: Boris Kovar <boris.kovar@m2ms.sk>
boriskovar-m2ms added a commit that referenced this issue Nov 26, 2024
* Squashed commit of the following:

commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251

* #1482 added TagName and CentroidRes columns for expanded view of observation dialog

* #1489 show warning toast message if is defined on target load

* #1322 added longcode column

* updated general function for tag comparison

* #1505 adjusted getting of centroid_res

* #1458 allow to tag XCA sites, temp commit

# Conflicts:
#	js/components/preview/molecule/observationsDialog.js

* #1458 adjusted functionality and styling to proper change tag

* #1508 removed TagName column in expanded observation dialog, changed order of columns, adjusted labels and tooltips, show observation dialog in its full height

* #1508 adjusted column order and width calculation

* #1501 added upload links to menu

* #1520 show tag alias instead of upload_name on hit navigator CanonSites & ConformerSites box tooltip

* #1519 keep tag in edit window after save

* #1497 added Path column for extended view of observations

---------

Co-authored-by: Boris Kovar <boris.kovar@m2ms.sk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2024-03-13 green Data dissemination backend
Projects
Status: In production (Done)
Development

No branches or pull requests

4 participants