Skip to content

Commit

Permalink
[Ingest Pipelines] Drop into an empty tree (#76885)
Browse files Browse the repository at this point in the history
* add ability to drop processor into empty tree

* added a test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
  • Loading branch information
jloleysens and elasticmachine authored Sep 14, 2020
1 parent 1ea61ec commit 97813b2
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -184,5 +184,14 @@ describe('Pipeline Editor', () => {
expect(find('processors>0.moveItemButton').props().disabled).toBe(true);
expect(find('processors>1.moveItemButton').props().disabled).toBe(true);
});

it('can move a processor into an empty tree', () => {
const { actions } = testBed;
actions.moveProcessor('processors>0', 'onFailure.dropButtonEmptyTree');
const [onUpdateResult2] = onUpdate.mock.calls[onUpdate.mock.calls.length - 1];
const data = onUpdateResult2.getData();
expect(data.processors).toEqual([testProcessors.processors[1]]);
expect(data.on_failure).toEqual([testProcessors.processors[0]]);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const AddProcessorButton: FunctionComponent<Props> = (props) => {
return (
<EuiButtonEmpty
data-test-subj="addProcessorButton"
className="pipelineProcessorsEditor__tree__addProcessorButton"
disabled={editor.mode.id !== 'idle'}
iconSide="left"
iconType="plusInCircle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
}
}

&__addProcessorButton {
width: fit-content;
}

&__onFailureHandlerContainer {
margin-top: $euiSizeS;
margin-bottom: $euiSizeS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ import React, { FunctionComponent, memo, useRef, useEffect } from 'react';
import { EuiFlexGroup, EuiFlexItem, keys } from '@elastic/eui';
import { List, WindowScroller } from 'react-virtualized';

import { DropSpecialLocations } from '../../constants';
import { ProcessorInternal, ProcessorSelector } from '../../types';
import { selectorToDataTestSubject } from '../../utils';
import { AddProcessorButton } from '../add_processor_button';

import { PrivateTree, DropZoneButton } from './components';

import './processors_tree.scss';
import { AddProcessorButton } from '../add_processor_button';
import { PrivateTree } from './components';

export interface ProcessorInfo {
id: string;
Expand Down Expand Up @@ -96,8 +98,25 @@ export const ProcessorsTree: FunctionComponent<Props> = memo((props) => {
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup responsive={false} justifyContent="flexStart" gutterSize="none">
<EuiFlexItem data-test-subj={selectorToDataTestSubject(baseSelector)} grow={false}>
<EuiFlexGroup responsive={false} alignItems="flexStart" gutterSize="none">
<EuiFlexItem data-test-subj={selectorToDataTestSubject(baseSelector)}>
{!processors.length && (
<DropZoneButton
data-test-subj="dropButtonEmptyTree"
isVisible={Boolean(movingProcessor)}
isDisabled={false}
onClick={(event) => {
event.preventDefault();
onAction({
type: 'move',
payload: {
destination: baseSelector.concat(DropSpecialLocations.top),
source: movingProcessor!.selector,
},
});
}}
/>
)}
<AddProcessorButton
onClick={() => {
onAction({ type: 'addProcessor', payload: { target: baseSelector } });
Expand Down

0 comments on commit 97813b2

Please sign in to comment.