Fix grafana bugs

Author: Spikatrix

public/app/features/dashboard/containers/DashboardPage.tsx

@@ -60,6 +60,7 @@ export interface DashboardPageRouteParams {
   type?: string;
   slug?: string;
   accessToken?: string;
+  version?: number;
 }
 
 export type DashboardPageRouteSearchParams = {
@@ -250,7 +251,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
       routeName: this.props.route.routeName,
       fixUrl: !isPublic && !FNDashboard,
       accessToken: match.params.accessToken,
-      keybindingSrv: this.context.keybindings,
+      keybindingSrv: this.context?.keybindings,
     });
 
     // small delay to start live updates

public/app/features/dashboard/containers/SoloPanelPage.tsx

@@ -52,7 +52,7 @@ export class SoloPanelPage extends Component<Props, State> {
       urlType: match.params.type,
       routeName: route.routeName,
       fixUrl: false,
-      keybindingSrv: this.context.keybindings,
+      keybindingSrv: this.context?.keybindings,
     });
   }
 

public/app/features/dashboard/state/initDashboard.ts

@@ -41,7 +41,7 @@ export interface InitDashboardArgs {
   accessToken?: string;
   routeName?: string;
   fixUrl: boolean;
-  keybindingSrv: KeybindingSrv;
+  keybindingSrv?: KeybindingSrv;
 }
 
 async function fetchDashboard(
@@ -79,7 +79,12 @@ async function fetchDashboard(
         return await dashboardLoaderSrv.loadDashboard('public', args.urlSlug, args.accessToken, args.version);
       }
       case DashboardRoutes.Normal: {
-        const dashDTO: DashboardDTO = await dashboardLoaderSrv.loadDashboard(args.urlType, args.urlSlug, args.urlUid, args.version);
+        const dashDTO: DashboardDTO = await dashboardLoaderSrv.loadDashboard(
+          args.urlType,
+          args.urlSlug,
+          args.urlUid,
+          args.version
+        );
 
         if (args.fixUrl && dashDTO.meta.url && !playlistSrv.isPlaying) {
           // check if the current url is correct (might be old slug)