Skip to content

Fix: remove trailing or from compare when removing an item #11581

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix: remove trailing or from compare when removing an item #11581

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions src/app/compare/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,19 @@ function removeCompareItem(state: CompareState, item: DimItem): CompareState {
throw new Error("Programmer error: Can't remove item with no session");
}

// Sanitize query to remove any trailing 'or' ex. `query or'
// Preventing `query or -id:item`
const sanitizedQuery = state.session.query.endsWith(' or')
? state.session.query.slice(0, -3)
: state.session.query;

// Add `-id` filter to the right to avoid mixing it with
// `or` filters from item addition (see `addCompareItem`).
const addedQuery = `id:${item.id} or`;
const newQuery = (
state.session.query.includes(addedQuery)
? state.session.query.replace(addedQuery, '')
: `${state.session.query} -id:${item.id}`
sanitizedQuery.includes(addedQuery)
? sanitizedQuery.replace(addedQuery, '')
: `${sanitizedQuery} -id:${item.id}`
)
.replace(/\s+/, ' ')
.trim();
Expand Down