Skip to content

Commit c289cb5

Browse files
fix: TT-617 Order the list of Activities Alfabetically (#851)
Co-authored-by: wilc0519 <[email protected]>
1 parent 3bd5600 commit c289cb5

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/app/modules/activities-management/store/activity-management.selectors.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ const getActivityState = createFeatureSelector<ActivityState>('activities');
66
export const allActivities = createSelector(getActivityState, (state: ActivityState) => state?.data);
77

88
export const allActiveActivities = createSelector(getActivityState, (state: ActivityState) => {
9-
return state?.data.filter((item) => item.status !== 'inactive');
9+
return state?.data.filter((item) => item.status !== 'inactive').sort( (a, b) => {
10+
return (a.name).localeCompare(b.name);
11+
});
1012
});
1113

1214
export const activityIdToEdit = createSelector(getActivityState, (state: ActivityState) => state?.activityIdToEdit);

src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
6161
this.loadActivitiesSubscription = this.actionsSubject$
6262
.pipe(filter((action: any) => action.type === ActivityManagementActionTypes.LOAD_ACTIVITIES_SUCCESS))
6363
.subscribe((action) => {
64-
this.activities = action.payload.filter((item) => item.status !== 'inactive');
64+
this.activities = action.payload.filter((item) => item.status !== 'inactive').sort((a, b) => {
65+
return (a.name).localeCompare(b.name);
66+
});
6567
this.store.dispatch(new LoadActiveEntry());
6668
});
6769

0 commit comments

Comments
 (0)