test: Update snapshots and mocks

packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap

@@ -7,7 +7,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
     Object {
       "height": "auto",
       "maxHeight": "100%",
-      "minHeight": "0",
+      "minHeight": 0,
       "overflow": "hidden",
       "position": "relative",
       "width": "100%",
@@ -24,7 +24,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
         "marginBottom": 0,
         "marginRight": 0,
         "maxHeight": "calc(100% + 0px)",
-        "minHeight": "calc(0 + 0px)",
+        "minHeight": 0,
         "overflow": "scroll",
         "position": "relative",
         "right": undefined,

public/app/features/api-keys/ApiKeysPage.test.tsx

@@ -6,7 +6,14 @@ import { getMultipleMockKeys, getMockKey } from './__mocks__/apiKeysMock';
 
 const setup = (propOverrides?: object) => {
   const props: Props = {
-    navModel: {} as NavModel,
+    navModel: {
+      main: {
+        text: 'Configuration'
+      },
+      node: {
+        text: 'Api Keys'
+      }
+    } as NavModel,
     apiKeys: [] as ApiKey[],
     searchQuery: '',
     hasFetched: false,

public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap

@@ -1,21 +1,46 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Render should render API keys table if there are any keys 1`] = `
-<div>
+<Page
+  title="Configuration: Api Keys"
+>
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Api Keys",
+        },
+      }
+    }
   />
-  <PageLoader
+  <PageContents
-    pageName="Api keys"
+    isLoading={true}
   />
-</div>
+</Page>
 `;
 
 exports[`Render should render CTA if there are no API keys 1`] = `
-<div>
+<Page
+  title="Configuration: Api Keys"
+>
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Api Keys",
+        },
+      }
+    }
   />
+  <PageContents
+    isLoading={false}
+  >
     <div
       className="page-container page-body"
     >
@@ -128,5 +153,6 @@ exports[`Render should render CTA if there are no API keys 1`] = `
         </div>
       </Component>
     </div>
-</div>
+  </PageContents>
+</Page>
 `;

public/app/features/datasources/DataSourcesListPage.test.tsx

@@ -10,7 +10,14 @@ const setup = (propOverrides?: object) => {
     dataSources: [] as DataSource[],
     layoutMode: LayoutModes.Grid,
     loadDataSources: jest.fn(),
-    navModel: {} as NavModel,
+    navModel: {
+      main: {
+        text: 'Configuration'
+      },
+      node: {
+        text: 'Data Sources'
+      }
+    } as NavModel,
     dataSourcesCount: 0,
     searchQuery: '',
     setDataSourcesSearchQuery: jest.fn(),

public/app/features/datasources/__snapshots__/DataSourcesListPage.test.tsx.snap

@@ -5,7 +5,16 @@ exports[`Render should render action bar and datasources 1`] = `
   title="Configuration: Data Sources"
 >
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Data Sources",
+        },
+      }
+    }
   />
   <PageContents
     isLoading={false}
@@ -154,7 +163,16 @@ exports[`Render should render component 1`] = `
   title="Configuration: Data Sources"
 >
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Data Sources",
+        },
+      }
+    }
   />
   <PageContents
     isLoading={true}

public/app/features/org/OrgDetailsPage.test.tsx

@@ -6,7 +6,14 @@ import { NavModel, Organization } from '../../types';
 const setup = (propOverrides?: object) => {
   const props: Props = {
     organization: {} as Organization,
-    navModel: {} as NavModel,
+    navModel: {
+      main: {
+        text: 'Configuration'
+      },
+      node: {
+        text: 'Org details'
+      }
+    } as NavModel,
     loadOrganization: jest.fn(),
     setOrganizationName: jest.fn(),
     updateOrganization: jest.fn(),

public/app/features/org/__snapshots__/OrgDetailsPage.test.tsx.snap

@@ -1,25 +1,50 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Render should render component 1`] = `
-<div>
+<Page
+  title="Configuration: Org details"
+>
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Org details",
+        },
+      }
+    }
   />
