fix(club): show the active club

Badminton-Apps · Jul 31, 2024 · 63f5435 · 63f5435
1 parent cdb94f4
commit 63f5435
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/libs/frontend/components/src/player-search/player-search.component.html b/libs/frontend/components/src/player-search/player-search.component.html
@@ -62,10 +62,8 @@
               @if (option.memberId) {
                 <small class="member-id">({{ option.memberId }}) </small>
               }
-              @if (
-                option.clubs && option.clubs.length > 0 && option.clubs[0].id !== this.clubId()
-              ) {
-                <small>{{ option.clubs[0].name }}</small>
+              @if (option.club && option.club.id !== this.clubId()) {
+                <small>{{ option.club.name }}</small>
               }
               @if (validation.message) {
                 <div class="invalid-player">

diff --git a/libs/frontend/components/src/player-search/player-search.component.ts b/libs/frontend/components/src/player-search/player-search.component.ts
@@ -156,6 +156,8 @@ export class PlayerSearchComponent implements OnChanges, OnInit {
                         clubMembership {
                           id
                           membershipType
+                          active
+                          confirmed
                         }
                       }
                     }
@@ -206,6 +208,8 @@ export class PlayerSearchComponent implements OnChanges, OnInit {
                         clubMembership {
                           id
                           membershipType
+                          active
+                          confirmed
                         }
                       }
                     }

diff --git a/libs/frontend/components/src/roles/edit-role/edit-role.component.ts b/libs/frontend/components/src/roles/edit-role/edit-role.component.ts
@@ -72,7 +72,6 @@ export class EditRoleComponent implements OnInit {
   private dialog = inject(MatDialog);
 
   roleId = input.required<string>();
-
   type = input.required<SecurityType[] | SecurityType>();
 
   role?: Signal<Role | undefined>;