From fb33ff9028819406d9339bce53a29d1f6a05a88a Mon Sep 17 00:00:00 2001 From: Taewoo Kim Date: Mon, 15 May 2023 14:56:08 -0400 Subject: [PATCH] remove alerting badge in BasicSettings component --- .../components/BasicSettings.test.tsx | 1 - .../datasources/components/BasicSettings.tsx | 35 ++----------------- .../datasources/components/EditDataSource.tsx | 5 --- 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/public/app/features/datasources/components/BasicSettings.test.tsx b/public/app/features/datasources/components/BasicSettings.test.tsx index 7a869dc8beb..18c654deb35 100644 --- a/public/app/features/datasources/components/BasicSettings.test.tsx +++ b/public/app/features/datasources/components/BasicSettings.test.tsx @@ -11,7 +11,6 @@ const setup = () => { isDefault: false, onDefaultChange: jest.fn(), onNameChange: jest.fn(), - alertingSupported: false, }; return render(); diff --git a/public/app/features/datasources/components/BasicSettings.tsx b/public/app/features/datasources/components/BasicSettings.tsx index 71342bb1721..43882ca4b71 100644 --- a/public/app/features/datasources/components/BasicSettings.tsx +++ b/public/app/features/datasources/components/BasicSettings.tsx @@ -1,31 +1,19 @@ -import { css } from '@emotion/css'; import React from 'react'; -import { GrafanaTheme2 } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; -import { InlineField, InlineSwitch, Input, Badge, useStyles2 } from '@grafana/ui'; +import { InlineField, InlineSwitch, Input } from '@grafana/ui'; export interface Props { dataSourceName: string; isDefault: boolean; onNameChange: (name: string) => void; onDefaultChange: (value: boolean) => void; - alertingSupported: boolean; disabled?: boolean; } -export function BasicSettings({ - dataSourceName, - isDefault, - onDefaultChange, - onNameChange, - alertingSupported, - disabled, -}: Props) { +export function BasicSettings({ dataSourceName, isDefault, onDefaultChange, onNameChange, disabled }: Props) { return ( <> - -
{/* Name */} @@ -64,22 +52,3 @@ export function BasicSettings({ ); } - -export function AlertingEnabled({ enabled }: { enabled: boolean }) { - const styles = useStyles2(getStyles); - return ( -
- {enabled ? ( - - ) : ( - - )} -
- ); -} - -const getStyles = (theme: GrafanaTheme2) => ({ - badge: css` - margin-bottom: ${theme.spacing(2)}; - `, -}); diff --git a/public/app/features/datasources/components/EditDataSource.tsx b/public/app/features/datasources/components/EditDataSource.tsx index 460fd603244..f068010c9ee 100644 --- a/public/app/features/datasources/components/EditDataSource.tsx +++ b/public/app/features/datasources/components/EditDataSource.tsx @@ -113,10 +113,6 @@ export function EditDataSourceView({ const dsi = getDataSourceSrv()?.getInstanceSettings(dataSource.uid); - const hasAlertingEnabled = Boolean(dsi?.meta?.alerting ?? false); - const isAlertManagerDatasource = dsi?.type === 'alertmanager'; - const alertingSupported = hasAlertingEnabled || isAlertManagerDatasource; - const onSubmit = async (e: React.MouseEvent | React.FormEvent) => { e.preventDefault(); try { @@ -162,7 +158,6 @@ export function EditDataSourceView({ isDefault={dataSource.isDefault} onDefaultChange={onDefaultChange} onNameChange={onNameChange} - alertingSupported={alertingSupported} disabled={readOnly || !hasWriteRights} />