diff --git a/public/app/features/dashboard/state/initDashboard.test.ts b/public/app/features/dashboard/state/initDashboard.test.ts index 854278252d5..8681652d150 100644 --- a/public/app/features/dashboard/state/initDashboard.test.ts +++ b/public/app/features/dashboard/state/initDashboard.test.ts @@ -201,7 +201,6 @@ describeInitScenario('Initializing home dashboard', ctx => { ctx.setup(() => { ctx.args.routeInfo = DashboardRouteInfo.Home; ctx.backendSrv.get.mockResolvedValue({ - meta: {}, redirectUri: '/u/123/my-home', }); }); @@ -212,6 +211,17 @@ describeInitScenario('Initializing home dashboard', ctx => { }); }); +describeInitScenario('Initializing home dashboard cancelled', ctx => { + ctx.setup(() => { + ctx.args.routeInfo = DashboardRouteInfo.Home; + ctx.backendSrv.get.mockResolvedValue([]); + }); + + it('Should abort init process', () => { + expect(ctx.actions.length).toBe(1); + }); +}); + describeInitScenario('Initializing existing dashboard', ctx => { const mockQueries = [ { diff --git a/public/app/features/dashboard/state/initDashboard.ts b/public/app/features/dashboard/state/initDashboard.ts index 381fa77b373..b431c498d91 100644 --- a/public/app/features/dashboard/state/initDashboard.ts +++ b/public/app/features/dashboard/state/initDashboard.ts @@ -69,7 +69,7 @@ async function fetchDashboard( const dashDTO: DashboardDTO = await backendSrv.get('/api/dashboards/home'); // if above all is cancelled it will return an array - if (!dashDTO.meta) { + if (Array.isArray(dashDTO)) { return null; }