mirror of
https://github.com/plankanban/planka.git
synced 2025-08-09 23:45:31 +02:00
fix: Fixed bug - wrong card placement after creation, cleanup
This commit is contained in:
parent
c235c45f61
commit
66a14a76b1
4 changed files with 11 additions and 8 deletions
|
@ -12,7 +12,7 @@ const makeMapStateToProps = () => {
|
||||||
|
|
||||||
return (state, { id, index }) => {
|
return (state, { id, index }) => {
|
||||||
const { name, isPersisted } = selectListById(state, id);
|
const { name, isPersisted } = selectListById(state, id);
|
||||||
const [cardIds, cardIdsFull, isFiltered] = selectCardIdsByListId(state, id);
|
const { cardIds, cardIdsFull, isFiltered } = selectCardIdsByListId(state, id);
|
||||||
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
const isCurrentUserEditor =
|
const isCurrentUserEditor =
|
||||||
|
|
|
@ -91,6 +91,7 @@ export default class extends BaseModel {
|
||||||
const filterUserIds = this.board.filterUsers.toRefArray().map((user) => user.id);
|
const filterUserIds = this.board.filterUsers.toRefArray().map((user) => user.id);
|
||||||
const filterLabelIds = this.board.filterLabels.toRefArray().map((label) => label.id);
|
const filterLabelIds = this.board.filterLabels.toRefArray().map((label) => label.id);
|
||||||
let isFiltered = false;
|
let isFiltered = false;
|
||||||
|
|
||||||
if (filterUserIds.length > 0) {
|
if (filterUserIds.length > 0) {
|
||||||
cardModels = cardModels.filter((cardModel) => {
|
cardModels = cardModels.filter((cardModel) => {
|
||||||
const users = cardModel.users.toRefArray();
|
const users = cardModel.users.toRefArray();
|
||||||
|
@ -107,7 +108,7 @@ export default class extends BaseModel {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return [cardModels, cardModelsFull, isFiltered];
|
return { cardModels, cardModelsFull, isFiltered };
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteRelated() {
|
deleteRelated() {
|
||||||
|
|
|
@ -93,7 +93,8 @@ export const selectNextCardPosition = createSelector(
|
||||||
return listModel;
|
return listModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
return nextPosition(listModel.getFilteredOrderedCardsModelArray(), index, excludedId);
|
// eslint-disable-next-line prettier/prettier
|
||||||
|
return nextPosition(listModel.getFilteredOrderedCardsModelArray().cardModels, index, excludedId);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -33,12 +33,13 @@ export const makeSelectCardIdsByListId = () =>
|
||||||
if (!listModel) {
|
if (!listModel) {
|
||||||
return listModel;
|
return listModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
const cardsModelArray = listModel.getFilteredOrderedCardsModelArray();
|
const cardsModelArray = listModel.getFilteredOrderedCardsModelArray();
|
||||||
return [
|
return {
|
||||||
cardsModelArray[0].map((cardModel) => cardModel.id),
|
cardIds: cardsModelArray.cardModels.map((cardModel) => cardModel.id),
|
||||||
cardsModelArray[1].map((cardModel) => cardModel.id),
|
cardIdsFull: cardsModelArray.cardModelsFull.map((cardModel) => cardModel.id),
|
||||||
cardsModelArray[2],
|
isFiltered: cardsModelArray.isFiltered,
|
||||||
];
|
};
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue