Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-19 05:09:43 +02:00
Code Issues Releases Activity

fix: Order users by name (#806)

Browse source
This commit is contained in:
Emmanuel Guyot 2024-07-15 15:26:26 +02:00 • committed by GitHub
parent 6052f8999f
commit ea94fe8bf3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/models/Board.js
View file

@ -1,3 +1,4 @@
import orderBy from 'lodash/orderBy';
import { attr, fk, many } from 'redux-orm';
import BaseModel from './BaseModel';
@ -218,10 +219,6 @@ export default class extends BaseModel {
}
}
getOrderedMembershipsQuerySet() {
return this.memberships.orderBy('createdAt');
}
getOrderedLabelsQuerySet() {
return this.labels.orderBy('position');
}
@ -230,6 +227,12 @@ export default class extends BaseModel {
return this.lists.orderBy('position');
}
getOrderedMembershipsModelArray() {
return orderBy(this.memberships.toModelArray(), (boardMembershipModel) =>
boardMembershipModel.user.name.toLocaleLowerCase(),
);
}
getMembershipModelForUser(userId) {
return this.memberships
.filter({

2
client/src/models/User.js
View file

@ -298,7 +298,7 @@ export default class extends BaseModel {
static getOrderedUndeletedQuerySet() {
return this.filter({
deletedAt: null,
}).orderBy('createdAt');
}).orderBy((user) => user.name.toLocaleLowerCase());
}
getOrderedProjectManagersQuerySet() {

19
client/src/selectors/boards.js
View file

@ -55,17 +55,14 @@ export const selectMembershipsForCurrentBoard = createSelector(
return boardModel;
}
return boardModel
.getOrderedMembershipsQuerySet()
.toModelArray()
.map((boardMembershipModel) => ({
...boardMembershipModel.ref,
isPersisted: !isLocalId(boardMembershipModel.id),
user: {
...boardMembershipModel.user.ref,
isCurrent: boardMembershipModel.user.id === currentUserId,
},
}));
return boardModel.getOrderedMembershipsModelArray().map((boardMembershipModel) => ({
...boardMembershipModel.ref,
isPersisted: !isLocalId(boardMembershipModel.id),
user: {
...boardMembershipModel.user.ref,
isCurrent: boardMembershipModel.user.id === currentUserId,
},
}));
},
);