Skip to content

Commit a9b6120

Browse files
committed
repeate code fix
1 parent 2e6040e commit a9b6120

File tree

5 files changed

+8
-23
lines changed

5 files changed

+8
-23
lines changed

public/app/features/alerting/unified/components/rule-editor/AlertRuleForm.tsx

-13
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,6 @@ export const AlertRuleForm = ({ existing, prefill }: Props) => {
194194
notifyApp.error('There are errors in the form. Please correct them and try again!');
195195
};
196196

197-
const cancelRuleCreation = () => {
198-
logInfo(LogMessages.cancelSavingAlertRule);
199-
if (!existing) {
200-
trackNewAlerRuleFormCancelled({
201-
grafana_version: config.buildInfo.version,
202-
org_id: contextSrv.user.orgId,
203-
user_id: contextSrv.user.id,
204-
});
205-
}
206-
};
207-
const evaluateEveryInForm = watch('evaluateEvery');
208-
useEffect(() => setEvaluateEvery(evaluateEveryInForm), [evaluateEveryInForm]);
209-
210197
const cancelRuleCreation = () => {
211198
logInfo(LogMessages.cancelSavingAlertRule);
212199
};

public/app/plugins/datasource/tempo/traceql/traceql.ts

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ const keywords = intrinsics.concat(scopes).concat(booleans);
3636

3737
const statusValues = ['ok', 'unset', 'error', 'false', 'true'];
3838

39-
const statusValues = ['ok', 'unset', 'error', 'false', 'true'];
40-
4139
export const language = {
4240
ignoreCase: false,
4341
defaultToken: '',

public/app/routes/routes.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ export function getAppRoutes(): RouteDescriptor[] {
516516
path: '/*',
517517
component: PageNotFound,
518518
},
519-
].filter(isTruthy);
519+
].filter(isTruthy) as unknown as RouteDescriptor[];
520520
}
521521

522522
export function getSupportBundleRoutes(cfg = config): RouteDescriptor[] {

public/microfrontends/fn_dashboard/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>FluxNinja Microfrontend</title>
55
<base href="/" />
6-
<link rel="stylesheet" href="../../../public/build/grafana.dark.5261d0ab67ec1cf9b739.css" />
6+
<link rel="stylesheet" href="../../../public/build/grafana.dark.49a5c75f64d6b46fed4b.css" />
77
</head>
88

99
<body class="theme-dark app-grafana">
@@ -12,22 +12,22 @@
1212
<script nonce="">
1313
window.fnData = {
1414
themePaths: {
15-
light: '../../../public/build/grafana.light.95a3e99c3273544fddaa.css',
16-
dark: '../../../public/build/grafana.dark.5261d0ab67ec1cf9b739.css'
15+
light: '../../../public/build/grafana.light.c78db6a20e122909520d.css',
16+
dark: '../../../public/build/grafana.dark.49a5c75f64d6b46fed4b.css'
1717
}
1818
};
1919
</script>
2020

2121

2222
<script
2323
nonce=""
24-
src="../../../public/build/runtime~fn_dashboard.0b5ba2b612e02a26515d.js"
24+
src="../../../public/build/runtime~fn_dashboard.9d27ad570f9d9fbd7e03.js"
2525
type="text/javascript"
2626
></script>
2727

2828
<script
2929
nonce=""
30-
src="../../../public/build/fn_dashboard.742c500e788f62df8c85.js"
30+
src="../../../public/build/fn_dashboard.2712ec8cc4ad44a34b91.js"
3131
type="text/javascript"
3232
></script>
3333

public/sass/_variables.generated.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ $height-lg: 48;
9999
// Typography
100100
// -------------------------
101101
/* stylelint-disable-next-line string-quotes */
102-
$font-family-sans-serif: Nunito, Roboto, Arial;
102+
$font-family-sans-serif: "Source Sans Pro", Nunito, Roboto, Arial;
103103
/* stylelint-disable-next-line string-quotes */
104-
$font-family-monospace: 'Nunito Mono', monospace;
104+
$font-family-monospace: 'Nunito Mono', 'Roboto Mono', monospace;
105105

106106
$font-file-path: '../fonts' !default;
107107

0 commit comments

Comments
 (0)