fix(console): general fixes, project grants for owned and granted context (#425)

* update and delete project grants

* fix: user grant id (#421)

* fix: verboser logging on sql err (#412)

* fix(eventstore): improve insert statement

* fix: verbose logging on error

* fix: simplify insertEvents

* fix: project grant delete (#417)

* fix: add grant id to user grant if needed

* fix: add grant id to user grant if needed

Co-authored-by: Silvan <[email protected]>

* fix user grant context

* lint

* role validators

* fix: usergrantid (#424)

* fix: verboser logging on sql err (#412)

* fix(eventstore): improve insert statement

* fix: verbose logging on error

* fix: simplify insertEvents

* fix: project grant delete (#417)

* fix: add grant id to user grant if needed

* fix: add grant id to user grant if needed

* fix: add bulk remove

* fix: merge

Co-authored-by: Silvan <[email protected]>

Co-authored-by: Fabi <[email protected]>
Co-authored-by: Silvan <[email protected]>

console/src/app/modules/user-grants/user-grants-datasource.ts

@@ -82,6 +82,7 @@ export class UserGrantsDataSource extends DataSource<UserGrant.AsObject> {
             catchError(() => of([])),
             finalize(() => this.loadingSubject.next(false)),
         ).subscribe(grants => {
+            console.log(grants);
             this.grantsSubject.next(grants);
         });
     }

console/src/app/modules/user-grants/user-grants.component.html

@@ -14,8 +14,8 @@
         (click)="deleteGrantSelection()" *ngIf="selection.hasValue() && allowDelete">
         <i class="las la-trash"></i>
     </button>
-    <a *ngIf="allowCreate" matTooltip="{{'GRANTS.ADD' | translate}}" color="primary" class="add-button" color="primary"
-        mat-raised-button [routerLink]="routerLink">
+    <a *ngIf="allowCreate && context !== UserGrantContext.USER" matTooltip="{{'GRANTS.ADD' | translate}}"
+        color="primary" class="add-button" color="primary" mat-raised-button [routerLink]="routerLink">
         <mat-icon class="icon">add</mat-icon>{{ 'GRANTS.ADD_BTN' | translate }}
     </a>
 </div>
@@ -78,21 +78,61 @@
         <ng-container matColumnDef="roleNamesList">
             <th mat-header-cell *matHeaderCellDef> {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }} </th>
             <td mat-cell *matCellDef="let grant; let i = index">
-                <ng-container *ngIf="loadedProjectId !== grant.projectId">
-                    <span class="role app-label" *ngFor="let role of grant.roleKeysList">{{role}}</span>
-                    <button mat-icon-button (click)="loadRoleOptions(grant.projectId)">
-                        <i class="las la-edit"></i>
-                    </button>
+                <ng-container *ngIf="context === UserGrantContext.USER">
+                    <span class="no-roles"
+                        *ngIf="grant.roleKeysList?.length === 0">{{'PROJECT.GRANT.NOROLES' | translate}}</span>
+                    <span *ngFor="let role of grant.roleKeysList">{{role}}</span>
+                </ng-container>
+
+                <!-- <ng-container *ngIf="context === UserGrantContext.USER">
+                    <ng-container *ngIf="loadedGrantId !== grant.grantId">
+                        <span class="role app-label" *ngFor="let role of grant.roleKeysList">{{role}}</span>
+                        <button mat-icon-button (click)="getGrantRoleOptions(grant.grantId, grant.projectId)"
+                            matTooltip="{{'ACTIONS.CHANGE' | translate}}">
+                            <i class="las la-edit"></i>
+                        </button>
+                    </ng-container>
+                    <mat-form-field class="form-field" appearance="outline" *ngIf="loadedGrantId === grant.grantId">
+                        <mat-label>{{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}</mat-label>
+                        <mat-select [(ngModel)]="grant.roleKeysList" multiple [disabled]="allowCreate == false"
+                            (selectionChange)="updateRoles(grant, $event)">
+                            <mat-option *ngFor="let role of grantRoleOptions" [value]="role">
+                                {{role}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                </ng-container> -->
+
+                <ng-container *ngIf="context === UserGrantContext.OWNED_PROJECT">
+                    <ng-container *ngIf="loadedProjectId !== grant.projectId">
+                        <span class="role app-label" *ngFor="let role of grant.roleKeysList">{{role}}</span>
+                        <button mat-icon-button (click)="getProjectRoleOptions(grant.projectId)"
+                            matTooltip="{{'ACTIONS.CHANGE' | translate}}">
+                            <i class="las la-edit"></i>
+                        </button>
+                    </ng-container>
+                    <mat-form-field class="form-field" appearance="outline" *ngIf="loadedProjectId === grant.projectId">
+                        <mat-label>{{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}</mat-label>
+                        <mat-select [(ngModel)]="grant.roleKeysList" multiple [disabled]="allowCreate == false"
+                            (selectionChange)="updateRoles(grant, $event)">
+                            <mat-option *ngFor="let role of projectRoleOptions" [value]="role.key">
+                                {{role.key}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                </ng-container>
+
+                <ng-container *ngIf="context === UserGrantContext.GRANTED_PROJECT">
+                    <mat-form-field class="form-field" appearance="outline">
+                        <mat-label>{{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}</mat-label>
+                        <mat-select [(ngModel)]="grant.roleKeysList" multiple [disabled]="allowCreate == false"
+                            (selectionChange)="updateRoles(grant, $event)">
+                            <mat-option *ngFor="let role of grantRoleOptions" [value]="role">
+                                {{role}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field>
                 </ng-container>
-                <mat-form-field class="form-field" appearance="outline" *ngIf="loadedProjectId === grant.projectId">
-                    <mat-label>{{ 'PROJECT.GRANT.TITLE' | translate }}</mat-label>
-                    <mat-select [(ngModel)]="grant.roleKeysList" multiple [disabled]="allowCreate == false"
-                        (selectionChange)="updateRoles(grant, $event)">
-                        <mat-option *ngFor="let role of roleOptions" [value]="role.key">
-                            {{role.key}}
-                        </mat-option>
-                    </mat-select>
-                </mat-form-field>
             </td>
         </ng-container>
 

console/src/app/modules/user-grants/user-grants.component.scss

@@ -70,4 +70,9 @@
 .pointer {
     outline: none;
     cursor: pointer;
+}
+
+.no-roles {
+    font-size: 14px;
+    color: #8795a1;
 }

console/src/app/modules/user-grants/user-grants.component.ts

@@ -34,10 +34,15 @@ export class UserGrantsComponent implements OnInit, AfterViewInit {
     @Input() projectId: string = '';
     @Input() grantId: string = '';
 
-    public roleOptions: ProjectRoleView.AsObject[] = [];
+    public grantRoleOptions: string[] = [];
+    public projectRoleOptions: ProjectRoleView.AsObject[] = [];
     public routerLink: any = [''];
 
+    public loadedGrantId: string = '';
     public loadedProjectId: string = '';
+
+    public UserGrantContext: any = UserGrantContext;
+
     constructor(
         private userService: MgmtUserService,
         private projectService: ProjectService,
@@ -50,6 +55,7 @@ export class UserGrantsComponent implements OnInit, AfterViewInit {
         'projectId', 'creationDate', 'changeDate', 'roleNamesList'];
 
     public ngOnInit(): void {
+        console.log(this.context);
         this.dataSource = new UserGrantsDataSource(this.userService);
         const data = {
             projectId: this.projectId,
@@ -60,13 +66,14 @@ export class UserGrantsComponent implements OnInit, AfterViewInit {
         switch (this.context) {
             case UserGrantContext.OWNED_PROJECT:
                 if (this.projectId) {
-                    this.getRoleOptions(this.projectId);
+                    this.getProjectRoleOptions(this.projectId);
                     this.routerLink = ['/grant-create', 'project', this.projectId];
                 }
                 break;
             case UserGrantContext.GRANTED_PROJECT:
                 if (data && data.grantId) {
                     this.routerLink = ['/grant-create', 'project', this.projectId, 'grant', this.grantId];
+                    this.getGrantRoleOptions(this.grantId, this.projectId);
                 }
                 break;
             case UserGrantContext.USER:
@@ -112,26 +119,49 @@ export class UserGrantsComponent implements OnInit, AfterViewInit {
             this.dataSource.grantsSubject.value.forEach(row => this.selection.select(row));
     }
 
-    public loadRoleOptions(projectId: string): void {
-        if (this.context === UserGrantContext.USER) {
-            this.getRoleOptions(projectId);
-        }
+    public getGrantRoleOptions(grantId: string, projectId: string): void {
+        console.log(grantId, projectId);
+
+        this.projectService.GetGrantedProjectByID(projectId, grantId).then(resp => {
+            this.loadedGrantId = projectId;
+            this.grantRoleOptions = resp.toObject().roleKeysList;
+        }).catch(error => {
+            this.toast.showError(error);
+        });
     }
 
-    public getRoleOptions(projectId: string): void {
+    public getProjectRoleOptions(projectId: string): void {
+        console.log(projectId);
         this.projectService.SearchProjectRoles(projectId, 100, 0).then(resp => {
             this.loadedProjectId = projectId;
-            this.roleOptions = resp.toObject().resultList;
+            this.projectRoleOptions = resp.toObject().resultList;
         });
     }
 
     updateRoles(grant: UserGrant.AsObject, selectionChange: MatSelectChange): void {
-        this.userService.UpdateUserGrant(grant.id, grant.userId, selectionChange.value)
-            .then(() => {
-                this.toast.showInfo('GRANTS.TOAST.UPDATED', true);
-            }).catch(error => {
-                this.toast.showError(error);
-            });
+        switch (this.context) {
+            case UserGrantContext.OWNED_PROJECT:
+                if (grant.id && grant.projectId) {
+                    this.userService.UpdateProjectUserGrant(grant.id, grant.projectId, grant.userId, selectionChange.value)
+                        .then(() => {
+                            this.toast.showInfo('GRANTS.TOAST.UPDATED', true);
+                        }).catch(error => {
+                            this.toast.showError(error);
+                        });
+                }
+                break;
+            case UserGrantContext.GRANTED_PROJECT:
+                if (this.grantId && this.projectId) {
+                    this.userService.updateProjectGrantUserGrant(grant.id,
+                        this.grantId, grant.userId, selectionChange.value)
+                        .then(() => {
+                            this.toast.showInfo('GRANTS.TOAST.UPDATED', true);
+                        }).catch(error => {
+                            this.toast.showError(error);
+                        });
+                }
+                break;
+        }
     }
 
     deleteGrantSelection(): void {