diff --git a/public/app/core/components/sidemenu/__snapshots__/SideMenu.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/SideMenu.test.tsx.snap
index ec2fa845c6d..8d23cdc1565 100644
--- a/public/app/core/components/sidemenu/__snapshots__/SideMenu.test.tsx.snap
+++ b/public/app/core/components/sidemenu/__snapshots__/SideMenu.test.tsx.snap
@@ -2,16 +2,16 @@
exports[`Render should render component 1`] = `
Array [
-
-
,
+ ,
{
+ const rowCopy = { ...row };
const previous = result[result.length - 1];
if (index > 0 && isDuplicateRow(row, previous, strategy)) {
previous.duplicates++;
} else {
- row.duplicates = 0;
- result.push(row);
+ rowCopy.duplicates = 0;
+ result.push(rowCopy);
}
return result;
}, []);
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index 7bb753e6f71..e3b10f129d1 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -1,7 +1,6 @@
import config from 'app/core/config';
import _ from 'lodash';
import coreModule from 'app/core/core_module';
-import store from 'app/core/store';
export class User {
isGrafanaAdmin: any;
@@ -29,13 +28,10 @@ export class ContextSrv {
isSignedIn: any;
isGrafanaAdmin: any;
isEditor: any;
- sidemenu: any;
sidemenuSmallBreakpoint = false;
hasEditPermissionInFolders: boolean;
constructor() {
- this.sidemenu = store.getBool('grafana.sidemenu', true);
-
if (!config.bootData) {
config.bootData = { user: {}, settings: {} };
}
@@ -55,11 +51,6 @@ export class ContextSrv {
return !!(document.visibilityState === undefined || document.visibilityState === 'visible');
}
- toggleSideMenu() {
- this.sidemenu = !this.sidemenu;
- store.set('grafana.sidemenu', this.sidemenu);
- }
-
hasAccessToExplore() {
return (this.isEditor || config.viewersCanEdit) && config.exploreEnabled;
}
diff --git a/public/app/core/specs/logs_model.test.ts b/public/app/core/specs/logs_model.test.ts
index c59d18e8b7d..dcd1e483330 100644
--- a/public/app/core/specs/logs_model.test.ts
+++ b/public/app/core/specs/logs_model.test.ts
@@ -113,6 +113,34 @@ describe('dedupLogRows()', () => {
},
]);
});
+
+ test('should return to non-deduped state on same log result', () => {
+ const logs = {
+ rows: [
+ {
+ entry: 'INFO 123',
+ },
+ {
+ entry: 'WARN 123',
+ },
+ {
+ entry: 'WARN 123',
+ },
+ ],
+ };
+ expect(dedupLogRows(logs as LogsModel, LogsDedupStrategy.exact).rows).toEqual([
+ {
+ duplicates: 0,
+ entry: 'INFO 123',
+ },
+ {
+ duplicates: 1,
+ entry: 'WARN 123',
+ },
+ ]);
+
+ expect(dedupLogRows(logs as LogsModel, LogsDedupStrategy.none).rows).toEqual(logs.rows);
+ });
});
describe('calculateFieldStats()', () => {
diff --git a/public/app/features/explore/LogLabels.tsx b/public/app/features/explore/LogLabels.tsx
index 7105a2a5370..24d6e1ec23c 100644
--- a/public/app/features/explore/LogLabels.tsx
+++ b/public/app/features/explore/LogLabels.tsx
@@ -13,8 +13,19 @@ interface Props {
export class LogLabels extends PureComponent
{
render() {
const { getRows, labels, onClickLabel, plain } = this.props;
- return Object.keys(labels).map(key => (
-
- ));
+ return (
+
+ {Object.keys(labels).map(key => (
+
+ ))}
+
+ );
}
}
diff --git a/public/app/features/explore/LogRow.tsx b/public/app/features/explore/LogRow.tsx
index d7615446b21..e45864f7b54 100644
--- a/public/app/features/explore/LogRow.tsx
+++ b/public/app/features/explore/LogRow.tsx
@@ -150,7 +150,7 @@ export class LogRow extends PureComponent {
+
{row.timeLocal}
)}
diff --git a/public/app/features/explore/state/selectors.test.ts b/public/app/features/explore/state/selectors.test.ts
new file mode 100644
index 00000000000..3a1fa5102ae
--- /dev/null
+++ b/public/app/features/explore/state/selectors.test.ts
@@ -0,0 +1,108 @@
+import { deduplicatedLogsSelector } from './selectors';
+import { LogsDedupStrategy } from 'app/core/logs_model';
+import { ExploreItemState } from 'app/types';
+
+const state = {
+ logsResult: {
+ rows: [
+ {
+ entry: '2019-03-05T11:00:56Z sntpc sntpc[1]: offset=-0.033938, delay=0.000649',
+ },
+ {
+ entry: '2019-03-05T11:00:26Z sntpc sntpc[1]: offset=-0.033730, delay=0.000581',
+ },
+ {
+ entry: '2019-03-05T10:59:56Z sntpc sntpc[1]: offset=-0.034184, delay=0.001089',
+ },
+ {
+ entry: '2019-03-05T10:59:26Z sntpc sntpc[1]: offset=-0.033972, delay=0.000582',
+ },
+ {
+ entry: '2019-03-05T10:58:56Z sntpc sntpc[1]: offset=-0.033955, delay=0.000606',
+ },
+ {
+ entry: '2019-03-05T10:58:26Z sntpc sntpc[1]: offset=-0.034067, delay=0.000616',
+ },
+ {
+ entry: '2019-03-05T10:57:56Z sntpc sntpc[1]: offset=-0.034155, delay=0.001021',
+ },
+ {
+ entry: '2019-03-05T10:57:26Z sntpc sntpc[1]: offset=-0.035797, delay=0.000883',
+ },
+ {
+ entry: '2019-03-05T10:56:56Z sntpc sntpc[1]: offset=-0.046818, delay=0.000605',
+ },
+ {
+ entry: '2019-03-05T10:56:26Z sntpc sntpc[1]: offset=-0.049200, delay=0.000584',
+ },
+ ],
+ },
+ hiddenLogLevels: undefined,
+ dedupStrategy: LogsDedupStrategy.none,
+};
+
+describe('Deduplication selector', () => {
+ it('should correctly deduplicate log rows when changing strategy multiple times', () => {
+ // Simulating sequence of UI actions that was causing a problem with deduplication counter being visible when unnecessary.
+ // The sequence was changing dedup strategy: (none -> exact -> numbers -> signature -> none) *2 -> exact. After that the first
+ // row contained information that was deduped, while it shouldn't be.
+ // Problem was caused by mutating the log results entries in redux state. The memoisation hash for deduplicatedLogsSelector
+ // was changing depending on duplicates information from log row state, while should be dependand on log row only.
+
+ let dedups = deduplicatedLogsSelector(state as ExploreItemState);
+ expect(dedups.rows.length).toBe(10);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.none,
+ } as ExploreItemState);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.exact,
+ } as ExploreItemState);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.numbers,
+ } as ExploreItemState);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.signature,
+ } as ExploreItemState);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.none,
+ } as ExploreItemState);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.exact,
+ } as ExploreItemState);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.numbers,
+ } as ExploreItemState);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.signature,
+ } as ExploreItemState);
+
+ deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.none,
+ } as ExploreItemState);
+
+ dedups = deduplicatedLogsSelector({
+ ...state,
+ dedupStrategy: LogsDedupStrategy.exact,
+ } as ExploreItemState);
+
+ // Expecting that no row has duplicates now
+ expect(dedups.rows.reduce((acc, row) => acc + row.duplicates, 0)).toBe(0);
+ });
+});
diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 674c9581ce5..33872c7d6d5 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -13,7 +13,7 @@
+ placeholder="{{passwordHint}}">