From 0b05cd4e004fd3e9c78b3cec776961ae874b912d Mon Sep 17 00:00:00 2001 From: Ivana Date: Wed, 12 Aug 2020 16:33:49 +0200 Subject: [PATCH] Update LogsDedupStrategy enum to keep consistent with radio button capitalization --- packages/grafana-data/src/types/logs.ts | 8 ++++---- .../grafana-ui/src/components/Logs/LogRows.test.tsx | 12 ++++++------ packages/grafana-ui/src/components/Logs/LogRows.tsx | 2 +- public/app/core/logs_model.test.ts | 12 ++++++------ public/app/core/logs_model.ts | 8 ++++---- public/app/core/utils/explore.test.ts | 2 +- public/app/core/utils/explore.ts | 2 +- public/app/features/explore/Logs.tsx | 4 ++-- public/app/features/explore/LogsContainer.tsx | 3 ++- public/app/features/explore/state/actions.test.ts | 2 +- public/app/features/explore/state/reducers.test.ts | 2 +- public/app/features/explore/state/reducers.ts | 2 +- public/app/features/explore/state/selectors.test.ts | 6 +++--- public/app/plugins/panel/logs/LogsPanel.tsx | 2 +- 14 files changed, 34 insertions(+), 33 deletions(-) diff --git a/packages/grafana-data/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts index bf3a6fdb958..cb0f4c2b964 100644 --- a/packages/grafana-data/src/types/logs.ts +++ b/packages/grafana-data/src/types/logs.ts @@ -97,10 +97,10 @@ export interface LogLabelStatsModel { } export enum LogsDedupStrategy { - none = 'none', - exact = 'exact', - numbers = 'numbers', - signature = 'signature', + None = 'none', + Exact = 'exact', + Numbers = 'numbers', + Signature = 'signature', } export interface LogsParser { diff --git a/packages/grafana-ui/src/components/Logs/LogRows.test.tsx b/packages/grafana-ui/src/components/Logs/LogRows.test.tsx index 6e5fc500656..ad970c6553c 100644 --- a/packages/grafana-ui/src/components/Logs/LogRows.test.tsx +++ b/packages/grafana-ui/src/components/Logs/LogRows.test.tsx @@ -11,7 +11,7 @@ describe('LogRows', () => { const wrapper = mount( { const wrapper = mount( { { const wrapper = mount( { const wrapper = mount( { const wrapper = mount( { const dedupCount = dedupedRows ? dedupedRows.reduce((sum, row) => (row.duplicates ? sum + row.duplicates : sum), 0) : 0; - const showDuplicates = dedupStrategy !== LogsDedupStrategy.none && dedupCount > 0; + const showDuplicates = dedupStrategy !== LogsDedupStrategy.None && dedupCount > 0; // For horizontal scrolling we can't use CustomScrollbar as it causes the problem with logs context - it is not visible // for top log rows. Therefore we use CustomScrollbar only in LogsPanel and for Explore, we use custom css styling. diff --git a/public/app/core/logs_model.test.ts b/public/app/core/logs_model.test.ts index 407c117b04d..0507dbf4d0c 100644 --- a/public/app/core/logs_model.test.ts +++ b/public/app/core/logs_model.test.ts @@ -20,7 +20,7 @@ describe('dedupLogRows()', () => { entry: 'WARN test 1.23 on [xxx]', }, ] as any; - expect(dedupLogRows(rows, LogsDedupStrategy.none)).toMatchObject(rows); + expect(dedupLogRows(rows, LogsDedupStrategy.None)).toMatchObject(rows); }); test('should dedup on exact matches', () => { @@ -38,7 +38,7 @@ describe('dedupLogRows()', () => { entry: 'WARN test 1.23 on [xxx]', }, ] as any; - expect(dedupLogRows(rows, LogsDedupStrategy.exact)).toEqual([ + expect(dedupLogRows(rows, LogsDedupStrategy.Exact)).toEqual([ { duplicates: 1, entry: 'WARN test 1.23 on [xxx]', @@ -69,7 +69,7 @@ describe('dedupLogRows()', () => { entry: 'WARN test 1.23 on [xxx]', }, ] as any; - expect(dedupLogRows(rows, LogsDedupStrategy.numbers)).toEqual([ + expect(dedupLogRows(rows, LogsDedupStrategy.Numbers)).toEqual([ { duplicates: 1, entry: 'WARN test 1.2323423 on [xxx]', @@ -100,7 +100,7 @@ describe('dedupLogRows()', () => { entry: 'WARN test 1.23 on [xxx]', }, ] as any; - expect(dedupLogRows(rows, LogsDedupStrategy.signature)).toEqual([ + expect(dedupLogRows(rows, LogsDedupStrategy.Signature)).toEqual([ { duplicates: 3, entry: 'WARN test 1.2323423 on [xxx]', @@ -120,7 +120,7 @@ describe('dedupLogRows()', () => { entry: 'WARN 123', }, ] as any; - expect(dedupLogRows(rows, LogsDedupStrategy.exact)).toEqual([ + expect(dedupLogRows(rows, LogsDedupStrategy.Exact)).toEqual([ { duplicates: 0, entry: 'INFO 123', @@ -131,7 +131,7 @@ describe('dedupLogRows()', () => { }, ]); - expect(dedupLogRows(rows, LogsDedupStrategy.none)).toEqual(rows); + expect(dedupLogRows(rows, LogsDedupStrategy.None)).toEqual(rows); }); }); diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts index a6fee79c96a..8609820b787 100644 --- a/public/app/core/logs_model.ts +++ b/public/app/core/logs_model.ts @@ -48,14 +48,14 @@ export const LogLevelColor = { const isoDateRegexp = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-6]\d[,\.]\d+([+-][0-2]\d:[0-5]\d|Z)/g; function isDuplicateRow(row: LogRowModel, other: LogRowModel, strategy?: LogsDedupStrategy): boolean { switch (strategy) { - case LogsDedupStrategy.exact: + case LogsDedupStrategy.Exact: // Exact still strips dates return row.entry.replace(isoDateRegexp, '') === other.entry.replace(isoDateRegexp, ''); - case LogsDedupStrategy.numbers: + case LogsDedupStrategy.Numbers: return row.entry.replace(/\d/g, '') === other.entry.replace(/\d/g, ''); - case LogsDedupStrategy.signature: + case LogsDedupStrategy.Signature: return row.entry.replace(/\w/g, '') === other.entry.replace(/\w/g, ''); default: @@ -64,7 +64,7 @@ function isDuplicateRow(row: LogRowModel, other: LogRowModel, strategy?: LogsDed } export function dedupLogRows(rows: LogRowModel[], strategy?: LogsDedupStrategy): LogRowModel[] { - if (strategy === LogsDedupStrategy.none) { + if (strategy === LogsDedupStrategy.None) { return rows; } diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts index bffe80a9f1f..9eee9533ab7 100644 --- a/public/app/core/utils/explore.test.ts +++ b/public/app/core/utils/explore.test.ts @@ -25,7 +25,7 @@ const DEFAULT_EXPLORE_STATE: ExploreUrlState = { showingGraph: true, showingTable: true, showingLogs: true, - dedupStrategy: LogsDedupStrategy.none, + dedupStrategy: LogsDedupStrategy.None, }, originPanelId: undefined, }; diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts index 6a5cb90e82a..ca29af314cf 100644 --- a/public/app/core/utils/explore.ts +++ b/public/app/core/utils/explore.ts @@ -43,7 +43,7 @@ export const DEFAULT_UI_STATE = { showingTable: true, showingGraph: true, showingLogs: true, - dedupStrategy: LogsDedupStrategy.none, + dedupStrategy: LogsDedupStrategy.None, }; const MAX_HISTORY_ITEMS = 100; diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx index fffe1aacf84..7645e16c8c6 100644 --- a/public/app/features/explore/Logs.tsx +++ b/public/app/features/explore/Logs.tsx @@ -112,7 +112,7 @@ export class Logs extends PureComponent { onChangeDedup = (dedup: LogsDedupStrategy) => { const { onDedupStrategyChange } = this.props; if (this.props.dedupStrategy === dedup) { - return onDedupStrategyChange(LogsDedupStrategy.none); + return onDedupStrategyChange(LogsDedupStrategy.None); } return onDedupStrategyChange(dedup); }; @@ -202,7 +202,7 @@ export class Logs extends PureComponent { : 0; const meta = logsMeta ? [...logsMeta] : []; - if (dedupStrategy !== LogsDedupStrategy.none) { + if (dedupStrategy !== LogsDedupStrategy.None) { meta.push({ label: 'Dedup count', value: dedupCount, diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx index c93ad6524df..83b8386f010 100644 --- a/public/app/features/explore/LogsContainer.tsx +++ b/public/app/features/explore/LogsContainer.tsx @@ -116,6 +116,7 @@ export class LogsContainer extends PureComponent ) => { const exploreId = ExploreId.left; const containerWidth = 1920; const eventBridge = {} as Emitter; - const ui = { dedupStrategy: LogsDedupStrategy.none, showingGraph: false, showingLogs: false, showingTable: false }; + const ui = { dedupStrategy: LogsDedupStrategy.None, showingGraph: false, showingLogs: false, showingTable: false }; const timeZone = DefaultTimeZone; const range = testRange; const urlState: ExploreUrlState = { diff --git a/public/app/features/explore/state/reducers.test.ts b/public/app/features/explore/state/reducers.test.ts index 20b73e4ab69..d9fa9fbc768 100644 --- a/public/app/features/explore/state/reducers.test.ts +++ b/public/app/features/explore/state/reducers.test.ts @@ -300,7 +300,7 @@ export const setup = (urlStateOverrides?: any) => { to: '', }, ui: { - dedupStrategy: LogsDedupStrategy.none, + dedupStrategy: LogsDedupStrategy.None, showingGraph: false, showingTable: false, showingLogs: false, diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts index cc3f311b496..7da740c2d8f 100644 --- a/public/app/features/explore/state/reducers.ts +++ b/public/app/features/explore/state/reducers.ts @@ -120,7 +120,7 @@ export const makeExploreItemState = (): ExploreItemState => ({ tableResult: null, graphResult: null, logsResult: null, - dedupStrategy: LogsDedupStrategy.none, + dedupStrategy: LogsDedupStrategy.None, eventBridge: (null as unknown) as Emitter, }); diff --git a/public/app/features/explore/state/selectors.test.ts b/public/app/features/explore/state/selectors.test.ts index 86527447cc8..d3abe0ba9eb 100644 --- a/public/app/features/explore/state/selectors.test.ts +++ b/public/app/features/explore/state/selectors.test.ts @@ -53,7 +53,7 @@ const state: any = { ], }, hiddenLogLevels: undefined, - dedupStrategy: LogsDedupStrategy.none, + dedupStrategy: LogsDedupStrategy.None, }; describe('Deduplication selector', () => { @@ -66,7 +66,7 @@ describe('Deduplication selector', () => { it('should correctly extracts rows and deduplicates them', () => { const dedups = deduplicatedRowsSelector({ ...state, - dedupStrategy: LogsDedupStrategy.numbers, + dedupStrategy: LogsDedupStrategy.Numbers, } as ExploreItemState); expect(dedups?.length).toBe(2); expect(dedups).not.toBe(state.logsResult.rows); @@ -82,7 +82,7 @@ describe('Deduplication selector', () => { dedups = deduplicatedRowsSelector({ ...state, - dedupStrategy: LogsDedupStrategy.numbers, + dedupStrategy: LogsDedupStrategy.Numbers, hiddenLogLevels: [LogLevel.debug], } as ExploreItemState); diff --git a/public/app/plugins/panel/logs/LogsPanel.tsx b/public/app/plugins/panel/logs/LogsPanel.tsx index a2a12786748..450b6c49001 100644 --- a/public/app/plugins/panel/logs/LogsPanel.tsx +++ b/public/app/plugins/panel/logs/LogsPanel.tsx @@ -26,7 +26,7 @@ export const LogsPanel: React.FunctionComponent = ({