From cb3fc369fe238ce9763ab2825bacf81fcfba34ab Mon Sep 17 00:00:00 2001
From: Yunwen Zheng <yunwen.zheng@grafana.com>
Date: Wed, 3 Sep 2025 01:50:52 -0400
Subject: [PATCH] Provisioning Action Drawer: Organize action and cancel button
 order to match existing pattern (#110487)

---
 .../BulkActions/BulkDeleteProvisionedResource.tsx           | 6 +++---
 .../components/BulkActions/BulkMoveProvisionedResource.tsx  | 6 +++---
 .../Dashboards/DeleteProvisionedDashboardForm.tsx           | 6 +++---
 .../components/Dashboards/MoveProvisionedDashboardForm.tsx  | 6 +++---
 .../components/Dashboards/SaveProvisionedDashboardForm.tsx  | 6 +++---
 .../components/Folders/DeleteProvisionedFolderForm.tsx      | 6 +++---
 .../components/Folders/NewProvisionedFolderForm.tsx         | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/public/app/features/provisioning/components/BulkActions/BulkDeleteProvisionedResource.tsx b/public/app/features/provisioning/components/BulkActions/BulkDeleteProvisionedResource.tsx
index 96a3da40057..ba7d07bef6b 100644
--- a/public/app/features/provisioning/components/BulkActions/BulkDeleteProvisionedResource.tsx
+++ b/public/app/features/provisioning/components/BulkActions/BulkDeleteProvisionedResource.tsx
@@ -96,14 +96,14 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
                 hidePath
               />
               <Stack gap={2}>
+                <Button variant="secondary" fill="outline" onClick={onDismiss} disabled={isCreatingJob}>
+                  <Trans i18nKey="browse-dashboards.bulk-delete-resources-form.button-cancel">Cancel</Trans>
+                </Button>
                 <Button type="submit" disabled={disableBtn} variant="destructive">
                   {job?.status?.state === 'working' || job?.status?.state === 'pending'
                     ? t('browse-dashboards.bulk-delete-resources-form.button-deleting', 'Deleting...')
                     : t('browse-dashboards.bulk-delete-resources-form.button-delete', 'Delete')}
                 </Button>
-                <Button variant="secondary" fill="outline" onClick={onDismiss} disabled={isCreatingJob}>
-                  <Trans i18nKey="browse-dashboards.bulk-delete-resources-form.button-cancel">Cancel</Trans>
-                </Button>
               </Stack>
             </>
           )}
diff --git a/public/app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource.tsx b/public/app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource.tsx
index fd2dc5f7a09..3d370106196 100644
--- a/public/app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource.tsx
+++ b/public/app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource.tsx
@@ -149,6 +149,9 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
               />
 
               <Stack gap={2}>
+                <Button variant="secondary" fill="outline" onClick={onDismiss} disabled={isCreatingJob}>
+                  <Trans i18nKey="browse-dashboards.bulk-move-resources-form.button-cancel">Cancel</Trans>
+                </Button>
                 <Button
                   type="submit"
                   disabled={!!job || isCreatingJob || hasSubmitted || targetFolderUID === undefined}
@@ -157,9 +160,6 @@ function FormContent({ initialValues, selectedItems, repository, workflowOptions
                     ? t('browse-dashboards.bulk-move-resources-form.button-moving', 'Moving...')
                     : t('browse-dashboards.bulk-move-resources-form.button-move', 'Move')}
                 </Button>
-                <Button variant="secondary" fill="outline" onClick={onDismiss} disabled={isCreatingJob}>
-                  <Trans i18nKey="browse-dashboards.bulk-move-resources-form.button-cancel">Cancel</Trans>
-                </Button>
               </Stack>
             </>
           )}
