From e58765632ddbc97d56b7411a6a44cb9a2546503a Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Wed, 10 Sep 2025 10:43:42 -0400
Subject: [PATCH] ProvisioningAwarefolderPicker: Exclude current folder UID
 from selection (#110840)

ProvisioningAwarefolderPicker: Exclude current folder uid from selection
---
 .../dashboard-scene/settings/GeneralSettingsEditView.tsx         | 1 +
 .../components/BulkActions/BulkMoveProvisionedResource.tsx       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx b/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
index 97618d9e15a..ba4c10f81e7 100644
--- a/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
+++ b/public/app/features/dashboard-scene/settings/GeneralSettingsEditView.tsx
@@ -290,6 +290,7 @@ function GeneralSettingsEditViewComponent({ model }: SceneComponentProps<General
               value={meta.folderUid}
               onChange={dashboard.isManagedRepository() ? model.onProvisionedFolderChange : model.onFolderChange}
               repositoryName={dashboard.getManagerIdentity()}
+              excludeUIDs={meta?.folderUid ? [meta.folderUid] : undefined}
             />
           </Field>
 
diff --git a/public/app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource.tsx b/public/app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource.tsx
index 3d370106196..2f1782fad53 100644
--- a/public/app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource.tsx
+++ b/public/app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource.tsx
@@ -137,6 +137,7 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
                     clearErrors('targetFolderUID');
                   }}
                   repositoryName={repository.name}
+                  excludeUIDs={[...Object.keys(selectedItems?.folder).map((uid) => uid)]}
                 />
               </Field>
               <ResourceEditFormSharedFields