- | {{ 'PROJECT.MEMBER.ROLES' | translate }} |
+ {{ 'ROLESLABEL' | translate }} |
- {{ 'PROJECT.GRANT.TITLE' | translate }}
+ {{ 'ROLESLABEL' | translate }}
- {{ 'ROLES.'+role | translate }}
+ {{ role }}
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 057d3c0b60..0a71120d83 100644
--- a/console/src/app/modules/project-members/project-members.component.ts
+++ b/console/src/app/modules/project-members/project-members.component.ts
@@ -122,7 +122,6 @@ export class ProjectMembersComponent {
const dialogRef = this.dialog.open(MemberCreateDialogComponent, {
data: {
creationType: CreationType.PROJECT_OWNED,
- projectId: this.project.projectId,
},
width: '400px',
});
diff --git a/console/src/app/modules/project-roles/project-roles-datasource.ts b/console/src/app/modules/project-roles/project-roles-datasource.ts
index 5abf5e1540..4938398a61 100644
--- a/console/src/app/modules/project-roles/project-roles-datasource.ts
+++ b/console/src/app/modules/project-roles/project-roles-datasource.ts
@@ -1,4 +1,5 @@
import { DataSource } from '@angular/cdk/collections';
+import { Timestamp } from 'google-protobuf/google/protobuf/timestamp_pb';
import { BehaviorSubject, from, Observable, of } from 'rxjs';
import { catchError, finalize, map } from 'rxjs/operators';
import { ProjectRole } from 'src/app/proto/generated/management_pb';
@@ -11,6 +12,8 @@ import { ProjectService } from 'src/app/services/project.service';
*/
export class ProjectRolesDataSource extends DataSource {
public totalResult: number = 0;
+ public viewTimestamp!: Timestamp.AsObject;
+
public rolesSubject: BehaviorSubject = new BehaviorSubject([]);
private loadingSubject: BehaviorSubject = new BehaviorSubject(false);
public loading$: Observable = this.loadingSubject.asObservable();
@@ -25,7 +28,11 @@ export class ProjectRolesDataSource extends DataSource {
this.loadingSubject.next(true);
from(this.projectService.SearchProjectRoles(projectId, pageSize, offset)).pipe(
map(resp => {
- this.totalResult = resp.toObject().totalResult;
+ const response = resp.toObject();
+ this.totalResult = response.totalResult;
+ if (response.viewTimestamp) {
+ this.viewTimestamp = response.viewTimestamp;
+ }
return resp.toObject().resultList;
}),
catchError(() => of([])),
diff --git a/console/src/app/modules/project-roles/project-roles.component.html b/console/src/app/modules/project-roles/project-roles.component.html
index 7e738d6c8c..e5895ddda8 100644
--- a/console/src/app/modules/project-roles/project-roles.component.html
+++ b/console/src/app/modules/project-roles/project-roles.component.html
@@ -1,5 +1,5 @@
-
+
| 
+ src="../assets/images/zitadel-logo-light.svg" />
+ 