Skip to content

Commit ae0462a

Browse files
committed
fix unnecessary delete option
1 parent 0d421e2 commit ae0462a

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/pages/Search/AdvancedSearchFilters.tsx

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import usePermissions from '@hooks/usePermissions';
1616
import useSingleExecution from '@hooks/useSingleExecution';
1717
import useThemeStyles from '@hooks/useThemeStyles';
1818
import useWaitForNavigation from '@hooks/useWaitForNavigation';
19+
import type {WorkspaceListItem} from '@hooks/useWorkspaceList';
1920
import useWorkspaceList from '@hooks/useWorkspaceList';
2021
import {clearAllFilters, saveSearch} from '@libs/actions/Search';
2122
import {createCardFeedKey, getCardFeedKey, getCardFeedNamesWithType, getWorkspaceCardFeedKey} from '@libs/CardFeedUtils';
@@ -220,9 +221,8 @@ const typeFiltersKeys: Record<string, Array<Array<ValueOf<typeof CONST.SEARCH.SY
220221
],
221222
};
222223

223-
function getFilterWorkspaceDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, policies: OnyxCollection<Policy>) {
224-
const workspaceFilter = filters[CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID];
225-
return policies?.[`${ONYXKEYS.COLLECTION.POLICY}${workspaceFilter}`]?.name ?? workspaceFilter;
224+
function getFilterWorkspaceDisplayTitle(filters: SearchAdvancedFiltersForm, policies: WorkspaceListItem[]) {
225+
return policies.filter((value) => value.policyID === filters.policyID).at(0)?.text;
226226
}
227227

228228
function getFilterCardDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, cards: CardList, translate: LocaleContextProps['translate']) {
@@ -443,9 +443,6 @@ function AdvancedSearchFilters() {
443443
selectedPolicyID: undefined,
444444
searchTerm: '',
445445
});
446-
// We check if the previously selected workspace (which might have been deleted)
447-
// still exists — only then can we set it as the active one again.
448-
const isWorkspaceNameStillPresent = (filterTitle: string | undefined) => workspaces.some((section) => section.data?.some((item) => item.text === filterTitle));
449446

450447
// When looking if a user has any categories to display, we want to ignore the policies that are of type PERSONAL
451448
const nonPersonalPolicyCategoryIds = Object.values(policies)
@@ -560,10 +557,8 @@ function AdvancedSearchFilters() {
560557
if (!shouldDisplayWorkspaceFilter) {
561558
return;
562559
}
563-
const selectedWorkspaceName = baseFilterConfig[key].getTitle(searchAdvancedFilters, policies);
564-
if (isWorkspaceNameStillPresent(selectedWorkspaceName)) {
565-
filterTitle = selectedWorkspaceName;
566-
}
560+
const workspacesData = workspaces.flatMap((value) => value.data);
561+
filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, workspacesData);
567562
}
568563
return {
569564
key,

0 commit comments

Comments
 (0)