- {valueFormatted}
+ {value.text}
-
-
- );
}
- renderHorizontalLCD(valueFormatted: string, valuePercent: number) {
- const { height, width, maxValue, minValue } = this.props;
+ renderRetroBars(): ReactNode {
+ const { height, width, maxValue, minValue, value } = this.props;
const valueRange = maxValue - minValue;
- const maxWidth = width * BAR_SIZE_RATIO;
- const cellSpacing = 4;
- const cellCount = 30;
- const cellWidth = (maxWidth - cellSpacing * cellCount) / cellCount;
+ const maxSize = this.size * BAR_SIZE_RATIO;
+ const cellSpacing = 5;
+ const cellCount = maxSize / 20;
+ const cellSize = (maxSize - cellSpacing * cellCount) / cellCount;
const colors = this.getValueColors();
- const valueStyles = this.getValueStyles(valueFormatted, colors.value, width * (1 - BAR_SIZE_RATIO));
- valueStyles.marginLeft = '8px';
+ const spaceForText = this.isVertical ? width : Math.min(this.size - maxSize, height);
+ const valueStyles = this.getValueStyles(value.text, colors.value, spaceForText);
const containerStyles: CSSProperties = {
width: `${width}px`,
height: `${height}px`,
display: 'flex',
- flexDirection: 'row',
- alignItems: 'center',
};
+ if (this.isVertical) {
+ containerStyles.flexDirection = 'column-reverse';
+ containerStyles.alignItems = 'center';
+ valueStyles.marginBottom = '20px';
+ } else {
+ containerStyles.flexDirection = 'row';
+ containerStyles.alignItems = 'center';
+ valueStyles.marginLeft = '20px';
+ }
+
const cells: JSX.Element[] = [];
for (let i = 0; i < cellCount; i++) {
const currentValue = (valueRange / cellCount) * i;
const cellColor = this.getCellColor(currentValue);
const cellStyles: CSSProperties = {
- width: `${cellWidth}px`,
- backgroundColor: cellColor,
- marginRight: '4px',
- height: `${height}px`,
borderRadius: '2px',
};
+ if (cellColor.isLit) {
+ cellStyles.boxShadow = `0 0 4px ${cellColor.border}`;
+ cellStyles.backgroundImage = `radial-gradient(${cellColor.background} 10%, ${cellColor.backgroundShade})`;
+ } else {
+ cellStyles.backgroundColor = cellColor.background;
+ }
+
+ if (this.isVertical) {
+ cellStyles.height = `${cellSize}px`;
+ cellStyles.width = `${width}px`;
+ cellStyles.marginTop = `${cellSpacing}px`;
+ } else {
+ cellStyles.width = `${cellSize}px`;
+ cellStyles.height = `${height}px`;
+ cellStyles.marginRight = `${cellSpacing}px`;
+ }
+
cells.push();
}
@@ -210,30 +285,22 @@ export class BarGauge extends PureComponent
- {valueFormatted}
-
-
{cells}
);
}
-
- render() {
- const { maxValue, minValue, orientation, unit, decimals } = this.props;
-
- const numericValue = this.getNumericValue();
- const valuePercent = Math.min(numericValue / (maxValue - minValue), 1);
-
- const formatFunc = getValueFormat(unit);
- const valueFormatted = formatFunc(numericValue, decimals);
- const vertical = orientation === 'vertical';
-
- return vertical
- ? this.renderVerticalBar(valueFormatted, valuePercent)
- : this.renderHorizontalLCD(valueFormatted, valuePercent);
- }
}
interface BarColors {
value: string;
- bar: string;
+ background: string;
border: string;
}
+
+interface CellColors {
+ background: string;
+ backgroundShade?: string;
+ border: string;
+ isLit?: boolean;
+}
diff --git a/packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap b/packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap
index 65c647bd90c..25a2e79b647 100644
--- a/packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap
+++ b/packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap
@@ -6,353 +6,37 @@ exports[`Render BarGauge with basic options should render 1`] = `
Object {
"alignItems": "center",
"display": "flex",
- "flexDirection": "row",
+ "flexDirection": "row-reverse",
"height": "300px",
+ "justifyContent": "flex-end",
"width": "300px",
}
}
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {valueFormatted}
+ {value.text}
25
+
`;
diff --git a/packages/grafana-ui/src/components/DeleteButton/DeleteButton.tsx b/packages/grafana-ui/src/components/DeleteButton/DeleteButton.tsx
index df65d156ab3..d262c821968 100644
--- a/packages/grafana-ui/src/components/DeleteButton/DeleteButton.tsx
+++ b/packages/grafana-ui/src/components/DeleteButton/DeleteButton.tsx
@@ -2,6 +2,7 @@ import React, { PureComponent, SyntheticEvent } from 'react';
interface Props {
onConfirm(): void;
+ disabled?: boolean;
}
interface State {
@@ -33,25 +34,22 @@ export class DeleteButton extends PureComponent
diff --git a/packages/grafana-ui/src/components/Table/Table.story.tsx b/packages/grafana-ui/src/components/Table/Table.story.tsx
index 03765730343..8ab53a1ac77 100644
--- a/packages/grafana-ui/src/components/Table/Table.story.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.story.tsx
@@ -40,8 +40,6 @@ export function makeDummyTable(columnCount: number, rowCount: number): TableData
const suffix = (rowId + 1).toString();
return Array.from(new Array(columnCount), (x, colId) => columnIndexToLeter(colId) + suffix);
}),
- type: 'table',
- columnMap: {},
};
}
diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index a551d6d221d..c32c46f8b88 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -8,6 +8,7 @@ import {
CellMeasurerCache,
CellMeasurer,
GridCellProps,
+ Index,
} from 'react-virtualized';
import { Themeable } from '../../types/theme';
@@ -26,6 +27,7 @@ import { stringToJsRegex } from '../../utils/index';
export interface Props extends Themeable {
data: TableData;
+ minColumnWidth: number;
showHeader: boolean;
fixedHeader: boolean;
fixedColumns: number;
@@ -46,6 +48,7 @@ interface State {
interface ColumnRenderInfo {
header: string;
+ width: number;
builder: TableCellBuilder;
}
@@ -64,6 +67,7 @@ export class Table extends Component {
fixedHeader: true,
fixedColumns: 0,
rotate: false,
+ minColumnWidth: 150,
};
constructor(props: Props) {
@@ -76,7 +80,7 @@ export class Table extends Component {
this.renderer = this.initColumns(props);
this.measurer = new CellMeasurerCache({
defaultHeight: 30,
- defaultWidth: 150,
+ fixedWidth: true,
});
}
@@ -110,7 +114,8 @@ export class Table extends Component {
/** Given the configuration, setup how each column gets rendered */
initColumns(props: Props): ColumnRenderInfo[] {
- const { styles, data } = props;
+ const { styles, data, width, minColumnWidth } = props;
+ const columnWidth = Math.max(width / data.columns.length, minColumnWidth);
return data.columns.map((col, index) => {
let title = col.text;
@@ -131,6 +136,7 @@ export class Table extends Component {
return {
header: title,
+ width: columnWidth,
builder: getCellBuilder(col, style, this.props),
};
});
@@ -228,6 +234,10 @@ export class Table extends Component {
);
};
+ getColumnWidth = (col: Index): number => {
+ return this.renderer[col.index].width;
+ };
+
render() {
const { showHeader, fixedHeader, fixedColumns, rotate, width, height } = this.props;
const { data } = this.state;
@@ -269,7 +279,7 @@ export class Table extends Component {
rowCount={rowCount}
overscanColumnCount={8}
overscanRowCount={8}
- columnWidth={this.measurer.columnWidth}
+ columnWidth={this.getColumnWidth}
deferredMeasurementCache={this.measurer}
cellRenderer={this.cellRenderer}
rowHeight={this.measurer.rowHeight}
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.story.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.story.tsx
new file mode 100644
index 00000000000..8d6112130e7
--- /dev/null
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.story.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+
+import { ThresholdsEditor } from './ThresholdsEditor';
+
+const ThresholdsEditorStories = storiesOf('UI/ThresholdsEditor', module);
+const thresholds = [{ index: 0, value: -Infinity, color: 'green' }, { index: 1, value: 50, color: 'red' }];
+
+ThresholdsEditorStories.add('default', () => {
+ return ) => {
const props: Props = {
@@ -31,7 +32,7 @@ describe('Initialization', () => {
it('should add a base threshold if missing', () => {
const { instance } = setup();
- expect(instance.state.thresholds).toEqual([{ index: 0, value: -Infinity, color: '#7EB26D' }]);
+ expect(instance.state.thresholds).toEqual([{ index: 0, value: -Infinity, color: colors[0] }]);
});
});
@@ -41,7 +42,7 @@ describe('Add threshold', () => {
instance.onAddThreshold(0);
- expect(instance.state.thresholds).toEqual([{ index: 0, value: -Infinity, color: '#7EB26D' }]);
+ expect(instance.state.thresholds).toEqual([{ index: 0, value: -Infinity, color: colors[0] }]);
});
it('should add threshold', () => {
@@ -50,41 +51,41 @@ describe('Add threshold', () => {
instance.onAddThreshold(1);
expect(instance.state.thresholds).toEqual([
- { index: 0, value: -Infinity, color: '#7EB26D' },
- { index: 1, value: 50, color: '#EAB839' },
+ { index: 0, value: -Infinity, color: colors[0] },
+ { index: 1, value: 50, color: colors[2] },
]);
});
it('should add another threshold above a first', () => {
const { instance } = setup({
- thresholds: [{ index: 0, value: -Infinity, color: '#7EB26D' }, { index: 1, value: 50, color: '#EAB839' }],
+ thresholds: [{ index: 0, value: -Infinity, color: colors[0] }, { index: 1, value: 50, color: colors[2] }],
});
instance.onAddThreshold(2);
expect(instance.state.thresholds).toEqual([
- { index: 0, value: -Infinity, color: '#7EB26D' },
- { index: 1, value: 50, color: '#EAB839' },
- { index: 2, value: 75, color: '#6ED0E0' },
+ { index: 0, value: -Infinity, color: colors[0] },
+ { index: 1, value: 50, color: colors[2] },
+ { index: 2, value: 75, color: colors[3] },
]);
});
it('should add another threshold between first and second index', () => {
const { instance } = setup({
thresholds: [
- { index: 0, value: -Infinity, color: '#7EB26D' },
- { index: 1, value: 50, color: '#EAB839' },
- { index: 2, value: 75, color: '#6ED0E0' },
+ { index: 0, value: -Infinity, color: colors[0] },
+ { index: 1, value: 50, color: colors[2] },
+ { index: 2, value: 75, color: colors[3] },
],
});
instance.onAddThreshold(2);
expect(instance.state.thresholds).toEqual([
- { index: 0, value: -Infinity, color: '#7EB26D' },
- { index: 1, value: 50, color: '#EAB839' },
- { index: 2, value: 62.5, color: '#EF843C' },
- { index: 3, value: 75, color: '#6ED0E0' },
+ { index: 0, value: -Infinity, color: colors[0] },
+ { index: 1, value: 50, color: colors[2] },
+ { index: 2, value: 62.5, color: colors[4] },
+ { index: 3, value: 75, color: colors[3] },
]);
});
});
@@ -161,7 +162,7 @@ describe('change threshold value', () => {
});
describe('on blur threshold value', () => {
- it.only('should resort rows and update indexes', () => {
+ it('should resort rows and update indexes', () => {
const { instance } = setup();
const thresholds = [
{ index: 0, value: -Infinity, color: '#7EB26D' },
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
index 3361e1bee46..daecff37dc8 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
@@ -3,8 +3,8 @@ import { Threshold } from '../../types';
import { ColorPicker } from '..';
import { PanelOptionsGroup } from '..';
import { colors } from '../../utils';
-import { ThemeContext } from '../../themes/ThemeContext';
-import { getColorFromHexRgbOrName } from '../../utils/namedColorsPalette';
+import { ThemeContext } from '../../themes';
+import { getColorFromHexRgbOrName } from '../../utils';
export interface Props {
thresholds: Threshold[];
@@ -166,7 +166,11 @@ export class ThresholdsEditor extends PureComponent {
-
+
+
+
+
`;
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index b8c8d66cead..e20a52f6485 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -25,6 +25,7 @@ export { ValueMappingsEditor } from './ValueMappingsEditor/ValueMappingsEditor';
export { Switch } from './Switch/Switch';
export { EmptySearchResult } from './EmptySearchResult/EmptySearchResult';
export { UnitPicker } from './UnitPicker/UnitPicker';
+export { Input, InputStatus } from './Input/Input';
// Visualizations
export { Gauge } from './Gauge/Gauge';
diff --git a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
index 97ade6da7a5..16f4a20d139 100644
--- a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
+++ b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
@@ -120,7 +120,7 @@ $headings-line-height: ${theme.typography.lineHeight.sm} !default;
$border-width: ${theme.border.width.sm} !default;
$border-radius: ${theme.border.radius.md} !default;
-$border-radius-lg: ${theme.border.radius.lg}!default;
+$border-radius-lg: ${theme.border.radius.lg} !default;
$border-radius-sm: ${theme.border.radius.sm} !default;
// Page
@@ -191,7 +191,6 @@ $btn-padding-y-lg: 11px !default;
$btn-padding-x-xl: 21px !default;
$btn-padding-y-xl: 11px !default;
-
$btn-semi-transparent: rgba(0, 0, 0, 0.2) !default;
// sidemenu
diff --git a/packages/grafana-ui/src/types/data.ts b/packages/grafana-ui/src/types/data.ts
index b36e23ae6c0..ab177eb8888 100644
--- a/packages/grafana-ui/src/types/data.ts
+++ b/packages/grafana-ui/src/types/data.ts
@@ -51,27 +51,13 @@ export enum NullValueMode {
export type TimeSeriesVMs = TimeSeriesVM[];
export interface Column {
- text: string;
- title?: string;
- type?: string;
- sort?: boolean;
- desc?: boolean;
- filterable?: boolean;
+ text: string; // The column name
+ type?: 'time' | 'number' | 'string' | 'object'; // not used anywhere? can we remove?
+ filterable?: boolean; // currently only set by elasticsearch, and used in the table panel
unit?: string;
}
export interface TableData {
columns: Column[];
rows: any[];
- type: string;
- columnMap: any;
-}
-
-export type SingleStatValue = number | string | null;
-
-/*
- * So we can add meta info like tags & series name
- */
-export interface SingleStatValueInfo {
- value: SingleStatValue;
}
diff --git a/packages/grafana-ui/src/types/index.ts b/packages/grafana-ui/src/types/index.ts
index b09d88bab4d..c0aede431d0 100644
--- a/packages/grafana-ui/src/types/index.ts
+++ b/packages/grafana-ui/src/types/index.ts
@@ -5,3 +5,4 @@ export * from './plugin';
export * from './datasource';
export * from './theme';
export * from './threshold';
+export * from './input';
diff --git a/public/app/types/form.ts b/packages/grafana-ui/src/types/input.ts
similarity index 100%
rename from public/app/types/form.ts
rename to packages/grafana-ui/src/types/input.ts
diff --git a/packages/grafana-ui/src/types/panel.ts b/packages/grafana-ui/src/types/panel.ts
index 889e4ab310e..6c42ecfceb9 100644
--- a/packages/grafana-ui/src/types/panel.ts
+++ b/packages/grafana-ui/src/types/panel.ts
@@ -1,12 +1,12 @@
import { ComponentClass } from 'react';
-import { TimeSeries, LoadingState, TableData } from './data';
+import { LoadingState, TableData } from './data';
import { TimeRange } from './time';
import { ScopedVars } from './datasource';
export type InterpolateFunction = (value: string, scopedVars?: ScopedVars, format?: string | Function) => string;
export interface PanelProps {
- panelData: PanelData;
+ data?: TableData[];
timeRange: TimeRange;
loading: LoadingState;
options: T;
@@ -16,23 +16,26 @@ export interface PanelProps {
replaceVariables: InterpolateFunction;
}
-export interface PanelData {
- timeSeries?: TimeSeries[];
- tableData?: TableData;
-}
-
export interface PanelEditorProps {
options: T;
onOptionsChange: (options: T) => void;
}
-export type PreservePanelOptionsHandler = (pluginId: string, prevOptions: any) => Partial;
+/**
+ * Called before a panel is initalized
+ */
+export type PanelTypeChangedHook = (
+ options: Partial,
+ prevPluginId?: string,
+ prevOptions?: any
+) => Partial;
export class ReactPanelPlugin {
panel: ComponentClass>;
editor?: ComponentClass>;
defaults?: TOptions;
- preserveOptions?: PreservePanelOptionsHandler;
+
+ panelTypeChangedHook?: PanelTypeChangedHook;
constructor(panel: ComponentClass>) {
this.panel = panel;
@@ -46,8 +49,12 @@ export class ReactPanelPlugin {
this.defaults = defaults;
}
- setPreserveOptionsHandler(handler: PreservePanelOptionsHandler) {
- this.preserveOptions = handler;
+ /**
+ * Called when the visualization changes.
+ * Lets you keep whatever settings made sense in the previous panel
+ */
+ setPanelTypeChangedHook(v: PanelTypeChangedHook) {
+ this.panelTypeChangedHook = v;
}
}
diff --git a/packages/grafana-ui/src/types/plugin.ts b/packages/grafana-ui/src/types/plugin.ts
index e2dda8ad407..bb1794a5154 100644
--- a/packages/grafana-ui/src/types/plugin.ts
+++ b/packages/grafana-ui/src/types/plugin.ts
@@ -91,6 +91,7 @@ export interface PluginMeta {
includes: PluginInclude[];
// Datasource-specific
+ builtIn?: boolean;
metrics?: boolean;
tables?: boolean;
logs?: boolean;
diff --git a/packages/grafana-ui/src/utils/__snapshots__/processTableData.test.ts.snap b/packages/grafana-ui/src/utils/__snapshots__/processTableData.test.ts.snap
index 42e25cb38e4..f894917b7e0 100644
--- a/packages/grafana-ui/src/utils/__snapshots__/processTableData.test.ts.snap
+++ b/packages/grafana-ui/src/utils/__snapshots__/processTableData.test.ts.snap
@@ -2,7 +2,6 @@
exports[`processTableData basic processing should generate a header and fix widths 1`] = `
Object {
- "columnMap": Object {},
"columns": Array [
Object {
"text": "Column 1",
@@ -31,13 +30,11 @@ Object {
null,
],
],
- "type": "table",
}
`;
exports[`processTableData basic processing should read header and two rows 1`] = `
Object {
- "columnMap": Object {},
"columns": Array [
Object {
"text": "a",
@@ -61,6 +58,5 @@ Object {
6,
],
],
- "type": "table",
}
`;
diff --git a/packages/grafana-ui/src/utils/displayValue.test.ts b/packages/grafana-ui/src/utils/displayValue.test.ts
new file mode 100644
index 00000000000..bf0e7a89bba
--- /dev/null
+++ b/packages/grafana-ui/src/utils/displayValue.test.ts
@@ -0,0 +1,157 @@
+import { getDisplayProcessor, getColorFromThreshold, DisplayProcessor, DisplayValue } from './displayValue';
+import { MappingType, ValueMapping } from '../types/panel';
+
+function assertSame(input: any, processors: DisplayProcessor[], match: DisplayValue) {
+ processors.forEach(processor => {
+ const value = processor(input);
+ expect(value.text).toEqual(match.text);
+ if (match.hasOwnProperty('numeric')) {
+ expect(value.numeric).toEqual(match.numeric);
+ }
+ });
+}
+
+describe('Process simple display values', () => {
+ // Don't test float values here since the decimal formatting changes
+ const processors = [
+ // Without options, this shortcuts to a much easier implementation
+ getDisplayProcessor(),
+
+ // Add a simple option that is not used (uses a different base class)
+ getDisplayProcessor({ color: '#FFF' }),
+
+ // Add a simple option that is not used (uses a different base class)
+ getDisplayProcessor({ unit: 'locale' }),
+ ];
+
+ it('support null', () => {
+ assertSame(null, processors, { text: '', numeric: NaN });
+ });
+
+ it('support undefined', () => {
+ assertSame(undefined, processors, { text: '', numeric: NaN });
+ });
+
+ it('support NaN', () => {
+ assertSame(NaN, processors, { text: 'NaN', numeric: NaN });
+ });
+
+ it('Integer', () => {
+ assertSame(3, processors, { text: '3', numeric: 3 });
+ });
+
+ it('Text to number', () => {
+ assertSame('3', processors, { text: '3', numeric: 3 });
+ });
+
+ it('Simple String', () => {
+ assertSame('hello', processors, { text: 'hello', numeric: NaN });
+ });
+
+ it('empty array', () => {
+ assertSame([], processors, { text: '', numeric: NaN });
+ });
+
+ it('array of text', () => {
+ assertSame(['a', 'b', 'c'], processors, { text: 'a,b,c', numeric: NaN });
+ });
+
+ it('array of numbers', () => {
+ assertSame([1, 2, 3], processors, { text: '1,2,3', numeric: NaN });
+ });
+
+ it('empty object', () => {
+ assertSame({}, processors, { text: '[object Object]', numeric: NaN });
+ });
+
+ it('boolean true', () => {
+ assertSame(true, processors, { text: 'true', numeric: 1 });
+ });
+
+ it('boolean false', () => {
+ assertSame(false, processors, { text: 'false', numeric: 0 });
+ });
+});
+
+describe('Processor with more configs', () => {
+ it('support prefix & suffix', () => {
+ const processor = getDisplayProcessor({
+ prefix: 'AA_',
+ suffix: '_ZZ',
+ });
+
+ expect(processor('XXX').text).toEqual('AA_XXX_ZZ');
+ });
+});
+
+describe('Get color from threshold', () => {
+ it('should get first threshold color when only one threshold', () => {
+ const thresholds = [{ index: 0, value: -Infinity, color: '#7EB26D' }];
+ expect(getColorFromThreshold(49, thresholds)).toEqual('#7EB26D');
+ });
+
+ it('should get the threshold color if value is same as a threshold', () => {
+ const thresholds = [
+ { index: 2, value: 75, color: '#6ED0E0' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ ];
+ expect(getColorFromThreshold(50, thresholds)).toEqual('#EAB839');
+ });
+
+ it('should get the nearest threshold color between thresholds', () => {
+ const thresholds = [
+ { index: 2, value: 75, color: '#6ED0E0' },
+ { index: 1, value: 50, color: '#EAB839' },
+ { index: 0, value: -Infinity, color: '#7EB26D' },
+ ];
+ expect(getColorFromThreshold(55, thresholds)).toEqual('#EAB839');
+ });
+});
+
+describe('Format value', () => {
+ it('should return if value isNaN', () => {
+ const valueMappings: ValueMapping[] = [];
+ const value = 'N/A';
+ const instance = getDisplayProcessor({ mappings: valueMappings });
+
+ const result = instance(value);
+
+ expect(result.text).toEqual('N/A');
+ });
+
+ it('should return formatted value if there are no value mappings', () => {
+ const valueMappings: ValueMapping[] = [];
+ const value = '6';
+
+ const instance = getDisplayProcessor({ mappings: valueMappings, decimals: 1 });
+
+ const result = instance(value);
+
+ expect(result.text).toEqual('6.0');
+ });
+
+ it('should return formatted value if there are no matching value mappings', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: 'elva', type: MappingType.ValueToText, value: '11' },
+ { id: 1, operator: '', text: '1-9', type: MappingType.RangeToText, from: '1', to: '9' },
+ ];
+ const value = '10';
+ const instance = getDisplayProcessor({ mappings: valueMappings, decimals: 1 });
+
+ const result = instance(value);
+
+ expect(result.text).toEqual('10.0');
+ });
+
+ it('should return mapped value if there are matching value mappings', () => {
+ const valueMappings: ValueMapping[] = [
+ { id: 0, operator: '', text: '1-20', type: MappingType.RangeToText, from: '1', to: '20' },
+ { id: 1, operator: '', text: 'elva', type: MappingType.ValueToText, value: '11' },
+ ];
+ const value = '11';
+ const instance = getDisplayProcessor({ mappings: valueMappings, decimals: 1 });
+
+ expect(instance(value).text).toEqual('1-20');
+ });
+});
diff --git a/packages/grafana-ui/src/utils/displayValue.ts b/packages/grafana-ui/src/utils/displayValue.ts
new file mode 100644
index 00000000000..75191f34434
--- /dev/null
+++ b/packages/grafana-ui/src/utils/displayValue.ts
@@ -0,0 +1,145 @@
+import { ValueMapping, Threshold } from '../types';
+import _ from 'lodash';
+import { getValueFormat, DecimalCount } from './valueFormats/valueFormats';
+import { getMappedValue } from './valueMappings';
+import { GrafanaTheme, GrafanaThemeType } from '../types';
+import { getColorFromHexRgbOrName } from './namedColorsPalette';
+import moment from 'moment';
+
+export interface DisplayValue {
+ text: string; // Show in the UI
+ numeric: number; // Use isNaN to check if it is a real number
+ color?: string; // color based on configs or Threshold
+}
+
+export interface DisplayValueOptions {
+ unit?: string;
+ decimals?: DecimalCount;
+ scaledDecimals?: DecimalCount;
+ dateFormat?: string; // If set try to convert numbers to date
+
+ color?: string;
+ mappings?: ValueMapping[];
+ thresholds?: Threshold[];
+ prefix?: string;
+ suffix?: string;
+
+ // Alternative to empty string
+ noValue?: string;
+
+ // Context
+ isUtc?: boolean;
+ theme?: GrafanaTheme; // Will pick 'dark' if not defined
+}
+
+export type DisplayProcessor = (value: any) => DisplayValue;
+
+export function getDisplayProcessor(options?: DisplayValueOptions): DisplayProcessor {
+ if (options && !_.isEmpty(options)) {
+ const formatFunc = getValueFormat(options.unit || 'none');
+ return (value: any) => {
+ const { prefix, suffix, mappings, thresholds, theme } = options;
+ let color = options.color;
+
+ let text = _.toString(value);
+ let numeric = toNumber(value);
+
+ let shouldFormat = true;
+ if (mappings && mappings.length > 0) {
+ const mappedValue = getMappedValue(mappings, value);
+ if (mappedValue) {
+ text = mappedValue.text;
+ const v = toNumber(text);
+ if (!isNaN(v)) {
+ numeric = v;
+ }
+ shouldFormat = false;
+ }
+ }
+
+ if (options.dateFormat) {
+ const date = toMoment(value, numeric, options.dateFormat);
+ if (date.isValid()) {
+ text = date.format(options.dateFormat);
+ shouldFormat = false;
+ }
+ }
+
+ if (!isNaN(numeric)) {
+ if (shouldFormat && !_.isBoolean(value)) {
+ text = formatFunc(numeric, options.decimals, options.scaledDecimals, options.isUtc);
+ }
+ if (thresholds && thresholds.length > 0) {
+ color = getColorFromThreshold(numeric, thresholds, theme);
+ }
+ }
+
+ if (!text) {
+ text = options.noValue ? options.noValue : '';
+ }
+ if (prefix) {
+ text = prefix + text;
+ }
+ if (suffix) {
+ text = text + suffix;
+ }
+ return { text, numeric, color };
+ };
+ }
+ return toStringProcessor;
+}
+
+function toMoment(value: any, numeric: number, format: string): moment.Moment {
+ if (!isNaN(numeric)) {
+ const v = moment(numeric);
+ if (v.isValid()) {
+ return v;
+ }
+ }
+ const v = moment(value, format);
+ if (v.isValid) {
+ return v;
+ }
+ return moment(value); // moment will try to parse the format
+}
+
+/** Will return any value as a number or NaN */
+function toNumber(value: any): number {
+ if (typeof value === 'number') {
+ return value;
+ }
+ if (value === null || value === undefined || Array.isArray(value)) {
+ return NaN; // lodash calls them 0
+ }
+ if (typeof value === 'boolean') {
+ return value ? 1 : 0;
+ }
+ return _.toNumber(value);
+}
+
+function toStringProcessor(value: any): DisplayValue {
+ return { text: _.toString(value), numeric: toNumber(value) };
+}
+
+export function getColorFromThreshold(value: number, thresholds: Threshold[], theme?: GrafanaTheme): string {
+ const themeType = theme ? theme.type : GrafanaThemeType.Dark;
+
+ if (thresholds.length === 1) {
+ return getColorFromHexRgbOrName(thresholds[0].color, themeType);
+ }
+
+ const atThreshold = thresholds.filter(threshold => value === threshold.value)[0];
+ if (atThreshold) {
+ return getColorFromHexRgbOrName(atThreshold.color, themeType);
+ }
+
+ const belowThreshold = thresholds.filter(threshold => value > threshold.value);
+
+ if (belowThreshold.length > 0) {
+ const nearestThreshold = belowThreshold.sort((t1, t2) => t2.value - t1.value)[0];
+ return getColorFromHexRgbOrName(nearestThreshold.color, themeType);
+ }
+
+ // Use the first threshold as the default color
+ return getColorFromHexRgbOrName(thresholds[0].color, themeType);
+}
diff --git a/packages/grafana-ui/src/utils/index.ts b/packages/grafana-ui/src/utils/index.ts
index a08b9ce1a89..7e7c2e30ebf 100644
--- a/packages/grafana-ui/src/utils/index.ts
+++ b/packages/grafana-ui/src/utils/index.ts
@@ -1,9 +1,11 @@
export * from './processTimeSeries';
-export * from './singlestat';
+export * from './processTableData';
export * from './valueFormats/valueFormats';
export * from './colors';
export * from './namedColorsPalette';
export * from './thresholds';
export * from './string';
+export * from './displayValue';
export * from './deprecationWarning';
export { getMappedValue } from './valueMappings';
+export * from './validate';
diff --git a/packages/grafana-ui/src/utils/processTableData.test.ts b/packages/grafana-ui/src/utils/processTableData.test.ts
index fc2545b1706..ba9edcacebd 100644
--- a/packages/grafana-ui/src/utils/processTableData.test.ts
+++ b/packages/grafana-ui/src/utils/processTableData.test.ts
@@ -1,4 +1,4 @@
-import { parseCSV } from './processTableData';
+import { parseCSV, toTableData } from './processTableData';
describe('processTableData', () => {
describe('basic processing', () => {
@@ -18,3 +18,41 @@ describe('processTableData', () => {
});
});
});
+
+describe('toTableData', () => {
+ it('converts timeseries to table skipping nulls', () => {
+ const input1 = {
+ target: 'Field Name',
+ datapoints: [[100, 1], [200, 2]],
+ };
+ const input2 = {
+ // without target
+ target: '',
+ datapoints: [[100, 1], [200, 2]],
+ };
+ const data = toTableData([null, input1, input2, null, null]);
+ expect(data.length).toBe(2);
+ expect(data[0].columns[0].text).toBe(input1.target);
+ expect(data[0].rows).toBe(input1.datapoints);
+
+ // Default name
+ expect(data[1].columns[0].text).toEqual('Value');
+ });
+
+ it('keeps tableData unchanged', () => {
+ const input = {
+ columns: [{ text: 'A' }, { text: 'B' }, { text: 'C' }],
+ rows: [[100, 'A', 1], [200, 'B', 2], [300, 'C', 3]],
+ };
+ const data = toTableData([null, input, null, null]);
+ expect(data.length).toBe(1);
+ expect(data[0]).toBe(input);
+ });
+
+ it('supports null values OK', () => {
+ expect(toTableData([null, null, null, null])).toEqual([]);
+ expect(toTableData(undefined)).toEqual([]);
+ expect(toTableData((null as unknown) as any[])).toEqual([]);
+ expect(toTableData([])).toEqual([]);
+ });
+});
diff --git a/packages/grafana-ui/src/utils/processTableData.ts b/packages/grafana-ui/src/utils/processTableData.ts
index d65e42827e0..d4a91efd622 100644
--- a/packages/grafana-ui/src/utils/processTableData.ts
+++ b/packages/grafana-ui/src/utils/processTableData.ts
@@ -3,7 +3,7 @@ import isNumber from 'lodash/isNumber';
import Papa, { ParseError, ParseMeta } from 'papaparse';
// Types
-import { TableData, Column } from '../types';
+import { TableData, Column, TimeSeries } from '../types';
// Subset of all parse options
export interface TableParseOptions {
@@ -70,8 +70,6 @@ export function matchRowSizes(table: TableData): TableData {
return {
columns,
rows: fixedRows,
- type: table.type,
- columnMap: table.columnMap,
};
}
@@ -118,8 +116,6 @@ export function parseCSV(text: string, options?: TableParseOptions, details?: Ta
return {
columns: [],
rows: [],
- type: 'table',
- columnMap: {},
};
}
@@ -130,11 +126,48 @@ export function parseCSV(text: string, options?: TableParseOptions, details?: Ta
return matchRowSizes({
columns: makeColumns(header),
rows: results.data,
- type: 'table',
- columnMap: {},
});
}
+function convertTimeSeriesToTableData(timeSeries: TimeSeries): TableData {
+ return {
+ columns: [
+ {
+ text: timeSeries.target || 'Value',
+ unit: timeSeries.unit,
+ },
+ {
+ text: 'Time',
+ type: 'time',
+ unit: 'dateTimeAsIso',
+ },
+ ],
+ rows: timeSeries.datapoints,
+ };
+}
+
+export const isTableData = (data: any): data is TableData => data && data.hasOwnProperty('columns');
+
+export const toTableData = (results?: any[]): TableData[] => {
+ if (!results) {
+ return [];
+ }
+
+ return results
+ .filter(d => !!d)
+ .map(data => {
+ if (data.hasOwnProperty('columns')) {
+ return data as TableData;
+ }
+ if (data.hasOwnProperty('datapoints')) {
+ return convertTimeSeriesToTableData(data);
+ }
+ // TODO, try to convert JSON to table?
+ console.warn('Can not convert', data);
+ throw new Error('Unsupported data format');
+ });
+};
+
export function sortTableData(data: TableData, sortIndex?: number, reverse = false): TableData {
if (isNumber(sortIndex)) {
const copy = {
diff --git a/packages/grafana-ui/src/utils/processTimeSeries.ts b/packages/grafana-ui/src/utils/processTimeSeries.ts
index f5e9f96efba..9a6aeac6e69 100644
--- a/packages/grafana-ui/src/utils/processTimeSeries.ts
+++ b/packages/grafana-ui/src/utils/processTimeSeries.ts
@@ -4,17 +4,36 @@ import isNumber from 'lodash/isNumber';
import { colors } from './colors';
// Types
-import { TimeSeries, TimeSeriesVMs, NullValueMode, TimeSeriesValue } from '../types';
+import { TimeSeriesVMs, NullValueMode, TimeSeriesValue, TableData } from '../types';
interface Options {
- timeSeries: TimeSeries[];
+ data: TableData[];
+ xColumn?: number; // Time (or null to guess)
+ yColumn?: number; // Value (or null to guess)
nullValueMode: NullValueMode;
}
-export function processTimeSeries({ timeSeries, nullValueMode }: Options): TimeSeriesVMs {
- const vmSeries = timeSeries.map((item, index) => {
+// NOTE: this should move to processTableData.ts
+// I left it as is so the merge changes are more clear.
+export function processTimeSeries({ data, xColumn, yColumn, nullValueMode }: Options): TimeSeriesVMs {
+ const vmSeries = data.map((item, index) => {
+ if (!isNumber(xColumn)) {
+ xColumn = 1; // Default timeseries colum. TODO, find first time field!
+ }
+ if (!isNumber(yColumn)) {
+ yColumn = 0; // TODO, find first non-time field
+ }
+
+ // TODO? either % or throw error?
+ if (xColumn >= item.columns.length) {
+ throw new Error('invalid colum: ' + xColumn);
+ }
+ if (yColumn >= item.columns.length) {
+ throw new Error('invalid colum: ' + yColumn);
+ }
+
const colorIndex = index % colors.length;
- const label = item.target;
+ const label = item.columns[yColumn].text;
const result = [];
// stat defaults
@@ -42,9 +61,9 @@ export function processTimeSeries({ timeSeries, nullValueMode }: Options): TimeS
let previousValue = 0;
let previousDeltaUp = true;
- for (let i = 0; i < item.datapoints.length; i++) {
- currentValue = item.datapoints[i][0];
- currentTime = item.datapoints[i][1];
+ for (let i = 0; i < item.rows.length; i++) {
+ currentValue = item.rows[i][yColumn];
+ currentTime = item.rows[i][xColumn];
if (typeof currentTime !== 'number') {
continue;
@@ -95,7 +114,7 @@ export function processTimeSeries({ timeSeries, nullValueMode }: Options): TimeS
if (previousValue > currentValue) {
// counter reset
previousDeltaUp = false;
- if (i === item.datapoints.length - 1) {
+ if (i === item.rows.length - 1) {
// reset on last
delta += currentValue;
}
diff --git a/packages/grafana-ui/src/utils/singlestat.ts b/packages/grafana-ui/src/utils/singlestat.ts
deleted file mode 100644
index 5f5fbb8f247..00000000000
--- a/packages/grafana-ui/src/utils/singlestat.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { PanelData, NullValueMode, SingleStatValueInfo } from '../types';
-import { processTimeSeries } from './processTimeSeries';
-
-export interface SingleStatProcessingOptions {
- panelData: PanelData;
- stat: string;
-}
-
-//
-// This is a temporary thing, waiting for a better data model and maybe unification between time series & table data
-//
-export function processSingleStatPanelData(options: SingleStatProcessingOptions): SingleStatValueInfo[] {
- const { panelData, stat } = options;
-
- if (panelData.timeSeries) {
- const timeSeries = processTimeSeries({
- timeSeries: panelData.timeSeries,
- nullValueMode: NullValueMode.Null,
- });
-
- return timeSeries.map((series, index) => {
- const value = stat !== 'name' ? series.stats[stat] : series.label;
-
- return {
- value: value,
- };
- });
- } else if (panelData.tableData) {
- throw { message: 'Panel data not supported' };
- }
-
- return [];
-}
diff --git a/packages/grafana-ui/src/utils/validate.ts b/packages/grafana-ui/src/utils/validate.ts
new file mode 100644
index 00000000000..286ec700577
--- /dev/null
+++ b/packages/grafana-ui/src/utils/validate.ts
@@ -0,0 +1,24 @@
+import { ValidationRule, ValidationEvents } from '../types/input';
+
+export enum EventsWithValidation {
+ onBlur = 'onBlur',
+ onFocus = 'onFocus',
+ onChange = 'onChange',
+}
+
+export const validate = (value: string, validationRules: ValidationRule[]) => {
+ const errors = validationRules.reduce(
+ (acc, currRule) => {
+ if (!currRule.rule(value)) {
+ return acc.concat(currRule.errorMessage);
+ }
+ return acc;
+ },
+ [] as string[]
+ );
+ return errors.length > 0 ? errors : null;
+};
+
+export const hasValidationEvent = (event: EventsWithValidation, validationEvents: ValidationEvents | undefined) => {
+ return validationEvents && validationEvents[event];
+};
diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go
index c16c2f126f8..4ad8a2b84ab 100644
--- a/pkg/api/admin_users.go
+++ b/pkg/api/admin_users.go
@@ -110,3 +110,26 @@ func AdminDeleteUser(c *m.ReqContext) {
c.JsonOK("User deleted")
}
+
+// POST /api/admin/users/:id/logout
+func (server *HTTPServer) AdminLogoutUser(c *m.ReqContext) Response {
+ userID := c.ParamsInt64(":id")
+
+ if c.UserId == userID {
+ return Error(400, "You cannot logout yourself", nil)
+ }
+
+ return server.logoutUserFromAllDevicesInternal(userID)
+}
+
+// GET /api/admin/users/:id/auth-tokens
+func (server *HTTPServer) AdminGetUserAuthTokens(c *m.ReqContext) Response {
+ userID := c.ParamsInt64(":id")
+ return server.getUserAuthTokensInternal(c, userID)
+}
+
+// POST /api/admin/users/:id/revoke-auth-token
+func (server *HTTPServer) AdminRevokeUserAuthToken(c *m.ReqContext, cmd m.RevokeAuthTokenCmd) Response {
+ userID := c.ParamsInt64(":id")
+ return server.revokeUserAuthTokenInternal(c, userID, cmd)
+}
diff --git a/pkg/api/admin_users_test.go b/pkg/api/admin_users_test.go
index 0b94a64b3fb..b94f09b0b75 100644
--- a/pkg/api/admin_users_test.go
+++ b/pkg/api/admin_users_test.go
@@ -6,6 +6,7 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/auth"
. "github.com/smartystreets/goconvey/convey"
)
@@ -27,6 +28,62 @@ func TestAdminApiEndpoint(t *testing.T) {
So(sc.resp.Code, ShouldEqual, 400)
})
})
+
+ Convey("When a server admin attempts to logout himself from all devices", t, func() {
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ cmd.Result = &m.User{Id: TestUserID}
+ return nil
+ })
+
+ adminLogoutUserScenario("Should not be allowed when calling POST on", "/api/admin/users/1/logout", "/api/admin/users/:id/logout", func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 400)
+ })
+ })
+
+ Convey("When a server admin attempts to logout a non-existing user from all devices", t, func() {
+ userId := int64(0)
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ userId = cmd.Id
+ return m.ErrUserNotFound
+ })
+
+ adminLogoutUserScenario("Should return not found when calling POST on", "/api/admin/users/200/logout", "/api/admin/users/:id/logout", func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 404)
+ So(userId, ShouldEqual, 200)
+ })
+ })
+
+ Convey("When a server admin attempts to revoke an auth token for a non-existing user", t, func() {
+ userId := int64(0)
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ userId = cmd.Id
+ return m.ErrUserNotFound
+ })
+
+ cmd := m.RevokeAuthTokenCmd{AuthTokenId: 2}
+
+ adminRevokeUserAuthTokenScenario("Should return not found when calling POST on", "/api/admin/users/200/revoke-auth-token", "/api/admin/users/:id/revoke-auth-token", cmd, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 404)
+ So(userId, ShouldEqual, 200)
+ })
+ })
+
+ Convey("When a server admin gets auth tokens for a non-existing user", t, func() {
+ userId := int64(0)
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ userId = cmd.Id
+ return m.ErrUserNotFound
+ })
+
+ adminGetUserAuthTokensScenario("Should return not found when calling GET on", "/api/admin/users/200/auth-tokens", "/api/admin/users/:id/auth-tokens", func(sc *scenarioContext) {
+ sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 404)
+ So(userId, ShouldEqual, 200)
+ })
+ })
}
func putAdminScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.AdminUpdateUserPermissionsForm, fn scenarioFunc) {
@@ -48,3 +105,84 @@ func putAdminScenario(desc string, url string, routePattern string, role m.RoleT
fn(sc)
})
}
+
+func adminLogoutUserScenario(desc string, url string, routePattern string, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ AuthTokenService: auth.NewFakeUserAuthTokenService(),
+ }
+
+ sc := setupScenarioContext(url)
+ sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = m.ROLE_ADMIN
+
+ return hs.AdminLogoutUser(c)
+ })
+
+ sc.m.Post(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
+
+func adminRevokeUserAuthTokenScenario(desc string, url string, routePattern string, cmd m.RevokeAuthTokenCmd, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ AuthTokenService: fakeAuthTokenService,
+ }
+
+ sc := setupScenarioContext(url)
+ sc.userAuthTokenService = fakeAuthTokenService
+ sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = m.ROLE_ADMIN
+
+ return hs.AdminRevokeUserAuthToken(c, cmd)
+ })
+
+ sc.m.Post(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
+
+func adminGetUserAuthTokensScenario(desc string, url string, routePattern string, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ AuthTokenService: fakeAuthTokenService,
+ }
+
+ sc := setupScenarioContext(url)
+ sc.userAuthTokenService = fakeAuthTokenService
+ sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = m.ROLE_ADMIN
+
+ return hs.AdminGetUserAuthTokens(c)
+ })
+
+ sc.m.Get(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 81ea83eae61..86bc83f558b 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -14,6 +14,7 @@ func (hs *HTTPServer) registerRoutes() {
reqGrafanaAdmin := middleware.ReqGrafanaAdmin
reqEditorRole := middleware.ReqEditorRole
reqOrgAdmin := middleware.ReqOrgAdmin
+ reqCanAccessTeams := middleware.AdminOrFeatureEnabled(hs.Cfg.EditorsCanAdmin)
redirectFromLegacyDashboardURL := middleware.RedirectFromLegacyDashboardURL()
redirectFromLegacyDashboardSoloURL := middleware.RedirectFromLegacyDashboardSoloURL()
quota := middleware.Quota(hs.QuotaService)
@@ -41,8 +42,8 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/org/users", reqOrgAdmin, hs.Index)
r.Get("/org/users/new", reqOrgAdmin, hs.Index)
r.Get("/org/users/invite", reqOrgAdmin, hs.Index)
- r.Get("/org/teams", reqOrgAdmin, hs.Index)
- r.Get("/org/teams/*", reqOrgAdmin, hs.Index)
+ r.Get("/org/teams", reqCanAccessTeams, hs.Index)
+ r.Get("/org/teams/*", reqCanAccessTeams, hs.Index)
r.Get("/org/apikeys/", reqOrgAdmin, hs.Index)
r.Get("/dashboard/import/", reqSignedIn, hs.Index)
r.Get("/configuration", reqGrafanaAdmin, hs.Index)
@@ -133,6 +134,9 @@ func (hs *HTTPServer) registerRoutes() {
userRoute.Get("/preferences", Wrap(GetUserPreferences))
userRoute.Put("/preferences", bind(dtos.UpdatePrefsCmd{}), Wrap(UpdateUserPreferences))
+
+ userRoute.Get("/auth-tokens", Wrap(hs.GetUserAuthTokens))
+ userRoute.Post("/revoke-auth-token", bind(m.RevokeAuthTokenCmd{}), Wrap(hs.RevokeUserAuthToken))
})
// users (admin permission required)
@@ -150,20 +154,21 @@ func (hs *HTTPServer) registerRoutes() {
// team (admin permission required)
apiRoute.Group("/teams", func(teamsRoute routing.RouteRegister) {
- teamsRoute.Post("/", bind(m.CreateTeamCommand{}), Wrap(CreateTeam))
- teamsRoute.Put("/:teamId", bind(m.UpdateTeamCommand{}), Wrap(UpdateTeam))
- teamsRoute.Delete("/:teamId", Wrap(DeleteTeamByID))
+ teamsRoute.Post("/", bind(m.CreateTeamCommand{}), Wrap(hs.CreateTeam))
+ teamsRoute.Put("/:teamId", bind(m.UpdateTeamCommand{}), Wrap(hs.UpdateTeam))
+ teamsRoute.Delete("/:teamId", Wrap(hs.DeleteTeamByID))
teamsRoute.Get("/:teamId/members", Wrap(GetTeamMembers))
- teamsRoute.Post("/:teamId/members", bind(m.AddTeamMemberCommand{}), Wrap(AddTeamMember))
- teamsRoute.Delete("/:teamId/members/:userId", Wrap(RemoveTeamMember))
- teamsRoute.Get("/:teamId/preferences", Wrap(GetTeamPreferences))
- teamsRoute.Put("/:teamId/preferences", bind(dtos.UpdatePrefsCmd{}), Wrap(UpdateTeamPreferences))
- }, reqOrgAdmin)
+ teamsRoute.Post("/:teamId/members", bind(m.AddTeamMemberCommand{}), Wrap(hs.AddTeamMember))
+ teamsRoute.Put("/:teamId/members/:userId", bind(m.UpdateTeamMemberCommand{}), Wrap(hs.UpdateTeamMember))
+ teamsRoute.Delete("/:teamId/members/:userId", Wrap(hs.RemoveTeamMember))
+ teamsRoute.Get("/:teamId/preferences", Wrap(hs.GetTeamPreferences))
+ teamsRoute.Put("/:teamId/preferences", bind(dtos.UpdatePrefsCmd{}), Wrap(hs.UpdateTeamPreferences))
+ }, reqCanAccessTeams)
// team without requirement of user to be org admin
apiRoute.Group("/teams", func(teamsRoute routing.RouteRegister) {
teamsRoute.Get("/:teamId", Wrap(GetTeamByID))
- teamsRoute.Get("/search", Wrap(SearchTeams))
+ teamsRoute.Get("/search", Wrap(hs.SearchTeams))
})
// org information available to all users.
@@ -262,7 +267,7 @@ func (hs *HTTPServer) registerRoutes() {
apiRoute.Group("/folders", func(folderRoute routing.RouteRegister) {
folderRoute.Get("/", Wrap(GetFolders))
folderRoute.Get("/id/:id", Wrap(GetFolderByID))
- folderRoute.Post("/", bind(m.CreateFolderCommand{}), Wrap(CreateFolder))
+ folderRoute.Post("/", bind(m.CreateFolderCommand{}), Wrap(hs.CreateFolder))
folderRoute.Group("/:uid", func(folderUidRoute routing.RouteRegister) {
folderUidRoute.Get("/", Wrap(GetFolderByUID))
@@ -375,6 +380,10 @@ func (hs *HTTPServer) registerRoutes() {
adminRoute.Put("/users/:id/quotas/:target", bind(m.UpdateUserQuotaCmd{}), Wrap(UpdateUserQuota))
adminRoute.Get("/stats", AdminGetStats)
adminRoute.Post("/pause-all-alerts", bind(dtos.PauseAllAlertsCommand{}), Wrap(PauseAllAlerts))
+
+ adminRoute.Post("/users/:id/logout", Wrap(hs.AdminLogoutUser))
+ adminRoute.Get("/users/:id/auth-tokens", Wrap(hs.AdminGetUserAuthTokens))
+ adminRoute.Post("/users/:id/revoke-auth-token", bind(m.RevokeAuthTokenCmd{}), Wrap(hs.AdminRevokeUserAuthToken))
}, reqGrafanaAdmin)
// rendering
diff --git a/pkg/api/app_routes.go b/pkg/api/app_routes.go
index d77d9d87b4a..abee55711b0 100644
--- a/pkg/api/app_routes.go
+++ b/pkg/api/app_routes.go
@@ -48,18 +48,18 @@ func (hs *HTTPServer) initAppPluginRoutes(r *macaron.Macaron) {
handlers = append(handlers, middleware.RoleAuth(m.ROLE_EDITOR, m.ROLE_ADMIN))
}
}
- handlers = append(handlers, AppPluginRoute(route, plugin.Id))
+ handlers = append(handlers, AppPluginRoute(route, plugin.Id, hs))
r.Route(url, route.Method, handlers...)
log.Debug("Plugins: Adding proxy route %s", url)
}
}
}
-func AppPluginRoute(route *plugins.AppPluginRoute, appID string) macaron.Handler {
+func AppPluginRoute(route *plugins.AppPluginRoute, appID string, hs *HTTPServer) macaron.Handler {
return func(c *m.ReqContext) {
path := c.Params("*")
- proxy := pluginproxy.NewApiPluginProxy(c, path, route, appID)
+ proxy := pluginproxy.NewApiPluginProxy(c, path, route, appID, hs.Cfg)
proxy.Transport = pluginProxyTransport
proxy.ServeHTTP(c.Resp, c.Req.Request)
}
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index 3f3a50aae69..4e0b0dcd998 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -8,6 +8,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/auth"
"gopkg.in/macaron.v1"
. "github.com/smartystreets/goconvey/convey"
@@ -94,13 +95,14 @@ func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map
}
type scenarioContext struct {
- m *macaron.Macaron
- context *m.ReqContext
- resp *httptest.ResponseRecorder
- handlerFunc handlerFunc
- defaultHandler macaron.Handler
- req *http.Request
- url string
+ m *macaron.Macaron
+ context *m.ReqContext
+ resp *httptest.ResponseRecorder
+ handlerFunc handlerFunc
+ defaultHandler macaron.Handler
+ req *http.Request
+ url string
+ userAuthTokenService *auth.FakeUserAuthTokenService
}
func (sc *scenarioContext) exec() {
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 07c4f75778d..c47e8f31ccc 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -213,7 +213,8 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand)
dash := cmd.GetDashboardModel()
- if dash.Id == 0 && dash.Uid == "" {
+ newDashboard := dash.Id == 0 && dash.Uid == ""
+ if newDashboard {
limitReached, err := hs.QuotaService.QuotaReached(c, "dashboard")
if err != nil {
return Error(500, "failed to get quota", err)
@@ -276,6 +277,15 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand)
return Error(500, "Failed to save dashboard", err)
}
+ if hs.Cfg.EditorsCanAdmin && newDashboard {
+ inFolder := cmd.FolderId > 0
+ err := dashboards.MakeUserAdmin(hs.Bus, cmd.OrgId, cmd.UserId, dashboard.Id, !inFolder)
+ if err != nil {
+ hs.log.Error("Could not make user admin", "dashboard", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
+ return Error(500, "Failed to make user admin of dashboard", err)
+ }
+ }
+
c.TimeRequest(metrics.M_Api_Dashboard_Save)
return JSON(200, util.DynMap{
"status": "success",
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index 923bf57ce8a..ea69c049115 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -974,6 +974,7 @@ func postDashboardScenario(desc string, url string, routePattern string, mock *d
hs := HTTPServer{
Bus: bus.GetBus(),
+ Cfg: setting.NewCfg(),
}
sc := setupScenarioContext(url)
@@ -1024,6 +1025,7 @@ func restoreDashboardVersionScenario(desc string, url string, routePattern strin
defer bus.ClearBusHandlers()
hs := HTTPServer{
+ Cfg: setting.NewCfg(),
Bus: bus.GetBus(),
}
diff --git a/pkg/api/dataproxy.go b/pkg/api/dataproxy.go
index 54a744fccdc..48f9c73c934 100644
--- a/pkg/api/dataproxy.go
+++ b/pkg/api/dataproxy.go
@@ -31,7 +31,7 @@ func (hs *HTTPServer) ProxyDataSourceRequest(c *m.ReqContext) {
// macaron does not include trailing slashes when resolving a wildcard path
proxyPath := ensureProxyPathTrailingSlash(c.Req.URL.Path, c.Params("*"))
- proxy := pluginproxy.NewDataSourceProxy(ds, plugin, c, proxyPath)
+ proxy := pluginproxy.NewDataSourceProxy(ds, plugin, c, proxyPath, hs.Cfg)
proxy.HandleRequest()
}
diff --git a/pkg/api/dtos/user_token.go b/pkg/api/dtos/user_token.go
new file mode 100644
index 00000000000..1542421e2f6
--- /dev/null
+++ b/pkg/api/dtos/user_token.go
@@ -0,0 +1,12 @@
+package dtos
+
+import "time"
+
+type UserToken struct {
+ Id int64 `json:"id"`
+ IsActive bool `json:"isActive"`
+ ClientIp string `json:"clientIp"`
+ UserAgent string `json:"userAgent"`
+ CreatedAt time.Time `json:"createdAt"`
+ SeenAt time.Time `json:"seenAt"`
+}
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 0e08343b556..0a9a2671071 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -54,13 +54,20 @@ func GetFolderByID(c *m.ReqContext) Response {
return JSON(200, toFolderDto(g, folder))
}
-func CreateFolder(c *m.ReqContext, cmd m.CreateFolderCommand) Response {
+func (hs *HTTPServer) CreateFolder(c *m.ReqContext, cmd m.CreateFolderCommand) Response {
s := dashboards.NewFolderService(c.OrgId, c.SignedInUser)
err := s.CreateFolder(&cmd)
if err != nil {
return toFolderError(err)
}
+ if hs.Cfg.EditorsCanAdmin {
+ if err := dashboards.MakeUserAdmin(hs.Bus, c.OrgId, c.SignedInUser.UserId, cmd.Result.Id, true); err != nil {
+ hs.log.Error("Could not make user admin", "folder", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
+ return Error(500, "Failed to make user admin of folder", err)
+ }
+ }
+
g := guardian.New(cmd.Result.Id, c.OrgId, c.SignedInUser)
return JSON(200, toFolderDto(g, cmd.Result))
}
diff --git a/pkg/api/folder_test.go b/pkg/api/folder_test.go
index 880de338c8f..5e7184ae0c9 100644
--- a/pkg/api/folder_test.go
+++ b/pkg/api/folder_test.go
@@ -9,6 +9,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
)
@@ -141,12 +142,17 @@ func createFolderScenario(desc string, url string, routePattern string, mock *fa
Convey(desc+" "+url, func() {
defer bus.ClearBusHandlers()
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ Cfg: setting.NewCfg(),
+ }
+
sc := setupScenarioContext(url)
sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
sc.context = c
sc.context.SignedInUser = &m.SignedInUser{OrgId: TestOrgID, UserId: TestUserID}
- return CreateFolder(c, cmd)
+ return hs.CreateFolder(c, cmd)
})
origNewFolderService := dashboards.NewFolderService
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 67a511b8b4d..cd61c2f3ebc 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -167,7 +167,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
"externalUserMngLinkUrl": setting.ExternalUserMngLinkUrl,
"externalUserMngLinkName": setting.ExternalUserMngLinkName,
"viewersCanEdit": setting.ViewersCanEdit,
- "editorsCanOwn": hs.Cfg.EditorsCanOwn,
+ "editorsCanAdmin": hs.Cfg.EditorsCanAdmin,
"disableSanitizeHtml": hs.Cfg.DisableSanitizeHtml,
"buildInfo": map[string]interface{}{
"version": setting.BuildVersion,
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 904a885b171..e7555e14621 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -327,6 +327,27 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
})
}
+ if (c.OrgRole == m.ROLE_EDITOR || c.OrgRole == m.ROLE_VIEWER) && hs.Cfg.EditorsCanAdmin {
+ cfgNode := &dtos.NavLink{
+ Id: "cfg",
+ Text: "Configuration",
+ SubTitle: "Organization: " + c.OrgName,
+ Icon: "gicon gicon-cog",
+ Url: setting.AppSubUrl + "/org/teams",
+ Children: []*dtos.NavLink{
+ {
+ Text: "Teams",
+ Id: "teams",
+ Description: "Manage org groups",
+ Icon: "gicon gicon-team",
+ Url: setting.AppSubUrl + "/org/teams",
+ },
+ },
+ }
+
+ data.NavTree = append(data.NavTree, cfgNode)
+ }
+
data.NavTree = append(data.NavTree, &dtos.NavLink{
Text: "Help",
SubTitle: fmt.Sprintf(`%s v%s (%s)`, setting.ApplicationName, setting.BuildVersion, setting.BuildCommit),
diff --git a/pkg/api/pluginproxy/ds_proxy.go b/pkg/api/pluginproxy/ds_proxy.go
index b1950998297..3aec988f9e3 100644
--- a/pkg/api/pluginproxy/ds_proxy.go
+++ b/pkg/api/pluginproxy/ds_proxy.go
@@ -34,13 +34,14 @@ type DataSourceProxy struct {
proxyPath string
route *plugins.AppPluginRoute
plugin *plugins.DataSourcePlugin
+ cfg *setting.Cfg
}
type httpClient interface {
Do(req *http.Request) (*http.Response, error)
}
-func NewDataSourceProxy(ds *m.DataSource, plugin *plugins.DataSourcePlugin, ctx *m.ReqContext, proxyPath string) *DataSourceProxy {
+func NewDataSourceProxy(ds *m.DataSource, plugin *plugins.DataSourcePlugin, ctx *m.ReqContext, proxyPath string, cfg *setting.Cfg) *DataSourceProxy {
targetURL, _ := url.Parse(ds.Url)
return &DataSourceProxy{
@@ -49,6 +50,7 @@ func NewDataSourceProxy(ds *m.DataSource, plugin *plugins.DataSourcePlugin, ctx
ctx: ctx,
proxyPath: proxyPath,
targetUrl: targetURL,
+ cfg: cfg,
}
}
@@ -170,6 +172,10 @@ func (proxy *DataSourceProxy) getDirector() func(req *http.Request) {
req.Header.Add("Authorization", dsAuth)
}
+ if proxy.cfg.SendUserHeader && !proxy.ctx.SignedInUser.IsAnonymous {
+ req.Header.Add("X-Grafana-User", proxy.ctx.SignedInUser.Login)
+ }
+
// clear cookie header, except for whitelisted cookies
var keptCookies []*http.Cookie
if proxy.ds.JsonData != nil {
diff --git a/pkg/api/pluginproxy/ds_proxy_test.go b/pkg/api/pluginproxy/ds_proxy_test.go
index c9be169565f..bfad7d5670d 100644
--- a/pkg/api/pluginproxy/ds_proxy_test.go
+++ b/pkg/api/pluginproxy/ds_proxy_test.go
@@ -81,7 +81,7 @@ func TestDSRouteRule(t *testing.T) {
}
Convey("When matching route path", func() {
- proxy := NewDataSourceProxy(ds, plugin, ctx, "api/v4/some/method")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "api/v4/some/method", &setting.Cfg{})
proxy.route = plugin.Routes[0]
ApplyRoute(proxy.ctx.Req.Context(), req, proxy.proxyPath, proxy.route, proxy.ds)
@@ -92,7 +92,7 @@ func TestDSRouteRule(t *testing.T) {
})
Convey("When matching route path and has dynamic url", func() {
- proxy := NewDataSourceProxy(ds, plugin, ctx, "api/common/some/method")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "api/common/some/method", &setting.Cfg{})
proxy.route = plugin.Routes[3]
ApplyRoute(proxy.ctx.Req.Context(), req, proxy.proxyPath, proxy.route, proxy.ds)
@@ -104,20 +104,20 @@ func TestDSRouteRule(t *testing.T) {
Convey("Validating request", func() {
Convey("plugin route with valid role", func() {
- proxy := NewDataSourceProxy(ds, plugin, ctx, "api/v4/some/method")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "api/v4/some/method", &setting.Cfg{})
err := proxy.validateRequest()
So(err, ShouldBeNil)
})
Convey("plugin route with admin role and user is editor", func() {
- proxy := NewDataSourceProxy(ds, plugin, ctx, "api/admin")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "api/admin", &setting.Cfg{})
err := proxy.validateRequest()
So(err, ShouldNotBeNil)
})
Convey("plugin route with admin role and user is admin", func() {
ctx.SignedInUser.OrgRole = m.ROLE_ADMIN
- proxy := NewDataSourceProxy(ds, plugin, ctx, "api/admin")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "api/admin", &setting.Cfg{})
err := proxy.validateRequest()
So(err, ShouldBeNil)
})
@@ -186,7 +186,7 @@ func TestDSRouteRule(t *testing.T) {
So(err, ShouldBeNil)
client = newFakeHTTPClient(json)
- proxy1 := NewDataSourceProxy(ds, plugin, ctx, "pathwithtoken1")
+ proxy1 := NewDataSourceProxy(ds, plugin, ctx, "pathwithtoken1", &setting.Cfg{})
proxy1.route = plugin.Routes[0]
ApplyRoute(proxy1.ctx.Req.Context(), req, proxy1.proxyPath, proxy1.route, proxy1.ds)
@@ -200,7 +200,7 @@ func TestDSRouteRule(t *testing.T) {
req, _ := http.NewRequest("GET", "http://localhost/asd", nil)
client = newFakeHTTPClient(json2)
- proxy2 := NewDataSourceProxy(ds, plugin, ctx, "pathwithtoken2")
+ proxy2 := NewDataSourceProxy(ds, plugin, ctx, "pathwithtoken2", &setting.Cfg{})
proxy2.route = plugin.Routes[1]
ApplyRoute(proxy2.ctx.Req.Context(), req, proxy2.proxyPath, proxy2.route, proxy2.ds)
@@ -215,7 +215,7 @@ func TestDSRouteRule(t *testing.T) {
req, _ := http.NewRequest("GET", "http://localhost/asd", nil)
client = newFakeHTTPClient([]byte{})
- proxy3 := NewDataSourceProxy(ds, plugin, ctx, "pathwithtoken1")
+ proxy3 := NewDataSourceProxy(ds, plugin, ctx, "pathwithtoken1", &setting.Cfg{})
proxy3.route = plugin.Routes[0]
ApplyRoute(proxy3.ctx.Req.Context(), req, proxy3.proxyPath, proxy3.route, proxy3.ds)
@@ -236,7 +236,7 @@ func TestDSRouteRule(t *testing.T) {
ds := &m.DataSource{Url: "htttp://graphite:8080", Type: m.DS_GRAPHITE}
ctx := &m.ReqContext{}
- proxy := NewDataSourceProxy(ds, plugin, ctx, "/render")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "/render", &setting.Cfg{})
req, err := http.NewRequest(http.MethodGet, "http://grafana.com/sub", nil)
So(err, ShouldBeNil)
@@ -261,7 +261,7 @@ func TestDSRouteRule(t *testing.T) {
}
ctx := &m.ReqContext{}
- proxy := NewDataSourceProxy(ds, plugin, ctx, "")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "", &setting.Cfg{})
req, err := http.NewRequest(http.MethodGet, "http://grafana.com/sub", nil)
So(err, ShouldBeNil)
@@ -291,7 +291,7 @@ func TestDSRouteRule(t *testing.T) {
}
ctx := &m.ReqContext{}
- proxy := NewDataSourceProxy(ds, plugin, ctx, "")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "", &setting.Cfg{})
requestURL, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestURL, Header: make(http.Header)}
@@ -317,7 +317,7 @@ func TestDSRouteRule(t *testing.T) {
}
ctx := &m.ReqContext{}
- proxy := NewDataSourceProxy(ds, plugin, ctx, "")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "", &setting.Cfg{})
requestURL, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestURL, Header: make(http.Header)}
@@ -347,7 +347,7 @@ func TestDSRouteRule(t *testing.T) {
}
ctx := &m.ReqContext{}
- proxy := NewDataSourceProxy(ds, plugin, ctx, "")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "", &setting.Cfg{})
requestURL, _ := url.Parse("http://grafana.com/sub")
req := http.Request{URL: requestURL, Header: make(http.Header)}
@@ -369,7 +369,7 @@ func TestDSRouteRule(t *testing.T) {
Url: "http://host/root/",
}
ctx := &m.ReqContext{}
- proxy := NewDataSourceProxy(ds, plugin, ctx, "/path/to/folder/")
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "/path/to/folder/", &setting.Cfg{})
req, err := http.NewRequest(http.MethodGet, "http://grafana.com/sub", nil)
req.Header.Add("Origin", "grafana.com")
req.Header.Add("Referer", "grafana.com")
@@ -388,9 +388,68 @@ func TestDSRouteRule(t *testing.T) {
So(req.Header.Get("X-Canary"), ShouldEqual, "stillthere")
})
})
+
+ Convey("When SendUserHeader config is enabled", func() {
+ req := getDatasourceProxiedRequest(
+ &m.ReqContext{
+ SignedInUser: &m.SignedInUser{
+ Login: "test_user",
+ },
+ },
+ &setting.Cfg{SendUserHeader: true},
+ )
+ Convey("Should add header with username", func() {
+ So(req.Header.Get("X-Grafana-User"), ShouldEqual, "test_user")
+ })
+ })
+
+ Convey("When SendUserHeader config is disabled", func() {
+ req := getDatasourceProxiedRequest(
+ &m.ReqContext{
+ SignedInUser: &m.SignedInUser{
+ Login: "test_user",
+ },
+ },
+ &setting.Cfg{SendUserHeader: false},
+ )
+ Convey("Should not add header with username", func() {
+ // Get will return empty string even if header is not set
+ So(req.Header.Get("X-Grafana-User"), ShouldEqual, "")
+ })
+ })
+
+ Convey("When SendUserHeader config is enabled but user is anonymous", func() {
+ req := getDatasourceProxiedRequest(
+ &m.ReqContext{
+ SignedInUser: &m.SignedInUser{IsAnonymous: true},
+ },
+ &setting.Cfg{SendUserHeader: true},
+ )
+ Convey("Should not add header with username", func() {
+ // Get will return empty string even if header is not set
+ So(req.Header.Get("X-Grafana-User"), ShouldEqual, "")
+ })
+ })
})
}
+// getDatasourceProxiedRequest is a helper for easier setup of tests based on global config and ReqContext.
+func getDatasourceProxiedRequest(ctx *m.ReqContext, cfg *setting.Cfg) *http.Request {
+ plugin := &plugins.DataSourcePlugin{}
+
+ ds := &m.DataSource{
+ Type: "custom",
+ Url: "http://host/root/",
+ }
+
+ proxy := NewDataSourceProxy(ds, plugin, ctx, "", cfg)
+ req, err := http.NewRequest(http.MethodGet, "http://grafana.com/sub", nil)
+ So(err, ShouldBeNil)
+
+ proxy.getDirector()(req)
+ return req
+}
+
type httpClientStub struct {
fakeBody []byte
}
diff --git a/pkg/api/pluginproxy/pluginproxy.go b/pkg/api/pluginproxy/pluginproxy.go
index 4cf1dbd7cde..5ee59017a82 100644
--- a/pkg/api/pluginproxy/pluginproxy.go
+++ b/pkg/api/pluginproxy/pluginproxy.go
@@ -2,6 +2,7 @@ package pluginproxy
import (
"encoding/json"
+ "github.com/grafana/grafana/pkg/setting"
"net"
"net/http"
"net/http/httputil"
@@ -37,7 +38,7 @@ func getHeaders(route *plugins.AppPluginRoute, orgId int64, appID string) (http.
return result, err
}
-func NewApiPluginProxy(ctx *m.ReqContext, proxyPath string, route *plugins.AppPluginRoute, appID string) *httputil.ReverseProxy {
+func NewApiPluginProxy(ctx *m.ReqContext, proxyPath string, route *plugins.AppPluginRoute, appID string, cfg *setting.Cfg) *httputil.ReverseProxy {
targetURL, _ := url.Parse(route.Url)
director := func(req *http.Request) {
@@ -79,6 +80,10 @@ func NewApiPluginProxy(ctx *m.ReqContext, proxyPath string, route *plugins.AppPl
req.Header.Add("X-Grafana-Context", string(ctxJson))
+ if cfg.SendUserHeader && !ctx.SignedInUser.IsAnonymous {
+ req.Header.Add("X-Grafana-User", ctx.SignedInUser.Login)
+ }
+
if len(route.Headers) > 0 {
headers, err := getHeaders(route, ctx.OrgId, appID)
if err != nil {
diff --git a/pkg/api/pluginproxy/pluginproxy_test.go b/pkg/api/pluginproxy/pluginproxy_test.go
index 424c3fd670c..e4a4fdb25ba 100644
--- a/pkg/api/pluginproxy/pluginproxy_test.go
+++ b/pkg/api/pluginproxy/pluginproxy_test.go
@@ -1,6 +1,7 @@
package pluginproxy
import (
+ "net/http"
"testing"
"github.com/grafana/grafana/pkg/bus"
@@ -44,4 +45,59 @@ func TestPluginProxy(t *testing.T) {
})
})
+ Convey("When SendUserHeader config is enabled", t, func() {
+ req := getPluginProxiedRequest(
+ &m.ReqContext{
+ SignedInUser: &m.SignedInUser{
+ Login: "test_user",
+ },
+ },
+ &setting.Cfg{SendUserHeader: true},
+ )
+
+ Convey("Should add header with username", func() {
+ // Get will return empty string even if header is not set
+ So(req.Header.Get("X-Grafana-User"), ShouldEqual, "test_user")
+ })
+ })
+
+ Convey("When SendUserHeader config is disabled", t, func() {
+ req := getPluginProxiedRequest(
+ &m.ReqContext{
+ SignedInUser: &m.SignedInUser{
+ Login: "test_user",
+ },
+ },
+ &setting.Cfg{SendUserHeader: false},
+ )
+ Convey("Should not add header with username", func() {
+ // Get will return empty string even if header is not set
+ So(req.Header.Get("X-Grafana-User"), ShouldEqual, "")
+ })
+ })
+
+ Convey("When SendUserHeader config is enabled but user is anonymous", t, func() {
+ req := getPluginProxiedRequest(
+ &m.ReqContext{
+ SignedInUser: &m.SignedInUser{IsAnonymous: true},
+ },
+ &setting.Cfg{SendUserHeader: true},
+ )
+
+ Convey("Should not add header with username", func() {
+ // Get will return empty string even if header is not set
+ So(req.Header.Get("X-Grafana-User"), ShouldEqual, "")
+ })
+ })
+}
+
+// getPluginProxiedRequest is a helper for easier setup of tests based on global config and ReqContext.
+func getPluginProxiedRequest(ctx *m.ReqContext, cfg *setting.Cfg) *http.Request {
+ route := &plugins.AppPluginRoute{}
+ proxy := NewApiPluginProxy(ctx, "", route, "", cfg)
+
+ req, err := http.NewRequest(http.MethodGet, "http://grafana.com/sub", nil)
+ So(err, ShouldBeNil)
+ proxy.Director(req)
+ return req
}
diff --git a/pkg/api/team.go b/pkg/api/team.go
index 32265e5d018..ecfd8028c1b 100644
--- a/pkg/api/team.go
+++ b/pkg/api/team.go
@@ -4,19 +4,38 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/teamguardian"
"github.com/grafana/grafana/pkg/util"
)
// POST /api/teams
-func CreateTeam(c *m.ReqContext, cmd m.CreateTeamCommand) Response {
+func (hs *HTTPServer) CreateTeam(c *m.ReqContext, cmd m.CreateTeamCommand) Response {
cmd.OrgId = c.OrgId
- if err := bus.Dispatch(&cmd); err != nil {
+
+ if c.OrgRole == m.ROLE_VIEWER {
+ return Error(403, "Not allowed to create team.", nil)
+ }
+
+ if err := hs.Bus.Dispatch(&cmd); err != nil {
if err == m.ErrTeamNameTaken {
return Error(409, "Team name taken", err)
}
return Error(500, "Failed to create Team", err)
}
+ if c.OrgRole == m.ROLE_EDITOR && hs.Cfg.EditorsCanAdmin {
+ addMemberCmd := m.AddTeamMemberCommand{
+ UserId: c.SignedInUser.UserId,
+ OrgId: cmd.OrgId,
+ TeamId: cmd.Result.Id,
+ Permission: m.PERMISSION_ADMIN,
+ }
+
+ if err := hs.Bus.Dispatch(&addMemberCmd); err != nil {
+ c.Logger.Error("Could not add creator to team.", "error", err)
+ }
+ }
+
return JSON(200, &util.DynMap{
"teamId": cmd.Result.Id,
"message": "Team created",
@@ -24,10 +43,15 @@ func CreateTeam(c *m.ReqContext, cmd m.CreateTeamCommand) Response {
}
// PUT /api/teams/:teamId
-func UpdateTeam(c *m.ReqContext, cmd m.UpdateTeamCommand) Response {
+func (hs *HTTPServer) UpdateTeam(c *m.ReqContext, cmd m.UpdateTeamCommand) Response {
cmd.OrgId = c.OrgId
cmd.Id = c.ParamsInt64(":teamId")
- if err := bus.Dispatch(&cmd); err != nil {
+
+ if err := teamguardian.CanAdmin(hs.Bus, cmd.OrgId, cmd.Id, c.SignedInUser); err != nil {
+ return Error(403, "Not allowed to update team", err)
+ }
+
+ if err := hs.Bus.Dispatch(&cmd); err != nil {
if err == m.ErrTeamNameTaken {
return Error(400, "Team name taken", err)
}
@@ -38,18 +62,26 @@ func UpdateTeam(c *m.ReqContext, cmd m.UpdateTeamCommand) Response {
}
// DELETE /api/teams/:teamId
-func DeleteTeamByID(c *m.ReqContext) Response {
- if err := bus.Dispatch(&m.DeleteTeamCommand{OrgId: c.OrgId, Id: c.ParamsInt64(":teamId")}); err != nil {
+func (hs *HTTPServer) DeleteTeamByID(c *m.ReqContext) Response {
+ orgId := c.OrgId
+ teamId := c.ParamsInt64(":teamId")
+ user := c.SignedInUser
+
+ if err := teamguardian.CanAdmin(hs.Bus, orgId, teamId, user); err != nil {
+ return Error(403, "Not allowed to delete team", err)
+ }
+
+ if err := hs.Bus.Dispatch(&m.DeleteTeamCommand{OrgId: orgId, Id: teamId}); err != nil {
if err == m.ErrTeamNotFound {
return Error(404, "Failed to delete Team. ID not found", nil)
}
- return Error(500, "Failed to update Team", err)
+ return Error(500, "Failed to delete Team", err)
}
return Success("Team deleted")
}
// GET /api/teams/search
-func SearchTeams(c *m.ReqContext) Response {
+func (hs *HTTPServer) SearchTeams(c *m.ReqContext) Response {
perPage := c.QueryInt("perpage")
if perPage <= 0 {
perPage = 1000
@@ -59,12 +91,18 @@ func SearchTeams(c *m.ReqContext) Response {
page = 1
}
+ var userIdFilter int64
+ if hs.Cfg.EditorsCanAdmin && c.OrgRole != m.ROLE_ADMIN {
+ userIdFilter = c.SignedInUser.UserId
+ }
+
query := m.SearchTeamsQuery{
- OrgId: c.OrgId,
- Query: c.Query("query"),
- Name: c.Query("name"),
- Page: page,
- Limit: perPage,
+ OrgId: c.OrgId,
+ Query: c.Query("query"),
+ Name: c.Query("name"),
+ UserIdFilter: userIdFilter,
+ Page: page,
+ Limit: perPage,
}
if err := bus.Dispatch(&query); err != nil {
@@ -98,11 +136,25 @@ func GetTeamByID(c *m.ReqContext) Response {
}
// GET /api/teams/:teamId/preferences
-func GetTeamPreferences(c *m.ReqContext) Response {
- return getPreferencesFor(c.OrgId, 0, c.ParamsInt64(":teamId"))
+func (hs *HTTPServer) GetTeamPreferences(c *m.ReqContext) Response {
+ teamId := c.ParamsInt64(":teamId")
+ orgId := c.OrgId
+
+ if err := teamguardian.CanAdmin(hs.Bus, orgId, teamId, c.SignedInUser); err != nil {
+ return Error(403, "Not allowed to view team preferences.", err)
+ }
+
+ return getPreferencesFor(orgId, 0, teamId)
}
// PUT /api/teams/:teamId/preferences
-func UpdateTeamPreferences(c *m.ReqContext, dtoCmd dtos.UpdatePrefsCmd) Response {
- return updatePreferencesFor(c.OrgId, 0, c.ParamsInt64(":teamId"), &dtoCmd)
+func (hs *HTTPServer) UpdateTeamPreferences(c *m.ReqContext, dtoCmd dtos.UpdatePrefsCmd) Response {
+ teamId := c.ParamsInt64(":teamId")
+ orgId := c.OrgId
+
+ if err := teamguardian.CanAdmin(hs.Bus, orgId, teamId, c.SignedInUser); err != nil {
+ return Error(403, "Not allowed to update team preferences.", err)
+ }
+
+ return updatePreferencesFor(orgId, 0, teamId, &dtoCmd)
}
diff --git a/pkg/api/team_members.go b/pkg/api/team_members.go
index 5b5970de6ad..54a4d8220e5 100644
--- a/pkg/api/team_members.go
+++ b/pkg/api/team_members.go
@@ -4,6 +4,7 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/teamguardian"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
@@ -29,11 +30,15 @@ func GetTeamMembers(c *m.ReqContext) Response {
}
// POST /api/teams/:teamId/members
-func AddTeamMember(c *m.ReqContext, cmd m.AddTeamMemberCommand) Response {
- cmd.TeamId = c.ParamsInt64(":teamId")
+func (hs *HTTPServer) AddTeamMember(c *m.ReqContext, cmd m.AddTeamMemberCommand) Response {
cmd.OrgId = c.OrgId
+ cmd.TeamId = c.ParamsInt64(":teamId")
- if err := bus.Dispatch(&cmd); err != nil {
+ if err := teamguardian.CanAdmin(hs.Bus, cmd.OrgId, cmd.TeamId, c.SignedInUser); err != nil {
+ return Error(403, "Not allowed to add team member", err)
+ }
+
+ if err := hs.Bus.Dispatch(&cmd); err != nil {
if err == m.ErrTeamNotFound {
return Error(404, "Team not found", nil)
}
@@ -50,9 +55,48 @@ func AddTeamMember(c *m.ReqContext, cmd m.AddTeamMemberCommand) Response {
})
}
+// PUT /:teamId/members/:userId
+func (hs *HTTPServer) UpdateTeamMember(c *m.ReqContext, cmd m.UpdateTeamMemberCommand) Response {
+ teamId := c.ParamsInt64(":teamId")
+ orgId := c.OrgId
+
+ if err := teamguardian.CanAdmin(hs.Bus, orgId, teamId, c.SignedInUser); err != nil {
+ return Error(403, "Not allowed to update team member", err)
+ }
+
+ if c.OrgRole != m.ROLE_ADMIN {
+ cmd.ProtectLastAdmin = true
+ }
+
+ cmd.TeamId = teamId
+ cmd.UserId = c.ParamsInt64(":userId")
+ cmd.OrgId = orgId
+
+ if err := hs.Bus.Dispatch(&cmd); err != nil {
+ if err == m.ErrTeamMemberNotFound {
+ return Error(404, "Team member not found.", nil)
+ }
+ return Error(500, "Failed to update team member.", err)
+ }
+ return Success("Team member updated")
+}
+
// DELETE /api/teams/:teamId/members/:userId
-func RemoveTeamMember(c *m.ReqContext) Response {
- if err := bus.Dispatch(&m.RemoveTeamMemberCommand{OrgId: c.OrgId, TeamId: c.ParamsInt64(":teamId"), UserId: c.ParamsInt64(":userId")}); err != nil {
+func (hs *HTTPServer) RemoveTeamMember(c *m.ReqContext) Response {
+ orgId := c.OrgId
+ teamId := c.ParamsInt64(":teamId")
+ userId := c.ParamsInt64(":userId")
+
+ if err := teamguardian.CanAdmin(hs.Bus, orgId, teamId, c.SignedInUser); err != nil {
+ return Error(403, "Not allowed to remove team member", err)
+ }
+
+ protectLastAdmin := false
+ if c.OrgRole != m.ROLE_ADMIN {
+ protectLastAdmin = true
+ }
+
+ if err := hs.Bus.Dispatch(&m.RemoveTeamMemberCommand{OrgId: orgId, TeamId: teamId, UserId: userId, ProtectLastAdmin: protectLastAdmin}); err != nil {
if err == m.ErrTeamNotFound {
return Error(404, "Team not found", nil)
}
diff --git a/pkg/api/team_test.go b/pkg/api/team_test.go
index a1984288870..cab59cc5f98 100644
--- a/pkg/api/team_test.go
+++ b/pkg/api/team_test.go
@@ -3,6 +3,8 @@ package api
import (
"testing"
+ "github.com/grafana/grafana/pkg/setting"
+
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
@@ -20,6 +22,10 @@ func TestTeamApiEndpoint(t *testing.T) {
TotalCount: 2,
}
+ hs := &HTTPServer{
+ Cfg: setting.NewCfg(),
+ }
+
Convey("When searching with no parameters", func() {
loggedInUserScenario("When calling GET on", "/api/teams/search", func(sc *scenarioContext) {
var sentLimit int
@@ -33,7 +39,7 @@ func TestTeamApiEndpoint(t *testing.T) {
return nil
})
- sc.handlerFunc = SearchTeams
+ sc.handlerFunc = hs.SearchTeams
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
So(sentLimit, ShouldEqual, 1000)
@@ -60,7 +66,7 @@ func TestTeamApiEndpoint(t *testing.T) {
return nil
})
- sc.handlerFunc = SearchTeams
+ sc.handlerFunc = hs.SearchTeams
sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
So(sentLimit, ShouldEqual, 10)
diff --git a/pkg/api/user_token.go b/pkg/api/user_token.go
new file mode 100644
index 00000000000..2f74eedea5d
--- /dev/null
+++ b/pkg/api/user_token.go
@@ -0,0 +1,110 @@
+package api
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/api/dtos"
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/util"
+)
+
+// GET /api/user/auth-tokens
+func (server *HTTPServer) GetUserAuthTokens(c *models.ReqContext) Response {
+ return server.getUserAuthTokensInternal(c, c.UserId)
+}
+
+// POST /api/user/revoke-auth-token
+func (server *HTTPServer) RevokeUserAuthToken(c *models.ReqContext, cmd models.RevokeAuthTokenCmd) Response {
+ return server.revokeUserAuthTokenInternal(c, c.UserId, cmd)
+}
+
+func (server *HTTPServer) logoutUserFromAllDevicesInternal(userID int64) Response {
+ userQuery := models.GetUserByIdQuery{Id: userID}
+
+ if err := bus.Dispatch(&userQuery); err != nil {
+ if err == models.ErrUserNotFound {
+ return Error(404, "User not found", err)
+ }
+ return Error(500, "Could not read user from database", err)
+ }
+
+ err := server.AuthTokenService.RevokeAllUserTokens(userID)
+ if err != nil {
+ return Error(500, "Failed to logout user", err)
+ }
+
+ return JSON(200, util.DynMap{
+ "message": "User logged out",
+ })
+}
+
+func (server *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID int64) Response {
+ userQuery := models.GetUserByIdQuery{Id: userID}
+
+ if err := bus.Dispatch(&userQuery); err != nil {
+ if err == models.ErrUserNotFound {
+ return Error(404, "User not found", err)
+ }
+ return Error(500, "Failed to get user", err)
+ }
+
+ tokens, err := server.AuthTokenService.GetUserTokens(userID)
+ if err != nil {
+ return Error(500, "Failed to get user auth tokens", err)
+ }
+
+ result := []*dtos.UserToken{}
+ for _, token := range tokens {
+ isActive := false
+ if c.UserToken != nil && c.UserToken.Id == token.Id {
+ isActive = true
+ }
+
+ result = append(result, &dtos.UserToken{
+ Id: token.Id,
+ IsActive: isActive,
+ ClientIp: token.ClientIp,
+ UserAgent: token.UserAgent,
+ CreatedAt: time.Unix(token.CreatedAt, 0),
+ SeenAt: time.Unix(token.SeenAt, 0),
+ })
+ }
+
+ return JSON(200, result)
+}
+
+func (server *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID int64, cmd models.RevokeAuthTokenCmd) Response {
+ userQuery := models.GetUserByIdQuery{Id: userID}
+
+ if err := bus.Dispatch(&userQuery); err != nil {
+ if err == models.ErrUserNotFound {
+ return Error(404, "User not found", err)
+ }
+ return Error(500, "Failed to get user", err)
+ }
+
+ token, err := server.AuthTokenService.GetUserToken(userID, cmd.AuthTokenId)
+ if err != nil {
+ if err == models.ErrUserTokenNotFound {
+ return Error(404, "User auth token not found", err)
+ }
+ return Error(500, "Failed to get user auth token", err)
+ }
+
+ if c.UserToken != nil && c.UserToken.Id == token.Id {
+ return Error(400, "Cannot revoke active user auth token", nil)
+ }
+
+ err = server.AuthTokenService.RevokeToken(token)
+ if err != nil {
+ if err == models.ErrUserTokenNotFound {
+ return Error(404, "User auth token not found", err)
+ }
+ return Error(500, "Failed to revoke user auth token", err)
+ }
+
+ return JSON(200, util.DynMap{
+ "message": "User auth token revoked",
+ })
+}
diff --git a/pkg/api/user_token_test.go b/pkg/api/user_token_test.go
new file mode 100644
index 00000000000..111070dca92
--- /dev/null
+++ b/pkg/api/user_token_test.go
@@ -0,0 +1,294 @@
+package api
+
+import (
+ "testing"
+ "time"
+
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/auth"
+
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUserTokenApiEndpoint(t *testing.T) {
+ Convey("When current user attempts to revoke an auth token for a non-existing user", t, func() {
+ userId := int64(0)
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ userId = cmd.Id
+ return m.ErrUserNotFound
+ })
+
+ cmd := m.RevokeAuthTokenCmd{AuthTokenId: 2}
+
+ revokeUserAuthTokenScenario("Should return not found when calling POST on", "/api/user/revoke-auth-token", "/api/user/revoke-auth-token", cmd, 200, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 404)
+ So(userId, ShouldEqual, 200)
+ })
+ })
+
+ Convey("When current user gets auth tokens for a non-existing user", t, func() {
+ userId := int64(0)
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ userId = cmd.Id
+ return m.ErrUserNotFound
+ })
+
+ getUserAuthTokensScenario("Should return not found when calling GET on", "/api/user/auth-tokens", "/api/user/auth-tokens", 200, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 404)
+ So(userId, ShouldEqual, 200)
+ })
+ })
+
+ Convey("When logout an existing user from all devices", t, func() {
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ cmd.Result = &m.User{Id: 200}
+ return nil
+ })
+
+ logoutUserFromAllDevicesInternalScenario("Should be successful", 1, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+ })
+
+ Convey("When logout a non-existing user from all devices", t, func() {
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ return m.ErrUserNotFound
+ })
+
+ logoutUserFromAllDevicesInternalScenario("Should return not found", TestUserID, func(sc *scenarioContext) {
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 404)
+ })
+ })
+
+ Convey("When revoke an auth token for a user", t, func() {
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ cmd.Result = &m.User{Id: 200}
+ return nil
+ })
+
+ cmd := m.RevokeAuthTokenCmd{AuthTokenId: 2}
+ token := &m.UserToken{Id: 1}
+
+ revokeUserAuthTokenInternalScenario("Should be successful", cmd, 200, token, func(sc *scenarioContext) {
+ sc.userAuthTokenService.GetUserTokenProvider = func(userId, userTokenId int64) (*m.UserToken, error) {
+ return &m.UserToken{Id: 2}, nil
+ }
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 200)
+ })
+ })
+
+ Convey("When revoke the active auth token used by himself", t, func() {
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ cmd.Result = &m.User{Id: TestUserID}
+ return nil
+ })
+
+ cmd := m.RevokeAuthTokenCmd{AuthTokenId: 2}
+ token := &m.UserToken{Id: 2}
+
+ revokeUserAuthTokenInternalScenario("Should not be successful", cmd, TestUserID, token, func(sc *scenarioContext) {
+ sc.userAuthTokenService.GetUserTokenProvider = func(userId, userTokenId int64) (*m.UserToken, error) {
+ return token, nil
+ }
+ sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+ So(sc.resp.Code, ShouldEqual, 400)
+ })
+ })
+
+ Convey("When gets auth tokens for a user", t, func() {
+ bus.AddHandler("test", func(cmd *m.GetUserByIdQuery) error {
+ cmd.Result = &m.User{Id: TestUserID}
+ return nil
+ })
+
+ currentToken := &m.UserToken{Id: 1}
+
+ getUserAuthTokensInternalScenario("Should be successful", currentToken, func(sc *scenarioContext) {
+ tokens := []*m.UserToken{
+ {
+ Id: 1,
+ ClientIp: "127.0.0.1",
+ UserAgent: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36",
+ CreatedAt: time.Now().Unix(),
+ SeenAt: time.Now().Unix(),
+ },
+ {
+ Id: 2,
+ ClientIp: "127.0.0.2",
+ UserAgent: "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
+ CreatedAt: time.Now().Unix(),
+ SeenAt: time.Now().Unix(),
+ },
+ }
+ sc.userAuthTokenService.GetUserTokensProvider = func(userId int64) ([]*m.UserToken, error) {
+ return tokens, nil
+ }
+ sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+ So(sc.resp.Code, ShouldEqual, 200)
+ result := sc.ToJSON()
+ So(result.MustArray(), ShouldHaveLength, 2)
+
+ resultOne := result.GetIndex(0)
+ So(resultOne.Get("id").MustInt64(), ShouldEqual, tokens[0].Id)
+ So(resultOne.Get("isActive").MustBool(), ShouldBeTrue)
+ So(resultOne.Get("clientIp").MustString(), ShouldEqual, "127.0.0.1")
+ So(resultOne.Get("userAgent").MustString(), ShouldEqual, "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36")
+ So(resultOne.Get("createdAt").MustString(), ShouldEqual, time.Unix(tokens[0].CreatedAt, 0).Format(time.RFC3339))
+ So(resultOne.Get("seenAt").MustString(), ShouldEqual, time.Unix(tokens[0].SeenAt, 0).Format(time.RFC3339))
+
+ resultTwo := result.GetIndex(1)
+ So(resultTwo.Get("id").MustInt64(), ShouldEqual, tokens[1].Id)
+ So(resultTwo.Get("isActive").MustBool(), ShouldBeFalse)
+ So(resultTwo.Get("clientIp").MustString(), ShouldEqual, "127.0.0.2")
+ So(resultTwo.Get("userAgent").MustString(), ShouldEqual, "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1")
+ So(resultTwo.Get("createdAt").MustString(), ShouldEqual, time.Unix(tokens[1].CreatedAt, 0).Format(time.RFC3339))
+ So(resultTwo.Get("seenAt").MustString(), ShouldEqual, time.Unix(tokens[1].SeenAt, 0).Format(time.RFC3339))
+ })
+ })
+}
+
+func revokeUserAuthTokenScenario(desc string, url string, routePattern string, cmd m.RevokeAuthTokenCmd, userId int64, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ AuthTokenService: fakeAuthTokenService,
+ }
+
+ sc := setupScenarioContext(url)
+ sc.userAuthTokenService = fakeAuthTokenService
+ sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+ sc.context = c
+ sc.context.UserId = userId
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = m.ROLE_ADMIN
+
+ return hs.RevokeUserAuthToken(c, cmd)
+ })
+
+ sc.m.Post(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
+
+func getUserAuthTokensScenario(desc string, url string, routePattern string, userId int64, fn scenarioFunc) {
+ Convey(desc+" "+url, func() {
+ defer bus.ClearBusHandlers()
+
+ fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ AuthTokenService: fakeAuthTokenService,
+ }
+
+ sc := setupScenarioContext(url)
+ sc.userAuthTokenService = fakeAuthTokenService
+ sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+ sc.context = c
+ sc.context.UserId = userId
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = m.ROLE_ADMIN
+
+ return hs.GetUserAuthTokens(c)
+ })
+
+ sc.m.Get(routePattern, sc.defaultHandler)
+
+ fn(sc)
+ })
+}
+
+func logoutUserFromAllDevicesInternalScenario(desc string, userId int64, fn scenarioFunc) {
+ Convey(desc, func() {
+ defer bus.ClearBusHandlers()
+
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ AuthTokenService: auth.NewFakeUserAuthTokenService(),
+ }
+
+ sc := setupScenarioContext("/")
+ sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = m.ROLE_ADMIN
+
+ return hs.logoutUserFromAllDevicesInternal(userId)
+ })
+
+ sc.m.Post("/", sc.defaultHandler)
+
+ fn(sc)
+ })
+}
+
+func revokeUserAuthTokenInternalScenario(desc string, cmd m.RevokeAuthTokenCmd, userId int64, token *m.UserToken, fn scenarioFunc) {
+ Convey(desc, func() {
+ defer bus.ClearBusHandlers()
+
+ fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ AuthTokenService: fakeAuthTokenService,
+ }
+
+ sc := setupScenarioContext("/")
+ sc.userAuthTokenService = fakeAuthTokenService
+ sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = m.ROLE_ADMIN
+ sc.context.UserToken = token
+
+ return hs.revokeUserAuthTokenInternal(c, userId, cmd)
+ })
+
+ sc.m.Post("/", sc.defaultHandler)
+
+ fn(sc)
+ })
+}
+
+func getUserAuthTokensInternalScenario(desc string, token *m.UserToken, fn scenarioFunc) {
+ Convey(desc, func() {
+ defer bus.ClearBusHandlers()
+
+ fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+
+ hs := HTTPServer{
+ Bus: bus.GetBus(),
+ AuthTokenService: fakeAuthTokenService,
+ }
+
+ sc := setupScenarioContext("/")
+ sc.userAuthTokenService = fakeAuthTokenService
+ sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+ sc.context = c
+ sc.context.UserId = TestUserID
+ sc.context.OrgId = TestOrgID
+ sc.context.OrgRole = m.ROLE_ADMIN
+ sc.context.UserToken = token
+
+ return hs.getUserAuthTokensInternal(c, TestUserID)
+ })
+
+ sc.m.Get("/", sc.defaultHandler)
+
+ fn(sc)
+ })
+}
diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index 53218147ae0..c10212329cf 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -29,6 +29,7 @@ import (
// self registering services
_ "github.com/grafana/grafana/pkg/extensions"
_ "github.com/grafana/grafana/pkg/infra/metrics"
+ _ "github.com/grafana/grafana/pkg/infra/remotecache"
_ "github.com/grafana/grafana/pkg/infra/serverlock"
_ "github.com/grafana/grafana/pkg/infra/tracing"
_ "github.com/grafana/grafana/pkg/infra/usagestats"
diff --git a/pkg/infra/remotecache/database_storage.go b/pkg/infra/remotecache/database_storage.go
new file mode 100644
index 00000000000..1c39d74d800
--- /dev/null
+++ b/pkg/infra/remotecache/database_storage.go
@@ -0,0 +1,126 @@
+package remotecache
+
+import (
+ "context"
+ "time"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/services/sqlstore"
+)
+
+var getTime = time.Now
+
+const databaseCacheType = "database"
+
+type databaseCache struct {
+ SQLStore *sqlstore.SqlStore
+ log log.Logger
+}
+
+func newDatabaseCache(sqlstore *sqlstore.SqlStore) *databaseCache {
+ dc := &databaseCache{
+ SQLStore: sqlstore,
+ log: log.New("remotecache.database"),
+ }
+
+ return dc
+}
+
+func (dc *databaseCache) Run(ctx context.Context) error {
+ ticker := time.NewTicker(time.Minute * 10)
+ for {
+ select {
+ case <-ctx.Done():
+ return ctx.Err()
+ case <-ticker.C:
+ dc.internalRunGC()
+ }
+ }
+}
+
+func (dc *databaseCache) internalRunGC() {
+ now := getTime().Unix()
+ sql := `DELETE FROM cache_data WHERE (? - created_at) >= expires AND expires <> 0`
+
+ _, err := dc.SQLStore.NewSession().Exec(sql, now)
+ if err != nil {
+ dc.log.Error("failed to run garbage collect", "error", err)
+ }
+}
+
+func (dc *databaseCache) Get(key string) (interface{}, error) {
+ cacheHit := CacheData{}
+ session := dc.SQLStore.NewSession()
+ defer session.Close()
+
+ exist, err := session.Where("cache_key= ?", key).Get(&cacheHit)
+
+ if err != nil {
+ return nil, err
+ }
+
+ if !exist {
+ return nil, ErrCacheItemNotFound
+ }
+
+ if cacheHit.Expires > 0 {
+ existedButExpired := getTime().Unix()-cacheHit.CreatedAt >= cacheHit.Expires
+ if existedButExpired {
+ _ = dc.Delete(key) //ignore this error since we will return `ErrCacheItemNotFound` anyway
+ return nil, ErrCacheItemNotFound
+ }
+ }
+
+ item := &cachedItem{}
+ if err = decodeGob(cacheHit.Data, item); err != nil {
+ return nil, err
+ }
+
+ return item.Val, nil
+}
+
+func (dc *databaseCache) Set(key string, value interface{}, expire time.Duration) error {
+ item := &cachedItem{Val: value}
+ data, err := encodeGob(item)
+ if err != nil {
+ return err
+ }
+
+ session := dc.SQLStore.NewSession()
+
+ var cacheHit CacheData
+ has, err := session.Where("cache_key = ?", key).Get(&cacheHit)
+ if err != nil {
+ return err
+ }
+
+ var expiresInSeconds int64
+ if expire != 0 {
+ expiresInSeconds = int64(expire) / int64(time.Second)
+ }
+
+ // insert or update depending on if item already exist
+ if has {
+ sql := `UPDATE cache_data SET data=?, created=?, expire=? WHERE cache_key='?'`
+ _, err = session.Exec(sql, data, getTime().Unix(), expiresInSeconds, key)
+ } else {
+ sql := `INSERT INTO cache_data (cache_key,data,created_at,expires) VALUES(?,?,?,?)`
+ _, err = session.Exec(sql, key, data, getTime().Unix(), expiresInSeconds)
+ }
+
+ return err
+}
+
+func (dc *databaseCache) Delete(key string) error {
+ sql := "DELETE FROM cache_data WHERE cache_key=?"
+ _, err := dc.SQLStore.NewSession().Exec(sql, key)
+
+ return err
+}
+
+type CacheData struct {
+ CacheKey string
+ Data []byte
+ Expires int64
+ CreatedAt int64
+}
diff --git a/pkg/infra/remotecache/database_storage_test.go b/pkg/infra/remotecache/database_storage_test.go
new file mode 100644
index 00000000000..d15e26fd07f
--- /dev/null
+++ b/pkg/infra/remotecache/database_storage_test.go
@@ -0,0 +1,56 @@
+package remotecache
+
+import (
+ "testing"
+ "time"
+
+ "github.com/bmizerany/assert"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/services/sqlstore"
+)
+
+func TestDatabaseStorageGarbageCollection(t *testing.T) {
+ sqlstore := sqlstore.InitTestDB(t)
+
+ db := &databaseCache{
+ SQLStore: sqlstore,
+ log: log.New("remotecache.database"),
+ }
+
+ obj := &CacheableStruct{String: "foolbar"}
+
+ //set time.now to 2 weeks ago
+ var err error
+ getTime = func() time.Time { return time.Now().AddDate(0, 0, -2) }
+ err = db.Set("key1", obj, 1000*time.Second)
+ assert.Equal(t, err, nil)
+
+ err = db.Set("key2", obj, 1000*time.Second)
+ assert.Equal(t, err, nil)
+
+ err = db.Set("key3", obj, 1000*time.Second)
+ assert.Equal(t, err, nil)
+
+ // insert object that should never expire
+ db.Set("key4", obj, 0)
+
+ getTime = time.Now
+ db.Set("key5", obj, 1000*time.Second)
+
+ //run GC
+ db.internalRunGC()
+
+ //try to read values
+ _, err = db.Get("key1")
+ assert.Equal(t, err, ErrCacheItemNotFound, "expected cache item not found. got: ", err)
+ _, err = db.Get("key2")
+ assert.Equal(t, err, ErrCacheItemNotFound)
+ _, err = db.Get("key3")
+ assert.Equal(t, err, ErrCacheItemNotFound)
+
+ _, err = db.Get("key4")
+ assert.Equal(t, err, nil)
+ _, err = db.Get("key5")
+ assert.Equal(t, err, nil)
+}
diff --git a/pkg/infra/remotecache/memcached_storage.go b/pkg/infra/remotecache/memcached_storage.go
new file mode 100644
index 00000000000..5424a05ad02
--- /dev/null
+++ b/pkg/infra/remotecache/memcached_storage.go
@@ -0,0 +1,71 @@
+package remotecache
+
+import (
+ "time"
+
+ "github.com/bradfitz/gomemcache/memcache"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+const memcachedCacheType = "memcached"
+
+type memcachedStorage struct {
+ c *memcache.Client
+}
+
+func newMemcachedStorage(opts *setting.RemoteCacheOptions) *memcachedStorage {
+ return &memcachedStorage{
+ c: memcache.New(opts.ConnStr),
+ }
+}
+
+func newItem(sid string, data []byte, expire int32) *memcache.Item {
+ return &memcache.Item{
+ Key: sid,
+ Value: data,
+ Expiration: expire,
+ }
+}
+
+// Set sets value to given key in the cache.
+func (s *memcachedStorage) Set(key string, val interface{}, expires time.Duration) error {
+ item := &cachedItem{Val: val}
+ bytes, err := encodeGob(item)
+ if err != nil {
+ return err
+ }
+
+ var expiresInSeconds int64
+ if expires != 0 {
+ expiresInSeconds = int64(expires) / int64(time.Second)
+ }
+
+ memcachedItem := newItem(key, bytes, int32(expiresInSeconds))
+ return s.c.Set(memcachedItem)
+}
+
+// Get gets value by given key in the cache.
+func (s *memcachedStorage) Get(key string) (interface{}, error) {
+ memcachedItem, err := s.c.Get(key)
+ if err != nil && err.Error() == "memcache: cache miss" {
+ return nil, ErrCacheItemNotFound
+ }
+
+ if err != nil {
+ return nil, err
+ }
+
+ item := &cachedItem{}
+
+ err = decodeGob(memcachedItem.Value, item)
+ if err != nil {
+ return nil, err
+ }
+
+ return item.Val, nil
+}
+
+// Delete delete a key from the cache
+func (s *memcachedStorage) Delete(key string) error {
+ return s.c.Delete(key)
+}
diff --git a/pkg/infra/remotecache/memcached_storage_integration_test.go b/pkg/infra/remotecache/memcached_storage_integration_test.go
new file mode 100644
index 00000000000..d1d82468644
--- /dev/null
+++ b/pkg/infra/remotecache/memcached_storage_integration_test.go
@@ -0,0 +1,15 @@
+// +build memcached
+
+package remotecache
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+func TestMemcachedCacheStorage(t *testing.T) {
+ opts := &setting.RemoteCacheOptions{Name: memcachedCacheType, ConnStr: "localhost:11211"}
+ client := createTestClient(t, opts, nil)
+ runTestsForClient(t, client)
+}
diff --git a/pkg/infra/remotecache/redis_storage.go b/pkg/infra/remotecache/redis_storage.go
new file mode 100644
index 00000000000..bd54b843119
--- /dev/null
+++ b/pkg/infra/remotecache/redis_storage.go
@@ -0,0 +1,62 @@
+package remotecache
+
+import (
+ "time"
+
+ "github.com/grafana/grafana/pkg/setting"
+ redis "gopkg.in/redis.v2"
+)
+
+const redisCacheType = "redis"
+
+type redisStorage struct {
+ c *redis.Client
+}
+
+func newRedisStorage(opts *setting.RemoteCacheOptions) *redisStorage {
+ opt := &redis.Options{
+ Network: "tcp",
+ Addr: opts.ConnStr,
+ }
+ return &redisStorage{c: redis.NewClient(opt)}
+}
+
+// Set sets value to given key in session.
+func (s *redisStorage) Set(key string, val interface{}, expires time.Duration) error {
+ item := &cachedItem{Val: val}
+ value, err := encodeGob(item)
+ if err != nil {
+ return err
+ }
+
+ status := s.c.SetEx(key, expires, string(value))
+ return status.Err()
+}
+
+// Get gets value by given key in session.
+func (s *redisStorage) Get(key string) (interface{}, error) {
+ v := s.c.Get(key)
+
+ item := &cachedItem{}
+ err := decodeGob([]byte(v.Val()), item)
+
+ if err == nil {
+ return item.Val, nil
+ }
+
+ if err.Error() == "EOF" {
+ return nil, ErrCacheItemNotFound
+ }
+
+ if err != nil {
+ return nil, err
+ }
+
+ return item.Val, nil
+}
+
+// Delete delete a key from session.
+func (s *redisStorage) Delete(key string) error {
+ cmd := s.c.Del(key)
+ return cmd.Err()
+}
diff --git a/pkg/infra/remotecache/redis_storage_integration_test.go b/pkg/infra/remotecache/redis_storage_integration_test.go
new file mode 100644
index 00000000000..8d54fc9ff14
--- /dev/null
+++ b/pkg/infra/remotecache/redis_storage_integration_test.go
@@ -0,0 +1,16 @@
+// +build redis
+
+package remotecache
+
+import (
+ "testing"
+
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+func TestRedisCacheStorage(t *testing.T) {
+
+ opts := &setting.RemoteCacheOptions{Name: redisCacheType, ConnStr: "localhost:6379"}
+ client := createTestClient(t, opts, nil)
+ runTestsForClient(t, client)
+}
diff --git a/pkg/infra/remotecache/remotecache.go b/pkg/infra/remotecache/remotecache.go
new file mode 100644
index 00000000000..9219fa33a08
--- /dev/null
+++ b/pkg/infra/remotecache/remotecache.go
@@ -0,0 +1,133 @@
+package remotecache
+
+import (
+ "bytes"
+ "context"
+ "encoding/gob"
+ "errors"
+ "time"
+
+ "github.com/grafana/grafana/pkg/setting"
+
+ "github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/services/sqlstore"
+
+ "github.com/grafana/grafana/pkg/registry"
+)
+
+var (
+ // ErrCacheItemNotFound is returned if cache does not exist
+ ErrCacheItemNotFound = errors.New("cache item not found")
+
+ // ErrInvalidCacheType is returned if the type is invalid
+ ErrInvalidCacheType = errors.New("invalid remote cache name")
+
+ defaultMaxCacheExpiration = time.Hour * 24
+)
+
+func init() {
+ registry.RegisterService(&RemoteCache{})
+}
+
+// CacheStorage allows the caller to set, get and delete items in the cache.
+// Cached items are stored as byte arrays and marshalled using "encoding/gob"
+// so any struct added to the cache needs to be registred with `remotecache.Register`
+// ex `remotecache.Register(CacheableStruct{})``
+type CacheStorage interface {
+ // Get reads object from Cache
+ Get(key string) (interface{}, error)
+
+ // Set sets an object into the cache. if `expire` is set to zero it will default to 24h
+ Set(key string, value interface{}, expire time.Duration) error
+
+ // Delete object from cache
+ Delete(key string) error
+}
+
+// RemoteCache allows Grafana to cache data outside its own process
+type RemoteCache struct {
+ log log.Logger
+ client CacheStorage
+ SQLStore *sqlstore.SqlStore `inject:""`
+ Cfg *setting.Cfg `inject:""`
+}
+
+// Get reads object from Cache
+func (ds *RemoteCache) Get(key string) (interface{}, error) {
+ return ds.client.Get(key)
+}
+
+// Set sets an object into the cache. if `expire` is set to zero it will default to 24h
+func (ds *RemoteCache) Set(key string, value interface{}, expire time.Duration) error {
+ if expire == 0 {
+ expire = defaultMaxCacheExpiration
+ }
+
+ return ds.client.Set(key, value, expire)
+}
+
+// Delete object from cache
+func (ds *RemoteCache) Delete(key string) error {
+ return ds.client.Delete(key)
+}
+
+// Init initializes the service
+func (ds *RemoteCache) Init() error {
+ ds.log = log.New("cache.remote")
+ var err error
+ ds.client, err = createClient(ds.Cfg.RemoteCacheOptions, ds.SQLStore)
+ return err
+}
+
+// Run start the backend processes for cache clients
+func (ds *RemoteCache) Run(ctx context.Context) error {
+ //create new interface if more clients need GC jobs
+ backgroundjob, ok := ds.client.(registry.BackgroundService)
+ if ok {
+ return backgroundjob.Run(ctx)
+ }
+
+ <-ctx.Done()
+ return ctx.Err()
+}
+
+func createClient(opts *setting.RemoteCacheOptions, sqlstore *sqlstore.SqlStore) (CacheStorage, error) {
+ if opts.Name == redisCacheType {
+ return newRedisStorage(opts), nil
+ }
+
+ if opts.Name == memcachedCacheType {
+ return newMemcachedStorage(opts), nil
+ }
+
+ if opts.Name == databaseCacheType {
+ return newDatabaseCache(sqlstore), nil
+ }
+
+ return nil, ErrInvalidCacheType
+}
+
+// Register records a type, identified by a value for that type, under its
+// internal type name. That name will identify the concrete type of a value
+// sent or received as an interface variable. Only types that will be
+// transferred as implementations of interface values need to be registered.
+// Expecting to be used only during initialization, it panics if the mapping
+// between types and names is not a bijection.
+func Register(value interface{}) {
+ gob.Register(value)
+}
+
+type cachedItem struct {
+ Val interface{}
+}
+
+func encodeGob(item *cachedItem) ([]byte, error) {
+ buf := bytes.NewBuffer(nil)
+ err := gob.NewEncoder(buf).Encode(item)
+ return buf.Bytes(), err
+}
+
+func decodeGob(data []byte, out *cachedItem) error {
+ buf := bytes.NewBuffer(data)
+ return gob.NewDecoder(buf).Decode(&out)
+}
diff --git a/pkg/infra/remotecache/remotecache_test.go b/pkg/infra/remotecache/remotecache_test.go
new file mode 100644
index 00000000000..bf1675ec87c
--- /dev/null
+++ b/pkg/infra/remotecache/remotecache_test.go
@@ -0,0 +1,93 @@
+package remotecache
+
+import (
+ "testing"
+ "time"
+
+ "github.com/bmizerany/assert"
+
+ "github.com/grafana/grafana/pkg/services/sqlstore"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+type CacheableStruct struct {
+ String string
+ Int64 int64
+}
+
+func init() {
+ Register(CacheableStruct{})
+}
+
+func createTestClient(t *testing.T, opts *setting.RemoteCacheOptions, sqlstore *sqlstore.SqlStore) CacheStorage {
+ t.Helper()
+
+ dc := &RemoteCache{
+ SQLStore: sqlstore,
+ Cfg: &setting.Cfg{
+ RemoteCacheOptions: opts,
+ },
+ }
+
+ err := dc.Init()
+ if err != nil {
+ t.Fatalf("failed to init client for test. error: %v", err)
+ }
+
+ return dc
+}
+
+func TestCachedBasedOnConfig(t *testing.T) {
+
+ cfg := setting.NewCfg()
+ cfg.Load(&setting.CommandLineArgs{
+ HomePath: "../../../",
+ })
+
+ client := createTestClient(t, cfg.RemoteCacheOptions, sqlstore.InitTestDB(t))
+ runTestsForClient(t, client)
+}
+
+func TestInvalidCacheTypeReturnsError(t *testing.T) {
+ _, err := createClient(&setting.RemoteCacheOptions{Name: "invalid"}, nil)
+ assert.Equal(t, err, ErrInvalidCacheType)
+}
+
+func runTestsForClient(t *testing.T, client CacheStorage) {
+ canPutGetAndDeleteCachedObjects(t, client)
+ canNotFetchExpiredItems(t, client)
+}
+
+func canPutGetAndDeleteCachedObjects(t *testing.T, client CacheStorage) {
+ cacheableStruct := CacheableStruct{String: "hej", Int64: 2000}
+
+ err := client.Set("key1", cacheableStruct, 0)
+ assert.Equal(t, err, nil, "expected nil. got: ", err)
+
+ data, err := client.Get("key1")
+ s, ok := data.(CacheableStruct)
+
+ assert.Equal(t, ok, true)
+ assert.Equal(t, s.String, "hej")
+ assert.Equal(t, s.Int64, int64(2000))
+
+ err = client.Delete("key1")
+ assert.Equal(t, err, nil)
+
+ _, err = client.Get("key1")
+ assert.Equal(t, err, ErrCacheItemNotFound)
+}
+
+func canNotFetchExpiredItems(t *testing.T, client CacheStorage) {
+ cacheableStruct := CacheableStruct{String: "hej", Int64: 2000}
+
+ err := client.Set("key1", cacheableStruct, time.Second)
+ assert.Equal(t, err, nil)
+
+ //not sure how this can be avoided when testing redis/memcached :/
+ <-time.After(time.Second + time.Millisecond)
+
+ // should not be able to read that value since its expired
+ _, err = client.Get("key1")
+ assert.Equal(t, err, ErrCacheItemNotFound)
+}
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index e06409211eb..c00241ea34c 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -86,3 +86,20 @@ func Auth(options *AuthOptions) macaron.Handler {
}
}
}
+
+// AdminOrFeatureEnabled creates a middleware that allows access
+// if the signed in user is either an Org Admin or if the
+// feature flag is enabled.
+// Intended for when feature flags open up access to APIs that
+// are otherwise only available to admins.
+func AdminOrFeatureEnabled(enabled bool) macaron.Handler {
+ return func(c *m.ReqContext) {
+ if c.OrgRole == m.ROLE_ADMIN {
+ return
+ }
+
+ if !enabled {
+ accessForbidden(c)
+ }
+ }
+}
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index 1fbd303bebd..2fc8e0c456f 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -11,6 +11,7 @@ import (
msession "github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/services/session"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
@@ -155,7 +156,7 @@ func TestMiddlewareContext(t *testing.T) {
return nil
})
- sc.userAuthTokenService.lookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
+ sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
return &m.UserToken{
UserId: 12,
UnhashedToken: unhashedToken,
@@ -184,14 +185,14 @@ func TestMiddlewareContext(t *testing.T) {
return nil
})
- sc.userAuthTokenService.lookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
+ sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
return &m.UserToken{
UserId: 12,
UnhashedToken: "",
}, nil
}
- sc.userAuthTokenService.tryRotateTokenProvider = func(userToken *m.UserToken, clientIP, userAgent string) (bool, error) {
+ sc.userAuthTokenService.TryRotateTokenProvider = func(userToken *m.UserToken, clientIP, userAgent string) (bool, error) {
userToken.UnhashedToken = "rotated"
return true, nil
}
@@ -226,7 +227,7 @@ func TestMiddlewareContext(t *testing.T) {
middlewareScenario("Invalid/expired auth token in cookie", func(sc *scenarioContext) {
sc.withTokenSessionCookie("token")
- sc.userAuthTokenService.lookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
+ sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
return nil, m.ErrUserTokenNotFound
}
@@ -562,7 +563,7 @@ func middlewareScenario(desc string, fn scenarioFunc) {
}))
session.Init(&msession.Options{}, 0)
- sc.userAuthTokenService = newFakeUserAuthTokenService()
+ sc.userAuthTokenService = auth.NewFakeUserAuthTokenService()
sc.m.Use(GetContextHandler(sc.userAuthTokenService))
// mock out gc goroutine
session.StartSessionGC = func() {}
@@ -595,7 +596,7 @@ type scenarioContext struct {
handlerFunc handlerFunc
defaultHandler macaron.Handler
url string
- userAuthTokenService *fakeUserAuthTokenService
+ userAuthTokenService *auth.FakeUserAuthTokenService
req *http.Request
}
@@ -676,57 +677,3 @@ func (sc *scenarioContext) exec() {
type scenarioFunc func(c *scenarioContext)
type handlerFunc func(c *m.ReqContext)
-
-type fakeUserAuthTokenService struct {
- createTokenProvider func(userId int64, clientIP, userAgent string) (*m.UserToken, error)
- tryRotateTokenProvider func(token *m.UserToken, clientIP, userAgent string) (bool, error)
- lookupTokenProvider func(unhashedToken string) (*m.UserToken, error)
- revokeTokenProvider func(token *m.UserToken) error
- activeAuthTokenCount func() (int64, error)
-}
-
-func newFakeUserAuthTokenService() *fakeUserAuthTokenService {
- return &fakeUserAuthTokenService{
- createTokenProvider: func(userId int64, clientIP, userAgent string) (*m.UserToken, error) {
- return &m.UserToken{
- UserId: 0,
- UnhashedToken: "",
- }, nil
- },
- tryRotateTokenProvider: func(token *m.UserToken, clientIP, userAgent string) (bool, error) {
- return false, nil
- },
- lookupTokenProvider: func(unhashedToken string) (*m.UserToken, error) {
- return &m.UserToken{
- UserId: 0,
- UnhashedToken: "",
- }, nil
- },
- revokeTokenProvider: func(token *m.UserToken) error {
- return nil
- },
- activeAuthTokenCount: func() (int64, error) {
- return 10, nil
- },
- }
-}
-
-func (s *fakeUserAuthTokenService) CreateToken(userId int64, clientIP, userAgent string) (*m.UserToken, error) {
- return s.createTokenProvider(userId, clientIP, userAgent)
-}
-
-func (s *fakeUserAuthTokenService) LookupToken(unhashedToken string) (*m.UserToken, error) {
- return s.lookupTokenProvider(unhashedToken)
-}
-
-func (s *fakeUserAuthTokenService) TryRotateToken(token *m.UserToken, clientIP, userAgent string) (bool, error) {
- return s.tryRotateTokenProvider(token, clientIP, userAgent)
-}
-
-func (s *fakeUserAuthTokenService) RevokeToken(token *m.UserToken) error {
- return s.revokeTokenProvider(token)
-}
-
-func (s *fakeUserAuthTokenService) ActiveTokenCount() (int64, error) {
- return s.activeAuthTokenCount()
-}
diff --git a/pkg/middleware/org_redirect_test.go b/pkg/middleware/org_redirect_test.go
index e01d1a68d21..fe5b2736035 100644
--- a/pkg/middleware/org_redirect_test.go
+++ b/pkg/middleware/org_redirect_test.go
@@ -24,7 +24,7 @@ func TestOrgRedirectMiddleware(t *testing.T) {
return nil
})
- sc.userAuthTokenService.lookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
+ sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
return &m.UserToken{
UserId: 0,
UnhashedToken: "",
@@ -50,7 +50,7 @@ func TestOrgRedirectMiddleware(t *testing.T) {
return nil
})
- sc.userAuthTokenService.lookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
+ sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
return &m.UserToken{
UserId: 12,
UnhashedToken: "",
diff --git a/pkg/middleware/quota_test.go b/pkg/middleware/quota_test.go
index 52b696cf037..0ba42e708bc 100644
--- a/pkg/middleware/quota_test.go
+++ b/pkg/middleware/quota_test.go
@@ -3,6 +3,7 @@ package middleware
import (
"testing"
+ "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/services/quota"
"github.com/grafana/grafana/pkg/bus"
@@ -36,7 +37,7 @@ func TestMiddlewareQuota(t *testing.T) {
},
}
- fakeAuthTokenService := newFakeUserAuthTokenService()
+ fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
qs := "a.QuotaService{
AuthTokenService: fakeAuthTokenService,
}
@@ -87,7 +88,7 @@ func TestMiddlewareQuota(t *testing.T) {
return nil
})
- sc.userAuthTokenService.lookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
+ sc.userAuthTokenService.LookupTokenProvider = func(unhashedToken string) (*m.UserToken, error) {
return &m.UserToken{
UserId: 12,
UnhashedToken: "",
diff --git a/pkg/middleware/recovery_test.go b/pkg/middleware/recovery_test.go
index 6736d699a39..00f3b7a3032 100644
--- a/pkg/middleware/recovery_test.go
+++ b/pkg/middleware/recovery_test.go
@@ -6,6 +6,7 @@ import (
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
+ "github.com/grafana/grafana/pkg/services/auth"
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey"
macaron "gopkg.in/macaron.v1"
@@ -62,7 +63,7 @@ func recoveryScenario(desc string, url string, fn scenarioFunc) {
Delims: macaron.Delims{Left: "[[", Right: "]]"},
}))
- sc.userAuthTokenService = newFakeUserAuthTokenService()
+ sc.userAuthTokenService = auth.NewFakeUserAuthTokenService()
sc.m.Use(GetContextHandler(sc.userAuthTokenService))
// mock out gc goroutine
sc.m.Use(OrgRedirect())
diff --git a/pkg/models/team.go b/pkg/models/team.go
index 61285db3a5f..bc8cbba8100 100644
--- a/pkg/models/team.go
+++ b/pkg/models/team.go
@@ -7,9 +7,12 @@ import (
// Typed errors
var (
- ErrTeamNotFound = errors.New("Team not found")
- ErrTeamNameTaken = errors.New("Team name is taken")
- ErrTeamMemberNotFound = errors.New("Team member not found")
+ ErrTeamNotFound = errors.New("Team not found")
+ ErrTeamNameTaken = errors.New("Team name is taken")
+ ErrTeamMemberNotFound = errors.New("Team member not found")
+ ErrLastTeamAdmin = errors.New("Not allowed to remove last admin")
+ ErrNotAllowedToUpdateTeam = errors.New("User not allowed to update team")
+ ErrNotAllowedToUpdateTeamInDifferentOrg = errors.New("User not allowed to update team in another org")
)
// Team model
@@ -59,22 +62,24 @@ type GetTeamsByUserQuery struct {
}
type SearchTeamsQuery struct {
- Query string
- Name string
- Limit int
- Page int
- OrgId int64
+ Query string
+ Name string
+ Limit int
+ Page int
+ OrgId int64
+ UserIdFilter int64
Result SearchTeamQueryResult
}
type TeamDTO struct {
- Id int64 `json:"id"`
- OrgId int64 `json:"orgId"`
- Name string `json:"name"`
- Email string `json:"email"`
- AvatarUrl string `json:"avatarUrl"`
- MemberCount int64 `json:"memberCount"`
+ Id int64 `json:"id"`
+ OrgId int64 `json:"orgId"`
+ Name string `json:"name"`
+ Email string `json:"email"`
+ AvatarUrl string `json:"avatarUrl"`
+ MemberCount int64 `json:"memberCount"`
+ Permission PermissionType `json:"permission"`
}
type SearchTeamQueryResult struct {
diff --git a/pkg/models/team_member.go b/pkg/models/team_member.go
index dd64787f465..0b80aef8f44 100644
--- a/pkg/models/team_member.go
+++ b/pkg/models/team_member.go
@@ -12,11 +12,12 @@ var (
// TeamMember model
type TeamMember struct {
- Id int64
- OrgId int64
- TeamId int64
- UserId int64
- External bool
+ Id int64
+ OrgId int64
+ TeamId int64
+ UserId int64
+ External bool // Signals that the membership has been created by an external systems, such as LDAP
+ Permission PermissionType
Created time.Time
Updated time.Time
@@ -26,16 +27,26 @@ type TeamMember struct {
// COMMANDS
type AddTeamMemberCommand struct {
- UserId int64 `json:"userId" binding:"Required"`
- OrgId int64 `json:"-"`
- TeamId int64 `json:"-"`
- External bool `json:"-"`
+ UserId int64 `json:"userId" binding:"Required"`
+ OrgId int64 `json:"-"`
+ TeamId int64 `json:"-"`
+ External bool `json:"-"`
+ Permission PermissionType `json:"-"`
+}
+
+type UpdateTeamMemberCommand struct {
+ UserId int64 `json:"-"`
+ OrgId int64 `json:"-"`
+ TeamId int64 `json:"-"`
+ Permission PermissionType `json:"permission"`
+ ProtectLastAdmin bool `json:"-"`
}
type RemoveTeamMemberCommand struct {
- OrgId int64 `json:"-"`
- UserId int64
- TeamId int64
+ OrgId int64 `json:"-"`
+ UserId int64
+ TeamId int64
+ ProtectLastAdmin bool `json:"-"`
}
// ----------------------
@@ -53,12 +64,13 @@ type GetTeamMembersQuery struct {
// Projections and DTOs
type TeamMemberDTO struct {
- OrgId int64 `json:"orgId"`
- TeamId int64 `json:"teamId"`
- UserId int64 `json:"userId"`
- External bool `json:"-"`
- Email string `json:"email"`
- Login string `json:"login"`
- AvatarUrl string `json:"avatarUrl"`
- Labels []string `json:"labels"`
+ OrgId int64 `json:"orgId"`
+ TeamId int64 `json:"teamId"`
+ UserId int64 `json:"userId"`
+ External bool `json:"-"`
+ Email string `json:"email"`
+ Login string `json:"login"`
+ AvatarUrl string `json:"avatarUrl"`
+ Labels []string `json:"labels"`
+ Permission PermissionType `json:"permission"`
}
diff --git a/pkg/models/user_token.go b/pkg/models/user_token.go
index 388bc2dd4a2..8c3e7985995 100644
--- a/pkg/models/user_token.go
+++ b/pkg/models/user_token.go
@@ -1,6 +1,8 @@
package models
-import "errors"
+import (
+ "errors"
+)
// Typed errors
var (
@@ -23,11 +25,18 @@ type UserToken struct {
UnhashedToken string
}
+type RevokeAuthTokenCmd struct {
+ AuthTokenId int64 `json:"authTokenId"`
+}
+
// UserTokenService are used for generating and validating user tokens
type UserTokenService interface {
CreateToken(userId int64, clientIP, userAgent string) (*UserToken, error)
LookupToken(unhashedToken string) (*UserToken, error)
TryRotateToken(token *UserToken, clientIP, userAgent string) (bool, error)
RevokeToken(token *UserToken) error
+ RevokeAllUserTokens(userId int64) error
ActiveTokenCount() (int64, error)
+ GetUserToken(userId, userTokenId int64) (*UserToken, error)
+ GetUserTokens(userId int64) ([]*UserToken, error)
}
diff --git a/pkg/services/alerting/notifiers/victorops.go b/pkg/services/alerting/notifiers/victorops.go
index 3093aec9957..f33b3f4019e 100644
--- a/pkg/services/alerting/notifiers/victorops.go
+++ b/pkg/services/alerting/notifiers/victorops.go
@@ -92,14 +92,29 @@ func (this *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
messageType = AlertStateRecovery
}
+ fields := make(map[string]interface{}, 0)
+ fieldLimitCount := 4
+ for index, evt := range evalContext.EvalMatches {
+ fields[evt.Metric] = evt.Value
+ if index > fieldLimitCount {
+ break
+ }
+ }
+
bodyJSON := simplejson.New()
bodyJSON.Set("message_type", messageType)
bodyJSON.Set("entity_id", evalContext.Rule.Name)
+ bodyJSON.Set("entity_display_name", evalContext.GetNotificationTitle())
bodyJSON.Set("timestamp", time.Now().Unix())
bodyJSON.Set("state_start_time", evalContext.StartTime.Unix())
bodyJSON.Set("state_message", evalContext.Rule.Message)
bodyJSON.Set("monitoring_tool", "Grafana v"+setting.BuildVersion)
bodyJSON.Set("alert_url", ruleUrl)
+ bodyJSON.Set("metrics", fields)
+
+ if evalContext.Error != nil {
+ bodyJSON.Set("error_message", evalContext.Error.Error())
+ }
if evalContext.ImagePublicUrl != "" {
bodyJSON.Set("image_url", evalContext.ImagePublicUrl)
diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/auth_token.go
index 648575d54cd..255866a9ba0 100644
--- a/pkg/services/auth/auth_token.go
+++ b/pkg/services/auth/auth_token.go
@@ -221,6 +221,57 @@ func (s *UserAuthTokenService) RevokeToken(token *models.UserToken) error {
return nil
}
+func (s *UserAuthTokenService) RevokeAllUserTokens(userId int64) error {
+ sql := `DELETE from user_auth_token WHERE user_id = ?`
+ res, err := s.SQLStore.NewSession().Exec(sql, userId)
+ if err != nil {
+ return err
+ }
+
+ affected, err := res.RowsAffected()
+ if err != nil {
+ return err
+ }
+
+ s.log.Debug("all user tokens for user revoked", "userId", userId, "count", affected)
+
+ return nil
+}
+
+func (s *UserAuthTokenService) GetUserToken(userId, userTokenId int64) (*models.UserToken, error) {
+ var token userAuthToken
+ exists, err := s.SQLStore.NewSession().Where("id = ? AND user_id = ?", userTokenId, userId).Get(&token)
+ if err != nil {
+ return nil, err
+ }
+
+ if !exists {
+ return nil, models.ErrUserTokenNotFound
+ }
+
+ var result models.UserToken
+ token.toUserToken(&result)
+
+ return &result, nil
+}
+
+func (s *UserAuthTokenService) GetUserTokens(userId int64) ([]*models.UserToken, error) {
+ var tokens []*userAuthToken
+ err := s.SQLStore.NewSession().Where("user_id = ? AND created_at > ? AND rotated_at > ?", userId, s.createdAfterParam(), s.rotatedAfterParam()).Find(&tokens)
+ if err != nil {
+ return nil, err
+ }
+
+ result := []*models.UserToken{}
+ for _, token := range tokens {
+ var userToken models.UserToken
+ token.toUserToken(&userToken)
+ result = append(result, &userToken)
+ }
+
+ return result, nil
+}
+
func (s *UserAuthTokenService) createdAfterParam() int64 {
tokenMaxLifetime := time.Duration(s.Cfg.LoginMaxLifetimeDays) * 24 * time.Hour
return getTime().Add(-tokenMaxLifetime).Unix()
diff --git a/pkg/services/auth/auth_token_test.go b/pkg/services/auth/auth_token_test.go
index 49e7acc3a5b..33eb309ad18 100644
--- a/pkg/services/auth/auth_token_test.go
+++ b/pkg/services/auth/auth_token_test.go
@@ -75,6 +75,47 @@ func TestUserAuthToken(t *testing.T) {
err = userAuthTokenService.RevokeToken(userToken)
So(err, ShouldEqual, models.ErrUserTokenNotFound)
})
+
+ Convey("When creating an additional token", func() {
+ userToken2, err := userAuthTokenService.CreateToken(userID, "192.168.10.11:1234", "some user agent")
+ So(err, ShouldBeNil)
+ So(userToken2, ShouldNotBeNil)
+
+ Convey("Can get first user token", func() {
+ token, err := userAuthTokenService.GetUserToken(userID, userToken.Id)
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+ So(token.Id, ShouldEqual, userToken.Id)
+ })
+
+ Convey("Can get second user token", func() {
+ token, err := userAuthTokenService.GetUserToken(userID, userToken2.Id)
+ So(err, ShouldBeNil)
+ So(token, ShouldNotBeNil)
+ So(token.Id, ShouldEqual, userToken2.Id)
+ })
+
+ Convey("Can get user tokens", func() {
+ tokens, err := userAuthTokenService.GetUserTokens(userID)
+ So(err, ShouldBeNil)
+ So(tokens, ShouldHaveLength, 2)
+ So(tokens[0].Id, ShouldEqual, userToken.Id)
+ So(tokens[1].Id, ShouldEqual, userToken2.Id)
+ })
+
+ Convey("Can revoke all user tokens", func() {
+ err := userAuthTokenService.RevokeAllUserTokens(userID)
+ So(err, ShouldBeNil)
+
+ model, err := ctx.getAuthTokenByID(userToken.Id)
+ So(err, ShouldBeNil)
+ So(model, ShouldBeNil)
+
+ model2, err := ctx.getAuthTokenByID(userToken2.Id)
+ So(err, ShouldBeNil)
+ So(model2, ShouldBeNil)
+ })
+ })
})
Convey("expires correctly", func() {
diff --git a/pkg/services/auth/testing.go b/pkg/services/auth/testing.go
new file mode 100644
index 00000000000..68e65466c3d
--- /dev/null
+++ b/pkg/services/auth/testing.go
@@ -0,0 +1,81 @@
+package auth
+
+import "github.com/grafana/grafana/pkg/models"
+
+type FakeUserAuthTokenService struct {
+ CreateTokenProvider func(userId int64, clientIP, userAgent string) (*models.UserToken, error)
+ TryRotateTokenProvider func(token *models.UserToken, clientIP, userAgent string) (bool, error)
+ LookupTokenProvider func(unhashedToken string) (*models.UserToken, error)
+ RevokeTokenProvider func(token *models.UserToken) error
+ RevokeAllUserTokensProvider func(userId int64) error
+ ActiveAuthTokenCount func() (int64, error)
+ GetUserTokenProvider func(userId, userTokenId int64) (*models.UserToken, error)
+ GetUserTokensProvider func(userId int64) ([]*models.UserToken, error)
+}
+
+func NewFakeUserAuthTokenService() *FakeUserAuthTokenService {
+ return &FakeUserAuthTokenService{
+ CreateTokenProvider: func(userId int64, clientIP, userAgent string) (*models.UserToken, error) {
+ return &models.UserToken{
+ UserId: 0,
+ UnhashedToken: "",
+ }, nil
+ },
+ TryRotateTokenProvider: func(token *models.UserToken, clientIP, userAgent string) (bool, error) {
+ return false, nil
+ },
+ LookupTokenProvider: func(unhashedToken string) (*models.UserToken, error) {
+ return &models.UserToken{
+ UserId: 0,
+ UnhashedToken: "",
+ }, nil
+ },
+ RevokeTokenProvider: func(token *models.UserToken) error {
+ return nil
+ },
+ RevokeAllUserTokensProvider: func(userId int64) error {
+ return nil
+ },
+ ActiveAuthTokenCount: func() (int64, error) {
+ return 10, nil
+ },
+ GetUserTokenProvider: func(userId, userTokenId int64) (*models.UserToken, error) {
+ return nil, nil
+ },
+ GetUserTokensProvider: func(userId int64) ([]*models.UserToken, error) {
+ return nil, nil
+ },
+ }
+}
+
+func (s *FakeUserAuthTokenService) CreateToken(userId int64, clientIP, userAgent string) (*models.UserToken, error) {
+ return s.CreateTokenProvider(userId, clientIP, userAgent)
+}
+
+func (s *FakeUserAuthTokenService) LookupToken(unhashedToken string) (*models.UserToken, error) {
+ return s.LookupTokenProvider(unhashedToken)
+}
+
+func (s *FakeUserAuthTokenService) TryRotateToken(token *models.UserToken, clientIP, userAgent string) (bool, error) {
+ return s.TryRotateTokenProvider(token, clientIP, userAgent)
+}
+
+func (s *FakeUserAuthTokenService) RevokeToken(token *models.UserToken) error {
+ return s.RevokeTokenProvider(token)
+}
+
+func (s *FakeUserAuthTokenService) RevokeAllUserTokens(userId int64) error {
+ return s.RevokeAllUserTokensProvider(userId)
+}
+
+func (s *FakeUserAuthTokenService) ActiveTokenCount() (int64, error) {
+ return s.ActiveAuthTokenCount()
+}
+
+func (s *FakeUserAuthTokenService) GetUserToken(userId, userTokenId int64) (*models.UserToken, error) {
+ return s.GetUserTokenProvider(userId, userTokenId)
+}
+
+func (s *FakeUserAuthTokenService) GetUserTokens(userId int64) ([]*models.UserToken, error) {
+ return s.GetUserTokensProvider(userId)
+}
diff --git a/pkg/services/dashboards/acl_service.go b/pkg/services/dashboards/acl_service.go
new file mode 100644
index 00000000000..864fbb80a6b
--- /dev/null
+++ b/pkg/services/dashboards/acl_service.go
@@ -0,0 +1,55 @@
+package dashboards
+
+import (
+ "github.com/grafana/grafana/pkg/bus"
+ "github.com/grafana/grafana/pkg/models"
+ "time"
+)
+
+func MakeUserAdmin(bus bus.Bus, orgId int64, userId int64, dashboardId int64, setViewAndEditPermissions bool) error {
+ rtEditor := models.ROLE_EDITOR
+ rtViewer := models.ROLE_VIEWER
+
+ items := []*models.DashboardAcl{
+ {
+ OrgId: orgId,
+ DashboardId: dashboardId,
+ UserId: userId,
+ Permission: models.PERMISSION_ADMIN,
+ Created: time.Now(),
+ Updated: time.Now(),
+ },
+ }
+
+ if setViewAndEditPermissions {
+ items = append(items,
+ &models.DashboardAcl{
+ OrgId: orgId,
+ DashboardId: dashboardId,
+ Role: &rtEditor,
+ Permission: models.PERMISSION_EDIT,
+ Created: time.Now(),
+ Updated: time.Now(),
+ },
+ &models.DashboardAcl{
+ OrgId: orgId,
+ DashboardId: dashboardId,
+ Role: &rtViewer,
+ Permission: models.PERMISSION_VIEW,
+ Created: time.Now(),
+ Updated: time.Now(),
+ },
+ )
+ }
+
+ aclCmd := &models.UpdateDashboardAclCommand{
+ DashboardId: dashboardId,
+ Items: items,
+ }
+
+ if err := bus.Dispatch(aclCmd); err != nil {
+ return err
+ }
+
+ return nil
+}
diff --git a/pkg/services/sqlstore/migrations/cache_data_mig.go b/pkg/services/sqlstore/migrations/cache_data_mig.go
new file mode 100644
index 00000000000..3467b88962b
--- /dev/null
+++ b/pkg/services/sqlstore/migrations/cache_data_mig.go
@@ -0,0 +1,22 @@
+package migrations
+
+import "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+
+func addCacheMigration(mg *migrator.Migrator) {
+ var cacheDataV1 = migrator.Table{
+ Name: "cache_data",
+ Columns: []*migrator.Column{
+ {Name: "cache_key", Type: migrator.DB_NVarchar, IsPrimaryKey: true, Length: 168},
+ {Name: "data", Type: migrator.DB_Blob},
+ {Name: "expires", Type: migrator.DB_Integer, Length: 255, Nullable: false},
+ {Name: "created_at", Type: migrator.DB_Integer, Length: 255, Nullable: false},
+ },
+ Indices: []*migrator.Index{
+ {Cols: []string{"cache_key"}, Type: migrator.UniqueIndex},
+ },
+ }
+
+ mg.AddMigration("create cache_data table", migrator.NewAddTableMigration(cacheDataV1))
+
+ mg.AddMigration("add unique index cache_data.cache_key", migrator.NewAddIndexMigration(cacheDataV1, cacheDataV1.Indices[0]))
+}
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 931259ec3ed..3e40c749f37 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -33,6 +33,7 @@ func AddMigrations(mg *Migrator) {
addUserAuthMigrations(mg)
addServerlockMigrations(mg)
addUserAuthTokenMigrations(mg)
+ addCacheMigration(mg)
}
func addMigrationLogMigrations(mg *Migrator) {
diff --git a/pkg/services/sqlstore/migrations/team_mig.go b/pkg/services/sqlstore/migrations/team_mig.go
index 34c46ad13cf..981a4865caa 100644
--- a/pkg/services/sqlstore/migrations/team_mig.go
+++ b/pkg/services/sqlstore/migrations/team_mig.go
@@ -54,4 +54,8 @@ func addTeamMigrations(mg *Migrator) {
mg.AddMigration("Add column external to team_member table", NewAddColumnMigration(teamMemberV1, &Column{
Name: "external", Type: DB_Bool, Nullable: true,
}))
+
+ mg.AddMigration("Add column permission to team_member table", NewAddColumnMigration(teamMemberV1, &Column{
+ Name: "permission", Type: DB_SmallInt, Nullable: true,
+ }))
}
diff --git a/pkg/services/sqlstore/team.go b/pkg/services/sqlstore/team.go
index 83593e6f2d7..03fd2df78fc 100644
--- a/pkg/services/sqlstore/team.go
+++ b/pkg/services/sqlstore/team.go
@@ -18,17 +18,30 @@ func init() {
bus.AddHandler("sql", GetTeamsByUser)
bus.AddHandler("sql", AddTeamMember)
+ bus.AddHandler("sql", UpdateTeamMember)
bus.AddHandler("sql", RemoveTeamMember)
bus.AddHandler("sql", GetTeamMembers)
}
+func getTeamSearchSqlBase() string {
+ return `SELECT
+ team.id as id,
+ team.org_id,
+ team.name as name,
+ team.email as email,
+ (SELECT COUNT(*) from team_member where team_member.team_id = team.id) as member_count,
+ team_member.permission
+ FROM team as team
+ INNER JOIN team_member on team.id = team_member.team_id AND team_member.user_id = ? `
+}
+
func getTeamSelectSqlBase() string {
return `SELECT
team.id as id,
team.org_id,
team.name as name,
team.email as email,
- (SELECT COUNT(*) from team_member where team_member.team_id = team.id) as member_count
+ (SELECT COUNT(*) from team_member where team_member.team_id = team.id) as member_count
FROM team as team `
}
@@ -91,10 +104,8 @@ func UpdateTeam(cmd *m.UpdateTeamCommand) error {
// DeleteTeam will delete a team, its member and any permissions connected to the team
func DeleteTeam(cmd *m.DeleteTeamCommand) error {
return inTransaction(func(sess *DBSession) error {
- if teamExists, err := teamExists(cmd.OrgId, cmd.Id, sess); err != nil {
+ if _, err := teamExists(cmd.OrgId, cmd.Id, sess); err != nil {
return err
- } else if !teamExists {
- return m.ErrTeamNotFound
}
deletes := []string{
@@ -117,7 +128,7 @@ func teamExists(orgId int64, teamId int64, sess *DBSession) (bool, error) {
if res, err := sess.Query("SELECT 1 from team WHERE org_id=? and id=?", orgId, teamId); err != nil {
return false, err
} else if len(res) != 1 {
- return false, nil
+ return false, m.ErrTeamNotFound
}
return true, nil
@@ -147,7 +158,12 @@ func SearchTeams(query *m.SearchTeamsQuery) error {
var sql bytes.Buffer
params := make([]interface{}, 0)
- sql.WriteString(getTeamSelectSqlBase())
+ if query.UserIdFilter > 0 {
+ sql.WriteString(getTeamSearchSqlBase())
+ params = append(params, query.UserIdFilter)
+ } else {
+ sql.WriteString(getTeamSelectSqlBase())
+ }
sql.WriteString(` WHERE team.org_id = ?`)
params = append(params, query.OrgId)
@@ -233,19 +249,18 @@ func AddTeamMember(cmd *m.AddTeamMemberCommand) error {
return m.ErrTeamMemberAlreadyAdded
}
- if teamExists, err := teamExists(cmd.OrgId, cmd.TeamId, sess); err != nil {
+ if _, err := teamExists(cmd.OrgId, cmd.TeamId, sess); err != nil {
return err
- } else if !teamExists {
- return m.ErrTeamNotFound
}
entity := m.TeamMember{
- OrgId: cmd.OrgId,
- TeamId: cmd.TeamId,
- UserId: cmd.UserId,
- External: cmd.External,
- Created: time.Now(),
- Updated: time.Now(),
+ OrgId: cmd.OrgId,
+ TeamId: cmd.TeamId,
+ UserId: cmd.UserId,
+ External: cmd.External,
+ Created: time.Now(),
+ Updated: time.Now(),
+ Permission: cmd.Permission,
}
_, err := sess.Insert(&entity)
@@ -253,13 +268,59 @@ func AddTeamMember(cmd *m.AddTeamMemberCommand) error {
})
}
+func getTeamMember(sess *DBSession, orgId int64, teamId int64, userId int64) (m.TeamMember, error) {
+ rawSql := `SELECT * FROM team_member WHERE org_id=? and team_id=? and user_id=?`
+ var member m.TeamMember
+ exists, err := sess.SQL(rawSql, orgId, teamId, userId).Get(&member)
+
+ if err != nil {
+ return member, err
+ }
+ if !exists {
+ return member, m.ErrTeamMemberNotFound
+ }
+
+ return member, nil
+}
+
+// UpdateTeamMember updates a team member
+func UpdateTeamMember(cmd *m.UpdateTeamMemberCommand) error {
+ return inTransaction(func(sess *DBSession) error {
+ member, err := getTeamMember(sess, cmd.OrgId, cmd.TeamId, cmd.UserId)
+ if err != nil {
+ return err
+ }
+
+ if cmd.ProtectLastAdmin {
+ _, err := isLastAdmin(sess, cmd.OrgId, cmd.TeamId, cmd.UserId)
+ if err != nil {
+ return err
+ }
+ }
+
+ if cmd.Permission != m.PERMISSION_ADMIN { // make sure we don't get invalid permission levels in store
+ cmd.Permission = 0
+ }
+
+ member.Permission = cmd.Permission
+ _, err = sess.Cols("permission").Where("org_id=? and team_id=? and user_id=?", cmd.OrgId, cmd.TeamId, cmd.UserId).Update(member)
+
+ return err
+ })
+}
+
// RemoveTeamMember removes a member from a team
func RemoveTeamMember(cmd *m.RemoveTeamMemberCommand) error {
return inTransaction(func(sess *DBSession) error {
- if teamExists, err := teamExists(cmd.OrgId, cmd.TeamId, sess); err != nil {
+ if _, err := teamExists(cmd.OrgId, cmd.TeamId, sess); err != nil {
return err
- } else if !teamExists {
- return m.ErrTeamNotFound
+ }
+
+ if cmd.ProtectLastAdmin {
+ _, err := isLastAdmin(sess, cmd.OrgId, cmd.TeamId, cmd.UserId)
+ if err != nil {
+ return err
+ }
}
var rawSql = "DELETE FROM team_member WHERE org_id=? and team_id=? and user_id=?"
@@ -276,6 +337,29 @@ func RemoveTeamMember(cmd *m.RemoveTeamMemberCommand) error {
})
}
+func isLastAdmin(sess *DBSession, orgId int64, teamId int64, userId int64) (bool, error) {
+ rawSql := "SELECT user_id FROM team_member WHERE org_id=? and team_id=? and permission=?"
+ userIds := []*int64{}
+ err := sess.SQL(rawSql, orgId, teamId, m.PERMISSION_ADMIN).Find(&userIds)
+ if err != nil {
+ return false, err
+ }
+
+ isAdmin := false
+ for _, adminId := range userIds {
+ if userId == *adminId {
+ isAdmin = true
+ break
+ }
+ }
+
+ if isAdmin && len(userIds) == 1 {
+ return true, m.ErrLastTeamAdmin
+ }
+
+ return false, err
+}
+
// GetTeamMembers return a list of members for the specified team
func GetTeamMembers(query *m.GetTeamMembersQuery) error {
query.Result = make([]*m.TeamMemberDTO, 0)
@@ -293,7 +377,7 @@ func GetTeamMembers(query *m.GetTeamMembersQuery) error {
if query.External {
sess.Where("team_member.external=?", dialect.BooleanStr(true))
}
- sess.Cols("team_member.org_id", "team_member.team_id", "team_member.user_id", "user.email", "user.login", "team_member.external")
+ sess.Cols("team_member.org_id", "team_member.team_id", "team_member.user_id", "user.email", "user.login", "team_member.external", "team_member.permission")
sess.Asc("user.login", "user.email")
err := sess.Find(&query.Result)
diff --git a/pkg/services/sqlstore/team_test.go b/pkg/services/sqlstore/team_test.go
index 8f243617262..7ac78733af7 100644
--- a/pkg/services/sqlstore/team_test.go
+++ b/pkg/services/sqlstore/team_test.go
@@ -75,6 +75,72 @@ func TestTeamCommandsAndQueries(t *testing.T) {
So(q2.Result[0].External, ShouldEqual, true)
})
+ Convey("Should be able to update users in a team", func() {
+ userId := userIds[0]
+ team := group1.Result
+ addMemberCmd := m.AddTeamMemberCommand{OrgId: testOrgId, TeamId: team.Id, UserId: userId}
+ err = AddTeamMember(&addMemberCmd)
+ So(err, ShouldBeNil)
+
+ qBeforeUpdate := &m.GetTeamMembersQuery{OrgId: testOrgId, TeamId: team.Id}
+ err = GetTeamMembers(qBeforeUpdate)
+ So(err, ShouldBeNil)
+ So(qBeforeUpdate.Result[0].Permission, ShouldEqual, 0)
+
+ err = UpdateTeamMember(&m.UpdateTeamMemberCommand{
+ UserId: userId,
+ OrgId: testOrgId,
+ TeamId: team.Id,
+ Permission: m.PERMISSION_ADMIN,
+ })
+
+ So(err, ShouldBeNil)
+
+ qAfterUpdate := &m.GetTeamMembersQuery{OrgId: testOrgId, TeamId: team.Id}
+ err = GetTeamMembers(qAfterUpdate)
+ So(err, ShouldBeNil)
+ So(qAfterUpdate.Result[0].Permission, ShouldEqual, m.PERMISSION_ADMIN)
+ })
+
+ Convey("Should default to member permission level when updating a user with invalid permission level", func() {
+ userID := userIds[0]
+ team := group1.Result
+ addMemberCmd := m.AddTeamMemberCommand{OrgId: testOrgId, TeamId: team.Id, UserId: userID}
+ err = AddTeamMember(&addMemberCmd)
+ So(err, ShouldBeNil)
+
+ qBeforeUpdate := &m.GetTeamMembersQuery{OrgId: testOrgId, TeamId: team.Id}
+ err = GetTeamMembers(qBeforeUpdate)
+ So(err, ShouldBeNil)
+ So(qBeforeUpdate.Result[0].Permission, ShouldEqual, 0)
+
+ invalidPermissionLevel := m.PERMISSION_EDIT
+ err = UpdateTeamMember(&m.UpdateTeamMemberCommand{
+ UserId: userID,
+ OrgId: testOrgId,
+ TeamId: team.Id,
+ Permission: invalidPermissionLevel,
+ })
+
+ So(err, ShouldBeNil)
+
+ qAfterUpdate := &m.GetTeamMembersQuery{OrgId: testOrgId, TeamId: team.Id}
+ err = GetTeamMembers(qAfterUpdate)
+ So(err, ShouldBeNil)
+ So(qAfterUpdate.Result[0].Permission, ShouldEqual, 0)
+ })
+
+ Convey("Shouldn't be able to update a user not in the team.", func() {
+ err = UpdateTeamMember(&m.UpdateTeamMemberCommand{
+ UserId: 1,
+ OrgId: testOrgId,
+ TeamId: group1.Result.Id,
+ Permission: m.PERMISSION_ADMIN,
+ })
+
+ So(err, ShouldEqual, m.ErrTeamMemberNotFound)
+ })
+
Convey("Should be able to search for teams", func() {
query := &m.SearchTeamsQuery{OrgId: testOrgId, Query: "group", Page: 1}
err = SearchTeams(query)
@@ -114,6 +180,33 @@ func TestTeamCommandsAndQueries(t *testing.T) {
So(len(q2.Result), ShouldEqual, 0)
})
+ Convey("When ProtectLastAdmin is set to true", func() {
+ err = AddTeamMember(&m.AddTeamMemberCommand{OrgId: testOrgId, TeamId: group1.Result.Id, UserId: userIds[0], Permission: m.PERMISSION_ADMIN})
+ So(err, ShouldBeNil)
+
+ Convey("A user should not be able to remove the last admin", func() {
+ err = RemoveTeamMember(&m.RemoveTeamMemberCommand{OrgId: testOrgId, TeamId: group1.Result.Id, UserId: userIds[0], ProtectLastAdmin: true})
+ So(err, ShouldEqual, m.ErrLastTeamAdmin)
+ })
+
+ Convey("A user should be able to remove an admin if there are other admins", func() {
+ AddTeamMember(&m.AddTeamMemberCommand{OrgId: testOrgId, TeamId: group1.Result.Id, UserId: userIds[1], Permission: m.PERMISSION_ADMIN})
+ err = RemoveTeamMember(&m.RemoveTeamMemberCommand{OrgId: testOrgId, TeamId: group1.Result.Id, UserId: userIds[0], ProtectLastAdmin: true})
+ So(err, ShouldEqual, nil)
+ })
+
+ Convey("A user should not be able to remove the admin permission for the last admin", func() {
+ err = UpdateTeamMember(&m.UpdateTeamMemberCommand{OrgId: testOrgId, TeamId: group1.Result.Id, UserId: userIds[0], Permission: 0, ProtectLastAdmin: true})
+ So(err, ShouldEqual, m.ErrLastTeamAdmin)
+ })
+
+ Convey("A user should be able to remove the admin permission if there are other admins", func() {
+ AddTeamMember(&m.AddTeamMemberCommand{OrgId: testOrgId, TeamId: group1.Result.Id, UserId: userIds[1], Permission: m.PERMISSION_ADMIN})
+ err = UpdateTeamMember(&m.UpdateTeamMemberCommand{OrgId: testOrgId, TeamId: group1.Result.Id, UserId: userIds[0], Permission: 0, ProtectLastAdmin: true})
+ So(err, ShouldEqual, nil)
+ })
+ })
+
Convey("Should be able to remove a group with users and permissions", func() {
groupId := group2.Result.Id
err := AddTeamMember(&m.AddTeamMemberCommand{OrgId: testOrgId, TeamId: groupId, UserId: userIds[1]})
diff --git a/pkg/services/teamguardian/team.go b/pkg/services/teamguardian/team.go
new file mode 100644
index 00000000000..70053d12da1
--- /dev/null
+++ b/pkg/services/teamguardian/team.go
@@ -0,0 +1,34 @@
+package teamguardian
+
+import (
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+)
+
+func CanAdmin(bus bus.Bus, orgId int64, teamId int64, user *m.SignedInUser) error {
+ if user.OrgRole == m.ROLE_ADMIN {
+ return nil
+ }
+
+ if user.OrgId != orgId {
+ return m.ErrNotAllowedToUpdateTeamInDifferentOrg
+ }
+
+ cmd := m.GetTeamMembersQuery{
+ OrgId: orgId,
+ TeamId: teamId,
+ UserId: user.UserId,
+ }
+
+ if err := bus.Dispatch(&cmd); err != nil {
+ return err
+ }
+
+ for _, member := range cmd.Result {
+ if member.UserId == user.UserId && member.Permission == m.PERMISSION_ADMIN {
+ return nil
+ }
+ }
+
+ return m.ErrNotAllowedToUpdateTeam
+}
diff --git a/pkg/services/teamguardian/teams_test.go b/pkg/services/teamguardian/teams_test.go
new file mode 100644
index 00000000000..8af69569620
--- /dev/null
+++ b/pkg/services/teamguardian/teams_test.go
@@ -0,0 +1,87 @@
+package teamguardian
+
+import (
+ "github.com/grafana/grafana/pkg/bus"
+ m "github.com/grafana/grafana/pkg/models"
+ . "github.com/smartystreets/goconvey/convey"
+ "testing"
+)
+
+func TestUpdateTeam(t *testing.T) {
+ Convey("Updating a team", t, func() {
+ bus.ClearBusHandlers()
+
+ admin := m.SignedInUser{
+ UserId: 1,
+ OrgId: 1,
+ OrgRole: m.ROLE_ADMIN,
+ }
+ editor := m.SignedInUser{
+ UserId: 2,
+ OrgId: 1,
+ OrgRole: m.ROLE_EDITOR,
+ }
+ testTeam := m.Team{
+ Id: 1,
+ OrgId: 1,
+ }
+
+ Convey("Given an editor and a team he isn't a member of", func() {
+ Convey("Should not be able to update the team", func() {
+ bus.AddHandler("test", func(cmd *m.GetTeamMembersQuery) error {
+ cmd.Result = []*m.TeamMemberDTO{}
+ return nil
+ })
+
+ err := CanAdmin(bus.GetBus(), testTeam.OrgId, testTeam.Id, &editor)
+ So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeam)
+ })
+ })
+
+ Convey("Given an editor and a team he is an admin in", func() {
+ Convey("Should be able to update the team", func() {
+ bus.AddHandler("test", func(cmd *m.GetTeamMembersQuery) error {
+ cmd.Result = []*m.TeamMemberDTO{{
+ OrgId: testTeam.OrgId,
+ TeamId: testTeam.Id,
+ UserId: editor.UserId,
+ Permission: m.PERMISSION_ADMIN,
+ }}
+ return nil
+ })
+
+ err := CanAdmin(bus.GetBus(), testTeam.OrgId, testTeam.Id, &editor)
+ So(err, ShouldBeNil)
+ })
+ })
+
+ Convey("Given an editor and a team in another org", func() {
+ testTeamOtherOrg := m.Team{
+ Id: 1,
+ OrgId: 2,
+ }
+
+ Convey("Shouldn't be able to update the team", func() {
+ bus.AddHandler("test", func(cmd *m.GetTeamMembersQuery) error {
+ cmd.Result = []*m.TeamMemberDTO{{
+ OrgId: testTeamOtherOrg.OrgId,
+ TeamId: testTeamOtherOrg.Id,
+ UserId: editor.UserId,
+ Permission: m.PERMISSION_ADMIN,
+ }}
+ return nil
+ })
+
+ err := CanAdmin(bus.GetBus(), testTeamOtherOrg.OrgId, testTeamOtherOrg.Id, &editor)
+ So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeamInDifferentOrg)
+ })
+ })
+
+ Convey("Given an org admin and a team", func() {
+ Convey("Should be able to update the team", func() {
+ err := CanAdmin(bus.GetBus(), testTeam.OrgId, testTeam.Id, &admin)
+ So(err, ShouldBeNil)
+ })
+ })
+ })
+}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 7b6e99255aa..8c6d8c54f11 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -239,8 +239,13 @@ type Cfg struct {
LoginMaxLifetimeDays int
TokenRotationIntervalMinutes int
- // User
- EditorsCanOwn bool
+ // Dataproxy
+ SendUserHeader bool
+
+ // DistributedCache
+ RemoteCacheOptions *RemoteCacheOptions
+
+ EditorsCanAdmin bool
}
type CommandLineArgs struct {
@@ -601,6 +606,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
dataproxy := iniFile.Section("dataproxy")
DataProxyLogging = dataproxy.Key("logging").MustBool(false)
DataProxyTimeout = dataproxy.Key("timeout").MustInt(30)
+ cfg.SendUserHeader = dataproxy.Key("send_user_header").MustBool(false)
// read security settings
security := iniFile.Section("security")
@@ -663,7 +669,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
ExternalUserMngLinkName = users.Key("external_manage_link_name").String()
ExternalUserMngInfo = users.Key("external_manage_info").String()
ViewersCanEdit = users.Key("viewers_can_edit").MustBool(false)
- cfg.EditorsCanOwn = users.Key("editors_can_own").MustBool(false)
+ cfg.EditorsCanAdmin = users.Key("editors_can_admin").MustBool(false)
// auth
auth := iniFile.Section("auth")
@@ -781,9 +787,20 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
enterprise := iniFile.Section("enterprise")
cfg.EnterpriseLicensePath = enterprise.Key("license_path").MustString(filepath.Join(cfg.DataPath, "license.jwt"))
+ cacheServer := iniFile.Section("remote_cache")
+ cfg.RemoteCacheOptions = &RemoteCacheOptions{
+ Name: cacheServer.Key("type").MustString("database"),
+ ConnStr: cacheServer.Key("connstr").MustString(""),
+ }
+
return nil
}
+type RemoteCacheOptions struct {
+ Name string
+ ConnStr string
+}
+
func (cfg *Cfg) readSessionConfig() {
sec := cfg.Raw.Section("session")
SessionOptions = session.Options{}
diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go
index 12f2b6c03c9..c740d6cbe77 100644
--- a/pkg/tsdb/mssql/mssql.go
+++ b/pkg/tsdb/mssql/mssql.go
@@ -3,6 +3,7 @@ package mssql
import (
"database/sql"
"fmt"
+ "github.com/grafana/grafana/pkg/setting"
"strconv"
_ "github.com/denisenkom/go-mssqldb"
@@ -24,7 +25,9 @@ func newMssqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
if err != nil {
return nil, err
}
- logger.Debug("getEngine", "connection", cnnstr)
+ if setting.Env == setting.DEV {
+ logger.Debug("getEngine", "connection", cnnstr)
+ }
config := tsdb.SqlQueryEndpointConfiguration{
DriverName: "mssql",
diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go
index d307e12166c..0451f8f0dc1 100644
--- a/pkg/tsdb/mysql/mysql.go
+++ b/pkg/tsdb/mysql/mysql.go
@@ -3,6 +3,7 @@ package mysql
import (
"database/sql"
"fmt"
+ "github.com/grafana/grafana/pkg/setting"
"reflect"
"strconv"
"strings"
@@ -44,7 +45,9 @@ func newMysqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
cnnstr += "&tls=" + tlsConfigString
}
- logger.Debug("getEngine", "connection", cnnstr)
+ if setting.Env == setting.DEV {
+ logger.Debug("getEngine", "connection", cnnstr)
+ }
config := tsdb.SqlQueryEndpointConfiguration{
DriverName: "mysql",
diff --git a/pkg/tsdb/postgres/postgres.go b/pkg/tsdb/postgres/postgres.go
index 4bcf06638f4..ae6b165e731 100644
--- a/pkg/tsdb/postgres/postgres.go
+++ b/pkg/tsdb/postgres/postgres.go
@@ -2,6 +2,7 @@ package postgres
import (
"database/sql"
+ "github.com/grafana/grafana/pkg/setting"
"net/url"
"strconv"
@@ -19,7 +20,9 @@ func newPostgresQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndp
logger := log.New("tsdb.postgres")
cnnstr := generateConnectionString(datasource)
- logger.Debug("getEngine", "connection", cnnstr)
+ if setting.Env == setting.DEV {
+ logger.Debug("getEngine", "connection", cnnstr)
+ }
config := tsdb.SqlQueryEndpointConfiguration{
DriverName: "postgres",
diff --git a/pkg/tsdb/testdata/scenarios.go b/pkg/tsdb/testdata/scenarios.go
index 421a907b5e9..4780dd6e662 100644
--- a/pkg/tsdb/testdata/scenarios.go
+++ b/pkg/tsdb/testdata/scenarios.go
@@ -2,6 +2,7 @@ package testdata
import (
"encoding/json"
+ "math"
"math/rand"
"strconv"
"strings"
@@ -100,6 +101,15 @@ func init() {
},
})
+ registerScenario(&Scenario{
+ Id: "random_walk_table",
+ Name: "Random Walk Table",
+
+ Handler: func(query *tsdb.Query, context *tsdb.TsdbQuery) *tsdb.QueryResult {
+ return getRandomWalkTable(query, context)
+ },
+ })
+
registerScenario(&Scenario{
Id: "slow_query",
Name: "Slow Query",
@@ -251,7 +261,7 @@ func getRandomWalk(query *tsdb.Query, tsdbQuery *tsdb.TsdbQuery) *tsdb.QueryResu
series := newSeriesForQuery(query)
points := make(tsdb.TimeSeriesPoints, 0)
- walker := rand.Float64() * 100
+ walker := query.Model.Get("startValue").MustFloat64(rand.Float64() * 100)
for i := int64(0); i < 10000 && timeWalkerMs < to; i++ {
points = append(points, tsdb.NewTimePoint(null.FloatFrom(walker), float64(timeWalkerMs)))
@@ -267,6 +277,64 @@ func getRandomWalk(query *tsdb.Query, tsdbQuery *tsdb.TsdbQuery) *tsdb.QueryResu
return queryRes
}
+func getRandomWalkTable(query *tsdb.Query, tsdbQuery *tsdb.TsdbQuery) *tsdb.QueryResult {
+ timeWalkerMs := tsdbQuery.TimeRange.GetFromAsMsEpoch()
+ to := tsdbQuery.TimeRange.GetToAsMsEpoch()
+
+ table := tsdb.Table{
+ Columns: []tsdb.TableColumn{
+ {Text: "Time"},
+ {Text: "Value"},
+ {Text: "Min"},
+ {Text: "Max"},
+ {Text: "Info"},
+ },
+ Rows: []tsdb.RowValues{},
+ }
+
+ withNil := query.Model.Get("withNil").MustBool(false)
+ walker := query.Model.Get("startValue").MustFloat64(rand.Float64() * 100)
+ spread := 2.5
+ var info strings.Builder
+
+ for i := int64(0); i < query.MaxDataPoints && timeWalkerMs < to; i++ {
+ delta := rand.Float64() - 0.5
+ walker += delta
+
+ info.Reset()
+ if delta > 0 {
+ info.WriteString("up")
+ } else {
+ info.WriteString("down")
+ }
+ if math.Abs(delta) > .4 {
+ info.WriteString(" fast")
+ }
+ row := tsdb.RowValues{
+ float64(timeWalkerMs),
+ walker,
+ walker - ((rand.Float64() * spread) + 0.01), // Min
+ walker + ((rand.Float64() * spread) + 0.01), // Max
+ info.String(),
+ }
+
+ // Add some random null values
+ if withNil && rand.Float64() > 0.8 {
+ for i := 1; i < 4; i++ {
+ if rand.Float64() > .2 {
+ row[i] = nil
+ }
+ }
+ }
+
+ table.Rows = append(table.Rows, row)
+ timeWalkerMs += query.IntervalMs
+ }
+ queryRes := tsdb.NewQueryResult()
+ queryRes.Tables = append(queryRes.Tables, &table)
+ return queryRes
+}
+
func registerScenario(scenario *Scenario) {
ScenarioRegistry[scenario.Id] = scenario
}
diff --git a/pkg/tsdb/testdata/scenarios_test.go b/pkg/tsdb/testdata/scenarios_test.go
new file mode 100644
index 00000000000..307f5e4affe
--- /dev/null
+++ b/pkg/tsdb/testdata/scenarios_test.go
@@ -0,0 +1,94 @@
+package testdata
+
+import (
+ "testing"
+ "time"
+
+ "github.com/grafana/grafana/pkg/components/simplejson"
+ "github.com/grafana/grafana/pkg/tsdb"
+ . "github.com/smartystreets/goconvey/convey"
+)
+
+func TestTestdataScenarios(t *testing.T) {
+ Convey("random walk ", t, func() {
+ scenario, _ := ScenarioRegistry["random_walk"]
+
+ Convey("Should start at the requested value", func() {
+ req := &tsdb.TsdbQuery{
+ TimeRange: tsdb.NewFakeTimeRange("5m", "now", time.Now()),
+ Queries: []*tsdb.Query{
+ {RefId: "A", IntervalMs: 100, MaxDataPoints: 100, Model: simplejson.New()},
+ },
+ }
+ query := req.Queries[0]
+ query.Model.Set("startValue", 1.234)
+
+ result := scenario.Handler(req.Queries[0], req)
+ points := result.Series[0].Points
+
+ So(result.Series, ShouldNotBeNil)
+ So(points[0][0].Float64, ShouldEqual, 1.234)
+ })
+ })
+
+ Convey("random walk table", t, func() {
+ scenario, _ := ScenarioRegistry["random_walk_table"]
+
+ Convey("Should return a table that looks like value/min/max", func() {
+ req := &tsdb.TsdbQuery{
+ TimeRange: tsdb.NewFakeTimeRange("5m", "now", time.Now()),
+ Queries: []*tsdb.Query{
+ {RefId: "A", IntervalMs: 100, MaxDataPoints: 100, Model: simplejson.New()},
+ },
+ }
+
+ result := scenario.Handler(req.Queries[0], req)
+ table := result.Tables[0]
+
+ So(len(table.Rows), ShouldBeGreaterThan, 50)
+ for _, row := range table.Rows {
+ value := row[1]
+ min := row[2]
+ max := row[3]
+
+ So(min, ShouldBeLessThan, value)
+ So(max, ShouldBeGreaterThan, value)
+ }
+ })
+
+ Convey("Should return a table with some nil values", func() {
+ req := &tsdb.TsdbQuery{
+ TimeRange: tsdb.NewFakeTimeRange("5m", "now", time.Now()),
+ Queries: []*tsdb.Query{
+ {RefId: "A", IntervalMs: 100, MaxDataPoints: 100, Model: simplejson.New()},
+ },
+ }
+ query := req.Queries[0]
+ query.Model.Set("withNil", true)
+
+ result := scenario.Handler(req.Queries[0], req)
+ table := result.Tables[0]
+
+ nil1 := false
+ nil2 := false
+ nil3 := false
+
+ So(len(table.Rows), ShouldBeGreaterThan, 50)
+ for _, row := range table.Rows {
+ if row[1] == nil {
+ nil1 = true
+ }
+ if row[2] == nil {
+ nil2 = true
+ }
+ if row[3] == nil {
+ nil3 = true
+ }
+ }
+
+ So(nil1, ShouldBeTrue)
+ So(nil2, ShouldBeTrue)
+ So(nil3, ShouldBeTrue)
+ })
+ })
+}
diff --git a/public/app/app.ts b/public/app/app.ts
index 03f332e357b..a54c9270e2c 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -17,12 +17,13 @@ import 'vendor/angular-other/angular-strap';
import $ from 'jquery';
import angular from 'angular';
import config from 'app/core/config';
+// @ts-ignore ignoring this for now, otherwise we would have to extend _ interface with move
import _ from 'lodash';
import moment from 'moment';
import { addClassIfNoOverlayScrollbar } from 'app/core/utils/scrollbar';
// add move to lodash for backward compatabiltiy
-_.move = (array, fromIndex, toIndex) => {
+_.move = (array: [], fromIndex: number, toIndex: number) => {
array.splice(toIndex, 0, array.splice(fromIndex, 1)[0]);
return array;
};
@@ -36,7 +37,7 @@ import 'app/features/all';
// import symlinked extensions
const extensionsIndex = (require as any).context('.', true, /extensions\/index.ts/);
-extensionsIndex.keys().forEach(key => {
+extensionsIndex.keys().forEach((key: any) => {
extensionsIndex(key);
});
@@ -52,7 +53,7 @@ export class GrafanaApp {
this.ngModuleDependencies = [];
}
- useModule(module) {
+ useModule(module: angular.IModule) {
if (this.preBootModules) {
this.preBootModules.push(module);
} else {
@@ -67,40 +68,49 @@ export class GrafanaApp {
moment.locale(config.bootData.user.locale);
- app.config(($locationProvider, $controllerProvider, $compileProvider, $filterProvider, $httpProvider, $provide) => {
- // pre assing bindings before constructor calls
- $compileProvider.preAssignBindingsEnabled(true);
+ app.config(
+ (
+ $locationProvider: angular.ILocationProvider,
+ $controllerProvider: angular.IControllerProvider,
+ $compileProvider: angular.ICompileProvider,
+ $filterProvider: angular.IFilterProvider,
+ $httpProvider: angular.IHttpProvider,
+ $provide: angular.auto.IProvideService
+ ) => {
+ // pre assing bindings before constructor calls
+ $compileProvider.preAssignBindingsEnabled(true);
- if (config.buildInfo.env !== 'development') {
- $compileProvider.debugInfoEnabled(false);
- }
+ if (config.buildInfo.env !== 'development') {
+ $compileProvider.debugInfoEnabled(false);
+ }
- $httpProvider.useApplyAsync(true);
+ $httpProvider.useApplyAsync(true);
- this.registerFunctions.controller = $controllerProvider.register;
- this.registerFunctions.directive = $compileProvider.directive;
- this.registerFunctions.factory = $provide.factory;
- this.registerFunctions.service = $provide.service;
- this.registerFunctions.filter = $filterProvider.register;
+ this.registerFunctions.controller = $controllerProvider.register;
+ this.registerFunctions.directive = $compileProvider.directive;
+ this.registerFunctions.factory = $provide.factory;
+ this.registerFunctions.service = $provide.service;
+ this.registerFunctions.filter = $filterProvider.register;
- $provide.decorator('$http', [
- '$delegate',
- '$templateCache',
- ($delegate, $templateCache) => {
- const get = $delegate.get;
- $delegate.get = (url, config) => {
- if (url.match(/\.html$/)) {
- // some template's already exist in the cache
- if (!$templateCache.get(url)) {
- url += '?v=' + new Date().getTime();
+ $provide.decorator('$http', [
+ '$delegate',
+ '$templateCache',
+ ($delegate: any, $templateCache: any) => {
+ const get = $delegate.get;
+ $delegate.get = (url: string, config: any) => {
+ if (url.match(/\.html$/)) {
+ // some template's already exist in the cache
+ if (!$templateCache.get(url)) {
+ url += '?v=' + new Date().getTime();
+ }
}
- }
- return get(url, config);
- };
- return $delegate;
- },
- ]);
- });
+ return get(url, config);
+ };
+ return $delegate;
+ },
+ ]);
+ }
+ );
this.ngModuleDependencies = [
'grafana.core',
@@ -116,7 +126,7 @@ export class GrafanaApp {
];
// makes it possible to add dynamic stuff
- _.each(angularModules, m => {
+ _.each(angularModules, (m: angular.IModule) => {
this.useModule(m);
});
@@ -129,7 +139,7 @@ export class GrafanaApp {
// bootstrap the app
angular.bootstrap(document, this.ngModuleDependencies).invoke(() => {
- _.each(this.preBootModules, module => {
+ _.each(this.preBootModules, (module: angular.IModule) => {
_.extend(module, this.registerFunctions);
});
diff --git a/public/app/core/components/Animations/FadeIn.tsx b/public/app/core/components/Animations/FadeIn.tsx
index d667b54261e..a782a418b3c 100644
--- a/public/app/core/components/Animations/FadeIn.tsx
+++ b/public/app/core/components/Animations/FadeIn.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React, { FC, CSSProperties } from 'react';
import Transition, { ExitHandler } from 'react-transition-group/Transition';
interface Props {
@@ -10,12 +10,12 @@ interface Props {
}
export const FadeIn: FC = props => {
- const defaultStyle = {
+ const defaultStyle: CSSProperties = {
transition: `opacity ${props.duration}ms linear`,
opacity: 0,
};
- const transitionStyles = {
+ const transitionStyles: { [str: string]: CSSProperties } = {
exited: { opacity: 0, display: 'none' },
entering: { opacity: 0 },
entered: { opacity: 1 },
diff --git a/public/app/core/components/Animations/SlideDown.tsx b/public/app/core/components/Animations/SlideDown.tsx
index 6e8995298dc..c5cbf03b241 100644
--- a/public/app/core/components/Animations/SlideDown.tsx
+++ b/public/app/core/components/Animations/SlideDown.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { CSSProperties, FC } from 'react';
import Transition from 'react-transition-group/Transition';
interface Style {
@@ -16,11 +16,18 @@ export const defaultStyle: Style = {
overflow: 'hidden',
};
-export default ({ children, in: inProp, maxHeight = defaultMaxHeight, style = defaultStyle }) => {
+export interface Props {
+ children: React.ReactNode;
+ in: boolean;
+ maxHeight?: number;
+ style?: CSSProperties;
+}
+
+export const SlideDown: FC = ({ children, in: inProp, maxHeight = defaultMaxHeight, style = defaultStyle }) => {
// There are 4 main states a Transition can be in:
// ENTERING, ENTERED, EXITING, EXITED
- // https://reactcommunity.org/react-transition-group/
- const transitionStyles = {
+ // https://reactcommunity.or[g/react-transition-group/
+ const transitionStyles: { [str: string]: CSSProperties } = {
exited: { maxHeight: 0 },
entering: { maxHeight: maxHeight },
entered: { maxHeight: 'unset', overflow: 'visible' },
@@ -34,6 +41,7 @@ export default ({ children, in: inProp, maxHeight = defaultMaxHeight, style = de
style={{
...style,
...transitionStyles[state],
+ inProp,
}}
>
{children}
diff --git a/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx b/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx
index ea63de58b47..bd9b51e6d4f 100644
--- a/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx
+++ b/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx
@@ -11,10 +11,10 @@ interface Props {
}
export class CopyToClipboard extends PureComponent {
- clipboardjs: any;
+ clipboardjs: ClipboardJS;
myRef: any;
- constructor(props) {
+ constructor(props: Props) {
super(props);
this.myRef = React.createRef();
}
diff --git a/public/app/core/components/EmptyListCTA/EmptyListCTA.test.tsx b/public/app/core/components/EmptyListCTA/EmptyListCTA.test.tsx
index 21700bb4d03..ac07b671c31 100644
--- a/public/app/core/components/EmptyListCTA/EmptyListCTA.test.tsx
+++ b/public/app/core/components/EmptyListCTA/EmptyListCTA.test.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import renderer from 'react-test-renderer';
+import { shallow } from 'enzyme';
import EmptyListCTA from './EmptyListCTA';
const model = {
@@ -16,7 +16,7 @@ const model = {
describe('EmptyListCTA', () => {
it('renders correctly', () => {
- const tree = renderer.create( {
async componentDidMount() {
const prefs = await this.backendSrv.get(`/api/${this.props.resourceUri}/preferences`);
const dashboards = await this.backendSrv.search({ starred: true });
+ const defaultDashboardHit: DashboardSearchHit = {
+ id: 0,
+ title: 'Default',
+ tags: [],
+ type: '' as DashboardSearchHitType,
+ uid: '',
+ uri: '',
+ url: '',
+ folderId: 0,
+ folderTitle: '',
+ folderUid: '',
+ folderUrl: '',
+ isStarred: false,
+ slug: '',
+ };
if (prefs.homeDashboardId > 0 && !dashboards.find(d => d.id === prefs.homeDashboardId)) {
const missing = await this.backendSrv.search({ dashboardIds: [prefs.homeDashboardId] });
@@ -53,7 +68,7 @@ export class SharedPreferences extends PureComponent {
homeDashboardId: prefs.homeDashboardId,
theme: prefs.theme,
timezone: prefs.timezone,
- dashboards: [{ id: 0, title: 'Default', tags: [], type: '', uid: '', uri: '', url: '' }, ...dashboards],
+ dashboards: [defaultDashboardHit, ...dashboards],
});
}
diff --git a/public/app/core/components/WithFeatureToggle.tsx b/public/app/core/components/WithFeatureToggle.tsx
new file mode 100644
index 00000000000..250697e0029
--- /dev/null
+++ b/public/app/core/components/WithFeatureToggle.tsx
@@ -0,0 +1,13 @@
+import React, { FunctionComponent } from 'react';
+
+export interface Props {
+ featureToggle: boolean;
+}
+
+export const WithFeatureToggle: FunctionComponent = ({ featureToggle, children }) => {
+ if (featureToggle === true) {
+ return <>{children};
+ }
+
+ return null;
+};
diff --git a/public/app/core/components/form_dropdown/form_dropdown.ts b/public/app/core/components/form_dropdown/form_dropdown.ts
index 81d4b336443..b0c3e48b835 100644
--- a/public/app/core/components/form_dropdown/form_dropdown.ts
+++ b/public/app/core/components/form_dropdown/form_dropdown.ts
@@ -1,7 +1,8 @@
import _ from 'lodash';
import coreModule from '../../core_module';
+import { ISCEService, IQService } from 'angular';
-function typeaheadMatcher(this: any, item) {
+function typeaheadMatcher(this: any, item: string) {
let str = this.query;
if (str === '') {
return true;
@@ -16,8 +17,8 @@ function typeaheadMatcher(this: any, item) {
}
export class FormDropdownCtrl {
- inputElement: any;
- linkElement: any;
+ inputElement: JQLite;
+ linkElement: JQLite;
model: any;
display: any;
text: any;
@@ -37,7 +38,13 @@ export class FormDropdownCtrl {
debounce: number;
/** @ngInject */
- constructor(private $scope, $element, private $sce, private templateSrv, private $q) {
+ constructor(
+ private $scope: any,
+ $element: JQLite,
+ private $sce: ISCEService,
+ private templateSrv: any,
+ private $q: IQService
+ ) {
this.inputElement = $element.find('input').first();
this.linkElement = $element.find('a').first();
this.linkMode = true;
@@ -99,7 +106,7 @@ export class FormDropdownCtrl {
}
}
- getOptionsInternal(query) {
+ getOptionsInternal(query: string) {
const result = this.getOptions({ $query: query });
if (this.isPromiseLike(result)) {
return result;
@@ -107,7 +114,7 @@ export class FormDropdownCtrl {
return this.$q.when(result);
}
- isPromiseLike(obj) {
+ isPromiseLike(obj: any) {
return obj && typeof obj.then === 'function';
}
@@ -117,7 +124,7 @@ export class FormDropdownCtrl {
} else {
// if we have text use it
if (this.lookupText) {
- this.getOptionsInternal('').then(options => {
+ this.getOptionsInternal('').then((options: any) => {
const item = _.find(options, { value: this.model });
this.updateDisplay(item ? item.text : this.model);
});
@@ -127,12 +134,12 @@ export class FormDropdownCtrl {
}
}
- typeaheadSource(query, callback) {
- this.getOptionsInternal(query).then(options => {
+ typeaheadSource(query: string, callback: (res: any) => void) {
+ this.getOptionsInternal(query).then((options: any) => {
this.optionCache = options;
// extract texts
- const optionTexts = _.map(options, op => {
+ const optionTexts = _.map(options, (op: any) => {
return _.escape(op.text);
});
@@ -147,7 +154,7 @@ export class FormDropdownCtrl {
});
}
- typeaheadUpdater(text) {
+ typeaheadUpdater(text: string) {
if (text === this.text) {
clearTimeout(this.cancelBlur);
this.inputElement.focus();
@@ -159,7 +166,7 @@ export class FormDropdownCtrl {
return text;
}
- switchToLink(fromClick) {
+ switchToLink(fromClick: boolean) {
if (this.linkMode && !fromClick) {
return;
}
@@ -178,7 +185,7 @@ export class FormDropdownCtrl {
this.cancelBlur = setTimeout(this.switchToLink.bind(this), 200);
}
- updateValue(text) {
+ updateValue(text: string) {
text = _.unescape(text);
if (text === '' || this.text === text) {
@@ -214,7 +221,7 @@ export class FormDropdownCtrl {
});
}
- updateDisplay(text) {
+ updateDisplay(text: string) {
this.text = text;
this.display = this.$sce.trustAsHtml(this.templateSrv.highlightVariablesAsHtml(text));
}
diff --git a/public/app/core/components/json_explorer/json_explorer.ts b/public/app/core/components/json_explorer/json_explorer.ts
index e4c92f662b1..f17f0f7ad7f 100644
--- a/public/app/core/components/json_explorer/json_explorer.ts
+++ b/public/app/core/components/json_explorer/json_explorer.ts
@@ -232,7 +232,7 @@ export class JsonExplorer {
// some pretty handling of number arrays
if (this.isNumberArray()) {
- this.json.forEach((val, index) => {
+ this.json.forEach((val: any, index: number) => {
if (index > 0) {
arrayWrapperSpan.appendChild(createElement('span', 'array-comma', ','));
}
diff --git a/public/app/core/components/layout_selector/layout_selector.ts b/public/app/core/components/layout_selector/layout_selector.ts
index b3f3cdc14d1..a72a2fd5b4a 100644
--- a/public/app/core/components/layout_selector/layout_selector.ts
+++ b/public/app/core/components/layout_selector/layout_selector.ts
@@ -16,7 +16,7 @@ export class LayoutSelectorCtrl {
mode: string;
/** @ngInject */
- constructor(private $rootScope) {
+ constructor(private $rootScope: any) {
this.mode = store.get('grafana.list.layout.mode') || 'grid';
}
@@ -46,18 +46,18 @@ export function layoutSelector() {
}
/** @ngInject */
-export function layoutMode($rootScope) {
+export function layoutMode($rootScope: any) {
return {
restrict: 'A',
scope: {},
- link: (scope, elem) => {
+ link: (scope: any, elem: any) => {
const layout = store.get('grafana.list.layout.mode') || 'grid';
let className = 'card-list-layout-' + layout;
elem.addClass(className);
$rootScope.onAppEvent(
'layout-mode-changed',
- (evt, newLayout) => {
+ (evt: any, newLayout: any) => {
elem.removeClass(className);
className = 'card-list-layout-' + newLayout;
elem.addClass(className);
diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.ts b/public/app/core/components/manage_dashboards/manage_dashboards.ts
index 25a69b1f5e4..5b5e299b1af 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.ts
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.ts
@@ -1,7 +1,31 @@
+// @ts-ignore
import _ from 'lodash';
import coreModule from 'app/core/core_module';
import appEvents from 'app/core/app_events';
import { SearchSrv } from 'app/core/services/search_srv';
+import { BackendSrv } from 'app/core/services/backend_srv';
+import { NavModelSrv } from 'app/core/nav_model_srv';
+import { ContextSrv } from 'app/core/services/context_srv';
+
+export interface Section {
+ id: number;
+ uid: string;
+ title: string;
+ expanded: boolean;
+ removable: boolean;
+ items: any[];
+ url: string;
+ icon: string;
+ score: number;
+ checked: boolean;
+ hideHeader: boolean;
+ toggle: Function;
+}
+
+export interface FoldersAndDashboardUids {
+ folderUids: string[];
+ dashboardUids: string[];
+}
class Query {
query: string;
@@ -14,7 +38,7 @@ class Query {
}
export class ManageDashboardsCtrl {
- sections: any[];
+ sections: Section[];
query: Query;
navModel: any;
@@ -45,7 +69,12 @@ export class ManageDashboardsCtrl {
hasEditPermissionInFolders: boolean;
/** @ngInject */
- constructor(private backendSrv, navModelSrv, private searchSrv: SearchSrv, private contextSrv) {
+ constructor(
+ private backendSrv: BackendSrv,
+ navModelSrv: NavModelSrv,
+ private searchSrv: SearchSrv,
+ private contextSrv: ContextSrv
+ ) {
this.isEditor = this.contextSrv.isEditor;
this.hasEditPermissionInFolders = this.contextSrv.hasEditPermissionInFolders;
@@ -73,7 +102,7 @@ export class ManageDashboardsCtrl {
refreshList() {
return this.searchSrv
.search(this.query)
- .then(result => {
+ .then((result: Section[]) => {
return this.initDashboardList(result);
})
.then(() => {
@@ -81,7 +110,7 @@ export class ManageDashboardsCtrl {
return;
}
- return this.backendSrv.getFolderByUid(this.folderUid).then(folder => {
+ return this.backendSrv.getFolderByUid(this.folderUid).then((folder: any) => {
this.canSave = folder.canSave;
if (!this.canSave) {
this.hasEditPermissionInFolders = false;
@@ -90,7 +119,7 @@ export class ManageDashboardsCtrl {
});
}
- initDashboardList(result: any) {
+ initDashboardList(result: Section[]) {
this.canMove = false;
this.canDelete = false;
this.selectAllChecked = false;
@@ -128,25 +157,25 @@ export class ManageDashboardsCtrl {
this.canDelete = selectedDashboards > 0 || selectedFolders > 0;
}
- getFoldersAndDashboardsToDelete() {
- const selectedDashboards = {
- folders: [],
- dashboards: [],
+ getFoldersAndDashboardsToDelete(): FoldersAndDashboardUids {
+ const selectedDashboards: FoldersAndDashboardUids = {
+ folderUids: [],
+ dashboardUids: [],
};
for (const section of this.sections) {
if (section.checked && section.id !== 0) {
- selectedDashboards.folders.push(section.uid);
+ selectedDashboards.folderUids.push(section.uid);
} else {
const selected = _.filter(section.items, { checked: true });
- selectedDashboards.dashboards.push(..._.map(selected, 'uid'));
+ selectedDashboards.dashboardUids.push(..._.map(selected, 'uid'));
}
}
return selectedDashboards;
}
- getFolderIds(sections) {
+ getFolderIds(sections: Section[]) {
const ids = [];
for (const s of sections) {
if (s.checked) {
@@ -158,8 +187,8 @@ export class ManageDashboardsCtrl {
delete() {
const data = this.getFoldersAndDashboardsToDelete();
- const folderCount = data.folders.length;
- const dashCount = data.dashboards.length;
+ const folderCount = data.folderUids.length;
+ const dashCount = data.dashboardUids.length;
let text = 'Do you want to delete the ';
let text2;
@@ -179,12 +208,12 @@ export class ManageDashboardsCtrl {
icon: 'fa-trash',
yesText: 'Delete',
onConfirm: () => {
- this.deleteFoldersAndDashboards(data.folders, data.dashboards);
+ this.deleteFoldersAndDashboards(data.folderUids, data.dashboardUids);
},
});
}
- private deleteFoldersAndDashboards(folderUids, dashboardUids) {
+ private deleteFoldersAndDashboards(folderUids: string[], dashboardUids: string[]) {
this.backendSrv.deleteFoldersAndDashboards(folderUids, dashboardUids).then(() => {
this.refreshList();
});
@@ -219,13 +248,13 @@ export class ManageDashboardsCtrl {
}
initTagFilter() {
- return this.searchSrv.getDashboardTags().then(results => {
+ return this.searchSrv.getDashboardTags().then((results: any) => {
this.tagFilterOptions = [{ term: 'Filter By Tag', disabled: true }].concat(results);
this.selectedTagFilter = this.tagFilterOptions[0];
});
}
- filterByTag(tag) {
+ filterByTag(tag: any) {
if (_.indexOf(this.query.tag, tag) === -1) {
this.query.tag.push(tag);
}
@@ -243,7 +272,7 @@ export class ManageDashboardsCtrl {
return res;
}
- removeTag(tag, evt) {
+ removeTag(tag: any, evt: Event) {
this.query.tag = _.without(this.query.tag, tag);
this.refreshList();
if (evt) {
@@ -269,7 +298,7 @@ export class ManageDashboardsCtrl {
section.checked = this.selectAllChecked;
}
- section.items = _.map(section.items, item => {
+ section.items = _.map(section.items, (item: any) => {
item.checked = this.selectAllChecked;
return item;
});
diff --git a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
index b52e5311dc5..5ba4503da13 100644
--- a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
+++ b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
@@ -12,6 +12,7 @@ const setup = (propOverrides?: object) => {
{
link: {},
user: {
+ id: 1,
isGrafanaAdmin: false,
isSignedIn: false,
orgCount: 2,
diff --git a/public/app/core/config.ts b/public/app/core/config.ts
index bbf7fb88d62..fe9005973b8 100644
--- a/public/app/core/config.ts
+++ b/public/app/core/config.ts
@@ -13,7 +13,7 @@ export interface BuildInfo {
export class Settings {
datasources: any;
- panels: PanelPlugin[];
+ panels: { [key: string]: PanelPlugin };
appSubUrl: string;
windowTitlePrefix: string;
buildInfo: BuildInfo;
@@ -37,7 +37,7 @@ export class Settings {
passwordHint: any;
loginError: any;
viewersCanEdit: boolean;
- editorsCanOwn: boolean;
+ editorsCanAdmin: boolean;
disableSanitizeHtml: boolean;
theme: GrafanaTheme;
@@ -59,7 +59,7 @@ export class Settings {
isEnterprise: false,
},
viewersCanEdit: false,
- editorsCanOwn: false,
+ editorsCanAdmin: false,
disableSanitizeHtml: false,
};
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index c73cc7661f5..0d7d098dcea 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -3,6 +3,7 @@ import coreModule from 'app/core/core_module';
import appEvents from 'app/core/app_events';
import config from 'app/core/config';
import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
+import { DashboardSearchHit } from 'app/types/search';
export class BackendSrv {
private inFlightRequests = {};
@@ -237,7 +238,7 @@ export class BackendSrv {
return this.request({ url: '/api/login/ping', method: 'GET', retry: 1 });
}
- search(query) {
+ search(query): Promise {
return this.get('/api/search', query);
}
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index e3b10f129d1..214c7efb782 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -3,6 +3,7 @@ import _ from 'lodash';
import coreModule from 'app/core/core_module';
export class User {
+ id: number;
isGrafanaAdmin: any;
isSignedIn: any;
orgRole: any;
diff --git a/public/app/core/services/search_srv.ts b/public/app/core/services/search_srv.ts
index 22d33921ebd..068fe3ffbc3 100644
--- a/public/app/core/services/search_srv.ts
+++ b/public/app/core/services/search_srv.ts
@@ -1,21 +1,32 @@
+// @ts-ignore
import _ from 'lodash';
+// @ts-ignore
+import { IQService } from 'angular';
+
import coreModule from 'app/core/core_module';
import impressionSrv from 'app/core/services/impression_srv';
import store from 'app/core/store';
import { contextSrv } from 'app/core/services/context_srv';
+import { BackendSrv } from './backend_srv';
+import { Section } from '../components/manage_dashboards/manage_dashboards';
+import { DashboardSearchHit } from 'app/types/search';
+
+interface Sections {
+ [key: string]: Partial;
+}
export class SearchSrv {
recentIsOpen: boolean;
starredIsOpen: boolean;
/** @ngInject */
- constructor(private backendSrv, private $q) {
+ constructor(private backendSrv: BackendSrv, private $q: IQService) {
this.recentIsOpen = store.getBool('search.sections.recent', true);
this.starredIsOpen = store.getBool('search.sections.starred', true);
}
- private getRecentDashboards(sections) {
- return this.queryForRecentDashboards().then(result => {
+ private getRecentDashboards(sections: Sections) {
+ return this.queryForRecentDashboards().then((result: any[]) => {
if (result.length > 0) {
sections['recent'] = {
title: 'Recent',
@@ -30,8 +41,8 @@ export class SearchSrv {
});
}
- private queryForRecentDashboards() {
- const dashIds = _.take(impressionSrv.getDashboardOpened(), 30);
+ private queryForRecentDashboards(): Promise {
+ const dashIds: number[] = _.take(impressionSrv.getDashboardOpened(), 30);
if (dashIds.length === 0) {
return Promise.resolve([]);
}
@@ -45,7 +56,7 @@ export class SearchSrv {
});
}
- private toggleRecent(section) {
+ private toggleRecent(section: Section) {
this.recentIsOpen = section.expanded = !section.expanded;
store.set('search.sections.recent', this.recentIsOpen);
@@ -59,13 +70,13 @@ export class SearchSrv {
});
}
- private toggleStarred(section) {
+ private toggleStarred(section: Section) {
this.starredIsOpen = section.expanded = !section.expanded;
store.set('search.sections.starred', this.starredIsOpen);
return Promise.resolve(section);
}
- private getStarred(sections) {
+ private getStarred(sections: Sections) {
if (!contextSrv.isSignedIn) {
return Promise.resolve();
}
@@ -84,7 +95,7 @@ export class SearchSrv {
});
}
- search(options) {
+ search(options: any) {
const sections: any = {};
const promises = [];
const query = _.clone(options);
@@ -118,7 +129,7 @@ export class SearchSrv {
});
}
- private handleSearchResult(sections, results) {
+ private handleSearchResult(sections: Sections, results: DashboardSearchHit[]): any {
if (results.length === 0) {
return sections;
}
@@ -177,7 +188,7 @@ export class SearchSrv {
}
}
- private toggleFolder(section) {
+ private toggleFolder(section: Section) {
section.expanded = !section.expanded;
section.icon = section.expanded ? 'fa fa-folder-open' : 'fa fa-folder';
diff --git a/public/app/core/specs/manage_dashboards.test.ts b/public/app/core/specs/manage_dashboards.test.ts
index 5af0ebade02..5e94d26ea89 100644
--- a/public/app/core/specs/manage_dashboards.test.ts
+++ b/public/app/core/specs/manage_dashboards.test.ts
@@ -1,12 +1,40 @@
-import { ManageDashboardsCtrl } from 'app/core/components/manage_dashboards/manage_dashboards';
-import { SearchSrv } from 'app/core/services/search_srv';
+// @ts-ignore
import q from 'q';
+import {
+ ManageDashboardsCtrl,
+ Section,
+ FoldersAndDashboardUids,
+} from 'app/core/components/manage_dashboards/manage_dashboards';
+import { SearchSrv } from 'app/core/services/search_srv';
+import { BackendSrv } from '../services/backend_srv';
+import { NavModelSrv } from '../nav_model_srv';
+import { ContextSrv } from '../services/context_srv';
+
+const mockSection = (overides?: object): Section => {
+ const defaultSection: Section = {
+ id: 0,
+ items: [],
+ checked: false,
+ expanded: false,
+ removable: false,
+ hideHeader: false,
+ icon: '',
+ score: 0,
+ title: 'Some Section',
+ toggle: jest.fn(),
+ uid: 'someuid',
+ url: '/some/url/',
+ };
+
+ return { ...defaultSection, ...overides };
+};
describe('ManageDashboards', () => {
- let ctrl;
+ let ctrl: ManageDashboardsCtrl;
describe('when browsing dashboards', () => {
beforeEach(() => {
+ const tags: any[] = [];
const response = [
{
id: 410,
@@ -18,11 +46,11 @@ describe('ManageDashboards', () => {
title: 'Dashboard Test',
url: 'dashboard/db/dashboard-test',
icon: 'fa fa-folder',
- tags: [],
+ tags,
isStarred: false,
},
],
- tags: [],
+ tags,
isStarred: false,
},
{
@@ -37,11 +65,11 @@ describe('ManageDashboards', () => {
title: 'Dashboard Test',
url: 'dashboard/db/dashboard-test',
icon: 'fa fa-folder',
- tags: [],
+ tags,
isStarred: false,
},
],
- tags: [],
+ tags,
isStarred: false,
},
];
@@ -61,6 +89,7 @@ describe('ManageDashboards', () => {
describe('when browsing dashboards for a folder', () => {
beforeEach(() => {
+ const tags: any[] = [];
const response = [
{
id: 410,
@@ -72,11 +101,11 @@ describe('ManageDashboards', () => {
title: 'Dashboard Test',
url: 'dashboard/db/dashboard-test',
icon: 'fa fa-folder',
- tags: [],
+ tags,
isStarred: false,
},
],
- tags: [],
+ tags,
isStarred: false,
},
];
@@ -92,6 +121,7 @@ describe('ManageDashboards', () => {
describe('when searching dashboards', () => {
beforeEach(() => {
+ const tags: any[] = [];
const response = [
{
checked: false,
@@ -103,7 +133,7 @@ describe('ManageDashboards', () => {
title: 'Dashboard Test',
url: 'dashboard/db/dashboard-test',
icon: 'fa fa-folder',
- tags: [],
+ tags,
isStarred: false,
folderId: 410,
folderUid: 'uid',
@@ -115,7 +145,7 @@ describe('ManageDashboards', () => {
title: 'Dashboard Test',
url: 'dashboard/db/dashboard-test',
icon: 'fa fa-folder',
- tags: [],
+ tags,
folderId: 499,
isStarred: false,
},
@@ -245,7 +275,7 @@ describe('ManageDashboards', () => {
});
describe('when selecting dashboards', () => {
- let ctrl;
+ let ctrl: ManageDashboardsCtrl;
beforeEach(() => {
ctrl = createCtrlWithStubs([]);
@@ -254,16 +284,16 @@ describe('ManageDashboards', () => {
describe('and no dashboards are selected', () => {
beforeEach(() => {
ctrl.sections = [
- {
+ mockSection({
id: 1,
items: [{ id: 2, checked: false }],
checked: false,
- },
- {
+ }),
+ mockSection({
id: 0,
items: [{ id: 3, checked: false }],
checked: false,
- },
+ }),
];
ctrl.selectionChanged();
});
@@ -302,16 +332,16 @@ describe('ManageDashboards', () => {
describe('and all folders and dashboards are selected', () => {
beforeEach(() => {
ctrl.sections = [
- {
+ mockSection({
id: 1,
items: [{ id: 2, checked: true }],
checked: true,
- },
- {
+ }),
+ mockSection({
id: 0,
items: [{ id: 3, checked: true }],
checked: true,
- },
+ }),
];
ctrl.selectionChanged();
});
@@ -350,18 +380,18 @@ describe('ManageDashboards', () => {
describe('and one dashboard in root is selected', () => {
beforeEach(() => {
ctrl.sections = [
- {
+ mockSection({
id: 1,
title: 'folder',
items: [{ id: 2, checked: false }],
checked: false,
- },
- {
+ }),
+ mockSection({
id: 0,
title: 'General',
items: [{ id: 3, checked: true }],
checked: false,
- },
+ }),
];
ctrl.selectionChanged();
});
@@ -378,18 +408,18 @@ describe('ManageDashboards', () => {
describe('and one child dashboard is selected', () => {
beforeEach(() => {
ctrl.sections = [
- {
+ mockSection({
id: 1,
title: 'folder',
items: [{ id: 2, checked: true }],
checked: false,
- },
- {
+ }),
+ mockSection({
id: 0,
title: 'General',
items: [{ id: 3, checked: false }],
checked: false,
- },
+ }),
];
ctrl.selectionChanged();
@@ -407,18 +437,18 @@ describe('ManageDashboards', () => {
describe('and one child dashboard and one dashboard is selected', () => {
beforeEach(() => {
ctrl.sections = [
- {
+ mockSection({
id: 1,
title: 'folder',
items: [{ id: 2, checked: true }],
checked: false,
- },
- {
+ }),
+ mockSection({
id: 0,
title: 'General',
items: [{ id: 3, checked: true }],
checked: false,
- },
+ }),
];
ctrl.selectionChanged();
@@ -436,24 +466,24 @@ describe('ManageDashboards', () => {
describe('and one child dashboard and one folder is selected', () => {
beforeEach(() => {
ctrl.sections = [
- {
+ mockSection({
id: 1,
title: 'folder',
items: [{ id: 2, checked: false }],
checked: true,
- },
- {
+ }),
+ mockSection({
id: 3,
title: 'folder',
items: [{ id: 4, checked: true }],
checked: false,
- },
- {
+ }),
+ mockSection({
id: 0,
title: 'General',
items: [{ id: 3, checked: false }],
checked: false,
- },
+ }),
];
ctrl.selectionChanged();
@@ -470,55 +500,55 @@ describe('ManageDashboards', () => {
});
describe('when deleting dashboards', () => {
- let toBeDeleted: any;
+ let toBeDeleted: FoldersAndDashboardUids;
beforeEach(() => {
ctrl = createCtrlWithStubs([]);
ctrl.sections = [
- {
+ mockSection({
id: 1,
uid: 'folder',
title: 'folder',
items: [{ id: 2, checked: true, uid: 'folder-dash' }],
checked: true,
- },
- {
+ }),
+ mockSection({
id: 3,
title: 'folder-2',
items: [{ id: 3, checked: true, uid: 'folder-2-dash' }],
checked: false,
uid: 'folder-2',
- },
- {
+ }),
+ mockSection({
id: 0,
title: 'General',
items: [{ id: 3, checked: true, uid: 'root-dash' }],
checked: true,
- },
+ }),
];
toBeDeleted = ctrl.getFoldersAndDashboardsToDelete();
});
it('should return 1 folder', () => {
- expect(toBeDeleted.folders.length).toEqual(1);
+ expect(toBeDeleted.folderUids.length).toEqual(1);
});
it('should return 2 dashboards', () => {
- expect(toBeDeleted.dashboards.length).toEqual(2);
+ expect(toBeDeleted.dashboardUids.length).toEqual(2);
});
it('should filter out children if parent is checked', () => {
- expect(toBeDeleted.folders[0]).toEqual('folder');
+ expect(toBeDeleted.folderUids[0]).toEqual('folder');
});
it('should not filter out children if parent not is checked', () => {
- expect(toBeDeleted.dashboards[0]).toEqual('folder-2-dash');
+ expect(toBeDeleted.dashboardUids[0]).toEqual('folder-2-dash');
});
it('should not filter out children if parent is checked and root', () => {
- expect(toBeDeleted.dashboards[1]).toEqual('root-dash');
+ expect(toBeDeleted.dashboardUids[1]).toEqual('root-dash');
});
});
@@ -527,19 +557,19 @@ describe('ManageDashboards', () => {
ctrl = createCtrlWithStubs([]);
ctrl.sections = [
- {
+ mockSection({
id: 1,
title: 'folder',
items: [{ id: 2, checked: true, uid: 'dash' }],
checked: false,
uid: 'folder',
- },
- {
+ }),
+ mockSection({
id: 0,
title: 'General',
items: [{ id: 3, checked: true, uid: 'dash-2' }],
checked: false,
- },
+ }),
];
});
@@ -562,5 +592,10 @@ function createCtrlWithStubs(searchResponse: any, tags?: any) {
},
};
- return new ManageDashboardsCtrl({}, { getNav: () => {} }, searchSrvStub as SearchSrv, { isEditor: true });
+ return new ManageDashboardsCtrl(
+ {} as BackendSrv,
+ { getNav: () => {} } as NavModelSrv,
+ searchSrvStub as SearchSrv,
+ { isEditor: true } as ContextSrv
+ );
}
diff --git a/public/app/core/specs/search_srv.test.ts b/public/app/core/specs/search_srv.test.ts
index 550d11bbf9e..6566224c613 100644
--- a/public/app/core/specs/search_srv.test.ts
+++ b/public/app/core/specs/search_srv.test.ts
@@ -1,8 +1,12 @@
+// @ts-ignore
+import { IQService } from 'angular';
+
import { SearchSrv } from 'app/core/services/search_srv';
import { BackendSrvMock } from 'test/mocks/backend_srv';
import impressionSrv from 'app/core/services/impression_srv';
import { contextSrv } from 'app/core/services/context_srv';
import { beforeEach } from 'test/lib/common';
+import { BackendSrv } from '../services/backend_srv';
jest.mock('app/core/store', () => {
return {
@@ -18,18 +22,18 @@ jest.mock('app/core/services/impression_srv', () => {
});
describe('SearchSrv', () => {
- let searchSrv, backendSrvMock;
+ let searchSrv: SearchSrv, backendSrvMock: BackendSrvMock;
beforeEach(() => {
backendSrvMock = new BackendSrvMock();
- searchSrv = new SearchSrv(backendSrvMock, Promise);
+ searchSrv = new SearchSrv(backendSrvMock as BackendSrv, (Promise as any) as IQService);
contextSrv.isSignedIn = true;
impressionSrv.getDashboardOpened = jest.fn().mockReturnValue([]);
});
describe('With recent dashboards', () => {
- let results;
+ let results: any;
beforeEach(() => {
backendSrvMock.search = jest
@@ -56,7 +60,7 @@ describe('SearchSrv', () => {
});
describe('and 3 recent dashboards removed in backend', () => {
- let results;
+ let results: any;
beforeEach(() => {
backendSrvMock.search = jest
@@ -80,7 +84,7 @@ describe('SearchSrv', () => {
});
describe('With starred dashboards', () => {
- let results;
+ let results: any;
beforeEach(() => {
backendSrvMock.search = jest.fn().mockReturnValue(Promise.resolve([{ id: 1, title: 'starred' }]));
@@ -97,7 +101,7 @@ describe('SearchSrv', () => {
});
describe('With starred dashboards and recent', () => {
- let results;
+ let results: any;
beforeEach(() => {
backendSrvMock.search = jest
@@ -125,7 +129,7 @@ describe('SearchSrv', () => {
});
describe('with no query string and dashboards with folders returned', () => {
- let results;
+ let results: any;
beforeEach(() => {
backendSrvMock.search = jest
@@ -173,12 +177,10 @@ describe('SearchSrv', () => {
});
describe('with query string and dashboards with folders returned', () => {
- let results;
+ let results: any;
beforeEach(() => {
- backendSrvMock.search = jest.fn();
-
- backendSrvMock.search.mockReturnValue(
+ backendSrvMock.search = jest.fn().mockReturnValue(
Promise.resolve([
{
id: 2,
@@ -249,8 +251,9 @@ describe('SearchSrv', () => {
backendSrvMock.search = jest.fn();
backendSrvMock.search.mockReturnValue(Promise.resolve([]));
- searchSrv.getRecentDashboards = () => {
+ searchSrv['getRecentDashboards'] = () => {
getRecentDashboardsCalled = true;
+ return Promise.resolve();
};
return searchSrv.search({ skipRecent: true }).then(() => {});
@@ -269,8 +272,9 @@ describe('SearchSrv', () => {
backendSrvMock.search.mockReturnValue(Promise.resolve([]));
impressionSrv.getDashboardOpened = jest.fn().mockReturnValue([]);
- searchSrv.getStarred = () => {
+ searchSrv['getStarred'] = () => {
getStarredCalled = true;
+ return Promise.resolve();
};
return searchSrv.search({ skipStarred: true }).then(() => {});
diff --git a/public/app/core/table_model.ts b/public/app/core/table_model.ts
index fa7170bed13..291689941f7 100644
--- a/public/app/core/table_model.ts
+++ b/public/app/core/table_model.ts
@@ -1,17 +1,18 @@
import _ from 'lodash';
+import { Column, TableData } from '@grafana/ui';
-interface Column {
- text: string;
+/**
+ * Extends the standard Column class with variables that get
+ * mutated in the angular table panel.
+ */
+interface MutableColumn extends Column {
title?: string;
- type?: string;
sort?: boolean;
desc?: boolean;
- filterable?: boolean;
- unit?: string;
}
-export default class TableModel {
- columns: Column[];
+export default class TableModel implements TableData {
+ columns: MutableColumn[];
rows: any[];
type: string;
columnMap: any;
diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index 31e5a392050..fdc63b931f7 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -9,6 +9,7 @@ import store from 'app/core/store';
import { parse as parseDate } from 'app/core/utils/datemath';
import { colors } from '@grafana/ui';
import TableModel, { mergeTablesIntoModel } from 'app/core/table_model';
+import { getNextRefIdChar } from './query';
// Types
import { RawTimeRange, IntervalValues, DataQuery, DataSourceApi } from '@grafana/ui';
@@ -225,12 +226,8 @@ export function generateKey(index = 0): string {
return `Q-${Date.now()}-${Math.random()}-${index}`;
}
-export function generateRefId(index = 0): string {
- return `${index + 1}`;
-}
-
-export function generateEmptyQuery(index = 0): { refId: string; key: string } {
- return { refId: generateRefId(index), key: generateKey(index) };
+export function generateEmptyQuery(queries: DataQuery[], index = 0): DataQuery {
+ return { refId: getNextRefIdChar(queries), key: generateKey(index) };
}
/**
@@ -238,9 +235,9 @@ export function generateEmptyQuery(index = 0): { refId: string; key: string } {
*/
export function ensureQueries(queries?: DataQuery[]): DataQuery[] {
if (queries && typeof queries === 'object' && queries.length > 0) {
- return queries.map((query, i) => ({ ...query, ...generateEmptyQuery(i) }));
+ return queries.map((query, i) => ({ ...query, ...generateEmptyQuery(queries, i) }));
}
- return [{ ...generateEmptyQuery() }];
+ return [{ ...generateEmptyQuery(queries) }];
}
/**
diff --git a/public/app/core/utils/query.test.ts b/public/app/core/utils/query.test.ts
new file mode 100644
index 00000000000..a69162751a4
--- /dev/null
+++ b/public/app/core/utils/query.test.ts
@@ -0,0 +1,30 @@
+import { DataQuery } from '@grafana/ui';
+import { getNextRefIdChar } from './query';
+
+const dataQueries: DataQuery[] = [
+ {
+ refId: 'A',
+ },
+ {
+ refId: 'B',
+ },
+ {
+ refId: 'C',
+ },
+ {
+ refId: 'D',
+ },
+ {
+ refId: 'E',
+ },
+];
+
+describe('Get next refId char', () => {
+ it('should return next char', () => {
+ expect(getNextRefIdChar(dataQueries)).toEqual('F');
+ });
+
+ it('should get first char', () => {
+ expect(getNextRefIdChar([])).toEqual('A');
+ });
+});
diff --git a/public/app/core/utils/query.ts b/public/app/core/utils/query.ts
new file mode 100644
index 00000000000..933a73138a8
--- /dev/null
+++ b/public/app/core/utils/query.ts
@@ -0,0 +1,12 @@
+import _ from 'lodash';
+import { DataQuery } from '@grafana/ui/';
+
+export const getNextRefIdChar = (queries: DataQuery[]): string => {
+ const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+ return _.find(letters, refId => {
+ return _.every(queries, other => {
+ return other.refId !== refId;
+ });
+ });
+};
diff --git a/public/app/core/utils/validate.ts b/public/app/core/utils/validate.ts
deleted file mode 100644
index c6663882808..00000000000
--- a/public/app/core/utils/validate.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ValidationRule, ValidationEvents } from 'app/types';
-import { EventsWithValidation } from 'app/core/components/Form/Input';
-
-export const validate = (value: string, validationRules: ValidationRule[]) => {
- const errors = validationRules.reduce((acc, currRule) => {
- if (!currRule.rule(value)) {
- return acc.concat(currRule.errorMessage);
- }
- return acc;
- }, []);
- return errors.length > 0 ? errors : null;
-};
-
-export const hasValidationEvent = (event: EventsWithValidation, validationEvents: ValidationEvents) => {
- return validationEvents && validationEvents[event];
-};
diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx
index 4be5012a985..538f21d0d34 100644
--- a/public/app/features/api-keys/ApiKeysPage.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.tsx
@@ -7,7 +7,7 @@ import { getNavModel } from 'app/core/selectors/navModel';
import { getApiKeys, getApiKeysCount } from './state/selectors';
import { loadApiKeys, deleteApiKey, setSearchQuery, addApiKey } from './state/actions';
import Page from 'app/core/components/Page/Page';
-import SlideDown from 'app/core/components/Animations/SlideDown';
+import { SlideDown } from 'app/core/components/Animations/SlideDown';
import ApiKeysAddedModal from './ApiKeysAddedModal';
import config from 'app/core/config';
import appEvents from 'app/core/app_events';
diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
index ac1b5f08632..1562953fd1b 100644
--- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
@@ -4,13 +4,16 @@ jest.mock('app/core/store', () => {
};
});
+// @ts-ignore
import _ from 'lodash';
import config from 'app/core/config';
import { DashboardExporter } from './DashboardExporter';
import { DashboardModel } from '../../state/DashboardModel';
+import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { PanelPlugin } from 'app/types';
describe('given dashboard with repeated panels', () => {
- let dash, exported;
+ let dash: any, exported: any;
beforeEach(done => {
dash = {
@@ -89,25 +92,25 @@ describe('given dashboard with repeated panels', () => {
config.buildInfo.version = '3.0.2';
//Stubs test function calls
- const datasourceSrvStub = { get: jest.fn(arg => getStub(arg)) };
+ const datasourceSrvStub = ({ get: jest.fn(arg => getStub(arg)) } as any) as DatasourceSrv;
config.panels['graph'] = {
id: 'graph',
name: 'Graph',
info: { version: '1.1.0' },
- };
+ } as PanelPlugin;
config.panels['table'] = {
id: 'table',
name: 'Table',
info: { version: '1.1.1' },
- };
+ } as PanelPlugin;
config.panels['heatmap'] = {
id: 'heatmap',
name: 'Heatmap',
info: { version: '1.1.2' },
- };
+ } as PanelPlugin;
dash = new DashboardModel(dash, {});
const exporter = new DashboardExporter(datasourceSrvStub);
@@ -213,7 +216,7 @@ describe('given dashboard with repeated panels', () => {
});
// Stub responses
-const stubs = [];
+const stubs: { [key: string]: {} } = {};
stubs['gfdb'] = {
name: 'gfdb',
meta: { id: 'testdb', info: { version: '1.2.1' }, name: 'TestDB' },
@@ -249,6 +252,6 @@ stubs['-- Grafana --'] = {
},
};
-function getStub(arg) {
+function getStub(arg: string) {
return Promise.resolve(stubs[arg || 'gfdb']);
}
diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
index 6cf14f81c86..4150cb9a848 100644
--- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
+++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
@@ -1,9 +1,42 @@
-import config from 'app/core/config';
+// @ts-ignore
import _ from 'lodash';
+
+import config from 'app/core/config';
import { DashboardModel } from '../../state/DashboardModel';
+import DatasourceSrv from 'app/features/plugins/datasource_srv';
+import { PanelModel } from 'app/features/dashboard/state';
+import { PanelPlugin } from 'app/types/plugins';
+
+interface Input {
+ name: string;
+ type: string;
+ label: string;
+ value: any;
+ description: string;
+}
+
+interface Requires {
+ [key: string]: {
+ type: string;
+ id: string;
+ name: string;
+ version: string;
+ };
+}
+
+interface DataSources {
+ [key: string]: {
+ name: string;
+ label: string;
+ description: string;
+ type: string;
+ pluginId: string;
+ pluginName: string;
+ };
+}
export class DashboardExporter {
- constructor(private datasourceSrv) {}
+ constructor(private datasourceSrv: DatasourceSrv) {}
makeExportable(dashboard: DashboardModel) {
// clean up repeated rows and panels,
@@ -18,19 +51,19 @@ export class DashboardExporter {
// undo repeat cleanup
dashboard.processRepeats();
- const inputs = [];
- const requires = {};
- const datasources = {};
- const promises = [];
- const variableLookup: any = {};
+ const inputs: Input[] = [];
+ const requires: Requires = {};
+ const datasources: DataSources = {};
+ const promises: Array> = [];
+ const variableLookup: { [key: string]: any } = {};
for (const variable of saveModel.templating.list) {
variableLookup[variable.name] = variable;
}
- const templateizeDatasourceUsage = obj => {
- let datasource = obj.datasource;
- let datasourceVariable = null;
+ const templateizeDatasourceUsage = (obj: any) => {
+ let datasource: string = obj.datasource;
+ let datasourceVariable: any = null;
// ignore data source properties that contain a variable
if (datasource && datasource.indexOf('$') === 0) {
@@ -74,7 +107,7 @@ export class DashboardExporter {
);
};
- const processPanel = panel => {
+ const processPanel = (panel: PanelModel) => {
if (panel.datasource !== undefined) {
templateizeDatasourceUsage(panel);
}
@@ -87,7 +120,7 @@ export class DashboardExporter {
}
}
- const panelDef = config.panels[panel.type];
+ const panelDef: PanelPlugin = config.panels[panel.type];
if (panelDef) {
requires['panel' + panelDef.id] = {
type: 'panel',
@@ -135,7 +168,7 @@ export class DashboardExporter {
return Promise.all(promises)
.then(() => {
- _.each(datasources, (value, key) => {
+ _.each(datasources, (value: any) => {
inputs.push(value);
});
@@ -160,7 +193,7 @@ export class DashboardExporter {
}
// make inputs and requires a top thing
- const newObj = {};
+ const newObj: { [key: string]: {} } = {};
newObj['__inputs'] = inputs;
newObj['__requires'] = _.sortBy(requires, ['id']);
diff --git a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
index f358281e018..7c610c87d9f 100644
--- a/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
+++ b/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
@@ -1,6 +1,6 @@
import React, { PureComponent } from 'react';
import { Tooltip } from '@grafana/ui';
-import SlideDown from 'app/core/components/Animations/SlideDown';
+import { SlideDown } from 'app/core/components/Animations/SlideDown';
import { StoreState, FolderInfo } from 'app/types';
import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl';
import {
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index 3955f45d926..029fb0e8371 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -14,6 +14,7 @@ import { PanelEditor } from '../panel_editor/PanelEditor';
import { PanelModel, DashboardModel } from '../state';
import { PanelPlugin } from 'app/types';
import { PanelResizer } from './PanelResizer';
+import { PanelTypeChangedHook } from '@grafana/ui';
export interface Props {
panel: PanelModel;
@@ -91,7 +92,11 @@ export class DashboardPanel extends PureComponent {
this.props.panel.changeType(pluginId);
} else {
- panel.changeType(pluginId, plugin.exports.reactPanel.preserveOptions);
+ let hook: PanelTypeChangedHook | null = null;
+ if (plugin.exports.reactPanel) {
+ hook = plugin.exports.reactPanel.panelTypeChangedHook;
+ }
+ panel.changeType(pluginId, hook);
}
}
diff --git a/public/app/features/dashboard/dashgrid/DataPanel.tsx b/public/app/features/dashboard/dashgrid/DataPanel.tsx
index 82d94669cd6..6941832c273 100644
--- a/public/app/features/dashboard/dashgrid/DataPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DataPanel.tsx
@@ -11,16 +11,15 @@ import {
DataQueryResponse,
DataQueryError,
LoadingState,
- PanelData,
TableData,
TimeRange,
- TimeSeries,
ScopedVars,
+ toTableData,
} from '@grafana/ui';
interface RenderProps {
loading: LoadingState;
- panelData: PanelData;
+ data: TableData[];
}
export interface Props {
@@ -44,7 +43,7 @@ export interface State {
isFirstLoad: boolean;
loading: LoadingState;
response: DataQueryResponse;
- panelData: PanelData;
+ data?: TableData[];
}
export class DataPanel extends Component {
@@ -64,7 +63,6 @@ export class DataPanel extends Component {
response: {
data: [],
},
- panelData: {},
isFirstLoad: true,
};
}
@@ -149,7 +147,7 @@ export class DataPanel extends Component {
this.setState({
loading: LoadingState.Done,
response: resp,
- panelData: this.getPanelData(resp),
+ data: toTableData(resp.data),
isFirstLoad: false,
});
} catch (err) {
@@ -172,23 +170,9 @@ export class DataPanel extends Component {
}
};
- getPanelData(response: DataQueryResponse) {
- if (response.data.length > 0 && (response.data[0] as TableData).type === 'table') {
- return {
- tableData: response.data[0] as TableData,
- timeSeries: null,
- };
- }
-
- return {
- timeSeries: response.data as TimeSeries[],
- tableData: null,
- };
- }
-
render() {
const { queries } = this.props;
- const { loading, isFirstLoad, panelData } = this.state;
+ const { loading, isFirstLoad, data } = this.state;
// do not render component until we have first data
if (isFirstLoad && (loading === LoadingState.Loading || loading === LoadingState.NotStarted)) {
@@ -206,7 +190,7 @@ export class DataPanel extends Component {
return (
<>
{loading === LoadingState.Loading && this.renderLoadingState()}
- {this.props.children({ loading, panelData })}
+ {this.props.children({ loading, data })}
);
}
diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
index deb14f130ec..9a2dec5acd8 100644
--- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
@@ -11,7 +11,7 @@ import { DataPanel } from './DataPanel';
import ErrorBoundary from '../../../core/components/ErrorBoundary/ErrorBoundary';
// Utils
-import { applyPanelTimeOverrides, snapshotDataToPanelData } from 'app/features/dashboard/utils/panel';
+import { applyPanelTimeOverrides } from 'app/features/dashboard/utils/panel';
import { PANEL_HEADER_HEIGHT } from 'app/core/constants';
import { profiler } from 'app/core/profiler';
import config from 'app/core/config';
@@ -19,7 +19,7 @@ import config from 'app/core/config';
// Types
import { DashboardModel, PanelModel } from '../state';
import { PanelPlugin } from 'app/types';
-import { DataQueryResponse, TimeRange, LoadingState, PanelData, DataQueryError } from '@grafana/ui';
+import { DataQueryResponse, TimeRange, LoadingState, TableData, DataQueryError, toTableData } from '@grafana/ui';
import { ScopedVars } from '@grafana/ui';
import templateSrv from 'app/features/templating/template_srv';
@@ -139,10 +139,10 @@ export class PanelChrome extends PureComponent {
}
get getDataForPanel() {
- return this.hasPanelSnapshot ? snapshotDataToPanelData(this.props.panel) : null;
+ return this.hasPanelSnapshot ? toTableData(this.props.panel.snapshotData) : null;
}
- renderPanelPlugin(loading: LoadingState, panelData: PanelData, width: number, height: number): JSX.Element {
+ renderPanelPlugin(loading: LoadingState, data: TableData[], width: number, height: number): JSX.Element {
const { panel, plugin } = this.props;
const { timeRange, renderCounter } = this.state;
const PanelComponent = plugin.exports.reactPanel.panel;
@@ -157,7 +157,7 @@ export class PanelChrome extends PureComponent {
{
onDataResponse={this.onDataResponse}
onError={this.onDataError}
>
- {({ loading, panelData }) => {
- return this.renderPanelPlugin(loading, panelData, width, height);
+ {({ loading, data }) => {
+ return this.renderPanelPlugin(loading, data, width, height);
}}
) : (
diff --git a/public/app/features/dashboard/panel_editor/QueryOptions.tsx b/public/app/features/dashboard/panel_editor/QueryOptions.tsx
index 0d031cb12ba..377582d7ce5 100644
--- a/public/app/features/dashboard/panel_editor/QueryOptions.tsx
+++ b/public/app/features/dashboard/panel_editor/QueryOptions.tsx
@@ -5,17 +5,12 @@ import React, { PureComponent, ChangeEvent, FocusEvent } from 'react';
import { isValidTimeSpan } from 'app/core/utils/rangeutil';
// Components
-import { Switch } from '@grafana/ui';
-import { Input } from 'app/core/components/Form';
-import { EventsWithValidation } from 'app/core/components/Form/Input';
-import { InputStatus } from 'app/core/components/Form/Input';
+import { DataSourceSelectItem, EventsWithValidation, Input, InputStatus, Switch, ValidationEvents } from '@grafana/ui';
import { DataSourceOption } from './DataSourceOption';
import { FormLabel } from '@grafana/ui';
// Types
-import { PanelModel } from '../state/PanelModel';
-import { DataSourceSelectItem } from '@grafana/ui/src/types';
-import { ValidationEvents } from 'app/types';
+import { PanelModel } from '../state';
const timeRangeValidationEvents: ValidationEvents = {
[EventsWithValidation.onBlur]: [
diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts
index 686a8ba6d28..82af0804029 100644
--- a/public/app/features/dashboard/state/PanelModel.test.ts
+++ b/public/app/features/dashboard/state/PanelModel.test.ts
@@ -3,9 +3,10 @@ import { PanelModel } from './PanelModel';
describe('PanelModel', () => {
describe('when creating new panel model', () => {
let model;
+ let modelJson;
beforeEach(() => {
- model = new PanelModel({
+ modelJson = {
type: 'table',
showColumns: true,
targets: [{ refId: 'A' }, { noRefId: true }],
@@ -23,7 +24,8 @@ describe('PanelModel', () => {
},
],
},
- });
+ };
+ model = new PanelModel(modelJson);
});
it('should apply defaults', () => {
@@ -38,6 +40,15 @@ describe('PanelModel', () => {
expect(model.targets[1].refId).toBe('B');
});
+ it("shouldn't break panel with non-array targets", () => {
+ modelJson.targets = {
+ 0: { refId: 'A' },
+ foo: { bar: 'baz' },
+ };
+ model = new PanelModel(modelJson);
+ expect(model.targets[0].refId).toBe('A');
+ });
+
it('getSaveModel should remove defaults', () => {
const saveModel = model.getSaveModel();
expect(saveModel.gridPos).toBe(undefined);
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index 88065fdf208..68f017adb9e 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -1,9 +1,12 @@
// Libraries
import _ from 'lodash';
-// Types
+// Utils
import { Emitter } from 'app/core/utils/emitter';
-import { DataQuery, TimeSeries, Threshold, ScopedVars } from '@grafana/ui';
+import { getNextRefIdChar } from 'app/core/utils/query';
+
+// Types
+import { DataQuery, TimeSeries, Threshold, ScopedVars, PanelTypeChangedHook } from '@grafana/ui';
import { TableData } from '@grafana/ui/src';
export interface GridPos {
@@ -108,12 +111,12 @@ export class PanelModel {
cachedPluginOptions?: any;
legend?: { show: boolean };
- constructor(model) {
+ constructor(model: any) {
this.events = new Emitter();
// copy properties from persisted model
for (const property in model) {
- this[property] = model[property];
+ (this as any)[property] = model[property];
}
// defaults
@@ -125,10 +128,10 @@ export class PanelModel {
}
ensureQueryIds() {
- if (this.targets) {
+ if (this.targets && _.isArray(this.targets)) {
for (const query of this.targets) {
if (!query.refId) {
- query.refId = this.getNextQueryLetter();
+ query.refId = getNextRefIdChar(this.targets);
}
}
}
@@ -147,7 +150,7 @@ export class PanelModel {
}
}
- getOptions(panelDefaults) {
+ getOptions(panelDefaults: any) {
return _.defaultsDeep(this.options || {}, panelDefaults);
}
@@ -224,7 +227,7 @@ export class PanelModel {
}
return {
...acc,
- [property]: this[property],
+ [property]: (this as any)[property],
};
}, {});
}
@@ -233,11 +236,11 @@ export class PanelModel {
const prevOptions = this.cachedPluginOptions[pluginId] || {};
Object.keys(prevOptions).map(property => {
- this[property] = prevOptions[property];
+ (this as any)[property] = prevOptions[property];
});
}
- changeType(pluginId: string, preserveOptions?: any) {
+ changeType(pluginId: string, hook?: PanelTypeChangedHook) {
const oldOptions: any = this.getOptionsToRemember();
const oldPluginId = this.type;
@@ -249,34 +252,27 @@ export class PanelModel {
continue;
}
- delete this[key];
+ delete (this as any)[key];
}
this.cachedPluginOptions[oldPluginId] = oldOptions;
this.restorePanelOptions(pluginId);
- if (preserveOptions && oldOptions) {
+ // Callback that can validate and migrate any existing settings
+ if (hook) {
this.options = this.options || {};
- Object.assign(this.options, preserveOptions(oldPluginId, oldOptions.options));
+ const old = oldOptions ? oldOptions.options : null;
+
+ Object.assign(this.options, hook(this.options, oldPluginId, old));
}
}
addQuery(query?: Partial) {
query = query || { refId: 'A' };
- query.refId = this.getNextQueryLetter();
+ query.refId = getNextRefIdChar(this.targets);
this.targets.push(query as DataQuery);
}
- getNextQueryLetter(): string {
- const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
- return _.find(letters, refId => {
- return _.every(this.targets, other => {
- return other.refId !== refId;
- });
- });
- }
-
changeQuery(query: DataQuery, index: number) {
// ensure refId is maintained
query.refId = this.targets[index].refId;
diff --git a/public/app/features/dashboard/utils/panel.ts b/public/app/features/dashboard/utils/panel.ts
index d14432cb2eb..57f4b81a0e0 100644
--- a/public/app/features/dashboard/utils/panel.ts
+++ b/public/app/features/dashboard/utils/panel.ts
@@ -4,8 +4,7 @@ import store from 'app/core/store';
// Models
import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
import { PanelModel } from 'app/features/dashboard/state/PanelModel';
-import { PanelData, TimeRange, TimeSeries } from '@grafana/ui';
-import { TableData } from '@grafana/ui/src';
+import { TimeRange } from '@grafana/ui';
// Utils
import { isString as _isString } from 'lodash';
@@ -170,19 +169,3 @@ export function getResolution(panel: PanelModel): number {
return panel.maxDataPoints ? panel.maxDataPoints : Math.ceil(width * (panel.gridPos.w / 24));
}
-
-const isTimeSeries = (data: any): data is TimeSeries => data && data.hasOwnProperty('datapoints');
-const isTableData = (data: any): data is TableData => data && data.hasOwnProperty('columns');
-export const snapshotDataToPanelData = (panel: PanelModel): PanelData => {
- const snapshotData = panel.snapshotData;
- if (isTimeSeries(snapshotData[0])) {
- return {
- timeSeries: snapshotData,
- } as PanelData;
- } else if (isTableData(snapshotData[0])) {
- return {
- tableData: snapshotData[0],
- } as PanelData;
- }
- throw new Error('snapshotData is invalid:' + snapshotData.toString());
-};
diff --git a/public/app/features/explore/LogLabelStats.tsx b/public/app/features/explore/LogLabelStats.tsx
index d689b6e70b2..466cc050e43 100644
--- a/public/app/features/explore/LogLabelStats.tsx
+++ b/public/app/features/explore/LogLabelStats.tsx
@@ -11,7 +11,9 @@ function LogLabelStatsRow(logLabelStatsModel: LogLabelStatsModel) {
return (
{
const tableModel = data || EMPTY_TABLE;
const columnNames = tableModel.columns.map(({ text }) => text);
const columns = tableModel.columns.map(({ filterable, text }) => ({
- Header: text,
+ Header: () => {text},
accessor: text,
className: VALUE_REGEX.test(text) ? 'text-right' : '',
show: text !== 'Time',
- Cell: row => {row.value},
+ Cell: row => (
+
+ {row.value}
+
+ ),
}));
const noDataText = data ? 'The queries returned no data for a table.' : '';
diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts
index e0b84320fa7..fda8fe5eef4 100644
--- a/public/app/features/explore/state/actions.ts
+++ b/public/app/features/explore/state/actions.ts
@@ -60,7 +60,6 @@ import {
splitCloseAction,
splitOpenAction,
addQueryRowAction,
- AddQueryRowPayload,
toggleGraphAction,
toggleLogsAction,
toggleTableAction,
@@ -87,9 +86,12 @@ const updateExploreUIState = (exploreId, uiStateFragment: Partial {
- const query = generateEmptyQuery(index + 1);
- return addQueryRowAction({ exploreId, index, query });
+export function addQueryRow(exploreId: ExploreId, index: number): ThunkResult {
+ return (dispatch, getState) => {
+ const query = generateEmptyQuery(getState().explore[exploreId].queries, index);
+
+ dispatch(addQueryRowAction({ exploreId, index, query }));
+ };
}
/**
@@ -126,10 +128,10 @@ export function changeQuery(
index: number,
override: boolean
): ThunkResult {
- return dispatch => {
+ return (dispatch, getState) => {
// Null query means reset
if (query === null) {
- query = { ...generateEmptyQuery(index) };
+ query = { ...generateEmptyQuery(getState().explore[exploreId].queries) };
}
dispatch(changeQueryAction({ exploreId, query, index, override }));
@@ -287,7 +289,7 @@ export function importQueries(
const nextQueries = importedQueries.map((q, i) => ({
...q,
- ...generateEmptyQuery(i),
+ ...generateEmptyQuery(queries),
}));
dispatch(queriesImportedAction({ exploreId, queries: nextQueries }));
@@ -629,9 +631,9 @@ export function scanStart(exploreId: ExploreId, scanner: RangeScanner): ThunkRes
* Use this action for clicks on query examples. Triggers a query run.
*/
export function setQueries(exploreId: ExploreId, rawQueries: DataQuery[]): ThunkResult {
- return dispatch => {
+ return (dispatch, getState) => {
// Inject react keys into query objects
- const queries = rawQueries.map(q => ({ ...q, ...generateEmptyQuery() }));
+ const queries = rawQueries.map(q => ({ ...q, ...generateEmptyQuery(getState().explore[exploreId].queries) }));
dispatch(setQueriesAction({ exploreId, queries }));
dispatch(runQueries(exploreId));
};
diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts
index a8815842c89..32bfe09a96b 100644
--- a/public/app/features/explore/state/reducers.ts
+++ b/public/app/features/explore/state/reducers.ts
@@ -127,7 +127,7 @@ export const itemReducer = reducerFactory({} as ExploreItemSta
const { query, index } = action.payload;
// Override path: queries are completely reset
- const nextQuery: DataQuery = { ...query, ...generateEmptyQuery(index) };
+ const nextQuery: DataQuery = { ...query, ...generateEmptyQuery(state.queries) };
const nextQueries = [...queries];
nextQueries[index] = nextQuery;
@@ -267,7 +267,7 @@ export const itemReducer = reducerFactory({} as ExploreItemSta
// Modify all queries
nextQueries = queries.map((query, i) => ({
...modifier({ ...query }, modification),
- ...generateEmptyQuery(i),
+ ...generateEmptyQuery(state.queries),
}));
// Discard all ongoing transactions
nextQueryTransactions = [];
@@ -276,7 +276,9 @@ export const itemReducer = reducerFactory({} as ExploreItemSta
nextQueries = queries.map((query, i) => {
// Synchronize all queries with local query cache to ensure consistency
// TODO still needed?
- return i === index ? { ...modifier({ ...query }, modification), ...generateEmptyQuery(i) } : query;
+ return i === index
+ ? { ...modifier({ ...query }, modification), ...generateEmptyQuery(state.queries) }
+ : query;
});
nextQueryTransactions = queryTransactions
// Consume the hint corresponding to the action
diff --git a/public/app/features/folders/FolderPermissions.tsx b/public/app/features/folders/FolderPermissions.tsx
index a3aae423b75..705bb8f7848 100644
--- a/public/app/features/folders/FolderPermissions.tsx
+++ b/public/app/features/folders/FolderPermissions.tsx
@@ -3,7 +3,7 @@ import { hot } from 'react-hot-loader';
import { connect } from 'react-redux';
import Page from 'app/core/components/Page/Page';
import { Tooltip } from '@grafana/ui';
-import SlideDown from 'app/core/components/Animations/SlideDown';
+import { SlideDown } from 'app/core/components/Animations/SlideDown';
import { getNavModel } from 'app/core/selectors/navModel';
import { NavModel, StoreState, FolderState } from 'app/types';
import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl';
diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts
index 9a156652a65..ab9d9aba08a 100644
--- a/public/app/features/plugins/built_in_plugins.ts
+++ b/public/app/features/plugins/built_in_plugins.ts
@@ -25,6 +25,7 @@ import * as heatmapPanel from 'app/plugins/panel/heatmap/module';
import * as tablePanel from 'app/plugins/panel/table/module';
import * as table2Panel from 'app/plugins/panel/table2/module';
import * as singlestatPanel from 'app/plugins/panel/singlestat/module';
+import * as singlestatPanel2 from 'app/plugins/panel/singlestat2/module';
import * as gettingStartedPanel from 'app/plugins/panel/gettingstarted/module';
import * as gaugePanel from 'app/plugins/panel/gauge/module';
import * as barGaugePanel from 'app/plugins/panel/bargauge/module';
@@ -57,6 +58,7 @@ const builtInPlugins = {
'app/plugins/panel/table/module': tablePanel,
'app/plugins/panel/table2/module': table2Panel,
'app/plugins/panel/singlestat/module': singlestatPanel,
+ 'app/plugins/panel/singlestat2/module': singlestatPanel2,
'app/plugins/panel/gettingstarted/module': gettingStartedPanel,
'app/plugins/panel/gauge/module': gaugePanel,
'app/plugins/panel/bargauge/module': barGaugePanel,
diff --git a/public/app/features/teams/TeamGroupSync.tsx b/public/app/features/teams/TeamGroupSync.tsx
index 363fc2f2ccc..5f47c4b906d 100644
--- a/public/app/features/teams/TeamGroupSync.tsx
+++ b/public/app/features/teams/TeamGroupSync.tsx
@@ -1,6 +1,6 @@
import React, { PureComponent } from 'react';
import { connect } from 'react-redux';
-import SlideDown from 'app/core/components/Animations/SlideDown';
+import { SlideDown } from 'app/core/components/Animations/SlideDown';
import { Tooltip } from '@grafana/ui';
import { TeamGroup } from '../../types';
import { addTeamGroup, loadTeamGroups, removeTeamGroup } from './state/actions';
diff --git a/public/app/features/teams/TeamList.test.tsx b/public/app/features/teams/TeamList.test.tsx
index 369771bb340..da5afb58796 100644
--- a/public/app/features/teams/TeamList.test.tsx
+++ b/public/app/features/teams/TeamList.test.tsx
@@ -1,8 +1,9 @@
import React from 'react';
import { shallow } from 'enzyme';
import { Props, TeamList } from './TeamList';
-import { NavModel, Team } from '../../types';
+import { NavModel, Team, OrgRole } from '../../types';
import { getMockTeam, getMultipleMockTeams } from './__mocks__/teamMocks';
+import { User } from 'app/core/services/context_srv';
const setup = (propOverrides?: object) => {
const props: Props = {
@@ -21,6 +22,11 @@ const setup = (propOverrides?: object) => {
searchQuery: '',
teamsCount: 0,
hasFetched: false,
+ editorsCanAdmin: false,
+ signedInUser: {
+ id: 1,
+ orgRole: OrgRole.Viewer,
+ } as User,
};
Object.assign(props, propOverrides);
@@ -49,6 +55,42 @@ describe('Render', () => {
expect(wrapper).toMatchSnapshot();
});
+
+ describe('when feature toggle editorsCanAdmin is turned on', () => {
+ describe('and signedin user is not viewer', () => {
+ it('should enable the new team button', () => {
+ const { wrapper } = setup({
+ teams: getMultipleMockTeams(1),
+ teamsCount: 1,
+ hasFetched: true,
+ editorsCanAdmin: true,
+ signedInUser: {
+ id: 1,
+ orgRole: OrgRole.Editor,
+ } as User,
+ });
+
+ expect(wrapper).toMatchSnapshot();
+ });
+ });
+
+ describe('and signedin user is a viewer', () => {
+ it('should disable the new team button', () => {
+ const { wrapper } = setup({
+ teams: getMultipleMockTeams(1),
+ teamsCount: 1,
+ hasFetched: true,
+ editorsCanAdmin: true,
+ signedInUser: {
+ id: 1,
+ orgRole: OrgRole.Viewer,
+ } as User,
+ });
+
+ expect(wrapper).toMatchSnapshot();
+ });
+ });
+ });
});
describe('Life cycle', () => {
diff --git a/public/app/features/teams/TeamList.tsx b/public/app/features/teams/TeamList.tsx
index 60921a3378b..5d3ef005c9e 100644
--- a/public/app/features/teams/TeamList.tsx
+++ b/public/app/features/teams/TeamList.tsx
@@ -4,11 +4,13 @@ import { hot } from 'react-hot-loader';
import Page from 'app/core/components/Page/Page';
import { DeleteButton } from '@grafana/ui';
import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import { NavModel, Team } from 'app/types';
+import { NavModel, Team, OrgRole } from 'app/types';
import { loadTeams, deleteTeam, setSearchQuery } from './state/actions';
-import { getSearchQuery, getTeams, getTeamsCount } from './state/selectors';
+import { getSearchQuery, getTeams, getTeamsCount, isPermissionTeamAdmin } from './state/selectors';
import { getNavModel } from 'app/core/selectors/navModel';
import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
+import { config } from 'app/core/config';
+import { contextSrv, User } from 'app/core/services/context_srv';
export interface Props {
navModel: NavModel;
@@ -19,6 +21,8 @@ export interface Props {
loadTeams: typeof loadTeams;
deleteTeam: typeof deleteTeam;
setSearchQuery: typeof setSearchQuery;
+ editorsCanAdmin?: boolean;
+ signedInUser?: User;
}
export class TeamList extends PureComponent {
@@ -39,7 +43,10 @@ export class TeamList extends PureComponent {
};
renderTeam(team: Team) {
+ const { editorsCanAdmin, signedInUser } = this.props;
+ const permission = team.permission;
const teamUrl = `org/teams/edit/${team.id}`;
+ const canDelete = isPermissionTeamAdmin({ permission, editorsCanAdmin, signedInUser });
return (
@@ -58,7 +65,7 @@ export class TeamList extends PureComponent {
{team.memberCount}
- this.deleteTeam(team)} />
+ this.deleteTeam(team)} disabled={!canDelete} />
);
@@ -84,7 +91,10 @@ export class TeamList extends PureComponent {
}
renderTeamList() {
- const { teams, searchQuery } = this.props;
+ const { teams, searchQuery, editorsCanAdmin, signedInUser } = this.props;
+ const isCanAdminAndViewer = editorsCanAdmin && signedInUser.orgRole === OrgRole.Viewer;
+ const disabledClass = isCanAdminAndViewer ? ' disabled' : '';
+ const newTeamHref = isCanAdminAndViewer ? '#' : 'org/teams/new';
return (
<>
@@ -101,7 +111,7 @@ export class TeamList extends PureComponent {
-
+
New team
@@ -152,6 +162,8 @@ function mapStateToProps(state) {
searchQuery: getSearchQuery(state.teams),
teamsCount: getTeamsCount(state.teams),
hasFetched: state.teams.hasFetched,
+ editorsCanAdmin: config.editorsCanAdmin, // this makes the feature toggle mockable/controllable from tests,
+ signedInUser: contextSrv.user, // this makes the feature toggle mockable/controllable from tests,
};
}
diff --git a/public/app/features/teams/TeamMemberRow.test.tsx b/public/app/features/teams/TeamMemberRow.test.tsx
new file mode 100644
index 00000000000..0607825bff3
--- /dev/null
+++ b/public/app/features/teams/TeamMemberRow.test.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { TeamMember, TeamPermissionLevel } from '../../types';
+import { getMockTeamMember } from './__mocks__/teamMocks';
+import { TeamMemberRow, Props } from './TeamMemberRow';
+import { SelectOptionItem } from '@grafana/ui';
+
+const setup = (propOverrides?: object) => {
+ const props: Props = {
+ member: getMockTeamMember(),
+ syncEnabled: false,
+ editorsCanAdmin: false,
+ signedInUserIsTeamAdmin: false,
+ updateTeamMember: jest.fn(),
+ removeTeamMember: jest.fn(),
+ };
+
+ Object.assign(props, propOverrides);
+
+ const wrapper = shallow( {
+ constructor(props: Props) {
+ super(props);
+ this.renderLabels = this.renderLabels.bind(this);
+ this.renderPermissions = this.renderPermissions.bind(this);
+ }
+
+ onRemoveMember(member: TeamMember) {
+ this.props.removeTeamMember(member.userId);
+ }
+
+ onPermissionChange = (item: SelectOptionItem, member: TeamMember) => {
+ const permission = item.value;
+ const updatedTeamMember = { ...member, permission };
+
+ this.props.updateTeamMember(updatedTeamMember);
+ };
+
+ renderPermissions(member: TeamMember) {
+ const { editorsCanAdmin, signedInUserIsTeamAdmin } = this.props;
+ const value = teamsPermissionLevels.find(dp => dp.value === member.permission);
+
+ return (
+
+
+
+
+ );
+ }
+
+ renderLabels(labels: string[]) {
+ if (!labels) {
+ return
+ {labels.map(label => (
+ {}} />
+ ))}
+
+ );
+ }
+
+ render() {
+ const { member, syncEnabled, signedInUserIsTeamAdmin } = this.props;
+ return (
+
+
+ 
+
+ {member.login}
+ {member.email}
+ {this.renderPermissions(member)}
+ {syncEnabled && this.renderLabels(member.labels)}
+
+ this.onRemoveMember(member)} disabled={!signedInUserIsTeamAdmin} />
+
+
+ );
+ }
+}
+
+function mapStateToProps(state) {
+ return {};
+}
+
+const mapDispatchToProps = {
+ removeTeamMember,
+ updateTeamMember,
+};
+
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(TeamMemberRow);
diff --git a/public/app/features/teams/TeamMembers.test.tsx b/public/app/features/teams/TeamMembers.test.tsx
index 9922619adc2..01b9f12aa3b 100644
--- a/public/app/features/teams/TeamMembers.test.tsx
+++ b/public/app/features/teams/TeamMembers.test.tsx
@@ -1,18 +1,25 @@
import React from 'react';
import { shallow } from 'enzyme';
import { TeamMembers, Props, State } from './TeamMembers';
-import { TeamMember } from '../../types';
-import { getMockTeamMember, getMockTeamMembers } from './__mocks__/teamMocks';
+import { TeamMember, OrgRole } from '../../types';
+import { getMockTeamMembers } from './__mocks__/teamMocks';
+import { User } from 'app/core/services/context_srv';
+
+const signedInUserId = 1;
const setup = (propOverrides?: object) => {
const props: Props = {
members: [] as TeamMember[],
searchMemberQuery: '',
setSearchMemberQuery: jest.fn(),
- loadTeamMembers: jest.fn(),
addTeamMember: jest.fn(),
- removeTeamMember: jest.fn(),
syncEnabled: false,
+ editorsCanAdmin: false,
+ signedInUser: {
+ id: signedInUserId,
+ isGrafanaAdmin: false,
+ orgRole: OrgRole.Viewer,
+ } as User,
};
Object.assign(props, propOverrides);
@@ -28,24 +35,13 @@ const setup = (propOverrides?: object) => {
describe('Render', () => {
it('should render component', () => {
- const { wrapper } = setup();
+ const { wrapper } = setup({});
expect(wrapper).toMatchSnapshot();
});
it('should render team members', () => {
- const { wrapper } = setup({
- members: getMockTeamMembers(5),
- });
-
- expect(wrapper).toMatchSnapshot();
- });
-
- it('should render team members when sync enabled', () => {
- const { wrapper } = setup({
- members: getMockTeamMembers(5),
- syncEnabled: true,
- });
+ const { wrapper } = setup({ members: getMockTeamMembers(5, 5) });
expect(wrapper).toMatchSnapshot();
});
@@ -54,7 +50,7 @@ describe('Render', () => {
describe('Functions', () => {
describe('on search member query change', () => {
it('it should call setSearchMemberQuery', () => {
- const { instance } = setup();
+ const { instance } = setup({});
instance.onSearchQueryChange('member');
@@ -62,17 +58,8 @@ describe('Functions', () => {
});
});
- describe('on remove member', () => {
- const { instance } = setup();
- const mockTeamMember = getMockTeamMember();
-
- instance.onRemoveMember(mockTeamMember);
-
- expect(instance.props.removeTeamMember).toHaveBeenCalledWith(1);
- });
-
describe('on add user to team', () => {
- const { wrapper, instance } = setup();
+ const { wrapper, instance } = setup({});
const state = wrapper.state() as State;
state.newTeamMember = {
diff --git a/public/app/features/teams/TeamMembers.tsx b/public/app/features/teams/TeamMembers.tsx
index e5c3aaafef0..ab06f465097 100644
--- a/public/app/features/teams/TeamMembers.tsx
+++ b/public/app/features/teams/TeamMembers.tsx
@@ -1,22 +1,25 @@
import React, { PureComponent } from 'react';
import { connect } from 'react-redux';
-import SlideDown from 'app/core/components/Animations/SlideDown';
+import { SlideDown } from 'app/core/components/Animations/SlideDown';
import { UserPicker } from 'app/core/components/Select/UserPicker';
-import { DeleteButton } from '@grafana/ui';
import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
import { TeamMember, User } from 'app/types';
-import { loadTeamMembers, addTeamMember, removeTeamMember, setSearchMemberQuery } from './state/actions';
-import { getSearchMemberQuery, getTeamMembers } from './state/selectors';
+import { addTeamMember, setSearchMemberQuery } from './state/actions';
+import { getSearchMemberQuery, isSignedInUserTeamAdmin } from './state/selectors';
import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
+import { WithFeatureToggle } from 'app/core/components/WithFeatureToggle';
+import { config } from 'app/core/config';
+import { contextSrv, User as SignedInUser } from 'app/core/services/context_srv';
+import TeamMemberRow from './TeamMemberRow';
export interface Props {
members: TeamMember[];
searchMemberQuery: string;
- loadTeamMembers: typeof loadTeamMembers;
addTeamMember: typeof addTeamMember;
- removeTeamMember: typeof removeTeamMember;
setSearchMemberQuery: typeof setSearchMemberQuery;
syncEnabled: boolean;
+ editorsCanAdmin?: boolean;
+ signedInUser?: SignedInUser;
}
export interface State {
@@ -30,18 +33,10 @@ export class TeamMembers extends PureComponent {
this.state = { isAdding: false, newTeamMember: null };
}
- componentDidMount() {
- this.props.loadTeamMembers();
- }
-
onSearchQueryChange = (value: string) => {
this.props.setSearchMemberQuery(value);
};
- onRemoveMember(member: TeamMember) {
- this.props.removeTeamMember(member.userId);
- }
-
onToggleAdding = () => {
this.setState({ isAdding: !this.state.isAdding });
};
@@ -69,25 +64,11 @@ export class TeamMembers extends PureComponent {
);
}
- renderMember(member: TeamMember, syncEnabled: boolean) {
- return (
-
-
-
-
- {member.login}
- {member.email}
- {syncEnabled && this.renderLabels(member.labels)}
-
- this.onRemoveMember(member)} />
-
-
- );
- }
-
render() {
const { isAdding } = this.state;
- const { searchMemberQuery, members, syncEnabled } = this.props;
+ const { searchMemberQuery, members, syncEnabled, editorsCanAdmin, signedInUser } = this.props;
+ const isTeamAdmin = isSignedInUserTeamAdmin({ members, editorsCanAdmin, signedInUser });
+
return (
{
Name
Email
+
+ Permission
+
{syncEnabled &&
@@ -146,15 +145,14 @@ export class TeamMembers extends PureComponent {
function mapStateToProps(state) {
return {
- members: getTeamMembers(state.team),
searchMemberQuery: getSearchMemberQuery(state.team),
+ editorsCanAdmin: config.editorsCanAdmin, // this makes the feature toggle mockable/controllable from tests,
+ signedInUser: contextSrv.user, // this makes the feature toggle mockable/controllable from tests,
};
}
const mapDispatchToProps = {
- loadTeamMembers,
addTeamMember,
- removeTeamMember,
setSearchMemberQuery,
};
diff --git a/public/app/features/teams/TeamPages.test.tsx b/public/app/features/teams/TeamPages.test.tsx
index 5d751f46989..c49be9f550b 100644
--- a/public/app/features/teams/TeamPages.test.tsx
+++ b/public/app/features/teams/TeamPages.test.tsx
@@ -1,8 +1,9 @@
import React from 'react';
import { shallow } from 'enzyme';
import { TeamPages, Props } from './TeamPages';
-import { NavModel, Team } from '../../types';
+import { NavModel, Team, TeamMember, OrgRole } from '../../types';
import { getMockTeam } from './__mocks__/teamMocks';
+import { User } from 'app/core/services/context_srv';
jest.mock('app/core/config', () => ({
buildInfo: { isEnterprise: true },
@@ -13,8 +14,16 @@ const setup = (propOverrides?: object) => {
navModel: {} as NavModel,
teamId: 1,
loadTeam: jest.fn(),
+ loadTeamMembers: jest.fn(),
pageName: 'members',
team: {} as Team,
+ members: [] as TeamMember[],
+ editorsCanAdmin: false,
+ signedInUser: {
+ id: 1,
+ isGrafanaAdmin: false,
+ orgRole: OrgRole.Viewer,
+ } as User,
};
Object.assign(props, propOverrides);
@@ -65,4 +74,46 @@ describe('Render', () => {
expect(wrapper).toMatchSnapshot();
});
+
+ describe('when feature toggle editorsCanAdmin is turned on', () => {
+ it('should render settings page if user is team admin', () => {
+ const { wrapper } = setup({
+ team: getMockTeam(),
+ pageName: 'settings',
+ preferences: {
+ homeDashboardId: 1,
+ theme: 'Default',
+ timezone: 'Default',
+ },
+ editorsCanAdmin: true,
+ signedInUser: {
+ id: 1,
+ isGrafanaAdmin: false,
+ orgRole: OrgRole.Admin,
+ } as User,
+ });
+
+ expect(wrapper).toMatchSnapshot();
+ });
+
+ it('should not render settings page if user is team member', () => {
+ const { wrapper } = setup({
+ team: getMockTeam(),
+ pageName: 'settings',
+ preferences: {
+ homeDashboardId: 1,
+ theme: 'Default',
+ timezone: 'Default',
+ },
+ editorsCanAdmin: true,
+ signedInUser: {
+ id: 1,
+ isGrafanaAdmin: false,
+ orgRole: OrgRole.Viewer,
+ } as User,
+ });
+
+ expect(wrapper).toMatchSnapshot();
+ });
+ });
});
diff --git a/public/app/features/teams/TeamPages.tsx b/public/app/features/teams/TeamPages.tsx
index 15adc8b3856..e6b70e7b33b 100644
--- a/public/app/features/teams/TeamPages.tsx
+++ b/public/app/features/teams/TeamPages.tsx
@@ -7,19 +7,24 @@ import Page from 'app/core/components/Page/Page';
import TeamMembers from './TeamMembers';
import TeamSettings from './TeamSettings';
import TeamGroupSync from './TeamGroupSync';
-import { NavModel, Team } from 'app/types';
-import { loadTeam } from './state/actions';
-import { getTeam } from './state/selectors';
+import { NavModel, Team, TeamMember } from 'app/types';
+import { loadTeam, loadTeamMembers } from './state/actions';
+import { getTeam, getTeamMembers, isSignedInUserTeamAdmin } from './state/selectors';
import { getTeamLoadingNav } from './state/navModel';
import { getNavModel } from 'app/core/selectors/navModel';
import { getRouteParamsId, getRouteParamsPage } from '../../core/selectors/location';
+import { contextSrv, User } from 'app/core/services/context_srv';
export interface Props {
team: Team;
loadTeam: typeof loadTeam;
+ loadTeamMembers: typeof loadTeamMembers;
teamId: number;
pageName: string;
navModel: NavModel;
+ members?: TeamMember[];
+ editorsCanAdmin?: boolean;
+ signedInUser?: User;
}
interface State {
@@ -51,6 +56,7 @@ export class TeamPages extends PureComponent {
const { loadTeam, teamId } = this.props;
this.setState({ isLoading: true });
const team = await loadTeam(teamId);
+ await this.props.loadTeamMembers();
this.setState({ isLoading: false });
return team;
}
@@ -61,30 +67,56 @@ export class TeamPages extends PureComponent {
return _.includes(pages, currentPage) ? currentPage : pages[0];
}
- renderPage() {
+ textsAreEqual = (text1: string, text2: string) => {
+ if (!text1 && !text2) {
+ return true;
+ }
+
+ if (!text1 || !text2) {
+ return false;
+ }
+
+ return text1.toLocaleLowerCase() === text2.toLocaleLowerCase();
+ };
+
+ hideTabsFromNonTeamAdmin = (navModel: NavModel, isSignedInUserTeamAdmin: boolean) => {
+ if (!isSignedInUserTeamAdmin && navModel.main && navModel.main.children) {
+ navModel.main.children
+ .filter(navItem => !this.textsAreEqual(navItem.text, PageTypes.Members))
+ .map(navItem => {
+ navItem.hideFromTabs = true;
+ });
+ }
+
+ return navModel;
+ };
+
+ renderPage(isSignedInUserTeamAdmin: boolean) {
const { isSyncEnabled } = this.state;
+ const { members } = this.props;
const currentPage = this.getCurrentPage();
switch (currentPage) {
case PageTypes.Members:
- return
+
- {team && Object.keys(team).length !== 0 && this.renderPage()}
+ {team && Object.keys(team).length !== 0 && this.renderPage(isTeamAdmin)}
);
@@ -95,17 +127,24 @@ function mapStateToProps(state) {
const teamId = getRouteParamsId(state.location);
const pageName = getRouteParamsPage(state.location) || 'members';
const teamLoadingNav = getTeamLoadingNav(pageName);
+ const navModel = getNavModel(state.navIndex, `team-${pageName}-${teamId}`, teamLoadingNav);
+ const team = getTeam(state.team, teamId);
+ const members = getTeamMembers(state.team);
return {
- navModel: getNavModel(state.navIndex, `team-${pageName}-${teamId}`, teamLoadingNav),
+ navModel,
teamId: teamId,
pageName: pageName,
- team: getTeam(state.team, teamId),
+ team,
+ members,
+ editorsCanAdmin: config.editorsCanAdmin, // this makes the feature toggle mockable/controllable from tests,
+ signedInUser: contextSrv.user, // this makes the feature toggle mockable/controllable from tests,
};
}
const mapDispatchToProps = {
loadTeam,
+ loadTeamMembers,
};
export default hot(module)(
diff --git a/public/app/features/teams/__mocks__/teamMocks.ts b/public/app/features/teams/__mocks__/teamMocks.ts
index 339f227c081..abaa5ef555f 100644
--- a/public/app/features/teams/__mocks__/teamMocks.ts
+++ b/public/app/features/teams/__mocks__/teamMocks.ts
@@ -1,4 +1,4 @@
-import { Team, TeamGroup, TeamMember } from 'app/types';
+import { Team, TeamGroup, TeamMember, TeamPermissionLevel } from 'app/types';
export const getMultipleMockTeams = (numberOfTeams: number): Team[] => {
const teams: Team[] = [];
@@ -9,6 +9,7 @@ export const getMultipleMockTeams = (numberOfTeams: number): Team[] => {
avatarUrl: 'some/url/',
email: `test-${i}@test.com`,
memberCount: i,
+ permission: TeamPermissionLevel.Member,
});
}
@@ -22,10 +23,11 @@ export const getMockTeam = (): Team => {
avatarUrl: 'some/url/',
email: 'test@test.com',
memberCount: 1,
+ permission: TeamPermissionLevel.Member,
};
};
-export const getMockTeamMembers = (amount: number): TeamMember[] => {
+export const getMockTeamMembers = (amount: number, teamAdminId: number): TeamMember[] => {
const teamMembers: TeamMember[] = [];
for (let i = 1; i <= amount; i++) {
@@ -36,6 +38,7 @@ export const getMockTeamMembers = (amount: number): TeamMember[] => {
email: 'test@test.com',
login: `testUser-${i}`,
labels: ['label 1', 'label 2'],
+ permission: i === teamAdminId ? TeamPermissionLevel.Admin : TeamPermissionLevel.Member,
});
}
@@ -50,6 +53,7 @@ export const getMockTeamMember = (): TeamMember => {
email: 'test@test.com',
login: 'testUser',
labels: [],
+ permission: TeamPermissionLevel.Member,
};
};
diff --git a/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap
index 76d13e6a3d6..1017f0d9460 100644
--- a/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap
+++ b/public/app/features/teams/__snapshots__/TeamList.test.tsx.snap
@@ -133,6 +133,7 @@ exports[`Render should render teams table 1`] = `
className="text-right"
>
+
+
+`;
+
+exports[`Render when feature toggle editorsCanAdmin is turned on and signedin user is a viewer should disable the new team button 1`] = `
+
{threshold.color && (
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap b/packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
index b0dc025090b..2bc5ee56d4d 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
@@ -1,7 +1,450 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Render should render with base threshold 1`] = `
-
- this.onChangeThresholdColor(threshold, color)} />
+ this.onChangeThresholdColor(threshold, color)}
+ enableNamedColors={true}
+ />
)}
+
+
+
+ Thresholds
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/public/app/features/explore/Table.tsx b/public/app/features/explore/Table.tsx
index 4946a6a505d..bbf338df8f9 100644
--- a/public/app/features/explore/Table.tsx
+++ b/public/app/features/explore/Table.tsx
@@ -40,11 +40,15 @@ export default class Table extends PureComponent{value}
+
+ {value}
+
{count}
{percent}
+ {signedInUserIsTeamAdmin && (
+
+
@@ -103,7 +84,11 @@ export class TeamMembers extends PureComponent {
-
@@ -132,11 +117,25 @@ export class TeamMembers extends PureComponent
+
+
+
+
+
+ New team
+
+
+
+
+
+
+ | + | + Name + | ++ Email + | ++ Members + | ++ |
|---|---|---|---|---|
|
+
+ |
+ + + test-1 + + | ++ + test-1@test.com + + | ++ + 1 + + | +
+ |
+
+
+
+
+
+
+ New team
+
+
+
+
+
-
-
-`;
-
-exports[`Render should render team members when sync enabled 1`] = `
-| + | + Name + | ++ Email + | ++ Members + | ++ | |
|---|---|---|---|---|---|
|
+
+ |
+ + + test-1 + + | ++ + test-1@test.com + + | ++ + 1 + + | +
+ |
diff --git a/public/app/features/teams/__snapshots__/TeamMemberRow.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamMemberRow.test.tsx.snap
new file mode 100644
index 00000000000..ebaf7d5275c
--- /dev/null
+++ b/public/app/features/teams/__snapshots__/TeamMemberRow.test.tsx.snap
@@ -0,0 +1,250 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render team members when sync enabled 1`] = `
+|
|
+ |
+ + testUser + | ++ test@test.com + | +
+
+
+ Member
+
+
+ |
+
+ |
+
+ |
+
|
+ |
+ + testUser + | ++ test@test.com + | +
+
+
+
+ |
+
+ |
+|
|
+ |
+ + testUser + | ++ test@test.com + | +
+
+
+
+ |
+
+ |
+|
|
+ |
+ + testUser + | ++ test@test.com + | +
+
+
+ Member
+
+
+ |
+
+ |
++ Permission + | ++ Permission + | +- |
|
- |
- - testUser-1 - | -- test@test.com - | -
- |
- ||
|
- |
- - testUser-2 - | -- test@test.com - | -
- |
- ||
|
- |
- - testUser-3 - | -- test@test.com - | -
- |
- ||
|
- |
- - testUser-4 - | -- test@test.com - | -
- |
- ||
|
- |
- - testUser-5 - | -- test@test.com - | -
- |
-
-
-
-
+
+`;
+
+exports[`Render when feature toggle editorsCanAdmin is turned on should render settings page if user is team admin 1`] = `
+
+
+
+
+`;
diff --git a/public/app/features/teams/state/actions.ts b/public/app/features/teams/state/actions.ts
index d948dc1c5a3..e2582839233 100644
--- a/public/app/features/teams/state/actions.ts
+++ b/public/app/features/teams/state/actions.ts
@@ -160,3 +160,12 @@ export function deleteTeam(id: number): ThunkResult {
dispatch(loadTeams());
};
}
+
+export function updateTeamMember(member: TeamMember): ThunkResult {
+ return async dispatch => {
+ await getBackendSrv().put(`/api/teams/${member.teamId}/members/${member.userId}`, {
+ permission: member.permission,
+ });
+ dispatch(loadTeamMembers());
+ };
+}
diff --git a/public/app/features/teams/state/navModel.ts b/public/app/features/teams/state/navModel.ts
index 2fd5a68e680..aeb6b85f91e 100644
--- a/public/app/features/teams/state/navModel.ts
+++ b/public/app/features/teams/state/navModel.ts
@@ -1,4 +1,4 @@
-import { Team, NavModelItem, NavModel } from 'app/types';
+import { Team, NavModelItem, NavModel, TeamPermissionLevel } from 'app/types';
import config from 'app/core/config';
export function buildNavModel(team: Team): NavModelItem {
@@ -47,6 +47,7 @@ export function getTeamLoadingNav(pageName: string): NavModel {
name: 'Loading',
email: 'loading',
memberCount: 0,
+ permission: TeamPermissionLevel.Member,
});
let node: NavModelItem;
diff --git a/public/app/features/teams/state/selectors.test.ts b/public/app/features/teams/state/selectors.test.ts
index e88fbdfd4b1..5d9981e0403 100644
--- a/public/app/features/teams/state/selectors.test.ts
+++ b/public/app/features/teams/state/selectors.test.ts
@@ -1,6 +1,7 @@
-import { getTeam, getTeamMembers, getTeams } from './selectors';
+import { getTeam, getTeamMembers, getTeams, isSignedInUserTeamAdmin, Config } from './selectors';
import { getMockTeam, getMockTeamMembers, getMultipleMockTeams } from '../__mocks__/teamMocks';
-import { Team, TeamGroup, TeamsState, TeamState } from '../../../types';
+import { Team, TeamGroup, TeamsState, TeamState, OrgRole } from '../../../types';
+import { User } from 'app/core/services/context_srv';
describe('Teams selectors', () => {
describe('Get teams', () => {
@@ -40,7 +41,7 @@ describe('Team selectors', () => {
});
describe('Get members', () => {
- const mockTeamMembers = getMockTeamMembers(5);
+ const mockTeamMembers = getMockTeamMembers(5, 5);
it('should return team members', () => {
const mockState: TeamState = {
@@ -55,3 +56,94 @@ describe('Team selectors', () => {
});
});
});
+
+const signedInUserId = 1;
+
+const setup = (configOverrides?: Partial) => {
+ const defaultConfig: Config = {
+ editorsCanAdmin: false,
+ members: getMockTeamMembers(5, 5),
+ signedInUser: {
+ id: signedInUserId,
+ isGrafanaAdmin: false,
+ orgRole: OrgRole.Viewer,
+ } as User,
+ };
+
+ return { ...defaultConfig, ...configOverrides };
+};
+
+describe('isSignedInUserTeamAdmin', () => {
+ describe('when feature toggle editorsCanAdmin is turned off', () => {
+ it('should return true', () => {
+ const config = setup();
+
+ const result = isSignedInUserTeamAdmin(config);
+
+ expect(result).toBe(true);
+ });
+ });
+
+ describe('when feature toggle editorsCanAdmin is turned on', () => {
+ it('should return true if signed in user is grafanaAdmin', () => {
+ const config = setup({
+ editorsCanAdmin: true,
+ signedInUser: {
+ id: signedInUserId,
+ isGrafanaAdmin: true,
+ orgRole: OrgRole.Viewer,
+ } as User,
+ });
+
+ const result = isSignedInUserTeamAdmin(config);
+
+ expect(result).toBe(true);
+ });
+
+ it('should return true if signed in user is org admin', () => {
+ const config = setup({
+ editorsCanAdmin: true,
+ signedInUser: {
+ id: signedInUserId,
+ isGrafanaAdmin: false,
+ orgRole: OrgRole.Admin,
+ } as User,
+ });
+
+ const result = isSignedInUserTeamAdmin(config);
+
+ expect(result).toBe(true);
+ });
+
+ it('should return true if signed in user is team admin', () => {
+ const config = setup({
+ members: getMockTeamMembers(5, signedInUserId),
+ editorsCanAdmin: true,
+ signedInUser: {
+ id: signedInUserId,
+ isGrafanaAdmin: false,
+ orgRole: OrgRole.Viewer,
+ } as User,
+ });
+
+ const result = isSignedInUserTeamAdmin(config);
+
+ expect(result).toBe(true);
+ });
+
+ it('should return false if signed in user is not grafanaAdmin, org admin or team admin', () => {
+ const config = setup({
+ editorsCanAdmin: true,
+ signedInUser: {
+ id: signedInUserId,
+ isGrafanaAdmin: false,
+ orgRole: OrgRole.Viewer,
+ } as User,
+ });
+
+ const result = isSignedInUserTeamAdmin(config);
+
+ expect(result).toBe(false);
+ });
+ });
+});
diff --git a/public/app/features/teams/state/selectors.ts b/public/app/features/teams/state/selectors.ts
index 9201993bf0d..e770abfc093 100644
--- a/public/app/features/teams/state/selectors.ts
+++ b/public/app/features/teams/state/selectors.ts
@@ -1,4 +1,5 @@
-import { Team, TeamsState, TeamState } from 'app/types';
+import { Team, TeamsState, TeamState, TeamMember, OrgRole, TeamPermissionLevel } from 'app/types';
+import { User } from 'app/core/services/context_srv';
export const getSearchQuery = (state: TeamsState) => state.searchQuery;
export const getSearchMemberQuery = (state: TeamState) => state.searchMemberQuery;
@@ -28,3 +29,32 @@ export const getTeamMembers = (state: TeamState) => {
return regex.test(member.login) || regex.test(member.email);
});
};
+
+export interface Config {
+ members: TeamMember[];
+ editorsCanAdmin: boolean;
+ signedInUser: User;
+}
+
+export const isSignedInUserTeamAdmin = (config: Config): boolean => {
+ const { members, signedInUser, editorsCanAdmin } = config;
+ const userInMembers = members.find(m => m.userId === signedInUser.id);
+ const permission = userInMembers ? userInMembers.permission : TeamPermissionLevel.Member;
+
+ return isPermissionTeamAdmin({ permission, signedInUser, editorsCanAdmin });
+};
+
+export interface PermissionConfig {
+ permission: TeamPermissionLevel;
+ editorsCanAdmin: boolean;
+ signedInUser: User;
+}
+
+export const isPermissionTeamAdmin = (config: PermissionConfig): boolean => {
+ const { permission, signedInUser, editorsCanAdmin } = config;
+ const isAdmin = signedInUser.isGrafanaAdmin || signedInUser.orgRole === OrgRole.Admin;
+ const userIsTeamAdmin = permission === TeamPermissionLevel.Admin;
+ const isSignedInUserTeamAdmin = isAdmin || userIsTeamAdmin;
+
+ return isSignedInUserTeamAdmin || !editorsCanAdmin;
+};
diff --git a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
index 9f60c3440eb..2358b1ddab4 100644
--- a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
+++ b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx
@@ -2,55 +2,47 @@
import React, { PureComponent } from 'react';
// Services & Utils
-import { processSingleStatPanelData } from '@grafana/ui';
+import { DisplayValue, PanelProps, BarGauge } from '@grafana/ui';
import { config } from 'app/core/config';
-// Components
-import { BarGauge, VizRepeater } from '@grafana/ui';
-
// Types
import { BarGaugeOptions } from './types';
-import { PanelProps, SingleStatValueInfo } from '@grafana/ui/src/types';
+import { getSingleStatValues } from '../singlestat2/SingleStatPanel';
+import { ProcessedValuesRepeater } from '../singlestat2/ProcessedValuesRepeater';
-interface Props extends PanelProps {}
-
-export class BarGaugePanel extends PureComponent {
- renderBarGauge(value: SingleStatValueInfo, width, height) {
- const { replaceVariables, options } = this.props;
- const { valueOptions } = options;
-
- const prefix = replaceVariables(valueOptions.prefix);
- const suffix = replaceVariables(valueOptions.suffix);
+export class BarGaugePanel extends PureComponent> {
+ renderValue = (value: DisplayValue, width: number, height: number): JSX.Element => {
+ const { options } = this.props;
return (
- {({ vizHeight, vizWidth, value }) => this.renderBarGauge(value, vizWidth, vizHeight)}
-
- );
- }
}
diff --git a/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx b/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx
index 4232155228b..3404c8d8805 100644
--- a/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx
+++ b/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx
@@ -2,13 +2,13 @@
import React, { PureComponent } from 'react';
// Components
-import { SingleStatValueEditor } from 'app/plugins/panel/gauge/SingleStatValueEditor';
import { ThresholdsEditor, ValueMappingsEditor, PanelOptionsGrid, PanelOptionsGroup, FormField } from '@grafana/ui';
// Types
import { FormLabel, PanelEditorProps, Threshold, Select, ValueMapping } from '@grafana/ui';
-import { BarGaugeOptions, orientationOptions } from './types';
-import { SingleStatValueOptions } from '../gauge/types';
+import { BarGaugeOptions, orientationOptions, displayModes } from './types';
+import { SingleStatValueEditor } from '../singlestat2/SingleStatValueEditor';
+import { SingleStatValueOptions } from '../singlestat2/types';
export class BarGaugePanelEditor extends PureComponent> {
onThresholdsChanged = (thresholds: Threshold[]) =>
@@ -32,6 +32,7 @@ export class BarGaugePanelEditor extends PureComponent this.props.onOptionsChange({ ...this.props.options, minValue: target.value });
onMaxValueChange = ({ target }) => this.props.onOptionsChange({ ...this.props.options, maxValue: target.value });
onOrientationChange = ({ value }) => this.props.onOptionsChange({ ...this.props.options, orientation: value });
+ onDisplayModeChange = ({ value }) => this.props.onOptionsChange({ ...this.props.options, displayMode: value });
render() {
const { options } = this.props;
@@ -53,6 +54,16 @@ export class BarGaugePanelEditor extends PureComponent item.value === options.orientation)}
/>
+
-
-
-
-
-
-
-
-
- - Add team member -
-
-
-
-
-
-
diff --git a/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap
index 70f37cea4c5..4322d6991b4 100644
--- a/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap
+++ b/public/app/features/teams/__snapshots__/TeamPages.test.tsx.snap
@@ -30,6 +30,7 @@ exports[`Render should render member page if team not empty 1`] = `
isLoading={true}
>
| - | - Name - | -- Email - | -- | - |
|---|---|---|---|---|
|
- |
- - testUser-1 - | -- test@test.com - | -
- |
-
- |
-
|
- |
- - testUser-2 - | -- test@test.com - | -
- |
-
- |
-
-
|
- |
- - testUser-3 - | -- test@test.com - | -
- |
-
- |
-
-
|
- |
- - testUser-4 - | -- test@test.com - | -
- |
-
- |
-
-
|
- |
- - testUser-5 - | -- test@test.com - | -
- |
-
- |
-
+ member={
+ Object {
+ "avatarUrl": "some/url/",
+ "email": "test@test.com",
+ "labels": Array [
+ "label 1",
+ "label 2",
+ ],
+ "login": "testUser-5",
+ "permission": 4,
+ "teamId": 1,
+ "userId": 5,
+ }
+ }
+ signedInUserIsTeamAdmin={true}
+ syncEnabled={false}
+ />
+ Display Mode
+
+
+ );
+ };
+
+ getProcessedValues = (): DisplayValue[] => {
+ return getSingleStatValues(this.props);
+ };
+
+ render() {
+ const { height, width, options, data, renderCounter } = this.props;
+ return (
+ {value.text}
+ No Table Data...
;
}
return (