Persist skeleton group expansion state #7939

dieknolle3333 · 2024-07-23T20:57:09Z

https://moveskeletonexpansiontostore.webknossos.xyz/

Steps to test:

Go to skeletons tab, make sure to have some trees, ordered in some groups
Expand/collapse groups and subgroups, make sure everything works well
reload site and check that the same groups are expanded/collapsed, except root group

TODOs:

Issues:

fixes #

(Please delete unneeded items, merge only when none are left open)

Updated changelog
Updated migration guide if applicable
Updated documentation if applicable
Adapted wk-libs python client if relevant API parts change
Removed dev-only changes like prints and application.conf edits
Considered common edge cases
Needs datastore update after deployment

dieknolle3333 · 2024-07-24T13:07:51Z

@MichaelBuessemeyer would you be willing to make the according changes in the backend as in the segment group PR? the plan is the same here, to be able to store whether a segment group is collapsed or expanded.

MichaelBuessemeyer · 2024-07-24T14:53:13Z

Sure :)

dieknolle3333 · 2024-07-24T15:40:41Z

@philippotto the backend part is missing so testing will hopefully just yield the same behaviour as before. But I'm requesting review already for the first iteration so that most of the review is already done :) (funny: GitHub automatically set the right base branch.)

philippotto

first round of feedback :) will do testing in another iteration.

frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view_helpers.ts

frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx

dieknolle3333 · 2024-07-24T15:57:36Z

faster than lightning ⚡

frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx

MichaelBuessemeyer · 2024-07-25T16:20:41Z

The basics should work (the isExpanded state is persisted in the backend). However, I still need to check the nml support of the new "isExpanded" field

philippotto · 2024-07-29T11:37:16Z

However, I still need to check the nml support of the new "isExpanded" field

If the NML format is extended with an isExpanded property, the frontend parser and writer also need to be adapted. Wklibs, too. I wonder whether that's necessary (on the other hand, it's probably relatively easy to do)... cc @fm3

fm3 · 2024-07-29T11:40:28Z

It would not be complex to add that, I think. However, I’m also not sure if losing the expansion state during download + reupload would maybe be fair?

MichaelBuessemeyer · 2024-07-29T11:40:30Z

If the NML format is extended with an isExpanded property, the frontend parser and writer also need to be adapted. Wklibs, too. I wonder whether that's necessary (on the other hand, it's probably relatively easy to do)... cc @fm3

So we just have everything collapsed or expanded by default? That's fine by me :)

…nded

…eminds/webknossos into move-skeleton-expansion-to-store

…move-skeleton-expansion-to-store

frontend/javascripts/oxalis/model/helpers/nml_helpers.ts

frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx

frontend/javascripts/test/snapshots/public-test/test-bundle/test/libs/nml.spec.js.md

philippotto · 2024-07-31T14:52:20Z

code looks mostly good to me 👍 however: during testing I couldn't move an empty group into a child group of the root. I tried dragging group 4 into group 1, but nothing happened. on https://treetree.webknossos.xyz/ this works, so it seems to be related to this PR? can you reproduce this?

dieknolle3333 · 2024-08-01T10:26:06Z

can you reproduce this?

oh, yes. I will look into it!
for the record, the bug still persists (edit: fixed)

frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx

MichaelBuessemeyer · 2024-08-01T15:02:32Z

Please wait before merging. I just noticed that the backed review is still pending :)

dieknolle3333 · 2024-08-01T15:35:37Z

@philippotto super weird: I was able to reproduce the bug on https://moveskeletonexpansiontostore.webknossos.xyz/ but cannot reproduce it locally. Even before the small change I made. It doesnt seem to be browser related, but locally I was able to drag and drop empty groups with the current changes (also at commit 5e4c06d, where I addressed the second round of review).

philippotto · 2024-08-01T15:41:10Z

hm, weird indeed! however, your "fix commit" makes sense to me and now dnd seems to work reliably. so, from my side, this should be good to go :)

dieknolle3333 · 2024-08-01T15:47:44Z

oh its works for you now? because it wasnt working for me on the dev instance like 10 minutes ago. but I can confirm that now its working?! whatever, maybe a weird browser caching thing 🤷‍♂️ what matters is that its working now :) 👍

philippotto · 2024-08-01T16:05:57Z

because it wasnt working for me on the dev instance like 10 minutes ago.

maybe you had an old tab open? after running /install_dev it can take one or two minutes until the new files are served. if you mistakenly assumed, that the new stuff was already served and kept that tab open, this might explain it. cache problems are plausible, too, of course.

let's test again tomorrow and then merge this branch into tree-tree. on monday, we can hopefully merge tree-tree.

dieknolle3333 · 2024-08-01T16:14:51Z

if you mistakenly assumed, that the new stuff was already served and kept that tab open, this might explain it.

yeah, you're right, I might have been to fast. It felt longer than 1-2 minutes that I was switching between dev and local instance, and I felt like I was refreshing quite often, but maybe this was the cause after all. Thanks for the explanation, I will look out for this in the future.

