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

Jump to bottom

Pjdotson/sy 775 ontology ungrouping several folders at the same time causes #652

Merged
merged 7 commits into from
Jun 24, 2024
Merged

Pjdotson/sy 775 ontology ungrouping several folders at the same time causes #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
067f584
Merge pull request #644 from synnaxlabs/rc
pjdotson Jun 17, 2024
2506d8e
Update dependencies
pjdotson Jun 17, 2024
ccf260f
Merge pull request #650 from synnaxlabs/pjdotson/sy-799-documentation…
pjdotson Jun 19, 2024
9a2da59
Prevented deletion of subgroups by adding sorting of groups
pjdotson Jun 20, 2024
a917bf1
Removed some trailing commas
pjdotson Jun 20, 2024
c271933
Merge remote-tracking branch 'origin/rc' into pjdotson/sy-775-ontolog…
pjdotson Jun 20, 2024
f48871f
Added a comment explaining why sorting a group selection for ungroupi…
pjdotson Jun 24, 2024
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
8 changes: 4 additions & 4 deletions .vscode/synnax.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@
},
{
"name": "alamos/py",
"path": "../alamos/py",
"path": "../alamos/py"
},
{
"name": "alamos/go",
"path": "../alamos/go",
"path": "../alamos/go"
},
{
"name": "alamos/ts",
"path": "../alamos/ts",
"path": "../alamos/ts"
},
{
"name": "x/media",
Expand All @@ -103,7 +103,7 @@
{
"name": "driver",
"path": "../driver"
},
}
],
"settings": {
"editor.formatOnSave": true,
Expand Down
2 changes: 1 addition & 1 deletion alamos/py/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "alamos"
version = "0.23.0"
version = "0.23.1"
description = ""
authors = ["Emiliano Bonilla <ebonilla@synnaxlabs.com>"]
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion client/py/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "synnax"
version = "0.23.1"
version = "0.23.2"
description = "Synnax Client Library"
keywords = ["Synnax", "Synnax Python Client"]
authors = ["emiliano bonilla <emilbon99@gmail.com>"]
Expand Down
7 changes: 7 additions & 0 deletions console/src/group/ontology.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ const ungroupSelection = async ({
state,
}: Ontology.TreeContextMenuProps): Promise<void> => {
if (selection.parent == null) return;

// Sort the groups by depth that way deeper nested groups are ungrouped first.
selection.resources.sort((a, b) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

@pjdotson Can you explain how this fixes the problem?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The only issue I could find was nested groups disappearing when ungrouping so if Group B is in Group A, ungrouping Group A first would not remove items originally in Group B from the tree. Ungrouping deeper groups first fixed that problem.

Copy link
Contributor

Choose a reason for hiding this comment

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

Great. Thanks. Approved

const a_depth = selection.nodes.find((n) => n.key === a.id.toString())?.depth ?? 0;
const b_depth = selection.nodes.find((n) => n.key === b.id.toString())?.depth ?? 0;
return b_depth - a_depth;
});
for (const node of selection.resources) {
const id = node.id;
const children =
Expand Down
2 changes: 1 addition & 1 deletion freighter/py/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "synnax-freighter"
version = "0.23.0"
version = "0.23.1"
description = ""
authors = ["emiliano bonilla <emilbon99@gmail.com>"]
packages = [
Expand Down
Loading