Skip to content

Commit

Permalink
Only import needed types to public
Browse files Browse the repository at this point in the history
  • Loading branch information
skh committed Feb 11, 2020
1 parent f58c93d commit bb2f8ca
Show file tree
Hide file tree
Showing 19 changed files with 36 additions and 195 deletions.
178 changes: 0 additions & 178 deletions x-pack/plugins/ingest_manager/common/types/epm.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
AssetTypeToParts,
KibanaAssetType,
entries,
} from '../../../../../../common/types/epm';
} from '../../../types';
import {
AssetIcons,
AssetTitleMap,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { EuiCard, EuiIcon, ICON_TYPES } from '@elastic/eui';
import React from 'react';
import styled from 'styled-components';
import { PackageInfo, PackageListItem } from '../../../../../../common/types/epm';
import { PackageInfo, PackageListItem } from '../../../types';
import { useLinks } from '../hooks';

export interface BadgeProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
import { EuiFlexGrid, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
import React, { Fragment, ReactNode } from 'react';
import { PackageList } from '../../../../../../common/types/epm';
import { PackageList } from '../../../types';
import { BadgeProps, PackageCard } from './package_card';

type ListProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText, EuiTextColor, EuiTitle } from '@elastic/eui';
import React, { Fragment } from 'react';
import styled from 'styled-components';
import { RequirementsByServiceName, entries } from '../../../../../../common/types/epm';
import { RequirementsByServiceName, entries } from '../../../types';
import { ServiceTitleMap } from '../constants';
// import { useCore } from '../hooks/use_core';
import { Version } from './version';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import React from 'react';
import styled from 'styled-components';
import { RequirementVersion } from '../../../../../../common/types/epm';
import { RequirementVersion } from '../../../types';

// const CodeText = styled.span`
// font-family: ${props => props.theme.eui.euiCodeFontFamily};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule, EuiSpacer } from '@elasti
import React from 'react';
import styled from 'styled-components';
import { DEFAULT_PANEL, DetailParams } from '.';
import { PackageInfo } from '../../../../../../../common/types/epm';
import { PackageInfo } from '../../../../types';
import { AssetsFacetGroup } from '../../components/assets_facet_group';
import { Requirements } from '../../components/requirements';
import { CenterColumn, LeftColumn, RightColumn } from './layout';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiPage, EuiTitle, IconType } from '@elastic
import React, { Fragment } from 'react';
import styled from 'styled-components';
// import { PLUGIN } from '../../../common/constants';
import { PackageInfo } from '../../../../../../../common/types/epm';
import { PackageInfo } from '../../../../types';
import { IconPanel } from '../../components/icon_panel';
import { NavButtonBack } from '../../components/nav_button_back';
import { Version } from '../../components/version';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React, { Fragment, useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
import styled from 'styled-components';
import { DetailViewPanelName } from '../../types';
import { PackageInfo } from '../../../../../../../common/types/epm';
import { PackageInfo } from '../../../../types';
import { getPackageInfoByKey } from '../../data';
// import { useSetPackageInstallStatus } from '../../hooks';
// import { useCore } from '../../hooks/use_core';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
import { EuiButton } from '@elastic/eui';
import React, { Fragment, useCallback, useMemo, useState } from 'react';
import { PackageInfo } from '../../../../../../../common/types/epm';
import { PackageInfo } from '../../../../types';
// import { useDeletePackage, useGetPackageInstallStatus, useInstallPackage } from '../../hooks';
// import { InstallStatus } from '../../types';
import { ConfirmPackageDelete } from './confirm_package_delete';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
import { EuiSpacer } from '@elastic/eui';
import React, { Fragment } from 'react';
import { PackageInfo } from '../../../../../../../common/types/epm';
import { PackageInfo } from '../../../../types';
import { Readme } from './readme';
import { Screenshots } from './screenshots';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { EuiFlexGroup, EuiFlexItem, EuiImage, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
import React, { Fragment } from 'react';
import styled from 'styled-components';
import { ScreenshotItem } from '../../../../../../../common/types/epm';
import { ScreenshotItem } from '../../../../types';
// import { useCore, useLinks } from '../../hooks';

interface ScreenshotProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { EuiButtonEmpty, EuiButtonEmptyProps } from '@elastic/eui';
import React, { Fragment } from 'react';
import styled from 'styled-components';
import { DetailViewPanelName } from '../../types';
import { PackageInfo, entries } from '../../../../../../../common/types/epm';
import { PackageInfo, entries } from '../../../../types';
// import { useLinks, useGetPackageInstallStatus } from '../../hooks';
// import { InstallStatus } from '../../types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
import { EuiFacetButton, EuiFacetGroup } from '@elastic/eui';
import React from 'react';
import { CategorySummaryItem, CategorySummaryList } from '../../../../../../../common/types/epm';
import { CategorySummaryItem, CategorySummaryList } from '../../../../types';

export function CategoryFacets({
categories,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { useEffect, useRef, useState } from 'react';
import { CategorySummaryList, PackageList } from '../../../../../../../common/types/epm';
import { CategorySummaryList, PackageList } from '../../../../types';
import { getCategories, getPackages } from '../../data';
import { fieldsToSearch, LocalSearch, searchIdField } from './search_packages';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { EuiHorizontalRule, EuiPage, EuiPageBody, EuiSpacer } from '@elastic/eui
import React, { Fragment, useState } from 'react';
import styled from 'styled-components';
// import { PLUGIN } from '../../../common/constants';
import { CategorySummaryItem, PackageList } from '../../../../../../../common/types/epm';
import { CategorySummaryItem, PackageList } from '../../../../types';
import { PackageListGrid } from '../../components/package_list_grid';
// import { useBreadcrumbs, useLinks } from '../../hooks';
// import { useLinks } from '../../hooks';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { Search as LocalSearch } from 'js-search';
import React from 'react';
import { PackageList, PackageListItem } from '../../../../../../../common/types/epm';
import { PackageList, PackageListItem } from '../../../../types';
import { SearchResults } from './search_results';

export { LocalSearch };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { EuiText, EuiTitle } from '@elastic/eui';
import React from 'react';
import { PackageList } from '../../../../../../../common/types/epm';
import { PackageList } from '../../../../types';
import { PackageListGrid } from '../../components/package_list_grid';

interface SearchResultsProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,23 @@ export {
UpdateAgentConfigResponse,
DeleteAgentConfigsRequestSchema,
DeleteAgentConfigsResponse,
// EPM types
AssetsGroupedByServiceByType,
AssetTypeToParts,
CategorySummaryItem,
CategorySummaryList,
KibanaAssetType,
PackageInfo,
PackageList,
PackageListItem,
RequirementsByServiceName,
RequirementVersion,
ScreenshotItem,
} from '../../../../common';

// Calling Object.entries(PackagesGroupedByStatus) gave `status: string`
// which causes a "string is not assignable to type InstallationStatus` error
// see https://github.com/Microsoft/TypeScript/issues/20322
// and https://github.com/Microsoft/TypeScript/pull/12253#issuecomment-263132208
// and https://github.com/Microsoft/TypeScript/issues/21826#issuecomment-479851685
export const entries = Object.entries as <T>(o: T) => Array<[keyof T, T[keyof T]]>;

0 comments on commit bb2f8ca

Please sign in to comment.