Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ingest pipelines] Polish details panel and empty list #63926

Merged
merged 3 commits into from
Apr 20, 2020
Merged

[Ingest pipelines] Polish details panel and empty list #63926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
243106d
polish details panel and empty list
alisonelizabeth Apr 19, 2020
e527d4a
remove unused import
alisonelizabeth Apr 20, 2020
1298ce3
Merge branch 'feature/ingest-node-pipelines' into ingest-pipelines/po…
elasticmachine Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 51 additions & 45 deletions x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
EuiFlyoutBody,
EuiTitle,
EuiDescriptionList,
EuiSpacer,
EuiDescriptionListTitle,
EuiDescriptionListDescription,
EuiFlyoutFooter,
EuiFlexGroup,
EuiFlexItem,
Expand All @@ -35,24 +36,6 @@ export const PipelineDetails: FunctionComponent<Props> = ({
onEditClick,
onDeleteClick,
}) => {
const descriptionListItems = [
{
title: i18n.translate('xpack.ingestPipelines.list.pipelineDetails.descriptionTitle', {
defaultMessage: 'Description',
}),
description: pipeline.description ?? '',
},
];

if (pipeline.version) {
descriptionListItems.push({
title: i18n.translate('xpack.ingestPipelines.list.pipelineDetails.versionTitle', {
defaultMessage: 'Version',
}),
description: String(pipeline.version),
});
}

return (
<EuiFlyout
onClose={onClose}
Expand All @@ -67,35 +50,58 @@ export const PipelineDetails: FunctionComponent<Props> = ({
</EuiFlyoutHeader>

<EuiFlyoutBody>
<EuiDescriptionList listItems={descriptionListItems} />
<EuiDescriptionList>
{/* Pipeline description */}
<EuiDescriptionListTitle>
{i18n.translate('xpack.ingestPipelines.list.pipelineDetails.descriptionTitle', {
defaultMessage: 'Description',
})}
</EuiDescriptionListTitle>
<EuiDescriptionListDescription>
{pipeline.description ?? ''}
</EuiDescriptionListDescription>

<EuiSpacer size="m" />
{/* Pipeline version */}
{pipeline.version && (
<>
<EuiDescriptionListTitle>
{i18n.translate('xpack.ingestPipelines.list.pipelineDetails.versionTitle', {
defaultMessage: 'Version',
})}
</EuiDescriptionListTitle>
<EuiDescriptionListDescription>
{String(pipeline.version)}
</EuiDescriptionListDescription>
</>
)}

<PipelineDetailsJsonBlock
htmlForId="pipelineDetailsProcessorsJson"
label={i18n.translate('xpack.ingestPipelines.list.pipelineDetails.processorsTitle', {
defaultMessage: 'Processors JSON',
})}
json={pipeline.processors}
/>
{/* Processors JSON */}
<EuiDescriptionListTitle>
{i18n.translate('xpack.ingestPipelines.list.pipelineDetails.processorsTitle', {
defaultMessage: 'Processors JSON',
})}
</EuiDescriptionListTitle>
<EuiDescriptionListDescription>
<PipelineDetailsJsonBlock json={pipeline.processors} />
</EuiDescriptionListDescription>

{/* On Failure Processor JSON */}
{pipeline.on_failure?.length && (
<>
<EuiSpacer size="m" />
<PipelineDetailsJsonBlock
htmlForId="pipelineDetailsOnFailureProcessorsJson"
label={i18n.translate(
'xpack.ingestPipelines.list.pipelineDetails.failureProcessorsTitle',
{
defaultMessage: 'On failure processors JSON',
}
)}
json={pipeline.on_failure}
/>
</>
)}
{/* End On Failure Processor JSON */}
{/* On Failure Processor JSON */}
{pipeline.on_failure?.length && (
<>
<EuiDescriptionListTitle>
{i18n.translate(
'xpack.ingestPipelines.list.pipelineDetails.failureProcessorsTitle',
{
defaultMessage: 'On failure processors JSON',
}
)}
</EuiDescriptionListTitle>
<EuiDescriptionListDescription>
<PipelineDetailsJsonBlock json={pipeline.on_failure} />
</EuiDescriptionListDescription>
</>
)}
</EuiDescriptionList>
</EuiFlyoutBody>

<EuiFlyoutFooter>
Expand Down
32 changes: 18 additions & 14 deletions ...lugins/ingest_pipelines/public/application/sections/pipelines_list/details_json_block.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,28 @@
* you may not use this file except in compliance with the Elastic License.
*/

import React, { FunctionComponent } from 'react';
import { EuiCodeBlock, EuiText } from '@elastic/eui';
import React, { FunctionComponent, useRef } from 'react';
import { EuiCodeBlock } from '@elastic/eui';

export interface Props {
htmlForId: string;
label: string;
json: Record<string, any>;
}

export const PipelineDetailsJsonBlock: FunctionComponent<Props> = ({ label, htmlForId, json }) => (
<>
<EuiText size="s">
<label htmlFor={htmlForId}>
<b>{label}</b>
</label>
</EuiText>
<EuiCodeBlock paddingSize="s" id={htmlForId} language="json" overflowHeight={200} isCopyable>
export const PipelineDetailsJsonBlock: FunctionComponent<Props> = ({ json }) => {
// Hack so copied-to-clipboard value updates as content changes
// Related issue: https://github.com/elastic/eui/issues/3321
const uuid = useRef(0);
uuid.current++;

return (
<EuiCodeBlock
paddingSize="s"
language="json"
overflowHeight={json.length > 0 ? 300 : undefined}
isCopyable
key={uuid.current}
>
{JSON.stringify(json, null, 2)}
</EuiCodeBlock>
</>
);
);
};
4 changes: 2 additions & 2 deletions x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/empty_list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ export const EmptyList: FunctionComponent = () => (
title={
<h2>
{i18n.translate('xpack.ingestPipelines.list.table.emptyPromptTitle', {
defaultMessage: 'Create your first pipeline',
defaultMessage: 'Start by creating a pipeline',
})}
</h2>
}
actions={
<EuiButton href={`#${BASE_PATH}/create`}>
<EuiButton href={`#${BASE_PATH}/create`} iconType="plusInCircle" fill>
{i18n.translate('xpack.ingestPipelines.list.table.emptyPrompt.createButtonLabel', {
defaultMessage: 'Create a pipeline',
})}
Expand Down