From b899a0e1c188f4ffa4d652573e533c9e66a561b0 Mon Sep 17 00:00:00 2001 From: Peter Holmberg Date: Thu, 27 Sep 2018 14:45:36 +0200 Subject: [PATCH] revert rename --- public/app/features/plugins/PluginList.tsx | 2 +- public/app/features/plugins/PluginListItem.tsx | 4 ++-- public/app/features/plugins/PluginListPage.test.tsx | 4 ++-- public/app/features/plugins/PluginListPage.tsx | 4 ++-- public/app/features/plugins/__mocks__/pluginMocks.ts | 4 ++-- public/app/features/plugins/state/actions.ts | 6 +++--- public/app/features/plugins/state/reducers.ts | 4 ++-- public/app/types/index.ts | 4 ++-- public/app/types/plugins.ts | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/public/app/features/plugins/PluginList.tsx b/public/app/features/plugins/PluginList.tsx index f080b67f78d..2c47e755de3 100644 --- a/public/app/features/plugins/PluginList.tsx +++ b/public/app/features/plugins/PluginList.tsx @@ -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 { diff --git a/public/app/features/plugins/PluginListItem.tsx b/public/app/features/plugins/PluginListItem.tsx index 2bfe401d5b3..05eac614fd5 100644 --- a/public/app/features/plugins/PluginListItem.tsx +++ b/public/app/features/plugins/PluginListItem.tsx @@ -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 => { diff --git a/public/app/features/plugins/PluginListPage.test.tsx b/public/app/features/plugins/PluginListPage.test.tsx index 866d63c9437..452a89837c7 100644 --- a/public/app/features/plugins/PluginListPage.test.tsx +++ b/public/app/features/plugins/PluginListPage.test.tsx @@ -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(), }; diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx index 4a330ece7f4..de2968b126c 100644 --- a/public/app/features/plugins/PluginListPage.tsx +++ b/public/app/features/plugins/PluginListPage.tsx @@ -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; } diff --git a/public/app/features/plugins/__mocks__/pluginMocks.ts b/public/app/features/plugins/__mocks__/pluginMocks.ts index d34997d0ffa..d8dd67d5b61 100644 --- a/public/app/features/plugins/__mocks__/pluginMocks.ts +++ b/public/app/features/plugins/__mocks__/pluginMocks.ts @@ -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++) { diff --git a/public/app/features/plugins/state/actions.ts b/public/app/features/plugins/state/actions.ts index 51c3e5241d0..24774c6061c 100644 --- a/public/app/features/plugins/state/actions.ts +++ b/public/app/features/plugins/state/actions.ts @@ -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, }); diff --git a/public/app/features/plugins/state/reducers.ts b/public/app/features/plugins/state/reducers.ts index f643a80ce54..1ca2880282c 100644 --- a/public/app/features/plugins/state/reducers.ts +++ b/public/app/features/plugins/state/reducers.ts @@ -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, }; diff --git a/public/app/types/index.ts b/public/app/types/index.ts index 33bcffc1790..1dd11d73564 100644 --- a/public/app/types/index.ts +++ b/public/app/types/index.ts @@ -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, }; diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts index 6dcb4cefe02..92bebfef8d4 100644 --- a/public/app/types/plugins.ts +++ b/public/app/types/plugins.ts @@ -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; }