From afe457306ab2729c3a3be68af70b8345f432a607 Mon Sep 17 00:00:00 2001 From: Juan Cabanas Date: Tue, 10 Sep 2024 17:11:54 -0300 Subject: [PATCH] ShareDrawer: Change alert texts (#93184) --- .../ModalAlerts/NoUpsertPermissionsAlert.tsx | 44 ++++++++++++------- .../UnsupportedDataSourcesAlert.tsx | 16 +++++-- public/locales/en-US/grafana.json | 5 ++- public/locales/pseudo-LOCALE/grafana.json | 5 ++- 4 files changed, 48 insertions(+), 22 deletions(-) diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx index 7d68fe772d3..5227335389b 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx @@ -1,22 +1,34 @@ import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; +import { config } from '@grafana/runtime'; import { Alert } from '@grafana/ui/src'; import { Trans, t } from 'app/core/internationalization'; const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard; -export const NoUpsertPermissionsAlert = ({ mode }: { mode: 'create' | 'edit' }) => ( - - - Contact your admin to get permission to {{ mode }} public dashboards - - -); +export const NoUpsertPermissionsAlert = ({ mode }: { mode: 'create' | 'edit' }) => { + const title = config.featureToggles.newDashboardSharingComponent + ? t( + 'public-dashboard.share-externally.no-upsert-perm-alert-title', + 'You don’t have permission to {{ mode }} a shared dashboard', + { mode } + ) + : t( + 'public-dashboard.modal-alerts.no-upsert-perm-alert-title', + 'You don’t have permission to {{ mode }} a public dashboard', + { mode } + ); + + return ( + + {config.featureToggles.newDashboardSharingComponent ? ( + + Contact your admin to get permission to {{ mode }} shared dashboards + + ) : ( + + Contact your admin to get permission to {{ mode }} public dashboards + + )} + + ); +}; diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx index 691f56b8644..58fb31ec130 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx @@ -3,6 +3,7 @@ import cx from 'classnames'; import { GrafanaTheme2 } from '@grafana/data/src'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; +import { config } from '@grafana/runtime'; import { Alert, useStyles2 } from '@grafana/ui/src'; import { Trans, t } from 'app/core/internationalization'; @@ -19,10 +20,17 @@ export const UnsupportedDataSourcesAlert = ({ unsupportedDataSources }: { unsupp bottomSpacing={0} >

- - There are data sources in this dashboard that are unsupported for public dashboards. Panels that use these - data sources may not function properly: {{ unsupportedDataSources }}. - + {config.featureToggles.newDashboardSharingComponent ? ( + + There are data sources in this dashboard that are unsupported for shared dashboards. Panels that use these + data sources may not function properly: {{ unsupportedDataSources }}. + + ) : ( + + There are data sources in this dashboard that are unsupported for public dashboards. Panels that use these + data sources may not function properly: {{ unsupportedDataSources }}. + + )}