Merge remote-tracking branch 'origin/main' into resource-store

.github/CODEOWNERS

@@ -416,7 +416,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

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 './api/useRecentlyDeletedStateManager';
-import { useRecentlyDeletedStateManager } from './utils/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();

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 { useRestoreDashboardMutation } from '../api/browseDashboardsAPI';
-import { setAllSelection, useActionSelectionState } from '../../browse-dashboards/state';
+import { useRecentlyDeletedStateManager } from '../api/useRecentlyDeletedStateManager';
-import { RestoreModal } from '../components/RestoreModal';
+import { setAllSelection, useActionSelectionState } from '../state';
-import { useRecentlyDeletedStateManager } from '../utils/useRecentlyDeletedStateManager';
+
+import { RestoreModal } from './RestoreModal';
 
 export function RecentlyDeletedActions() {
   const styles = useStyles2(getStyles);

public/app/features/datasources/state/actions.ts

@@ -277,7 +277,7 @@ export function updateDataSource(dataSource: DataSourceSettings) {
 
       dispatch(testDataSourceFailed(formattedError));
 
-      return Promise.reject(dataSource);
+      return Promise.reject(err);
     }
 
     await getDatasourceSrv().reload();

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')
       ),
     },
     {