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.

Sign up for GitHub

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

Always activate group after creating it #4282

Merged
merged 2 commits into from
Sep 16, 2019
Merged

Always activate group after creating it #4282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73589f6
always activate group after creating it
philippotto Sep 12, 2019
ed1f880
update changelog
philippotto Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions frontend/javascripts/oxalis/view/right-menu/delete_group_modal_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,18 @@ export default function DeleteGroupModalView({
title={messages["tracing.group_deletion_message"]}
onOk={onJustDeleteGroup}
onCancel={onCancel}
width={620}
footer={[
<Button key="back" onClick={onCancel}>
Cancel
</Button>,
<Button key="submit-all" onClick={onDeleteGroupAndTrees}>
Remove group recursively
Remove group including all children
</Button>,
<Button key="submit-groups-only" type="primary" onClick={onJustDeleteGroup}>
Remove group only
Remove group and keep children
Copy link
Member

Choose a reason for hiding this comment

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

👍

</Button>,
]}
>
Do you really want to remove the selected group? If you want to remove the group with all its
trees and subgroups recursively, select &quot;Remove group recursively&quot;. If you want to
remove just the group and keep the subtrees and subgroups select &quot;Remove group
only&quot;.
When selecting &quot;Remove group and keep children&quot;, the children will be moved to the
level of the original group.
</Modal>
);
}
14 changes: 8 additions & 6 deletions frontend/javascripts/oxalis/view/right-menu/tree_hierarchy_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,26 +149,27 @@ class TreeHierarchyView extends React.PureComponent<Props, State> {
}
};

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);
}
};

Expand Down Expand Up @@ -240,6 +241,7 @@ class TreeHierarchyView extends React.PureComponent<Props, State> {
});
}
this.props.onUpdateTreeGroups(newTreeGroups);
this.selectGroupById(newGroupId);
}

deleteGroup(groupId: number) {
Expand Down