+  <PageContents
+    isLoading={true}
+  >
     <div
       className="page-container page-body"
-  >
-    <PageLoader
-      pageName="Organization"
     />
-  </div>
+  </PageContents>
-</div>
+</Page>
 `;
 
 exports[`Render should render organization and preferences 1`] = `
-<div>
+<Page
+  title="Configuration: Org details"
+>
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Org details",
+        },
+      }
+    }
   />
+  <PageContents
+    isLoading={false}
+  >
     <div
       className="page-container page-body"
     >
@@ -34,5 +59,6 @@ exports[`Render should render organization and preferences 1`] = `
         />
       </div>
     </div>
-</div>
+  </PageContents>
+</Page>
 `;

public/app/features/plugins/PluginListPage.test.tsx

@@ -6,7 +6,14 @@ import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector
 
 const setup = (propOverrides?: object) => {
   const props: Props = {
-    navModel: {} as NavModel,
+    navModel: {
+      main: {
+        text: 'Configuration'
+      },
+      node: {
+        text: 'Plugins'
+      }
+    } as NavModel,
     plugins: [] as Plugin[],
     searchQuery: '',
     setPluginsSearchQuery: jest.fn(),

public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap

@@ -5,7 +5,16 @@ exports[`Render should render component 1`] = `
   title="Configuration: Plugins"
 >
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Plugins",
+        },
+      }
+    }
   />
   <PageContents
     isLoading={true}
@@ -31,7 +40,16 @@ exports[`Render should render list 1`] = `
   title="Configuration: Plugins"
 >
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Plugins",
+        },
+      }
+    }
   />
   <PageContents
     isLoading={false}

public/app/features/teams/TeamList.test.tsx

@@ -6,7 +6,14 @@ import { getMockTeam, getMultipleMockTeams } from './__mocks__/teamMocks';
 
 const setup = (propOverrides?: object) => {
   const props: Props = {
-    navModel: {} as NavModel,
+    navModel: {
+      main: {
+        text: 'Configuration'
+      },
+      node: {
+        text: 'Team List'
+      }
+    } as NavModel,
     teams: [] as Team[],
     loadTeams: jest.fn(),
     deleteTeam: jest.fn(),

public/app/features/teams/__snapshots__/TeamList.test.tsx.snap

@@ -2,10 +2,19 @@
 
 exports[`Render should render component 1`] = `
 <Page
-  title="Configuration: Teams"
+  title="Configuration: Team List"
 >
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Team List",
+        },
+      }
+    }
   />
   <PageContents
     isLoading={true}
@@ -15,10 +24,19 @@ exports[`Render should render component 1`] = `
 
 exports[`Render should render teams table 1`] = `
 <Page
-  title="Configuration: Teams"
+  title="Configuration: Team List"
 >
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Team List",
+        },
+      }
+    }
   />
   <PageContents
     isLoading={false}

public/app/features/users/UsersListPage.test.tsx

@@ -11,7 +11,14 @@ jest.mock('../../core/app_events', () => ({
 
 const setup = (propOverrides?: object) => {
   const props: Props = {
-    navModel: {} as NavModel,
+    navModel: {
+      main: {
+        text: 'Configuration'
+      },
+      node: {
+        text: 'Users'
+      }
+    } as NavModel,
     users: [] as OrgUser[],
     invitees: [] as Invitee[],
     searchQuery: '',

public/app/features/users/__snapshots__/UsersListPage.test.tsx.snap

@@ -5,7 +5,16 @@ exports[`Render should render List page 1`] = `
   title="Configuration: Users"
 >
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Users",
+        },
+      }
+    }
   />
   <PageContents
     isLoading={false}
@@ -28,7 +37,16 @@ exports[`Render should render component 1`] = `
   title="Configuration: Users"
 >
   <PageHeader
-    model={Object {}}
+    model={
+      Object {
+        "main": Object {
+          "text": "Configuration",
+        },
+        "node": Object {
+          "text": "Users",
+        },
+      }
+    }
   />
   <PageContents
     isLoading={true}