Merge branch 'master' into folder-to-redux

.circleci/config.yml

@@ -81,7 +81,7 @@ jobs:
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
-      - run: 'go get -u gopkg.in/alecthomas/gometalinter.v2'
+      - run: 'go get -u github.com/alecthomas/gometalinter'
       - run: 'go get -u github.com/tsenart/deadcode'
       - run: 'go get -u github.com/gordonklaus/ineffassign'
       - run: 'go get -u github.com/opennota/check/cmd/structcheck'
@@ -89,7 +89,7 @@ jobs:
       - run: 'go get -u github.com/opennota/check/cmd/varcheck'
       - run:
           name: run linters
-          command: 'gometalinter.v2 --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...'
+          command: 'gometalinter --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...'
       - run:
           name: run go vet
           command: 'go vet ./pkg/...'

package.json

@@ -11,12 +11,12 @@
   },
   "devDependencies": {
     "@types/d3": "^4.10.1",
-    "@types/enzyme": "^2.8.9",
+    "@types/enzyme": "^3.1.13",
     "@types/jest": "^21.1.4",
     "@types/node": "^8.0.31",
-    "@types/react": "^16.0.25",
+    "@types/react": "^16.4.14",
     "@types/react-custom-scrollbars": "^4.0.5",
-    "@types/react-dom": "^16.0.3",
+    "@types/react-dom": "^16.0.7",
     "angular-mocks": "1.6.6",
     "autoprefixer": "^6.4.0",
     "axios": "^0.17.1",
@@ -26,9 +26,9 @@
     "babel-preset-es2015": "^6.24.1",
     "clean-webpack-plugin": "^0.1.19",
     "css-loader": "^0.28.7",
-    "enzyme": "^3.1.0",
-    "enzyme-adapter-react-16": "^1.0.1",
-    "enzyme-to-json": "^3.3.0",
+    "enzyme": "^3.6.0",
+    "enzyme-adapter-react-16": "^1.5.0",
+    "enzyme-to-json": "^3.3.4",
     "es6-promise": "^3.0.2",
     "es6-shim": "^0.35.3",
     "expect.js": "~0.2.0",
@@ -72,8 +72,8 @@
     "postcss-loader": "^2.0.6",
     "postcss-reporter": "^5.0.0",
     "prettier": "1.9.2",
-    "react-hot-loader": "^4.2.0",
-    "react-test-renderer": "^16.0.0",
+    "react-hot-loader": "^4.3.6",
+    "react-test-renderer": "^16.5.0",
     "sass-lint": "^1.10.2",
     "sass-loader": "^7.0.1",
     "sinon": "1.17.6",
@@ -153,11 +153,11 @@
     "mousetrap": "^1.6.0",
     "mousetrap-global-bind": "^1.1.0",
     "prismjs": "^1.6.0",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.2",
     "rc-cascader": "^0.14.0",
-    "react": "^16.2.0",
+    "react": "^16.5.0",
     "react-custom-scrollbars": "^4.2.1",
-    "react-dom": "^16.2.0",
+    "react-dom": "^16.5.0",
     "react-grid-layout": "0.16.6",
     "react-highlight-words": "^0.10.0",
     "react-popper": "^0.7.5",

pkg/api/index.go

@@ -91,6 +91,9 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
 	if themeURLParam == "light" {
 		data.User.LightTheme = true
 		data.Theme = "light"
+	} else if themeURLParam == "dark" {
+		data.User.LightTheme = false
+		data.Theme = "dark"
 	}
 
 	if hasEditPermissionInFoldersQuery.Result {

public/app/core/components/Picker/__snapshots__/TeamPicker.test.tsx.snap

@@ -15,7 +15,7 @@ exports[`TeamPicker renders correctly 1`] = `
       onTouchMove={[Function]}
       onTouchStart={[Function]}
     >
-      <span
+      <div
         className="Select-multi-value-wrapper"
         id="react-select-2--value"
       >
@@ -66,7 +66,7 @@ exports[`TeamPicker renders correctly 1`] = `
             
           </div>
         </div>
-      </span>
+      </div>
       <span
         aria-hidden="true"
         className="Select-loading-zone"

public/app/core/components/Picker/__snapshots__/UserPicker.test.tsx.snap

@@ -15,7 +15,7 @@ exports[`UserPicker renders correctly 1`] = `
       onTouchMove={[Function]}
       onTouchStart={[Function]}
     >
-      <span
+      <div
         className="Select-multi-value-wrapper"
         id="react-select-2--value"
       >
@@ -66,7 +66,7 @@ exports[`UserPicker renders correctly 1`] = `
             
           </div>
         </div>
-      </span>
+      </div>
       <span
         aria-hidden="true"
         className="Select-loading-zone"

public/app/core/components/sidemenu/__snapshots__/SideMenu.test.tsx.snap

@@ -6,12 +6,29 @@ Array [
     className="sidemenu__logo"
     key="logo"
     onClick={[Function]}
-  />,
+  >
+    <img
+      alt="graphana_logo"
+      src="public/img/grafana_icon.svg"
+    />
+  </div>,
   <div
     className="sidemenu__logo_small_breakpoint"
     key="hamburger"
     onClick={[Function]}
-  />,
+  >
+    <i
+      className="fa fa-bars"
+    />
+    <span
+      className="sidemenu__close"
+    >
+      <i
+        className="fa fa-times"
+      />
+       Close
+    </span>
+  </div>,
   <TopSection
     key="topsection"
   />,

public/app/features/teams/TeamMembers.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import { TeamMembers, Props } from './TeamMembers';
+import { TeamMembers, Props, State } from './TeamMembers';
 import { TeamMember } from '../../types';
 import { getMockTeamMember, getMockTeamMembers } from './__mocks__/teamMocks';
 
@@ -64,8 +64,9 @@ describe('Functions', () => {
 
   describe('on add user to team', () => {
     const { wrapper, instance } = setup();
+    const state = wrapper.state() as State;
 
-    wrapper.state().newTeamMember = {
+    state.newTeamMember = {
       id: 1,
       label: '',
       avatarUrl: '',

public/app/features/teams/TeamMembers.tsx

@@ -16,7 +16,7 @@ export interface Props {
   setSearchMemberQuery: typeof setSearchMemberQuery;
 }
 
-interface State {
+export interface State {
   isAdding: boolean;
   newTeamMember?: User;
 }

public/app/plugins/datasource/prometheus/datasource.ts

@@ -39,7 +39,7 @@ export function addLabelToQuery(query: string, key: string, value: string): stri
 
   // Add empty selector to bare metric name
   let previousWord;
-  query = query.replace(/(\w+)\b(?![\(\]{=",])/g, (match, word, offset) => {
+  query = query.replace(/([A-Za-z]\w*)\b(?![\(\]{=",])/g, (match, word, offset) => {
     // Check if inside a selector
     const nextSelectorStart = query.slice(offset).indexOf('{');
     const nextSelectorEnd = query.slice(offset).indexOf('}');

public/app/plugins/datasource/prometheus/specs/datasource.test.ts

@@ -376,6 +376,7 @@ describe('PrometheusDatasource', () => {
       'foo{bar="baz",instance="my-host.com:9100"}'
     );
     expect(addLabelToQuery('rate(metric[1m])', 'foo', 'bar')).toBe('rate(metric{foo="bar"}[1m])');
+    expect(addLabelToQuery('metric > 0.001', 'foo', 'bar')).toBe('metric{foo="bar"} > 0.001');
   });
 });
 

scripts/grunt/options/exec.js

@@ -7,7 +7,7 @@ module.exports = function(config, grunt) {
   }
 
   return {
-    tslint: 'node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json',
+    tslint: 'node ./node_modules/tslint/lib/tslintCli.js -c tslint.json --project ./tsconfig.json',
     jest: 'node ./node_modules/jest-cli/bin/jest.js ' + coverage,
     webpack: 'node ./node_modules/webpack/bin/webpack.js --config scripts/webpack/webpack.prod.js',
   };