Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions ScriptBeeClient/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { authGuard } from './guards/auth.guard';
import { loginGuard } from './guards/login.guard';
import { permissionGuard } from './guards/permissions.guard';
import { projectPermissionsGuard } from './guards/projectPermission.guard';
import { ManageAccessComponent } from './pages/projects/project-details/manage-access/manage-access.component';

export const routes: Routes = [
{ path: '', redirectTo: 'login', pathMatch: 'full' },
Expand Down Expand Up @@ -78,6 +79,11 @@ export const routes: Routes = [
],
canActivate: [permissionGuard('plugin:view')],
},
{
path: 'access',
component: ManageAccessComponent,
canActivate: [permissionGuard('project:manage_access')],
},
{ path: '**', redirectTo: 'analysis' },
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('ProjectSideNavListComponent', () => {
imports: [ProjectSideNavListComponent],
providers: [
provideRouter(
['model', 'analysis', 'settings', 'plugins'].map((path) => ({
['model', 'analysis', 'settings', 'access', 'plugins'].map((path) => ({
path,
component: TestEntry,
}))
Expand All @@ -44,13 +44,14 @@ describe('ProjectSideNavListComponent', () => {

it('should render entries', () => {
const icons = fixture.debugElement.queryAll(By.css('mat-icon'));
expect(icons).toHaveLength(5);
expect(icons).toHaveLength(6);

const names = fixture.debugElement.queryAll(By.css('span[matListItemTitle]'));
expect(names).toHaveLength(4);
expect(names).toHaveLength(5);
expect(names[0].nativeElement.textContent).toContain('Model');
expect(names[1].nativeElement.textContent).toContain('Analysis');
expect(names[2].nativeElement.textContent).toContain('Settings');
expect(names[3].nativeElement.textContent).toContain('Plugins');
expect(names[3].nativeElement.textContent).toContain('Manage Access');
expect(names[4].nativeElement.textContent).toContain('Plugins');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ const defaultNavItems: NavItem[] = [
icon: 'settings',
permission: 'project:edit',
},
{
link: '/access',
name: 'Manage Access',
icon: 'manage_accounts',
permission: 'project:manage_access',
},
{
link: '/plugins',
name: 'Plugins',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<div class="manage-access-container">
<h3>Manage Access</h3>

@if (membersResource.isLoading()) {
<app-loading-progress-bar title="Loading members..." />
} @else if (membersResource.error()) {
<app-error-state [error]="{ title: 'Failed to load members', detail: 'Please try again.', status: 500 }" (retry)="membersResource.reload()" />
} @else {
<table mat-table [dataSource]="membersResource.value() ?? []" class="members-table">
<ng-container matColumnDef="memberId">
<th mat-header-cell *matHeaderCellDef>Member ID</th>
<td mat-cell *matCellDef="let member">{{ member.memberId }}</td>
</ng-container>

<ng-container matColumnDef="memberType">
<th mat-header-cell *matHeaderCellDef>Type</th>
<td mat-cell *matCellDef="let member">
<mat-icon class="type-icon">{{ member.memberType === 'user' ? 'person' : 'group' }}</mat-icon>
{{ member.memberType }}
</td>
</ng-container>

<ng-container matColumnDef="role">
<th mat-header-cell *matHeaderCellDef>Role</th>
<td mat-cell *matCellDef="let member">{{ member.role }}</td>
</ng-container>

<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef></th>
<td mat-cell *matCellDef="let member">
<button
mat-icon-button
color="warn"
[disabled]="removingMemberId() === member.memberId"
(click)="onRemoveMember(member)"
id="remove-member-{{ member.memberId }}">
<mat-icon>delete</mat-icon>
</button>
</td>
</ng-container>

<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>

<tr class="mat-row" *matNoDataRow>
<td class="mat-cell no-data-cell" [attr.colspan]="displayedColumns.length">No members found. Add members below.</td>
</tr>
</table>
}

<mat-divider />

<mat-card appearance="outlined" class="add-member-card">
<mat-card-header>
<mat-card-title>Add / Update Member</mat-card-title>
</mat-card-header>

<mat-card-content>
<form [formGroup]="addMemberForm" class="add-member-form" (ngSubmit)="onAddMember()">
<mat-form-field>
<mat-label>Member Type</mat-label>
<mat-select formControlName="memberType" id="member-type-select">
<mat-option value="user">User</mat-option>
<mat-option value="group">Group</mat-option>
</mat-select>
</mat-form-field>

@if (isUserType()) {
<mat-form-field>
<mat-label>User</mat-label>
<input matInput id="member-id-autocomplete" [matAutocomplete]="auto" formControlName="memberId" placeholder="Search user..." />
<mat-autocomplete #auto="matAutocomplete" (optionSelected)="onUserSelected($event.option.value)">
@for (user of filteredUsers(); track user.id) {
<mat-option [value]="user">{{ user.name }}</mat-option>
}
</mat-autocomplete>
</mat-form-field>
} @else {
<mat-form-field>
<mat-label>Group ID</mat-label>
<input matInput id="member-id-input" formControlName="memberId" placeholder="e.g. dev-team" />
</mat-form-field>
}

<mat-form-field>
<mat-label>Role</mat-label>
@if (rolesResource.isLoading()) {
<mat-select id="role-select" formControlName="role" [compareWith]="compareRoles" [disabled]="true">
<mat-option>Loading roles...</mat-option>
</mat-select>
} @else {
<mat-select id="role-select" formControlName="role" [compareWith]="compareRoles">
@for (role of rolesResource.value() ?? []; track role.id) {
<mat-option [value]="role" [matTooltip]="role.description" matTooltipPosition="right">
<span class="role-option-name">{{ role.id }}</span>
<span class="role-option-description">{{ role.description }}</span>
</mat-option>
}
</mat-select>
}
</mat-form-field>

<button mat-flat-button type="submit" id="add-member-submit" [disabled]="addMemberForm.invalid || isSaving()">
@if (isSaving()) {
<mat-spinner diameter="20" />
} @else {
Add / Update
}
</button>
</form>
</mat-card-content>
</mat-card>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
.manage-access-container {
padding: 24px;
display: flex;
flex-direction: column;
gap: 24px;
}

.members-table {
width: 100%;
}

.type-icon {
font-size: 16px;
height: 16px;
width: 16px;
vertical-align: middle;
margin-right: 4px;
}

.no-data-cell {
text-align: center;
padding: 32px;
color: var(--mat-sys-on-surface-variant);
}

.add-member-card {
max-width: 600px;
}

.add-member-form {
display: flex;
flex-direction: column;
gap: 8px;

mat-form-field {
width: 100%;
}

button {
align-self: flex-start;
}
}

.role-option-name {
display: block;
font-weight: 500;
}

.role-option-description {
display: block;
font-size: 0.75rem;
color: var(--mat-sys-on-surface-variant);
white-space: normal;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ManageAccessComponent } from './manage-access.component';
import { ProjectService } from '../../../../services/projects/project.service';
import { ProjectStateService } from '../../../../services/projects/project-state.service';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { of } from 'rxjs';
import { By } from '@angular/platform-browser';
import { Project, ProjectMember, RoleInfo, UserInfo } from '../../../../types/project';
import { signal } from '@angular/core';
import { MatSnackBarRef, TextOnlySnackBar } from '@angular/material/snack-bar';

describe('ManageAccessComponent', () => {
let component: ManageAccessComponent;
let fixture: ComponentFixture<ManageAccessComponent>;
let snackbarOpenSpy: unknown;

const projectServiceSpy = {
getProjectMembers: vi.fn(),
updateProjectMember: vi.fn(),
removeProjectMember: vi.fn(),
getAllUsers: vi.fn(),
getRoles: vi.fn(),
};

const mockProject: Project = {
id: 'project-1',
name: 'Test Project',
creationDate: '2024-02-08',
savedFiles: {},
loadedFiles: {},
linkers: [],
};

const mockMembers: ProjectMember[] = [
{ memberId: 'user-a', memberType: 'user', role: 'owner' },
{ memberId: 'team-b', memberType: 'group', role: 'viewer' },
];

const mockUsers: UserInfo[] = [
{ id: 'user-a', name: 'Alice' },
{ id: 'user-c', name: 'Charlie' },
];

const mockRoles: RoleInfo[] = [
{ id: 'owner', description: 'Full control over the project' },
{ id: 'editor', description: 'Can modify project resources' },
{ id: 'viewer', description: 'Read-only access to the project' },
];

beforeEach(async () => {
projectServiceSpy.getProjectMembers.mockReset().mockReturnValue(of(mockMembers));
projectServiceSpy.updateProjectMember.mockReset().mockReturnValue(of(undefined));
projectServiceSpy.removeProjectMember.mockReset().mockReturnValue(of(undefined));
projectServiceSpy.getAllUsers.mockReset().mockReturnValue(of(mockUsers));
projectServiceSpy.getRoles.mockReset().mockReturnValue(of(mockRoles));

const projectStateServiceMock = {
currentProject: signal<Project | null>(mockProject),
};

await TestBed.configureTestingModule({
imports: [ManageAccessComponent],
providers: [
{ provide: ProjectService, useValue: projectServiceSpy },
{ provide: ProjectStateService, useValue: projectStateServiceMock },
],
}).compileComponents();

fixture = TestBed.createComponent(ManageAccessComponent);
component = fixture.componentInstance;

fixture.detectChanges();
snackbarOpenSpy = vi.spyOn(component.snackbar, 'open').mockReturnValue({} as MatSnackBarRef<TextOnlySnackBar>);

await fixture.whenStable();
});

describe('Business Perspective: Manage Project Access Page', () => {
it('should show current members and groups with their roles in the table', () => {
const screenText = fixture.nativeElement.textContent;
expect(screenText).toContain('user-a');
expect(screenText).toContain('team-b');
expect(screenText).toContain('owner');
expect(screenText).toContain('viewer');
});

it('should add/update group member access when user selects group details and clicks submit', async () => {
component.addMemberForm.controls.memberType.setValue('group');
fixture.detectChanges();
await fixture.whenStable();

const groupInput = fixture.debugElement.query(By.css('#member-id-input')).nativeElement;
groupInput.value = 'dev-team';
groupInput.dispatchEvent(new Event('input'));

const editorRole = mockRoles.find((r) => r.id === 'editor')!;
component.addMemberForm.controls.role.setValue(editorRole);

fixture.detectChanges();
await fixture.whenStable();

const submitBtn = fixture.debugElement.query(By.css('#add-member-submit'));
submitBtn.nativeElement.click();

fixture.detectChanges();
await fixture.whenStable();

expect(projectServiceSpy.updateProjectMember).toHaveBeenCalledWith('project-1', 'dev-team', 'editor', 'group');
expect(snackbarOpenSpy).toHaveBeenCalledWith('Member access updated.', 'Dismiss', { duration: 3000 });
});

it('should revoke access when the user clicks the delete button for a member', async () => {
const deleteBtn = fixture.debugElement.query(By.css('#remove-member-user-a'));
deleteBtn.triggerEventHandler('click', null);

fixture.detectChanges();
await fixture.whenStable();

expect(projectServiceSpy.removeProjectMember).toHaveBeenCalledWith('project-1', 'user-a', 'user');
expect(snackbarOpenSpy).toHaveBeenCalledWith('Member removed.', 'Dismiss', { duration: 3000 });
});
});
});
Loading
Loading