public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temporarily remove feature toggle

Browse Source
This commit is contained in:
laurenashleigh
2026-01-12 11:46:50 +00:00
parent b2a3e4997c
commit 9b90ac0f25
2 changed files with 41 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/alerting/unified/components/panel-alerts-tab/NewRuleFromPanelButton.tsx
+21 -42
View File
@@ -2,10 +2,8 @@ import { useState } from 'react';
import { useLocation } from 'react-router-dom-v5-compat';
import { useAsync } from 'react-use';
import { urlUtil } from '@grafana/data';
import { Trans, t } from '@grafana/i18n';
import { config } from '@grafana/runtime';
import { Alert, Button, LinkButton } from '@grafana/ui';
import { Alert, Button } from '@grafana/ui';
import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
import { PanelModel } from 'app/features/dashboard/state/PanelModel';
import { useSelector } from 'app/types/store';
@@ -59,49 +57,30 @@ export const NewRuleFromPanelButton = ({ dashboard, panel, className }: Props) =
);
}
const { onContinueInAlertingFromDrawer, onButtonClick: onContinueInAlertingButton } = createPanelAlertRuleNavigation(
const { onContinueInAlertingFromDrawer } = createPanelAlertRuleNavigation(
() => panelToRuleFormValues(panel, dashboard),
location
);
const shouldUseDrawer = config.featureToggles.createAlertRuleFromPanel;
if (shouldUseDrawer) {
return (
<>
<Button
icon="bell"
className={className}
data-testid="create-alert-rule-button-drawer"
onClick={() => {
logInfo(LogMessages.alertRuleFromPanel);
setIsOpen(true);
}}
>
<Trans i18nKey="alerting.new-rule-from-panel-button.new-alert-rule">New alert rule</Trans>
</Button>
<AlertRuleDrawerForm
isOpen={isOpen}
onClose={() => setIsOpen(false)}
onContinueInAlerting={onContinueInAlertingFromDrawer}
prefill={formValues ?? undefined}
/>
</>
);
}
return (
<LinkButton
icon="bell"
onClick={onContinueInAlertingButton}
href={urlUtil.renderUrl('alerting/new', {
defaults: JSON.stringify(formValues),
returnTo: location.pathname + location.search,
})}
className={className}
data-testid="create-alert-rule-button"
>
<Trans i18nKey="alerting.new-rule-from-panel-button.new-alert-rule">New alert rule</Trans>
</LinkButton>
<>
<Button
icon="bell"
className={className}
data-testid="create-alert-rule-button-drawer"
onClick={() => {
logInfo(LogMessages.alertRuleFromPanel);
setIsOpen(true);
}}
>
<Trans i18nKey="alerting.new-rule-from-panel-button.new-alert-rule">New alert rule</Trans>
</Button>
<AlertRuleDrawerForm
isOpen={isOpen}
onClose={() => setIsOpen(false)}
onContinueInAlerting={onContinueInAlertingFromDrawer}
prefill={formValues ?? undefined}
/>
</>
);
};
public/app/features/dashboard-scene/panel-edit/PanelDataPane/NewAlertRuleButton.tsx
+20 -31
View File
@@ -3,7 +3,6 @@ import { useLocation } from 'react-router-dom-v5-compat';
import { useAsync } from 'react-use';
import { Trans, t } from '@grafana/i18n';
import { config } from '@grafana/runtime';
import { VizPanel } from '@grafana/scenes';
import { Alert, Button } from '@grafana/ui';
import { LogMessages, logInfo } from 'app/features/alerting/unified/Analytics';
@@ -45,40 +44,30 @@ export const ScenesNewRuleFromPanelButton = ({ panel, className }: ScenesNewRule
);
}
const { onContinueInAlertingFromDrawer, onButtonClick } = createPanelAlertRuleNavigation(
const { onContinueInAlertingFromDrawer } = createPanelAlertRuleNavigation(
() => scenesPanelToRuleFormValues(panel),
location
);
const shouldUseDrawer = config.featureToggles.createAlertRuleFromPanel;
if (shouldUseDrawer) {
return (
<>
<Button
icon="bell"
className={className}
data-testid="create-alert-rule-button-drawer"
onClick={() => {
logInfo(LogMessages.alertRuleFromPanel);
setIsOpen(true);
}}
>
<Trans i18nKey="alerting.new-rule-from-panel-button.new-alert-rule">New alert rule</Trans>
</Button>
<AlertRuleDrawerForm
isOpen={isOpen}
onClose={() => setIsOpen(false)}
onContinueInAlerting={onContinueInAlertingFromDrawer}
prefill={formValues ?? undefined}
/>
</>
);
}
return (
<Button icon="bell" onClick={onButtonClick} className={className} data-testid="create-alert-rule-button">
<Trans i18nKey="dashboard-scene.scenes-new-rule-from-panel-button.new-alert-rule">New alert rule</Trans>
</Button>
<>
<Button
icon="bell"
className={className}
data-testid="create-alert-rule-button-drawer"
onClick={() => {
logInfo(LogMessages.alertRuleFromPanel);
setIsOpen(true);
}}
>
<Trans i18nKey="alerting.new-rule-from-panel-button.new-alert-rule">New alert rule</Trans>
</Button>
<AlertRuleDrawerForm
isOpen={isOpen}
onClose={() => setIsOpen(false)}
onContinueInAlerting={onContinueInAlertingFromDrawer}
prefill={formValues ?? undefined}
/>
</>
);
};