diff --git a/.editorconfig b/.editorconfig index 146224e7330..84bbaf8a420 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,6 +7,8 @@ indent_size = 2 charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true +max_line_length = 120 +insert_final_newline = true [*.go] indent_style = tab diff --git a/package.json b/package.json index 847f1738e45..509b9bb106d 100644 --- a/package.json +++ b/package.json @@ -107,14 +107,19 @@ }, "lint-staged": { "*.{ts,tsx}": [ - "prettier --single-quote --trailing-comma es5 --write", + "prettier --write", "git add" ], "*.scss": [ - "prettier --single-quote --write", + "prettier --write", "git add" ] }, + "prettier": { + "trailingComma": "es5", + "singleQuote": true, + "printWidth": 120 + }, "license": "Apache-2.0", "dependencies": { "angular": "^1.6.6", diff --git a/public/app/app.ts b/public/app/app.ts index f3e1fa5133e..45050240602 100644 --- a/public/app/app.ts +++ b/public/app/app.ts @@ -54,49 +54,40 @@ export class GrafanaApp { moment.locale(config.bootData.user.locale); - app.config( - ( - $locationProvider, - $controllerProvider, - $compileProvider, - $filterProvider, - $httpProvider, - $provide - ) => { - // pre assing bindings before constructor calls - $compileProvider.preAssignBindingsEnabled(true); + app.config(($locationProvider, $controllerProvider, $compileProvider, $filterProvider, $httpProvider, $provide) => { + // pre assing bindings before constructor calls + $compileProvider.preAssignBindingsEnabled(true); - if (config.buildInfo.env !== 'development') { - $compileProvider.debugInfoEnabled(false); - } - - $httpProvider.useApplyAsync(true); - - this.registerFunctions.controller = $controllerProvider.register; - this.registerFunctions.directive = $compileProvider.directive; - this.registerFunctions.factory = $provide.factory; - this.registerFunctions.service = $provide.service; - this.registerFunctions.filter = $filterProvider.register; - - $provide.decorator('$http', [ - '$delegate', - '$templateCache', - function($delegate, $templateCache) { - var get = $delegate.get; - $delegate.get = function(url, config) { - if (url.match(/\.html$/)) { - // some template's already exist in the cache - if (!$templateCache.get(url)) { - url += '?v=' + new Date().getTime(); - } - } - return get(url, config); - }; - return $delegate; - }, - ]); + if (config.buildInfo.env !== 'development') { + $compileProvider.debugInfoEnabled(false); } - ); + + $httpProvider.useApplyAsync(true); + + this.registerFunctions.controller = $controllerProvider.register; + this.registerFunctions.directive = $compileProvider.directive; + this.registerFunctions.factory = $provide.factory; + this.registerFunctions.service = $provide.service; + this.registerFunctions.filter = $filterProvider.register; + + $provide.decorator('$http', [ + '$delegate', + '$templateCache', + function($delegate, $templateCache) { + var get = $delegate.get; + $delegate.get = function(url, config) { + if (url.match(/\.html$/)) { + // some template's already exist in the cache + if (!$templateCache.get(url)) { + url += '?v=' + new Date().getTime(); + } + } + return get(url, config); + }; + return $delegate; + }, + ]); + }); this.ngModuleDependencies = [ 'grafana.core', @@ -111,14 +102,7 @@ export class GrafanaApp { 'react', ]; - var module_types = [ - 'controllers', - 'directives', - 'factories', - 'services', - 'filters', - 'routes', - ]; + var module_types = ['controllers', 'directives', 'factories', 'services', 'filters', 'routes']; _.each(module_types, type => { var moduleName = 'grafana.' + type; diff --git a/public/app/core/components/code_editor/code_editor.ts b/public/app/core/components/code_editor/code_editor.ts index 36d6c1b1020..2a0fe103bcf 100644 --- a/public/app/core/components/code_editor/code_editor.ts +++ b/public/app/core/components/code_editor/code_editor.ts @@ -56,9 +56,7 @@ function link(scope, elem, attrs) { let maxLines = attrs.maxLines || DEFAULT_MAX_LINES; let showGutter = attrs.showGutter !== undefined; let tabSize = attrs.tabSize || DEFAULT_TAB_SIZE; - let behavioursEnabled = attrs.behavioursEnabled - ? attrs.behavioursEnabled === 'true' - : DEFAULT_BEHAVIOURS; + let behavioursEnabled = attrs.behavioursEnabled ? attrs.behavioursEnabled === 'true' : DEFAULT_BEHAVIOURS; // Initialize editor let aceElem = elem.get(0); diff --git a/public/app/core/components/colorpicker/spectrum_picker.ts b/public/app/core/components/colorpicker/spectrum_picker.ts index 45d367bfbe8..6e93a4f39f4 100644 --- a/public/app/core/components/colorpicker/spectrum_picker.ts +++ b/public/app/core/components/colorpicker/spectrum_picker.ts @@ -12,8 +12,7 @@ export function spectrumPicker() { require: 'ngModel', scope: true, replace: true, - template: - '', + template: '', link: function(scope, element, attrs, ngModel) { scope.ngModel = ngModel; scope.onColorChange = color => { diff --git a/public/app/core/components/form_dropdown/form_dropdown.ts b/public/app/core/components/form_dropdown/form_dropdown.ts index f8d715579a5..1fa1dea4338 100644 --- a/public/app/core/components/form_dropdown/form_dropdown.ts +++ b/public/app/core/components/form_dropdown/form_dropdown.ts @@ -32,13 +32,7 @@ export class FormDropdownCtrl { lookupText: boolean; /** @ngInject **/ - constructor( - private $scope, - $element, - private $sce, - private templateSrv, - private $q - ) { + constructor(private $scope, $element, private $sce, private templateSrv, private $q) { this.inputElement = $element.find('input').first(); this.linkElement = $element.find('a').first(); this.linkMode = true; @@ -50,8 +44,7 @@ export class FormDropdownCtrl { if (this.labelMode) { this.cssClasses = 'gf-form-label ' + this.cssClass; } else { - this.cssClasses = - 'gf-form-input gf-form-input--dropdown ' + this.cssClass; + this.cssClasses = 'gf-form-input gf-form-input--dropdown ' + this.cssClass; } this.inputElement.attr('data-provide', 'typeahead'); @@ -207,16 +200,11 @@ export class FormDropdownCtrl { updateDisplay(text) { this.text = text; - this.display = this.$sce.trustAsHtml( - this.templateSrv.highlightVariablesAsHtml(text) - ); + this.display = this.$sce.trustAsHtml(this.templateSrv.highlightVariablesAsHtml(text)); } open() { - this.inputElement.css( - 'width', - Math.max(this.linkElement.width(), 80) + 16 + 'px' - ); + this.inputElement.css('width', Math.max(this.linkElement.width(), 80) + 16 + 'px'); this.inputElement.show(); this.inputElement.focus(); diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts index 54685b5cf35..7124a36cccc 100644 --- a/public/app/core/components/grafana_app.ts +++ b/public/app/core/components/grafana_app.ts @@ -9,15 +9,7 @@ import Drop from 'tether-drop'; export class GrafanaCtrl { /** @ngInject */ - constructor( - $scope, - alertSrv, - utilSrv, - $rootScope, - $controller, - contextSrv, - globalEventSrv - ) { + constructor($scope, alertSrv, utilSrv, $rootScope, $controller, contextSrv, globalEventSrv) { $scope.init = function() { $scope.contextSrv = contextSrv; @@ -118,12 +110,7 @@ export class GrafanaCtrl { } /** @ngInject */ -export function grafanaAppDirective( - playlistSrv, - contextSrv, - $timeout, - $rootScope -) { +export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScope) { return { restrict: 'E', controller: GrafanaCtrl, @@ -269,10 +256,7 @@ export function grafanaAppDirective( // hide search if (body.find('.search-container').length > 0) { - if ( - target.parents('.search-results-container, .search-field-wrapper') - .length === 0 - ) { + if (target.parents('.search-results-container, .search-field-wrapper').length === 0) { scope.$apply(function() { scope.appEvent('hide-dash-search'); }); @@ -281,10 +265,7 @@ export function grafanaAppDirective( // hide popovers var popover = elem.find('.popover'); - if ( - popover.length > 0 && - target.parents('.graph-legend').length === 0 - ) { + if (popover.length > 0 && target.parents('.graph-legend').length === 0) { popover.hide(); } }); diff --git a/public/app/core/components/json_explorer/helpers.ts b/public/app/core/components/json_explorer/helpers.ts index 69fd422fff1..5b053792d73 100644 --- a/public/app/core/components/json_explorer/helpers.ts +++ b/public/app/core/components/json_explorer/helpers.ts @@ -103,11 +103,7 @@ export function cssClass(className: string): string { * Creates a new DOM element wiht given type and class * TODO: move me to helpers */ -export function createElement( - type: string, - className?: string, - content?: Element | string -): Element { +export function createElement(type: string, className?: string, content?: Element | string): Element { const el = document.createElement(type); if (className) { el.classList.add(cssClass(className)); diff --git a/public/app/core/components/json_explorer/json_explorer.ts b/public/app/core/components/json_explorer/json_explorer.ts index 5c879bcee0f..9cc1b53bc82 100644 --- a/public/app/core/components/json_explorer/json_explorer.ts +++ b/public/app/core/components/json_explorer/json_explorer.ts @@ -1,14 +1,7 @@ // Based on work https://github.com/mohsen1/json-formatter-js // Licence MIT, Copyright (c) 2015 Mohsen Azimi -import { - isObject, - getObjectName, - getType, - getValuePreview, - cssClass, - createElement, -} from './helpers'; +import { isObject, getObjectName, getType, getValuePreview, cssClass, createElement } from './helpers'; import _ from 'lodash'; @@ -112,9 +105,7 @@ export class JsonExplorer { private get isDate(): boolean { return ( this.type === 'string' && - (DATE_STRING_REGEX.test(this.json) || - JSON_DATE_REGEX.test(this.json) || - PARTIAL_DATE_REGEX.test(this.json)) + (DATE_STRING_REGEX.test(this.json) || JSON_DATE_REGEX.test(this.json) || PARTIAL_DATE_REGEX.test(this.json)) ); } @@ -151,9 +142,7 @@ export class JsonExplorer { * is this an empty object or array? */ private get isEmpty(): boolean { - return ( - this.isEmptyObject || (this.keys && !this.keys.length && this.isArray) - ); + return this.isEmptyObject || (this.keys && !this.keys.length && this.isArray); } /* @@ -234,11 +223,7 @@ export class JsonExplorer { } isNumberArray() { - return ( - this.json.length > 0 && - this.json.length < 4 && - (_.isNumber(this.json[0]) || _.isNumber(this.json[1])) - ); + return this.json.length > 0 && this.json.length < 4 && (_.isNumber(this.json[0]) || _.isNumber(this.json[1])); } renderArray() { @@ -249,17 +234,13 @@ export class JsonExplorer { if (this.isNumberArray()) { this.json.forEach((val, index) => { if (index > 0) { - arrayWrapperSpan.appendChild( - createElement('span', 'array-comma', ',') - ); + arrayWrapperSpan.appendChild(createElement('span', 'array-comma', ',')); } arrayWrapperSpan.appendChild(createElement('span', 'number', val)); }); this.skipChildren = true; } else { - arrayWrapperSpan.appendChild( - createElement('span', 'number', this.json.length) - ); + arrayWrapperSpan.appendChild(createElement('span', 'number', this.json.length)); } arrayWrapperSpan.appendChild(createElement('span', 'bracket', ']')); @@ -298,11 +279,7 @@ export class JsonExplorer { const objectWrapperSpan = createElement('span'); // get constructor name and append it to wrapper span - var constructorName = createElement( - 'span', - 'constructor-name', - this.constructorName - ); + var constructorName = createElement('span', 'constructor-name', this.constructorName); objectWrapperSpan.appendChild(constructorName); // if it's an array append the array specific elements like brackets and length @@ -399,12 +376,7 @@ export class JsonExplorer { let index = 0; const addAChild = () => { const key = this.keys[index]; - const formatter = new JsonExplorer( - this.json[key], - this.open - 1, - this.config, - key - ); + const formatter = new JsonExplorer(this.json[key], this.open - 1, this.config, key); children.appendChild(formatter.render()); index += 1; @@ -421,12 +393,7 @@ export class JsonExplorer { requestAnimationFrame(addAChild); } else { this.keys.forEach(key => { - const formatter = new JsonExplorer( - this.json[key], - this.open - 1, - this.config, - key - ); + const formatter = new JsonExplorer(this.json[key], this.open - 1, this.config, key); children.appendChild(formatter.render()); }); } @@ -437,9 +404,7 @@ export class JsonExplorer { * Animated option is used when user triggers this via a click */ removeChildren(animated = false) { - const childrenElement = this.element.querySelector( - `div.${cssClass('children')}` - ) as HTMLDivElement; + const childrenElement = this.element.querySelector(`div.${cssClass('children')}`) as HTMLDivElement; if (animated) { let childrenRemoved = 0; diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.ts b/public/app/core/components/manage_dashboards/manage_dashboards.ts index a985a9fee7b..962b17632dc 100644 --- a/public/app/core/components/manage_dashboards/manage_dashboards.ts +++ b/public/app/core/components/manage_dashboards/manage_dashboards.ts @@ -13,11 +13,7 @@ export class ManageDashboardsCtrl { canMove = false; hasFilters = false; selectAllChecked = false; - starredFilterOptions = [ - { text: 'Filter by Starred', disabled: true }, - { text: 'Yes' }, - { text: 'No' }, - ]; + starredFilterOptions = [{ text: 'Filter by Starred', disabled: true }, { text: 'Yes' }, { text: 'No' }]; selectedStarredFilter: any; folderId?: number; @@ -53,10 +49,7 @@ export class ManageDashboardsCtrl { this.canMove = false; this.canDelete = false; this.selectAllChecked = false; - this.hasFilters = - this.query.query.length > 0 || - this.query.tag.length > 0 || - this.query.starred; + this.hasFilters = this.query.query.length > 0 || this.query.tag.length > 0 || this.query.starred; if (!result) { this.sections = []; @@ -126,16 +119,10 @@ export class ManageDashboardsCtrl { let text2; if (folderCount > 0 && dashCount > 0) { - text += `selected folder${folderCount === 1 ? '' : 's'} and dashboard${ - dashCount === 1 ? '' : 's' - }?`; - text2 = `All dashboards of the selected folder${ - folderCount === 1 ? '' : 's' - } will also be deleted`; + text += `selected folder${folderCount === 1 ? '' : 's'} and dashboard${dashCount === 1 ? '' : 's'}?`; + text2 = `All dashboards of the selected folder${folderCount === 1 ? '' : 's'} will also be deleted`; } else if (folderCount > 0) { - text += `selected folder${ - folderCount === 1 ? '' : 's' - } and all its dashboards?`; + text += `selected folder${folderCount === 1 ? '' : 's'} and all its dashboards?`; } else { text += `selected dashboard${dashCount === 1 ? '' : 's'}?`; } @@ -165,22 +152,16 @@ export class ManageDashboardsCtrl { let msg; if (folderCount > 0 && dashCount > 0) { - header = `Folder${folderCount === 1 ? '' : 's'} And Dashboard${ - dashCount === 1 ? '' : 's' - } Deleted`; + header = `Folder${folderCount === 1 ? '' : 's'} And Dashboard${dashCount === 1 ? '' : 's'} Deleted`; msg = `${folderCount} folder${folderCount === 1 ? '' : 's'} `; - msg += `and ${dashCount} dashboard${ - dashCount === 1 ? '' : 's' - } has been deleted`; + msg += `and ${dashCount} dashboard${dashCount === 1 ? '' : 's'} has been deleted`; } else if (folderCount > 0) { header = `Folder${folderCount === 1 ? '' : 's'} Deleted`; if (folderCount === 1) { msg = `${folders[0].dashboard.title} has been deleted`; } else { - msg = `${folderCount} folder${ - folderCount === 1 ? '' : 's' - } has been deleted`; + msg = `${folderCount} folder${folderCount === 1 ? '' : 's'} has been deleted`; } } else if (dashCount > 0) { header = `Dashboard${dashCount === 1 ? '' : 's'} Deleted`; @@ -188,9 +169,7 @@ export class ManageDashboardsCtrl { if (dashCount === 1) { msg = `${dashboards[0].dashboard.title} has been deleted`; } else { - msg = `${dashCount} dashboard${ - dashCount === 1 ? '' : 's' - } has been deleted`; + msg = `${dashCount} dashboard${dashCount === 1 ? '' : 's'} has been deleted`; } } @@ -231,9 +210,7 @@ export class ManageDashboardsCtrl { getTags() { return this.searchSrv.getDashboardTags().then(results => { - this.tagFilterOptions = [ - { term: 'Filter By Tag', disabled: true }, - ].concat(results); + this.tagFilterOptions = [{ term: 'Filter By Tag', disabled: true }].concat(results); this.selectedTagFilter = this.tagFilterOptions[0]; }); } @@ -312,8 +289,7 @@ export class ManageDashboardsCtrl { export function manageDashboardsDirective() { return { restrict: 'E', - templateUrl: - 'public/app/core/components/manage_dashboards/manage_dashboards.html', + templateUrl: 'public/app/core/components/manage_dashboards/manage_dashboards.html', controller: ManageDashboardsCtrl, bindToController: true, controllerAs: 'ctrl', diff --git a/public/app/core/components/org_switcher.ts b/public/app/core/components/org_switcher.ts index b682acfcad0..e2bd1be7928 100644 --- a/public/app/core/components/org_switcher.ts +++ b/public/app/core/components/org_switcher.ts @@ -63,9 +63,7 @@ export class OrgSwitchCtrl { setUsingOrg(org) { return this.backendSrv.post('/api/user/using/' + org.orgId).then(() => { const re = /orgId=\d+/gi; - this.setWindowLocationHref( - this.getWindowLocationHref().replace(re, 'orgId=' + org.orgId) - ); + this.setWindowLocationHref(this.getWindowLocationHref().replace(re, 'orgId=' + org.orgId)); }); } diff --git a/public/app/core/components/query_part/query_part_editor.ts b/public/app/core/components/query_part/query_part_editor.ts index e993d4ce24b..400892fe5f8 100644 --- a/public/app/core/components/query_part/query_part_editor.ts +++ b/public/app/core/components/query_part/query_part_editor.ts @@ -17,8 +17,7 @@ var template = ` /** @ngInject */ export function queryPartEditorDirective($compile, templateSrv) { - var paramTemplate = - ''; + var paramTemplate = ''; return { restrict: 'E', @@ -102,14 +101,12 @@ export function queryPartEditorDirective($compile, templateSrv) { } $scope.$apply(function() { - $scope - .handleEvent({ $event: { name: 'get-param-options' } }) - .then(function(result) { - var dynamicOptions = _.map(result, function(op) { - return op.value; - }); - callback(dynamicOptions); + $scope.handleEvent({ $event: { name: 'get-param-options' } }).then(function(result) { + var dynamicOptions = _.map(result, function(op) { + return op.value; }); + callback(dynamicOptions); + }); }); }; @@ -136,11 +133,9 @@ export function queryPartEditorDirective($compile, templateSrv) { } $scope.showActionsMenu = function() { - $scope - .handleEvent({ $event: { name: 'get-part-actions' } }) - .then(res => { - $scope.partActions = res; - }); + $scope.handleEvent({ $event: { name: 'get-part-actions' } }).then(res => { + $scope.partActions = res; + }); }; $scope.triggerPartAction = function(action) { @@ -157,12 +152,8 @@ export function queryPartEditorDirective($compile, templateSrv) { $(', ').appendTo($paramsContainer); } - var paramValue = templateSrv.highlightVariablesAsHtml( - part.params[index] - ); - var $paramLink = $( - '' + paramValue + '' - ); + var paramValue = templateSrv.highlightVariablesAsHtml(part.params[index]); + var $paramLink = $('' + paramValue + ''); var $input = $(paramTemplate); $paramLink.appendTo($paramsContainer); diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts index 632db4270f4..dcb88d7d32d 100644 --- a/public/app/core/components/search/search.ts +++ b/public/app/core/components/search/search.ts @@ -17,12 +17,7 @@ export class SearchCtrl { initialFolderFilterTitle: string; /** @ngInject */ - constructor( - $scope, - private $location, - private $timeout, - private searchSrv: SearchSrv - ) { + constructor($scope, private $location, private $timeout, private searchSrv: SearchSrv) { appEvents.on('show-dash-search', this.openSearch.bind(this), $scope); appEvents.on('hide-dash-search', this.closeSearch.bind(this), $scope); @@ -75,9 +70,7 @@ export class SearchCtrl { if (currentItem) { if (currentItem.dashboardIndex !== undefined) { - const selectedDash = this.results[currentItem.folderIndex].items[ - currentItem.dashboardIndex - ]; + const selectedDash = this.results[currentItem.folderIndex].items[currentItem.dashboardIndex]; if (selectedDash) { this.$location.search({}); @@ -105,9 +98,7 @@ export class SearchCtrl { if (currentItem) { if (currentItem.dashboardIndex !== undefined) { - this.results[currentItem.folderIndex].items[ - currentItem.dashboardIndex - ].selected = false; + this.results[currentItem.folderIndex].items[currentItem.dashboardIndex].selected = false; } else { this.results[currentItem.folderIndex].selected = false; } @@ -123,10 +114,7 @@ export class SearchCtrl { this.selectedIndex = (newIndex %= max) < 0 ? newIndex + max : newIndex; const selectedItem = flattenedResult[this.selectedIndex]; - if ( - selectedItem.dashboardIndex === undefined && - this.results[selectedItem.folderIndex].id === 0 - ) { + if (selectedItem.dashboardIndex === undefined && this.results[selectedItem.folderIndex].id === 0) { this.moveSelection(direction); return; } @@ -137,9 +125,7 @@ export class SearchCtrl { return; } - this.results[selectedItem.folderIndex].items[ - selectedItem.dashboardIndex - ].selected = true; + this.results[selectedItem.folderIndex].items[selectedItem.dashboardIndex].selected = true; return; } @@ -167,9 +153,7 @@ export class SearchCtrl { queryHasNoFilters() { var query = this.query; - return ( - query.query === '' && query.starred === false && query.tag.length === 0 - ); + return query.query === '' && query.starred === false && query.tag.length === 0; } filterByTag(tag) { diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 20e8975de53..0276a7331b3 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -13,25 +13,12 @@ export class SideMenuCtrl { isOpenMobile: boolean; /** @ngInject */ - constructor( - private $scope, - private $rootScope, - private $location, - private contextSrv, - private $timeout - ) { + constructor(private $scope, private $rootScope, private $location, private contextSrv, private $timeout) { this.isSignedIn = contextSrv.isSignedIn; this.user = contextSrv.user; - this.mainLinks = _.filter( - config.bootData.navTree, - item => !item.hideFromMenu - ); - this.bottomNav = _.filter( - config.bootData.navTree, - item => item.hideFromMenu - ); - this.loginUrl = - 'login?redirect=' + encodeURIComponent(this.$location.path()); + this.mainLinks = _.filter(config.bootData.navTree, item => !item.hideFromMenu); + this.bottomNav = _.filter(config.bootData.navTree, item => item.hideFromMenu); + this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path()); if (contextSrv.user.orgCount > 1) { let profileNode = _.find(this.bottomNav, { id: 'profile' }); @@ -41,8 +28,7 @@ export class SideMenuCtrl { } this.$scope.$on('$routeChangeSuccess', () => { - this.loginUrl = - 'login?redirect=' + encodeURIComponent(this.$location.path()); + this.loginUrl = 'login?redirect=' + encodeURIComponent(this.$location.path()); }); } diff --git a/public/app/core/components/team_picker.ts b/public/app/core/components/team_picker.ts index a289b4075d4..228767a76c4 100644 --- a/public/app/core/components/team_picker.ts +++ b/public/app/core/components/team_picker.ts @@ -30,13 +30,11 @@ export class TeamPickerCtrl { searchGroups(query: string) { return Promise.resolve( - this.backendSrv - .get('/api/teams/search?perpage=10&page=1&query=' + query) - .then(result => { - return _.map(result.teams, ug => { - return { text: ug.name, value: ug }; - }); - }) + this.backendSrv.get('/api/teams/search?perpage=10&page=1&query=' + query).then(result => { + return _.map(result.teams, ug => { + return { text: ug.name, value: ug }; + }); + }) ); } diff --git a/public/app/core/components/user_picker.ts b/public/app/core/components/user_picker.ts index 36b7c34b1fa..606ded09885 100644 --- a/public/app/core/components/user_picker.ts +++ b/public/app/core/components/user_picker.ts @@ -26,13 +26,11 @@ export class UserPickerCtrl { searchUsers(query: string) { return Promise.resolve( - this.backendSrv - .get('/api/users/search?perpage=10&page=1&query=' + query) - .then(result => { - return _.map(result.users, user => { - return { text: user.login + ' - ' + user.email, value: user }; - }); - }) + this.backendSrv.get('/api/users/search?perpage=10&page=1&query=' + query).then(result => { + return _.map(result.users, user => { + return { text: user.login + ' - ' + user.email, value: user }; + }); + }) ); } diff --git a/public/app/core/controllers/inspect_ctrl.ts b/public/app/core/controllers/inspect_ctrl.ts index 1e74bcf1968..5dd4cb3d06f 100644 --- a/public/app/core/controllers/inspect_ctrl.ts +++ b/public/app/core/controllers/inspect_ctrl.ts @@ -28,10 +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, function(value, key) { return { key: key, value: value }; }); } @@ -46,14 +43,9 @@ export class InspectCtrl { $scope.editor.index = 2; if (_.isString(model.error.config.data)) { - $scope.request_parameters = this.getParametersFromQueryString( - 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, function(value, key) { return { key: key, value: angular.toJson(value, true) }; }); } diff --git a/public/app/core/controllers/invited_ctrl.ts b/public/app/core/controllers/invited_ctrl.ts index f09c81522d9..e88c810b557 100644 --- a/public/app/core/controllers/invited_ctrl.ts +++ b/public/app/core/controllers/invited_ctrl.ts @@ -16,17 +16,15 @@ export class InvitedCtrl { }; $scope.init = function() { - backendSrv - .get('/api/user/invite/' + $routeParams.code) - .then(function(invite) { - $scope.formModel.name = invite.name; - $scope.formModel.email = invite.email; - $scope.formModel.username = invite.email; - $scope.formModel.inviteCode = $routeParams.code; + backendSrv.get('/api/user/invite/' + $routeParams.code).then(function(invite) { + $scope.formModel.name = invite.name; + $scope.formModel.email = invite.email; + $scope.formModel.username = invite.email; + $scope.formModel.inviteCode = $routeParams.code; - $scope.greeting = invite.name || invite.email || invite.username; - $scope.invitedBy = invite.invitedBy; - }); + $scope.greeting = invite.name || invite.email || invite.username; + $scope.invitedBy = invite.invitedBy; + }); }; $scope.submit = function() { @@ -34,11 +32,9 @@ export class InvitedCtrl { return; } - backendSrv - .post('/api/user/invite/complete', $scope.formModel) - .then(function() { - window.location.href = config.appSubUrl + '/'; - }); + backendSrv.post('/api/user/invite/complete', $scope.formModel).then(function() { + window.location.href = config.appSubUrl + '/'; + }); }; $scope.init(); diff --git a/public/app/core/controllers/json_editor_ctrl.ts b/public/app/core/controllers/json_editor_ctrl.ts index cedadc5370f..08491acc682 100644 --- a/public/app/core/controllers/json_editor_ctrl.ts +++ b/public/app/core/controllers/json_editor_ctrl.ts @@ -5,8 +5,7 @@ export class JsonEditorCtrl { /** @ngInject */ constructor($scope) { $scope.json = angular.toJson($scope.object, true); - $scope.canUpdate = - $scope.updateHandler !== void 0 && $scope.contextSrv.isEditor; + $scope.canUpdate = $scope.updateHandler !== void 0 && $scope.contextSrv.isEditor; $scope.update = function() { var newObject = angular.fromJson($scope.json); diff --git a/public/app/core/controllers/login_ctrl.ts b/public/app/core/controllers/login_ctrl.ts index 79e5530ea91..313fc2efa1a 100644 --- a/public/app/core/controllers/login_ctrl.ts +++ b/public/app/core/controllers/login_ctrl.ts @@ -48,15 +48,13 @@ export class LoginCtrl { return; } - backendSrv - .post('/api/user/signup', $scope.formModel) - .then(function(result) { - if (result.status === 'SignUpCreated') { - $location.path('/signup').search({ email: $scope.formModel.email }); - } else { - window.location.href = config.appSubUrl + '/'; - } - }); + backendSrv.post('/api/user/signup', $scope.formModel).then(function(result) { + if (result.status === 'SignUpCreated') { + $location.path('/signup').search({ email: $scope.formModel.email }); + } else { + window.location.href = config.appSubUrl + '/'; + } + }); }; $scope.login = function() { diff --git a/public/app/core/controllers/reset_password_ctrl.ts b/public/app/core/controllers/reset_password_ctrl.ts index f2078a442c8..38bd51d2933 100644 --- a/public/app/core/controllers/reset_password_ctrl.ts +++ b/public/app/core/controllers/reset_password_ctrl.ts @@ -17,10 +17,7 @@ export class ResetPasswordCtrl { main: { icon: 'gicon gicon-branding', subTitle: 'Reset your Grafana password', - breadcrumbs: [ - { title: 'Login', url: '/login' }, - { title: 'Reset Password' }, - ], + breadcrumbs: [{ title: 'Login', url: '/login' }, { title: 'Reset Password' }], }, }; @@ -28,11 +25,9 @@ export class ResetPasswordCtrl { if (!$scope.sendResetForm.$valid) { return; } - backendSrv - .post('/api/user/password/send-reset-email', $scope.formModel) - .then(function() { - $scope.mode = 'email-sent'; - }); + backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(function() { + $scope.mode = 'email-sent'; + }); }; $scope.submitReset = function() { @@ -45,11 +40,9 @@ export class ResetPasswordCtrl { return; } - backendSrv - .post('/api/user/password/reset', $scope.formModel) - .then(function() { - $location.path('login'); - }); + backendSrv.post('/api/user/password/reset', $scope.formModel).then(function() { + $location.path('login'); + }); }; } } diff --git a/public/app/core/controllers/signup_ctrl.ts b/public/app/core/controllers/signup_ctrl.ts index 38e30994dfa..3b4fd6a4a9e 100644 --- a/public/app/core/controllers/signup_ctrl.ts +++ b/public/app/core/controllers/signup_ctrl.ts @@ -5,12 +5,7 @@ import coreModule from '../core_module'; export class SignUpCtrl { /** @ngInject */ - constructor( - private $scope: any, - private backendSrv: any, - $location: any, - contextSrv: any - ) { + constructor(private $scope: any, private backendSrv: any, $location: any, contextSrv: any) { contextSrv.sidemenu = false; $scope.ctrl = this; @@ -44,16 +39,13 @@ export class SignUpCtrl { return; } - this.backendSrv - .post('/api/user/signup/step2', this.$scope.formModel) - .then(rsp => { - if (rsp.code === 'redirect-to-select-org') { - window.location.href = - config.appSubUrl + '/profile/select-org?signup=1'; - } else { - window.location.href = config.appSubUrl + '/'; - } - }); + this.backendSrv.post('/api/user/signup/step2', this.$scope.formModel).then(rsp => { + if (rsp.code === 'redirect-to-select-org') { + window.location.href = config.appSubUrl + '/profile/select-org?signup=1'; + } else { + window.location.href = config.appSubUrl + '/'; + } + }); } } diff --git a/public/app/core/directives/misc.ts b/public/app/core/directives/misc.ts index 298d3ce5d3c..0d913c32349 100644 --- a/public/app/core/directives/misc.ts +++ b/public/app/core/directives/misc.ts @@ -118,14 +118,7 @@ function editorCheckbox($compile, $interpolate) { var model = $interpolate(attrs.model)(scope); var ngchange = attrs.change ? ' ng-change="' + attrs.change + '"' : ''; var tip = attrs.tip ? ' ' + attrs.tip + '' : ''; - var label = - ''; + var label = ''; var template = '', - '', - ]; + var ul = ['']; for (let index = 0; index < items.length; index++) { let item = items[index]; @@ -172,9 +160,7 @@ function gfDropdown($parse, $compile, $timeout) { var li = '' + '' ); }; @@ -253,23 +245,14 @@ kbn.toFixed = function(value, decimals) { var decimalPos = formatted.indexOf('.'); var precision = decimalPos === -1 ? 0 : formatted.length - decimalPos - 1; if (precision < decimals) { - return ( - (precision ? formatted : formatted + '.') + - String(factor).substr(1, decimals - precision) - ); + return (precision ? formatted : formatted + '.') + String(factor).substr(1, decimals - precision); } } return formatted; }; -kbn.toFixedScaled = function( - value, - decimals, - scaledDecimals, - additionalDecimals, - ext -) { +kbn.toFixedScaled = function(value, decimals, scaledDecimals, additionalDecimals, ext) { if (scaledDecimals === null) { return kbn.toFixed(value, decimals) + ext; } else { @@ -346,9 +329,7 @@ kbn.formatBuilders.decimalSIPrefix = function(unit, offset) { // offset is given, it starts the units at the given prefix; otherwise, the // offset defaults to zero and the initial unit is not prefixed. kbn.formatBuilders.binarySIPrefix = function(unit, offset) { - var prefixes = ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi'].slice( - offset - ); + var prefixes = ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi'].slice(offset); var units = prefixes.map(function(p) { return ' ' + p + unit; }); @@ -525,11 +506,7 @@ kbn.valueFormats.pressurembar = kbn.formatBuilders.decimalSIPrefix('bar', -1); kbn.valueFormats.pressurekbar = kbn.formatBuilders.decimalSIPrefix('bar', 1); kbn.valueFormats.pressurehpa = kbn.formatBuilders.fixedUnit('hPa'); kbn.valueFormats.pressurehg = kbn.formatBuilders.fixedUnit('"Hg'); -kbn.valueFormats.pressurepsi = kbn.formatBuilders.scaledUnits(1000, [ - ' psi', - ' ksi', - ' Mpsi', -]); +kbn.valueFormats.pressurepsi = kbn.formatBuilders.scaledUnits(1000, [' psi', ' ksi', ' Mpsi']); // Force kbn.valueFormats.forceNm = kbn.formatBuilders.decimalSIPrefix('Nm'); @@ -602,31 +579,13 @@ kbn.valueFormats.ms = function(size, decimals, scaledDecimals) { return kbn.toFixedScaled(size / 60000, decimals, scaledDecimals, 5, ' min'); } else if (Math.abs(size) < 86400000) { // Less than one day, devide in hours - return kbn.toFixedScaled( - size / 3600000, - decimals, - scaledDecimals, - 7, - ' hour' - ); + return kbn.toFixedScaled(size / 3600000, decimals, scaledDecimals, 7, ' hour'); } else if (Math.abs(size) < 31536000000) { // Less than one year, devide in days - return kbn.toFixedScaled( - size / 86400000, - decimals, - scaledDecimals, - 8, - ' day' - ); + return kbn.toFixedScaled(size / 86400000, decimals, scaledDecimals, 8, ' day'); } - return kbn.toFixedScaled( - size / 31536000000, - decimals, - scaledDecimals, - 10, - ' year' - ); + return kbn.toFixedScaled(size / 31536000000, decimals, scaledDecimals, 10, ' year'); }; kbn.valueFormats.s = function(size, decimals, scaledDecimals) { @@ -636,33 +595,15 @@ kbn.valueFormats.s = function(size, decimals, scaledDecimals) { // Less than 1 µs, devide in ns if (Math.abs(size) < 0.000001) { - return kbn.toFixedScaled( - size * 1e9, - decimals, - scaledDecimals - decimals, - -9, - ' ns' - ); + return kbn.toFixedScaled(size * 1e9, decimals, scaledDecimals - decimals, -9, ' ns'); } // Less than 1 ms, devide in µs if (Math.abs(size) < 0.001) { - return kbn.toFixedScaled( - size * 1e6, - decimals, - scaledDecimals - decimals, - -6, - ' µs' - ); + return kbn.toFixedScaled(size * 1e6, decimals, scaledDecimals - decimals, -6, ' µs'); } // Less than 1 second, devide in ms if (Math.abs(size) < 1) { - return kbn.toFixedScaled( - size * 1e3, - decimals, - scaledDecimals - decimals, - -3, - ' ms' - ); + return kbn.toFixedScaled(size * 1e3, decimals, scaledDecimals - decimals, -3, ' ms'); } if (Math.abs(size) < 60) { @@ -678,22 +619,10 @@ kbn.valueFormats.s = function(size, decimals, scaledDecimals) { return kbn.toFixedScaled(size / 86400, decimals, scaledDecimals, 5, ' day'); } else if (Math.abs(size) < 31536000) { // Less than one year, devide in week - return kbn.toFixedScaled( - size / 604800, - decimals, - scaledDecimals, - 6, - ' week' - ); + return kbn.toFixedScaled(size / 604800, decimals, scaledDecimals, 6, ' week'); } - return kbn.toFixedScaled( - size / 3.15569e7, - decimals, - scaledDecimals, - 7, - ' year' - ); + return kbn.toFixedScaled(size / 3.15569e7, decimals, scaledDecimals, 7, ' year'); }; kbn.valueFormats['µs'] = function(size, decimals, scaledDecimals) { @@ -720,29 +649,11 @@ kbn.valueFormats.ns = function(size, decimals, scaledDecimals) { } else if (Math.abs(size) < 1000000) { return kbn.toFixedScaled(size / 1000, decimals, scaledDecimals, 3, ' µs'); } else if (Math.abs(size) < 1000000000) { - return kbn.toFixedScaled( - size / 1000000, - decimals, - scaledDecimals, - 6, - ' ms' - ); + return kbn.toFixedScaled(size / 1000000, decimals, scaledDecimals, 6, ' ms'); } else if (Math.abs(size) < 60000000000) { - return kbn.toFixedScaled( - size / 1000000000, - decimals, - scaledDecimals, - 9, - ' s' - ); + return kbn.toFixedScaled(size / 1000000000, decimals, scaledDecimals, 9, ' s'); } else { - return kbn.toFixedScaled( - size / 60000000000, - decimals, - scaledDecimals, - 12, - ' min' - ); + return kbn.toFixedScaled(size / 60000000000, decimals, scaledDecimals, 12, ' min'); } }; @@ -758,21 +669,9 @@ kbn.valueFormats.m = function(size, decimals, scaledDecimals) { } else if (Math.abs(size) < 10080) { return kbn.toFixedScaled(size / 1440, decimals, scaledDecimals, 3, ' day'); } else if (Math.abs(size) < 604800) { - return kbn.toFixedScaled( - size / 10080, - decimals, - scaledDecimals, - 4, - ' week' - ); + return kbn.toFixedScaled(size / 10080, decimals, scaledDecimals, 4, ' week'); } else { - return kbn.toFixedScaled( - size / 5.25948e5, - decimals, - scaledDecimals, - 5, - ' year' - ); + return kbn.toFixedScaled(size / 5.25948e5, decimals, scaledDecimals, 5, ' year'); } }; diff --git a/public/app/core/utils/model_utils.ts b/public/app/core/utils/model_utils.ts index e2984aa7484..e595ada6e13 100644 --- a/public/app/core/utils/model_utils.ts +++ b/public/app/core/utils/model_utils.ts @@ -1,9 +1,4 @@ -export function assignModelProperties( - target, - source, - defaults, - removeDefaults? -) { +export function assignModelProperties(target, source, defaults, removeDefaults?) { for (var key in defaults) { if (!defaults.hasOwnProperty(key)) { continue; diff --git a/public/app/core/utils/outline.ts b/public/app/core/utils/outline.ts index dafe0b12914..94393e781e9 100644 --- a/public/app/core/utils/outline.ts +++ b/public/app/core/utils/outline.ts @@ -16,9 +16,7 @@ function outlineFixer() { var set_css = function(css_text) { // Handle setting of