IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: upgrade to Typescript 3.9.3 (#25154)

Browse Source 
* upgrade to typescript 3.9.3

* Fix errors that surfaced with update

* Null check fixs

* FIx null checks

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
This commit is contained in:
Ryan McKinley
2020-06-17 04:26:01 -06:00
committed by GitHub
parent d352c213b3
commit d1b230f84a
34 changed files with 160 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/routes/routes.ts
View File

@@ -36,6 +36,7 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
})
.when('/d/:uid/:slug', {
template: '<react-container />',
//@ts-ignore
pageClass: 'page-dashboard',
routeInfo: DashboardRouteInfo.Normal,
reloadOnSearch: false,
@@ -45,6 +46,7 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
})
.when('/d/:uid', {
template: '<react-container />',
//@ts-ignore
pageClass: 'page-dashboard',
reloadOnSearch: false,
routeInfo: DashboardRouteInfo.Normal,
@@ -54,6 +56,7 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
})
.when('/dashboard/:type/:slug', {
template: '<react-container />',
//@ts-ignore
pageClass: 'page-dashboard',
routeInfo: DashboardRouteInfo.Normal,
reloadOnSearch: false,
@@ -63,6 +66,7 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
})
.when('/dashboard/new', {
template: '<react-container />',
//@ts-ignore
pageClass: 'page-dashboard',
routeInfo: DashboardRouteInfo.New,
reloadOnSearch: false,
@@ -72,6 +76,7 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
})
.when('/d-solo/:uid/:slug', {
template: '<react-container />',
//@ts-ignore
pageClass: 'dashboard-solo',
routeInfo: DashboardRouteInfo.Normal,
reloadOnSearch: false,
@@ -84,6 +89,7 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
})
.when('/d-solo/:uid', {
template: '<react-container />',
//@ts-ignore
pageClass: 'dashboard-solo',
routeInfo: DashboardRouteInfo.Normal,
reloadOnSearch: false,
@@ -96,6 +102,7 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
})
.when('/dashboard-solo/:type/:slug', {
template: '<react-container />',
//@ts-ignore
pageClass: 'dashboard-solo',
routeInfo: DashboardRouteInfo.Normal,
reloadOnSearch: false,
@@ -221,6 +228,7 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
.when('/explore', {
template: '<react-container />',
reloadOnSearch: false,
//@ts-ignore
pageClass: 'page-explore',
resolve: {
roles: () => (config.viewersCanEdit ? [] : ['Editor', 'Admin']),
@@ -406,13 +414,15 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
// LOGIN / SIGNUP
.when('/login', {
template: '<react-container/>',
//@ts-ignore
pageClass: 'login-page sidemenu-hidden',
resolve: {
component: () => LoginPage,
},
pageClass: 'login-page sidemenu-hidden',
})
.when('/invite/:code', {
template: '<react-container/>',
//@ts-ignore
pageClass: 'sidemenu-hidden',
resolve: {
component: () =>
@@ -421,19 +431,22 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
})
.when('/signup', {
template: '<react-container/>',
//@ts-ignore
pageClass: 'sidemenu-hidden',
resolve: {
component: () => SignupPage,
},
pageClass: 'sidemenu-hidden',
})
.when('/user/password/send-reset-email', {
templateUrl: 'public/app/partials/reset_password.html',
controller: 'ResetPasswordCtrl',
//@ts-ignore
pageClass: 'sidemenu-hidden',
})
.when('/user/password/reset', {
templateUrl: 'public/app/partials/reset_password.html',
controller: 'ResetPasswordCtrl',
//@ts-ignore
pageClass: 'sidemenu-hidden',
})
.when('/dashboard/snapshots', {