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

Add full permissions for the robot account #19507

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Add full permissions for the robot account #19507

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
134 changes: 28 additions & 106 deletions ...se/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,22 @@
<clr-datagrid [clrDgPreserveSelection]="true" [(clrDgSelected)]="selectedRow">
<clr-dg-action-bar>
<clr-dropdown [clrCloseMenuOnItemClick]="false">
<button
[disabled]="coverAll"
class="btn btn-secondary btn-sm"
clrDropdownTrigger>
<clr-datagrid
[clrDgPreserveSelection]="true"
[(clrDgSelected)]="selectedRow"
[clrDgLoading]="loadingData"
class="datagrid-compact">
<clr-dg-action-bar class="action-bar">
<robot-permissions-panel
[mode]="PermissionSelectPanelModes.DROPDOWN"
[(permissionsModel)]="initialAccess"
(permissionsModelChange)="resetAccess(initialAccess)"
[candidatePermissions]="robotMetadata?.project">
<button class="btn btn-secondary btn-sm m-0">
{{ 'SYSTEM_ROBOT.RESET_PERMISSION' | translate }}
<clr-icon shape="caret down"></clr-icon>
<clr-icon size="12" shape="caret down"></clr-icon>
</button>
<clr-dropdown-menu
[style.height.px]="230"
clrPosition="bottom-left"
*clrIfOpen>
<div>
<button
class="btn btn-link btn-sm select-all-for-dropdown ml-20px"
(click)="
selectAllPermissionOrUnselectAll(defaultAccesses);
resetAccess(defaultAccesses)
">
<span *ngIf="isSelectAll(defaultAccesses)">{{
'SYSTEM_ROBOT.SELECT_ALL' | translate
}}</span>
<span *ngIf="!isSelectAll(defaultAccesses)">{{
'SYSTEM_ROBOT.UNSELECT_ALL' | translate
}}</span>
</button>
</div>
<div
clrDropdownItem
*ngFor="let item of defaultAccesses"
(click)="chooseDefaultAccess(item)">
<clr-icon
class="check"
shape="check"
[style.visibility]="
item.checked ? 'visible' : 'hidden'
"></clr-icon>
<span
>{{ i18nMap[item.action] | translate }}
{{ i18nMap[item.resource] | translate }}</span
>
</div>
</clr-dropdown-menu>
</clr-dropdown>
</robot-permissions-panel>
<button
(click)="selectAllOrUnselectAll()"
[disabled]="coverAll"
class="btn btn-secondary btn-sm ml-1">
class="btn btn-secondary btn-sm m-0 ml-1">
<span *ngIf="showSelectAll">{{
'SYSTEM_ROBOT.SELECT_ALL' | translate
}}</span>
Expand All @@ -67,9 +36,7 @@
<clr-dg-column>{{
'SYSTEM_ROBOT.PERMISSION_COLUMN' | translate
}}</clr-dg-column>
<clr-dg-row
*clrDgItems="let p of projects; let projectIndex = index"
[clrDgItem]="p">
<clr-dg-row *clrDgItems="let p of projects" [clrDgItem]="p">
<clr-dg-cell>
<a href="javascript:void(0)" [routerLink]="getLink(p.project_id)">{{
p.name
Expand All @@ -79,70 +46,25 @@
p.creation_time | harborDatetime : 'short'
}}</clr-dg-cell>
<clr-dg-cell>
<div class="permissions">
<clr-dropdown [clrCloseMenuOnItemClick]="false">
<button
[disabled]="coverAll"
class="btn btn-link"
clrDropdownTrigger>
{{ getPermissions(p.permissions[0].access) }}
{{ 'SYSTEM_ROBOT.PERMISSIONS' | translate }}
<clr-icon shape="caret down"></clr-icon>
</button>
<clr-dropdown-menu
[style.height.px]="140"
clrPosition="bottom-left"
*clrIfOpen>
<div>
<button
class="btn btn-link btn-sm select-all-for-dropdown ml-20px"
(click)="
selectAllPermissionOrUnselectAll(
p.permissions[0].access
)
">
<span
*ngIf="isSelectAll(p.permissions[0].access)"
>{{
'SYSTEM_ROBOT.SELECT_ALL' | translate
}}</span
>
<span
*ngIf="
!isSelectAll(p.permissions[0].access)
"
>{{
'SYSTEM_ROBOT.UNSELECT_ALL' | translate
}}</span
>
</button>
</div>
<div
clrDropdownItem
*ngFor="let item of p.permissions[0].access"
(click)="chooseAccess(item)">
<clr-icon
class="check"
shape="check"
[style.visibility]="
item.checked ? 'visible' : 'hidden'
"></clr-icon>
<span
>{{ i18nMap[item.action] | translate }}
{{ i18nMap[item.resource] | translate }}</span
>
</div>
</clr-dropdown-menu>
</clr-dropdown>
</div>
<robot-permissions-panel
[usedInDatagrid]="true"
[mode]="PermissionSelectPanelModes.DROPDOWN"
[(permissionsModel)]="selectedProjectPermissionMap[p.name]"
[candidatePermissions]="robotMetadata?.project">
<button class="btn btn-link btn-sm m-0 p-0">
{{ selectedProjectPermissionMap[p.name]?.length || 0 }}
{{ 'SYSTEM_ROBOT.PERMISSIONS' | translate }}
<clr-icon shape="caret down"></clr-icon>
</button>
</robot-permissions-panel>
</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination
#pagination
[(clrDgPage)]="currentPage"
[clrDgPageSize]="pageSize">
<clr-dg-page-size [clrPageSizeOptions]="[5, 15, 25]">{{
<clr-dg-page-size [clrPageSizeOptions]="[5, 10]">{{
'PAGINATION.PAGE_SIZE' | translate
}}</clr-dg-page-size>
<span
Expand Down
25 changes: 10 additions & 15 deletions ...se/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
.check {
margin-right: 5px;
color: green;
.ml-20px {
margin-left: 20px;
}

.permissions {
height: 16px;
.action-bar {
margin-top: 0;
display: flex;
align-items: center;
}
Expand All @@ -13,16 +12,12 @@
position: inherit;
}

.dropdown-menu {
overflow-y: auto;
}

.dropdown-item {
min-height: 20px;
display: flex;
align-items: center;
:host::ng-deep.datagrid-spinner {
top: 5rem !important;
width: 62% !important;
height: 32% !important;
}

.ml-20px {
margin-left: 20px;
:host::ng-deep.spinner {
left: 14rem !important;
}
6 changes: 1 addition & 5 deletions ...left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ListAllProjectsComponent } from './list-all-projects.component';
import { clone } from '../../../../shared/units/utils';
import { INITIAL_ACCESSES } from '../system-robot-util';
import { Project } from '../../../../../../ng-swagger-gen/models/project';
import { SharedTestingModule } from '../../../../shared/shared.module';

Expand Down Expand Up @@ -30,16 +28,14 @@ describe('ListAllProjectsComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(ListAllProjectsComponent);
component = fixture.componentInstance;
component.defaultAccesses = clone(INITIAL_ACCESSES);
component.cachedAllProjects = [project1, project2, project3];
component.init(false);
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
it('should render list', async () => {
component.projects = [project1, project2, project3];
fixture.detectChanges();
await fixture.whenStable();
const rows = fixture.nativeElement.querySelectorAll('clr-dg-row');
Expand Down
Loading