Participant can see its own fights

softwaremagico · Jun 20, 2024 · cdae4d6 · cdae4d6
1 parent ae3acef
commit cdae4d6
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 26 deletions.
diff --git a/frontend/src/app/interceptors/logged-in.service.ts b/frontend/src/app/interceptors/logged-in.service.ts
@@ -36,30 +36,32 @@ export class LoggedInService {
   }
 
   userLoginPageDependingOnRoles(context: string, params: string): boolean {
+    debugger
     if (this.loginService.getJwtValue()) {
       //Participant users must redirect to their statistcs.
-      if (localStorage.getItem('account') == 'participant' && !context.startsWith('/participants/statistics')) {
+      if (localStorage.getItem('account') == 'participant'
+        && (!context.startsWith('/participants/statistics') && !context.startsWith('/participants/fights'))) {
         this.router.navigate(['/participants/statistics']);
       } else if (localStorage.getItem('account') == 'guest' && !context.startsWith('/tournaments/fights')) {
         this.router.navigate(['/tournaments/fights']);
       }
-      this.loginService.getUserRoles().subscribe((_roles: String[]): void => {
-        if (_roles.includes("viewer") || _roles.includes("editor") || _roles.includes("admin")) {
-          // Do nothing and navigate as usual.
-        } else if (_roles.includes("guest")) {
-          //Gets last tournament and redirects to fight list.
-          this.tournamentService.getLastUnlockedTournament().subscribe((_tournament: Tournament): void => {
-            //Path '/tournaments/fights' and '/fights/championship' does not call  LoggedInService to avoid redirect loops.
-            if (_tournament) {
-              this.router.navigate(['/tournaments/fights'], {state: {tournamentId: _tournament.id}});
-            } else {
-              this.router.navigate(['/login']);
-            }
-          });
-        } else if (_roles.includes("participant")) {
-          this.router.navigate(['/participants/statistics']);
-        }
-      });
+      // this.loginService.getUserRoles().subscribe((_roles: String[]): void => {
+      //   if (_roles.includes("viewer") || _roles.includes("editor") || _roles.includes("admin")) {
+      //     // Do nothing and navigate as usual.
+      //   } else if (_roles.includes("guest")) {
+      //     //Gets last tournament and redirects to fight list.
+      //     this.tournamentService.getLastUnlockedTournament().subscribe((_tournament: Tournament): void => {
+      //       //Path '/tournaments/fights' and '/fights/championship' does not call  LoggedInService to avoid redirect loops.
+      //       if (_tournament) {
+      //         this.router.navigate(['/tournaments/fights'], {state: {tournamentId: _tournament.id}});
+      //       } else {
+      //         this.router.navigate(['/login']);
+      //       }
+      //     });
+      //   } else if (_roles.includes("participant")) {
+      //     this.router.navigate(['/participants/statistics']);
+      //   }
+      // });
       return true;
     }
     return this.whiteListedPages.includes(context);

diff --git a/frontend/src/app/services/rbac/activity.service.ts b/frontend/src/app/services/rbac/activity.service.ts
@@ -106,7 +106,9 @@ export class ActivityService {
       RbacActivity.CHECK_TOURNAMENT_BRACKETS,
       RbacActivity.READ_TEAMS_RANKINGS,
       RbacActivity.READ_COMPETITORS_RANKINGS,
-      RbacActivity.CAN_LOGOUT
+      RbacActivity.CAN_LOGOUT,
+      RbacActivity.VIEW_PARTICIPANT_FIGHTS,
+      RbacActivity.VIEW_PARTICIPANT_STATISTICS
     ];
   }
 

diff --git a/frontend/src/app/services/rbac/rbac.activity.ts b/frontend/src/app/services/rbac/rbac.activity.ts
@@ -27,6 +27,7 @@ export enum RbacActivity {
   UPLOAD_TOURNAMENT_ACCREDITATION = 'UPLOAD_TOURNAMENT_ACCREDITATION',
   UPLOAD_TOURNAMENT_PHOTO = 'UPLOAD_TOURNAMENT_PHOTO',
   VIEW_TOURNAMENT_STATISTICS = 'VIEW_TOURNAMENT_STATISTICS',
+  VIEW_PARTICIPANT_STATISTICS = 'VIEW_PARTICIPANT_STATISTICS',
   VIEW_PARTICIPANT_FIGHTS = 'VIEW_PARTICIPANT_FIGHTS',
 
   READ_ALL_ROLES = 'READ_ALL_ROLES',

diff --git a/frontend/src/app/views/participant-fight-list/participant-fight-list.component.html b/frontend/src/app/views/participant-fight-list/participant-fight-list.component.html
@@ -3,8 +3,8 @@
   <div class="fights-table">
     <div class="upper-menu">
       <div class="cell">
-        <button (click)="goBackToUsers()"
-                *ngIf="(RbacActivity.READ_ALL_TOURNAMENTS | rbac : this.rbacService.getActivities())"
+        <button (click)="goBackToStatistics()"
+                *ngIf="(RbacActivity.VIEW_PARTICIPANT_STATISTICS | rbac : this.rbacService.getActivities())"
                 [matTooltipShowDelay]="500"
                 mat-button
                 matTooltip="{{'back' | translate}}">

diff --git a/frontend/src/app/views/participant-fight-list/participant-fight-list.component.ts b/frontend/src/app/views/participant-fight-list/participant-fight-list.component.ts
@@ -43,20 +43,20 @@ export class ParticipantFightListComponent extends RbacBasedComponent implements
       if (state['participantId'] && !isNaN(Number(state['participantId']))) {
         this.participantId = Number(state['participantId']);
       } else {
-        this.goBackToUsers();
+        this.goBackToStatistics();
       }
     }
   }
 
-  goBackToUsers(): void {
+  goBackToStatistics(): void {
     this.router.navigate(['/participants/statistics'], {state: {participantId: this.participantId}});
   }
 
   ngOnInit(): void {
     if (this.participantId) {
       this.initializeData();
     } else {
-      this.goBackToUsers();
+      this.goBackToStatistics();
     }
   }
 

diff --git a/frontend/src/app/views/participant-list/participant-list.component.html b/frontend/src/app/views/participant-list/participant-list.component.html
@@ -26,7 +26,7 @@
     <basic-table [basicTableData]="basicTableData" [disableRow]="disableRow"></basic-table>
     <div class="bottom-menu">
       <button (click)="openStatistics()"
-              *ngIf="(RbacActivity.VIEW_TOURNAMENT_STATISTICS | rbac : this.rbacService.getActivities())"
+              *ngIf="(RbacActivity.VIEW_PARTICIPANT_STATISTICS | rbac : this.rbacService.getActivities())"
               [disabled]="!basicTableData.selectedElement" [matTooltipShowDelay]="500"
               color="primary" mat-button
               matTooltip="{{'titleStatistics' | translate}}">

diff --git a/frontend/src/app/views/participant-statistics/participant-statistics.component.scss b/frontend/src/app/views/participant-statistics/participant-statistics.component.scss
@@ -123,7 +123,7 @@
 
 app-achievement-wall {
   margin-top: 10px;
-  width: 270px;
+  width: 275px;
   height: 245px;
 }