+ + diff --git a/docs/sources/auth/github.md b/docs/sources/auth/github.md new file mode 100644 index 00000000000..263b3cc5d4d --- /dev/null +++ b/docs/sources/auth/github.md @@ -0,0 +1,98 @@ ++++ +title = "Google OAuth2 Authentication" +description = "Grafana OAuthentication Guide " +keywords = ["grafana", "configuration", "documentation", "oauth"] +type = "docs" +[menu.docs] +name = "GitHub" +identifier = "github_oauth2" +parent = "authentication" +weight = 4 ++++ + +# GitHub OAuth2 Authentication + +To enable the GitHub OAuth2 you must register your application with GitHub. GitHub will generate a client ID and secret key for you to use. + +## Configure GitHub OAuth application + +You need to create a GitHub OAuth application (you find this under the GitHub +settings page). When you create the application you will need to specify +a callback URL. Specify this as callback: + +```bash +http://
- -## [auth.anonymous] - -### enabled - -Set to `true` to enable anonymous access. Defaults to `false` - -### org_name - -Set the organization name that should be used for anonymous users. If -you change your organization name in the Grafana UI this setting needs -to be updated to match the new name. - -### org_role - -Specify role for anonymous users. Defaults to `Viewer`, other valid -options are `Editor` and `Admin`. - -## [auth.github] - -You need to create a GitHub OAuth application (you find this under the GitHub -settings page). When you create the application you will need to specify -a callback URL. Specify this as callback: - -```bash -http://
- -## [auth.gitlab] - -> Only available in Grafana v5.3+. - -You need to [create a GitLab OAuth -application](https://docs.gitlab.com/ce/integration/oauth_provider.html). -Choose a descriptive *Name*, and use the following *Redirect URI*: - -``` -https://grafana.example.com/login/gitlab -``` - -where `https://grafana.example.com` is the URL you use to connect to Grafana. -Adjust it as needed if you don't use HTTPS or if you use a different port; for -instance, if you access Grafana at `http://203.0.113.31:3000`, you should use - -``` -http://203.0.113.31:3000/login/gitlab -``` - -Finally, select *api* as the *Scope* and submit the form. Note that if you're -not going to use GitLab groups for authorization (i.e. not setting -`allowed_groups`, see below), you can select *read_user* instead of *api* as -the *Scope*, thus giving a more restricted access to your GitLab API. - -You'll get an *Application Id* and a *Secret* in return; we'll call them -`GITLAB_APPLICATION_ID` and `GITLAB_SECRET` respectively for the rest of this -section. - -Add the following to your Grafana configuration file to enable GitLab -authentication: - -```ini -[auth.gitlab] -enabled = false -allow_sign_up = false -client_id = GITLAB_APPLICATION_ID -client_secret = GITLAB_SECRET -scopes = api -auth_url = https://gitlab.com/oauth/authorize -token_url = https://gitlab.com/oauth/token -api_url = https://gitlab.com/api/v4 -allowed_groups = -``` - -Restart the Grafana backend for your changes to take effect. - -If you use your own instance of GitLab instead of `gitlab.com`, adjust -`auth_url`, `token_url` and `api_url` accordingly by replacing the `gitlab.com` -hostname with your own. - -With `allow_sign_up` set to `false`, only existing users will be able to login -using their GitLab account, but with `allow_sign_up` set to `true`, *any* user -who can authenticate on GitLab will be able to login on your Grafana instance; -if you use the public `gitlab.com`, it means anyone in the world would be able -to login on your Grafana instance. - -You can can however limit access to only members of a given group or list of -groups by setting the `allowed_groups` option. - -### allowed_groups - -To limit access to authenticated users that are members of one or more [GitLab -groups](https://docs.gitlab.com/ce/user/group/index.html), set `allowed_groups` -to a comma- or space-separated list of groups. For instance, if you want to -only give access to members of the `example` group, set - - -```ini -allowed_groups = example -``` - -If you want to also give access to members of the subgroup `bar`, which is in -the group `foo`, set - -```ini -allowed_groups = example, foo/bar -``` - -Note that in GitLab, the group or subgroup name doesn't always match its -display name, especially if the display name contains spaces or special -characters. Make sure you always use the group or subgroup name as it appears -in the URL of the group or subgroup. - -Here's a complete example with `alloed_sign_up` enabled, and access limited to -the `example` and `foo/bar` groups: - -```ini -[auth.gitlab] -enabled = false -allow_sign_up = true -client_id = GITLAB_APPLICATION_ID -client_secret = GITLAB_SECRET -scopes = api -auth_url = https://gitlab.com/oauth/authorize -token_url = https://gitlab.com/oauth/token -api_url = https://gitlab.com/api/v4 -allowed_groups = example, foo/bar -``` - -
- -## [auth.google] - -First, you need to create a Google OAuth Client: - -1. Go to https://console.developers.google.com/apis/credentials - -2. Click the 'Create Credentials' button, then click 'OAuth Client ID' in the -menu that drops down - -3. Enter the following: - - - Application Type: Web Application - - Name: Grafana - - Authorized Javascript Origins: https://grafana.mycompany.com - - Authorized Redirect URLs: https://grafana.mycompany.com/login/google - - Replace https://grafana.mycompany.com with the URL of your Grafana instance. - -4. Click Create - -5. Copy the Client ID and Client Secret from the 'OAuth Client' modal - -Specify the Client ID and Secret in the Grafana configuration file. For example: - -```bash -[auth.google] -enabled = true -client_id = CLIENT_ID -client_secret = CLIENT_SECRET -scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email -auth_url = https://accounts.google.com/o/oauth2/auth -token_url = https://accounts.google.com/o/oauth2/token -allowed_domains = mycompany.com mycompany.org -allow_sign_up = true -``` - -Restart the Grafana back-end. You should now see a Google login button -on the login page. You can now login or sign up with your Google -accounts. The `allowed_domains` option is optional, and domains were separated by space. - -You may allow users to sign-up via Google authentication by setting the -`allow_sign_up` option to `true`. When this option is set to `true`, any -user successfully authenticating via Google authentication will be -automatically signed up. - -## [auth.generic_oauth] - -This option could be used if have your own oauth service. - -This callback URL must match the full HTTP address that you use in your -browser to access Grafana, but with the prefix path of `/login/generic_oauth`. - -```bash -[auth.generic_oauth] -enabled = true -client_id = YOUR_APP_CLIENT_ID -client_secret = YOUR_APP_CLIENT_SECRET -scopes = -auth_url = -token_url = -api_url = -allowed_domains = mycompany.com mycompany.org -allow_sign_up = true -``` - -Set api_url to the resource that returns [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo) compatible information. - -### Set up oauth2 with Okta - -First set up Grafana as an OpenId client "webapplication" in Okta. Then set the Base URIs to `https://
- -## [auth.basic] -### enabled -When enabled is `true` (default) the http api will accept basic authentication. - -
- -## [auth.ldap] -### enabled -Set to `true` to enable LDAP integration (default: `false`) - -### config_file -Path to the LDAP specific configuration file (default: `/etc/grafana/ldap.toml`) - -### allow_sign_up - -Allow sign up should almost always be true (default) to allow new Grafana users to be created (if ldap authentication is ok). If set to -false only pre-existing Grafana users will be able to login (if ldap authentication is ok). - -> For details on LDAP Configuration, go to the [LDAP Integration]({{< relref "ldap.md" >}}) page. - -
- -## [auth.proxy] - -This feature allows you to handle authentication in a http reverse proxy. - -### enabled - -Defaults to `false` - -### header_name - -Defaults to X-WEBAUTH-USER - -#### header_property - -Defaults to username but can also be set to email - -### auto_sign_up - -Set to `true` to enable auto sign up of users who do not exist in Grafana DB. Defaults to `true`. - -### whitelist - -Limit where auth proxy requests come from by configuring a list of IP addresses. This can be used to prevent users spoofing the X-WEBAUTH-USER header. - -### headers - -Used to define additional headers for `Name`, `Email` and/or `Login`, for example if the user's name is sent in the X-WEBAUTH-NAME header and their email address in the X-WEBAUTH-EMAIL header, set `headers = Name:X-WEBAUTH-NAME Email:X-WEBAUTH-EMAIL`. - -
+Grafana provides many ways to authenticate users. The docs for authentication has been split in to many different pages +below. + +- [Authentication Overview]({{< relref "auth/overview.md" >}}) (anonymous access options, hide login and more) +- [Google OAuth]({{< relref "auth/google.md" >}}) (auth.google) +- [GitHub OAuth]({{< relref "auth/github.md" >}}) (auth.github) +- [Gitlab OAuth]({{< relref "auth/gitlab.md" >}}) (auth.gitlab) +- [Generic OAuth]({{< relref "auth/generic-oauth.md" >}}) (auth.generic_oauth, okta2, auth0, bitbucket, azure) +- [Basic Authentication]({{< relref "auth/overview.md" >}}) (auth.basic) +- [LDAP Authentication]({{< relref "auth/ldap.md" >}}) (auth.ldap) +- [Auth Proxy]({{< relref "auth/auth-proxy.md" >}}) (auth.proxy) ## [session] @@ -1009,3 +556,13 @@ Defaults to true. Set to false to disable alerting engine and hide Alerting from ### execute_alerts Makes it possible to turn off alert rule execution. + +### error_or_timeout +> Available in 5.3 and above + +Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state) + +### nodata_or_nullvalues +> Available in 5.3 and above + +Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok) diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index c71dc105ad4..ba0d6199ba4 100644 --- a/docs/sources/installation/docker.md +++ b/docs/sources/installation/docker.md @@ -20,7 +20,7 @@ $ docker run -d -p 3000:3000 grafana/grafana ## Configuration -All options defined in conf/grafana.ini can be overridden using environment +All options defined in `conf/grafana.ini` can be overridden using environment variables by using the syntax `GF_
+
+ );
+ }
+
+ renderEmptyList() {
+ return (
+
+
+
+
+
+
+
+
+
+
+ New team
+
+
+
+
+
+
+ | + | Name | +Members | ++ |
|---|
+
+ );
+ }
+
render() {
const { nav, teams } = this.props;
+ let view;
+
+ if (teams.filteredTeams.length > 0) {
+ view = this.renderTeamList(teams);
+ } else {
+ view = this.renderEmptyList();
+ }
+
return (
-
+ {view}
-
-
-
-
-
-
-
-
-
- New team
-
-
-
-
-
-
- | - | Name | -Members | -- |
|---|
Scrollable content
+
+
+`;
diff --git a/public/app/core/components/Login/LoginBackground.tsx b/public/app/core/components/Login/LoginBackground.tsx
deleted file mode 100644
index 83e228ab6e0..00000000000
--- a/public/app/core/components/Login/LoginBackground.tsx
+++ /dev/null
@@ -1,1240 +0,0 @@
-import React, { Component } from 'react';
-
-const xCount = 50;
-const yCount = 50;
-
-function Cell({ x, y, flipIndex }) {
- const index = (y * xCount) + x;
- const bgColor1 = getColor(x, y);
- return (
-
- );
-}
-
-function getRandomInt(min, max) {
- min = Math.ceil(min);
- max = Math.floor(max);
- return Math.floor(Math.random() * (max - min)) + min; //The maximum is exclusive and the minimum is inclusive
-}
-
-export default class LoginBackground extends Component
+
+ + Scrollable content +
+
+
+
+
+
+
+
- {Array.from(Array(yCount)).map((el, y) => {
- return (
-
- );
- }
-}
-
-function getColor(x, y) {
- const colors = [
- '#14161A',
- '#111920',
- '#121E27',
- '#13212B',
- '#122029',
- '#101C24',
- '#0F1B23',
- '#0F1B22',
- '#111C24',
- '#101A22',
- '#101A21',
- '#111D25',
- '#101E27',
- '#101D26',
- '#101B23',
- '#11191E',
- '#131519',
- '#131518',
- '#101B21',
- '#121F29',
- '#10232D',
- '#11212B',
- '#0E1C25',
- '#0E1C24',
- '#111F29',
- '#11222B',
- '#101E28',
- '#102028',
- '#111F2A',
- '#11202A',
- '#11191F',
- '#121417',
- '#12191D',
- '#101D25',
- '#11212C',
- '#10242F',
- '#0F212B',
- '#0F1E27',
- '#0F1D26',
- '#0F1F29',
- '#0F2029',
- '#11232E',
- '#10212B',
- '#10222C',
- '#0F202A',
- '#112530',
- '#10252F',
- '#0F242E',
- '#10222D',
- '#10202A',
- '#0F1C24',
- '#0F1E28',
- '#0F212A',
- '#0F222B',
- '#14171A',
- '#0F1A20',
- '#0F1C25',
- '#10232E',
- '#0E202A',
- '#0E1E27',
- '#0E1D26',
- '#0F202B',
- '#11232F',
- '#102632',
- '#102530',
- '#122430',
- '#0F1B21',
- '#0F212C',
- '#0E1F29',
- '#112531',
- '#0F2734',
- '#0F2835',
- '#0D1B23',
- '#0F1A21',
- '#0F1A23',
- '#0F1D27',
- '#0F222D',
- '#102430',
- '#102531',
- '#10222E',
- '#0F232D',
- '#0E2633',
- '#0E2734',
- '#0F2834',
- '#0E2835',
- '#0F2633',
- '#0F2532',
- '#0E1A22',
- '#0D1C24',
- '#0F2735',
- '#0F2937',
- '#102A38',
- '#112938',
- '#102A39',
- '#0F2A38',
- '#102836',
- '#0E1B23',
- '#0F2938',
- '#102A3A',
- '#102D3D',
- '#0F3040',
- '#102D3E',
- '#0F2E3E',
- '#112C3B',
- '#102B3B',
- '#102B3A',
- '#102D3C',
- '#0F2A39',
- '#0F2634',
- '#0E2029',
- '#0E1A21',
- '#0F2B39',
- '#0F2D3D',
- '#0F2F40',
- '#0E3142',
- '#113445',
- '#122431',
- '#102E3E',
- '#0F3345',
- '#0E2F40',
- '#0F3143',
- '#102C3C',
- '#0F2B3A',
- '#0F1F28',
- '#0F3344',
- '#113548',
- '#113C51',
- '#144258',
- '#103A4E',
- '#103A4F',
- '#103547',
- '#10364A',
- '#103649',
- '#0F3448',
- '#102C3A',
- '#0F2836',
- '#103447',
- '#0F384C',
- '#123F55',
- '#15445A',
- '#133F55',
- '#103B50',
- '#113E54',
- '#103446',
- '#0F3A4F',
- '#0F3548',
- '#0D3142',
- '#102C3B',
- '#0E2937',
- '#103D52',
- '#0E3544',
- '#184C65',
- '#154760',
- '#14435B',
- '#15465F',
- '#124159',
- '#0F3D53',
- '#103C51',
- '#0F3447',
- '#0E3243',
- '#113143',
- '#113D53',
- '#184B64',
- '#184D67',
- '#184C66',
- '#174A63',
- '#15455C',
- '#13425A',
- '#14445A',
- '#10384C',
- '#0E3446',
- '#10181E',
- '#103243',
- '#0F384D',
- '#14455C',
- '#164761',
- '#164C66',
- '#1D627D',
- '#12425A',
- '#164A63',
- '#14465D',
- '#13435A',
- '#0A2B38',
- '#0F3446',
- '#0D2F40',
- '#0D2F3F',
- '#0F2531',
- '#102937',
- '#10384B',
- '#0F3649',
- '#184E68',
- '#1A5472',
- '#184D68',
- '#154A63',
- '#19506B',
- '#19536F',
- '#1A4F69',
- '#144760',
- '#114058',
- '#0E3A4F',
- '#0E3547',
- '#0C3042',
- '#0E1B24',
- '#11222C',
- '#154C65',
- '#1A5776',
- '#1B5675',
- '#113847',
- '#1A5371',
- '#194E68',
- '#0E2D3D',
- '#112D3B',
- '#113D52',
- '#18516D',
- '#1A5979',
- '#1B5878',
- '#19526E',
- '#1A526E',
- '#13435B',
- '#0F3E55',
- '#0B374C',
- '#0E3448',
- '#0D2E3F',
- '#0F2B3B',
- '#112E3E',
- '#113B50',
- '#15465D',
- '#1A526F',
- '#1E5E81',
- '#1D5B7B',
- '#1A5777',
- '#154456',
- '#113949',
- '#0D394E',
- '#0F3549',
- '#0F2C3B',
- '#0E2733',
- '#112E3D',
- '#123D52',
- '#10394C',
- '#1B5674',
- '#1A5370',
- '#144861',
- '#104058',
- '#104159',
- '#0E384C',
- '#0D2D3D',
- '#0E2533',
- '#112C3A',
- '#1B5979',
- '#1B5C7D',
- '#1A5675',
- '#104057',
- '#0F3C51',
- '#11425A',
- '#0E394D',
- '#0C3243',
- '#0E2735',
- '#112F3E',
- '#134158',
- '#1D5E7F',
- '#1D6083',
- '#1C5877',
- '#1A5573',
- '#184D66',
- '#164962',
- '#0F3D54',
- '#0E3D53',
- '#0E3447',
- '#0F2A3A',
- '#0F2936',
- '#101F28',
- '#103040',
- '#124056',
- '#164E69',
- '#144B64',
- '#164D66',
- '#0F3E54',
- '#0E3B51',
- '#0D3346',
- '#0E1F27',
- '#124158',
- '#164961',
- '#0E3C52',
- '#19506C',
- '#0F2C3C',
- '#0E3244',
- '#0E2A39',
- '#0E2938',
- '#113040',
- '#134057',
- '#1A5471',
- '#154B63',
- '#1C597A',
- '#164760',
- '#10374B',
- '#0E374C',
- '#0E384D',
- '#11242F',
- '#10394D',
- '#18526E',
- '#154B65',
- '#103F55',
- '#0D3345',
- '#102532',
- '#102029',
- '#113142',
- '#1B5973',
- '#1A516B',
- '#1C5979',
- '#1C5A7A',
- '#184A65',
- '#164C65',
- '#0D3041',
- '#123142',
- '#123E54',
- '#1B5877',
- '#1A5574',
- '#1C5878',
- '#13435C',
- '#0F374B',
- '#0C3143',
- '#112F40',
- '#123C51',
- '#174E68',
- '#1D5C7D',
- '#14465F',
- '#0F3F56',
- '#0B3041',
- '#123243',
- '#15435B',
- '#19516D',
- '#1D5D7E',
- '#1C5C7D',
- '#184F69',
- '#11374B',
- '#103E54',
- '#0E3143',
- '#0F2D3C',
- '#11242E',
- '#133445',
- '#1A5674',
- '#1D6184',
- '#1F658B',
- '#0D3A50',
- '#0C374B',
- '#154862',
- '#164B64',
- '#154961',
- '#0D384D',
- '#102631',
- '#113242',
- '#134259',
- '#185270',
- '#1D6386',
- '#1E678C',
- '#1C5978',
- '#0D3549',
- '#0F2632',
- '#184961',
- '#1D5E80',
- '#1E6488',
- '#1F678D',
- '#1E5B7C',
- '#164862',
- '#19526D',
- '#113C52',
- '#15455E',
- '#0F2F3F',
- '#144259',
- '#194D67',
- '#1D6991',
- '#195777',
- '#19516C',
- '#103F56',
- '#144660',
- '#0D2E3E',
- '#10212A',
- '#113141',
- '#16455C',
- '#1D5B7C',
- '#1F6589',
- '#1E668C',
- '#1E5F81',
- '#0F3B50',
- '#0D3244',
- '#164A64',
- '#184E69',
- '#0E364A',
- '#0E2E3E',
- '#10222B',
- '#19475E',
- '#1B5A7B',
- '#1E5D7F',
- '#1E678D',
- '#1E6184',
- '#19506A',
- '#1B5370',
- '#1B5573',
- '#0E3041',
- '#122E3E',
- '#16455B',
- '#195370',
- '#1D6489',
- '#1D6B93',
- '#164A65',
- '#154A64',
- '#1A5572',
- '#1D6082',
- '#1F6286',
- '#1D6C94',
- '#1E709A',
- '#174A65',
- '#1B526F',
- '#1E6589',
- '#1D6384',
- '#0D3143',
- '#0E2F3F',
- '#174760',
- '#1F6487',
- '#1D668C',
- '#0D2F41',
- '#103B4F',
- '#1C5C7E',
- '#1F688F',
- '#1C5B7C',
- '#164D68',
- '#1D6285',
- '#0D364A',
- '#1D5A7A',
- '#1E6990',
- '#1D6488',
- '#18516B',
- '#1A506B',
- '#0E3B50',
- '#0E3548',
- '#124259',
- '#13455C',
- '#14485F',
- '#1E5C7D',
- '#122D3C',
- '#1E6E98',
- '#1E6A91',
- '#1E6286',
- '#1E6C95',
- '#1D6990',
- '#101F29',
- '#174A62',
- '#10394E',
- '#1D6D96',
- '#1E688E',
- '#1D6E97',
- '#1E6C94',
- '#0E394E',
- '#112B39',
- '#195270',
- '#1E668B',
- '#1E6386',
- '#1D6385',
- '#0C3142',
- '#1E6083',
- '#1E729C',
- '#1F709A',
- '#1E6F98',
- '#1D5F81',
- '#1F688D',
- '#1C6488',
- '#1D6588',
- '#1C6A93',
- '#1E658B',
- '#1F6C95',
- '#0D3C52',
- '#1C6385',
- '#1E5F82',
- '#0E3D54',
- '#0F3244',
- '#18485F',
- '#1E6991',
- '#1C5B7B',
- '#1F6082',
- '#0F3346',
- '#18536F',
- '#114056',
- '#1D6B92',
- '#1B5776',
- '#0F3C52',
- '#1E6890',
- '#1F688E',
- '#0C394E',
- '#0F1D25',
- '#1F6386',
- '#1E688D',
- '#1F6488',
- '#20668C',
- '#1D5978',
- '#0F3D52',
- '#0F1E26',
- '#13465F',
- '#0D374C',
- '#1B5C7C',
- '#0E1A23',
- '#0F374A',
- '#1B5574',
- '#0F394C',
- '#0E2A38',
- '#102A37',
- '#18506B',
- '#1E5A7A',
- '#0F3245',
- '#0E2E3F',
- '#1E678E',
- '#1C5D7E',
- '#1A5A7A',
- '#0E2837',
- '#102733',
- '#0F3B51',
- '#15475E',
- '#1E6B93',
- '#1E648A',
- '#194961',
- '#0F3A4E',
- '#0E1D25',
- '#194F69',
- '#103345',
- '#0F394D',
- '#102B39',
- '#103E55',
- '#1B5572',
- '#164861',
- '#174861',
- '#113B4F',
- '#102936',
- '#0F3041',
- '#174961',
- '#113E53',
- '#134056',
- '#124057',
- '#194B63',
- '#0E364B',
- '#15445B',
- '#16475E',
- '#102F3F',
- '#16485F',
- '#0F2E3D',
- '#101920',
- '#12222C',
- '#122C3B',
- '#144157',
- '#123B50',
- '#16465D',
- '#184960',
- '#112B3A',
- '#12232F',
- '#132430',
- '#113344',
- '#11394C',
- '#113649',
- '#11364A',
- '#133F56',
- '#121D25',
- '#112733',
- '#112A38',
- '#0F1F2A',
- '#113447',
- '#113A4E',
- '#0F222C',
- '#13222B',
- '#112836',
- '#102F3E',
- '#113243',
- '#123445',
- '#12374B',
- '#121E26',
- '#122531',
- '#11303F',
- '#0D1D25',
- '#102835',
- '#112834',
- '#101C23',
- '#111C23',
- '#12212B',
- '#11222D',
- '#0E1B22',
- '#0E1D27',
- '#121C22',
- '#12202A',
- '#101A20',
- '#13191E',
- '#111E28',
- '#11212D',
- '#0F1B24',
- '#0F1C23',
- '#13181D',
- '#15171A',
- '#121D23',
- '#121F27',
- '#111E27',
- '#101B22',
- '#121F28',
- '#111E26',
- '#101D24',
- '#111C22',
- '#12161E',
- '#101925',
- '#121E2D',
- '#112033',
- '#111E2F',
- '#0F1B29',
- '#0F1A28',
- '#101B2A',
- '#0E1A27',
- '#101C2B',
- '#111D2D',
- '#111D2B',
- '#0F1B28',
- '#101923',
- '#13161D',
- '#13161C',
- '#0F1A26',
- '#101E2F',
- '#112235',
- '#102031',
- '#0F1B2A',
- '#112031',
- '#102032',
- '#101D2E',
- '#121F2F',
- '#112133',
- '#101E30',
- '#101F30',
- '#102336',
- '#101B2C',
- '#0F1C2B',
- '#111E2E',
- '#0F2134',
- '#102236',
- '#0F2133',
- '#101F31',
- '#0F2438',
- '#102337',
- '#102235',
- '#102133',
- '#11171E',
- '#101F2F',
- '#102030',
- '#102234',
- '#102132',
- '#12181F',
- '#0F1A25',
- '#0F2135',
- '#0F1F30',
- '#0F1C2D',
- '#101D2C',
- '#0F2033',
- '#0E2338',
- '#0F2237',
- '#0F2236',
- '#0B243B',
- '#0D2338',
- '#0E1A26',
- '#0F1D2E',
- '#0F2032',
- '#0D2339',
- '#0B253F',
- '#0A253F',
- '#0A253E',
- '#0C2439',
- '#0E1925',
- '#0E2135',
- '#0F2235',
- '#0A243A',
- '#08253E',
- '#09253E',
- '#0A263F',
- '#0A243C',
- '#0B233B',
- '#0E1A28',
- '#0D1A26',
- '#09253F',
- '#0A2743',
- '#0B2844',
- '#0B2641',
- '#0A2744',
- '#0A2844',
- '#0B2743',
- '#092745',
- '#0F2337',
- '#101D2D',
- '#092743',
- '#092846',
- '#0E2B4C',
- '#102E4F',
- '#0E2C4D',
- '#0B2A49',
- '#082947',
- '#0D2B4B',
- '#0C2A4A',
- '#092946',
- '#082845',
- '#0C2B4B',
- '#0F2D4E',
- '#103051',
- '#133257',
- '#0E2D4E',
- '#143156',
- '#112F51',
- '#0B243A',
- '#082744',
- '#092844',
- '#123054',
- '#143359',
- '#173A64',
- '#183F6E',
- '#173F6D',
- '#153961',
- '#163962',
- '#133358',
- '#15345B',
- '#14345A',
- '#102F50',
- '#0A2948',
- '#082844',
- '#092641',
- '#16375F',
- '#193C69',
- '#174170',
- '#173E6B',
- '#163A63',
- '#173D69',
- '#183D6A',
- '#15365E',
- '#112E50',
- '#0A2A49',
- '#082743',
- '#0E1927',
- '#173C68',
- '#13487E',
- '#164476',
- '#174375',
- '#193F6F',
- '#173B66',
- '#163B65',
- '#082A48',
- '#0A2641',
- '#09243C',
- '#174171',
- '#14477C',
- '#124980',
- '#14487F',
- '#174374',
- '#15467B',
- '#184172',
- '#17406F',
- '#184070',
- '#163C67',
- '#16355D',
- '#123256',
- '#0E1B29',
- '#0F1923',
- '#113052',
- '#184274',
- '#164579',
- '#13477C',
- '#193E6D',
- '#0A243E',
- '#0B233A',
- '#0D1A29',
- '#0B2742',
- '#17365E',
- '#163860',
- '#124A84',
- '#095191',
- '#114A83',
- '#0D4D8A',
- '#0C4D8C',
- '#104B85',
- '#15477E',
- '#174477',
- '#183862',
- '#0A233A',
- '#092947',
- '#09243D',
- '#173963',
- '#194173',
- '#085396',
- '#085394',
- '#114B87',
- '#144983',
- '#094F8E',
- '#075090',
- '#0F4C89',
- '#215287',
- '#0E1A29',
- '#184376',
- '#0C4D8B',
- '#07549A',
- '#0A4E8D',
- '#0F4C88',
- '#0A4E8C',
- '#174273',
- '#193C6A',
- '#0B2948',
- '#0B2C4B',
- '#0C4E8D',
- '#1259A4',
- '#0C579E',
- '#0D4D8B',
- '#095397',
- '#085397',
- '#085295',
- '#144880',
- '#173861',
- '#15335A',
- '#0F2C4D',
- '#0C2949',
- '#0B4E8D',
- '#08559C',
- '#07508F',
- '#154578',
- '#17365F',
- '#122F53',
- '#111D2C',
- '#092A48',
- '#08559D',
- '#08559E',
- '#0C56A1',
- '#164271',
- '#163E6A',
- '#194071',
- '#082642',
- '#0F1E30',
- '#0D2D4D',
- '#114C87',
- '#0E59A3',
- '#135BA6',
- '#085498',
- '#085497',
- '#095192',
- '#0E4D8B',
- '#0C4E8A',
- '#134982',
- '#17457B',
- '#121F2E',
- '#183E6C',
- '#153E69',
- '#07508E',
- '#173F6C',
- '#193D6B',
- '#112D4F',
- '#0A243B',
- '#072946',
- '#111E2D',
- '#0B2740',
- '#10497F',
- '#17406E',
- '#084F8D',
- '#104A80',
- '#0E2E4F',
- '#143358',
- '#16365D',
- '#0A2742',
- '#13477B',
- '#154474',
- '#104C86',
- '#095291',
- '#0B4F8E',
- '#114A80',
- '#095090',
- '#075296',
- '#163760',
- '#2D6DB5',
- '#0C2843',
- '#0C233A',
- '#153A62',
- '#14467A',
- '#075498',
- '#085293',
- '#09263F',
- '#122030',
- '#09559D',
- '#0F4B83',
- '#08549A',
- '#14375D',
- '#085499',
- '#075499',
- '#0A243D',
- '#143E68',
- '#10497E',
- '#074F8E',
- '#085496',
- '#0C58A3',
- '#065499',
- '#085190',
- '#0A2B4A',
- '#104C88',
- '#0D4F8E',
- '#0F58A2',
- '#0B569B',
- '#0D58A1',
- '#134A81',
- '#09559C',
- '#0A5293',
- '#114B86',
- '#0D2C4C',
- '#103255',
- '#16457A',
- '#074F8C',
- '#07559C',
- '#185DA9',
- '#1D61AD',
- '#175CA8',
- '#16406D',
- '#153C65',
- '#0E243A',
- '#144679',
- '#085192',
- '#1A5EAC',
- '#1D61AE',
- '#11497F',
- '#12487E',
- '#0C243C',
- '#123155',
- '#0F59A3',
- '#1B5FAB',
- '#1E61AD',
- '#145CA4',
- '#0E599F',
- '#11497E',
- '#094F8D',
- '#15345A',
- '#134A85',
- '#165CA8',
- '#2263AF',
- '#124466',
- '#0A518F',
- '#08569D',
- '#16416F',
- '#0B2B4A',
- '#124A83',
- '#0C57A2',
- '#1E60AD',
- '#1E62AE',
- '#165DA8',
- '#1059A4',
- '#15406C',
- '#0A4F8E',
- '#12365A',
- '#0A5191',
- '#16355C',
- '#1C5EAB',
- '#155CA7',
- '#085292',
- '#174478',
- '#153258',
- '#111F2F',
- '#174272',
- '#1159A5',
- '#1C5EAC',
- '#2F74BB',
- '#0C58A2',
- '#0D59A3',
- '#14477D',
- '#132F53',
- '#155BA6',
- '#195FAA',
- '#2366B1',
- '#2967B2',
- '#14477E',
- '#1B5EAB',
- '#175DA8',
- '#0F4C86',
- '#065090',
- '#1C5FAC',
- '#185CA8',
- '#0D58A3',
- '#0C4E8C',
- '#134981',
- '#14416D',
- '#0F5AA5',
- '#1F63AF',
- '#114B88',
- '#09508E',
- '#0A569D',
- '#195DAA',
- '#0F1D2F',
- '#1059A2',
- '#0E599E',
- '#2063AF',
- '#1F63AE',
- '#1A5EAA',
- '#0C57A0',
- '#195EAA',
- '#1A5EA9',
- '#0E4E8A',
- '#12487D',
- '#185DAA',
- '#175EAA',
- '#0A508E',
- '#1559A6',
- '#0E58A3',
- '#095399',
- '#0B4E8B',
- '#0B569F',
- '#0C57A1',
- '#2967B1',
- '#2365B0',
- '#2163AE',
- '#1A5DAA',
- '#195EAB',
- '#1E5FAC',
- '#2564AF',
- '#2767B1',
- '#2766B1',
- '#0D5A9F',
- '#2062AE',
- '#1F61AD',
- '#195FAB',
- '#0D4E8D',
- '#173760',
- '#111D2E',
- '#09518F',
- '#1A5FAC',
- '#135BA7',
- '#085291',
- '#183761',
- '#0B2845',
- '#113457',
- '#075393',
- '#185EA9',
- '#2B69B3',
- '#2A67B2',
- '#2867B1',
- '#155DA8',
- '#135CA6',
- '#135AA5',
- '#114980',
- '#2566B1',
- '#2064AF',
- '#2364AF',
- '#13365B',
- '#154475',
- '#08549B',
- '#164373',
- '#085392',
- '#144576',
- '#12497E',
- '#0E5392',
- '#135BA3',
- '#0C5395',
- '#0C5291',
- '#0E579C',
- '#0E5290',
- '#134C83',
- '#2163AC',
- '#195CA6',
- '#0D4E8C',
- '#082945',
- '#133256',
- '#0E2F50',
- '#105AA6',
- '#134677',
- '#144475',
- '#145BA7',
- '#154270',
- '#1D60AD',
- '#09569B',
- '#09243E',
- '#134A86',
- '#0E59A4',
- '#0A4E8B',
- '#0E4B83',
- '#1D5EAC',
- '#101C2A',
- '#134A84',
- '#0E518F',
- '#145CA7',
- '#0E5699',
- '#145BA5',
- '#095292',
- '#15416E',
- '#153D67',
- '#153F6B',
- '#125AA5',
- '#16406E',
- '#0E1B27',
- '#0D4F8C',
- '#0F58A3',
- '#114A82',
- '#09569C',
- '#0C2339',
- '#0E1B28',
- '#0D59A4',
- '#07559D',
- '#08569E',
- '#095190',
- '#0B253E',
- '#0C2B49',
- '#2264AF',
- '#09549A',
- '#09569F',
- '#163D68',
- '#0C263F',
- '#143960',
- '#183A65',
- '#075496',
- '#0C579F',
- '#085191',
- '#102438',
- '#075295',
- '#082946',
- '#102437',
- '#0C2642',
- '#101C29',
- '#0C253E',
- '#15355C',
- '#0B2E4D',
- '#0F3253',
- '#154577',
- '#16335B',
- '#0F1925',
- '#0C2742',
- '#0B2946',
- '#0E2C4B',
- '#0E2B48',
- '#0E2237',
- '#102237',
- '#0B253D',
- '#0A2946',
- '#0C2841',
- '#0D2A47',
- '#0C2C4A',
- '#08253F',
- '#08243D',
- '#111C2B',
- '#0C2844',
- '#0C2945',
- '#0D243A',
- '#122134',
- '#0B2642',
- '#113154',
- '#113255',
- '#0A2642',
- '#0A2945',
- '#0B263F',
- '#0D2E4E',
- '#0F1E2E',
- '#0A2845',
- '#0D2439',
- '#0F1A29',
- '#101C2E',
- '#111923',
- '#13181F',
- '#111D2F',
- '#111F30',
- '#121E30',
- '#121E2E',
- '#101B27',
- '#101A27',
- '#13171F',
- ];
-
- // let randX = getRandomInt(0, x);
- // let randY = getRandomInt(0, y);
- // let randIndex = randY * xCount + randX;
-
- return colors[(y*xCount + x) % colors.length];
-}
diff --git a/public/app/core/components/code_editor/code_editor.ts b/public/app/core/components/code_editor/code_editor.ts
index 6ae1a99f245..50ff55f3083 100644
--- a/public/app/core/components/code_editor/code_editor.ts
+++ b/public/app/core/components/code_editor/code_editor.ts
@@ -84,7 +84,7 @@ function link(scope, elem, attrs) {
// disable depreacation warning
codeEditor.$blockScrolling = Infinity;
// Padding hacks
- (
- {Array.from(Array(xCount)).map((el2, x) => {
- return (
- |
- );
- })}
-
- );
- })}
-
@@ -15,7 +14,7 @@ const scrollerClass = 'baron__scroller';
export function geminiScrollbar() {
return {
restrict: 'A',
- link: function(scope, elem, attrs) {
+ link: (scope, elem, attrs) => {
let scrollRoot = elem.parent();
const scroller = elem;
@@ -39,43 +38,6 @@ export function geminiScrollbar() {
const scrollbar = baron(scrollParams);
- let lastPos = 0;
-
- appEvents.on(
- 'dash-scroll',
- evt => {
- if (evt.restore) {
- elem[0].scrollTop = lastPos;
- return;
- }
-
- lastPos = elem[0].scrollTop;
-
- if (evt.animate) {
- elem.animate({ scrollTop: evt.pos }, 500);
- } else {
- elem[0].scrollTop = evt.pos;
- }
- },
- scope
- );
-
- // force updating dashboard width
- appEvents.on('toggle-sidemenu', forceUpdate, scope);
- appEvents.on('toggle-sidemenu-hidden', forceUpdate, scope);
- appEvents.on('toggle-view-mode', forceUpdate, scope);
- appEvents.on('toggle-kiosk-mode', forceUpdate, scope);
- appEvents.on('toggle-inactive-mode', forceUpdate, scope);
-
- function forceUpdate() {
- scrollbar.scroll();
- }
-
- scope.$on('$routeChangeSuccess', () => {
- lastPos = 0;
- elem[0].scrollTop = 0;
- });
-
scope.$on('$destroy', () => {
scrollbar.dispose();
});
diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts
index b8e3ea5d3e2..e347fcd829a 100644
--- a/public/app/core/components/search/search.ts
+++ b/public/app/core/components/search/search.ts
@@ -130,8 +130,8 @@ export class SearchCtrl {
}
const max = flattenedResult.length;
- let newIndex = this.selectedIndex + direction;
- this.selectedIndex = (newIndex %= max) < 0 ? newIndex + max : newIndex;
+ const newIndex = (this.selectedIndex + direction) % max;
+ this.selectedIndex = newIndex < 0 ? newIndex + max : newIndex;
const selectedItem = flattenedResult[this.selectedIndex];
if (selectedItem.dashboardIndex === undefined && this.results[selectedItem.folderIndex].id === 0) {
diff --git a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
new file mode 100644
index 00000000000..8eaed4ca264
--- /dev/null
+++ b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
@@ -0,0 +1,96 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import BottomNavLinks from './BottomNavLinks';
+import appEvents from '../../app_events';
+
+jest.mock('../../app_events', () => ({
+ emit: jest.fn(),
+}));
+
+const setup = (propOverrides?: object) => {
+ const props = Object.assign(
+ {
+ link: {},
+ user: {
+ isGrafanaAdmin: false,
+ isSignedIn: false,
+ orgCount: 2,
+ orgRole: '',
+ orgId: 1,
+ orgName: 'Grafana',
+ timezone: 'UTC',
+ helpFlags1: 1,
+ lightTheme: false,
+ hasEditPermissionInFolders: false,
+ },
+ },
+ propOverrides
+ );
+ return shallow( {
+ itemClicked = (event, child) => {
+ if (child.url === '/shortcuts') {
+ event.preventDefault();
+ appEvents.emit('show-modal', {
+ templateHtml: ' = props => {
+ const { child } = props;
+ const listItemClassName = child.divider ? 'divider' : '';
+
+ return (
+
+
+ {child.icon && }
+ {child.text}
+
+
+ );
+};
+
+export default DropDownChild;
diff --git a/public/app/core/components/sidemenu/SideMenu.test.tsx b/public/app/core/components/sidemenu/SideMenu.test.tsx
new file mode 100644
index 00000000000..2a262adca5a
--- /dev/null
+++ b/public/app/core/components/sidemenu/SideMenu.test.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { SideMenu } from './SideMenu';
+import appEvents from '../../app_events';
+import { contextSrv } from 'app/core/services/context_srv';
+
+jest.mock('../../app_events', () => ({
+ emit: jest.fn(),
+}));
+
+jest.mock('app/core/services/context_srv', () => ({
+ contextSrv: {
+ sidemenu: true,
+ user: {},
+ isSignedIn: false,
+ isGrafanaAdmin: false,
+ isEditor: false,
+ hasEditPermissionFolders: false,
+ toggleSideMenu: jest.fn(),
+ },
+}));
+
+const setup = (propOverrides?: object) => {
+ const props = Object.assign(
+ {
+ loginUrl: '',
+ user: {},
+ mainLinks: [],
+ bottomeLinks: [],
+ isSignedIn: false,
+ },
+ propOverrides
+ );
+
+ return shallow( = props => {
+ const { link } = props;
+ return (
+ = () => {
+ const loginUrl = `login?redirect=${encodeURIComponent(window.location.pathname)}`;
+ return (
+ = () => {
+ const navTree = _.cloneDeep(config.bootData.navTree);
+ const mainLinks = _.filter(navTree, item => !item.hideFromMenu);
+
+ return (
+ = props => {
+ const { link } = props;
+ return (
+
+
+
+`;
+
+exports[`Render should render icon if exists 1`] = `
+
+
+
+
+
+`;
diff --git a/public/app/core/components/sidemenu/__snapshots__/SideMenu.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/SideMenu.test.tsx.snap
new file mode 100644
index 00000000000..78e64209749
--- /dev/null
+++ b/public/app/core/components/sidemenu/__snapshots__/SideMenu.test.tsx.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render component 1`] = `
+Array [
+ ,
+ ,
+ 
-
-
-
-
-
-
-
-
+
+
+ {link.icon && }
+ {link.img && 
}
+
+
+
+ );
+ }
+}
+
+export default BottomNavLinks;
diff --git a/public/app/core/components/sidemenu/BottomSection.test.tsx b/public/app/core/components/sidemenu/BottomSection.test.tsx
new file mode 100644
index 00000000000..40307895c57
--- /dev/null
+++ b/public/app/core/components/sidemenu/BottomSection.test.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import BottomSection from './BottomSection';
+
+jest.mock('../../config', () => ({
+ bootData: {
+ navTree: [
+ {
+ id: 'profile',
+ hideFromMenu: true,
+ },
+ {
+ hideFromMenu: true,
+ },
+ {
+ hideFromMenu: false,
+ },
+ {
+ hideFromMenu: true,
+ },
+ ],
+ },
+ user: {
+ orgCount: 5,
+ orgName: 'Grafana',
+ },
+}));
+
+jest.mock('app/core/services/context_srv', () => ({
+ contextSrv: {
+ sidemenu: true,
+ isSignedIn: false,
+ isGrafanaAdmin: false,
+ hasEditPermissionFolders: false,
+ },
+}));
+
+describe('Render', () => {
+ it('should render component', () => {
+ const wrapper = shallow(-
+ {link.subTitle && (
+
- + {link.subTitle} + + )} + {link.showOrgSwitcher && ( +
-
+
+ ++{user.orgName}+Current Org:++ Switch ++ +
+ )}
+ {link.children &&
+ link.children.map((child, index) => {
+ if (!child.hideFromMenu) {
+ return (
+
- + this.itemClicked(event, child)}> + {child.icon && } + {child.text} + + + ); + } + return null; + })} +
- + {link.text} + +
+ {!isSignedIn &&
+ );
+}
diff --git a/public/app/core/components/sidemenu/DropDownChild.test.tsx b/public/app/core/components/sidemenu/DropDownChild.test.tsx
new file mode 100644
index 00000000000..6a15ca5b23f
--- /dev/null
+++ b/public/app/core/components/sidemenu/DropDownChild.test.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import DropDownChild from './DropDownChild';
+
+const setup = (propOverrides?: object) => {
+ const props = Object.assign(
+ {
+ child: {
+ divider: true,
+ },
+ },
+ propOverrides
+ );
+
+ return shallow(
+
+
,
+
+
+
+
+ Close
+
+
,
+ -
+
- + {link.text} + + {link.children && + link.children.map((child, index) => { + return
+
+
+
+
+
+
+
+ );
+};
+
+export default SignIn;
diff --git a/public/app/core/components/sidemenu/TopSection.test.tsx b/public/app/core/components/sidemenu/TopSection.test.tsx
new file mode 100644
index 00000000000..6ed01479833
--- /dev/null
+++ b/public/app/core/components/sidemenu/TopSection.test.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import TopSection from './TopSection';
+
+jest.mock('../../config', () => ({
+ bootData: {
+ navTree: [
+ { id: '1', hideFromMenu: true },
+ { id: '2', hideFromMenu: true },
+ { id: '3', hideFromMenu: false },
+ { id: '4', hideFromMenu: true },
+ ],
+ },
+}));
+
+const setup = (propOverrides?: object) => {
+ const props = Object.assign(
+ {
+ mainLinks: [],
+ },
+ propOverrides
+ );
+
+ return shallow(-
+
- + Sign In + +
+ {mainLinks.map((link, index) => {
+ return
+ );
+};
+
+export default TopSection;
diff --git a/public/app/core/components/sidemenu/TopSectionItem.test.tsx b/public/app/core/components/sidemenu/TopSectionItem.test.tsx
new file mode 100644
index 00000000000..e7d3c4b7c75
--- /dev/null
+++ b/public/app/core/components/sidemenu/TopSectionItem.test.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import TopSectionItem from './TopSectionItem';
+
+const setup = (propOverrides?: object) => {
+ const props = Object.assign(
+ {
+ link: {},
+ },
+ propOverrides
+ );
+
+ return shallow(
+
+
+
+ {link.img && }
+
+
+ {link.children &&
+ );
+};
+
+export default TopSectionItem;
diff --git a/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
new file mode 100644
index 00000000000..f3181b617ad
--- /dev/null
+++ b/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
@@ -0,0 +1,163 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render children 1`] = `
+
+
+
+
+
+
+`;
+
+exports[`Render should render component 1`] = `
+
+
+
+
+
+`;
+
+exports[`Render should render organisation switcher 1`] = `
+-
+
- + + +
+
+
+
+
+`;
+
+exports[`Render should render subtitle 1`] = `
+-
+
-
+
+ +++ Grafana +++ Current Org: +++ + Switch ++ +
+
- + + +
+
+
+
+
+`;
diff --git a/public/app/core/components/sidemenu/__snapshots__/BottomSection.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/BottomSection.test.tsx.snap
new file mode 100644
index 00000000000..ea92e8b7343
--- /dev/null
+++ b/public/app/core/components/sidemenu/__snapshots__/BottomSection.test.tsx.snap
@@ -0,0 +1,34 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render component 1`] = `
+-
+
- + + subtitle + + +
- + + +
+
+`;
diff --git a/public/app/core/components/sidemenu/__snapshots__/DropDownChild.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/DropDownChild.test.tsx.snap
new file mode 100644
index 00000000000..fcfd8ea936a
--- /dev/null
+++ b/public/app/core/components/sidemenu/__snapshots__/DropDownChild.test.tsx.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render component 1`] = `
+-
+
- + + link + + +
-
+
- + + link + + +
+
+`;
+
+exports[`Render should render items 1`] = `
+
+
+`;
diff --git a/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap
new file mode 100644
index 00000000000..f7ff56bff6b
--- /dev/null
+++ b/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render component 1`] = `
+
+
+
+
+
+
+
+`;
diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html
deleted file mode 100644
index 3a4ce11333e..00000000000
--- a/public/app/core/components/sidemenu/sidemenu.html
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts
deleted file mode 100644
index f2798f874bd..00000000000
--- a/public/app/core/components/sidemenu/sidemenu.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import _ from 'lodash';
-import config from 'app/core/config';
-import $ from 'jquery';
-import coreModule from '../../core_module';
-import appEvents from 'app/core/app_events';
-
-export class SideMenuCtrl {
- user: any;
- mainLinks: any;
- bottomNav: any;
- loginUrl: string;
- isSignedIn: boolean;
- isOpenMobile: boolean;
-
- /** @ngInject */
- constructor(private $scope, private $rootScope, private $location, private contextSrv, private $timeout) {
- this.isSignedIn = contextSrv.isSignedIn;
- this.user = contextSrv.user;
-
- const navTree = _.cloneDeep(config.bootData.navTree);
- this.mainLinks = _.filter(navTree, item => !item.hideFromMenu);
- this.bottomNav = _.filter(navTree, item => item.hideFromMenu);
- this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
-
- if (contextSrv.user.orgCount > 1) {
- const profileNode = _.find(this.bottomNav, { id: 'profile' });
- if (profileNode) {
- profileNode.showOrgSwitcher = true;
- }
- }
-
- this.$scope.$on('$routeChangeSuccess', () => {
- this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path());
- });
- }
-
- toggleSideMenu() {
- this.contextSrv.toggleSideMenu();
- appEvents.emit('toggle-sidemenu');
-
- this.$timeout(() => {
- this.$rootScope.$broadcast('render');
- });
- }
-
- toggleSideMenuSmallBreakpoint() {
- appEvents.emit('toggle-sidemenu-mobile');
- }
-
- switchOrg() {
- this.$rootScope.appEvent('show-modal', {
- templateHtml: '
-
-
-
- ![]()
-
-
-
-
-
+{{part.label}}
+{{part.def.wrapOpen}}{{part.def.wrapClose}}
+
+`;
+
+/** @ngInject */
+export function sqlPartEditorDirective($compile, templateSrv) {
+ const paramTemplate = '';
+
+ return {
+ restrict: 'E',
+ template: template,
+ scope: {
+ part: '=',
+ handleEvent: '&',
+ debounce: '@',
+ },
+ link: function postLink($scope, elem) {
+ const part = $scope.part;
+ const partDef = part.def;
+ const $paramsContainer = elem.find('.query-part-parameters');
+ const debounceLookup = $scope.debounce;
+ let cancelBlur = null;
+
+ $scope.partActions = [];
+
+ function clickFuncParam(this: any, paramIndex) {
+ /*jshint validthis:true */
+ const $link = $(this);
+ const $input = $link.next();
+
+ $input.val(part.params[paramIndex]);
+ $input.css('width', $link.width() + 16 + 'px');
+
+ $link.hide();
+ $input.show();
+ $input.focus();
+ $input.select();
+
+ const typeahead = $input.data('typeahead');
+ if (typeahead) {
+ $input.val('');
+ typeahead.lookup();
+ }
+ }
+
+ function inputBlur($input, paramIndex) {
+ cancelBlur = setTimeout(() => {
+ switchToLink($input, paramIndex);
+ }, 200);
+ }
+
+ function switchToLink($input, paramIndex) {
+ /*jshint validthis:true */
+ const $link = $input.prev();
+ const newValue = $input.val();
+
+ if (newValue !== '' || part.def.params[paramIndex].optional) {
+ $link.html(templateSrv.highlightVariablesAsHtml(newValue));
+
+ part.updateParam($input.val(), paramIndex);
+ $scope.$apply(() => {
+ $scope.handleEvent({ $event: { name: 'part-param-changed' } });
+ });
+ }
+
+ $input.hide();
+ $link.show();
+ }
+
+ function inputKeyPress(this: any, paramIndex, e) {
+ /*jshint validthis:true */
+ if (e.which === 13) {
+ switchToLink($(this), paramIndex);
+ }
+ }
+
+ function inputKeyDown(this: any) {
+ /*jshint validthis:true */
+ this.style.width = (3 + this.value.length) * 8 + 'px';
+ }
+
+ function addTypeahead($input, param, paramIndex) {
+ if (!param.options && !param.dynamicLookup) {
+ return;
+ }
+
+ const typeaheadSource = (query, callback) => {
+ if (param.options) {
+ let options = param.options;
+ if (param.type === 'int') {
+ options = _.map(options, val => {
+ return val.toString();
+ });
+ }
+ return options;
+ }
+
+ $scope.$apply(() => {
+ $scope.handleEvent({ $event: { name: 'get-param-options', param: param } }).then(result => {
+ const dynamicOptions = _.map(result, op => {
+ return op.value;
+ });
+
+ // add current value to dropdown if it's not in dynamicOptions
+ if (_.indexOf(dynamicOptions, part.params[paramIndex]) === -1) {
+ dynamicOptions.unshift(part.params[paramIndex]);
+ }
+
+ callback(dynamicOptions);
+ });
+ });
+ };
+
+ $input.attr('data-provide', 'typeahead');
+
+ $input.typeahead({
+ source: typeaheadSource,
+ minLength: 0,
+ items: 1000,
+ updater: value => {
+ if (value === part.params[paramIndex]) {
+ clearTimeout(cancelBlur);
+ $input.focus();
+ return value;
+ }
+ return value;
+ },
+ });
+
+ const typeahead = $input.data('typeahead');
+ typeahead.lookup = function() {
+ this.query = this.$element.val() || '';
+ const items = this.source(this.query, $.proxy(this.process, this));
+ return items ? this.process(items) : items;
+ };
+
+ if (debounceLookup) {
+ typeahead.lookup = _.debounce(typeahead.lookup, 500, { leading: true });
+ }
+ }
+
+ $scope.showActionsMenu = () => {
+ $scope.handleEvent({ $event: { name: 'get-part-actions' } }).then(res => {
+ $scope.partActions = res;
+ });
+ };
+
+ $scope.triggerPartAction = action => {
+ $scope.handleEvent({ $event: { name: 'action', action: action } });
+ };
+
+ function addElementsAndCompile() {
+ _.each(partDef.params, (param, index) => {
+ if (param.optional && part.params.length <= index) {
+ return;
+ }
+
+ if (index > 0) {
+ $('' + partDef.separator + '').appendTo($paramsContainer);
+ }
+
+ const paramValue = templateSrv.highlightVariablesAsHtml(part.params[index]);
+ const $paramLink = $('' + paramValue + '');
+ const $input = $(paramTemplate);
+
+ $paramLink.appendTo($paramsContainer);
+ $input.appendTo($paramsContainer);
+
+ $input.blur(_.partial(inputBlur, $input, index));
+ $input.keyup(inputKeyDown);
+ $input.keypress(_.partial(inputKeyPress, index));
+ $paramLink.click(_.partial(clickFuncParam, index));
+
+ addTypeahead($input, param, index);
+ });
+ }
+
+ function relink() {
+ $paramsContainer.empty();
+ addElementsAndCompile();
+ }
+
+ relink();
+ },
+ };
+}
+
+coreModule.directive('sqlPartEditor', sqlPartEditorDirective);
diff --git a/public/app/core/config.ts b/public/app/core/config.ts
index f522c6340e6..bf5abe37d7f 100644
--- a/public/app/core/config.ts
+++ b/public/app/core/config.ts
@@ -11,9 +11,9 @@ export class Settings {
datasources: any;
panels: any;
appSubUrl: string;
- window_title_prefix: string;
+ windowTitlePrefix: string;
buildInfo: BuildInfo;
- new_panel_title: string;
+ newPanelTitle: string;
bootData: any;
externalUserMngLinkUrl: string;
externalUserMngLinkName: string;
@@ -22,6 +22,8 @@ export class Settings {
disableLoginForm: boolean;
defaultDatasource: string;
alertingEnabled: boolean;
+ alertingErrorOrTimeout: string;
+ alertingNoDataOrNullValues: string;
authProxyEnabled: boolean;
exploreEnabled: boolean;
ldapEnabled: boolean;
@@ -33,9 +35,9 @@ export class Settings {
constructor(options) {
const defaults = {
datasources: {},
- window_title_prefix: 'Grafana - ',
+ windowTitlePrefix: 'Grafana - ',
panels: {},
- new_panel_title: 'Panel Title',
+ newPanelTitle: 'Panel Title',
playlist_timespan: '1m',
unsaved_changes_warning: true,
appSubUrl: '',
@@ -51,7 +53,7 @@ export class Settings {
}
}
-const bootData = (window).grafanaBootData || { settings: {} };
+const bootData = (window as any).grafanaBootData || { settings: {} };
const options = bootData.settings;
options.bootData = bootData;
diff --git a/public/app/core/controllers/inspect_ctrl.ts b/public/app/core/controllers/inspect_ctrl.ts
index 612b9cac42e..d106b42da16 100644
--- a/public/app/core/controllers/inspect_ctrl.ts
+++ b/public/app/core/controllers/inspect_ctrl.ts
@@ -28,7 +28,7 @@ export class InspectCtrl {
}
if (model.error.config && model.error.config.params) {
- $scope.request_parameters = _.map(model.error.config.params, function(value, key) {
+ $scope.request_parameters = _.map(model.error.config.params, (value, key) => {
return { key: key, value: value };
});
}
@@ -45,7 +45,7 @@ export class InspectCtrl {
if (_.isString(model.error.config.data)) {
$scope.request_parameters = this.getParametersFromQueryString(model.error.config.data);
} else {
- $scope.request_parameters = _.map(model.error.config.data, function(value, key) {
+ $scope.request_parameters = _.map(model.error.config.data, (value, key) => {
return { key: key, value: angular.toJson(value, true) };
});
}
@@ -60,7 +60,7 @@ export class InspectCtrl {
if (keyValue[1].length > 0) {
result.push({
key: keyValue[0],
- value: (window).unescape(keyValue[1]),
+ value: (window as any).unescape(keyValue[1]),
});
}
}
diff --git a/public/app/core/controllers/invited_ctrl.ts b/public/app/core/controllers/invited_ctrl.ts
index e9127af26b7..63f9d975c1f 100644
--- a/public/app/core/controllers/invited_ctrl.ts
+++ b/public/app/core/controllers/invited_ctrl.ts
@@ -16,8 +16,8 @@ export class InvitedCtrl {
},
};
- $scope.init = function() {
- backendSrv.get('/api/user/invite/' + $routeParams.code).then(function(invite) {
+ $scope.init = () => {
+ backendSrv.get('/api/user/invite/' + $routeParams.code).then(invite => {
$scope.formModel.name = invite.name;
$scope.formModel.email = invite.email;
$scope.formModel.username = invite.email;
@@ -28,12 +28,12 @@ export class InvitedCtrl {
});
};
- $scope.submit = function() {
+ $scope.submit = () => {
if (!$scope.inviteForm.$valid) {
return;
}
- backendSrv.post('/api/user/invite/complete', $scope.formModel).then(function() {
+ backendSrv.post('/api/user/invite/complete', $scope.formModel).then(() => {
window.location.href = config.appSubUrl + '/';
});
};
diff --git a/public/app/core/controllers/json_editor_ctrl.ts b/public/app/core/controllers/json_editor_ctrl.ts
index 3260f6ff537..9c3f9d9e98d 100644
--- a/public/app/core/controllers/json_editor_ctrl.ts
+++ b/public/app/core/controllers/json_editor_ctrl.ts
@@ -8,7 +8,7 @@ export class JsonEditorCtrl {
$scope.canUpdate = $scope.updateHandler !== void 0 && $scope.contextSrv.isEditor;
$scope.canCopy = $scope.enableCopy;
- $scope.update = function() {
+ $scope.update = () => {
const newObject = angular.fromJson($scope.json);
$scope.updateHandler(newObject, $scope.object);
};
diff --git a/public/app/core/controllers/login_ctrl.ts b/public/app/core/controllers/login_ctrl.ts
index 737596fcdf6..de4e3415dfb 100644
--- a/public/app/core/controllers/login_ctrl.ts
+++ b/public/app/core/controllers/login_ctrl.ts
@@ -29,7 +29,7 @@ export class LoginCtrl {
$scope.loginMode = true;
$scope.submitBtnText = 'Log in';
- $scope.init = function() {
+ $scope.init = () => {
$scope.$watch('loginMode', $scope.loginModeChanged);
if (config.loginError) {
@@ -37,7 +37,7 @@ export class LoginCtrl {
}
};
- $scope.submit = function() {
+ $scope.submit = () => {
if ($scope.loginMode) {
$scope.login();
} else {
@@ -45,7 +45,7 @@ export class LoginCtrl {
}
};
- $scope.changeView = function() {
+ $scope.changeView = () => {
const loginView = document.querySelector('#login-view');
const changePasswordView = document.querySelector('#change-password-view');
@@ -65,7 +65,7 @@ export class LoginCtrl {
}, 400);
};
- $scope.changePassword = function() {
+ $scope.changePassword = () => {
$scope.command.oldPassword = 'admin';
if ($scope.command.newPassword !== $scope.command.confirmNew) {
@@ -73,25 +73,25 @@ export class LoginCtrl {
return;
}
- backendSrv.put('/api/user/password', $scope.command).then(function() {
+ backendSrv.put('/api/user/password', $scope.command).then(() => {
$scope.toGrafana();
});
};
- $scope.skip = function() {
+ $scope.skip = () => {
$scope.toGrafana();
};
- $scope.loginModeChanged = function(newValue) {
+ $scope.loginModeChanged = newValue => {
$scope.submitBtnText = newValue ? 'Log in' : 'Sign up';
};
- $scope.signUp = function() {
+ $scope.signUp = () => {
if (!$scope.loginForm.$valid) {
return;
}
- backendSrv.post('/api/user/signup', $scope.formModel).then(function(result) {
+ backendSrv.post('/api/user/signup', $scope.formModel).then(result => {
if (result.status === 'SignUpCreated') {
$location.path('/signup').search({ email: $scope.formModel.email });
} else {
@@ -100,7 +100,7 @@ export class LoginCtrl {
});
};
- $scope.login = function() {
+ $scope.login = () => {
delete $scope.loginError;
if (!$scope.loginForm.$valid) {
@@ -110,7 +110,7 @@ export class LoginCtrl {
backendSrv
.post('/login', $scope.formModel)
- .then(function(result) {
+ .then(result => {
$scope.result = result;
if ($scope.formModel.password !== 'admin' || $scope.ldapEnabled || $scope.authProxyEnabled) {
@@ -125,7 +125,7 @@ export class LoginCtrl {
});
};
- $scope.toGrafana = function() {
+ $scope.toGrafana = () => {
const params = $location.search();
if (params.redirect && params.redirect[0] === '/') {
diff --git a/public/app/core/controllers/reset_password_ctrl.ts b/public/app/core/controllers/reset_password_ctrl.ts
index 244f0307150..933655399e8 100644
--- a/public/app/core/controllers/reset_password_ctrl.ts
+++ b/public/app/core/controllers/reset_password_ctrl.ts
@@ -22,16 +22,16 @@ export class ResetPasswordCtrl {
},
};
- $scope.sendResetEmail = function() {
+ $scope.sendResetEmail = () => {
if (!$scope.sendResetForm.$valid) {
return;
}
- backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(function() {
+ backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(() => {
$scope.mode = 'email-sent';
});
};
- $scope.submitReset = function() {
+ $scope.submitReset = () => {
if (!$scope.resetForm.$valid) {
return;
}
@@ -41,7 +41,7 @@ export class ResetPasswordCtrl {
return;
}
- backendSrv.post('/api/user/password/reset', $scope.formModel).then(function() {
+ backendSrv.post('/api/user/password/reset', $scope.formModel).then(() => {
$location.path('login');
});
};
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index d6088283f3b..173d6b80b15 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -20,7 +20,6 @@ import './services/search_srv';
import './services/ng_react';
import { grafanaAppDirective } from './components/grafana_app';
-import { sideMenuDirective } from './components/sidemenu/sidemenu';
import { searchDirective } from './components/search/search';
import { infoPopover } from './components/info_popover';
import { navbarDirective } from './components/navbar/navbar';
@@ -31,6 +30,7 @@ import { layoutSelector } from './components/layout_selector/layout_selector';
import { switchDirective } from './components/switch';
import { dashboardSelector } from './components/dashboard_selector';
import { queryPartEditorDirective } from './components/query_part/query_part_editor';
+import { sqlPartEditorDirective } from './components/sql_part/sql_part_editor';
import { formDropdownDirective } from './components/form_dropdown/form_dropdown';
import 'app/core/controllers/all';
import 'app/core/services/all';
@@ -61,7 +61,6 @@ export {
arrayJoin,
coreModule,
grafanaAppDirective,
- sideMenuDirective,
navbarDirective,
searchDirective,
liveSrv,
@@ -72,6 +71,7 @@ export {
appEvents,
dashboardSelector,
queryPartEditorDirective,
+ sqlPartEditorDirective,
colors,
formDropdownDirective,
assignModelProperties,
diff --git a/public/app/core/directives/array_join.ts b/public/app/core/directives/array_join.ts
index f3416f43576..c906319e985 100644
--- a/public/app/core/directives/array_join.ts
+++ b/public/app/core/directives/array_join.ts
@@ -7,7 +7,7 @@ export function arrayJoin() {
return {
restrict: 'A',
require: 'ngModel',
- link: function(scope, element, attr, ngModel) {
+ link: (scope, element, attr, ngModel) => {
function split_array(text) {
return (text || '').split(',');
}
diff --git a/public/app/core/directives/dash_class.ts b/public/app/core/directives/dash_class.ts
index 031338d3c5b..224bc2c772d 100644
--- a/public/app/core/directives/dash_class.ts
+++ b/public/app/core/directives/dash_class.ts
@@ -4,19 +4,19 @@ import coreModule from '../core_module';
/** @ngInject */
export function dashClass() {
return {
- link: function($scope, elem) {
- $scope.onAppEvent('panel-fullscreen-enter', function() {
+ link: ($scope, elem) => {
+ $scope.onAppEvent('panel-fullscreen-enter', () => {
elem.toggleClass('panel-in-fullscreen', true);
});
- $scope.onAppEvent('panel-fullscreen-exit', function() {
+ $scope.onAppEvent('panel-fullscreen-exit', () => {
elem.toggleClass('panel-in-fullscreen', false);
});
- $scope.$watch('ctrl.dashboardViewState.state.editview', function(newValue) {
+ $scope.$watch('ctrl.dashboardViewState.state.editview', newValue => {
if (newValue) {
elem.toggleClass('dashboard-page--settings-opening', _.isString(newValue));
- setTimeout(function() {
+ setTimeout(() => {
elem.toggleClass('dashboard-page--settings-open', _.isString(newValue));
}, 10);
} else {
diff --git a/public/app/core/directives/dropdown_typeahead.ts b/public/app/core/directives/dropdown_typeahead.ts
index af8c4ddc3bb..cdba0f3e3c2 100644
--- a/public/app/core/directives/dropdown_typeahead.ts
+++ b/public/app/core/directives/dropdown_typeahead.ts
@@ -20,7 +20,7 @@ export function dropdownTypeahead($compile) {
dropdownTypeaheadOnSelect: '&dropdownTypeaheadOnSelect',
model: '=ngModel',
},
- link: function($scope, elem, attrs) {
+ link: ($scope, elem, attrs) => {
const $input = $(inputTemplate);
const $button = $(buttonTemplate);
$input.appendTo(elem);
@@ -31,9 +31,9 @@ export function dropdownTypeahead($compile) {
}
if (attrs.ngModel) {
- $scope.$watch('model', function(newValue) {
- _.each($scope.menuItems, function(item) {
- _.each(item.submenu, function(subItem) {
+ $scope.$watch('model', newValue => {
+ _.each($scope.menuItems, item => {
+ _.each(item.submenu, subItem => {
if (subItem.value === newValue) {
$button.html(subItem.text);
}
@@ -44,12 +44,12 @@ export function dropdownTypeahead($compile) {
const typeaheadValues = _.reduce(
$scope.menuItems,
- function(memo, value, index) {
+ (memo, value, index) => {
if (!value.submenu) {
value.click = 'menuItemSelected(' + index + ')';
memo.push(value.text);
} else {
- _.each(value.submenu, function(item, subIndex) {
+ _.each(value.submenu, (item, subIndex) => {
item.click = 'menuItemSelected(' + index + ',' + subIndex + ')';
memo.push(value.text + ' ' + item.text);
});
@@ -59,7 +59,7 @@ export function dropdownTypeahead($compile) {
[]
);
- $scope.menuItemSelected = function(index, subIndex) {
+ $scope.menuItemSelected = (index, subIndex) => {
const menuItem = $scope.menuItems[index];
const payload: any = { $item: menuItem };
if (menuItem.submenu && subIndex !== void 0) {
@@ -73,10 +73,10 @@ export function dropdownTypeahead($compile) {
source: typeaheadValues,
minLength: 1,
items: 10,
- updater: function(value) {
+ updater: value => {
const result: any = {};
- _.each($scope.menuItems, function(menuItem) {
- _.each(menuItem.submenu, function(submenuItem) {
+ _.each($scope.menuItems, menuItem => {
+ _.each(menuItem.submenu, submenuItem => {
if (value === menuItem.text + ' ' + submenuItem.text) {
result.$subItem = submenuItem;
result.$item = menuItem;
@@ -85,7 +85,7 @@ export function dropdownTypeahead($compile) {
});
if (result.$item) {
- $scope.$apply(function() {
+ $scope.$apply(() => {
$scope.dropdownTypeaheadOnSelect(result);
});
}
@@ -95,24 +95,24 @@ export function dropdownTypeahead($compile) {
},
});
- $button.click(function() {
+ $button.click(() => {
$button.hide();
$input.show();
$input.focus();
});
- $input.keyup(function() {
+ $input.keyup(() => {
elem.toggleClass('open', $input.val() === '');
});
- $input.blur(function() {
+ $input.blur(() => {
$input.hide();
$input.val('');
$button.show();
$button.focus();
// clicking the function dropdown menu won't
// work if you remove class at once
- setTimeout(function() {
+ setTimeout(() => {
elem.removeClass('open');
}, 200);
});
@@ -138,7 +138,7 @@ export function dropdownTypeahead2($compile) {
dropdownTypeaheadOnSelect: '&dropdownTypeaheadOnSelect',
model: '=ngModel',
},
- link: function($scope, elem, attrs) {
+ link: ($scope, elem, attrs) => {
const $input = $(inputTemplate);
const $button = $(buttonTemplate);
$input.appendTo(elem);
@@ -149,9 +149,9 @@ export function dropdownTypeahead2($compile) {
}
if (attrs.ngModel) {
- $scope.$watch('model', function(newValue) {
- _.each($scope.menuItems, function(item) {
- _.each(item.submenu, function(subItem) {
+ $scope.$watch('model', newValue => {
+ _.each($scope.menuItems, item => {
+ _.each(item.submenu, subItem => {
if (subItem.value === newValue) {
$button.html(subItem.text);
}
@@ -162,12 +162,12 @@ export function dropdownTypeahead2($compile) {
const typeaheadValues = _.reduce(
$scope.menuItems,
- function(memo, value, index) {
+ (memo, value, index) => {
if (!value.submenu) {
value.click = 'menuItemSelected(' + index + ')';
memo.push(value.text);
} else {
- _.each(value.submenu, function(item, subIndex) {
+ _.each(value.submenu, (item, subIndex) => {
item.click = 'menuItemSelected(' + index + ',' + subIndex + ')';
memo.push(value.text + ' ' + item.text);
});
@@ -177,7 +177,7 @@ export function dropdownTypeahead2($compile) {
[]
);
- $scope.menuItemSelected = function(index, subIndex) {
+ $scope.menuItemSelected = (index, subIndex) => {
const menuItem = $scope.menuItems[index];
const payload: any = { $item: menuItem };
if (menuItem.submenu && subIndex !== void 0) {
@@ -191,10 +191,10 @@ export function dropdownTypeahead2($compile) {
source: typeaheadValues,
minLength: 1,
items: 10,
- updater: function(value) {
+ updater: value => {
const result: any = {};
- _.each($scope.menuItems, function(menuItem) {
- _.each(menuItem.submenu, function(submenuItem) {
+ _.each($scope.menuItems, menuItem => {
+ _.each(menuItem.submenu, submenuItem => {
if (value === menuItem.text + ' ' + submenuItem.text) {
result.$subItem = submenuItem;
result.$item = menuItem;
@@ -203,7 +203,7 @@ export function dropdownTypeahead2($compile) {
});
if (result.$item) {
- $scope.$apply(function() {
+ $scope.$apply(() => {
$scope.dropdownTypeaheadOnSelect(result);
});
}
@@ -213,24 +213,24 @@ export function dropdownTypeahead2($compile) {
},
});
- $button.click(function() {
+ $button.click(() => {
$button.hide();
$input.show();
$input.focus();
});
- $input.keyup(function() {
+ $input.keyup(() => {
elem.toggleClass('open', $input.val() === '');
});
- $input.blur(function() {
+ $input.blur(() => {
$input.hide();
$input.val('');
$button.show();
$button.focus();
// clicking the function dropdown menu won't
// work if you remove class at once
- setTimeout(function() {
+ setTimeout(() => {
elem.removeClass('open');
}, 200);
});
diff --git a/public/app/core/directives/give_focus.ts b/public/app/core/directives/give_focus.ts
index 9b2cf01750e..4ef574ec68e 100644
--- a/public/app/core/directives/give_focus.ts
+++ b/public/app/core/directives/give_focus.ts
@@ -1,18 +1,18 @@
import coreModule from '../core_module';
-coreModule.directive('giveFocus', function() {
- return function(scope, element, attrs) {
- element.click(function(e) {
+coreModule.directive('giveFocus', () => {
+ return (scope, element, attrs) => {
+ element.click(e => {
e.stopPropagation();
});
scope.$watch(
attrs.giveFocus,
- function(newValue) {
+ newValue => {
if (!newValue) {
return;
}
- setTimeout(function() {
+ setTimeout(() => {
element.focus();
const domEl = element[0];
if (domEl.setSelectionRange) {
diff --git a/public/app/core/directives/metric_segment.ts b/public/app/core/directives/metric_segment.ts
index 117f776f487..7759e14f2cc 100644
--- a/public/app/core/directives/metric_segment.ts
+++ b/public/app/core/directives/metric_segment.ts
@@ -24,7 +24,7 @@ export function metricSegment($compile, $sce) {
onChange: '&',
debounce: '@',
},
- link: function($scope, elem) {
+ link: ($scope, elem) => {
const $input = $(inputTemplate);
const segment = $scope.segment;
const $button = $(segment.selectMode ? selectTemplate : linkTemplate);
@@ -36,14 +36,14 @@ export function metricSegment($compile, $sce) {
$input.appendTo(elem);
$button.appendTo(elem);
- $scope.updateVariableValue = function(value) {
+ $scope.updateVariableValue = value => {
if (value === '' || segment.value === value) {
return;
}
value = _.unescape(value);
- $scope.$apply(function() {
+ $scope.$apply(() => {
const selected = _.find($scope.altSegments, { value: value });
if (selected) {
segment.value = selected.value;
@@ -65,7 +65,7 @@ export function metricSegment($compile, $sce) {
});
};
- $scope.switchToLink = function(fromClick) {
+ $scope.switchToLink = fromClick => {
if (linkMode && !fromClick) {
return;
}
@@ -78,17 +78,17 @@ export function metricSegment($compile, $sce) {
$scope.updateVariableValue($input.val());
};
- $scope.inputBlur = function() {
+ $scope.inputBlur = () => {
// happens long before the click event on the typeahead options
// need to have long delay because the blur
cancelBlur = setTimeout($scope.switchToLink, 200);
};
- $scope.source = function(query, callback) {
- $scope.$apply(function() {
- $scope.getOptions({ $query: query }).then(function(altSegments) {
+ $scope.source = (query, callback) => {
+ $scope.$apply(() => {
+ $scope.getOptions({ $query: query }).then(altSegments => {
$scope.altSegments = altSegments;
- options = _.map($scope.altSegments, function(alt) {
+ options = _.map($scope.altSegments, alt => {
return _.escape(alt.value);
});
@@ -104,7 +104,7 @@ export function metricSegment($compile, $sce) {
});
};
- $scope.updater = function(value) {
+ $scope.updater = value => {
if (value === segment.value) {
clearTimeout(cancelBlur);
$input.focus();
@@ -152,14 +152,14 @@ export function metricSegment($compile, $sce) {
typeahead.lookup = _.debounce(typeahead.lookup, 500, { leading: true });
}
- $button.keydown(function(evt) {
+ $button.keydown(evt => {
// trigger typeahead on down arrow or enter key
if (evt.keyCode === 40 || evt.keyCode === 13) {
$button.click();
}
});
- $button.click(function() {
+ $button.click(() => {
options = null;
$input.css('width', Math.max($button.width(), 80) + 16 + 'px');
@@ -199,7 +199,7 @@ export function metricSegmentModel(uiSegmentSrv, $q) {
pre: function postLink($scope, elem, attrs) {
let cachedOptions;
- $scope.valueToSegment = function(value) {
+ $scope.valueToSegment = value => {
const option = _.find($scope.options, { value: value });
const segment = {
cssClass: attrs.cssClass,
@@ -211,18 +211,18 @@ export function metricSegmentModel(uiSegmentSrv, $q) {
return uiSegmentSrv.newSegment(segment);
};
- $scope.getOptionsInternal = function() {
+ $scope.getOptionsInternal = () => {
if ($scope.options) {
cachedOptions = $scope.options;
return $q.when(
- _.map($scope.options, function(option) {
+ _.map($scope.options, option => {
return { value: option.text };
})
);
} else {
- return $scope.getOptions().then(function(options) {
+ return $scope.getOptions().then(options => {
cachedOptions = options;
- return _.map(options, function(option) {
+ return _.map(options, option => {
if (option.html) {
return option;
}
@@ -232,7 +232,7 @@ export function metricSegmentModel(uiSegmentSrv, $q) {
}
};
- $scope.onSegmentChange = function() {
+ $scope.onSegmentChange = () => {
if (cachedOptions) {
const option = _.find(cachedOptions, { text: $scope.segment.value });
if (option && option.value !== $scope.property) {
@@ -246,8 +246,8 @@ export function metricSegmentModel(uiSegmentSrv, $q) {
// needs to call this after digest so
// property is synced with outerscope
- $scope.$$postDigest(function() {
- $scope.$apply(function() {
+ $scope.$$postDigest(() => {
+ $scope.$apply(() => {
$scope.onChange();
});
});
diff --git a/public/app/core/directives/misc.ts b/public/app/core/directives/misc.ts
index 07796245f2b..192e2df4167 100644
--- a/public/app/core/directives/misc.ts
+++ b/public/app/core/directives/misc.ts
@@ -8,8 +8,8 @@ import { appEvents } from 'app/core/core';
function tip($compile) {
return {
restrict: 'E',
- link: function(scope, elem, attrs) {
- var _t =
+ link: (scope, elem, attrs) => {
+ let _t =
'' + attrs.tip + '' : '';
const showIf = attrs.showIf ? ' ng-show="' + attrs.showIf + '" ' : '';
@@ -118,14 +118,14 @@ function editorOptBool($compile) {
function editorCheckbox($compile, $interpolate) {
return {
restrict: 'E',
- link: function(scope, elem, attrs) {
+ link: (scope, elem, attrs) => {
const text = $interpolate(attrs.text)(scope);
const model = $interpolate(attrs.model)(scope);
const ngchange = attrs.change ? ' ng-change="' + attrs.change + '"' : '';
const tip = attrs.tip ? ' ' + attrs.tip + ' ' : '';
const label = '';
- var template =
+ let template =
'' +
@@ -194,7 +194,7 @@ function gfDropdown($parse, $compile, $timeout) {
link: function postLink(scope, iElement, iAttrs) {
const getter = $parse(iAttrs.gfDropdown),
items = getter(scope);
- $timeout(function() {
+ $timeout(() => {
const placement = iElement.data('placement');
const dropdown = angular.element(buildTemplate(items, placement).join(''));
dropdown.insertAfter(iElement);
diff --git a/public/app/core/directives/ng_model_on_blur.ts b/public/app/core/directives/ng_model_on_blur.ts
index 2818f620dde..7e903c1f889 100644
--- a/public/app/core/directives/ng_model_on_blur.ts
+++ b/public/app/core/directives/ng_model_on_blur.ts
@@ -6,14 +6,14 @@ function ngModelOnBlur() {
restrict: 'A',
priority: 1,
require: 'ngModel',
- link: function(scope, elm, attr, ngModelCtrl) {
+ link: (scope, elm, attr, ngModelCtrl) => {
if (attr.type === 'radio' || attr.type === 'checkbox') {
return;
}
elm.off('input keydown change');
- elm.bind('blur', function() {
- scope.$apply(function() {
+ elm.bind('blur', () => {
+ scope.$apply(() => {
ngModelCtrl.$setViewValue(elm.val());
});
});
@@ -25,8 +25,8 @@ function emptyToNull() {
return {
restrict: 'A',
require: 'ngModel',
- link: function(scope, elm, attrs, ctrl) {
- ctrl.$parsers.push(function(viewValue) {
+ link: (scope, elm, attrs, ctrl) => {
+ ctrl.$parsers.push(viewValue => {
if (viewValue === '') {
return null;
}
@@ -39,8 +39,8 @@ function emptyToNull() {
function validTimeSpan() {
return {
require: 'ngModel',
- link: function(scope, elm, attrs, ctrl) {
- ctrl.$validators.integer = function(modelValue, viewValue) {
+ link: (scope, elm, attrs, ctrl) => {
+ ctrl.$validators.integer = (modelValue, viewValue) => {
if (ctrl.$isEmpty(modelValue)) {
return true;
}
diff --git a/public/app/core/directives/rebuild_on_change.ts b/public/app/core/directives/rebuild_on_change.ts
index 3a2d33dd771..43edf9d703f 100644
--- a/public/app/core/directives/rebuild_on_change.ts
+++ b/public/app/core/directives/rebuild_on_change.ts
@@ -2,23 +2,25 @@ import $ from 'jquery';
import coreModule from '../core_module';
function getBlockNodes(nodes) {
- var node = nodes[0];
+ let node = nodes[0];
const endNode = nodes[nodes.length - 1];
- var blockNodes;
+ let blockNodes;
+ node = node.nextSibling;
- for (var i = 1; node !== endNode && (node = node.nextSibling); i++) {
+ for (let i = 1; node !== endNode && node; i++) {
if (blockNodes || nodes[i] !== node) {
if (!blockNodes) {
blockNodes = $([].slice.call(nodes, 0, i));
}
blockNodes.push(node);
}
+ node = node.nextSibling;
}
return blockNodes || nodes;
}
-/** @ngInject **/
+/** @ngInject */
function rebuildOnChange($animate) {
return {
multiElement: true,
@@ -26,8 +28,8 @@ function rebuildOnChange($animate) {
transclude: true,
priority: 600,
restrict: 'E',
- link: function(scope, elem, attrs, ctrl, transclude) {
- var block, childScope, previousElements;
+ link: (scope, elem, attrs, ctrl, transclude) => {
+ let block, childScope, previousElements;
function cleanUp() {
if (previousElements) {
@@ -40,7 +42,7 @@ function rebuildOnChange($animate) {
}
if (block) {
previousElements = getBlockNodes(block.clone);
- $animate.leave(previousElements).then(function() {
+ $animate.leave(previousElements).then(() => {
previousElements = null;
});
block = null;
@@ -53,7 +55,7 @@ function rebuildOnChange($animate) {
}
if (!childScope && (value || attrs.showNull)) {
- transclude(function(clone, newScope) {
+ transclude((clone, newScope) => {
childScope = newScope;
clone[clone.length++] = document.createComment(' end rebuild on change ');
block = { clone: clone };
diff --git a/public/app/core/directives/tags.ts b/public/app/core/directives/tags.ts
index 7cee3ac338d..33a2252a683 100644
--- a/public/app/core/directives/tags.ts
+++ b/public/app/core/directives/tags.ts
@@ -13,7 +13,7 @@ function setColor(name, element) {
function tagColorFromName() {
return {
scope: { tagColorFromName: '=' },
- link: function(scope, element) {
+ link: (scope, element) => {
setColor(scope.tagColorFromName, element);
},
};
@@ -29,7 +29,7 @@ function bootstrapTagsinput() {
return scope.$parent[property];
}
- return function(item) {
+ return item => {
return item[property];
};
}
@@ -64,12 +64,12 @@ function bootstrapTagsinput() {
itemText: getItemProperty(scope, attrs.itemtext),
tagClass: angular.isFunction(scope.$parent[attrs.tagclass])
? scope.$parent[attrs.tagclass]
- : function() {
+ : () => {
return attrs.tagclass;
},
});
- select.on('itemAdded', function(event) {
+ select.on('itemAdded', event => {
if (scope.model.indexOf(event.item) === -1) {
scope.model.push(event.item);
if (scope.onTagsUpdated) {
@@ -79,13 +79,13 @@ function bootstrapTagsinput() {
const tagElement = select
.next()
.children('span')
- .filter(function() {
+ .filter(() => {
return $(this).text() === event.item;
});
setColor(event.item, tagElement);
});
- select.on('itemRemoved', function(event) {
+ select.on('itemRemoved', event => {
const idx = scope.model.indexOf(event.item);
if (idx !== -1) {
scope.model.splice(idx, 1);
@@ -97,14 +97,14 @@ function bootstrapTagsinput() {
scope.$watch(
'model',
- function() {
+ () => {
if (!angular.isArray(scope.model)) {
scope.model = [];
}
select.tagsinput('removeAll');
- for (var i = 0; i < scope.model.length; i++) {
+ for (let i = 0; i < scope.model.length; i++) {
select.tagsinput('add', scope.model[i]);
}
},
diff --git a/public/app/core/directives/value_select_dropdown.ts b/public/app/core/directives/value_select_dropdown.ts
index 69504c1bb1b..a75ecd46ad0 100644
--- a/public/app/core/directives/value_select_dropdown.ts
+++ b/public/app/core/directives/value_select_dropdown.ts
@@ -245,7 +245,7 @@ export function valueSelectDropdown($compile, $window, $timeout, $rootScope) {
controller: 'ValueSelectDropdownCtrl',
controllerAs: 'vm',
bindToController: true,
- link: function(scope, elem) {
+ link: (scope, elem) => {
const bodyEl = angular.element($window.document.body);
const linkEl = elem.find('.variable-value-link');
const inputEl = elem.find('input');
@@ -258,7 +258,7 @@ export function valueSelectDropdown($compile, $window, $timeout, $rootScope) {
inputEl.focus();
$timeout(
- function() {
+ () => {
bodyEl.on('click', bodyOnClick);
},
0,
@@ -274,7 +274,7 @@ export function valueSelectDropdown($compile, $window, $timeout, $rootScope) {
function bodyOnClick(e) {
if (elem.has(e.target).length === 0) {
- scope.$apply(function() {
+ scope.$apply(() => {
scope.vm.commitChanges();
});
}
diff --git a/public/app/core/filters/filters.ts b/public/app/core/filters/filters.ts
index 098bda58de9..c4dbf6b7535 100644
--- a/public/app/core/filters/filters.ts
+++ b/public/app/core/filters/filters.ts
@@ -3,22 +3,22 @@ import angular from 'angular';
import moment from 'moment';
import coreModule from '../core_module';
-coreModule.filter('stringSort', function() {
- return function(input) {
+coreModule.filter('stringSort', () => {
+ return input => {
return input.sort();
};
});
-coreModule.filter('slice', function() {
- return function(arr, start, end) {
+coreModule.filter('slice', () => {
+ return (arr, start, end) => {
if (!_.isUndefined(arr)) {
return arr.slice(start, end);
}
};
});
-coreModule.filter('stringify', function() {
- return function(arr) {
+coreModule.filter('stringify', () => {
+ return arr => {
if (_.isObject(arr) && !_.isArray(arr)) {
return angular.toJson(arr);
} else {
@@ -27,8 +27,8 @@ coreModule.filter('stringify', function() {
};
});
-coreModule.filter('moment', function() {
- return function(date, mode) {
+coreModule.filter('moment', () => {
+ return (date, mode) => {
switch (mode) {
case 'ago':
return moment(date).fromNow();
@@ -37,8 +37,8 @@ coreModule.filter('moment', function() {
};
});
-coreModule.filter('noXml', function() {
- const noXml = function(text) {
+coreModule.filter('noXml', () => {
+ const noXml = text => {
return _.isString(text)
? text
.replace(/&/g, '&')
@@ -48,15 +48,15 @@ coreModule.filter('noXml', function() {
.replace(/"/g, '"')
: text;
};
- return function(text) {
+ return text => {
return _.isArray(text) ? _.map(text, noXml) : noXml(text);
};
});
/** @ngInject */
function interpolateTemplateVars(templateSrv) {
- const filterFunc: any = function(text, scope) {
- var scopedVars;
+ const filterFunc: any = (text, scope) => {
+ let scopedVars;
if (scope.ctrl) {
scopedVars = (scope.ctrl.panel || scope.ctrl.row).scopedVars;
} else {
diff --git a/public/app/core/jquery_extended.ts b/public/app/core/jquery_extended.ts
index f6c28c69f35..fa9b1aeb823 100644
--- a/public/app/core/jquery_extended.ts
+++ b/public/app/core/jquery_extended.ts
@@ -4,15 +4,15 @@ import _ from 'lodash';
const $win = $(window);
-$.fn.place_tt = (function() {
+$.fn.place_tt = (() => {
const defaults = {
offset: 5,
};
- return function(x, y, opts) {
+ return function(this: any, x, y, opts) {
opts = $.extend(true, {}, defaults, opts);
- return this.each(function() {
+ return this.each(() => {
const $tooltip = $(this);
let width, height;
@@ -28,7 +28,7 @@ $.fn.place_tt = (function() {
.invoke([
'$compile',
'$rootScope',
- function($compile, $rootScope) {
+ ($compile, $rootScope) => {
const tmpScope = $rootScope.$new(true);
_.extend(tmpScope, opts.scopeData);
diff --git a/public/app/core/lodash_extended.ts b/public/app/core/lodash_extended.ts
index 1a8820fb0db..1fc7d7c341a 100644
--- a/public/app/core/lodash_extended.ts
+++ b/public/app/core/lodash_extended.ts
@@ -4,7 +4,7 @@ import _ from 'lodash';
Mixins :)
*/
_.mixin({
- move: function(array, fromIndex, toIndex) {
+ move: (array, fromIndex, toIndex) => {
array.splice(toIndex, 0, array.splice(fromIndex, 1)[0]);
return array;
},
diff --git a/public/app/core/nav_model_srv.ts b/public/app/core/nav_model_srv.ts
index 8985b2c489c..300a7f0e208 100644
--- a/public/app/core/nav_model_srv.ts
+++ b/public/app/core/nav_model_srv.ts
@@ -38,7 +38,7 @@ export class NavModelSrv {
}
getNav(...args) {
- var children = this.navItems;
+ let children = this.navItems;
const nav = new NavModel();
for (const id of args) {
diff --git a/public/app/core/partials.ts b/public/app/core/partials.ts
index fb70e30f96a..864a3dcfa8a 100644
--- a/public/app/core/partials.ts
+++ b/public/app/core/partials.ts
@@ -1,4 +1,4 @@
-var templates = (require).context('../', true, /\.html$/);
-templates.keys().forEach(function(key) {
+let templates = (require as any).context('../', true, /\.html$/);
+templates.keys().forEach(key => {
templates(key);
});
diff --git a/public/app/core/profiler.ts b/public/app/core/profiler.ts
index 09c0d6843a8..0e738dd3da1 100644
--- a/public/app/core/profiler.ts
+++ b/public/app/core/profiler.ts
@@ -69,7 +69,7 @@ export class Profiler {
// measure digest performance
const rootDigestStart = window.performance.now();
- for (var i = 0; i < 30; i++) {
+ for (let i = 0; i < 30; i++) {
this.$rootScope.$apply();
}
@@ -78,19 +78,19 @@ export class Profiler {
}
getTotalWatcherCount() {
- var count = 0;
- var scopes = 0;
+ let count = 0;
+ let scopes = 0;
const root = $(document.getElementsByTagName('body'));
- const f = function(element) {
+ const f = element => {
if (element.data().hasOwnProperty('$scope')) {
scopes++;
- angular.forEach(element.data().$scope.$$watchers, function() {
+ angular.forEach(element.data().$scope.$$watchers, () => {
count++;
});
}
- angular.forEach(element.children(), function(childElement) {
+ angular.forEach(element.children(), childElement => {
f($(childElement));
});
};
diff --git a/public/app/core/services/alert_srv.ts b/public/app/core/services/alert_srv.ts
index 19ad81667d7..2d447651b75 100644
--- a/public/app/core/services/alert_srv.ts
+++ b/public/app/core/services/alert_srv.ts
@@ -70,7 +70,7 @@ export class AlertSrv {
const newAlertJson = angular.toJson(newAlert);
// remove same alert if it already exists
- _.remove(this.list, function(value) {
+ _.remove(this.list, value => {
return angular.toJson(value) === newAlertJson;
});
diff --git a/public/app/core/services/analytics.ts b/public/app/core/services/analytics.ts
index c3936f45451..be4371adb26 100644
--- a/public/app/core/services/analytics.ts
+++ b/public/app/core/services/analytics.ts
@@ -12,13 +12,14 @@ export class Analytics {
dataType: 'script',
cache: true,
});
- const ga = ((window).ga =
- (window).ga ||
+ const ga = ((window as any).ga =
+ (window as any).ga ||
+ //tslint:disable-next-line:only-arrow-functions
function() {
(ga.q = ga.q || []).push(arguments);
});
ga.l = +new Date();
- ga('create', (config).googleAnalyticsId, 'auto');
+ ga('create', (config as any).googleAnalyticsId, 'auto');
ga('set', 'anonymizeIp', true);
return ga;
}
@@ -26,7 +27,7 @@ export class Analytics {
init() {
this.$rootScope.$on('$viewContentLoaded', () => {
const track = { page: this.$location.url() };
- const ga = (window).ga || this.gaInit();
+ const ga = (window as any).ga || this.gaInit();
ga('set', track);
ga('send', 'pageview');
});
@@ -35,7 +36,7 @@ export class Analytics {
/** @ngInject */
function startAnalytics(googleAnalyticsSrv) {
- if ((config).googleAnalyticsId) {
+ if ((config as any).googleAnalyticsId) {
googleAnalyticsSrv.init();
}
}
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 99f8358fdfc..2a50a1b1f12 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -43,7 +43,7 @@ export class BackendSrv {
return;
}
- var data = err.data || { message: 'Unexpected error' };
+ let data = err.data || { message: 'Unexpected error' };
if (_.isString(data)) {
data = { message: data };
}
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index c2742c82958..c4134598175 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -8,6 +8,8 @@ export class User {
isSignedIn: any;
orgRole: any;
orgId: number;
+ orgName: string;
+ orgCount: number;
timezone: string;
helpFlags1: number;
lightTheme: boolean;
@@ -62,6 +64,6 @@ export class ContextSrv {
const contextSrv = new ContextSrv();
export { contextSrv };
-coreModule.factory('contextSrv', function() {
+coreModule.factory('contextSrv', () => {
return contextSrv;
});
diff --git a/public/app/core/services/impression_srv.ts b/public/app/core/services/impression_srv.ts
index bbebf37c149..57464f773b3 100644
--- a/public/app/core/services/impression_srv.ts
+++ b/public/app/core/services/impression_srv.ts
@@ -7,7 +7,7 @@ export class ImpressionSrv {
addDashboardImpression(dashboardId) {
const impressionsKey = this.impressionKey(config);
- var impressions = [];
+ let impressions = [];
if (store.exists(impressionsKey)) {
impressions = JSON.parse(store.get(impressionsKey));
if (!_.isArray(impressions)) {
@@ -28,7 +28,7 @@ export class ImpressionSrv {
}
getDashboardOpened() {
- var impressions = store.get(this.impressionKey(config)) || '[]';
+ let impressions = store.get(this.impressionKey(config)) || '[]';
impressions = JSON.parse(impressions);
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index cad538d13aa..d05e9b0c21c 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -77,15 +77,15 @@ export class KeybindingSrv {
appEvents.emit('hide-modal');
- if (!this.modalOpen) {
- if (this.timepickerOpen) {
- this.$rootScope.appEvent('closeTimepicker');
- this.timepickerOpen = false;
- } else {
- this.$rootScope.appEvent('panel-change-view', { fullscreen: false, edit: false });
- }
- } else {
+ if (this.modalOpen) {
this.modalOpen = false;
+ return;
+ }
+
+ if (this.timepickerOpen) {
+ this.$rootScope.appEvent('closeTimepicker');
+ this.timepickerOpen = false;
+ return;
}
// close settings view
@@ -93,6 +93,16 @@ export class KeybindingSrv {
if (search.editview) {
delete search.editview;
this.$location.search(search);
+ return;
+ }
+
+ if (search.fullscreen) {
+ this.$rootScope.appEvent('panel-change-view', { fullscreen: false, edit: false });
+ return;
+ }
+
+ if (search.kiosk) {
+ this.$rootScope.appEvent('toggle-kiosk-mode', { exit: true });
}
}
diff --git a/public/app/core/services/ng_react.ts b/public/app/core/services/ng_react.ts
index 8c262275ffa..6a712b29dab 100644
--- a/public/app/core/services/ng_react.ts
+++ b/public/app/core/services/ng_react.ts
@@ -27,14 +27,14 @@ function getReactComponent(name, $injector) {
}
// ensure the specified React component is accessible, and fail fast if it's not
- var reactComponent;
+ let reactComponent;
try {
reactComponent = $injector.get(name);
} catch (e) {}
if (!reactComponent) {
try {
- reactComponent = name.split('.').reduce(function(current, namePart) {
+ reactComponent = name.split('.').reduce((current, namePart) => {
return current[namePart];
}, window);
} catch (e) {}
@@ -52,13 +52,14 @@ function applied(fn, scope) {
if (fn.wrappedInApply) {
return fn;
}
+ //tslint:disable-next-line:only-arrow-functions
const wrapped: any = function() {
const args = arguments;
const phase = scope.$root.$$phase;
if (phase === '$apply' || phase === '$digest') {
return fn.apply(null, args);
} else {
- return scope.$apply(function() {
+ return scope.$apply(() => {
return fn.apply(null, args);
});
}
@@ -80,7 +81,7 @@ function applied(fn, scope) {
* @returns {Object} props with the functions wrapped in scope.$apply
*/
function applyFunctions(obj, scope, propsConfig?) {
- return Object.keys(obj || {}).reduce(function(prev, key) {
+ return Object.keys(obj || {}).reduce((prev, key) => {
const value = obj[key];
const config = (propsConfig || {})[key] || {};
/**
@@ -108,7 +109,7 @@ function watchProps(watchDepth, scope, watchExpressions, listener) {
const watchGroupExpressions = [];
- watchExpressions.forEach(function(expr) {
+ watchExpressions.forEach(expr => {
const actualExpr = getPropExpression(expr);
const exprWatchDepth = getPropWatchDepth(watchDepth, expr);
@@ -134,7 +135,7 @@ function watchProps(watchDepth, scope, watchExpressions, listener) {
// render React component, with scope[attrs.props] being passed in as the component props
function renderComponent(component, props, scope, elem) {
- scope.$evalAsync(function() {
+ scope.$evalAsync(() => {
ReactDOM.render(React.createElement(component, props), elem[0]);
});
}
@@ -156,7 +157,7 @@ function getPropExpression(prop) {
// find the normalized attribute knowing that React props accept any type of capitalization
function findAttribute(attrs, propName) {
- const index = Object.keys(attrs).filter(function(attr) {
+ const index = Object.keys(attrs).filter(attr => {
return attr.toLowerCase() === propName.toLowerCase();
})[0];
return attrs[index];
@@ -186,14 +187,14 @@ function getPropWatchDepth(defaultWatch, prop) {
// }
// }));
//
-const reactComponent = function($injector) {
+const reactComponent = $injector => {
return {
restrict: 'E',
replace: true,
link: function(scope, elem, attrs) {
const reactComponent = getReactComponent(attrs.name, $injector);
- const renderMyComponent = function() {
+ const renderMyComponent = () => {
const scopeProps = scope.$eval(attrs.props);
const props = applyFunctions(scopeProps, scope);
@@ -204,7 +205,7 @@ const reactComponent = function($injector) {
attrs.props ? watchProps(attrs.watchDepth, scope, [attrs.props], renderMyComponent) : renderMyComponent();
// cleanup when scope is destroyed
- scope.$on('$destroy', function() {
+ scope.$on('$destroy', () => {
if (!attrs.onScopeDestroy) {
ReactDOM.unmountComponentAtNode(elem[0]);
} else {
@@ -243,8 +244,8 @@ const reactComponent = function($injector) {
//
// searchSrvStub, { isEditor: true });
+ return new ManageDashboardsCtrl({}, { getNav: () => {} }, searchSrvStub as SearchSrv, { isEditor: true });
}
diff --git a/public/app/core/specs/search.test.ts b/public/app/core/specs/search.test.ts
index 3cc789b3cc5..fa60d373e2f 100644
--- a/public/app/core/specs/search.test.ts
+++ b/public/app/core/specs/search.test.ts
@@ -12,7 +12,7 @@ describe('SearchCtrl', () => {
search: (options: any) => {},
getDashboardTags: () => {},
};
- const ctrl = new SearchCtrl({ $on: () => {} }, {}, {}, searchSrvStub);
+ const ctrl = new SearchCtrl({ $on: () => {} }, {}, {}, searchSrvStub as SearchSrv);
describe('Given an empty result', () => {
beforeEach(() => {
diff --git a/public/app/core/specs/table_model.test.ts b/public/app/core/specs/table_model.test.ts
index b88bad12227..990daaaa2da 100644
--- a/public/app/core/specs/table_model.test.ts
+++ b/public/app/core/specs/table_model.test.ts
@@ -26,7 +26,7 @@ describe('when sorting table desc', () => {
});
describe('when sorting table asc', () => {
- var table;
+ let table;
const panel = {
sort: { col: 1, desc: false },
};
@@ -46,8 +46,8 @@ describe('when sorting table asc', () => {
});
describe('when sorting with nulls', () => {
- var table;
- var values;
+ let table;
+ let values;
beforeEach(() => {
table = new TableModel();
diff --git a/public/app/core/specs/time_series.test.ts b/public/app/core/specs/time_series.test.ts
index 605c8fd0a2e..6cf7399c059 100644
--- a/public/app/core/specs/time_series.test.ts
+++ b/public/app/core/specs/time_series.test.ts
@@ -1,33 +1,33 @@
import TimeSeries from 'app/core/time_series2';
import { updateLegendValues } from 'app/core/time_series2';
-describe('TimeSeries', function() {
+describe('TimeSeries', () => {
let points, series;
const yAxisFormats = ['short', 'ms'];
let testData;
- beforeEach(function() {
+ beforeEach(() => {
testData = {
alias: 'test',
datapoints: [[1, 2], [null, 3], [10, 4], [8, 5]],
};
});
- describe('when getting flot pairs', function() {
- it('with connected style, should ignore nulls', function() {
+ describe('when getting flot pairs', () => {
+ it('with connected style, should ignore nulls', () => {
series = new TimeSeries(testData);
points = series.getFlotPairs('connected', yAxisFormats);
expect(points.length).toBe(3);
});
- it('with null as zero style, should replace nulls with zero', function() {
+ it('with null as zero style, should replace nulls with zero', () => {
series = new TimeSeries(testData);
points = series.getFlotPairs('null as zero', yAxisFormats);
expect(points.length).toBe(4);
expect(points[1][1]).toBe(0);
});
- it('if last is null current should pick next to last', function() {
+ it('if last is null current should pick next to last', () => {
series = new TimeSeries({
datapoints: [[10, 1], [null, 2]],
});
@@ -35,7 +35,7 @@ describe('TimeSeries', function() {
expect(series.stats.current).toBe(10);
});
- it('max value should work for negative values', function() {
+ it('max value should work for negative values', () => {
series = new TimeSeries({
datapoints: [[-10, 1], [-4, 2]],
});
@@ -43,13 +43,13 @@ describe('TimeSeries', function() {
expect(series.stats.max).toBe(-4);
});
- it('average value should ignore nulls', function() {
+ it('average value should ignore nulls', () => {
series = new TimeSeries(testData);
series.getFlotPairs('null', yAxisFormats);
expect(series.stats.avg).toBe(6.333333333333333);
});
- it('the delta value should account for nulls', function() {
+ it('the delta value should account for nulls', () => {
series = new TimeSeries({
datapoints: [[1, 2], [3, 3], [null, 4], [10, 5], [15, 6]],
});
@@ -57,7 +57,7 @@ describe('TimeSeries', function() {
expect(series.stats.delta).toBe(14);
});
- it('the delta value should account for nulls on first', function() {
+ it('the delta value should account for nulls on first', () => {
series = new TimeSeries({
datapoints: [[null, 2], [1, 3], [10, 4], [15, 5]],
});
@@ -65,7 +65,7 @@ describe('TimeSeries', function() {
expect(series.stats.delta).toBe(14);
});
- it('the delta value should account for nulls on last', function() {
+ it('the delta value should account for nulls on last', () => {
series = new TimeSeries({
datapoints: [[1, 2], [5, 3], [10, 4], [null, 5]],
});
@@ -73,7 +73,7 @@ describe('TimeSeries', function() {
expect(series.stats.delta).toBe(9);
});
- it('the delta value should account for resets', function() {
+ it('the delta value should account for resets', () => {
series = new TimeSeries({
datapoints: [[1, 2], [5, 3], [10, 4], [0, 5], [10, 6]],
});
@@ -81,7 +81,7 @@ describe('TimeSeries', function() {
expect(series.stats.delta).toBe(19);
});
- it('the delta value should account for resets on last', function() {
+ it('the delta value should account for resets on last', () => {
series = new TimeSeries({
datapoints: [[1, 2], [2, 3], [10, 4], [8, 5]],
});
@@ -89,13 +89,13 @@ describe('TimeSeries', function() {
expect(series.stats.delta).toBe(17);
});
- it('the range value should be max - min', function() {
+ it('the range value should be max - min', () => {
series = new TimeSeries(testData);
series.getFlotPairs('null', yAxisFormats);
expect(series.stats.range).toBe(9);
});
- it('first value should ingone nulls', function() {
+ it('first value should ingone nulls', () => {
series = new TimeSeries(testData);
series.getFlotPairs('null', yAxisFormats);
expect(series.stats.first).toBe(1);
@@ -106,13 +106,13 @@ describe('TimeSeries', function() {
expect(series.stats.first).toBe(1);
});
- it('with null as zero style, average value should treat nulls as 0', function() {
+ it('with null as zero style, average value should treat nulls as 0', () => {
series = new TimeSeries(testData);
series.getFlotPairs('null as zero', yAxisFormats);
expect(series.stats.avg).toBe(4.75);
});
- it('average value should be null if all values is null', function() {
+ it('average value should be null if all values is null', () => {
series = new TimeSeries({
datapoints: [[null, 2], [null, 3], [null, 4], [null, 5]],
});
@@ -120,7 +120,7 @@ describe('TimeSeries', function() {
expect(series.stats.avg).toBe(null);
});
- it('calculates timeStep', function() {
+ it('calculates timeStep', () => {
series = new TimeSeries({
datapoints: [[null, 1], [null, 2], [null, 3]],
});
@@ -135,190 +135,190 @@ describe('TimeSeries', function() {
});
});
- describe('When checking if ms resolution is needed', function() {
- describe('msResolution with second resolution timestamps', function() {
- beforeEach(function() {
+ describe('When checking if ms resolution is needed', () => {
+ describe('msResolution with second resolution timestamps', () => {
+ beforeEach(() => {
series = new TimeSeries({
datapoints: [[45, 1234567890], [60, 1234567899]],
});
});
- it('should set hasMsResolution to false', function() {
+ it('should set hasMsResolution to false', () => {
expect(series.hasMsResolution).toBe(false);
});
});
- describe('msResolution with millisecond resolution timestamps', function() {
- beforeEach(function() {
+ describe('msResolution with millisecond resolution timestamps', () => {
+ beforeEach(() => {
series = new TimeSeries({
datapoints: [[55, 1236547890001], [90, 1234456709000]],
});
});
- it('should show millisecond resolution tooltip', function() {
+ it('should show millisecond resolution tooltip', () => {
expect(series.hasMsResolution).toBe(true);
});
});
- describe('msResolution with millisecond resolution timestamps but with trailing zeroes', function() {
- beforeEach(function() {
+ describe('msResolution with millisecond resolution timestamps but with trailing zeroes', () => {
+ beforeEach(() => {
series = new TimeSeries({
datapoints: [[45, 1234567890000], [60, 1234567899000]],
});
});
- it('should not show millisecond resolution tooltip', function() {
+ it('should not show millisecond resolution tooltip', () => {
expect(series.hasMsResolution).toBe(false);
});
});
});
- describe('can detect if series contains ms precision', function() {
- var fakedata;
+ describe('can detect if series contains ms precision', () => {
+ let fakedata;
- beforeEach(function() {
+ beforeEach(() => {
fakedata = testData;
});
- it('missing datapoint with ms precision', function() {
+ it('missing datapoint with ms precision', () => {
fakedata.datapoints[0] = [1337, 1234567890000];
series = new TimeSeries(fakedata);
expect(series.isMsResolutionNeeded()).toBe(false);
});
- it('contains datapoint with ms precision', function() {
+ it('contains datapoint with ms precision', () => {
fakedata.datapoints[0] = [1337, 1236547890001];
series = new TimeSeries(fakedata);
expect(series.isMsResolutionNeeded()).toBe(true);
});
});
- describe('series overrides', function() {
- var series;
- beforeEach(function() {
+ describe('series overrides', () => {
+ let series;
+ beforeEach(() => {
series = new TimeSeries(testData);
});
- describe('fill & points', function() {
- beforeEach(function() {
+ describe('fill & points', () => {
+ beforeEach(() => {
series.alias = 'test';
series.applySeriesOverrides([{ alias: 'test', fill: 0, points: true }]);
});
- it('should set fill zero, and enable points', function() {
+ it('should set fill zero, and enable points', () => {
expect(series.lines.fill).toBe(0.001);
expect(series.points.show).toBe(true);
});
});
- describe('series option overrides, bars, true & lines false', function() {
- beforeEach(function() {
+ describe('series option overrides, bars, true & lines false', () => {
+ beforeEach(() => {
series.alias = 'test';
series.applySeriesOverrides([{ alias: 'test', bars: true, lines: false }]);
});
- it('should disable lines, and enable bars', function() {
+ it('should disable lines, and enable bars', () => {
expect(series.lines.show).toBe(false);
expect(series.bars.show).toBe(true);
});
});
- describe('series option overrides, linewidth, stack', function() {
- beforeEach(function() {
+ describe('series option overrides, linewidth, stack', () => {
+ beforeEach(() => {
series.alias = 'test';
series.applySeriesOverrides([{ alias: 'test', linewidth: 5, stack: false }]);
});
- it('should disable stack, and set lineWidth', function() {
+ it('should disable stack, and set lineWidth', () => {
expect(series.stack).toBe(false);
expect(series.lines.lineWidth).toBe(5);
});
});
- describe('series option overrides, dashes and lineWidth', function() {
- beforeEach(function() {
+ describe('series option overrides, dashes and lineWidth', () => {
+ beforeEach(() => {
series.alias = 'test';
series.applySeriesOverrides([{ alias: 'test', linewidth: 5, dashes: true }]);
});
- it('should enable dashes, set dashes lineWidth to 5 and lines lineWidth to 0', function() {
+ it('should enable dashes, set dashes lineWidth to 5 and lines lineWidth to 0', () => {
expect(series.dashes.show).toBe(true);
expect(series.dashes.lineWidth).toBe(5);
expect(series.lines.lineWidth).toBe(0);
});
});
- describe('series option overrides, fill below to', function() {
- beforeEach(function() {
+ describe('series option overrides, fill below to', () => {
+ beforeEach(() => {
series.alias = 'test';
series.applySeriesOverrides([{ alias: 'test', fillBelowTo: 'min' }]);
});
- it('should disable line fill and add fillBelowTo', function() {
+ it('should disable line fill and add fillBelowTo', () => {
expect(series.fillBelowTo).toBe('min');
});
});
- describe('series option overrides, pointradius, steppedLine', function() {
- beforeEach(function() {
+ describe('series option overrides, pointradius, steppedLine', () => {
+ beforeEach(() => {
series.alias = 'test';
series.applySeriesOverrides([{ alias: 'test', pointradius: 5, steppedLine: true }]);
});
- it('should set pointradius, and set steppedLine', function() {
+ it('should set pointradius, and set steppedLine', () => {
expect(series.points.radius).toBe(5);
expect(series.lines.steps).toBe(true);
});
});
- describe('override match on regex', function() {
- beforeEach(function() {
+ describe('override match on regex', () => {
+ beforeEach(() => {
series.alias = 'test_01';
series.applySeriesOverrides([{ alias: '/.*01/', lines: false }]);
});
- it('should match second series', function() {
+ it('should match second series', () => {
expect(series.lines.show).toBe(false);
});
});
- describe('override series y-axis, and z-index', function() {
- beforeEach(function() {
+ describe('override series y-axis, and z-index', () => {
+ beforeEach(() => {
series.alias = 'test';
series.applySeriesOverrides([{ alias: 'test', yaxis: 2, zindex: 2 }]);
});
- it('should set yaxis', function() {
+ it('should set yaxis', () => {
expect(series.yaxis).toBe(2);
});
- it('should set zindex', function() {
+ it('should set zindex', () => {
expect(series.zindex).toBe(2);
});
});
- describe('override color', function() {
- beforeEach(function() {
+ describe('override color', () => {
+ beforeEach(() => {
series.applySeriesOverrides([{ alias: 'test', color: '#112233' }]);
});
- it('should set color', function() {
+ it('should set color', () => {
expect(series.color).toBe('#112233');
});
- it('should set bars.fillColor', function() {
+ it('should set bars.fillColor', () => {
expect(series.bars.fillColor).toBe('#112233');
});
});
});
- describe('value formatter', function() {
- var series;
- beforeEach(function() {
+ describe('value formatter', () => {
+ let series;
+ beforeEach(() => {
series = new TimeSeries(testData);
});
- it('should format non-numeric values as empty string', function() {
+ it('should format non-numeric values as empty string', () => {
expect(series.formatValue(null)).toBe('');
expect(series.formatValue(undefined)).toBe('');
expect(series.formatValue(NaN)).toBe('');
@@ -327,10 +327,10 @@ describe('TimeSeries', function() {
});
});
- describe('legend decimals', function() {
+ describe('legend decimals', () => {
let series, panel;
const height = 200;
- beforeEach(function() {
+ beforeEach(() => {
testData = {
alias: 'test',
datapoints: [[1, 2], [0, 3], [10, 4], [8, 5]],
@@ -347,14 +347,14 @@ describe('TimeSeries', function() {
};
});
- it('should set decimals based on Y axis (expect calculated decimals = 1)', function() {
+ it('should set decimals based on Y axis (expect calculated decimals = 1)', () => {
const data = [series];
// Expect ticks with this data will have decimals = 1
updateLegendValues(data, panel, height);
expect(data[0].decimals).toBe(2);
});
- it('should set decimals based on Y axis to 0 if calculated decimals = 0)', function() {
+ it('should set decimals based on Y axis to 0 if calculated decimals = 0)', () => {
testData.datapoints = [[10, 2], [0, 3], [100, 4], [80, 5]];
series = new TimeSeries(testData);
series.getFlotPairs();
@@ -363,14 +363,14 @@ describe('TimeSeries', function() {
expect(data[0].decimals).toBe(0);
});
- it('should set decimals to Y axis decimals + 1', function() {
+ it('should set decimals to Y axis decimals + 1', () => {
panel.yaxes[0].decimals = 2;
const data = [series];
updateLegendValues(data, panel, height);
expect(data[0].decimals).toBe(3);
});
- it('should set decimals to legend decimals value if it was set explicitly', function() {
+ it('should set decimals to legend decimals value if it was set explicitly', () => {
panel.decimals = 3;
const data = [series];
updateLegendValues(data, panel, height);
diff --git a/public/app/core/table_model.ts b/public/app/core/table_model.ts
index 0c85a0293dd..f8b96d0537b 100644
--- a/public/app/core/table_model.ts
+++ b/public/app/core/table_model.ts
@@ -26,7 +26,7 @@ export default class TableModel {
return;
}
- this.rows.sort(function(a, b) {
+ this.rows.sort((a, b) => {
a = a[options.col];
b = b[options.col];
// Sort null or undefined seperately from comparable values
diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts
index f8c27cfc67d..76af75d0935 100644
--- a/public/app/core/time_series2.ts
+++ b/public/app/core/time_series2.ts
@@ -124,7 +124,7 @@ export default class TimeSeries {
delete this.stack;
delete this.bars.show;
- for (var i = 0; i < overrides.length; i++) {
+ for (let i = 0; i < overrides.length; i++) {
const override = overrides[i];
if (!matchSeriesOverride(override.alias, this.alias)) {
continue;
@@ -211,14 +211,14 @@ export default class TimeSeries {
const ignoreNulls = fillStyle === 'connected';
const nullAsZero = fillStyle === 'null as zero';
- var currentTime;
- var currentValue;
- var nonNulls = 0;
- var previousTime;
- var previousValue = 0;
- var previousDeltaUp = true;
+ let currentTime;
+ let currentValue;
+ let nonNulls = 0;
+ let previousTime;
+ let previousValue = 0;
+ let previousDeltaUp = true;
- for (var i = 0; i < this.datapoints.length; i++) {
+ for (let i = 0; i < this.datapoints.length; i++) {
currentValue = this.datapoints[i][0];
currentTime = this.datapoints[i][1];
@@ -328,7 +328,7 @@ export default class TimeSeries {
}
isMsResolutionNeeded() {
- for (var i = 0; i < this.datapoints.length; i++) {
+ for (let i = 0; i < this.datapoints.length; i++) {
if (this.datapoints[i][1] !== null) {
const timestamp = this.datapoints[i][1].toString();
if (timestamp.length === 13 && timestamp % 1000 !== 0) {
diff --git a/public/app/core/utils/css_loader.ts b/public/app/core/utils/css_loader.ts
index b8aaef47085..b4c26293bb8 100644
--- a/public/app/core/utils/css_loader.ts
+++ b/public/app/core/utils/css_loader.ts
@@ -9,9 +9,9 @@ for (let i = 0; i < links.length; i++) {
}
const isWebkit = !!window.navigator.userAgent.match(/AppleWebKit\/([^ ;]*)/);
-const webkitLoadCheck = function(link, callback) {
- setTimeout(function() {
- for (var i = 0; i < document.styleSheets.length; i++) {
+const webkitLoadCheck = (link, callback) => {
+ setTimeout(() => {
+ for (let i = 0; i < document.styleSheets.length; i++) {
const sheet = document.styleSheets[i];
if (sheet.href === link.href) {
return callback();
@@ -21,19 +21,19 @@ const webkitLoadCheck = function(link, callback) {
}, 10);
};
-const noop = function() {};
+const noop = () => {};
-const loadCSS = function(url) {
- return new Promise(function(resolve, reject) {
+const loadCSS = url => {
+ return new Promise((resolve, reject) => {
const link = document.createElement('link');
- const timeout = setTimeout(function() {
+ const timeout = setTimeout(() => {
reject('Unable to load CSS');
}, waitSeconds * 1000);
- const _callback = function(error) {
+ const _callback = error => {
clearTimeout(timeout);
link.onload = link.onerror = noop;
- setTimeout(function() {
+ setTimeout(() => {
if (error) {
reject(error);
} else {
@@ -47,14 +47,14 @@ const loadCSS = function(url) {
link.href = url;
if (!isWebkit) {
- link.onload = function() {
+ link.onload = () => {
_callback(undefined);
};
} else {
webkitLoadCheck(link, _callback);
}
- link.onerror = function(evt: any) {
+ link.onerror = (evt: any) => {
_callback(evt.error || new Error('Error loading CSS file.'));
};
@@ -68,7 +68,7 @@ export function fetch(load): any {
}
// don't reload styles loaded in the head
- for (var i = 0; i < linkHrefs.length; i++) {
+ for (let i = 0; i < linkHrefs.length; i++) {
if (load.address === linkHrefs[i]) {
return '';
}
diff --git a/public/app/core/utils/datemath.ts b/public/app/core/utils/datemath.ts
index 045b5711beb..cdc529146a1 100644
--- a/public/app/core/utils/datemath.ts
+++ b/public/app/core/utils/datemath.ts
@@ -14,10 +14,10 @@ export function parse(text, roundUp?, timezone?) {
return moment(text);
}
- var time;
- var mathString = '';
- var index;
- var parseString;
+ let time;
+ let mathString = '';
+ let index;
+ let parseString;
if (text.substring(0, 3) === 'now') {
if (timezone === 'utc') {
@@ -61,14 +61,14 @@ export function isValid(text) {
export function parseDateMath(mathString, time, roundUp?) {
const dateTime = time;
- var i = 0;
+ let i = 0;
const len = mathString.length;
while (i < len) {
const c = mathString.charAt(i++);
- var type;
- var num;
- var unit;
+ let type;
+ let num;
+ let unit;
if (c === '/') {
type = 0;
diff --git a/public/app/core/utils/file_export.ts b/public/app/core/utils/file_export.ts
index 298a06c64fd..4fbdea0f953 100644
--- a/public/app/core/utils/file_export.ts
+++ b/public/app/core/utils/file_export.ts
@@ -84,7 +84,7 @@ export function convertSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAU
formatSpecialHeader(excel) +
formatRow(
['Time'].concat(
- seriesList.map(function(val) {
+ seriesList.map(val => {
return val.alias;
})
)
@@ -97,7 +97,7 @@ export function convertSeriesListToCsvColumns(seriesList, dateTimeFormat = DEFAU
const timestamp = moment(seriesList[0].datapoints[i][POINT_TIME_INDEX]).format(dateTimeFormat);
text += formatRow(
[timestamp].concat(
- seriesList.map(function(series) {
+ seriesList.map(series => {
return series.datapoints[i][POINT_VALUE_INDEX];
})
),
diff --git a/public/app/core/utils/flatten.ts b/public/app/core/utils/flatten.ts
index 3350f5f6c33..38601f463aa 100644
--- a/public/app/core/utils/flatten.ts
+++ b/public/app/core/utils/flatten.ts
@@ -10,7 +10,7 @@ export default function flatten(target, opts): any {
const output = {};
function step(object, prev) {
- Object.keys(object).forEach(function(key) {
+ Object.keys(object).forEach(key => {
const value = object[key];
const isarray = opts.safe && Array.isArray(value);
const type = Object.prototype.toString.call(value);
diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts
index 9f30972bc61..bd69f2e89d9 100644
--- a/public/app/core/utils/kbn.ts
+++ b/public/app/core/utils/kbn.ts
@@ -5,13 +5,13 @@ const kbn: any = {};
kbn.valueFormats = {};
-kbn.regexEscape = function(value) {
+kbn.regexEscape = value => {
return value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&');
};
///// HELPER FUNCTIONS /////
-kbn.round_interval = function(interval) {
+kbn.round_interval = interval => {
switch (true) {
// 0.015s
case interval < 15:
@@ -102,7 +102,7 @@ kbn.round_interval = function(interval) {
}
};
-kbn.secondsToHms = function(seconds) {
+kbn.secondsToHms = seconds => {
const numyears = Math.floor(seconds / 31536000);
if (numyears) {
return numyears + 'y';
@@ -131,7 +131,7 @@ kbn.secondsToHms = function(seconds) {
return 'less than a millisecond'; //'just now' //or other string you like;
};
-kbn.secondsToHhmmss = function(seconds) {
+kbn.secondsToHhmmss = seconds => {
const strings = [];
const numhours = Math.floor(seconds / 3600);
const numminutes = Math.floor((seconds % 3600) / 60);
@@ -142,11 +142,11 @@ kbn.secondsToHhmmss = function(seconds) {
return strings.join(':');
};
-kbn.to_percent = function(nr, outof) {
+kbn.to_percent = (nr, outof) => {
return Math.floor(nr / outof * 10000) / 100 + '%';
};
-kbn.addslashes = function(str) {
+kbn.addslashes = str => {
str = str.replace(/\\/g, '\\\\');
str = str.replace(/\'/g, "\\'");
str = str.replace(/\"/g, '\\"');
@@ -168,9 +168,9 @@ kbn.intervals_in_seconds = {
ms: 0.001,
};
-kbn.calculateInterval = function(range, resolution, lowLimitInterval) {
- var lowLimitMs = 1; // 1 millisecond default low limit
- var intervalMs;
+kbn.calculateInterval = (range, resolution, lowLimitInterval) => {
+ let lowLimitMs = 1; // 1 millisecond default low limit
+ let intervalMs;
if (lowLimitInterval) {
if (lowLimitInterval[0] === '>') {
@@ -190,7 +190,7 @@ kbn.calculateInterval = function(range, resolution, lowLimitInterval) {
};
};
-kbn.describe_interval = function(str) {
+kbn.describe_interval = str => {
const matches = str.match(kbn.interval_regex);
if (!matches || !_.has(kbn.intervals_in_seconds, matches[2])) {
throw new Error('Invalid interval string, expecting a number followed by one of "Mwdhmsy"');
@@ -203,17 +203,17 @@ kbn.describe_interval = function(str) {
}
};
-kbn.interval_to_ms = function(str) {
+kbn.interval_to_ms = str => {
const info = kbn.describe_interval(str);
return info.sec * 1000 * info.count;
};
-kbn.interval_to_seconds = function(str) {
+kbn.interval_to_seconds = str => {
const info = kbn.describe_interval(str);
return info.sec * info.count;
};
-kbn.query_color_dot = function(color, diameter) {
+kbn.query_color_dot = (color, diameter) => {
return (
'
2)
*/
export function getStringPrecision(num: string): number {
- const dot_index = num.indexOf('.');
- if (dot_index === -1) {
+ const dotIndex = num.indexOf('.');
+ if (dotIndex === -1) {
return 0;
} else {
- return num.length - dot_index - 1;
+ return num.length - dotIndex - 1;
}
}
diff --git a/public/app/core/utils/url.ts b/public/app/core/utils/url.ts
index 857e76d9094..04c3e9a4308 100644
--- a/public/app/core/utils/url.ts
+++ b/public/app/core/utils/url.ts
@@ -6,11 +6,11 @@ export function toUrlParams(a) {
const s = [];
const rbracket = /\[\]$/;
- const isArray = function(obj) {
+ const isArray = obj => {
return Object.prototype.toString.call(obj) === '[object Array]';
};
- const add = function(k, v) {
+ const add = (k, v) => {
v = typeof v === 'function' ? v() : v === null ? '' : v === undefined ? '' : v;
if (typeof v !== 'boolean') {
s[s.length] = encodeURIComponent(k) + '=' + encodeURIComponent(v);
@@ -19,8 +19,8 @@ export function toUrlParams(a) {
}
};
- const buildParams = function(prefix, obj) {
- var i, len, key;
+ const buildParams = (prefix, obj) => {
+ let i, len, key;
if (prefix) {
if (isArray(obj)) {
diff --git a/public/app/core/utils/version.ts b/public/app/core/utils/version.ts
index 8b249563d86..1131e1d2ab8 100644
--- a/public/app/core/utils/version.ts
+++ b/public/app/core/utils/version.ts
@@ -29,6 +29,6 @@ export class SemVersion {
}
export function isVersionGtOrEq(a: string, b: string): boolean {
- const a_semver = new SemVersion(a);
- return a_semver.isGtOrEq(b);
+ const aSemver = new SemVersion(a);
+ return aSemver.isGtOrEq(b);
}
diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/admin.ts
index bdbb887817e..00e98821779 100644
--- a/public/app/features/admin/admin.ts
+++ b/public/app/features/admin/admin.ts
@@ -8,11 +8,11 @@ import coreModule from 'app/core/core_module';
class AdminSettingsCtrl {
navModel: any;
- /** @ngInject **/
+ /** @ngInject */
constructor($scope, backendSrv, navModelSrv) {
this.navModel = navModelSrv.getNav('cfg', 'admin', 'server-settings', 1);
- backendSrv.get('/api/admin/settings').then(function(settings) {
+ backendSrv.get('/api/admin/settings').then(settings => {
$scope.settings = settings;
});
}
@@ -21,7 +21,7 @@ class AdminSettingsCtrl {
class AdminHomeCtrl {
navModel: any;
- /** @ngInject **/
+ /** @ngInject */
constructor(navModelSrv) {
this.navModel = navModelSrv.getNav('cfg', 'admin', 1);
}
diff --git a/public/app/features/admin/admin_edit_org_ctrl.ts b/public/app/features/admin/admin_edit_org_ctrl.ts
index d1e201dbe58..ec3f8548023 100644
--- a/public/app/features/admin/admin_edit_org_ctrl.ts
+++ b/public/app/features/admin/admin_edit_org_ctrl.ts
@@ -3,7 +3,7 @@ import angular from 'angular';
export class AdminEditOrgCtrl {
/** @ngInject */
constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
- $scope.init = function() {
+ $scope.init = () => {
$scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs', 1);
if ($routeParams.id) {
@@ -12,34 +12,34 @@ export class AdminEditOrgCtrl {
}
};
- $scope.getOrg = function(id) {
- backendSrv.get('/api/orgs/' + id).then(function(org) {
+ $scope.getOrg = id => {
+ backendSrv.get('/api/orgs/' + id).then(org => {
$scope.org = org;
});
};
- $scope.getOrgUsers = function(id) {
- backendSrv.get('/api/orgs/' + id + '/users').then(function(orgUsers) {
+ $scope.getOrgUsers = id => {
+ backendSrv.get('/api/orgs/' + id + '/users').then(orgUsers => {
$scope.orgUsers = orgUsers;
});
};
- $scope.update = function() {
+ $scope.update = () => {
if (!$scope.orgDetailsForm.$valid) {
return;
}
- backendSrv.put('/api/orgs/' + $scope.org.id, $scope.org).then(function() {
+ backendSrv.put('/api/orgs/' + $scope.org.id, $scope.org).then(() => {
$location.path('/admin/orgs');
});
};
- $scope.updateOrgUser = function(orgUser) {
+ $scope.updateOrgUser = orgUser => {
backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId, orgUser);
};
- $scope.removeOrgUser = function(orgUser) {
- backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId).then(function() {
+ $scope.removeOrgUser = orgUser => {
+ backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId).then(() => {
$scope.getOrgUsers($scope.org.id);
});
};
diff --git a/public/app/features/admin/admin_edit_user_ctrl.ts b/public/app/features/admin/admin_edit_user_ctrl.ts
index b84b690d44a..c34ccdc1cad 100644
--- a/public/app/features/admin/admin_edit_user_ctrl.ts
+++ b/public/app/features/admin/admin_edit_user_ctrl.ts
@@ -9,72 +9,72 @@ export class AdminEditUserCtrl {
$scope.permissions = {};
$scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-users', 1);
- $scope.init = function() {
+ $scope.init = () => {
if ($routeParams.id) {
$scope.getUser($routeParams.id);
$scope.getUserOrgs($routeParams.id);
}
};
- $scope.getUser = function(id) {
- backendSrv.get('/api/users/' + id).then(function(user) {
+ $scope.getUser = id => {
+ backendSrv.get('/api/users/' + id).then(user => {
$scope.user = user;
$scope.user_id = id;
$scope.permissions.isGrafanaAdmin = user.isGrafanaAdmin;
});
};
- $scope.setPassword = function() {
+ $scope.setPassword = () => {
if (!$scope.passwordForm.$valid) {
return;
}
const payload = { password: $scope.password };
- backendSrv.put('/api/admin/users/' + $scope.user_id + '/password', payload).then(function() {
+ backendSrv.put('/api/admin/users/' + $scope.user_id + '/password', payload).then(() => {
$location.path('/admin/users');
});
};
- $scope.updatePermissions = function() {
+ $scope.updatePermissions = () => {
const payload = $scope.permissions;
- backendSrv.put('/api/admin/users/' + $scope.user_id + '/permissions', payload).then(function() {
+ backendSrv.put('/api/admin/users/' + $scope.user_id + '/permissions', payload).then(() => {
$location.path('/admin/users');
});
};
- $scope.create = function() {
+ $scope.create = () => {
if (!$scope.userForm.$valid) {
return;
}
- backendSrv.post('/api/admin/users', $scope.user).then(function() {
+ backendSrv.post('/api/admin/users', $scope.user).then(() => {
$location.path('/admin/users');
});
};
- $scope.getUserOrgs = function(id) {
- backendSrv.get('/api/users/' + id + '/orgs').then(function(orgs) {
+ $scope.getUserOrgs = id => {
+ backendSrv.get('/api/users/' + id + '/orgs').then(orgs => {
$scope.orgs = orgs;
});
};
- $scope.update = function() {
+ $scope.update = () => {
if (!$scope.userForm.$valid) {
return;
}
- backendSrv.put('/api/users/' + $scope.user_id, $scope.user).then(function() {
+ backendSrv.put('/api/users/' + $scope.user_id, $scope.user).then(() => {
$location.path('/admin/users');
});
};
- $scope.updateOrgUser = function(orgUser) {
- backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id, orgUser).then(function() {});
+ $scope.updateOrgUser = orgUser => {
+ backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id, orgUser).then(() => {});
};
- $scope.removeOrgUser = function(orgUser) {
- backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id).then(function() {
+ $scope.removeOrgUser = orgUser => {
+ backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id).then(() => {
$scope.getUser($scope.user_id);
$scope.getUserOrgs($scope.user_id);
});
@@ -82,19 +82,19 @@ export class AdminEditUserCtrl {
$scope.orgsSearchCache = [];
- $scope.searchOrgs = function(queryStr, callback) {
+ $scope.searchOrgs = (queryStr, callback) => {
if ($scope.orgsSearchCache.length > 0) {
callback(_.map($scope.orgsSearchCache, 'name'));
return;
}
- backendSrv.get('/api/orgs', { query: '' }).then(function(result) {
+ backendSrv.get('/api/orgs', { query: '' }).then(result => {
$scope.orgsSearchCache = result;
callback(_.map(result, 'name'));
});
};
- $scope.addOrgUser = function() {
+ $scope.addOrgUser = () => {
if (!$scope.addOrgForm.$valid) {
return;
}
@@ -108,7 +108,7 @@ export class AdminEditUserCtrl {
$scope.newOrg.loginOrEmail = $scope.user.login;
- backendSrv.post('/api/orgs/' + orgInfo.id + '/users/', $scope.newOrg).then(function() {
+ backendSrv.post('/api/orgs/' + orgInfo.id + '/users/', $scope.newOrg).then(() => {
$scope.getUser($scope.user_id);
$scope.getUserOrgs($scope.user_id);
});
diff --git a/public/app/features/admin/admin_list_orgs_ctrl.ts b/public/app/features/admin/admin_list_orgs_ctrl.ts
index d6d1b9e7dda..0513752aa3e 100644
--- a/public/app/features/admin/admin_list_orgs_ctrl.ts
+++ b/public/app/features/admin/admin_list_orgs_ctrl.ts
@@ -3,26 +3,26 @@ import angular from 'angular';
export class AdminListOrgsCtrl {
/** @ngInject */
constructor($scope, backendSrv, navModelSrv) {
- $scope.init = function() {
+ $scope.init = () => {
$scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs', 1);
$scope.getOrgs();
};
- $scope.getOrgs = function() {
- backendSrv.get('/api/orgs').then(function(orgs) {
+ $scope.getOrgs = () => {
+ backendSrv.get('/api/orgs').then(orgs => {
$scope.orgs = orgs;
});
};
- $scope.deleteOrg = function(org) {
+ $scope.deleteOrg = org => {
$scope.appEvent('confirm-modal', {
title: 'Delete',
text: 'Do you want to delete organization ' + org.name + '?',
text2: 'All dashboards for this organization will be removed!',
icon: 'fa-trash',
yesText: 'Delete',
- onConfirm: function() {
- backendSrv.delete('/api/orgs/' + org.id).then(function() {
+ onConfirm: () => {
+ backendSrv.delete('/api/orgs/' + org.id).then(() => {
$scope.getOrgs();
});
},
diff --git a/public/app/features/admin/admin_list_users_ctrl.ts b/public/app/features/admin/admin_list_users_ctrl.ts
index 083340a43eb..1b5b27a4d66 100644
--- a/public/app/features/admin/admin_list_users_ctrl.ts
+++ b/public/app/features/admin/admin_list_users_ctrl.ts
@@ -26,7 +26,7 @@ export default class AdminListUsersCtrl {
this.showPaging = this.totalPages > 1;
this.pages = [];
- for (var i = 1; i < this.totalPages + 1; i++) {
+ for (let i = 1; i < this.totalPages + 1; i++) {
this.pages.push({ page: i, current: i === this.page });
}
});
diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts
index ef8e37483cc..53f7e57fd69 100644
--- a/public/app/features/alerting/alert_tab_ctrl.ts
+++ b/public/app/features/alerting/alert_tab_ctrl.ts
@@ -164,8 +164,8 @@ export class AlertTabCtrl {
alert.conditions.push(this.buildDefaultCondition());
}
- alert.noDataState = alert.noDataState || 'no_data';
- alert.executionErrorState = alert.executionErrorState || 'alerting';
+ alert.noDataState = alert.noDataState || config.alertingNoDataOrNullValues;
+ alert.executionErrorState = alert.executionErrorState || config.alertingErrorOrTimeout;
alert.frequency = alert.frequency || '60s';
alert.handler = alert.handler || 1;
alert.notifications = alert.notifications || [];
diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts
index 60942e6ffb4..315a9a619a1 100644
--- a/public/app/features/alerting/notification_edit_ctrl.ts
+++ b/public/app/features/alerting/notification_edit_ctrl.ts
@@ -11,6 +11,8 @@ export class AlertNotificationEditCtrl {
model: any;
defaults: any = {
type: 'email',
+ sendReminder: false,
+ frequency: '15m',
settings: {
httpMethod: 'POST',
autoResolve: true,
@@ -18,12 +20,17 @@ export class AlertNotificationEditCtrl {
},
isDefault: false,
};
+ getFrequencySuggestion: any;
/** @ngInject */
constructor(private $routeParams, private backendSrv, private $location, private $templateCache, navModelSrv) {
this.navModel = navModelSrv.getNav('alerting', 'channels', 0);
this.isNew = !this.$routeParams.id;
+ this.getFrequencySuggestion = () => {
+ return ['1m', '5m', '10m', '15m', '30m', '1h'];
+ };
+
this.backendSrv
.get(`/api/alert-notifiers`)
.then(notifiers => {
@@ -102,6 +109,7 @@ export class AlertNotificationEditCtrl {
const payload = {
name: this.model.name,
type: this.model.type,
+ frequency: this.model.frequency,
settings: this.model.settings,
};
diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html
index d20b9031a8f..7b198736b83 100644
--- a/public/app/features/alerting/partials/notification_edit.html
+++ b/public/app/features/alerting/partials/notification_edit.html
@@ -32,6 +32,29 @@
checked="ctrl.model.settings.uploadImage"
tooltip="Captures an image and include it in the notification">
+
+
+
+
+
+ Send reminder every
+
+ Specify how often reminders should be sent, e.g. every 30s, 1m, 10m, 30m or 1h etc.
+
+
+
+
+
+
+ Alert reminders are sent after rules are evaluated. Therefore a reminder can never be sent more frequently than a configured alert rule evaluation interval.
+
+
diff --git a/public/app/features/alerting/threshold_mapper.ts b/public/app/features/alerting/threshold_mapper.ts
index cbc7dbf6b43..995add42ef0 100644
--- a/public/app/features/alerting/threshold_mapper.ts
+++ b/public/app/features/alerting/threshold_mapper.ts
@@ -1,6 +1,6 @@
export class ThresholdMapper {
static alertToGraphThresholds(panel) {
- for (var i = 0; i < panel.alert.conditions.length; i++) {
+ for (let i = 0; i < panel.alert.conditions.length; i++) {
const condition = panel.alert.conditions[i];
if (condition.type !== 'query') {
continue;
diff --git a/public/app/features/annotations/annotation_tooltip.ts b/public/app/features/annotations/annotation_tooltip.ts
index cadbac1bd89..7e626bc5860 100644
--- a/public/app/features/annotations/annotation_tooltip.ts
+++ b/public/app/features/annotations/annotation_tooltip.ts
@@ -3,7 +3,7 @@ import $ from 'jquery';
import coreModule from 'app/core/core_module';
import alertDef from '../alerting/alert_def';
-/** @ngInject **/
+/** @ngInject */
export function annotationTooltipDirective($sanitize, dashboardSrv, contextSrv, $compile) {
function sanitizeString(str) {
try {
@@ -20,14 +20,14 @@ export function annotationTooltipDirective($sanitize, dashboardSrv, contextSrv,
event: '=',
onEdit: '&',
},
- link: function(scope, element) {
+ link: (scope, element) => {
const event = scope.event;
- var title = event.title;
- var text = event.text;
+ let title = event.title;
+ let text = event.text;
const dashboard = dashboardSrv.getCurrent();
- var tooltip = '
';
- var titleStateClass = '';
+ let tooltip = '
';
+ let titleStateClass = '';
if (event.alertId) {
const stateModel = alertDef.getStateDisplayModel(event.newState);
@@ -42,7 +42,7 @@ export function annotationTooltipDirective($sanitize, dashboardSrv, contextSrv,
title = '';
}
- var header = `
`;
+ let header = `
`;
if (event.login) {
header += `, this.getAlertStates(options)])
.then(results => {
// combine the annotations and flatten results
- var annotations = _.flattenDeep(results[0]);
+ let annotations = _.flattenDeep(results[0]);
// filter out annotations that do not belong to requesting panel
annotations = _.filter(annotations, item => {
diff --git a/public/app/features/annotations/event_editor.ts b/public/app/features/annotations/event_editor.ts
index 90c425438ab..a88cc44a251 100644
--- a/public/app/features/annotations/event_editor.ts
+++ b/public/app/features/annotations/event_editor.ts
@@ -12,7 +12,7 @@ export class EventEditorCtrl {
close: any;
timeFormated: string;
- /** @ngInject **/
+ /** @ngInject */
constructor(private annotationsSrv) {
this.event.panelId = this.panelCtrl.panel.id;
this.event.dashboardId = this.panelCtrl.dashboard.id;
diff --git a/public/app/features/annotations/event_manager.ts b/public/app/features/annotations/event_manager.ts
index f9c04141f8d..ef74ca193d4 100644
--- a/public/app/features/annotations/event_manager.ts
+++ b/public/app/features/annotations/event_manager.ts
@@ -102,7 +102,7 @@ export class EventManager {
}
} else {
// annotations from query
- for (var i = 0; i < annotations.length; i++) {
+ for (let i = 0; i < annotations.length; i++) {
const item = annotations[i];
// add properties used by jquery flot events
diff --git a/public/app/features/annotations/events_processing.ts b/public/app/features/annotations/events_processing.ts
index 6e610fb1457..1180b2a0989 100644
--- a/public/app/features/annotations/events_processing.ts
+++ b/public/app/features/annotations/events_processing.ts
@@ -14,33 +14,33 @@ export function makeRegions(annotations, options) {
}
function getRegions(events, range) {
- const region_events = _.filter(events, event => {
+ const regionEvents = _.filter(events, event => {
return event.regionId;
});
- let regions = _.groupBy(region_events, 'regionId');
+ let regions = _.groupBy(regionEvents, 'regionId');
regions = _.compact(
- _.map(regions, region_events => {
- const region_obj = _.head(region_events);
- if (region_events && region_events.length > 1) {
- region_obj.timeEnd = region_events[1].time;
- region_obj.isRegion = true;
- return region_obj;
+ _.map(regions, regionEvents => {
+ const regionObj = _.head(regionEvents);
+ if (regionEvents && regionEvents.length > 1) {
+ regionObj.timeEnd = regionEvents[1].time;
+ regionObj.isRegion = true;
+ return regionObj;
} else {
- if (region_events && region_events.length) {
+ if (regionEvents && regionEvents.length) {
// Don't change proper region object
- if (!region_obj.time || !region_obj.timeEnd) {
+ if (!regionObj.time || !regionObj.timeEnd) {
// This is cut region
- if (isStartOfRegion(region_obj)) {
- region_obj.timeEnd = range.to.valueOf() - 1;
+ if (isStartOfRegion(regionObj)) {
+ regionObj.timeEnd = range.to.valueOf() - 1;
} else {
// Start time = null
- region_obj.timeEnd = region_obj.time;
- region_obj.time = range.from.valueOf() + 1;
+ regionObj.timeEnd = regionObj.time;
+ regionObj.time = range.from.valueOf() + 1;
}
- region_obj.isRegion = true;
+ regionObj.isRegion = true;
}
- return region_obj;
+ return regionObj;
}
}
})
diff --git a/public/app/features/annotations/specs/annotations_srv.test.ts b/public/app/features/annotations/specs/annotations_srv.test.ts
index f262544da43..a00fc9b841d 100644
--- a/public/app/features/annotations/specs/annotations_srv.test.ts
+++ b/public/app/features/annotations/specs/annotations_srv.test.ts
@@ -2,7 +2,7 @@ import '../annotations_srv';
import 'app/features/dashboard/time_srv';
import { AnnotationsSrv } from '../annotations_srv';
-describe('AnnotationsSrv', function() {
+describe('AnnotationsSrv', () => {
const $rootScope = {
onAppEvent: jest.fn(),
};
diff --git a/public/app/features/dashboard/change_tracker.ts b/public/app/features/dashboard/change_tracker.ts
index 5047aefa199..aa71ac2e306 100644
--- a/public/app/features/dashboard/change_tracker.ts
+++ b/public/app/features/dashboard/change_tracker.ts
@@ -128,7 +128,7 @@ export class ChangeTracker {
});
// ignore template variable values
- _.each(dash.templating.list, function(value) {
+ _.each(dash.templating.list, value => {
value.current = null;
value.options = null;
value.filters = null;
diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/dashboard/create_folder_ctrl.ts
index 5c8bd276f76..99b2e8d4853 100644
--- a/public/app/features/dashboard/create_folder_ctrl.ts
+++ b/public/app/features/dashboard/create_folder_ctrl.ts
@@ -8,7 +8,7 @@ export class CreateFolderCtrl {
hasValidationError: boolean;
validationError: any;
- /** @ngInject **/
+ /** @ngInject */
constructor(private backendSrv, private $location, private validationSrv, navModelSrv) {
this.navModel = navModelSrv.getNav('dashboards', 'manage-dashboards', 0);
}
diff --git a/public/app/features/dashboard/dashboard_ctrl.ts b/public/app/features/dashboard/dashboard_ctrl.ts
index 5524b55e3dd..d61eb08d5b9 100644
--- a/public/app/features/dashboard/dashboard_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_ctrl.ts
@@ -102,7 +102,7 @@ export class DashboardCtrl implements PanelContainer {
}
setWindowTitleAndTheme() {
- window.document.title = config.window_title_prefix + this.dashboard.title;
+ window.document.title = config.windowTitlePrefix + this.dashboard.title;
}
showJsonEditor(evt, options) {
@@ -144,7 +144,7 @@ export class DashboardCtrl implements PanelContainer {
removePanel(panel: PanelModel, ask: boolean) {
// confirm deletion
if (ask !== false) {
- var text2, confirmText;
+ let text2, confirmText;
if (panel.alert) {
text2 = 'Panel includes an alert rule, removing panel will also remove alert rule';
diff --git a/public/app/features/dashboard/dashboard_import_ctrl.ts b/public/app/features/dashboard/dashboard_import_ctrl.ts
index 3dfae1250dd..455fa682edd 100644
--- a/public/app/features/dashboard/dashboard_import_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_import_ctrl.ts
@@ -1,5 +1,6 @@
import _ from 'lodash';
import config from 'app/core/config';
+import locationUtil from 'app/core/utils/location_util';
export class DashboardImportCtrl {
navModel: any;
@@ -179,7 +180,8 @@ export class DashboardImportCtrl {
folderId: this.folderId,
})
.then(res => {
- this.$location.url(res.importedUrl);
+ const dashUrl = locationUtil.stripBaseFromUrl(res.importedUrl);
+ this.$location.url(dashUrl);
});
}
diff --git a/public/app/features/dashboard/dashboard_loader_srv.ts b/public/app/features/dashboard/dashboard_loader_srv.ts
index cbf753c0124..572a92f07bc 100644
--- a/public/app/features/dashboard/dashboard_loader_srv.ts
+++ b/public/app/features/dashboard/dashboard_loader_srv.ts
@@ -36,7 +36,7 @@ export class DashboardLoaderSrv {
}
loadDashboard(type, slug, uid) {
- var promise;
+ let promise;
if (type === 'script') {
promise = this._loadScriptedDashboard(slug);
@@ -59,7 +59,7 @@ export class DashboardLoaderSrv {
});
}
- promise.then(function(result) {
+ promise.then(result => {
if (result.meta.dashboardNotFound !== true) {
impressionSrv.addDashboardImpression(result.dashboard.id);
}
@@ -106,7 +106,7 @@ export class DashboardLoaderSrv {
};
/*jshint -W054 */
- const script_func = new Function(
+ const scriptFunc = new Function(
'ARGS',
'kbn',
'dateMath',
@@ -119,12 +119,12 @@ export class DashboardLoaderSrv {
'services',
result.data
);
- const script_result = script_func(this.$routeParams, kbn, dateMath, _, moment, window, document, $, $, services);
+ const scriptResult = scriptFunc(this.$routeParams, kbn, dateMath, _, moment, window, document, $, $, services);
// Handle async dashboard scripts
- if (_.isFunction(script_result)) {
+ if (_.isFunction(scriptResult)) {
const deferred = this.$q.defer();
- script_result(dashboard => {
+ scriptResult(dashboard => {
this.$timeout(() => {
deferred.resolve({ data: dashboard });
});
@@ -132,7 +132,7 @@ export class DashboardLoaderSrv {
return deferred.promise;
}
- return { data: script_result };
+ return { data: scriptResult };
}
}
diff --git a/public/app/features/dashboard/dashboard_migration.ts b/public/app/features/dashboard/dashboard_migration.ts
index 88bd178c128..5f1deae6e14 100644
--- a/public/app/features/dashboard/dashboard_migration.ts
+++ b/public/app/features/dashboard/dashboard_migration.ts
@@ -18,7 +18,7 @@ export class DashboardMigrator {
}
updateSchema(old) {
- var i, j, k, n;
+ let i, j, k, n;
const oldVersion = this.dashboard.schemaVersion;
const panelUpgrades = [];
this.dashboard.schemaVersion = 16;
@@ -36,7 +36,7 @@ export class DashboardMigrator {
}
}
- panelUpgrades.push(function(panel) {
+ panelUpgrades.push(panel => {
// rename panel type
if (panel.type === 'graphite') {
panel.type = 'graph';
@@ -83,8 +83,8 @@ export class DashboardMigrator {
// schema version 3 changes
if (oldVersion < 3) {
// ensure panel ids
- var maxId = this.dashboard.getNextPanelId();
- panelUpgrades.push(function(panel) {
+ let maxId = this.dashboard.getNextPanelId();
+ panelUpgrades.push(panel => {
if (!panel.id) {
panel.id = maxId;
maxId += 1;
@@ -95,11 +95,11 @@ export class DashboardMigrator {
// schema version 4 changes
if (oldVersion < 4) {
// move aliasYAxis changes
- panelUpgrades.push(function(panel) {
+ panelUpgrades.push(panel => {
if (panel.type !== 'graph') {
return;
}
- _.each(panel.aliasYAxis, function(value, key) {
+ _.each(panel.aliasYAxis, (value, key) => {
panel.seriesOverrides = [{ alias: key, yaxis: value }];
});
delete panel.aliasYAxis;
@@ -140,28 +140,25 @@ export class DashboardMigrator {
}
// ensure query refIds
- panelUpgrades.push(function(panel) {
- _.each(
- panel.targets,
- function(target) {
- if (!target.refId) {
- target.refId = this.dashboard.getNextQueryLetter(panel);
- }
- }.bind(this)
- );
+ panelUpgrades.push(panel => {
+ _.each(panel.targets, target => {
+ if (!target.refId) {
+ target.refId = this.dashboard.getNextQueryLetter(panel);
+ }
+ });
});
}
if (oldVersion < 8) {
- panelUpgrades.push(function(panel) {
- _.each(panel.targets, function(target) {
+ panelUpgrades.push(panel => {
+ _.each(panel.targets, target => {
// update old influxdb query schema
if (target.fields && target.tags && target.groupBy) {
if (target.rawQuery) {
delete target.fields;
delete target.fill;
} else {
- target.select = _.map(target.fields, function(field) {
+ target.select = _.map(target.fields, field => {
const parts = [];
parts.push({ type: 'field', params: [field.name] });
parts.push({ type: field.func, params: [] });
@@ -174,7 +171,7 @@ export class DashboardMigrator {
return parts;
});
delete target.fields;
- _.each(target.groupBy, function(part) {
+ _.each(target.groupBy, part => {
if (part.type === 'time' && part.interval) {
part.params = [part.interval];
delete part.interval;
@@ -198,7 +195,7 @@ export class DashboardMigrator {
// schema version 9 changes
if (oldVersion < 9) {
// move aliasYAxis changes
- panelUpgrades.push(function(panel) {
+ panelUpgrades.push(panel => {
if (panel.type !== 'singlestat' && panel.thresholds !== '') {
return;
}
@@ -217,12 +214,12 @@ export class DashboardMigrator {
// schema version 10 changes
if (oldVersion < 10) {
// move aliasYAxis changes
- panelUpgrades.push(function(panel) {
+ panelUpgrades.push(panel => {
if (panel.type !== 'table') {
return;
}
- _.each(panel.styles, function(style) {
+ _.each(panel.styles, style => {
if (style.thresholds && style.thresholds.length >= 3) {
const k = style.thresholds;
k.shift();
@@ -234,7 +231,7 @@ export class DashboardMigrator {
if (oldVersion < 12) {
// update template variables
- _.each(this.dashboard.templating.list, function(templateVariable) {
+ _.each(this.dashboard.templating.list, templateVariable => {
if (templateVariable.refresh) {
templateVariable.refresh = 1;
}
@@ -251,7 +248,7 @@ export class DashboardMigrator {
if (oldVersion < 12) {
// update graph yaxes changes
- panelUpgrades.push(function(panel) {
+ panelUpgrades.push(panel => {
if (panel.type !== 'graph') {
return;
}
@@ -300,7 +297,7 @@ export class DashboardMigrator {
if (oldVersion < 13) {
// update graph yaxes changes
- panelUpgrades.push(function(panel) {
+ panelUpgrades.push(panel => {
if (panel.type !== 'graph') {
return;
}
diff --git a/public/app/features/dashboard/dashboard_model.ts b/public/app/features/dashboard/dashboard_model.ts
index d40467e8338..818765124bf 100644
--- a/public/app/features/dashboard/dashboard_model.ts
+++ b/public/app/features/dashboard/dashboard_model.ts
@@ -144,7 +144,7 @@ export class DashboardModel {
});
// make clone
- var copy: any = {};
+ let copy: any = {};
for (const property in this) {
if (DashboardModel.nonPersistedProperties[property] || !this.hasOwnProperty(property)) {
continue;
@@ -258,7 +258,7 @@ export class DashboardModel {
}
sortPanelsByGridPos() {
- this.panels.sort(function(panelA, panelB) {
+ this.panels.sort((panelA, panelB) => {
if (panelA.gridPos.y === panelB.gridPos.y) {
return panelA.gridPos.x - panelB.gridPos.x;
} else {
@@ -775,8 +775,8 @@ export class DashboardModel {
getNextQueryLetter(panel) {
const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
- return _.find(letters, function(refId) {
- return _.every(panel.targets, function(other) {
+ return _.find(letters, refId => {
+ return _.every(panel.targets, other => {
return other.refId !== refId;
});
});
@@ -842,12 +842,20 @@ export class DashboardModel {
})
);
- // Consider navbar and submenu controls, padding and margin
- let visibleHeight = window.innerHeight - 55 - 20;
+ const navbarHeight = 55;
+ const margin = 20;
+ const submenuHeight = 50;
- // Remove submenu if visible
- if (this.meta.submenuEnabled) {
- visibleHeight -= 50;
+ let visibleHeight = viewHeight - navbarHeight - margin;
+
+ // Remove submenu height if visible
+ if (this.meta.submenuEnabled && !this.meta.kiosk) {
+ visibleHeight -= submenuHeight;
+ }
+
+ // add back navbar height
+ if (this.meta.kiosk === 'b') {
+ visibleHeight += 55;
}
const visibleGridHeight = Math.floor(visibleHeight / (GRID_CELL_HEIGHT + GRID_CELL_VMARGIN));
diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index 6ec272b5ca4..74e00fea798 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -8,14 +8,14 @@
</a>
</div>
+ <div class=)
+
-
-
+
+
window).Intl) {
+ if (!(window as any).Intl) {
return utcOffset;
}
- const dateFormat = (window).Intl.DateTimeFormat();
+ const dateFormat = (window as any).Intl.DateTimeFormat();
if (!dateFormat.resolvedOptions) {
return utcOffset;
}
@@ -111,7 +111,7 @@ export function ShareModalCtrl($scope, $rootScope, $location, $timeout, timeSrv,
return '&tz=' + encodeURIComponent(options.timeZone);
};
- $scope.getShareUrl = function() {
+ $scope.getShareUrl = () => {
return $scope.shareUrl;
};
}
diff --git a/public/app/features/dashboard/share_snapshot_ctrl.ts b/public/app/features/dashboard/share_snapshot_ctrl.ts
index c470ddb47dd..ec487801948 100644
--- a/public/app/features/dashboard/share_snapshot_ctrl.ts
+++ b/public/app/features/dashboard/share_snapshot_ctrl.ts
@@ -2,7 +2,7 @@ import angular from 'angular';
import _ from 'lodash';
export class ShareSnapshotCtrl {
- /** @ngInject **/
+ /** @ngInject */
constructor($scope, $rootScope, $location, backendSrv, $timeout, timeSrv) {
$scope.snapshot = {
name: $scope.dashboard.title,
@@ -25,8 +25,8 @@ export class ShareSnapshotCtrl {
{ text: 'Public on the web', value: 3 },
];
- $scope.init = function() {
- backendSrv.get('/api/snapshot/shared-options').then(function(options) {
+ $scope.init = () => {
+ backendSrv.get('/api/snapshot/shared-options').then(options => {
$scope.externalUrl = options['externalSnapshotURL'];
$scope.sharingButtonText = options['externalSnapshotName'];
$scope.externalEnabled = options['externalEnabled'];
@@ -35,7 +35,7 @@ export class ShareSnapshotCtrl {
$scope.apiUrl = '/api/snapshots';
- $scope.createSnapshot = function(external) {
+ $scope.createSnapshot = external => {
$scope.dashboard.snapshot = {
timestamp: new Date(),
};
@@ -49,12 +49,12 @@ export class ShareSnapshotCtrl {
$rootScope.$broadcast('refresh');
- $timeout(function() {
+ $timeout(() => {
$scope.saveSnapshot(external);
}, $scope.snapshot.timeoutSeconds * 1000);
};
- $scope.saveSnapshot = function(external) {
+ $scope.saveSnapshot = external => {
const dash = $scope.dashboard.getSaveModelClone();
$scope.scrubDashboard(dash);
@@ -67,7 +67,7 @@ export class ShareSnapshotCtrl {
const postUrl = external ? $scope.externalUrl + $scope.apiUrl : $scope.apiUrl;
backendSrv.post(postUrl, cmdData).then(
- function(results) {
+ results => {
$scope.loading = false;
if (external) {
@@ -88,17 +88,17 @@ export class ShareSnapshotCtrl {
$scope.step = 2;
},
- function() {
+ () => {
$scope.loading = false;
}
);
};
- $scope.getSnapshotUrl = function() {
+ $scope.getSnapshotUrl = () => {
return $scope.snapshotUrl;
};
- $scope.scrubDashboard = function(dash) {
+ $scope.scrubDashboard = dash => {
// change title
dash.title = $scope.snapshot.name;
@@ -106,7 +106,7 @@ export class ShareSnapshotCtrl {
dash.time = timeSrv.timeRange();
// remove panel queries & links
- _.each(dash.panels, function(panel) {
+ _.each(dash.panels, panel => {
panel.targets = [];
panel.links = [];
panel.datasource = null;
@@ -114,10 +114,10 @@ export class ShareSnapshotCtrl {
// remove annotation queries
dash.annotations.list = _.chain(dash.annotations.list)
- .filter(function(annotation) {
+ .filter(annotation => {
return annotation.enable;
})
- .map(function(annotation) {
+ .map(annotation => {
return {
name: annotation.name,
enable: annotation.enable,
@@ -131,7 +131,7 @@ export class ShareSnapshotCtrl {
.value();
// remove template queries
- _.each(dash.templating.list, function(variable) {
+ _.each(dash.templating.list, variable => {
variable.query = '';
variable.options = variable.current;
variable.refresh = false;
@@ -149,21 +149,21 @@ export class ShareSnapshotCtrl {
// cleanup snapshotData
delete $scope.dashboard.snapshot;
- $scope.dashboard.forEachPanel(function(panel) {
+ $scope.dashboard.forEachPanel(panel => {
delete panel.snapshotData;
});
- _.each($scope.dashboard.annotations.list, function(annotation) {
+ _.each($scope.dashboard.annotations.list, annotation => {
delete annotation.snapshotData;
});
};
- $scope.deleteSnapshot = function() {
- backendSrv.get($scope.deleteUrl).then(function() {
+ $scope.deleteSnapshot = () => {
+ backendSrv.get($scope.deleteUrl).then(() => {
$scope.step = 3;
});
};
- $scope.saveExternalSnapshotRef = function(cmdData, results) {
+ $scope.saveExternalSnapshotRef = (cmdData, results) => {
// save external in local instance as well
cmdData.external = true;
cmdData.key = results.key;
diff --git a/public/app/features/dashboard/specs/dashboard_import_ctrl.test.ts b/public/app/features/dashboard/specs/dashboard_import_ctrl.test.ts
index fca857184f1..bcde009cb3a 100644
--- a/public/app/features/dashboard/specs/dashboard_import_ctrl.test.ts
+++ b/public/app/features/dashboard/specs/dashboard_import_ctrl.test.ts
@@ -1,7 +1,7 @@
import { DashboardImportCtrl } from '../dashboard_import_ctrl';
import config from '../../../core/config';
-describe('DashboardImportCtrl', function() {
+describe('DashboardImportCtrl', () => {
const ctx: any = {};
let navModelSrv;
@@ -26,8 +26,8 @@ describe('DashboardImportCtrl', function() {
ctx.ctrl = new DashboardImportCtrl(backendSrv, validationSrv, navModelSrv, {}, {});
});
- describe('when uploading json', function() {
- beforeEach(function() {
+ describe('when uploading json', () => {
+ beforeEach(() => {
config.datasources = {
ds: {
type: 'test-db',
@@ -46,19 +46,19 @@ describe('DashboardImportCtrl', function() {
});
});
- it('should build input model', function() {
+ it('should build input model', () => {
expect(ctx.ctrl.inputs.length).toBe(1);
expect(ctx.ctrl.inputs[0].name).toBe('ds');
expect(ctx.ctrl.inputs[0].info).toBe('Select a Test DB data source');
});
- it('should set inputValid to false', function() {
+ it('should set inputValid to false', () => {
expect(ctx.ctrl.inputsValid).toBe(false);
});
});
- describe('when specifying grafana.com url', function() {
- beforeEach(function() {
+ describe('when specifying grafana.com url', () => {
+ beforeEach(() => {
ctx.ctrl.gnetUrl = 'http://grafana.com/dashboards/123';
// setup api mock
backendSrv.get = jest.fn(() => {
@@ -69,13 +69,13 @@ describe('DashboardImportCtrl', function() {
return ctx.ctrl.checkGnetDashboard();
});
- it('should call gnet api with correct dashboard id', function() {
+ it('should call gnet api with correct dashboard id', () => {
expect(backendSrv.get.mock.calls[0][0]).toBe('api/gnet/dashboards/123');
});
});
- describe('when specifying dashboard id', function() {
- beforeEach(function() {
+ describe('when specifying dashboard id', () => {
+ beforeEach(() => {
ctx.ctrl.gnetUrl = '2342';
// setup api mock
backendSrv.get = jest.fn(() => {
@@ -86,7 +86,7 @@ describe('DashboardImportCtrl', function() {
return ctx.ctrl.checkGnetDashboard();
});
- it('should call gnet api with correct dashboard id', function() {
+ it('should call gnet api with correct dashboard id', () => {
expect(backendSrv.get.mock.calls[0][0]).toBe('api/gnet/dashboards/2342');
});
});
diff --git a/public/app/features/dashboard/specs/dashboard_migration.test.ts b/public/app/features/dashboard/specs/dashboard_migration.test.ts
index d07df0e7be2..5f693c9f6d9 100644
--- a/public/app/features/dashboard/specs/dashboard_migration.test.ts
+++ b/public/app/features/dashboard/specs/dashboard_migration.test.ts
@@ -6,14 +6,14 @@ import { expect } from 'test/lib/common';
jest.mock('app/core/services/context_srv', () => ({}));
-describe('DashboardModel', function() {
- describe('when creating dashboard with old schema', function() {
+describe('DashboardModel', () => {
+ describe('when creating dashboard with old schema', () => {
let model;
let graph;
let singlestat;
let table;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({
services: {
filter: { time: { from: 'now-1d', to: 'now' }, list: [{}] },
@@ -65,52 +65,52 @@ describe('DashboardModel', function() {
table = model.panels[2];
});
- it('should have title', function() {
+ it('should have title', () => {
expect(model.title).toBe('No Title');
});
- it('should have panel id', function() {
+ it('should have panel id', () => {
expect(graph.id).toBe(1);
});
- it('should move time and filtering list', function() {
+ it('should move time and filtering list', () => {
expect(model.time.from).toBe('now-1d');
expect(model.templating.list[0].allFormat).toBe('glob');
});
- it('graphite panel should change name too graph', function() {
+ it('graphite panel should change name too graph', () => {
expect(graph.type).toBe('graph');
});
- it('single stat panel should have two thresholds', function() {
+ it('single stat panel should have two thresholds', () => {
expect(singlestat.thresholds).toBe('20,30');
});
- it('queries without refId should get it', function() {
+ it('queries without refId should get it', () => {
expect(graph.targets[1].refId).toBe('B');
});
- it('update legend setting', function() {
+ it('update legend setting', () => {
expect(graph.legend.show).toBe(true);
});
- it('move aliasYAxis to series override', function() {
+ it('move aliasYAxis to series override', () => {
expect(graph.seriesOverrides[0].alias).toBe('test');
expect(graph.seriesOverrides[0].yaxis).toBe(2);
});
- it('should move pulldowns to new schema', function() {
+ it('should move pulldowns to new schema', () => {
expect(model.annotations.list[1].name).toBe('old');
});
- it('table panel should only have two thresholds values', function() {
+ it('table panel should only have two thresholds values', () => {
expect(table.styles[0].thresholds[0]).toBe('20');
expect(table.styles[0].thresholds[1]).toBe('30');
expect(table.styles[1].thresholds[0]).toBe('200');
expect(table.styles[1].thresholds[1]).toBe('300');
});
- it('graph grid to yaxes options', function() {
+ it('graph grid to yaxes options', () => {
expect(graph.yaxes[0].min).toBe(1);
expect(graph.yaxes[0].max).toBe(10);
expect(graph.yaxes[0].format).toBe('kbyte');
@@ -126,11 +126,11 @@ describe('DashboardModel', function() {
expect(graph.y_formats).toBe(undefined);
});
- it('dashboard schema version should be set to latest', function() {
+ it('dashboard schema version should be set to latest', () => {
expect(model.schemaVersion).toBe(16);
});
- it('graph thresholds should be migrated', function() {
+ it('graph thresholds should be migrated', () => {
expect(graph.thresholds.length).toBe(2);
expect(graph.thresholds[0].op).toBe('gt');
expect(graph.thresholds[0].value).toBe(200);
@@ -140,16 +140,16 @@ describe('DashboardModel', function() {
});
});
- describe('when migrating to the grid layout', function() {
+ describe('when migrating to the grid layout', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = {
rows: [],
};
});
- it('should create proper grid', function() {
+ it('should create proper grid', () => {
model.rows = [createRow({ collapse: false, height: 8 }, [[6], [6]])];
const dashboard = new DashboardModel(model);
const panelGridPos = getGridPositions(dashboard);
@@ -158,7 +158,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should add special "row" panel if row is collapsed', function() {
+ it('should add special "row" panel if row is collapsed', () => {
model.rows = [createRow({ collapse: true, height: 8 }, [[6], [6]]), createRow({ height: 8 }, [[12]])];
const dashboard = new DashboardModel(model);
const panelGridPos = getGridPositions(dashboard);
@@ -171,7 +171,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should add special "row" panel if row has visible title', function() {
+ it('should add special "row" panel if row has visible title', () => {
model.rows = [
createRow({ showTitle: true, title: 'Row', height: 8 }, [[6], [6]]),
createRow({ height: 8 }, [[12]]),
@@ -189,7 +189,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should not add "row" panel if row has not visible title or not collapsed', function() {
+ it('should not add "row" panel if row has not visible title or not collapsed', () => {
model.rows = [
createRow({ collapse: true, height: 8 }, [[12]]),
createRow({ height: 8 }, [[12]]),
@@ -212,7 +212,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should add all rows if even one collapsed or titled row is present', function() {
+ it('should add all rows if even one collapsed or titled row is present', () => {
model.rows = [createRow({ collapse: true, height: 8 }, [[6], [6]]), createRow({ height: 8 }, [[12]])];
const dashboard = new DashboardModel(model);
const panelGridPos = getGridPositions(dashboard);
@@ -225,7 +225,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should properly place panels with fixed height', function() {
+ it('should properly place panels with fixed height', () => {
model.rows = [
createRow({ height: 6 }, [[6], [6, 3], [6, 3]]),
createRow({ height: 6 }, [[4], [4], [4, 3], [4, 3]]),
@@ -245,7 +245,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should place panel to the right side of panel having bigger height', function() {
+ it('should place panel to the right side of panel having bigger height', () => {
model.rows = [createRow({ height: 6 }, [[4], [2, 3], [4, 6], [2, 3], [2, 3]])];
const dashboard = new DashboardModel(model);
const panelGridPos = getGridPositions(dashboard);
@@ -260,7 +260,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should fill current row if it possible', function() {
+ it('should fill current row if it possible', () => {
model.rows = [createRow({ height: 9 }, [[4], [2, 3], [4, 6], [2, 3], [2, 3], [8, 3]])];
const dashboard = new DashboardModel(model);
const panelGridPos = getGridPositions(dashboard);
@@ -276,7 +276,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should fill current row if it possible (2)', function() {
+ it('should fill current row if it possible (2)', () => {
model.rows = [createRow({ height: 8 }, [[4], [2, 3], [4, 6], [2, 3], [2, 3], [8, 3]])];
const dashboard = new DashboardModel(model);
const panelGridPos = getGridPositions(dashboard);
@@ -292,7 +292,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should fill current row if panel height more than row height', function() {
+ it('should fill current row if panel height more than row height', () => {
model.rows = [createRow({ height: 6 }, [[4], [2, 3], [4, 8], [2, 3], [2, 3]])];
const dashboard = new DashboardModel(model);
const panelGridPos = getGridPositions(dashboard);
@@ -307,7 +307,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should wrap panels to multiple rows', function() {
+ it('should wrap panels to multiple rows', () => {
model.rows = [createRow({ height: 6 }, [[6], [6], [12], [6], [3], [3]])];
const dashboard = new DashboardModel(model);
const panelGridPos = getGridPositions(dashboard);
@@ -323,7 +323,7 @@ describe('DashboardModel', function() {
expect(panelGridPos).toEqual(expectedGrid);
});
- it('should add repeated row if repeat set', function() {
+ it('should add repeated row if repeat set', () => {
model.rows = [
createRow({ showTitle: true, title: 'Row', height: 8, repeat: 'server' }, [[6]]),
createRow({ height: 8 }, [[12]]),
@@ -344,7 +344,7 @@ describe('DashboardModel', function() {
expect(dashboard.panels[3].repeat).toBeUndefined();
});
- it('should ignore repeated row', function() {
+ it('should ignore repeated row', () => {
model.rows = [
createRow({ showTitle: true, title: 'Row1', height: 8, repeat: 'server' }, [[6]]),
createRow(
@@ -364,7 +364,7 @@ describe('DashboardModel', function() {
expect(dashboard.panels.length).toBe(2);
});
- it('minSpan should be twice', function() {
+ it('minSpan should be twice', () => {
model.rows = [createRow({ height: 8 }, [[6]])];
model.rows[0].panels[0] = { minSpan: 12 };
@@ -372,7 +372,7 @@ describe('DashboardModel', function() {
expect(dashboard.panels[0].minSpan).toBe(24);
});
- it('should assign id', function() {
+ it('should assign id', () => {
model.rows = [createRow({ collapse: true, height: 8 }, [[6], [6]])];
model.rows[0].panels[0] = {};
diff --git a/public/app/features/dashboard/specs/dashboard_model.test.ts b/public/app/features/dashboard/specs/dashboard_model.test.ts
index 24d036a8233..e59d52f2410 100644
--- a/public/app/features/dashboard/specs/dashboard_model.test.ts
+++ b/public/app/features/dashboard/specs/dashboard_model.test.ts
@@ -4,43 +4,43 @@ import { PanelModel } from '../panel_model';
jest.mock('app/core/services/context_srv', () => ({}));
-describe('DashboardModel', function() {
- describe('when creating new dashboard model defaults only', function() {
+describe('DashboardModel', () => {
+ describe('when creating new dashboard model defaults only', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({}, {});
});
- it('should have title', function() {
+ it('should have title', () => {
expect(model.title).toBe('No Title');
});
- it('should have meta', function() {
+ it('should have meta', () => {
expect(model.meta.canSave).toBe(true);
expect(model.meta.canShare).toBe(true);
});
- it('should have default properties', function() {
+ it('should have default properties', () => {
expect(model.panels.length).toBe(0);
});
});
- describe('when getting next panel id', function() {
+ describe('when getting next panel id', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({
panels: [{ id: 5 }],
});
});
- it('should return max id + 1', function() {
+ it('should return max id + 1', () => {
expect(model.getNextPanelId()).toBe(6);
});
});
- describe('getSaveModelClone', function() {
+ describe('getSaveModelClone', () => {
it('should sort keys', () => {
const model = new DashboardModel({});
const saveModel = model.getSaveModelClone();
@@ -68,20 +68,20 @@ describe('DashboardModel', function() {
});
});
- describe('row and panel manipulation', function() {
+ describe('row and panel manipulation', () => {
let dashboard;
- beforeEach(function() {
+ beforeEach(() => {
dashboard = new DashboardModel({});
});
- it('adding panel should new up panel model', function() {
+ it('adding panel should new up panel model', () => {
dashboard.addPanel({ type: 'test', title: 'test' });
expect(dashboard.panels[0] instanceof PanelModel).toBe(true);
});
- it('duplicate panel should try to add to the right if there is space', function() {
+ it('duplicate panel should try to add to the right if there is space', () => {
const panel = { id: 10, gridPos: { x: 0, y: 0, w: 6, h: 2 } };
dashboard.addPanel(panel);
@@ -95,7 +95,7 @@ describe('DashboardModel', function() {
});
});
- it('duplicate panel should remove repeat data', function() {
+ it('duplicate panel should remove repeat data', () => {
const panel = {
id: 10,
gridPos: { x: 0, y: 0, w: 6, h: 2 },
@@ -111,29 +111,29 @@ describe('DashboardModel', function() {
});
});
- describe('Given editable false dashboard', function() {
+ describe('Given editable false dashboard', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({ editable: false });
});
- it('Should set meta canEdit and canSave to false', function() {
+ it('Should set meta canEdit and canSave to false', () => {
expect(model.meta.canSave).toBe(false);
expect(model.meta.canEdit).toBe(false);
});
- it('getSaveModelClone should remove meta', function() {
+ it('getSaveModelClone should remove meta', () => {
const clone = model.getSaveModelClone();
expect(clone.meta).toBe(undefined);
});
});
- describe('when loading dashboard with old influxdb query schema', function() {
+ describe('when loading dashboard with old influxdb query schema', () => {
let model;
let target;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({
panels: [
{
@@ -185,7 +185,7 @@ describe('DashboardModel', function() {
target = model.panels[0].targets[0];
});
- it('should update query schema', function() {
+ it('should update query schema', () => {
expect(target.fields).toBe(undefined);
expect(target.select.length).toBe(2);
expect(target.select[0].length).toBe(4);
@@ -196,10 +196,10 @@ describe('DashboardModel', function() {
});
});
- describe('when creating dashboard model with missing list for annoations or templating', function() {
+ describe('when creating dashboard model with missing list for annoations or templating', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({
annotations: {
enable: true,
@@ -210,54 +210,54 @@ describe('DashboardModel', function() {
});
});
- it('should add empty list', function() {
+ it('should add empty list', () => {
expect(model.annotations.list.length).toBe(1);
expect(model.templating.list.length).toBe(0);
});
- it('should add builtin annotation query', function() {
+ it('should add builtin annotation query', () => {
expect(model.annotations.list[0].builtIn).toBe(1);
expect(model.templating.list.length).toBe(0);
});
});
- describe('Formatting epoch timestamp when timezone is set as utc', function() {
+ describe('Formatting epoch timestamp when timezone is set as utc', () => {
let dashboard;
- beforeEach(function() {
+ beforeEach(() => {
dashboard = new DashboardModel({ timezone: 'utc' });
});
- it('Should format timestamp with second resolution by default', function() {
+ it('Should format timestamp with second resolution by default', () => {
expect(dashboard.formatDate(1234567890000)).toBe('2009-02-13 23:31:30');
});
- it('Should format timestamp with second resolution even if second format is passed as parameter', function() {
+ it('Should format timestamp with second resolution even if second format is passed as parameter', () => {
expect(dashboard.formatDate(1234567890007, 'YYYY-MM-DD HH:mm:ss')).toBe('2009-02-13 23:31:30');
});
- it('Should format timestamp with millisecond resolution if format is passed as parameter', function() {
+ it('Should format timestamp with millisecond resolution if format is passed as parameter', () => {
expect(dashboard.formatDate(1234567890007, 'YYYY-MM-DD HH:mm:ss.SSS')).toBe('2009-02-13 23:31:30.007');
});
});
- describe('updateSubmenuVisibility with empty lists', function() {
+ describe('updateSubmenuVisibility with empty lists', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({});
model.updateSubmenuVisibility();
});
- it('should not enable submmenu', function() {
+ it('should not enable submmenu', () => {
expect(model.meta.submenuEnabled).toBe(false);
});
});
- describe('updateSubmenuVisibility with annotation', function() {
+ describe('updateSubmenuVisibility with annotation', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({
annotations: {
list: [{}],
@@ -266,15 +266,15 @@ describe('DashboardModel', function() {
model.updateSubmenuVisibility();
});
- it('should enable submmenu', function() {
+ it('should enable submmenu', () => {
expect(model.meta.submenuEnabled).toBe(true);
});
});
- describe('updateSubmenuVisibility with template var', function() {
+ describe('updateSubmenuVisibility with template var', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({
templating: {
list: [{}],
@@ -283,15 +283,15 @@ describe('DashboardModel', function() {
model.updateSubmenuVisibility();
});
- it('should enable submmenu', function() {
+ it('should enable submmenu', () => {
expect(model.meta.submenuEnabled).toBe(true);
});
});
- describe('updateSubmenuVisibility with hidden template var', function() {
+ describe('updateSubmenuVisibility with hidden template var', () => {
let model;
- beforeEach(function() {
+ beforeEach(() => {
model = new DashboardModel({
templating: {
list: [{ hide: 2 }],
@@ -300,15 +300,15 @@ describe('DashboardModel', function() {
model.updateSubmenuVisibility();
});
- it('should not enable submmenu', function() {
+ it('should not enable submmenu', () => {
expect(model.meta.submenuEnabled).toBe(false);
});
});
- describe('updateSubmenuVisibility with hidden annotation toggle', function() {
+ describe('updateSubmenuVisibility with hidden annotation toggle', () => {
let dashboard;
- beforeEach(function() {
+ beforeEach(() => {
dashboard = new DashboardModel({
annotations: {
list: [{ hide: true }],
@@ -317,15 +317,15 @@ describe('DashboardModel', function() {
dashboard.updateSubmenuVisibility();
});
- it('should not enable submmenu', function() {
+ it('should not enable submmenu', () => {
expect(dashboard.meta.submenuEnabled).toBe(false);
});
});
- describe('When collapsing row', function() {
+ describe('When collapsing row', () => {
let dashboard;
- beforeEach(function() {
+ beforeEach(() => {
dashboard = new DashboardModel({
panels: [
{ id: 1, type: 'graph', gridPos: { x: 0, y: 0, w: 24, h: 2 } },
@@ -338,36 +338,36 @@ describe('DashboardModel', function() {
dashboard.toggleRow(dashboard.panels[1]);
});
- it('should remove panels and put them inside collapsed row', function() {
+ it('should remove panels and put them inside collapsed row', () => {
expect(dashboard.panels.length).toBe(3);
expect(dashboard.panels[1].panels.length).toBe(2);
});
- describe('and when removing row and its panels', function() {
- beforeEach(function() {
+ describe('and when removing row and its panels', () => {
+ beforeEach(() => {
dashboard.removeRow(dashboard.panels[1], true);
});
- it('should remove row and its panels', function() {
+ it('should remove row and its panels', () => {
expect(dashboard.panels.length).toBe(2);
});
});
- describe('and when removing only the row', function() {
- beforeEach(function() {
+ describe('and when removing only the row', () => {
+ beforeEach(() => {
dashboard.removeRow(dashboard.panels[1], false);
});
- it('should only remove row', function() {
+ it('should only remove row', () => {
expect(dashboard.panels.length).toBe(4);
});
});
});
- describe('When expanding row', function() {
+ describe('When expanding row', () => {
let dashboard;
- beforeEach(function() {
+ beforeEach(() => {
dashboard = new DashboardModel({
panels: [
{ id: 1, type: 'graph', gridPos: { x: 0, y: 0, w: 24, h: 6 } },
@@ -387,16 +387,16 @@ describe('DashboardModel', function() {
dashboard.toggleRow(dashboard.panels[1]);
});
- it('should add panels back', function() {
+ it('should add panels back', () => {
expect(dashboard.panels.length).toBe(5);
});
- it('should add them below row in array', function() {
+ it('should add them below row in array', () => {
expect(dashboard.panels[2].id).toBe(3);
expect(dashboard.panels[3].id).toBe(4);
});
- it('should position them below row', function() {
+ it('should position them below row', () => {
expect(dashboard.panels[2].gridPos).toMatchObject({
x: 0,
y: 7,
@@ -405,7 +405,7 @@ describe('DashboardModel', function() {
});
});
- it('should move panels below down', function() {
+ it('should move panels below down', () => {
expect(dashboard.panels[4].gridPos).toMatchObject({
x: 0,
y: 9,
@@ -414,22 +414,22 @@ describe('DashboardModel', function() {
});
});
- describe('and when removing row and its panels', function() {
- beforeEach(function() {
+ describe('and when removing row and its panels', () => {
+ beforeEach(() => {
dashboard.removeRow(dashboard.panels[1], true);
});
- it('should remove row and its panels', function() {
+ it('should remove row and its panels', () => {
expect(dashboard.panels.length).toBe(2);
});
});
- describe('and when removing only the row', function() {
- beforeEach(function() {
+ describe('and when removing only the row', () => {
+ beforeEach(() => {
dashboard.removeRow(dashboard.panels[1], false);
});
- it('should only remove row', function() {
+ it('should only remove row', () => {
expect(dashboard.panels.length).toBe(4);
});
});
diff --git a/public/app/features/dashboard/specs/history_srv.test.ts b/public/app/features/dashboard/specs/history_srv.test.ts
index 5c8578ecf39..1e2bd57a221 100644
--- a/public/app/features/dashboard/specs/history_srv.test.ts
+++ b/public/app/features/dashboard/specs/history_srv.test.ts
@@ -4,7 +4,7 @@ import { HistorySrv } from '../history/history_srv';
import { DashboardModel } from '../dashboard_model';
jest.mock('app/core/store');
-describe('historySrv', function() {
+describe('historySrv', () => {
const versionsResponse = versions();
const restoreResponse = restore;
@@ -19,35 +19,35 @@ describe('historySrv', function() {
const emptyDash = new DashboardModel({});
const historyListOpts = { limit: 10, start: 0 };
- describe('getHistoryList', function() {
- it('should return a versions array for the given dashboard id', function() {
+ describe('getHistoryList', () => {
+ it('should return a versions array for the given dashboard id', () => {
backendSrv.get = jest.fn(() => Promise.resolve(versionsResponse));
historySrv = new HistorySrv(backendSrv);
- return historySrv.getHistoryList(dash, historyListOpts).then(function(versions) {
+ return historySrv.getHistoryList(dash, historyListOpts).then(versions => {
expect(versions).toEqual(versionsResponse);
});
});
- it('should return an empty array when not given an id', function() {
- return historySrv.getHistoryList(emptyDash, historyListOpts).then(function(versions) {
+ it('should return an empty array when not given an id', () => {
+ return historySrv.getHistoryList(emptyDash, historyListOpts).then(versions => {
expect(versions).toEqual([]);
});
});
- it('should return an empty array when not given a dashboard', function() {
- return historySrv.getHistoryList(null, historyListOpts).then(function(versions) {
+ it('should return an empty array when not given a dashboard', () => {
+ return historySrv.getHistoryList(null, historyListOpts).then(versions => {
expect(versions).toEqual([]);
});
});
});
describe('restoreDashboard', () => {
- it('should return a success response given valid parameters', function() {
+ it('should return a success response given valid parameters', () => {
const version = 6;
backendSrv.post = jest.fn(() => Promise.resolve(restoreResponse(version)));
historySrv = new HistorySrv(backendSrv);
- return historySrv.restoreDashboard(dash, version).then(function(response) {
+ return historySrv.restoreDashboard(dash, version).then(response => {
expect(response).toEqual(restoreResponse(version));
});
});
diff --git a/public/app/features/dashboard/specs/repeat.test.ts b/public/app/features/dashboard/specs/repeat.test.ts
index d8c9e3bc2ed..49fb4ea9ee7 100644
--- a/public/app/features/dashboard/specs/repeat.test.ts
+++ b/public/app/features/dashboard/specs/repeat.test.ts
@@ -4,10 +4,10 @@ import { expect } from 'test/lib/common';
jest.mock('app/core/services/context_srv', () => ({}));
-describe('given dashboard with panel repeat', function() {
- var dashboard;
+describe('given dashboard with panel repeat', () => {
+ let dashboard;
- beforeEach(function() {
+ beforeEach(() => {
const dashboardJSON = {
panels: [
{ id: 1, type: 'row', gridPos: { x: 0, y: 0, h: 1, w: 24 } },
@@ -35,7 +35,7 @@ describe('given dashboard with panel repeat', function() {
dashboard.processRepeats();
});
- it('should repeat panels when row is expanding', function() {
+ it('should repeat panels when row is expanding', () => {
expect(dashboard.panels.length).toBe(4);
// toggle row
@@ -55,10 +55,10 @@ describe('given dashboard with panel repeat', function() {
});
});
-describe('given dashboard with panel repeat in horizontal direction', function() {
- var dashboard;
+describe('given dashboard with panel repeat in horizontal direction', () => {
+ let dashboard;
- beforeEach(function() {
+ beforeEach(() => {
dashboard = new DashboardModel({
panels: [
{
@@ -89,22 +89,22 @@ describe('given dashboard with panel repeat in horizontal direction', function()
dashboard.processRepeats();
});
- it('should repeat panel 3 times', function() {
+ it('should repeat panel 3 times', () => {
expect(dashboard.panels.length).toBe(3);
});
- it('should mark panel repeated', function() {
+ it('should mark panel repeated', () => {
expect(dashboard.panels[0].repeat).toBe('apps');
expect(dashboard.panels[1].repeatPanelId).toBe(2);
});
- it('should set scopedVars on panels', function() {
+ it('should set scopedVars on panels', () => {
expect(dashboard.panels[0].scopedVars.apps.value).toBe('se1');
expect(dashboard.panels[1].scopedVars.apps.value).toBe('se2');
expect(dashboard.panels[2].scopedVars.apps.value).toBe('se3');
});
- it('should place on first row and adjust width so all fit', function() {
+ it('should place on first row and adjust width so all fit', () => {
expect(dashboard.panels[0].gridPos).toMatchObject({
x: 0,
y: 0,
@@ -125,23 +125,23 @@ describe('given dashboard with panel repeat in horizontal direction', function()
});
});
- describe('After a second iteration', function() {
- beforeEach(function() {
+ describe('After a second iteration', () => {
+ beforeEach(() => {
dashboard.panels[0].fill = 10;
dashboard.processRepeats();
});
- it('reused panel should copy properties from source', function() {
+ it('reused panel should copy properties from source', () => {
expect(dashboard.panels[1].fill).toBe(10);
});
- it('should have same panel count', function() {
+ it('should have same panel count', () => {
expect(dashboard.panels.length).toBe(3);
});
});
- describe('After a second iteration with different variable', function() {
- beforeEach(function() {
+ describe('After a second iteration with different variable', () => {
+ beforeEach(() => {
dashboard.templating.list.push({
name: 'server',
current: { text: 'se1, se2, se3', value: ['se1'] },
@@ -151,46 +151,46 @@ describe('given dashboard with panel repeat in horizontal direction', function()
dashboard.processRepeats();
});
- it('should remove scopedVars value for last variable', function() {
+ it('should remove scopedVars value for last variable', () => {
expect(dashboard.panels[0].scopedVars.apps).toBe(undefined);
});
- it('should have new variable value in scopedVars', function() {
+ it('should have new variable value in scopedVars', () => {
expect(dashboard.panels[0].scopedVars.server.value).toBe('se1');
});
});
- describe('After a second iteration and selected values reduced', function() {
- beforeEach(function() {
+ describe('After a second iteration and selected values reduced', () => {
+ beforeEach(() => {
dashboard.templating.list[0].options[1].selected = false;
dashboard.processRepeats();
});
- it('should clean up repeated panel', function() {
+ it('should clean up repeated panel', () => {
expect(dashboard.panels.length).toBe(2);
});
});
- describe('After a second iteration and panel repeat is turned off', function() {
- beforeEach(function() {
+ describe('After a second iteration and panel repeat is turned off', () => {
+ beforeEach(() => {
dashboard.panels[0].repeat = null;
dashboard.processRepeats();
});
- it('should clean up repeated panel', function() {
+ it('should clean up repeated panel', () => {
expect(dashboard.panels.length).toBe(1);
});
- it('should remove scoped vars from reused panel', function() {
+ it('should remove scoped vars from reused panel', () => {
expect(dashboard.panels[0].scopedVars).toBe(undefined);
});
});
});
-describe('given dashboard with panel repeat in vertical direction', function() {
- var dashboard;
+describe('given dashboard with panel repeat in vertical direction', () => {
+ let dashboard;
- beforeEach(function() {
+ beforeEach(() => {
dashboard = new DashboardModel({
panels: [
{ id: 1, type: 'row', gridPos: { x: 0, y: 0, h: 1, w: 24 } },
@@ -218,7 +218,7 @@ describe('given dashboard with panel repeat in vertical direction', function() {
dashboard.processRepeats();
});
- it('should place on items on top of each other and keep witdh', function() {
+ it('should place on items on top of each other and keep witdh', () => {
expect(dashboard.panels[0].gridPos).toMatchObject({ x: 0, y: 0, h: 1, w: 24 }); // first row
expect(dashboard.panels[1].gridPos).toMatchObject({ x: 5, y: 1, h: 2, w: 8 });
@@ -271,8 +271,8 @@ describe('given dashboard with row repeat and panel repeat in horizontal directi
});
it('should panels in self row', () => {
- const panel_types = _.map(dashboard.panels, 'type');
- expect(panel_types).toEqual([
+ const panelTypes = _.map(dashboard.panels, 'type');
+ expect(panelTypes).toEqual([
'row',
'graph',
'graph',
@@ -290,7 +290,7 @@ describe('given dashboard with row repeat and panel repeat in horizontal directi
]);
});
- it('should be placed in their places', function() {
+ it('should be placed in their places', () => {
expect(dashboard.panels[0].gridPos).toMatchObject({ x: 0, y: 0, h: 1, w: 24 }); // 1st row
expect(dashboard.panels[1].gridPos).toMatchObject({ x: 0, y: 1, h: 2, w: 6 });
@@ -311,10 +311,10 @@ describe('given dashboard with row repeat and panel repeat in horizontal directi
});
});
-describe('given dashboard with row repeat', function() {
+describe('given dashboard with row repeat', () => {
let dashboard, dashboardJSON;
- beforeEach(function() {
+ beforeEach(() => {
dashboardJSON = {
panels: [
{
@@ -349,12 +349,12 @@ describe('given dashboard with row repeat', function() {
dashboard.processRepeats();
});
- it('should not repeat only row', function() {
- const panel_types = _.map(dashboard.panels, 'type');
- expect(panel_types).toEqual(['row', 'graph', 'graph', 'row', 'graph', 'graph', 'row', 'graph']);
+ it('should not repeat only row', () => {
+ const panelTypes = _.map(dashboard.panels, 'type');
+ expect(panelTypes).toEqual(['row', 'graph', 'graph', 'row', 'graph', 'graph', 'row', 'graph']);
});
- it('should set scopedVars for each panel', function() {
+ it('should set scopedVars for each panel', () => {
dashboardJSON.templating.list[0].options[2].selected = true;
dashboard = new DashboardModel(dashboardJSON);
dashboard.processRepeats();
@@ -375,12 +375,12 @@ describe('given dashboard with row repeat', function() {
expect(scopedVars).toEqual(['se1', 'se1', 'se1', 'se2', 'se2', 'se2', 'se3', 'se3', 'se3']);
});
- it('should repeat only configured row', function() {
+ it('should repeat only configured row', () => {
expect(dashboard.panels[6].id).toBe(4);
expect(dashboard.panels[7].id).toBe(5);
});
- it('should repeat only row if it is collapsed', function() {
+ it('should repeat only row if it is collapsed', () => {
dashboardJSON.panels = [
{
id: 1,
@@ -399,13 +399,13 @@ describe('given dashboard with row repeat', function() {
dashboard = new DashboardModel(dashboardJSON);
dashboard.processRepeats();
- const panel_types = _.map(dashboard.panels, 'type');
- expect(panel_types).toEqual(['row', 'row', 'row', 'graph']);
+ const panelTypes = _.map(dashboard.panels, 'type');
+ expect(panelTypes).toEqual(['row', 'row', 'row', 'graph']);
expect(dashboard.panels[0].panels).toHaveLength(2);
expect(dashboard.panels[1].panels).toHaveLength(2);
});
- it('should properly repeat multiple rows', function() {
+ it('should properly repeat multiple rows', () => {
dashboardJSON.panels = [
{
id: 1,
@@ -441,8 +441,8 @@ describe('given dashboard with row repeat', function() {
dashboard = new DashboardModel(dashboardJSON);
dashboard.processRepeats();
- const panel_types = _.map(dashboard.panels, 'type');
- expect(panel_types).toEqual([
+ const panelTypes = _.map(dashboard.panels, 'type');
+ expect(panelTypes).toEqual([
'row',
'graph',
'graph',
@@ -469,7 +469,7 @@ describe('given dashboard with row repeat', function() {
expect(dashboard.panels[12].scopedVars['hosts'].value).toBe('backend02');
});
- it('should assign unique ids for repeated panels', function() {
+ it('should assign unique ids for repeated panels', () => {
dashboardJSON.panels = [
{
id: 1,
@@ -488,7 +488,7 @@ describe('given dashboard with row repeat', function() {
dashboard = new DashboardModel(dashboardJSON);
dashboard.processRepeats();
- const panel_ids = _.flattenDeep(
+ const panelIds = _.flattenDeep(
_.map(dashboard.panels, panel => {
let ids = [];
if (panel.panels && panel.panels.length) {
@@ -498,10 +498,10 @@ describe('given dashboard with row repeat', function() {
return ids;
})
);
- expect(panel_ids.length).toEqual(_.uniq(panel_ids).length);
+ expect(panelIds.length).toEqual(_.uniq(panelIds).length);
});
- it('should place new panels in proper order', function() {
+ it('should place new panels in proper order', () => {
dashboardJSON.panels = [
{ id: 1, type: 'row', gridPos: { x: 0, y: 0, h: 1, w: 24 }, repeat: 'apps' },
{ id: 2, type: 'graph', gridPos: { x: 0, y: 1, h: 3, w: 12 } },
@@ -511,10 +511,10 @@ describe('given dashboard with row repeat', function() {
dashboard = new DashboardModel(dashboardJSON);
dashboard.processRepeats();
- const panel_types = _.map(dashboard.panels, 'type');
- expect(panel_types).toEqual(['row', 'graph', 'graph', 'graph', 'row', 'graph', 'graph', 'graph']);
- const panel_y_positions = _.map(dashboard.panels, p => p.gridPos.y);
- expect(panel_y_positions).toEqual([0, 1, 1, 5, 7, 8, 8, 12]);
+ const panelTypes = _.map(dashboard.panels, 'type');
+ expect(panelTypes).toEqual(['row', 'graph', 'graph', 'graph', 'row', 'graph', 'graph', 'graph']);
+ const panelYPositions = _.map(dashboard.panels, p => p.gridPos.y);
+ expect(panelYPositions).toEqual([0, 1, 1, 5, 7, 8, 8, 12]);
});
});
@@ -566,8 +566,8 @@ describe('given dashboard with row and panel repeat', () => {
});
it('should repeat row and panels for each row', () => {
- const panel_types = _.map(dashboard.panels, 'type');
- expect(panel_types).toEqual(['row', 'graph', 'graph', 'row', 'graph', 'graph']);
+ const panelTypes = _.map(dashboard.panels, 'type');
+ expect(panelTypes).toEqual(['row', 'graph', 'graph', 'row', 'graph', 'graph']);
});
it('should clean up old repeated panels', () => {
@@ -592,8 +592,8 @@ describe('given dashboard with row and panel repeat', () => {
dashboard = new DashboardModel(dashboardJSON);
dashboard.processRepeats();
- const panel_types = _.map(dashboard.panels, 'type');
- expect(panel_types).toEqual(['row', 'graph', 'graph', 'row', 'graph', 'graph']);
+ const panelTypes = _.map(dashboard.panels, 'type');
+ expect(panelTypes).toEqual(['row', 'graph', 'graph', 'row', 'graph', 'graph']);
});
it('should set scopedVars for each row', () => {
@@ -646,7 +646,7 @@ describe('given dashboard with row and panel repeat', () => {
});
});
- it('should repeat panels when row is expanding', function() {
+ it('should repeat panels when row is expanding', () => {
dashboard = new DashboardModel(dashboardJSON);
dashboard.processRepeats();
diff --git a/public/app/features/dashboard/specs/save_as_modal.test.ts b/public/app/features/dashboard/specs/save_as_modal.test.ts
index 29ed694474b..ceb7e49c550 100644
--- a/public/app/features/dashboard/specs/save_as_modal.test.ts
+++ b/public/app/features/dashboard/specs/save_as_modal.test.ts
@@ -10,11 +10,11 @@ describe('saving dashboard as', () => {
};
const mockDashboardSrv = {
- getCurrent: function() {
+ getCurrent: () => {
return {
id: 5,
meta: {},
- getSaveModelClone: function() {
+ getSaveModelClone: () => {
return json;
},
};
diff --git a/public/app/features/dashboard/specs/save_provisioned_modal.test.ts b/public/app/features/dashboard/specs/save_provisioned_modal.test.ts
index fb1a652a03c..a3ab27a984f 100644
--- a/public/app/features/dashboard/specs/save_provisioned_modal.test.ts
+++ b/public/app/features/dashboard/specs/save_provisioned_modal.test.ts
@@ -7,11 +7,11 @@ describe('SaveProvisionedDashboardModalCtrl', () => {
};
const mockDashboardSrv = {
- getCurrent: function() {
+ getCurrent: () => {
return {
id: 5,
meta: {},
- getSaveModelClone: function() {
+ getSaveModelClone: () => {
return json;
},
};
diff --git a/public/app/features/dashboard/specs/share_modal_ctrl.test.ts b/public/app/features/dashboard/specs/share_modal_ctrl.test.ts
index 796baf7f522..8a8d94fdddb 100644
--- a/public/app/features/dashboard/specs/share_modal_ctrl.test.ts
+++ b/public/app/features/dashboard/specs/share_modal_ctrl.test.ts
@@ -4,7 +4,7 @@ import config from 'app/core/config';
import { LinkSrv } from 'app/features/panellinks/link_srv';
describe('ShareModalCtrl', () => {
- const ctx = {
+ const ctx = {
timeSrv: {
timeRange: () => {
return { from: new Date(1000), to: new Date(2000) };
@@ -26,9 +26,9 @@ describe('ShareModalCtrl', () => {
templateSrv: {
fillVariableValuesForUrl: () => {},
},
- };
+ } as any;
- (window).Intl.DateTimeFormat = () => {
+ (window as any).Intl.DateTimeFormat = () => {
return {
resolvedOptions: () => {
return { timeZone: 'UTC' };
@@ -136,7 +136,7 @@ describe('ShareModalCtrl', () => {
ctx.$location.absUrl = () => 'http://server/#!/test';
ctx.scope.options.includeTemplateVars = true;
- ctx.templateSrv.fillVariableValuesForUrl = function(params) {
+ ctx.templateSrv.fillVariableValuesForUrl = params => {
params['var-app'] = 'mupp';
params['var-server'] = 'srv-01';
};
diff --git a/public/app/features/dashboard/specs/time_srv.test.ts b/public/app/features/dashboard/specs/time_srv.test.ts
index 046ac52c9bf..514e0b90792 100644
--- a/public/app/features/dashboard/specs/time_srv.test.ts
+++ b/public/app/features/dashboard/specs/time_srv.test.ts
@@ -2,7 +2,7 @@ import { TimeSrv } from '../time_srv';
import '../time_srv';
import moment from 'moment';
-describe('timeSrv', function() {
+describe('timeSrv', () => {
const rootScope = {
$on: jest.fn(),
onAppEvent: jest.fn(),
@@ -26,20 +26,20 @@ describe('timeSrv', function() {
getTimezone: jest.fn(() => 'browser'),
};
- beforeEach(function() {
+ beforeEach(() => {
timeSrv = new TimeSrv(rootScope, jest.fn(), location, timer, { isGrafanaVisibile: jest.fn() });
timeSrv.init(_dashboard);
});
- describe('timeRange', function() {
- it('should return unparsed when parse is false', function() {
+ describe('timeRange', () => {
+ it('should return unparsed when parse is false', () => {
timeSrv.setTime({ from: 'now', to: 'now-1h' });
const time = timeSrv.timeRange();
expect(time.raw.from).toBe('now');
expect(time.raw.to).toBe('now-1h');
});
- it('should return parsed when parse is true', function() {
+ it('should return parsed when parse is true', () => {
timeSrv.setTime({ from: 'now', to: 'now-1h' });
const time = timeSrv.timeRange();
expect(moment.isMoment(time.from)).toBe(true);
@@ -47,8 +47,8 @@ describe('timeSrv', function() {
});
});
- describe('init time from url', function() {
- it('should handle relative times', function() {
+ describe('init time from url', () => {
+ it('should handle relative times', () => {
location = {
search: jest.fn(() => ({
from: 'now-2d',
@@ -63,7 +63,7 @@ describe('timeSrv', function() {
expect(time.raw.to).toBe('now');
});
- it('should handle formatted dates', function() {
+ it('should handle formatted dates', () => {
location = {
search: jest.fn(() => ({
from: '20140410T052010',
@@ -79,7 +79,7 @@ describe('timeSrv', function() {
expect(time.to.valueOf()).toEqual(new Date('2014-05-20T03:10:22Z').getTime());
});
- it('should handle formatted dates without time', function() {
+ it('should handle formatted dates without time', () => {
location = {
search: jest.fn(() => ({
from: '20140410',
@@ -95,7 +95,7 @@ describe('timeSrv', function() {
expect(time.to.valueOf()).toEqual(new Date('2014-05-20T00:00:00Z').getTime());
});
- it('should handle epochs', function() {
+ it('should handle epochs', () => {
location = {
search: jest.fn(() => ({
from: '1410337646373',
@@ -111,7 +111,7 @@ describe('timeSrv', function() {
expect(time.to.valueOf()).toEqual(1410337665699);
});
- it('should handle bad dates', function() {
+ it('should handle bad dates', () => {
location = {
search: jest.fn(() => ({
from: '20151126T00010%3C%2Fp%3E%3Cspan%20class',
@@ -128,22 +128,22 @@ describe('timeSrv', function() {
});
});
- describe('setTime', function() {
- it('should return disable refresh if refresh is disabled for any range', function() {
+ describe('setTime', () => {
+ it('should return disable refresh if refresh is disabled for any range', () => {
_dashboard.refresh = false;
timeSrv.setTime({ from: '2011-01-01', to: '2015-01-01' });
expect(_dashboard.refresh).toBe(false);
});
- it('should restore refresh for absolute time range', function() {
+ it('should restore refresh for absolute time range', () => {
_dashboard.refresh = '30s';
timeSrv.setTime({ from: '2011-01-01', to: '2015-01-01' });
expect(_dashboard.refresh).toBe('30s');
});
- it('should restore refresh after relative time range is set', function() {
+ it('should restore refresh after relative time range is set', () => {
_dashboard.refresh = '10s';
timeSrv.setTime({
from: moment([2011, 1, 1]),
@@ -154,7 +154,7 @@ describe('timeSrv', function() {
expect(_dashboard.refresh).toBe('10s');
});
- it('should keep refresh after relative time range is changed and now delay exists', function() {
+ it('should keep refresh after relative time range is changed and now delay exists', () => {
_dashboard.refresh = '10s';
timeSrv.setTime({ from: 'now-1h', to: 'now-10s' });
expect(_dashboard.refresh).toBe('10s');
diff --git a/public/app/features/dashboard/time_srv.ts b/public/app/features/dashboard/time_srv.ts
index 9435433848e..dd5a0ba758f 100644
--- a/public/app/features/dashboard/time_srv.ts
+++ b/public/app/features/dashboard/time_srv.ts
@@ -13,7 +13,7 @@ export class TimeSrv {
timeAtLoad: any;
private autoRefreshBlocked: boolean;
- /** @ngInject **/
+ /** @ngInject */
constructor(private $rootScope, private $timeout, private $location, private timer, private contextSrv) {
// default time
this.time = { from: '6h', to: 'now' };
@@ -70,7 +70,7 @@ export class TimeSrv {
}
if (!isNaN(value)) {
- const epoch = parseInt(value);
+ const epoch = parseInt(value, 10);
return moment.utc(epoch);
}
diff --git a/public/app/features/dashboard/timepicker/input_date.ts b/public/app/features/dashboard/timepicker/input_date.ts
index 0e5e176b72b..7de39dfacb2 100644
--- a/public/app/features/dashboard/timepicker/input_date.ts
+++ b/public/app/features/dashboard/timepicker/input_date.ts
@@ -5,10 +5,10 @@ export function inputDateDirective() {
return {
restrict: 'A',
require: 'ngModel',
- link: function($scope, $elem, attrs, ngModel) {
+ link: ($scope, $elem, attrs, ngModel) => {
const format = 'YYYY-MM-DD HH:mm:ss';
- const fromUser = function(text) {
+ const fromUser = text => {
if (text.indexOf('now') !== -1) {
if (!dateMath.isValid(text)) {
ngModel.$setValidity('error', false);
@@ -18,7 +18,7 @@ export function inputDateDirective() {
return text;
}
- var parsed;
+ let parsed;
if ($scope.ctrl.isUtc) {
parsed = moment.utc(text, format);
} else {
@@ -34,7 +34,7 @@ export function inputDateDirective() {
return parsed;
};
- const toUser = function(currentValue) {
+ const toUser = currentValue => {
if (moment.isMoment(currentValue)) {
return currentValue.format(format);
} else {
diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html
index 07f97604c42..3e38881d480 100644
--- a/public/app/features/dashboard/timepicker/timepicker.html
+++ b/public/app/features/dashboard/timepicker/timepicker.html
@@ -1,18 +1,8 @@
-