From d7dcea71ea763780dc286792a0afd560bff2985c Mon Sep 17 00:00:00 2001 From: Alexa V <239999+axelavargas@users.noreply.github.com> Date: Tue, 13 Dec 2022 17:43:53 +0100 Subject: [PATCH] [v9.2.x] Snapshots: Build snapshot originalUrl on the backend (#60232) (#60256) Co-authored-by: kay delaney --- .../components/ConfirmModal/ConfirmModal.tsx | 12 +++- pkg/api/dashboard_snapshot.go | 23 ++++++-- .../dashboard/components/DashNav/DashNav.tsx | 56 +++++++++++++++++-- .../components/ShareModal/ShareSnapshot.tsx | 4 -- 4 files changed, 78 insertions(+), 17 deletions(-) diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx index 8139228a81c..477104a4375 100644 --- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx +++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx @@ -7,7 +7,7 @@ import { selectors } from '@grafana/e2e-selectors'; import { HorizontalGroup, Input } from '..'; import { useStyles2 } from '../../themes'; import { IconName } from '../../types/icon'; -import { Button } from '../Button'; +import { Button, ButtonVariant } from '../Button'; import { Modal } from '../Modal/Modal'; export interface ConfirmModalProps { @@ -21,8 +21,12 @@ export interface ConfirmModalProps { description?: React.ReactNode; /** Text for confirm button */ confirmText: string; + /** Variant for confirm button */ + confirmVariant?: ButtonVariant; /** Text for dismiss button */ dismissText?: string; + /** Variant for dismiss button */ + dismissVariant?: ButtonVariant; /** Icon for the modal header */ icon?: IconName; /** Text user needs to fill in before confirming */ @@ -43,8 +47,10 @@ export const ConfirmModal = ({ body, description, confirmText, + confirmVariant = 'destructive', confirmationText, dismissText = 'Cancel', + dismissVariant = 'secondary', alternativeText, icon = 'exclamation-triangle', onConfirm, @@ -79,11 +85,11 @@ export const ConfirmModal = ({ ) : null} -