Skip to content

Commit 3ab084f

Browse files
authored
Merge pull request #9 from grafana/bohandley/configuration-fixes
Configuration fixes
2 parents 95fa2e1 + eb71b33 commit 3ab084f

19 files changed

+89
-1271
lines changed

jest-setup.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
// Jest setup provided by Grafana scaffolding
22
import './.config/jest-setup';
3+
import { TextEncoder, TextDecoder } from 'util';
4+
5+
global.TextEncoder = TextEncoder;
6+
global.TextDecoder = TextDecoder;

src/configuration/AlertingSettingsOverhaul.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { cx } from '@emotion/css';
22
import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
33
import { ConfigSubSection } from '@grafana/experimental';
4-
import { config } from '@grafana/runtime';
54
import { InlineField, Switch, useTheme2 } from '@grafana/ui';
65
import React from 'react';
76

@@ -19,14 +18,14 @@ export function AlertingSettingsOverhaul<T extends AlertingConfig>({
1918
onOptionsChange,
2019
}: Props<T>): JSX.Element {
2120
const theme = useTheme2();
21+
// imported GrafanaTheme2 from @grafana/data does not match type of same from @grafana/ui
22+
// @ts-ignore
2223
const styles = overhaulStyles(theme);
2324

24-
const prometheusConfigOverhaulAuth = config.featureToggles.prometheusConfigOverhaulAuth;
25-
2625
return (
2726
<ConfigSubSection
2827
title="Alerting"
29-
className={cx(styles.container, { [styles.alertingTop]: prometheusConfigOverhaulAuth })}
28+
className={cx(styles.container, styles.alertingTop)}
3029
>
3130
<div className="gf-form-group">
3231
<div className="gf-form-inline">

src/configuration/AzureAuthSettings.tsx

Lines changed: 0 additions & 80 deletions
This file was deleted.

src/configuration/AzureCredentials.ts

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/configuration/AzureCredentialsConfig.ts

Lines changed: 0 additions & 137 deletions
This file was deleted.

src/configuration/AzureCredentialsForm.test.tsx

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)