Skip to content

Commit

Permalink
Merge branch '4.4-2.4-wzd' into fix/5091-error-click-multiple-agent-s…
Browse files Browse the repository at this point in the history
…elector
  • Loading branch information
asteriscos authored Jan 10, 2023
2 parents 944cd64 + e071e32 commit 97fa2a6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed commands: Aix, OpenSUSE, Alpine, Suse11, Fedora, HP, Oracle Linux 5, Amazon Linux 2, Centos5. Changed the word 'or higher' in buttons to '+'.Fixed validations for Hp, Solaris and Alpine. [5045](https:/wazuh/wazuh-kibana-app/pull/5045)
- Fixed error in Github module PDF report. [5069](https:/wazuh/wazuh-kibana-app/pull/5069)
- Fixed error when clicking on the selectors of agents in the group agents management [#5094](https:/wazuh/wazuh-kibana-app/pull/5094)
- Fixed menu content panel is displayed in the wrong place. [5092](https:/wazuh/wazuh-kibana-app/pull/5092)

### Removed

Expand Down
8 changes: 6 additions & 2 deletions public/components/wz-menu/wz-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,10 @@ export const WzMenu = withWindowSize(class WzMenu extends Component {


const container = document.getElementsByClassName('euiBreadcrumbs');
const expandedHeader = document.getElementById('globalHeaderBars')
const wzExpandedHeader = expandedHeader.children.length === 1
? 'wz-expanded-header-min'
: 'wz-expanded-header-max'
return ReactDOM.createPortal(
<WzReduxProvider>
{this.state.showMenu && (
Expand All @@ -954,8 +958,8 @@ export const WzMenu = withWindowSize(class WzMenu extends Component {
<EuiPopover
panelClassName={
this.state.pluginPlatformMenuBlockedOrOpened ?
"wz-menu-popover wz-menu-popover-over" :
"wz-menu-popover wz-menu-popover-under"
`wz-menu-popover wz-menu-popover-over ${wzExpandedHeader}` :
`wz-menu-popover wz-menu-popover-under ${wzExpandedHeader}`
}
button={mainButton}
isOpen={this.state.menuOpened}
Expand Down
8 changes: 8 additions & 0 deletions public/components/wz-menu/wz-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@ wz-menu {
border-right: none!important;
}

.wz-expanded-header-min {
top: 53px !important;
}

.wz-expanded-header-max {
top: 105px !important;
}

.wz-menu-popover-over .euiPopover__panelArrow.euiPopover__panelArrow--bottom:after {
border-bottom: 12px solid #fafbfd!important;
}
Expand Down

0 comments on commit 97fa2a6

Please sign in to comment.