IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update Monthly patch updates (#64323)

Browse Source 
* Update Monthly patch updates

* don't update dangerously-set-html-content

* run prettier

* fix types

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
This commit is contained in:
renovate[bot]
2023-03-08 09:38:06 +00:00
committed by GitHub
parent a317e48de8
commit 523f675dd8
18 changed files with 806 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/components/QueryOperationRow/QueryOperationRowHeader.tsx
View File

@@ -1,6 +1,6 @@
import { css, cx } from '@emotion/css';
import React, { MouseEventHandler } from 'react';
import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd';
import { DraggableProvided } from 'react-beautiful-dnd';
import { GrafanaTheme2 } from '@grafana/data';
import { Icon, IconButton, useStyles2 } from '@grafana/ui';
@@ -9,7 +9,7 @@ interface QueryOperationRowHeaderProps {
actionsElement?: React.ReactNode;
disabled?: boolean;
draggable: boolean;
dragHandleProps?: DraggableProvidedDragHandleProps;
dragHandleProps?: DraggableProvided['dragHandleProps'];
headerElement?: React.ReactNode;
isContentVisible: boolean;
onRowToggle: () => void;

4
public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts
View File

@@ -99,6 +99,8 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
getSession: jest.fn(),
resetUser: jest.fn(),
resetSession: jest.fn(),
setView: jest.fn(),
getView: jest.fn(),
},
config: {
globalObjectKey: '',
@@ -193,6 +195,8 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
getSession: jest.fn(),
resetUser: jest.fn(),
resetSession: jest.fn(),
setView: jest.fn(),
getView: jest.fn(),
},
config: {
globalObjectKey: '',

4
public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx
View File

@@ -199,10 +199,10 @@ const getStyles = (theme: GrafanaTheme2) => ({
margin-bottom: ${theme.spacing(3)};
`,
deleteButton: css`
margin-left: ${theme.spacing(3)}; ;
margin-left: ${theme.spacing(3)};
`,
deleteButtonMobile: css`
margin-top: ${theme.spacing(2)}; ;
margin-top: ${theme.spacing(2)};
`,
});

2
public/app/features/explore/LogsSamplePanel.tsx
View File

@@ -122,7 +122,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
logSamplesButton: css`
position: absolute;
top: ${theme.spacing(1)};
right: ${theme.spacing(1)}; ;
right: ${theme.spacing(1)};
`,
logContainer: css`
overflow-x: scroll;

2
public/app/features/explore/TraceView/components/model/link-patterns.tsx
View File

@@ -239,7 +239,7 @@ export function createGetLinks(linkPatterns: ProcessedLinkPattern[], cache: Weak
const processedLinks = (getConfigValue('linkPatterns') || [])
.map(processLinkPattern)
.filter((link): link is ProcessedLinkPattern => Boolean(link));
.filter((link: ProcessedLinkPattern | null): link is ProcessedLinkPattern => Boolean(link));
export const getTraceLinks: (trace: Trace | undefined) => TLinksRV = memoize(10)((trace: Trace | undefined) => {
const result: TLinksRV = [];

2
public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/state/reducer.test.ts
View File

@@ -139,7 +139,7 @@ describe('Bucket Aggregations Reducer', () => {
type: 'date_histogram',
};
const expectedSettings: typeof firstAggregation['settings'] = {
const expectedSettings: (typeof firstAggregation)['settings'] = {
min_doc_count: '1',
};

6
public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.test.ts
View File

@@ -170,7 +170,7 @@ describe('Metric Aggregations Reducer', () => {
type: 'count',
};
const expectedSettings: typeof firstAggregation['settings'] = {
const expectedSettings: (typeof firstAggregation)['settings'] = {
unit: 'Changed unit',
};
@@ -195,7 +195,7 @@ describe('Metric Aggregations Reducer', () => {
type: 'count',
};
const expectedMeta: typeof firstAggregation['meta'] = {
const expectedMeta: (typeof firstAggregation)['meta'] = {
avg: false,
};
@@ -215,7 +215,7 @@ describe('Metric Aggregations Reducer', () => {
type: 'count',
};
const expectedHide: typeof firstAggregation['hide'] = false;
const expectedHide: (typeof firstAggregation)['hide'] = false;
reducerTester<ElasticsearchQuery['metrics']>()
.givenReducer(reducer, [firstAggregation, secondAggregation])

4
public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx
View File

@@ -1,6 +1,6 @@
import { css } from '@emotion/css';
import React, { useState } from 'react';
import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd';
import { DraggableProvided } from 'react-beautiful-dnd';
import { GrafanaTheme2, SelectableValue } from '@grafana/data';
import { FlexItem } from '@grafana/experimental';
@@ -14,7 +14,7 @@ export interface Props {
def: QueryBuilderOperationDef;
index: number;
queryModeller: VisualQueryModeller;
dragHandleProps?: DraggableProvidedDragHandleProps;
dragHandleProps?: DraggableProvided['dragHandleProps'];
onChange: (index: number, update: QueryBuilderOperation) => void;
onRemove: (index: number) => void;
}

2
public/app/plugins/panel/graph/Legend/LegendSeriesItem.tsx
View File

@@ -6,7 +6,7 @@ import { SeriesColorPicker, SeriesIcon } from '@grafana/ui';
import { TimeSeries } from 'app/core/core';
export const LEGEND_STATS = ['min', 'max', 'avg', 'current', 'total'] as const;
export type LegendStat = typeof LEGEND_STATS[number];
export type LegendStat = (typeof LEGEND_STATS)[number];
export interface LegendLabelProps {
series: TimeSeries;

4
public/app/types/explore.ts
View File

@@ -87,7 +87,7 @@ export interface ExploreState {
}
export const EXPLORE_GRAPH_STYLES = ['lines', 'bars', 'points', 'stacked_lines', 'stacked_bars'] as const;
export type ExploreGraphStyle = typeof EXPLORE_GRAPH_STYLES[number];
export type ExploreGraphStyle = (typeof EXPLORE_GRAPH_STYLES)[number];
export interface ExploreItemState {
/**
@@ -264,7 +264,7 @@ export enum TABLE_RESULTS_STYLE {
raw = 'raw',
}
export const TABLE_RESULTS_STYLES = [TABLE_RESULTS_STYLE.table, TABLE_RESULTS_STYLE.raw];
export type TableResultsStyle = typeof TABLE_RESULTS_STYLES[number];
export type TableResultsStyle = (typeof TABLE_RESULTS_STYLES)[number];
export interface SupplementaryQuery {
enabled: boolean;