-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Some fixes for #54405. * Use the `popoverPositionFluid` method of `EuiPopover` to properly position the arrow based on where the popover was opened * Rearrange the variable declarations and effects in the popover index * Create a `Contents` component to separate the internals of the popover from the index, where the poisitioning is done * Add a story to show the contents rendering Co-authored-by: Elastic Machine <[email protected]>
- Loading branch information
1 parent
0855f12
commit 1abc562
Showing
4 changed files
with
171 additions
and
77 deletions.
There are no files selected for viewing
66 changes: 66 additions & 0 deletions
66
x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { | ||
EuiFlexGroup, | ||
EuiFlexItem, | ||
EuiHorizontalRule, | ||
EuiTitle | ||
} from '@elastic/eui'; | ||
import cytoscape from 'cytoscape'; | ||
import React from 'react'; | ||
import { Buttons } from './Buttons'; | ||
import { Info } from './Info'; | ||
import { ServiceMetricList } from './ServiceMetricList'; | ||
|
||
const popoverMinWidth = 280; | ||
|
||
interface ContentsProps { | ||
focusedServiceName?: string; | ||
isService: boolean; | ||
label: string; | ||
onFocusClick: () => void; | ||
selectedNodeData: cytoscape.NodeDataDefinition; | ||
selectedNodeServiceName: string; | ||
} | ||
|
||
export function Contents({ | ||
selectedNodeData, | ||
focusedServiceName, | ||
isService, | ||
label, | ||
onFocusClick, | ||
selectedNodeServiceName | ||
}: ContentsProps) { | ||
return ( | ||
<EuiFlexGroup | ||
direction="column" | ||
gutterSize="s" | ||
style={{ minWidth: popoverMinWidth }} | ||
> | ||
<EuiFlexItem> | ||
<EuiTitle size="xxs"> | ||
<h3>{label}</h3> | ||
</EuiTitle> | ||
<EuiHorizontalRule margin="xs" /> | ||
</EuiFlexItem> | ||
<EuiFlexItem> | ||
{isService ? ( | ||
<ServiceMetricList serviceName={selectedNodeServiceName} /> | ||
) : ( | ||
<Info {...selectedNodeData} /> | ||
)} | ||
</EuiFlexItem> | ||
{isService && ( | ||
<Buttons | ||
focusedServiceName={focusedServiceName} | ||
onFocusClick={onFocusClick} | ||
selectedNodeServiceName={selectedNodeServiceName} | ||
/> | ||
)} | ||
</EuiFlexGroup> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { storiesOf } from '@storybook/react'; | ||
import React from 'react'; | ||
import { | ||
ApmPluginContext, | ||
ApmPluginContextValue | ||
} from '../../../../context/ApmPluginContext'; | ||
import { Contents } from './Contents'; | ||
|
||
const selectedNodeData = { | ||
id: 'opbeans-node', | ||
label: 'opbeans-node', | ||
href: | ||
'#/services/opbeans-node/service-map?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0', | ||
agentName: 'nodejs', | ||
type: 'service' | ||
}; | ||
|
||
storiesOf('app/ServiceMap/Popover/Contents', module).add( | ||
'example', | ||
() => { | ||
return ( | ||
<ApmPluginContext.Provider | ||
value={ | ||
({ core: { notifications: {} } } as unknown) as ApmPluginContextValue | ||
} | ||
> | ||
<Contents | ||
selectedNodeData={selectedNodeData} | ||
isService={true} | ||
label="opbeans-node" | ||
onFocusClick={() => {}} | ||
selectedNodeServiceName="opbeans-node" | ||
/> | ||
</ApmPluginContext.Provider> | ||
); | ||
}, | ||
{ | ||
info: { | ||
propTablesExclude: [ApmPluginContext.Provider], | ||
source: false | ||
} | ||
} | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters