Skip to content

handle_empty_sys_components #933

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

Merged
merged 1 commit into from
May 17, 2023
Merged

handle_empty_sys_components #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 24 additions & 22 deletions ui_src/src/domain/overview/systemComponents/components/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,28 +87,30 @@ const Component = ({ comp, i }) => {
<Divider type="vertical" />
</>
)}
<div className="ports">
<label className="comp-label">Ports</label>
<label className="value">{comp?.ports.length > 0 ? comp?.ports[0] : 'None'}</label>
{comp?.ports?.length > 1 && (
<Popover
overlayInnerStyle={remainingPorstPopInnerStyle}
placement="bottomLeft"
content={comp?.ports?.slice(1)?.map((port) => {
return (
<p className="comp-plus-popover" onClick={handleIconClick}>
{port}
</p>
);
})}
>
<div className="plus-comp" onClick={handleIconClick}>
<Add className="add" />
<p>{comp?.ports?.length - 1}</p>
</div>
</Popover>
)}
</div>
{comp?.ports && (
<div className="ports">
<label className="comp-label">Ports</label>
<label className="value">{comp?.ports.length > 0 ? comp?.ports[0] : 'None'}</label>
{comp?.ports?.length > 1 && (
<Popover
overlayInnerStyle={remainingPorstPopInnerStyle}
placement="bottomLeft"
content={comp?.ports?.slice(1)?.map((port) => {
return (
<p className="comp-plus-popover" onClick={handleIconClick}>
{port}
</p>
);
})}
>
<div className="plus-comp" onClick={handleIconClick}>
<Add className="add" />
<p>{comp?.ports?.length - 1}</p>
</div>
</Popover>
)}
</div>
)}
</div>
</div>
</div>
Expand Down
17 changes: 10 additions & 7 deletions ui_src/src/domain/overview/systemComponents/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,25 @@ const SysComponents = () => {
</div>
<div className="component-list">
{state?.monitor_data?.system_components?.map((comp, i) => {
const childrenData = getBrokers(comp);
return (
<Tree
key={`tree-node${i}`}
blockNode
showLine
selectable={true}
showLine={childrenData.length > 0}
selectable={childrenData.length > 0}
expandedKeys={expandedNodes}
switcherIcon={({ expanded }) => (
<img className={expanded ? 'collapse-arrow open' : 'collapse-arrow'} src={CollapseArrow} alt="collapse-arrow" />
)}
switcherIcon={({ expanded }) =>
childrenData.length > 0 && (
<img className={expanded ? 'collapse-arrow open' : 'collapse-arrow'} src={CollapseArrow} alt="collapse-arrow" />
)
}
rootClassName={!expandedNodes?.includes(`0-${i}`) && 'divided'}
onSelect={(_, info) => {
if (!expandedNodes?.includes(info.node.key)) setExpandedNodes([...expandedNodes, info.node.key]);
else setExpandedNodes(expandedNodes.filter((node) => node !== info.node.key));
}}
defaultExpandedKeys={['0-0']}
defaultExpandedKeys={childrenData.length > 0 ? ['0-0'] : []}
onExpand={(_, { expanded }) => {
if (expanded) setExpandedNodes([...expandedNodes, `0-${i}`]);
else setExpandedNodes(expandedNodes.filter((node) => node !== `0-${i}`));
Expand All @@ -83,7 +86,7 @@ const SysComponents = () => {
{
title: <Component comp={comp} i={i} />,
key: `0-${i}`,
children: getBrokers(comp)
children: childrenData
}
]}
/>
Expand Down