Skip to content

Fix #5732 list insert position #5766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix #5732 list insert position #5766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0202c81
Fix: correctly insert new list after specified list using sort index
nourguidara May 12, 2025
4826da0
fix add after list
nourguidara May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 42 additions & 26 deletions client/components/swimlanes/swimlanes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,36 +250,52 @@ BlazeComponent.extendComponent({
return [
{
submit(evt) {
evt.preventDefault();
const lastList = this.currentBoard.getLastList();
const titleInput = this.find('.list-name-input');
const title = titleInput.value.trim();
let sortIndex = 0
if (lastList) {
const positionInput = this.find('.list-position-input');
evt.preventDefault();
const titleInput = this.find('.list-name-input');
const title = titleInput?.value.trim();
const positionInput = this.find('.list-position-input');

let sortIndex = 0;

if (title) {
const currentBoardId = Utils.getCurrentBoardId();

if (positionInput) {
const position = positionInput.value.trim();
const ret = ReactiveCache.getList({ boardId: Utils.getCurrentBoardId(), _id: position, archived: false })
sortIndex = parseInt(JSON.stringify(ret['sort']))
sortIndex = sortIndex+1
const prevList = Lists.findOne({ _id: position, boardId: currentBoardId, archived: false });
const nextList = Lists.findOne({
boardId: currentBoardId,
archived: false,
sort: { $gt: prevList?.sort },
}, { sort: { sort: 1 } });

if (prevList) {
sortIndex = Utils.calculateIndexData(prevList, nextList).base;
} else {
const lastList = Lists.findOne({ boardId: currentBoardId }, { sort: { sort: -1 } });
sortIndex = lastList ? lastList.sort + 1 : 0;
}
} else {
sortIndex = Utils.calculateIndexData(lastList, null).base;
const lastList = Lists.findOne({ boardId: currentBoardId }, { sort: { sort: -1 } });
sortIndex = lastList ? lastList.sort + 1 : 0;
}

if (title) {
Lists.insert({
title,
boardId: Session.get('currentBoard'),
sort: sortIndex,
type: this.isListTemplatesSwimlane ? 'template-list' : 'list',
swimlaneId: this.currentBoard.isTemplatesBoard()
? this.currentSwimlane._id
: '',
});

titleInput.value = '';
titleInput.focus();
}
},
Lists.insert({
title,
boardId: currentBoardId,
sort: sortIndex,
type: this.isListTemplatesSwimlane ? 'template-list' : 'list',
swimlaneId: this.currentBoard.isTemplatesBoard()
? this.currentSwimlane._id
: '',
});

titleInput.value = '';
titleInput.focus();
}
}

,
'click .js-list-template': Popup.open('searchElement'),
},
];
Expand Down
Loading