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

Right panel annotation tabs #4579

Merged
merged 96 commits into from May 3, 2016
Merged

Conversation

will-moore
Copy link
Member

@will-moore will-moore commented Apr 15, 2016

This PR updates the right panel annotations panes so that they don't load data unless expanded.
Also data is loaded via json instead of html.
Batch annotation has not been changed yet.

This will need a lot of testing with all the different annotations and permissions. Not ready for full testing yet. More cleanup work to do, but this is stable enough to open a PR now...

  • Handle all "custom" types of annotation (boolean, xml, long, etc)
  • Remove listAnnotations() from container.py. Leave for now - used by annotate_tags()
  • Tests for tree.py marshal_annotations()
  • Split ome.general_tab.js into separate files for each Annotation Pane.
  • Move js for each annotation Pane out of metadata_general.html into separate classes for each Pane.
  • Filter annotations by user (also in batch_annotation)
  • Date formatting
  • Long text E.g. ns on tooltips.

To test, compare what's shown in web with Insight - to check correct annotations / permissions etc.
For all panes:

  • Check annotations are same as Insight
  • Check tooltips
  • Filter by owner (mine/others)
  • When pane is expanded, it should stay expanded when selecting new P/D/I etc
  • All annotations should take Well-Index into account - E.g. Select Well with index is 2 - add annotations & check that they are shown just on this well & index.
  • Permissions: when can / cannot annotate, check that buttons etc reflect this.
  • Permissions: check you can remove / delete your own / others' annotations as expected.
  • Add and remove annotations - check that display is updated as expected.
  • As discussed with @pwalczysko: test if fast selection changes can load incorrect content into an Annotation pane. E.g. Expand 'tag' pane, select a "slow-to-load" pane (object with lots of tags) followed rapidly by a "fast-to-load" pane. IF the slow content arrives AFTER the fast content, it might replace it (incorrectly) and be displayed for the second object.

Batch annotate

  • Same panes should stay expanded/collapsed when switching between singe/batch annotate.
  • Tags summarised as before (details in tooltip) - Clicking X removes all links that you can unlink, including those linked by others.

Specific annotations

  • Tags:
    • NB: we still show separate tags for each user (as before) instead of summarise them like Insight.
    • Now use a '-' icon for remove instead of 'x' see ticket
  • Key Value Pairs
    • Create & Edit
    • Check display of non "client-editable" map annotations
  • Attachments
    • Check 'scripts' button works (run script with checked files)
  • Rating
    • No-longer have to start with + button. Start with blank 5 stars.
  • Others
    • I will add some to image on eel.
    • Tooltip on values.

@mtbc
Copy link
Member

mtbc commented Apr 18, 2016

./components/tools/OmeroWeb/omeroweb/webclient/tree.py:1704:80: E501 line too long (98 > 79 characters)

will-moore and others added 2 commits May 2, 2016 11:58
@will-moore will-moore closed this May 2, 2016
@will-moore will-moore reopened this May 2, 2016
It seems that on one browser, CI tests fail because 'Add Comment' button is not
visible (it is shown/hidden when text area gets/loses focus and this may be
somehow fragile to Robot tests)
@jburel
Copy link
Member

jburel commented May 3, 2016

@will-moore
Copy link
Member Author

Only 2 Robot failures now: https://ci.openmicroscopy.org/view/OMERO-DEV/job/OMERO-DEV-merge-robotframework/286/robot/
One is webadmin (not this PR) and the other is just a transient failure (age: 1)

@jburel
Copy link
Member

jburel commented May 3, 2016

Back to something more reasonable with @will-moore's latest commit

@jburel
Copy link
Member

jburel commented May 3, 2016

Thanks all.
@will-moore: you might want to move your last item in the description to a ticket/card so it does not get forgotten

@jburel jburel merged commit 44642c4 into ome:develop May 3, 2016
@will-moore
Copy link
Member Author

@jburel Will do!
Thanks all for the extensive testing.

@will-moore
Copy link
Member Author

@jburel
Copy link
Member

jburel commented May 3, 2016

Thanks @will-moore

@pwalczysko
Copy link
Member

How about the cross-group search 61a7965 ? Do we have a placeholder for this ?

@jburel jburel added this to the 5.2.3 milestone May 4, 2016
@sbesson sbesson modified the milestones: 5.3.0, 5.2.3 May 10, 2016
@will-moore
Copy link
Member Author

@manics I seem to remember you had a "hack" for IDR to display annotations on a Well alongside those on the Image in the right panel (normally webclient doesn't display Well annotations). I don't know if that ever got into develop branch, but with this PR (in 5.2.3) merged with IDR, that will have been lost, so it will need to be added back in a different way if you still need that functionality in IDR?

@manics
Copy link
Member

manics commented May 19, 2016

This was the metadata52 PR: #4457

@will-moore
Copy link
Member Author

@manics Yes. That code is no-longer used with this PR (it has been cleaned up and removed in #4660)
Unfortunately I don't think there will be such an easy one-liner fix to replicate that functionality in 5.2.3 since we now load annotations for a Well by using image ID, E.g. tags: /webclient/api/annotations/?type=tag&image=1230132. I can have a look at fixing this if needed?

@joshmoore
Copy link
Member

@will-moore : if you have an idea for a fix, even one that can't make it to the mainline, it would be much appreciated.

@manics
Copy link
Member

manics commented May 19, 2016

Or we change omero metadata to attach annotations to the image instead of well (if it doesn't already, I can't remember if that was another hack that went in).

@sbesson sbesson modified the milestones: 5.3.0, 5.2.3 Sep 10, 2016
@will-moore will-moore deleted the right_panel_annotation_tabs branch February 18, 2019 04:09
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

9 participants