Skip to content

Commit 27ff24f

Browse files
move tab content to shared directory
1 parent cf77c7e commit 27ff24f

File tree

19 files changed

+83
-83
lines changed

19 files changed

+83
-83
lines changed

x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { act } from 'react-dom/test-utils';
88

99
import { setupEnvironment, pageHelpers } from './helpers';
1010
import { ComponentTemplateDetailsTestBed } from './helpers/component_template_details.helpers';
11-
import { ComponentTemplateDeserialized } from '../../types';
11+
import { ComponentTemplateDeserialized } from '../../shared_imports';
1212

1313
const { setup } = pageHelpers.componentTemplateDetails;
1414

x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_list.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66

77
import { act } from 'react-dom/test-utils';
88

9+
import { ComponentTemplateListItem } from '../../shared_imports';
10+
911
import { setupEnvironment, pageHelpers } from './helpers';
1012
import { ComponentTemplateListTestBed } from './helpers/component_template_list.helpers';
11-
import { API_BASE_PATH } from '../../../../../../common/constants';
12-
import { ComponentTemplateListItem } from '../../types';
13+
14+
const API_BASE_PATH = '/api/index_management';
1315

1416
const { setup } = pageHelpers.componentTemplateList;
1517

x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/http_requests.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
*/
66

77
import sinon, { SinonFakeServer } from 'sinon';
8-
import {
9-
API_BASE_PATH,
10-
ComponentTemplateListItem,
11-
ComponentTemplateDeserialized,
12-
} from '../../../../../../../common';
8+
import { ComponentTemplateListItem, ComponentTemplateDeserialized } from '../../../shared_imports';
9+
10+
const API_BASE_PATH = '/api/index_management';
1311

