public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(provisioning): use raw selection for export count

Browse Source 
- Use useCheckboxSelectionState for export to include all selected dashboards
- Use useActionSelectionState for move/delete (filters out children of folders)
- Fixes count showing '1 folder, 1 dashboard' instead of '2 folders, 4 dashboards'
This commit is contained in:
Roberto Jimenez Sanchez
2025-12-02 19:21:35 +01:00
parent d179b98f7b
commit 0ff7646121
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/browse-dashboards/components/BrowseActions/BrowseActions.tsx
+13 -11
View File
@@ -20,7 +20,7 @@ import {
useMoveMultipleFoldersMutationFacade,
} from '../../../../api/clients/folder/v1beta1/hooks';
import { useDeleteDashboardsMutation, useMoveDashboardsMutation } from '../../api/browseDashboardsAPI';
import { useActionSelectionState } from '../../state/hooks';
import { useActionSelectionState, useCheckboxSelectionState } from '../../state/hooks';
import { setAllSelection } from '../../state/slice';
import { DashboardTreeSelection } from '../../types';
@@ -38,7 +38,8 @@ export function BrowseActions({ folderDTO }: Props) {
const [showBulkExportProvisionedResource, setShowBulkExportProvisionedResource] = useState(false);
const dispatch = useDispatch();
const selectedItems = useActionSelectionState();
const selectedItemsForActions = useActionSelectionState(); // For move/delete - filters out children
const selectedItems = useCheckboxSelectionState(); // For export - includes all selected items
const [deleteDashboards] = useDeleteDashboardsMutation();
const deleteFolders = useDeleteMultipleFoldersMutationFacade();
const [moveFolders] = useMoveMultipleFoldersMutationFacade();
@@ -47,7 +48,7 @@ export function BrowseActions({ folderDTO }: Props) {
const provisioningEnabled = config.featureToggles.provisioning;
const { hasProvisioned, hasNonProvisioned } = useSelectionProvisioningStatus(
selectedItems,
selectedItemsForActions,
folderDTO?.managedBy === ManagerKind.Repo
);
const { hasUnmanaged, isLoading: isLoadingUnmanaged } = useSelectionUnmanagedStatus(selectedItems);
@@ -64,21 +65,21 @@ export function BrowseActions({ folderDTO }: Props) {
};
const onDelete = async () => {
const selectedDashboards = Object.keys(selectedItems.dashboard).filter((uid) => selectedItems.dashboard[uid]);
const selectedFolders = Object.keys(selectedItems.folder).filter((uid) => selectedItems.folder[uid]);
const selectedDashboards = Object.keys(selectedItemsForActions.dashboard).filter((uid) => selectedItemsForActions.dashboard[uid]);
const selectedFolders = Object.keys(selectedItemsForActions.folder).filter((uid) => selectedItemsForActions.folder[uid]);
await deleteDashboards({ dashboardUIDs: selectedDashboards });
await deleteFolders({ folderUIDs: selectedFolders });
trackAction('delete', selectedItems);
trackAction('delete', selectedItemsForActions);
onActionComplete();
};
const onMove = async (destinationUID: string) => {
const selectedDashboards = Object.keys(selectedItems.dashboard).filter((uid) => selectedItems.dashboard[uid]);
const selectedFolders = Object.keys(selectedItems.folder).filter((uid) => selectedItems.folder[uid]);
const selectedDashboards = Object.keys(selectedItemsForActions.dashboard).filter((uid) => selectedItemsForActions.dashboard[uid]);
const selectedFolders = Object.keys(selectedItemsForActions.folder).filter((uid) => selectedItemsForActions.folder[uid]);
await moveFolders({ folderUIDs: selectedFolders, destinationUID });
await moveDashboards({ dashboardUIDs: selectedDashboards, destinationUID });
trackAction('move', selectedItems);
trackAction('move', selectedItemsForActions);
onActionComplete();
};
@@ -145,6 +146,7 @@ export function BrowseActions({ folderDTO }: Props) {
);
// Check if any dashboards are selected (export only supports dashboards, not folders)
// Use raw selectedItems (not selectedItemsForActions) to include all selected dashboards
const hasSelectedDashboards =
Object.keys(selectedItems.dashboard || {}).filter((uid) => selectedItems.dashboard[uid]).length > 0;
@@ -181,7 +183,7 @@ export function BrowseActions({ folderDTO }: Props) {
size="md"
>
<BulkDeleteProvisionedResource
selectedItems={selectedItems}
selectedItems={selectedItemsForActions}
folderUid={folderDTO?.uid || ''}
onDismiss={() => {
setShowBulkDeleteProvisionedResource(false);
@@ -203,7 +205,7 @@ export function BrowseActions({ folderDTO }: Props) {
size="md"
>
<BulkMoveProvisionedResource
selectedItems={selectedItems}
selectedItems={selectedItemsForActions}
folderUid={folderDTO?.uid}
onDismiss={() => {
setShowBulkMoveProvisionedResource(false);