File tree 6 files changed +15
-18
lines changed 6 files changed +15
-18
lines changed Original file line number Diff line number Diff line change 8
8
* the workspaces and audits page that have a risk of getting out of sync.
9
9
*/
10
10
import { API } from "api/api" ;
11
- import {
12
- type UseFilterMenuOptions ,
13
- useFilterMenu ,
14
- } from "components/Filter/menu" ;
15
11
import {
16
12
SelectFilter ,
17
13
type SelectFilterOption ,
18
14
SelectFilterSearch ,
19
15
} from "components/Filter/SelectFilter" ;
16
+ import {
17
+ type UseFilterMenuOptions ,
18
+ useFilterMenu ,
19
+ } from "components/Filter/menu" ;
20
20
import { UserAvatar } from "components/UserAvatar/UserAvatar" ;
21
21
import type { FC } from "react" ;
22
22
Original file line number Diff line number Diff line change 1
1
import { AuditActions , ResourceTypes } from "api/typesGenerated" ;
2
2
import { Filter , MenuSkeleton , type useFilter } from "components/Filter/Filter" ;
3
- import {
4
- type UseFilterMenuOptions ,
5
- useFilterMenu ,
6
- } from "components/Filter/menu" ;
7
3
import {
8
4
SelectFilter ,
9
5
type SelectFilterOption ,
10
6
} from "components/Filter/SelectFilter" ;
11
7
import { type UserFilterMenu , UserMenu } from "components/Filter/UserFilter" ;
8
+ import {
9
+ type UseFilterMenuOptions ,
10
+ useFilterMenu ,
11
+ } from "components/Filter/menu" ;
12
12
import capitalize from "lodash/capitalize" ;
13
13
import {
14
14
type OrganizationsFilterMenu ,
Original file line number Diff line number Diff line change 1
1
import { paginatedAudits } from "api/queries/audits" ;
2
- import { useUserFilterMenu } from "components/Filter/UserFilter" ;
3
2
import { useFilter } from "components/Filter/Filter" ;
3
+ import { useUserFilterMenu } from "components/Filter/UserFilter" ;
4
4
import { isNonInitialPage } from "components/PaginationWidget/utils" ;
5
5
import { usePaginatedQuery } from "hooks/usePaginatedQuery" ;
6
6
import { useDashboard } from "modules/dashboard/useDashboard" ;
7
7
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility" ;
8
+ import { useOrganizationsFilterMenu } from "modules/tableFiltering/options" ;
8
9
import type { FC } from "react" ;
9
10
import { Helmet } from "react-helmet-async" ;
10
11
import { useSearchParams } from "react-router-dom" ;
11
12
import { pageTitle } from "utils/page" ;
12
- import {
13
- useActionFilterMenu ,
14
- useOrganizationsFilterMenu ,
15
- useResourceTypeFilterMenu ,
16
- } from "./AuditFilter" ;
13
+ import { useActionFilterMenu , useResourceTypeFilterMenu } from "./AuditFilter" ;
17
14
import { AuditPageView } from "./AuditPageView" ;
18
15
19
16
const AuditPage : FC = ( ) => {
Original file line number Diff line number Diff line change 1
1
import { API } from "api/api" ;
2
2
import type { Organization } from "api/typesGenerated" ;
3
+ import { Filter , MenuSkeleton , type useFilter } from "components/Filter/Filter" ;
3
4
import {
4
5
SelectFilter ,
5
6
type SelectFilterOption ,
6
7
} from "components/Filter/SelectFilter" ;
7
- import { type useFilter , Filter , MenuSkeleton } from "components/Filter/Filter" ;
8
8
import { useFilterMenu } from "components/Filter/menu" ;
9
9
import { UserAvatar } from "components/UserAvatar/UserAvatar" ;
10
10
import type { FC } from "react" ;
Original file line number Diff line number Diff line change
1
+ import { Filter , MenuSkeleton , type useFilter } from "components/Filter/Filter" ;
1
2
import {
2
3
SelectFilter ,
3
4
type SelectFilterOption ,
4
5
} from "components/Filter/SelectFilter" ;
5
- import { type useFilter , Filter , MenuSkeleton } from "components/Filter/Filter" ;
6
6
import {
7
7
type UseFilterMenuOptions ,
8
8
useFilterMenu ,
Original file line number Diff line number Diff line change 1
1
import { templates } from "api/queries/templates" ;
2
2
import type { Workspace } from "api/typesGenerated" ;
3
- import { useUserFilterMenu } from "components/Filter/UserFilter" ;
4
3
import { useFilter } from "components/Filter/Filter" ;
4
+ import { useUserFilterMenu } from "components/Filter/UserFilter" ;
5
5
import { useAuthenticated } from "contexts/auth/RequireAuth" ;
6
6
import { useEffectEvent } from "hooks/hookPolyfills" ;
7
7
import { usePagination } from "hooks/usePagination" ;
8
8
import { useDashboard } from "modules/dashboard/useDashboard" ;
9
+ import { useOrganizationsFilterMenu } from "modules/tableFiltering/options" ;
9
10
import { type FC , useEffect , useState } from "react" ;
10
11
import { Helmet } from "react-helmet-async" ;
11
12
import { useQuery } from "react-query" ;
@@ -17,7 +18,6 @@ import { WorkspacesPageView } from "./WorkspacesPageView";
17
18
import { useBatchActions } from "./batchActions" ;
18
19
import { useWorkspaceUpdate , useWorkspacesData } from "./data" ;
19
20
import { useStatusFilterMenu , useTemplateFilterMenu } from "./filter/menus" ;
20
- import { useOrganizationsFilterMenu } from "pages/AuditPage/AuditFilter" ;
21
21
22
22
function useSafeSearchParams ( ) {
23
23
// Have to wrap setSearchParams because React Router doesn't make sure that
You can’t perform that action at this time.
0 commit comments