diff --git a/public/app/features/provisioning/components/Dashboards/DeleteProvisionedDashboardForm.tsx b/public/app/features/provisioning/components/Dashboards/DeleteProvisionedDashboardForm.tsx
index 1a9db401522..ca542bcfb3c 100644
--- a/public/app/features/provisioning/components/Dashboards/DeleteProvisionedDashboardForm.tsx
+++ b/public/app/features/provisioning/components/Dashboards/DeleteProvisionedDashboardForm.tsx
@@ -136,14 +136,14 @@ export function DeleteProvisionedDashboardForm({
 
             {/* Save / Cancel button */}
             <Stack gap={2}>
+              <Button variant="secondary" onClick={onDismiss} fill="outline">
+                <Trans i18nKey="dashboard-scene.delete-provisioned-dashboard-form.cancel-action">Cancel</Trans>
+              </Button>
               <Button variant="destructive" type="submit" disabled={request.isLoading || readOnly}>
                 {request.isLoading
                   ? t('dashboard-scene.delete-provisioned-dashboard-form.deleting', 'Deleting...')
                   : t('dashboard-scene.delete-provisioned-dashboard-form.delete-action', 'Delete dashboard')}
               </Button>
-              <Button variant="secondary" onClick={onDismiss} fill="outline">
-                <Trans i18nKey="dashboard-scene.delete-provisioned-dashboard-form.cancel-action">Cancel</Trans>
-              </Button>
             </Stack>
           </Stack>
         </form>
diff --git a/public/app/features/provisioning/components/Dashboards/MoveProvisionedDashboardForm.tsx b/public/app/features/provisioning/components/Dashboards/MoveProvisionedDashboardForm.tsx
index dcab0cc5f79..7c2a6e78643 100644
--- a/public/app/features/provisioning/components/Dashboards/MoveProvisionedDashboardForm.tsx
+++ b/public/app/features/provisioning/components/Dashboards/MoveProvisionedDashboardForm.tsx
@@ -228,6 +228,9 @@ export function MoveProvisionedDashboardForm({
             />
 
             <Stack gap={2}>
+              <Button variant="secondary" onClick={onDismiss} fill="outline">
+                <Trans i18nKey="dashboard-scene.move-provisioned-dashboard-form.cancel-action">Cancel</Trans>
+              </Button>
               <Button
                 variant="primary"
                 type="submit"
@@ -237,9 +240,6 @@ export function MoveProvisionedDashboardForm({
                   ? t('dashboard-scene.move-provisioned-dashboard-form.moving', 'Moving...')
                   : t('dashboard-scene.move-provisioned-dashboard-form.move-action', 'Move dashboard')}
               </Button>
-              <Button variant="secondary" onClick={onDismiss} fill="outline">
-                <Trans i18nKey="dashboard-scene.move-provisioned-dashboard-form.cancel-action">Cancel</Trans>
-              </Button>
             </Stack>
           </Stack>
         </form>
diff --git a/public/app/features/provisioning/components/Dashboards/SaveProvisionedDashboardForm.tsx b/public/app/features/provisioning/components/Dashboards/SaveProvisionedDashboardForm.tsx
index 747b0e407da..728e72a532c 100644
--- a/public/app/features/provisioning/components/Dashboards/SaveProvisionedDashboardForm.tsx
+++ b/public/app/features/provisioning/components/Dashboards/SaveProvisionedDashboardForm.tsx
@@ -243,14 +243,14 @@ export function SaveProvisionedDashboardForm({
           />
 
           <Stack gap={2}>
+            <Button variant="secondary" onClick={drawer.onClose} fill="outline">
+              <Trans i18nKey="dashboard-scene.save-provisioned-dashboard-form.cancel">Cancel</Trans>
+            </Button>
             <Button variant="primary" type="submit" disabled={request.isLoading || !isDirty || readOnly}>
               {request.isLoading
                 ? t('dashboard-scene.save-provisioned-dashboard-form.saving', 'Saving...')
                 : t('dashboard-scene.save-provisioned-dashboard-form.save', 'Save')}
             </Button>
-            <Button variant="secondary" onClick={drawer.onClose} fill="outline">
-              <Trans i18nKey="dashboard-scene.save-provisioned-dashboard-form.cancel">Cancel</Trans>
-            </Button>
           </Stack>
         </Stack>
       </form>
diff --git a/public/app/features/provisioning/components/Folders/DeleteProvisionedFolderForm.tsx b/public/app/features/provisioning/components/Folders/DeleteProvisionedFolderForm.tsx
index 5b76b4a534a..a81ac76b504 100644
--- a/public/app/features/provisioning/components/Folders/DeleteProvisionedFolderForm.tsx
+++ b/public/app/features/provisioning/components/Folders/DeleteProvisionedFolderForm.tsx
@@ -131,14 +131,14 @@ function FormContent({ initialValues, parentFolder, repository, workflowOptions,
 
           {/* Delete / Cancel button */}
           <Stack gap={2}>
+            <Button variant="secondary" fill="outline" onClick={onDismiss}>
+              <Trans i18nKey="browse-dashboards.delete-provisioned-folder-form.button-cancel">Cancel</Trans>
+            </Button>
             <Button type="submit" disabled={request.isLoading} variant="destructive">
               {request.isLoading
                 ? t('browse-dashboards.delete-provisioned-folder-form.button-deleting', 'Deleting...')
                 : t('browse-dashboards.delete-provisioned-folder-form.button-delete', 'Delete')}
             </Button>
-            <Button variant="secondary" fill="outline" onClick={onDismiss}>
-              <Trans i18nKey="browse-dashboards.delete-provisioned-folder-form.button-cancel">Cancel</Trans>
-            </Button>
           </Stack>
         </Stack>
       </form>
diff --git a/public/app/features/provisioning/components/Folders/NewProvisionedFolderForm.tsx b/public/app/features/provisioning/components/Folders/NewProvisionedFolderForm.tsx
index 6eeaab029d7..10bcfcdcf66 100644
--- a/public/app/features/provisioning/components/Folders/NewProvisionedFolderForm.tsx
+++ b/public/app/features/provisioning/components/Folders/NewProvisionedFolderForm.tsx
@@ -187,14 +187,14 @@ function FormContent({ initialValues, repository, workflowOptions, folder, onDis
           )}
 
           <Stack gap={2}>
+            <Button variant="secondary" fill="outline" onClick={onDismiss}>
+              <Trans i18nKey="browse-dashboards.new-provisioned-folder-form.cancel">Cancel</Trans>
+            </Button>
             <Button type="submit" disabled={request.isLoading || !!formState?.errors.title}>
               {request.isLoading
                 ? t('browse-dashboards.new-provisioned-folder-form.button-creating', 'Creating...')
                 : t('browse-dashboards.new-provisioned-folder-form.button-create', 'Create')}
             </Button>
-            <Button variant="secondary" fill="outline" onClick={onDismiss}>
-              <Trans i18nKey="browse-dashboards.new-provisioned-folder-form.cancel">Cancel</Trans>
-            </Button>
           </Stack>
         </Stack>
       </form>