Skip to content

Ensure consistent ordering of assignment groups #53

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

Merged
eliaspr merged 1 commit into from
Jun 27, 2025
Merged

Ensure consistent ordering of assignment groups #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...ierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@

<table class="mb-2 table table-bordered">
<tbody>
@for (group of roleAssignments | keyvalue; track group.key) {
@for (group of roleAssignments; track group) {
<tr class="table-active">
<th>
<span [translate]="'Portal.RbacManagement.RoleName.' + group.key"></span>
<i class="ms-2 bi bi-info-circle" [ngbTooltip]="'Portal.RbacManagement.RoleDescription.' + group.key | translate"></i>
<span [translate]="'Portal.RbacManagement.RoleName.' + group.role"></span>
<i class="ms-2 bi bi-info-circle" [ngbTooltip]="'Portal.RbacManagement.RoleDescription.' + group.role | translate"></i>
</th>
</tr>

@for (assignment of group.value; track assignment.id) {
@for (assignment of group.assignments; track assignment.id) {
<tr>
<td>
<div class="d-flex flex-column gap-2">
Expand Down
36 changes: 20 additions & 16 deletions ...rnierplan.App/Client/src/app/portal/components/rbac-offcanvas/rbac-offcanvas.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class RbacOffcanvasComponent implements OnDestroy {
protected target!: IRbacOffcanvasTarget;
protected targetIcon: string = '';
protected isLoadingRoleAssignments = false;
protected roleAssignments: { [key: string]: RoleAssignmentDto[] } = {};
protected roleAssignments: { role: Role; assignments: RoleAssignmentDto[] }[] = [];
protected roleAssignmentCount: number = 0;

protected scopeTranslationKey: string = '';
Expand Down Expand Up @@ -73,17 +73,13 @@ export class RbacOffcanvasComponent implements OnDestroy {
next: () => {
this.roleAssignmentCount = 0;

for (const key of Object.keys(this.roleAssignments)) {
const filtered = this.roleAssignments[key].filter((x) => x.id !== id);
this.roleAssignmentCount += filtered.length;

if (filtered.length > 0) {
this.roleAssignments[key] = filtered;
} else {
delete this.roleAssignments[key];
}
for (const entry of this.roleAssignments) {
entry.assignments = entry.assignments.filter((x) => x.id !== id);
this.roleAssignmentCount += entry.assignments.length;
}

this.roleAssignments = this.roleAssignments.filter((x) => x.assignments.length > 0);

this.notificationService.showNotification(
'success',
'Portal.RbacManagement.DeletedSuccessToast.Title',
Expand All @@ -101,7 +97,11 @@ export class RbacOffcanvasComponent implements OnDestroy {
return false;
}

if (assignment.role === Role.Owner && this.targetIsOrganization && this.roleAssignments[Role.Owner].length === 1) {
if (
assignment.role === Role.Owner &&
this.targetIsOrganization &&
this.roleAssignments.find((x) => x.role === Role.Owner)?.assignments.length === 1
) {
// This is a special case which forbids deleting the only Owner assignment from an organization.
return false;
}
Expand Down Expand Up @@ -139,18 +139,22 @@ export class RbacOffcanvasComponent implements OnDestroy {
.pipe(finalize(() => (this.isLoadingRoleAssignments = false)))
.subscribe({
next: (roleAssignments) => {
this.roleAssignments = {};
// This definition guarantees the correct ordering
this.roleAssignments = Object.keys(Role).map((x) => ({ role: x as Role, assignments: [] as RoleAssignmentDto[] }));
this.roleAssignmentCount = 0;

for (const roleAssignment of roleAssignments) {
this.roleAssignmentCount++;

if (roleAssignment.role in this.roleAssignments) {
this.roleAssignments[roleAssignment.role].push(roleAssignment);
} else {
this.roleAssignments[roleAssignment.role] = [roleAssignment];
for (const entry of this.roleAssignments) {
if (entry.role === roleAssignment.role) {
entry.assignments.push(roleAssignment);
break;
}
}
}

this.roleAssignments = this.roleAssignments.filter((x) => x.assignments.length > 0);
},
error: (error) => {
this.errorSubject$.next(error);
Expand Down
Loading