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

4
public/app/features/folders/FolderPermissions.tsx
View File

@@ -2,10 +2,10 @@ import React, { PureComponent } from 'react';
import { hot } from 'react-hot-loader';
import { connect } from 'react-redux';
import Page from 'app/core/components/Page/Page';
import { Tooltip } from '@grafana/ui';
import { Tooltip, NavModel } from '@grafana/ui';
import { SlideDown } from 'app/core/components/Animations/SlideDown';
import { getNavModel } from 'app/core/selectors/navModel';
import { NavModel, StoreState, FolderState } from 'app/types';
import { StoreState, FolderState } from 'app/types';
import { DashboardAcl, PermissionLevel, NewDashboardAclItem } from 'app/types/acl';
import {
getFolderByUid,

2
public/app/features/folders/FolderSettingsPage.test.tsx
View File

@@ -1,7 +1,7 @@
import React from 'react';
import { FolderSettingsPage, Props } from './FolderSettingsPage';
import { NavModel } from 'app/types';
import { shallow } from 'enzyme';
import { NavModel } from '@grafana/ui';
const setup = (propOverrides?: object) => {
const props: Props = {

4
public/app/features/folders/FolderSettingsPage.tsx
View File

@@ -1,11 +1,11 @@
import React, { PureComponent } from 'react';
import { hot } from 'react-hot-loader';
import { connect } from 'react-redux';
import { Input } from '@grafana/ui';
import { Input, NavModel } from '@grafana/ui';
import Page from 'app/core/components/Page/Page';
import appEvents from 'app/core/app_events';
import { getNavModel } from 'app/core/selectors/navModel';
import { NavModel, StoreState, FolderState } from 'app/types';
import { StoreState, FolderState } from 'app/types';
import { getFolderByUid, setFolderTitle, saveFolder, deleteFolder } from './state/actions';
import { getLoadingNav } from './state/navModel';

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

@@ -1,4 +1,5 @@
import { FolderDTO, NavModelItem, NavModel } from 'app/types';
import { FolderDTO } from 'app/types';
import { NavModelItem, NavModel } from '@grafana/ui';
export function buildNavModel(folder: FolderDTO): NavModelItem {
return {