Skip to content

Commit e344d44

Browse files
gurinder39gurinder39
committed
Merge branch 'fluxninja_micro_frontends' into fluxninja_micro_frontends_v10.0.5
2 parents 6444175 + c4414b9 commit e344d44

File tree

6 files changed

+31
-46
lines changed

6 files changed

+31
-46
lines changed

‎.betterer.results

+16-37
Original file line numberDiff line numberDiff line change
@@ -1251,24 +1251,6 @@ exports[`better eslint`] = {
12511251
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
12521252
[0, 0, 0, "Unexpected any. Specify a different type.", "1"]
12531253
],
1254-
"packages/grafana-ui/src/components/Table/utils.ts:5381": [
1255-
[0, 0, 0, "Do not use any type assertions.", "0"],
1256-
[0, 0, 0, "Do not use any type assertions.", "1"],
1257-
[0, 0, 0, "Unexpected any. Specify a different type.", "2"],
1258-
[0, 0, 0, "Unexpected any. Specify a different type.", "3"],
1259-
[0, 0, 0, "Unexpected any. Specify a different type.", "4"],
1260-
[0, 0, 0, "Unexpected any. Specify a different type.", "5"],
1261-
[0, 0, 0, "Do not use any type assertions.", "6"],
1262-
[0, 0, 0, "Unexpected any. Specify a different type.", "7"],
1263-
[0, 0, 0, "Unexpected any. Specify a different type.", "8"],
1264-
[0, 0, 0, "Unexpected any. Specify a different type.", "9"],
1265-
[0, 0, 0, "Unexpected any. Specify a different type.", "10"],
1266-
[0, 0, 0, "Unexpected any. Specify a different type.", "11"],
1267-
[0, 0, 0, "Unexpected any. Specify a different type.", "12"],
1268-
[0, 0, 0, "Unexpected any. Specify a different type.", "13"],
1269-
[0, 0, 0, "Unexpected any. Specify a different type.", "14"],
1270-
[0, 0, 0, "Do not use any type assertions.", "15"]
1271-
],
12721254
"packages/grafana-ui/src/components/Tags/Tag.tsx:5381": [
12731255
[0, 0, 0, "Do not use any type assertions.", "0"]
12741256
],
@@ -3575,9 +3557,25 @@ exports[`better eslint`] = {
35753557
[0, 0, 0, "Unexpected any. Specify a different type.", "7"],
35763558
[0, 0, 0, "Unexpected any. Specify a different type.", "8"]
35773559
],
3560+
"public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts:5381": [
3561+
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
3562+
[0, 0, 0, "Unexpected any. Specify a different type.", "1"],
3563+
[0, 0, 0, "Unexpected any. Specify a different type.", "2"],
3564+
[0, 0, 0, "Unexpected any. Specify a different type.", "3"],
3565+
[0, 0, 0, "Unexpected any. Specify a different type.", "4"],
3566+
[0, 0, 0, "Unexpected any. Specify a different type.", "5"],
3567+
[0, 0, 0, "Unexpected any. Specify a different type.", "6"]
3568+
],
35783569
"public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.ts:5381": [
35793570
[0, 0, 0, "Do not use any type assertions.", "0"]
35803571
],
3572+
"public/app/plugins/datasource/azuremonitor/azure_monitor/response_parser.ts:5381": [
3573+
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
3574+
[0, 0, 0, "Unexpected any. Specify a different type.", "1"],
3575+
[0, 0, 0, "Unexpected any. Specify a different type.", "2"],
3576+
[0, 0, 0, "Unexpected any. Specify a different type.", "3"],
3577+
[0, 0, 0, "Unexpected any. Specify a different type.", "4"]
3578+
],
35813579
"public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/QueryField.tsx:5381": [
35823580
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
35833581
[0, 0, 0, "Do not use any type assertions.", "1"],
@@ -3598,26 +3596,10 @@ exports[`better eslint`] = {
35983596
[0, 0, 0, "Do not use any type assertions.", "2"],
35993597
[0, 0, 0, "Unexpected any. Specify a different type.", "3"]
36003598
],
3601-
"public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.ts:5381": [
3602-
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
3603-
[0, 0, 0, "Unexpected any. Specify a different type.", "1"],
3604-
[0, 0, 0, "Unexpected any. Specify a different type.", "2"],
3605-
[0, 0, 0, "Unexpected any. Specify a different type.", "3"],
3606-
[0, 0, 0, "Unexpected any. Specify a different type.", "4"],
3607-
[0, 0, 0, "Unexpected any. Specify a different type.", "5"],
3608-
[0, 0, 0, "Unexpected any. Specify a different type.", "6"]
3609-
],
36103599
"public/app/plugins/datasource/cloud-monitoring/components/Aggregation.tsx:5381": [
36113600
[0, 0, 0, "Do not use any type assertions.", "0"],
36123601
[0, 0, 0, "Do not use any type assertions.", "1"]
36133602
],
3614-
"public/app/plugins/datasource/azuremonitor/azure_monitor/response_parser.ts:5381": [
3615-
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
3616-
[0, 0, 0, "Unexpected any. Specify a different type.", "1"],
3617-
[0, 0, 0, "Unexpected any. Specify a different type.", "2"],
3618-
[0, 0, 0, "Unexpected any. Specify a different type.", "3"],
3619-
[0, 0, 0, "Unexpected any. Specify a different type.", "4"]
3620-
],
36213603
"public/app/plugins/datasource/cloud-monitoring/components/MQLQueryEditor.tsx:5381": [
36223604
[0, 0, 0, "Unexpected any. Specify a different type.", "0"]
36233605
],
@@ -5372,9 +5354,6 @@ exports[`better eslint`] = {
53725354
"public/app/plugins/panel/piechart/PieChart.tsx:5381": [
53735355
[0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
53745356
],
5375-
"public/app/plugins/panel/piechart/PieChart.tsx:5381": [
5376-
[0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
5377-
],
53785357
"public/app/plugins/panel/piechart/migrations.ts:5381": [
53795358
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
53805359
[0, 0, 0, "Unexpected any. Specify a different type.", "1"]

‎.opsninja.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ applications:
66
image:
77
name: grafana
88
dockerfile: Dockerfile
9+
argo_manifests:
10+
- app_path: apps/app-of-apps/cloud/cloud-prometheus.yaml
11+
image_prefix: NINJA_GRAFANA_

‎packages/grafana-data/src/themes/createTypography.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export interface ThemeTypographyInput {
5353
htmlFontSize?: number;
5454
}
5555

56-
const defaultFontFamily = 'Nunito, Roboto, Arial'; //'"Roboto", "Helvetica", "Arial", sans-serif';
57-
const defaultFontFamilyMonospace = "'Nunito Mono', monospace";
56+
const defaultFontFamily = '"Source Sans Pro", Nunito, Roboto, Arial'; //'"Roboto", "Helvetica", "Arial", sans-serif';
57+
const defaultFontFamilyMonospace = "'Nunito Mono', 'Roboto Mono', monospace"; // "'Roboto Mono', monospace";
5858

5959
export function createTypography(colors: ThemeColors, typographyInput: ThemeTypographyInput = {}): ThemeTypography {
6060
const {

‎public/app/features/dashboard/containers/DashboardPage.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export interface DashboardPageRouteParams {
4343
type?: string;
4444
slug?: string;
4545
accessToken?: string;
46+
version?: number;
4647
}
4748

4849
export type DashboardPageRouteSearchParams = {
@@ -141,7 +142,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
141142
routeName: this.props.route.routeName,
142143
fixUrl: true,
143144
accessToken: match.params.accessToken,
144-
keybindingSrv: this.context.keybindings,
145+
keybindingSrv: this.context?.keybindings,
145146
});
146147

147148
// small delay to start live updates

‎public/app/features/dashboard/containers/SoloPanelPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class SoloPanelPage extends Component<Props, State> {
5252
urlType: match.params.type,
5353
routeName: route.routeName,
5454
fixUrl: false,
55-
keybindingSrv: this.context.keybindings,
55+
keybindingSrv: this.context?.keybindings,
5656
});
5757
}
5858

‎public/app/features/templating/template_srv.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,13 @@ export class TemplateSrv implements BaseTemplateSrv {
319319
private _replaceWithVariableRegex(text: string, format: string | Function | undefined, replace: ReplaceFunction) {
320320
this.regex.lastIndex = 0;
321321

322-
return text.replace(this.regex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
323-
const variableName = var1 || var2 || var3;
324-
const fmt = fmt2 || fmt3 || format;
325-
return replace(match, variableName, fieldPath, fmt);
326-
});
322+
return (
323+
text?.replace(this.regex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
324+
const variableName = var1 || var2 || var3;
325+
const fmt = fmt2 || fmt3 || format;
326+
return replace(match, variableName, fieldPath, fmt);
327+
}) || ''
328+
);
327329
}
328330

329331
isAllValue(value: any) {

0 commit comments

Comments
 (0)