diff --git a/frontend/src/AppRoutes/routes.ts b/frontend/src/AppRoutes/routes.ts index ff5eb12ffb58..5c160e254395 100644 --- a/frontend/src/AppRoutes/routes.ts +++ b/frontend/src/AppRoutes/routes.ts @@ -8,15 +8,21 @@ import { AlertOverview, AllAlertChannelsPage, AllErrors, + APIKeys, ApiMonitoring, + BillingPage, + ChannelsEditPage, CreateAlertChannelAlerts, CreateNewAlerts, + CustomDomainSettings, DashboardPage, DashboardWidget, EditRulesPage, ErrorDetails, + GeneralSettings, Home, InfrastructureMonitoring, + IngestionSettings, InstalledIntegrations, LicensePage, ListAllALertsPage, @@ -27,10 +33,12 @@ import { LogsIndexToFields, LogsSaveViews, MetricsExplorer, + MySettings, NewDashboardPage, OldLogsExplorer, Onboarding, OnboardingV2, + OrganizationSettingsPage, OrgOnboarding, PasswordReset, PipelinePage, @@ -39,6 +47,7 @@ import { ServicesTablePage, ServiceTopLevelOperationsPage, SettingsPage, + ShortcutsPage, SignupPage, SomethingWentWrong, StatusPage, @@ -54,15 +63,6 @@ import { WorkspaceAccessRestricted, WorkspaceBlocked, WorkspaceSuspended, - MySettings, - CustomDomainSettings, - GeneralSettings, - IngestionSettings, - APIKeys, - BillingPage, - ShortcutsPage, - OrganizationSettingsPage, - ChannelsEditPage, } from './pageComponents'; const routes: AppRoutes[] = [ diff --git a/frontend/src/hooks/useAppRoutes.ts b/frontend/src/hooks/useAppRoutes.ts index 434cc36defec..fbc070e2e515 100644 --- a/frontend/src/hooks/useAppRoutes.ts +++ b/frontend/src/hooks/useAppRoutes.ts @@ -1,10 +1,10 @@ -import { AppRoutes } from 'AppRoutes/routes'; -import routes from 'AppRoutes/routes'; +import routes, { AppRoutes } from 'AppRoutes/routes'; +import { FeatureKeys } from 'constants/features'; import { getRoutes } from 'pages/Settings/utils'; import { useAppContext } from 'providers/App/App'; import { useMemo } from 'react'; + import useComponentPermission from './useComponentPermission'; -import { FeatureKeys } from 'constants/features'; import { useGetTenantLicense } from './useGetTenantLicense'; export const useAppRoutes = (): { routes: AppRoutes[] } => { diff --git a/frontend/src/pages/Settings/Settings.tsx b/frontend/src/pages/Settings/Settings.tsx index 94b4f4068dbc..c6d56722f6e2 100644 --- a/frontend/src/pages/Settings/Settings.tsx +++ b/frontend/src/pages/Settings/Settings.tsx @@ -13,9 +13,8 @@ import { Wrench } from 'lucide-react'; import { useAppContext } from 'providers/App/App'; import { useCallback, useEffect, useState } from 'react'; import { useLocation } from 'react-router-dom'; -import { USER_ROLES } from 'types/roles'; - import { Outlet } from 'react-router-dom-v5-compat'; +import { USER_ROLES } from 'types/roles'; function SettingsPage(): JSX.Element { const { pathname, search } = useLocation(); diff --git a/frontend/src/pages/Settings/utils.ts b/frontend/src/pages/Settings/utils.ts index 4b432318f4c8..ef229480633c 100644 --- a/frontend/src/pages/Settings/utils.ts +++ b/frontend/src/pages/Settings/utils.ts @@ -1,5 +1,5 @@ -import { ROLES, USER_ROLES } from 'types/roles'; import ROUTES, { SETTINGS_NESTED_ROUTES } from 'constants/routes'; +import { ROLES, USER_ROLES } from 'types/roles'; export const getRoutes = ( userRole: ROLES | null,