Skip to content

Fix search filter tags/categories showing items from other workspaces #84679

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

Open
MelvinBot wants to merge 4 commits into
base: main
Choose a base branch
from
+6 −6
Open

Fix search filter tags/categories showing items from other workspaces #84679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f62d5a2
Fix: Filter tags and categories by selected workspace only
MelvinBot Mar 10, 2026
89d18bc
Fix ESLint: use policyIDs.length in dependency arrays
MelvinBot Mar 10, 2026
211ad1b
Merge remote-tracking branch 'origin/main' into claude-fixSearchFilte…
MelvinBot Mar 13, 2026
3b3550b
Merge remote-tracking branch 'origin/main' into claude-fixSearchFilte…
MelvinBot Mar 16, 2026
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
6 changes: 3 additions & 3 deletions src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ function SearchFiltersCategoryPage() {
const items = [{name: translate('search.noCategory'), value: CONST.SEARCH.CATEGORY_EMPTY_VALUE as string}];
const uniqueCategoryNames = new Set<string>();

if (!selectedPoliciesCategories || selectedPoliciesCategories.length === 0) {
if (policyIDs.length === 0) {
const categories = Object.values(allPolicyCategories ?? {}).flatMap((policyCategories) => Object.values(policyCategories ?? {}));
for (const category of categories) {
uniqueCategoryNames.add(category.name);
}
} else {
} else if (selectedPoliciesCategories.length > 0) {
for (const category of selectedPoliciesCategories) {
uniqueCategoryNames.add(category.name);
}
Expand All @@ -80,7 +80,7 @@ function SearchFiltersCategoryPage() {
}),
);
return items;
}, [allPolicyCategories, selectedPoliciesCategories, translate]);
}, [allPolicyCategories, policyIDs.length, selectedPoliciesCategories, translate]);

const onSaveSelection = useCallback((values: string[]) => updateAdvancedFilters({category: values}), []);

Expand Down
6 changes: 3 additions & 3 deletions src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@ function SearchFiltersTagPage() {
const items = [{name: translate('search.noTag'), value: CONST.SEARCH.TAG_EMPTY_VALUE as string}];
const uniqueTagNames = new Set<string>();

if (!selectedPoliciesTagLists || selectedPoliciesTagLists.length === 0) {
if (policyIDs.length === 0) {
const tagListsUnpacked = Object.values(allPolicyTagLists ?? {}).filter((item) => !!item);
for (const tag of tagListsUnpacked.map(getTagNamesFromTagsLists).flat()) {
uniqueTagNames.add(tag);
}
} else {
} else if (selectedPoliciesTagLists.length > 0) {
for (const tag of selectedPoliciesTagLists) {
uniqueTagNames.add(tag);
}
}
items.push(...Array.from(uniqueTagNames).map((tagName) => ({name: getCleanedTagName(tagName), value: tagName})));

return items;
}, [allPolicyTagLists, selectedPoliciesTagLists, translate]);
}, [allPolicyTagLists, policyIDs.length, selectedPoliciesTagLists, translate]);

const updateTagFilter = useCallback((values: string[]) => updateAdvancedFilters({tag: values}), []);

Expand Down
Loading