Merge branch 'development' into hotfix/issue-000/global-improvements

Author: EmmanuelleBonoli

cypress/fixtures/common/userByToken.json

@@ -0,0 +1,5 @@
+{
+  "user": {
+
+  }
+}

src/app/features/activity/pages/activity-details/activity-details.component.html

@@ -13,7 +13,7 @@
       [ngClass]="{
         hidden: nav.chosen === 'Activité' && (screenWidth$ | async) < 1300,
         'show-association': nav.chosen === 'Association' || nav.chosen === 'Activité',
-        'show-messages': nav.chosen === 'Messages'
+        'show-messages': nav.chosen === 'Messages',
       }">
       <div class="navigation">
         @if (nav.tabs.length) {

src/app/features/authentication/store/user.selectors.ts

@@ -30,7 +30,7 @@ export const selectAssociationFounder = createSelector(selectUser, user => (user
 
 export const selectAssociationDescription = createSelector(selectUser, user => (user?.type === UserType.Association ? user.description : ''));
 
-export const selectAssociationStats = createSelector(selectUser, user => (user?.type === UserType.Association ? user.statistics ?? [] : []));
+export const selectAssociationStats = createSelector(selectUser, user => (user?.type === UserType.Association ? (user.statistics ?? []) : []));
 
 export const selectAssociationLogo = createSelector(selectUser, user =>
   user?.type === UserType.Association ? user.associationLogoImage.image : null

src/app/features/profile/components/activity-list/activity-list.component.ts

@@ -54,6 +54,6 @@ export class ActivityListComponent {
   }
 
   showEditButton(activityDate: string | Date): boolean {
-    return new Date(activityDate) > new Date();
+    return activityDate ? new Date(activityDate) > new Date() : true;
   }
 }

src/app/features/profile/components/association/association-activity-menu/association-activity-menu.component.ts

@@ -25,27 +25,11 @@ export class AssociationActivityMenuComponent implements OnInit {
   activities$: Observable<Activity[]> = this._activityFacade.activities$;
   associationId$: Observable<UUIDTypes | null> = this._activityFacade.associationId$;
   chosenNavigation$ = new BehaviorSubject<string>('Futures');
-
-  get filteredActivities$(): Observable<Activity[]> {
-    return combineLatest([this.activities$, this.associationId$, this.chosenNavigation$]).pipe(
-      map(([activities, associationId, chosenNavigation]) => {
-        if (!associationId) return [];
-
-        if (chosenNavigation === 'Futures' || chosenNavigation === 'Passées') {
-          return activities.filter(activity => activity.association.id === associationId && activity.status === ActivityStatusEnum.PUBLISHED);
-        }
-
-        if (chosenNavigation === 'Brouillons') {
-          return activities.filter(activity => activity.association.id === associationId && activity.status === ActivityStatusEnum.DRAFT);
-        }
-
-        return [];
-      })
-    );
-  }
+  filteredActivities$!: Observable<Activity[]>;
 
   ngOnInit(): void {
     this._loadActivitiesForTab(this.chosenNavigation$.value);
+    this._filterActivitiesForTab();
   }
 
   handleTabChange(tab: string): void {
@@ -63,4 +47,19 @@ export class AssociationActivityMenuComponent implements OnInit {
       this._activityFacade.getDraftActivitiesFromApi();
     }
   }
+
+  private _filterActivitiesForTab(): void {
+    this.filteredActivities$ = combineLatest([this.activities$, this.associationId$, this.chosenNavigation$]).pipe(
+      map(([activities, associationId, chosenNavigation]) => {
+        if (!associationId) return [];
+        if (['Futures', 'Passées'].includes(chosenNavigation)) {
+          return activities.filter(activity => activity.association.id === associationId && activity.status === ActivityStatusEnum.PUBLISHED);
+        }
+        if (chosenNavigation === 'Brouillons') {
+          return activities.filter(activity => activity.association.id === associationId && activity.status === ActivityStatusEnum.DRAFT);
+        }
+        return [];
+      })
+    );
+  }
 }