Skip to content

Commit

Permalink
Fix styles in deploy new agent section (#4832)
Browse files Browse the repository at this point in the history
* redhat7 version

* styles deploy new agent section

* Update CHANGELOG
  • Loading branch information
chantal-kelm authored Nov 9, 2022
1 parent cfaf613 commit a4617d3
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ commands of Start the agent in the deploy new agent section [#4458](https://gith
- Improved the message displayed when there is a versions mismatch between the Wazuh API and the Wazuh APP [#4529](https://github.com/wazuh/wazuh-kibana-app/pull/4529)
- Changed the endpoint that updates the plugin configuration to support multiple settings. [#4501](https://github.com/wazuh/wazuh-kibana-app/pull/4501)
- Allowed to upload an image for the `customization.logo.*` settings in `Settings/Configuration` [#4504](https://github.com/wazuh/wazuh-kibana-app/pull/4504)
- Fixed the OS styles and their versions. [#4832](https://github.com/wazuh/wazuh-kibana-app/pull/4832)

### Fixed

Expand Down
13 changes: 7 additions & 6 deletions public/controllers/agent/components/register-agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,8 @@ export const RegisterAgent = withErrorBoundary(
return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}-1.x86_64.rpm`;
case 'redhat7-armhf':
return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}-1.armv7hl.rpm`;
case 'redhat7-powerpc':
return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}.ppc64le.rpm`;
default:
return `https://packages.wazuh.com/4.x/yum/wazuh-agent-${this.state.wazuhVersion}-1.x86_64.rpm`;
}
Expand Down Expand Up @@ -1037,7 +1039,7 @@ export const RegisterAgent = withErrorBoundary(
options={options}
idSelected={idSelected}
onChange={onChange}
className={'osButtonsStyle'} />
className={'flex'} />
)
}

Expand All @@ -1050,7 +1052,7 @@ export const RegisterAgent = withErrorBoundary(
options={options}
idSelected={idSelected}
onChange={onChange}
className={'osButtonsStyle'}
className={'flex'}
/>
{this.state.selectedVersion == 'solaris10' || this.state.selectedVersion == 'solaris11' ? <EuiCallOut color="warning" className='message' iconType="iInCircle" title={
<span>
Expand Down Expand Up @@ -1084,8 +1086,7 @@ export const RegisterAgent = withErrorBoundary(
legend={legend}
options={options}
idSelected={idSelected}
onChange={onChange}
className={'osButtonsStyleMac'} />
onChange={onChange} />
)
}

Expand Down Expand Up @@ -1267,7 +1268,7 @@ export const RegisterAgent = withErrorBoundary(
},
]
: []),
...(this.state.selectedVersion == 'centos6' || this.state.selectedVersion == 'oraclelinux6' || this.state.selectedVersion == 'amazonlinux1' || this.state.selectedVersion == 'redhat6' || this.state.selectedVersion == 'redhat7' || this.state.selectedVersion == 'amazonlinux2022' || this.state.selectedVersion == 'debian7' || this.state.selectedVersion == 'debian8' || this.state.selectedVersion == 'ubuntu14' || this.state.selectedVersion == 'ubuntu15' || this.state.selectedVersion == 'ubuntu16'
...(this.state.selectedVersion == 'centos6' || this.state.selectedVersion == 'oraclelinux6' || this.state.selectedVersion == 'amazonlinux1' || this.state.selectedVersion == 'redhat6' || this.state.selectedVersion == 'amazonlinux2022' || this.state.selectedVersion == 'debian7' || this.state.selectedVersion == 'debian8' || this.state.selectedVersion == 'ubuntu14' || this.state.selectedVersion == 'ubuntu15' || this.state.selectedVersion == 'ubuntu16'
? [
{
title: 'Choose the architecture',
Expand All @@ -1277,7 +1278,7 @@ export const RegisterAgent = withErrorBoundary(
},
]
: []),
...(this.state.selectedVersion == 'centos7' || this.state.selectedVersion == 'amazonlinux2' || this.state.selectedVersion == 'suse12' || this.state.selectedVersion == '22' || this.state.selectedVersion == 'debian9' || this.state.selectedVersion == 'debian10' || this.state.selectedVersion == 'busterorgreater'
...(this.state.selectedVersion == 'centos7' || this.state.selectedVersion == 'redhat7' || this.state.selectedVersion == 'amazonlinux2' || this.state.selectedVersion == 'suse12' || this.state.selectedVersion == '22' || this.state.selectedVersion == 'debian9' || this.state.selectedVersion == 'debian10' || this.state.selectedVersion == 'busterorgreater'
? [
{
title: 'Choose the architecture',
Expand Down
16 changes: 11 additions & 5 deletions public/styles/component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,26 @@ kbn-dis doc-table .kbnDocViewer__warning {
flex-grow: 0;
}

.osButtonsStyle {
display: grid;
grid-template-columns: repeat(5, 1fr);
grid-gap: 10px;
.flex {
display: flex;
}

.osButtonsStyleMac {
.euiButtonGroup__buttons {
display: grid;
grid-template-columns: repeat(3, 1fr);
grid-template-columns: repeat(5, 1fr);
grid-gap: 10px;
padding: 0 3px;
box-shadow: none;
}

.message {
margin-top: 10px;
display: flex;
flex-direction: row;
}

.euiButtonGroup--medium .euiButtonGroupButton:not(:first-child), .euiButtonGroup--small .euiButtonGroupButton:not(:first-child) {
margin-left: 0 !important;

}

0 comments on commit a4617d3

Please sign in to comment.