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

Refactor: move NavModel to @grafana/ui (#16813)

Browse Source
This commit is contained in:
Ryan McKinley
2019-04-30 07:46:46 -07:00
committed by GitHub
parent 9660356638
commit 26bd76b4c2
42 changed files with 80 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/teams/TeamList.test.tsx
View File

@@ -1,9 +1,10 @@
import React from 'react';
import { shallow } from 'enzyme';
import { Props, TeamList } from './TeamList';
import { NavModel, Team, OrgRole } from '../../types';
import { Team, OrgRole } from '../../types';
import { getMockTeam, getMultipleMockTeams } from './__mocks__/teamMocks';
import { User } from 'app/core/services/context_srv';
import { NavModel } from '@grafana/ui';
const setup = (propOverrides?: object) => {
const props: Props = {

4
public/app/features/teams/TeamList.tsx
View File

@@ -2,9 +2,9 @@ import React, { PureComponent } from 'react';
import { connect } from 'react-redux';
import { hot } from 'react-hot-loader';
import Page from 'app/core/components/Page/Page';
import { DeleteButton } from '@grafana/ui';
import { DeleteButton, NavModel } from '@grafana/ui';
import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
import { NavModel, Team, OrgRole } from 'app/types';
import { Team, OrgRole } from 'app/types';
import { loadTeams, deleteTeam, setSearchQuery } from './state/actions';
import { getSearchQuery, getTeams, getTeamsCount, isPermissionTeamAdmin } from './state/selectors';
import { getNavModel } from 'app/core/selectors/navModel';

3
public/app/features/teams/TeamPages.test.tsx
View File

@@ -1,9 +1,10 @@
import React from 'react';
import { shallow } from 'enzyme';
import { TeamPages, Props } from './TeamPages';
import { NavModel, Team, TeamMember, OrgRole } from '../../types';
import { Team, TeamMember, OrgRole } from '../../types';
import { getMockTeam } from './__mocks__/teamMocks';
import { User } from 'app/core/services/context_srv';
import { NavModel } from '@grafana/ui';
jest.mock('app/core/config', () => ({
buildInfo: { isEnterprise: true },

3
public/app/features/teams/TeamPages.tsx
View File

@@ -7,13 +7,14 @@ import Page from 'app/core/components/Page/Page';
import TeamMembers from './TeamMembers';
import TeamSettings from './TeamSettings';
import TeamGroupSync from './TeamGroupSync';
import { NavModel, Team, TeamMember } from 'app/types';
import { Team, TeamMember } from 'app/types';
import { loadTeam, loadTeamMembers } from './state/actions';
import { getTeam, getTeamMembers, isSignedInUserTeamAdmin } from './state/selectors';
import { getTeamLoadingNav } from './state/navModel';
import { getNavModel } from 'app/core/selectors/navModel';
import { getRouteParamsId, getRouteParamsPage } from '../../core/selectors/location';
import { contextSrv, User } from 'app/core/services/context_srv';
import { NavModel } from '@grafana/ui';
export interface Props {
team: Team;

3
public/app/features/teams/state/navModel.ts
View File

@@ -1,5 +1,6 @@
import { Team, NavModelItem, NavModel, TeamPermissionLevel } from 'app/types';
import { Team, TeamPermissionLevel } from 'app/types';
import config from 'app/core/config';
import { NavModelItem, NavModel } from '@grafana/ui';
export function buildNavModel(team: Team): NavModelItem {
const navModel = {