diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e87f3dc4109..6136bd07605 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -415,7 +415,6 @@ playwright.config.ts @grafana/plugins-platform-frontend /public/app/features/live/ @grafana/grafana-app-platform-squad /public/app/features/apiserver/ @grafana/grafana-app-platform-squad /public/app/features/manage-dashboards/ @grafana/dashboards-squad -/public/app/features/manage-dashboards/RecentlyDeletedPage.tsx @grafana/grafana-frontend-platform /public/app/features/notifications/ @grafana/grafana-frontend-platform /public/app/features/org/ @grafana/grafana-frontend-platform /public/app/features/panel/ @grafana/dashboards-squad diff --git a/public/app/features/manage-dashboards/RecentlyDeletedPage.tsx b/public/app/features/browse-dashboards/RecentlyDeletedPage.tsx similarity index 84% rename from public/app/features/manage-dashboards/RecentlyDeletedPage.tsx rename to public/app/features/browse-dashboards/RecentlyDeletedPage.tsx index c54bb7b6688..149ca72a03b 100644 --- a/public/app/features/manage-dashboards/RecentlyDeletedPage.tsx +++ b/public/app/features/browse-dashboards/RecentlyDeletedPage.tsx @@ -6,12 +6,12 @@ import { ActionRow } from 'app/features/search/page/components/ActionRow'; import { getGrafanaSearcher } from 'app/features/search/service'; import { useDispatch } from '../../types'; -import { SearchView } from '../browse-dashboards/components/SearchView'; -import { getFolderPermissions } from '../browse-dashboards/permissions'; -import { setAllSelection } from '../browse-dashboards/state'; -import { RecentlyDeletedActions } from './state/RecentlyDeletedActions'; -import { useRecentlyDeletedStateManager } from './utils/useRecentlyDeletedStateManager'; +import { useRecentlyDeletedStateManager } from './api/useRecentlyDeletedStateManager'; +import { RecentlyDeletedActions } from './components/RecentlyDeletedActions'; +import { SearchView } from './components/SearchView'; +import { getFolderPermissions } from './permissions'; +import { setAllSelection } from './state'; const RecentlyDeletedPage = memo(() => { const dispatch = useDispatch(); diff --git a/public/app/features/manage-dashboards/utils/useRecentlyDeletedStateManager.ts b/public/app/features/browse-dashboards/api/useRecentlyDeletedStateManager.ts similarity index 100% rename from public/app/features/manage-dashboards/utils/useRecentlyDeletedStateManager.ts rename to public/app/features/browse-dashboards/api/useRecentlyDeletedStateManager.ts diff --git a/public/app/features/manage-dashboards/state/RecentlyDeletedActions.tsx b/public/app/features/browse-dashboards/components/RecentlyDeletedActions.tsx similarity index 84% rename from public/app/features/manage-dashboards/state/RecentlyDeletedActions.tsx rename to public/app/features/browse-dashboards/components/RecentlyDeletedActions.tsx index 79983e8f8a1..8657244d90c 100644 --- a/public/app/features/manage-dashboards/state/RecentlyDeletedActions.tsx +++ b/public/app/features/browse-dashboards/components/RecentlyDeletedActions.tsx @@ -8,10 +8,11 @@ import appEvents from '../../../core/app_events'; import { Trans } from '../../../core/internationalization'; import { useDispatch } from '../../../types'; import { ShowModalReactEvent } from '../../../types/events'; -import { useRestoreDashboardMutation } from '../../browse-dashboards/api/browseDashboardsAPI'; -import { setAllSelection, useActionSelectionState } from '../../browse-dashboards/state'; -import { RestoreModal } from '../components/RestoreModal'; -import { useRecentlyDeletedStateManager } from '../utils/useRecentlyDeletedStateManager'; +import { useRestoreDashboardMutation } from '../api/browseDashboardsAPI'; +import { useRecentlyDeletedStateManager } from '../api/useRecentlyDeletedStateManager'; +import { setAllSelection, useActionSelectionState } from '../state'; + +import { RestoreModal } from './RestoreModal'; export function RecentlyDeletedActions() { const styles = useStyles2(getStyles); diff --git a/public/app/features/manage-dashboards/components/RestoreModal.tsx b/public/app/features/browse-dashboards/components/RestoreModal.tsx similarity index 100% rename from public/app/features/manage-dashboards/components/RestoreModal.tsx rename to public/app/features/browse-dashboards/components/RestoreModal.tsx diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx index c8556ffc06a..87729a69432 100644 --- a/public/app/routes/routes.tsx +++ b/public/app/routes/routes.tsx @@ -439,7 +439,7 @@ export function getAppRoutes(): RouteDescriptor[] { path: '/dashboard/recentlyDeleted', roles: () => contextSrv.evaluatePermission([AccessControlAction.DashboardsDelete]), component: SafeDynamicImport( - () => import(/* webpackChunkName: "RecentlyDeletedPage" */ 'app/features/manage-dashboards/RecentlyDeletedPage') + () => import(/* webpackChunkName: "RecentlyDeletedPage" */ 'app/features/browse-dashboards/RecentlyDeletedPage') ), }, {