diff --git a/console/src/app/modules/accounts-card/accounts-card.component.ts b/console/src/app/modules/accounts-card/accounts-card.component.ts
index d7860efce9..b8a15ea6c5 100644
--- a/console/src/app/modules/accounts-card/accounts-card.component.ts
+++ b/console/src/app/modules/accounts-card/accounts-card.component.ts
@@ -17,10 +17,7 @@ export class AccountsCardComponent implements OnInit {
@Output() public close: EventEmitter
= new EventEmitter();
public users: UserSessionView.AsObject[] = [];
public loadingUsers: boolean = false;
- constructor(public authService: AuthService, private router: Router, private userService: AuthUserService) { }
-
- public ngOnInit(): void {
- this.loadingUsers = true;
+ constructor(public authService: AuthService, private router: Router, private userService: AuthUserService) {
this.userService.getMyUserSessions().then(sessions => {
this.users = sessions.toObject().userSessionsList;
@@ -33,6 +30,10 @@ export class AccountsCardComponent implements OnInit {
});
}
+ public ngOnInit(): void {
+ this.loadingUsers = true;
+ }
+
public editUserProfile(): void {
this.router.navigate(['user/me']);
this.close.emit();
diff --git a/console/src/app/modules/changes/changes.component.ts b/console/src/app/modules/changes/changes.component.ts
index 55d503df4c..406dbc69e4 100644
--- a/console/src/app/modules/changes/changes.component.ts
+++ b/console/src/app/modules/changes/changes.component.ts
@@ -23,12 +23,10 @@ export class ChangesComponent implements OnInit {
@Input() public sortDirectionAsc: boolean = true;
public bottom: boolean = false;
- // Source data
private _done: BehaviorSubject = new BehaviorSubject(false);
private _loading: BehaviorSubject = new BehaviorSubject(false);
private _data: BehaviorSubject = new BehaviorSubject([]);
- // Observable data
loading: Observable = this._loading.asObservable();
public data!: Observable;
public changes!: Changes.AsObject;
diff --git a/console/src/app/modules/meta-layout/meta-layout.component.ts b/console/src/app/modules/meta-layout/meta-layout.component.ts
index f6a6bf710f..f96b778b75 100644
--- a/console/src/app/modules/meta-layout/meta-layout.component.ts
+++ b/console/src/app/modules/meta-layout/meta-layout.component.ts
@@ -19,6 +19,4 @@ export class MetaLayoutComponent {
.pipe(map(result => {
return result.matches;
}));
-
-
}
diff --git a/console/src/app/modules/project-contributors/project-contributors.component.html b/console/src/app/modules/project-contributors/project-contributors.component.html
index a33ea92402..e4934c6d4d 100644
--- a/console/src/app/modules/project-contributors/project-contributors.component.html
+++ b/console/src/app/modules/project-contributors/project-contributors.component.html
@@ -7,10 +7,8 @@
-
diff --git a/console/src/app/modules/project-contributors/project-contributors.component.scss b/console/src/app/modules/project-contributors/project-contributors.component.scss
index 79b450fb88..75a5859de1 100644
--- a/console/src/app/modules/project-contributors/project-contributors.component.scss
+++ b/console/src/app/modules/project-contributors/project-contributors.component.scss
@@ -30,11 +30,16 @@
align-items: center;
.avatar-circle {
- float: left;
- margin: 0 8px 0 -15px;
- height: 32px;
- width: 32px;
- border-radius: 50%;
+ float: left;
+ margin: 0 8px 0 -15px;
+ height: 32px;
+ width: 32px;
+ border-radius: 50%;
+ &:not(:first-child) {
+ -webkit-box-shadow: -9px 0px 20px -6px rgba(0,0,0,0.75);
+ -moz-box-shadow: -9px 0px 20px -6px rgba(0,0,0,0.75);
+ box-shadow: -9px 0px 20px -6px rgba(0,0,0,0.75);
+ }
}
.add-img {
diff --git a/console/src/app/modules/project-members/project-members.component.ts b/console/src/app/modules/project-members/project-members.component.ts
index 55cb6a9d26..efc10295de 100644
--- a/console/src/app/modules/project-members/project-members.component.ts
+++ b/console/src/app/modules/project-members/project-members.component.ts
@@ -38,7 +38,6 @@ export class ProjectMembersComponent implements AfterViewInit {
private route: ActivatedRoute) {
this.route.data.pipe(take(1)).subscribe(data => {
this.projectType = data.type;
- console.log(data);
this.getRoleOptions();
@@ -156,6 +155,5 @@ export class ProjectMembersComponent implements AfterViewInit {
}).catch(error => {
this.toast.showError(error.message);
});
-
}
}
diff --git a/console/src/app/modules/project-roles/project-roles.module.ts b/console/src/app/modules/project-roles/project-roles.module.ts
index 36914707ec..b1de8f3416 100644
--- a/console/src/app/modules/project-roles/project-roles.module.ts
+++ b/console/src/app/modules/project-roles/project-roles.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDialogModule } from '@angular/material/dialog';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
@@ -28,6 +29,7 @@ import { ProjectRolesComponent } from './project-roles.component';
HasRoleModule,
MatTableModule,
MatPaginatorModule,
+ MatDialogModule,
MatFormFieldModule,
FormsModule,
ReactiveFormsModule,
diff --git a/console/src/app/modules/user-grants/user-grants-datasource.ts b/console/src/app/modules/user-grants/user-grants-datasource.ts
index 3cea1f8e73..9a88fe96a1 100644
--- a/console/src/app/modules/user-grants/user-grants-datasource.ts
+++ b/console/src/app/modules/user-grants/user-grants-datasource.ts
@@ -1,9 +1,21 @@
import { DataSource } from '@angular/cdk/collections';
import { BehaviorSubject, from, Observable, of } from 'rxjs';
import { catchError, finalize, map } from 'rxjs/operators';
-import { UserGrant, UserGrantSearchKey, UserGrantSearchQuery } from 'src/app/proto/generated/management_pb';
+import {
+ UserGrant,
+ UserGrantSearchKey,
+ UserGrantSearchQuery,
+ UserGrantSearchResponse,
+} from 'src/app/proto/generated/management_pb';
import { MgmtUserService } from 'src/app/services/mgmt-user.service';
+export enum UserGrantContext {
+ // AUTHUSER = 'authuser',
+ USER = 'user',
+ OWNED_PROJECT = 'owned',
+ GRANTED_PROJECT = 'granted',
+}
+
export class UserGrantsDataSource extends DataSource {
public totalResult: number = 0;
public grantsSubject: BehaviorSubject = new BehaviorSubject([]);
@@ -14,17 +26,54 @@ export class UserGrantsDataSource extends DataSource {
super();
}
- public loadGrants(filter: UserGrantSearchKey, userId: string, pageIndex: number, pageSize: number): void {
+ public loadGrants(
+ context: UserGrantContext,
+ pageIndex: number,
+ pageSize: number,
+ data: {
+ projectId?: string;
+ grantId?: string;
+ userId?: string;
+ },
+ queries?: UserGrantSearchQuery[],
+ ): void {
const offset = pageIndex * pageSize;
this.loadingSubject.next(true);
- const query = new UserGrantSearchQuery();
- query.setKey(filter);
- query.setValue(userId);
+ switch (context) {
+ case UserGrantContext.USER:
+ if (data && data.userId) {
+ const userfilter = new UserGrantSearchQuery();
+ userfilter.setKey(UserGrantSearchKey.USERGRANTSEARCHKEY_USER_ID);
+ userfilter.setValue(data.userId);
+ if (queries) {
+ queries.push(userfilter);
+ } else {
+ queries = [userfilter];
+ }
- const queries: UserGrantSearchQuery[] = [query];
- from(this.userService.SearchUserGrants(10, 0, queries)).pipe(
+ const promise = this.userService.SearchUserGrants(10, 0, queries);
+ this.loadResponse(promise);
+ }
+ break;
+ case UserGrantContext.OWNED_PROJECT:
+ if (data && data.projectId) {
+ const promise1 = this.userService.SearchProjectUserGrants(data.projectId, 10, 0, queries);
+ this.loadResponse(promise1);
+ }
+ break;
+ case UserGrantContext.GRANTED_PROJECT:
+ if (data && data.grantId) {
+ const promise2 = this.userService.SearchProjectGrantUserGrants(data.grantId, 10, 0, queries);
+ this.loadResponse(promise2);
+ }
+ break;
+ }
+ }
+
+ private loadResponse(promise: Promise): void {
+ from(promise).pipe(
map(resp => {
this.totalResult = resp.toObject().totalResult;
console.log(resp.toObject().resultList);
diff --git a/console/src/app/modules/user-grants/user-grants.component.html b/console/src/app/modules/user-grants/user-grants.component.html
index 6aefd7006c..f3aa5212f0 100644
--- a/console/src/app/modules/user-grants/user-grants.component.html
+++ b/console/src/app/modules/user-grants/user-grants.component.html
@@ -11,11 +11,11 @@