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

Jump to bottom

Fixed breadcrumbs style compatibility for Kibana 7.14.2 #3668

Merged
merged 3 commits into from
Nov 2, 2021
Merged

Fixed breadcrumbs style compatibility for Kibana 7.14.2 #3668

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
da6be99
Parcial breadcrumb style fix
asteriscos Oct 28, 2021
043f78f
Improved beadcrumb styling and text overflow
asteriscos Oct 29, 2021
0885410
Added changelog
asteriscos Oct 29, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ All notable changes to the Wazuh app project will be documented in this file.

- Fixed compatibility wazuh 4.2 - kibana 7.13.4 [#3653](https://github.com/wazuh/wazuh-kibana-app/pull/3653)
- Fixed interative register windows agent screen error [#3654](https://github.com/wazuh/wazuh-kibana-app/pull/3654)
- Fixed breadcrumbs style compatibility for Kibana 7.14.2 [#3668](https://github.com/wazuh/wazuh-kibana-app/pull/3668)

## Wazuh v4.2.4 - Kibana 7.10.2, 7.11.2, 7.12.1 - Revision 4205

Expand Down
19 changes: 11 additions & 8 deletions public/components/common/globalBreadcrumb/globalBreadcrumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
nav.euiBreadcrumbs.wz-global-breadcrumb span.euiBreadcrumb[title=""]:first-child{
display: none;
}

.euiBreadcrumbs--truncate .wz-global-breadcrumb .euiBreadcrumb:not(.euiBreadcrumb--collapsed) span.euiToolTipAnchor{
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: text-bottom;
}

.wz-global-breadcrumb {
font-size: 14px;
font-family: "Inter UI";
padding: 0px;
}

.wz-global-breadcrumb-btn{
max-width: unset!important;
height: 20px;
}

.wz-global-breadcrumb-btn{
height: 20px;
font-family: "Inter UI";
}


@media screen and (-webkit-min-device-pixel-ratio: 0) {
_::-webkit-full-page-media, _:future, :root , .wz-global-breadcrumb {
line-height: 1.5;
Expand Down
38 changes: 18 additions & 20 deletions public/components/common/globalBreadcrumb/globalBreadcrumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,24 @@ class WzGlobalBreadcrumb extends Component {
return (
<div>
{!!this.props.state.breadcrumb.length && (
<EuiBreadcrumbs
className='wz-global-breadcrumb'
responsive={false}
truncate={false}
max={6}
breadcrumbs={this.props.state.breadcrumb.map(breadcrumb => breadcrumb.agent ? {
text: (
<a
style={{ margin: '0px 0px -5px 0px', height: 20 }}
className="euiLink euiLink--subdued euiBreadcrumb "
onClick={(ev) => { ev.stopPropagation(); AppNavigate.navigateToModule(ev, 'agents', { "tab": "welcome", "agent": breadcrumb.agent.id }); this.router.reload(); }}
id="breadcrumbNoTitle"
>
<EuiToolTip position="top" content={"View agent summary"}>
<span>{breadcrumb.agent.name}</span>
</EuiToolTip>
</a>)
} : breadcrumb)}
aria-label="Wazuh global breadcrumbs"
/>
<EuiBreadcrumbs
className='wz-global-breadcrumb'
responsive={false}
truncate={false}
max={6}
breadcrumbs={this.props.state.breadcrumb.map(breadcrumb => breadcrumb.agent ? {
className: "euiLink euiLink--subdued ",
onClick: (ev) => { ev.stopPropagation(); AppNavigate.navigateToModule(ev, 'agents', { "tab": "welcome", "agent": breadcrumb.agent.id }); this.router.reload(); },
id: "breadcrumbNoTitle",
truncate: true,
text: (
<EuiToolTip position="top" content={"View agent summary"}>
<span>{breadcrumb.agent.name}</span>
</EuiToolTip>
)
} : breadcrumb)}
aria-label="Wazuh global breadcrumbs"
/>
)}
</div>
)
Expand Down
38 changes: 17 additions & 21 deletions public/components/common/modules/main-overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,33 +78,29 @@ export class MainModuleOverview extends Component {
},
];
if (currentAgent.id) {
breadcrumb.push( {
breadcrumb.push({
className: "euiLink euiLink--subdued ",
onClick: (ev) => { ev.stopPropagation(); AppNavigate.navigateToModule(ev, 'agents', { "tab": "welcome", "agent": currentAgent.id }); this.router.reload(); },
id: "breadcrumbNoTitle",
truncate: true,
text: (
<a
style={{ margin: '0px 0px -5px 0px', height: 20 }}
className="euiLink euiLink--subdued euiBreadcrumb "
onClick={(ev) => { ev.stopPropagation(); AppNavigate.navigateToModule(ev, 'agents', { "tab": "welcome", "agent": currentAgent.id }); this.router.reload(); }}
id="breadcrumbNoTitle"
>
<EuiToolTip position="bottom" content={"View agent summary"} display="inlineBlock">
<span>{currentAgent.name}</span>
</EuiToolTip>
</a>),
<EuiToolTip position="bottom" content={"View agent summary"} display="inlineBlock">
<span>{currentAgent.name}</span>
</EuiToolTip>
),
})
}
breadcrumb.push({
text: (
<EuiFlexGroup gutterSize="xs" alignItems="center" responsive={false}>
<div style={{ margin: '0.8em 0em 0em 0.09em' }}>
<EuiToolTip position="top">
<div className="euiBreadcrumb euiBreadcrumb--last" title="">
{WAZUH_MODULES[this.props.section].title}
</div>
</EuiToolTip>
</div>
<EuiFlexGroup gutterSize="none" alignItems="center" responsive={false}>
<EuiToolTip position="top">
<>
{WAZUH_MODULES[this.props.section].title}
</>
</EuiToolTip>
<EuiToolTip content={WAZUH_MODULES[this.props.section].description}>
<EuiIcon style={{ margin: '0px 0px 1px 5px' }} type='iInCircle' />
</EuiToolTip>
<EuiIcon style={{ margin: '0px 0px 1px 5px' }} type='iInCircle' />
</EuiToolTip>
</EuiFlexGroup>
),
truncate: false,
Expand Down