|
3 | 3 | * SPDX-License-Identifier: Apache-2.0 |
4 | 4 | */ |
5 | 5 |
|
6 | | -import React, { useCallback, useLayoutEffect } from "react" |
7 | | -import { useLoaderData, useNavigate, useRouteContext, useSearch } from "@tanstack/react-router" |
| 6 | +import React, { useCallback } from "react" |
| 7 | +import { useLoaderData, useNavigate } from "@tanstack/react-router" |
8 | 8 | import { Filters } from "../common/Filters" |
9 | 9 | import { FilterSettings } from "../common/Filters/types" |
10 | | -import { getFiltersForUrl, getInitialFilters } from "./utils" |
| 10 | +import { getFiltersForUrl } from "./utils" |
11 | 11 | import { SELECTED_FILTER_PREFIX } from "../../constants" |
12 | | -import { useStore } from "../../store/StoreProvider" |
| 12 | + |
13 | 13 |
|
14 | 14 | export const ServicesFilters = () => { |
15 | 15 | const navigate = useNavigate() |
16 | 16 | const { filters, filterSettings } = useLoaderData({ from: "/services/" }) |
17 | | - const { appProps } = useRouteContext({ from: "/services/" }) |
18 | | - const search = useSearch({ from: "/services/" }) |
19 | | - const { hasAppliedInitialFilters, markInitialFiltersApplied } = useStore() |
20 | | - |
21 | | - // Use store to track initial filters across tab navigation - prevents re-application when switching between services/vulnerabilities tabs |
22 | | - useLayoutEffect(() => { |
23 | | - if (hasAppliedInitialFilters) return |
24 | | - |
25 | | - // Use parsed search params from TanStack Router instead of window.location.search |
26 | | - const hasUrlFilters = Object.keys(search).some((key) => key.startsWith(SELECTED_FILTER_PREFIX)) |
27 | | - |
28 | | - if (!hasUrlFilters && appProps?.initialFilters?.support_group?.length) { |
29 | | - const initialFilters = getInitialFilters(appProps.initialFilters) |
30 | | - |
31 | | - if (initialFilters.length > 0) { |
32 | | - navigate({ |
33 | | - to: "/services", |
34 | | - search: getFiltersForUrl({ |
35 | | - searchTerm: "", |
36 | | - selectedFilters: initialFilters, |
37 | | - }), |
38 | | - replace: true, |
39 | | - }) |
40 | | - markInitialFiltersApplied() |
41 | | - } |
42 | | - } |
43 | | - }, [navigate, appProps, hasAppliedInitialFilters, markInitialFiltersApplied, search]) |
44 | 17 |
|
45 | 18 | const handleFilterChange = useCallback( |
46 | 19 | (updatedFilterSettings: FilterSettings) => { |
|
0 commit comments