revert rename

This commit is contained in:
Peter Holmberg
2018-09-27 14:45:36 +02:00
parent fede5e6c74
commit b899a0e1c1
9 changed files with 18 additions and 18 deletions

View File

@@ -1,7 +1,7 @@
import React, { SFC } from 'react';
import classNames from 'classnames/bind';
import PluginListItem from './PluginListItem';
import { PluginListItem } from 'app/types';
import { Plugin } from 'app/types';
import { LayoutMode, LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector';
interface Props {

View File

@@ -1,8 +1,8 @@
import React, { SFC } from 'react';
import { PluginListItem } from 'app/types';
import { Plugin } from 'app/types';
interface Props {
plugin: PluginListItem;
plugin: Plugin;
}
const PluginListItem: SFC<Props> = props => {

View File

@@ -1,13 +1,13 @@
import React from 'react';
import { shallow } from 'enzyme';
import { PluginListPage, Props } from './PluginListPage';
import { NavModel, PluginListItem } from '../../types';
import { NavModel, Plugin } from '../../types';
import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector';
const setup = (propOverrides?: object) => {
const props: Props = {
navModel: {} as NavModel,
plugins: [] as PluginListItem[],
plugins: [] as Plugin[],
layoutMode: LayoutModes.Grid,
loadPlugins: jest.fn(),
};

View File

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
import PageHeader from '../../core/components/PageHeader/PageHeader';
import PluginActionBar from './PluginActionBar';
import PluginList from './PluginList';
import { NavModel, PluginListItem } from '../../types';
import { NavModel, Plugin } from '../../types';
import { loadPlugins } from './state/actions';
import { getNavModel } from '../../core/selectors/navModel';
import { getLayoutMode, getPlugins } from './state/selectors';
@@ -12,7 +12,7 @@ import { LayoutMode } from '../../core/components/LayoutSelector/LayoutSelector'
export interface Props {
navModel: NavModel;
plugins: PluginListItem[];
plugins: Plugin[];
layoutMode: LayoutMode;
loadPlugins: typeof loadPlugins;
}

View File

@@ -1,6 +1,6 @@
import { PluginListItem } from 'app/types';
import { Plugin } from 'app/types';
export const getMockPlugins = (amount: number): PluginListItem[] => {
export const getMockPlugins = (amount: number): Plugin[] => {
const plugins = [];
for (let i = 0; i <= amount; i++) {

View File

@@ -1,4 +1,4 @@
import { PluginListItem, StoreState } from 'app/types';
import { Plugin, StoreState } from 'app/types';
import { ThunkAction } from 'redux-thunk';
import { getBackendSrv } from '../../../core/services/backend_srv';
import { LayoutMode } from '../../../core/components/LayoutSelector/LayoutSelector';
@@ -11,7 +11,7 @@ export enum ActionTypes {
export interface LoadPluginsAction {
type: ActionTypes.LoadPlugins;
payload: PluginListItem[];
payload: Plugin[];
}
export interface SetPluginsSearchQueryAction {
@@ -34,7 +34,7 @@ export const setPluginsSearchQuery = (query: string): SetPluginsSearchQueryActio
payload: query,
});
const pluginsLoaded = (plugins: PluginListItem[]): LoadPluginsAction => ({
const pluginsLoaded = (plugins: Plugin[]): LoadPluginsAction => ({
type: ActionTypes.LoadPlugins,
payload: plugins,
});

View File

@@ -1,9 +1,9 @@
import { Action, ActionTypes } from './actions';
import { PluginListItem, PluginsState } from 'app/types';
import { Plugin, PluginsState } from 'app/types';
import { LayoutModes } from '../../../core/components/LayoutSelector/LayoutSelector';
export const initialState: PluginsState = {
plugins: [] as PluginListItem[],
plugins: [] as Plugin[],
searchQuery: '',
layoutMode: LayoutModes.Grid,
};

View File

@@ -6,7 +6,7 @@ import { FolderDTO, FolderState, FolderInfo } from './folders';
import { DashboardState } from './dashboard';
import { DashboardAcl, OrgRole, PermissionLevel } from './acl';
import { DataSource } from './datasources';
import { PluginMeta, PluginListItem, PluginsState } from './plugins';
import { PluginMeta, Plugin, PluginsState } from './plugins';
export {
Team,
@@ -33,7 +33,7 @@ export {
PermissionLevel,
DataSource,
PluginMeta,
PluginListItem,
Plugin,
PluginsState,
};

View File

@@ -27,7 +27,7 @@ export interface PluginMetaInfo {
version: string;
}
export interface PluginListItem {
export interface Plugin {
defaultNavUrl: string;
enabled: boolean;
hasUpdate: boolean;
@@ -41,7 +41,7 @@ export interface PluginListItem {
}
export interface PluginsState {
plugins: PluginListItem[];
plugins: Plugin[];
searchQuery: string;
layoutMode: string;
}