philippotto · 2024-08-01T16:22:01Z

yeah, you're right, I might have been to fast. It felt longer than 1-2 minutes that I was switching between dev and local instance, and I felt like I was refreshing quite often, but maybe this was the cause after all. Thanks for the explanation, I will look out for this in the future.

by the way, you can always check the version number that is running here:

philippotto · 2024-08-05T07:28:03Z

works for me :)

MichaelBuessemeyer · 2024-08-05T15:39:43Z

Please wait before merging. I just noticed that the backed review is still pending :)

I think the backend review was still missing 🙈
But as it is now part of tree-tree, it can be reviewed there I guess

fm3

Backend LGTM

philippotto · 2024-08-06T09:36:25Z

Oops, I missed your comment between the other discussion.

* refactor tree hierarchy view as functional component * WIP refacator as antd <Tree> * restore checkbox and expaneded keys * restored expand/collapse all behaviors * re-use <DotIcon> components but with rgba values * restore search * fix drag and drop for single tree * fix multi select * remove react-sortable-tree library * updated styling and text wrap * make tree height/width smaller * collapse sup groups * added shift selection to skeleton tree * updated changelog * Update frontend/javascripts/oxalis/view/right-border-tabs/skeleton_tab_view.tsx Co-authored-by: MichaelBuessemeyer <[email protected]> * Update frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view_helpers.ts Co-authored-by: MichaelBuessemeyer <[email protected]> * Update frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx Co-authored-by: MichaelBuessemeyer <[email protected]> * Update frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx Co-authored-by: MichaelBuessemeyer <[email protected]> * apply PR feedback * fix tooltip * add autofocus to tree search * fix active tree updates highlighting tree * fix shift selection * fix crash on tree deletion * apply darker background colors for trees in dark mode * disable node drag icon * disabled checkboxes for empty groups * use darker colors for <Tree> components in dark mode * fix multi select drag and drop * formatting * fix CSS alignment of tree checkboxes * use antd themeing instead of CSS overrides * format * Persist skeleton group expansion state (#7939) * move skeleton expanded/collapsed group state to store * WIP: expand and collapse all skeleton groups * fix expand/collapse skeleton groups * expand group if tree is dropped * clean up code * lint * address review * address review 2/2 * remove console.log * lint * add small condition for ondrop * persist isExpanded state in backend * make groups default expanded if field is absent in nml (backend only) * make groups default expanded if for written nmls (backend only) * fix backend treegroup update action tests * add isExpanded to frontend nml support * update snapshots * omit object creation in var * omit useless return statement in map * add isExpanded prop to tree groups in backend testing fixtures (dummies) * add test to backend nml test to test properly setting default to expanded * add changelog * WIP: address review * fix bug where drag and drop of empty groups was failing * remove comment --------- Co-authored-by: Michael Büßemeyer <[email protected]> Co-authored-by: Philipp Otto <[email protected]> * fix tree sorting * fix off-by-one error in shift select * override <Tree> scroll handle in dark mode * use scrollTo(auto) * format * fix typo --------- Co-authored-by: MichaelBuessemeyer <[email protected]> Co-authored-by: Philipp Otto <[email protected]> Co-authored-by: Charlie Meister <[email protected]> Co-authored-by: Michael Büßemeyer <[email protected]> Co-authored-by: Philipp Otto <[email protected]>

dieknolle3333 assigned dieknolle3333 and MichaelBuessemeyer Jul 23, 2024

dieknolle3333 closed this Jul 24, 2024

dieknolle3333 force-pushed the move-skeleton-expansion-to-store branch from 1e5f5a3 to 32a5a57 Compare July 24, 2024 11:57

move skeleton expanded/collapsed group state to store

dc16ee2

dieknolle3333 reopened this Jul 24, 2024

dieknolle3333 added 2 commits July 24, 2024 15:47

WIP: expand and collapse all skeleton groups

3fb992a

fix expand/collapse skeleton groups

e190aca

dieknolle3333 added 3 commits July 24, 2024 17:05

expand group if tree is dropped

f5c9e31

clean up code

b5c055b

lint

0a7badd

dieknolle3333 requested a review from philippotto July 24, 2024 15:41

dieknolle3333 marked this pull request as ready for review July 24, 2024 15:42

philippotto reviewed Jul 24, 2024

View reviewed changes

dieknolle3333 added 2 commits July 24, 2024 18:25

address review

71d1c96

address review 2/2

860c9ff

dieknolle3333 commented Jul 24, 2024

View reviewed changes

frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx Outdated Show resolved Hide resolved

dieknolle3333 added 2 commits July 24, 2024 18:58

remove console.log

812dccf

lint

679c3e9

dieknolle3333 commented Jul 24, 2024

View reviewed changes

frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx Outdated Show resolved Hide resolved

dieknolle3333 and others added 2 commits July 24, 2024 19:48

add small condition for ondrop

95e4925

persist isExpanded state in backend

aa94946

MichaelBuessemeyer and others added 3 commits July 30, 2024 15:23

add test to backend nml test to test properly setting default to expa…

a4656fe

…nded

Merge branch 'move-skeleton-expansion-to-store' of github.com:scalabl…

0094a25

…eminds/webknossos into move-skeleton-expansion-to-store

add changelog

e0f1f50

dieknolle3333 changed the title ~~WIP: move skeleton group expansion to store~~ Persist skeleton group expansion state Jul 31, 2024

dieknolle3333 requested a review from philippotto July 31, 2024 09:15

Merge branch 'tree-tree' of github.com:scalableminds/webknossos into …

d9c32be

…move-skeleton-expansion-to-store

philippotto reviewed Jul 31, 2024

View reviewed changes

WIP: address review

5e4c06d

fix bug where drag and drop of empty groups was failing

c8ae492

dieknolle3333 commented Aug 1, 2024

View reviewed changes

frontend/javascripts/oxalis/view/right-border-tabs/tree_hierarchy_view.tsx Outdated Show resolved Hide resolved

MichaelBuessemeyer requested a review from fm3 August 1, 2024 15:01

remove comment

f07db71

philippotto merged commit 8a67ff4 into tree-tree Aug 5, 2024
2 checks passed

philippotto deleted the move-skeleton-expansion-to-store branch August 5, 2024 07:28

MichaelBuessemeyer mentioned this pull request Aug 5, 2024

Refactor Skeletontree tab as Antd <Tree /> component #7819

Merged

20 tasks

fm3 reviewed Aug 6, 2024

View reviewed changes

dieknolle3333 mentioned this pull request Aug 13, 2024

Allow expanding/collapsing tree groups in locked annotations #7988

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Persist skeleton group expansion state #7939

Persist skeleton group expansion state #7939

dieknolle3333 commented Jul 23, 2024 •

edited

Loading

dieknolle3333 commented Jul 24, 2024 •

edited

Loading

MichaelBuessemeyer commented Jul 24, 2024

dieknolle3333 commented Jul 24, 2024

philippotto left a comment

dieknolle3333 commented Jul 24, 2024

MichaelBuessemeyer commented Jul 25, 2024 •

edited

Loading

philippotto commented Jul 29, 2024

fm3 commented Jul 29, 2024

MichaelBuessemeyer commented Jul 29, 2024

philippotto commented Jul 31, 2024

dieknolle3333 commented Aug 1, 2024 •

edited

Loading

MichaelBuessemeyer commented Aug 1, 2024 •

edited

Loading

dieknolle3333 commented Aug 1, 2024

philippotto commented Aug 1, 2024

dieknolle3333 commented Aug 1, 2024 •

edited

Loading

philippotto commented Aug 1, 2024

dieknolle3333 commented Aug 1, 2024

philippotto commented Aug 1, 2024

philippotto commented Aug 5, 2024

MichaelBuessemeyer commented Aug 5, 2024 •

edited

Loading

fm3 left a comment

philippotto commented Aug 6, 2024

Persist skeleton group expansion state #7939

Persist skeleton group expansion state #7939

Conversation

dieknolle3333 commented Jul 23, 2024 • edited Loading

Steps to test:

TODOs:

Issues:

dieknolle3333 commented Jul 24, 2024 • edited Loading

MichaelBuessemeyer commented Jul 24, 2024

dieknolle3333 commented Jul 24, 2024

philippotto left a comment

Choose a reason for hiding this comment

dieknolle3333 commented Jul 24, 2024

MichaelBuessemeyer commented Jul 25, 2024 • edited Loading

philippotto commented Jul 29, 2024

fm3 commented Jul 29, 2024

MichaelBuessemeyer commented Jul 29, 2024

philippotto commented Jul 31, 2024

dieknolle3333 commented Aug 1, 2024 • edited Loading

MichaelBuessemeyer commented Aug 1, 2024 • edited Loading

dieknolle3333 commented Aug 1, 2024

philippotto commented Aug 1, 2024

dieknolle3333 commented Aug 1, 2024 • edited Loading

philippotto commented Aug 1, 2024

dieknolle3333 commented Aug 1, 2024

philippotto commented Aug 1, 2024

philippotto commented Aug 5, 2024

MichaelBuessemeyer commented Aug 5, 2024 • edited Loading

fm3 left a comment

Choose a reason for hiding this comment

philippotto commented Aug 6, 2024

dieknolle3333 commented Jul 23, 2024 •

edited

Loading

dieknolle3333 commented Jul 24, 2024 •

edited

Loading

MichaelBuessemeyer commented Jul 25, 2024 •

edited

Loading

dieknolle3333 commented Aug 1, 2024 •

edited

Loading

MichaelBuessemeyer commented Aug 1, 2024 •

edited

Loading

dieknolle3333 commented Aug 1, 2024 •

edited

Loading

MichaelBuessemeyer commented Aug 5, 2024 •

edited

Loading