fix: Order users by name (#806)
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
import orderBy from 'lodash/orderBy';
|
||||||
import { attr, fk, many } from 'redux-orm';
|
import { attr, fk, many } from 'redux-orm';
|
||||||
|
|
||||||
import BaseModel from './BaseModel';
|
import BaseModel from './BaseModel';
|
||||||
@@ -218,10 +219,6 @@ export default class extends BaseModel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
getOrderedMembershipsQuerySet() {
|
|
||||||
return this.memberships.orderBy('createdAt');
|
|
||||||
}
|
|
||||||
|
|
||||||
getOrderedLabelsQuerySet() {
|
getOrderedLabelsQuerySet() {
|
||||||
return this.labels.orderBy('position');
|
return this.labels.orderBy('position');
|
||||||
}
|
}
|
||||||
@@ -230,6 +227,12 @@ export default class extends BaseModel {
|
|||||||
return this.lists.orderBy('position');
|
return this.lists.orderBy('position');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getOrderedMembershipsModelArray() {
|
||||||
|
return orderBy(this.memberships.toModelArray(), (boardMembershipModel) =>
|
||||||
|
boardMembershipModel.user.name.toLocaleLowerCase(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
getMembershipModelForUser(userId) {
|
getMembershipModelForUser(userId) {
|
||||||
return this.memberships
|
return this.memberships
|
||||||
.filter({
|
.filter({
|
||||||
|
|||||||
@@ -298,7 +298,7 @@ export default class extends BaseModel {
|
|||||||
static getOrderedUndeletedQuerySet() {
|
static getOrderedUndeletedQuerySet() {
|
||||||
return this.filter({
|
return this.filter({
|
||||||
deletedAt: null,
|
deletedAt: null,
|
||||||
}).orderBy('createdAt');
|
}).orderBy((user) => user.name.toLocaleLowerCase());
|
||||||
}
|
}
|
||||||
|
|
||||||
getOrderedProjectManagersQuerySet() {
|
getOrderedProjectManagersQuerySet() {
|
||||||
|
|||||||
@@ -55,10 +55,7 @@ export const selectMembershipsForCurrentBoard = createSelector(
|
|||||||
return boardModel;
|
return boardModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
return boardModel
|
return boardModel.getOrderedMembershipsModelArray().map((boardMembershipModel) => ({
|
||||||
.getOrderedMembershipsQuerySet()
|
|
||||||
.toModelArray()
|
|
||||||
.map((boardMembershipModel) => ({
|
|
||||||
...boardMembershipModel.ref,
|
...boardMembershipModel.ref,
|
||||||
isPersisted: !isLocalId(boardMembershipModel.id),
|
isPersisted: !isLocalId(boardMembershipModel.id),
|
||||||
user: {
|
user: {
|
||||||
|
|||||||
Reference in New Issue
Block a user