From cbbddd91e3f4c1b95c720d27434f37921792df80 Mon Sep 17 00:00:00 2001 From: Sandra Gonzales Date: Mon, 6 Jul 2020 18:07:29 -0400 Subject: [PATCH] [Ingest Manager] Copy changes (#70828) * update overview page * remove streams column from config table * fleet name chanegs * remove unused component * update translations --- .../create_package_config_page/index.tsx | 2 +- .../package_configs/package_configs_table.tsx | 38 ------------------- .../sections/fleet/agent_list_page/index.tsx | 4 +- .../enrollment_token_list_page/index.tsx | 2 +- .../components/configuration_section.tsx | 6 +-- .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - 7 files changed, 7 insertions(+), 47 deletions(-) diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx index a81fb232ceaa0..b446e6bf97e7b 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/index.tsx @@ -314,7 +314,7 @@ export const CreatePackageConfigPage: React.FunctionComponent = () => { title: i18n.translate( 'xpack.ingestManager.createPackageConfig.stepDefinePackageConfigTitle', { - defaultMessage: 'Define your integration', + defaultMessage: 'Configure integration', } ), status: !packageInfo || !agentConfig ? 'disabled' : undefined, diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx index 42d1075e2ee1f..4da4e2cc68c9d 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/package_configs/package_configs_table.tsx @@ -10,7 +10,6 @@ import { EuiInMemoryTable, EuiInMemoryTableProps, EuiBadge, - EuiTextColor, EuiContextMenuItem, EuiButton, EuiFlexGroup, @@ -23,7 +22,6 @@ import { useCapabilities, useLink } from '../../../../../hooks'; import { useConfigRefresh } from '../../hooks'; interface InMemoryPackageConfig extends PackageConfig { - streams: { total: number; enabled: number }; inputTypes: string[]; packageName?: string; packageTitle?: string; @@ -72,30 +70,11 @@ export const PackageConfigsTable: React.FunctionComponent = ({ } const dsInputTypes: string[] = []; - const streams = packageConfig.inputs.reduce( - (streamSummary, input) => { - if (!inputTypesValues.includes(input.type)) { - inputTypesValues.push(input.type); - } - if (!dsInputTypes.includes(input.type)) { - dsInputTypes.push(input.type); - } - - streamSummary.total += input.streams.length; - streamSummary.enabled += input.enabled - ? input.streams.filter((stream) => stream.enabled).length - : 0; - - return streamSummary; - }, - { total: 0, enabled: 0 } - ); dsInputTypes.sort(stringSortAscending); return { ...packageConfig, - streams, inputTypes: dsInputTypes, packageName: packageConfig.package?.name ?? '', packageTitle: packageConfig.package?.title ?? '', @@ -175,23 +154,6 @@ export const PackageConfigsTable: React.FunctionComponent = ({ return namespace ? {namespace} : ''; }, }, - { - field: 'streams', - name: i18n.translate( - 'xpack.ingestManager.configDetails.packageConfigsTable.streamsCountColumnTitle', - { - defaultMessage: 'Streams', - } - ), - render: (streams: InMemoryPackageConfig['streams']) => { - return ( - <> - {streams.enabled} -  / {streams.total} - - ); - }, - }, { name: i18n.translate( 'xpack.ingestManager.configDetails.packageConfigsTable.actionsColumnTitle', diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx index 6d04f63702c64..ec58789becb72 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx @@ -245,7 +245,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => { { field: 'config_id', name: i18n.translate('xpack.ingestManager.agentList.configColumnTitle', { - defaultMessage: 'Configuration', + defaultMessage: 'Agent config', }), render: (configId: string, agent: Agent) => { const configName = agentConfigs.find((p) => p.id === configId)?.name; @@ -445,7 +445,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => { > } diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx index 800d4abfd45ed..df0862be9a141 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx @@ -175,7 +175,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => { { field: 'config_id', name: i18n.translate('xpack.ingestManager.enrollmentTokensList.configTitle', { - defaultMessage: 'Config', + defaultMessage: 'Agent config', }), render: (configId: string) => { const config = agentConfigs.find((c) => c.id === configId); diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx index ed4b3fc8e6a5d..5a5e901d629b5 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/overview/components/configuration_section.tsx @@ -36,7 +36,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[

@@ -55,7 +55,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[ @@ -64,7 +64,7 @@ export const OverviewConfigurationSection: React.FC<{ agentConfigs: AgentConfig[ diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index d14980f194639..5ad0283e1f51f 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -8159,7 +8159,6 @@ "xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "データソース", "xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "名前空間", "xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "統合", - "xpack.ingestManager.configDetails.packageConfigsTable.streamsCountColumnTitle": "ストリーム", "xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "データソース", "xpack.ingestManager.configDetails.subTabs.settingsTabText": "設定", "xpack.ingestManager.configDetails.summary.lastUpdated": "最終更新日:", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 620d897fba4fe..9acba60a2860c 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -8164,7 +8164,6 @@ "xpack.ingestManager.configDetails.packageConfigsTable.nameColumnTitle": "数据源", "xpack.ingestManager.configDetails.packageConfigsTable.namespaceColumnTitle": "命名空间", "xpack.ingestManager.configDetails.packageConfigsTable.packageNameColumnTitle": "集成", - "xpack.ingestManager.configDetails.packageConfigsTable.streamsCountColumnTitle": "流计数", "xpack.ingestManager.configDetails.subTabs.packageConfigsTabText": "数据源", "xpack.ingestManager.configDetails.subTabs.settingsTabText": "设置", "xpack.ingestManager.configDetails.summary.lastUpdated": "最后更新时间",