From f2019a9a40d361bbc4dd8a9d68e24625bfa008e0 Mon Sep 17 00:00:00 2001 From: wilc0519 Date: Thu, 21 Apr 2022 09:43:56 -0500 Subject: [PATCH] fix: TT-617 Order the list of Activities Alfabetically --- .../store/activity-management.selectors.ts | 4 +++- .../components/entry-fields/entry-fields.component.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/modules/activities-management/store/activity-management.selectors.ts b/src/app/modules/activities-management/store/activity-management.selectors.ts index 6c02907d4..cc20dfb9c 100644 --- a/src/app/modules/activities-management/store/activity-management.selectors.ts +++ b/src/app/modules/activities-management/store/activity-management.selectors.ts @@ -6,7 +6,9 @@ const getActivityState = createFeatureSelector('activities'); export const allActivities = createSelector(getActivityState, (state: ActivityState) => state?.data); export const allActiveActivities = createSelector(getActivityState, (state: ActivityState) => { - return state?.data.filter((item) => item.status !== 'inactive'); + return state?.data.filter((item) => item.status !== 'inactive').sort( (a, b) => { + return (a.name).localeCompare(b.name); + }); }); export const activityIdToEdit = createSelector(getActivityState, (state: ActivityState) => state?.activityIdToEdit); diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts index 8501cdf81..fd7530868 100644 --- a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts +++ b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts @@ -61,7 +61,9 @@ export class EntryFieldsComponent implements OnInit, OnDestroy { this.loadActivitiesSubscription = this.actionsSubject$ .pipe(filter((action: any) => action.type === ActivityManagementActionTypes.LOAD_ACTIVITIES_SUCCESS)) .subscribe((action) => { - this.activities = action.payload.filter((item) => item.status !== 'inactive'); + this.activities = action.payload.filter((item) => item.status !== 'inactive').sort((a, b) => { + return (a.name).localeCompare(b.name); + }); this.store.dispatch(new LoadActiveEntry()); });