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

Search result tables 13255 #4774

Merged
merged 3 commits into from Aug 18, 2016

Conversation

will-moore
Copy link
Member

What this PR does

Fixes https://trac.openmicroscopy.org/ome/ticket/13255. When an Image from SPW is found in a search and loaded in the right panel, we don't know that this is in a Well.
Therefore, the Tables tab was not shown so you couldn't query for tables data (needs Well Id).
Now, we always show the Tables tab, and if a user expands it then we do an AJAX call to check whether the image is in a Well (uses the paths_to_object query). If we get a Well Id then we do a second query to load the Tables data as normal.

Testing this PR

See ticket above.

  • Need to have tables data in SPW as described http://help.openmicroscopy.org/scripts.html#metadata
  • Add table data for a bunch of wells in plate (doesn't have to be all)
  • Table data should be displayed as normal when the Well is loaded in right panel.
  • Add unique tag name to Wells (images) to aid searching for them.
  • Search for tag name - click on Images in search results
  • In right panel expand Tables tab - should load Tables data as before.
  • Clicking on another SPW image in search results should auto-load Tables data if tab is left open.
  • For non-SPW images (either in search results or main Data tab) clicking Tables tab will open tab and query for wellId, but well Id won't be found so the Tables tab will not be opened automatically for subsequent images.

@sbesson sbesson added the develop label Aug 5, 2016
@@ -685,7 +685,8 @@ def paths_to_object(conn, experimenter_id=None, project_id=None,
select coalesce(sowner.id, plowner.id, aowner.id, wsowner.id),
slink.parent.id,
plate.id,
acquisition.id
acquisition.id,
well.id
from WellSample wellsample
left outer join wellsample.details.owner wsowner
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this PR, but why are wsowner and aowner the same: wellsample.details.owner?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need the owner of the top element in the path. E.g. Screen OR Plate. Probably never need Acquisition or WellSample. Even if lower elements in the path are owned by a different owner, that doesn't matter. We just need to know the context for browsing the jsTree, starting at Experimenter -> Screen or Experimenter -> Plate.

@manics
Copy link
Member

manics commented Aug 8, 2016

Otherwise good to merge.

@jburel
Copy link
Member

jburel commented Aug 15, 2016

Maybe add some robot tests cc @bramalingam

@atarkowska
Copy link
Member

atarkowska commented Aug 17, 2016

could robot test be added in a separate PR, would be great if that is rebased onto metadata branch and we could test along side mapr

@will-moore
Copy link
Member Author

--rebased-to #4788

@joshmoore
Copy link
Member

Filed card to come back to this before 5.3.0: https://trello.com/c/QlAb4anu/158-search-result-tables-robot-tests

Merging along with #4788, any refactoring or bug fixing should happen in paired PRs (develop/metadata52)

@joshmoore joshmoore merged commit 8ba7855 into ome:develop Aug 18, 2016
@joshmoore joshmoore deleted the search_result_tables_13255 branch August 18, 2016 16:20
@sbesson sbesson added this to the 5.3.0 milestone Sep 10, 2016
This was referenced Nov 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants