Merge pull request #1683 from symonbaikov/feat/negative-label-filter

Add negative label filtering for cards

Two conflicts, both from work that landed while this branch was open.

In the endless list query, master had added an ORDER BY so the cursor and the
limit agree. The exclusion clause belongs in the WHERE part, so it is placed
before it rather than after; the other way round the statement does not parse.

The label item had been restructured here for the tri-state filter and had
gained a tooltip on master. The restructured version is kept and the tooltip
put back on top of it, which also brings back the translation hook this branch
had dropped.
This commit is contained in:
Daniel Hiller
2026-09-17 00:46:31 +02:00
23 changed files with 641 additions and 238 deletions
+25
View File
@@ -57,6 +57,13 @@
* schema:
* type: string
* example: 1357158568008091268,1357158568008091269
* - name: excludedLabelIds
* in: query
* required: false
* description: Comma-separated label IDs to exclude from results
* schema:
* type: string
* example: 1357158568008091268,1357158568008091269
* responses:
* 200:
* description: Cards retrieved successfully
@@ -189,6 +196,7 @@ module.exports = {
},
userIds: idsInput,
labelIds: idsInput,
excludedLabelIds: idsInput,
},
exits: {
@@ -235,12 +243,28 @@ module.exports = {
}
let filterLabelIds;
let filterExcludedLabelIds;
if (inputs.labelIds) {
const labels = await Label.qm.getByBoardId(list.boardId);
const availableLabelIdsSet = new Set(sails.helpers.utils.mapRecords(labels));
filterLabelIds = _.uniq(inputs.labelIds.split(','));
filterLabelIds = filterLabelIds.filter((labelId) => availableLabelIdsSet.has(labelId));
if (inputs.excludedLabelIds) {
filterExcludedLabelIds = _.uniq(inputs.excludedLabelIds.split(','));
filterExcludedLabelIds = filterExcludedLabelIds.filter((labelId) =>
availableLabelIdsSet.has(labelId),
);
}
} else if (inputs.excludedLabelIds) {
const labels = await Label.qm.getByBoardId(list.boardId);
const availableLabelIdsSet = new Set(sails.helpers.utils.mapRecords(labels));
filterExcludedLabelIds = _.uniq(inputs.excludedLabelIds.split(','));
filterExcludedLabelIds = filterExcludedLabelIds.filter((labelId) =>
availableLabelIdsSet.has(labelId),
);
}
// ISO 8601 allows forms Postgres rejects as a timestamp (`2026`, `2026-W35-3`,
@@ -257,6 +281,7 @@ module.exports = {
search: inputs.search,
userIds: filterUserIds,
labelIds: filterLabelIds,
excludedLabelIds: filterExcludedLabelIds,
});
const cardIds = sails.helpers.utils.mapRecords(cards);