1412
// Register helpers to mock HTTP Requests
1513
const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {

x-pack/plugins/index_management/public/application/components/component_templates/component_template_details/component_template_details.tsx

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,12 @@ import {
1919
EuiCallOut,
2020
} from '@elastic/eui';
2121

22-
import { SectionLoading } from '../shared_imports';
23-
import { ComponentTemplateDeserialized } from '../types';
22+
import { SectionLoading, TabSettings, TabAliases, TabMappings } from '../shared_imports';
2423
import { useComponentTemplatesContext } from '../component_templates_context';
25-
import { TabSummary, TabSettings, TabAliases, TabMappings } from './tab_content';
24+
import { TabSummary } from './tab_summary';
2625
import { ComponentTemplateTabs, TabType, Tab } from './tabs';
2726
import { ManageButton, ManageAction } from './manage_button';
2827

29-
const tabToComponentMap: {
30-
[key: string]: React.FunctionComponent<{
31-
componentTemplateDetails: ComponentTemplateDeserialized;
32-
}>;
33-
} = {
34-
[TabType.Summary]: TabSummary,
35-
[TabType.Settings]: TabSettings,
36-
[TabType.Mappings]: TabMappings,
37-
[TabType.Aliases]: TabAliases,
38-
};
39-
4028
interface Props {
4129
componentTemplateName: string;
4230
onClose: () => void;
@@ -85,15 +73,28 @@ export const ComponentTemplateDetailsFlyout: React.FunctionComponent<Props> = ({
8573
</EuiCallOut>
8674
);
8775
} else if (componentTemplateDetails) {
88-
const TabContent = tabToComponentMap[activeTab];
76+
const {
77+
template: { settings, mappings, aliases },
78+
} = componentTemplateDetails;
79+
80+
const tabToComponentMap: {
81+
[key: string]: React.ReactNode;
82+
} = {
83+
[TabType.Summary]: <TabSummary componentTemplateDetails={componentTemplateDetails} />,
84+
[TabType.Settings]: <TabSettings settings={settings} />,
85+
[TabType.Mappings]: <TabMappings mappings={mappings} />,
86+
[TabType.Aliases]: <TabAliases aliases={aliases} />,
87+
};
88+
89+
const tabContent = tabToComponentMap[activeTab];
8990

9091
content = (
9192
<>
9293
<ComponentTemplateTabs activeTab={activeTab} setActiveTab={setActiveTab} />
9394

9495
<EuiSpacer size="l" />
9596

96-
<TabContent componentTemplateDetails={componentTemplateDetails} />
97+
{tabContent}
9798
</>
9899
);
99100
}

x-pack/plugins/index_management/public/application/components/component_templates/component_template_details/manage_button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
EuiContextMenu,
1414
EuiContextMenuPanelItemDescriptor,
1515
} from '@elastic/eui';
16-
import { ComponentTemplateDeserialized } from '../types';
16+
import { ComponentTemplateDeserialized } from '../shared_imports';
1717

1818
export interface ManageAction {
1919
name: string;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
EuiSpacer,
1717
} from '@elastic/eui';
1818

19-
import { ComponentTemplateDeserialized } from '../../types';
19+
import { ComponentTemplateDeserialized } from '../shared_imports';
2020

2121
interface Props {
2222
componentTemplateDetails: ComponentTemplateDeserialized;

x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,21 @@ import { ScopedHistory } from 'kibana/public';
1212

1313
import { SectionLoading } from '../shared_imports';
1414
import { UIM_COMPONENT_TEMPLATE_LIST_LOAD } from '../constants';
15-
import { ComponentTemplateDeserialized } from '../types';
15+
import { ComponentTemplateDeserialized } from '../shared_imports';
1616
import { useComponentTemplatesContext } from '../component_templates_context';
1717
import { ComponentTemplateDetailsFlyout } from '../component_template_details';
1818
import { EmptyPrompt } from './empty_prompt';
1919
import { ComponentTable } from './table';
2020
import { LoadError } from './error';
2121
import { ComponentTemplatesDeleteModal } from './delete_modal';
2222

23-
interface MatchParams {
23+
interface Props {
2424
componentTemplateName?: string;
25+
history: RouteComponentProps['history'];
2526
}
2627

27-
export const ComponentTemplateList: React.FunctionComponent<RouteComponentProps<MatchParams>> = ({
28-
match: {
29-
params: { componentTemplateName },
30-
},
28+
export const ComponentTemplateList: React.FunctionComponent<Props> = ({
29+
componentTemplateName,
3130
history,
3231
}) => {
3332
const { api, trackMetric } = useComponentTemplatesContext();

x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/component_template_list_container.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,28 @@
55
*/
66

77
import React from 'react';
8+
import { RouteComponentProps } from 'react-router-dom';
89

910
import { ComponentTemplatesAuthProvider } from './auth_provider';
1011
import { ComponentTemplatesWithPrivileges } from './with_privileges';
1112
import { ComponentTemplateList } from './component_template_list';
1213

13-
export const ComponentTemplateListContainer: React.FunctionComponent = () => {
14+
interface MatchParams {
15+
componentTemplateName?: string;
16+
}
17+
18+
export const ComponentTemplateListContainer: React.FunctionComponent<RouteComponentProps<
19+
MatchParams
20+
>> = ({
21+
match: {
22+
params: { componentTemplateName },
23+
},
24+
history,
25+
}) => {
1426
return (
1527
<ComponentTemplatesAuthProvider>
1628
<ComponentTemplatesWithPrivileges>
17-
<ComponentTemplateList />
29+
<ComponentTemplateList componentTemplateName={componentTemplateName} history={history} />
1830
</ComponentTemplatesWithPrivileges>
1931
</ComponentTemplatesAuthProvider>
2032
);

x-pack/plugins/index_management/public/application/components/component_templates/component_template_list/table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
import { ScopedHistory } from 'kibana/public';
1818

1919
import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
20-
import { ComponentTemplateListItem } from '../types';
20+
import { ComponentTemplateListItem } from '../shared_imports';
2121
import { UIM_COMPONENT_TEMPLATE_DETAILS } from '../constants';
2222
import { useComponentTemplatesContext } from '../component_templates_context';
2323

x-pack/plugins/index_management/public/application/components/component_templates/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ export { ComponentTemplatesProvider } from './component_templates_context';
99
export { ComponentTemplateList } from './component_template_list';
1010

1111
export { ComponentTemplateDetailsFlyout } from './component_template_details';
12-
13-
export * from './types';

0 commit comments

Comments
 (0)