diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ff7fa7f37..6e6bb5c7cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md). - Renamed "Expected Time" to "Time Limit" in the project table. [#4278](https://github.com/scalableminds/webknossos/pull/4278) - Clicking on an experience domain of a user, while multiple users are selected will edit the domain of all selected users (instead of only the domain of the clicked row). [#4280](https://github.com/scalableminds/webknossos/pull/4280) +- Creating a new group will always activate that group. [#4282](https://github.com/scalableminds/webknossos/pull/4282) ### Fixed - When creating tasks from zip, the individual nml names are used again, rather than the zip name. [#4277](https://github.com/scalableminds/webknossos/pull/4277) diff --git a/frontend/javascripts/oxalis/view/right-menu/delete_group_modal_view.js b/frontend/javascripts/oxalis/view/right-menu/delete_group_modal_view.js index 37af6e411e..35596fe026 100644 --- a/frontend/javascripts/oxalis/view/right-menu/delete_group_modal_view.js +++ b/frontend/javascripts/oxalis/view/right-menu/delete_group_modal_view.js @@ -20,22 +20,18 @@ export default function DeleteGroupModalView({ title={messages["tracing.group_deletion_message"]} onOk={onJustDeleteGroup} onCancel={onCancel} + width={620} footer={[ - , , , ]} > - Do you really want to remove the selected group? If you want to remove the group with all its - trees and subgroups recursively, select "Remove group recursively". If you want to - remove just the group and keep the subtrees and subgroups select "Remove group - only". + When selecting "Remove group and keep children", the children will be moved to the + level of the original group. ); } diff --git a/frontend/javascripts/oxalis/view/right-menu/tree_hierarchy_view.js b/frontend/javascripts/oxalis/view/right-menu/tree_hierarchy_view.js index 35cd2fc9f3..81f6a5f380 100644 --- a/frontend/javascripts/oxalis/view/right-menu/tree_hierarchy_view.js +++ b/frontend/javascripts/oxalis/view/right-menu/tree_hierarchy_view.js @@ -149,26 +149,27 @@ class TreeHierarchyView extends React.PureComponent { } }; + selectGroupById = (groupId: number) => { + this.props.deselectAllTrees(); + this.props.onSetActiveGroup(groupId); + }; + onSelectGroup = (evt: SyntheticMouseEvent<*>) => { // $FlowFixMe .dataset is unknown to flow const groupId = parseInt(evt.target.dataset.id, 10); const numberOfSelectedTrees = this.props.selectedTrees.length; - const selectGroup = () => { - this.props.deselectAllTrees(); - this.props.onSetActiveGroup(groupId); - }; if (numberOfSelectedTrees > 0) { Modal.confirm({ title: "Do you really want to select this group?", content: `You have ${numberOfSelectedTrees} selected Trees. Do you really want to select this group? This will deselect all selected trees.`, onOk() { - selectGroup(); + this.selectGroupById(groupId); }, onCancel() {}, }); } else { - selectGroup(); + this.selectGroupById(groupId); } }; @@ -240,6 +241,7 @@ class TreeHierarchyView extends React.PureComponent { }); } this.props.onUpdateTreeGroups(newTreeGroups); + this.selectGroupById(newGroupId); } deleteGroup(groupId: number) {