Merge remote-tracking branch 'origin/main'

softwaremagico · Jun 20, 2024 · 58c9216 · 58c9216
2 parents ae3acef + 0a6ae00
commit 58c9216
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
 [![GitHub last commit](https://img.shields.io/github/last-commit/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
 [![CircleCI](https://circleci.com/gh/softwaremagico/KendoTournamentManager.svg?style=shield)](https://circleci.com/gh/softwaremagico/KendoTournamentManager)
-[![Time](https://img.shields.io/badge/development-636.5h-blueviolet.svg)]()
+[![Time](https://img.shields.io/badge/development-637.5h-blueviolet.svg)]()
 
 [![Powered by](https://img.shields.io/badge/powered%20by%20java-orange.svg?logo=OpenJDK&logoColor=white)]()
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=kendo-tournament-backend&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=kendo-tournament-backend)

diff --git a/...kendo-tournament-rest/src/main/java/com/softwaremagico/kt/rest/services/DuelServices.java b/...kendo-tournament-rest/src/main/java/com/softwaremagico/kt/rest/services/DuelServices.java
@@ -80,7 +80,7 @@ public List<DuelDTO> getUntiesFromTournament(@Parameter(description = "Id of the
     }
 
 
-    @PreAuthorize("hasAnyRole('ROLE_VIEWER', 'ROLE_EDITOR', 'ROLE_ADMIN')")
+    @PreAuthorize("hasAnyRole('ROLE_VIEWER', 'ROLE_EDITOR', 'ROLE_ADMIN', 'ROLE_PARTICIPANT')")
     @Operation(summary = "Gets all untie duel where one participant is involved.", security = @SecurityRequirement(name = "bearerAuth"))
     @GetMapping(value = "/participant/{participantId}/unties", produces = MediaType.APPLICATION_JSON_VALUE)
     public List<DuelDTO> getUntiesFromParticipant(@Parameter(description = "Id of the participant.", required = true)

diff --git a/...endo-tournament-rest/src/main/java/com/softwaremagico/kt/rest/services/FightServices.java b/...endo-tournament-rest/src/main/java/com/softwaremagico/kt/rest/services/FightServices.java
@@ -176,7 +176,7 @@ public List<FightDTO> createNext(@Parameter(description = "Id of an existing tou
     }
 
 
-    @PreAuthorize("hasAnyRole('ROLE_VIEWER', 'ROLE_EDITOR', 'ROLE_ADMIN')")
+    @PreAuthorize("hasAnyRole('ROLE_VIEWER', 'ROLE_EDITOR', 'ROLE_ADMIN', 'ROLE_PARTICIPANT')")
     @Operation(summary = "Gets all fights from competitor.", security = @SecurityRequirement(name = "bearerAuth"))
     @GetMapping(value = "/competitor/{competitorId}", produces = MediaType.APPLICATION_JSON_VALUE)
     public List<FightDTO> getByCompetitor(@Parameter(description = "Id of the competitor.", required = true)

diff --git a/frontend/src/app/interceptors/logged-in.service.ts b/frontend/src/app/interceptors/logged-in.service.ts
@@ -38,28 +38,12 @@ export class LoggedInService {
   userLoginPageDependingOnRoles(context: string, params: string): boolean {
     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']);
-        }
-      });
       return true;
     }
     return this.whiteListedPages.includes(context);

diff --git a/frontend/src/app/services/login.service.ts b/frontend/src/app/services/login.service.ts
@@ -80,6 +80,8 @@ export class LoginService {
       next: (authenticatedUser: AuthenticatedUser): void => {
         this.setAuthenticatedUser(authenticatedUser, callback);
         localStorage.setItem('account', 'guest');
+        debugger
+        localStorage.setItem('tournamentId', tournamentId + "");
       },
       error: (): void => {
         this.router.navigate(["/"]);

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/fight-list/fight-list.component.ts b/frontend/src/app/views/fight-list/fight-list.component.ts
@@ -106,6 +106,10 @@ export class FightListComponent extends RbacBasedComponent implements OnInit, On
     } else {
       //Gets tournament from URL parameter (from QR codes).
       this.tournamentId = Number(this.activatedRoute.snapshot.queryParamMap.get('tournamentId'));
+      if (!this.tournamentId) {
+        this.tournamentId = Number(localStorage.getItem('tournamentId'));
+        debugger
+      }
       if (!this.tournamentId || isNaN(this.tournamentId)) {
         this.goBackToTournament();
       }

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;
 }