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

Sort roles in role dropdown according to backend #11916

Merged
merged 2 commits into from
Nov 18, 2024
+15 −2
Merged

Sort roles in role dropdown according to backend #11916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc9f8f
Sort roles in role dropdown according to backend
AlexAndBear Nov 15, 2024
f463b61
Add changelog item
AlexAndBear Nov 15, 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
7 changes: 7 additions & 0 deletions changelog/unreleased/bugfix-fix-order-in-roles-drop-down
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Bugfix: Fix order in roles drop down

We've fixed an issue where the order of roles in the roles drop down was not correct.
Now the roles are sorted as delegated by the backend.

https://github.com/owncloud/web/pull/11916
https://github.com/owncloud/web/issues/11915
10 changes: 8 additions & 2 deletions packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,14 @@ export default defineComponent({
const availableInternalRoles = inject<Ref<ShareRole[]>>('availableInternalShareRoles')
const availableExternalRoles = inject<Ref<ShareRole[]>>('availableExternalShareRoles')
const availableRoles = computed(() => {
let roles = availableInternalRoles
if (props.isExternal) {
return unref(availableExternalRoles)
roles = availableExternalRoles
}
return unref(availableInternalRoles)

return [...unref(roles)].sort(
(role1, role2) => role1['@libre.graph.weight'] - role2['@libre.graph.weight']
)
})

let initialSelectedRole: ShareRole
Expand Down Expand Up @@ -295,6 +299,7 @@ export default defineComponent({
&:first-child {
margin-top: 0;
}

&:last-child {
margin-bottom: 0;
}
Expand All @@ -312,6 +317,7 @@ export default defineComponent({
}
}
}

&-role-select-btn {
max-width: 100%;
}
Expand Down