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

Fix warning type error in status view #6722

Merged
merged 3 commits into from
May 30, 2024
Merged

Fix warning type error in status view #6722

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c4d42e
Conditional render
yenienserrano May 29, 2024
ea733b1
Merge branch '4.9.0' into fix/6693-Invalid-prop-value-supplied-to-Eui…
asteriscos May 30, 2024
e51d3a4
Merge branch '4.9.0' into fix/6693-Invalid-prop-value-supplied-to-Eui…
chantal-kelm May 30, 2024
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
75 changes: 40 additions & 35 deletions ...s/main/public/controllers/management/components/management/status/actions-buttons-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
EuiFlexItem,
EuiSelect,
EuiOverlayMask,
EuiConfirmModal
EuiConfirmModal,
} from '@elastic/eui';

import { connect } from 'react-redux';
Expand All @@ -30,7 +30,7 @@ import {
} from '../../../../../redux/actions/statusActions';

import StatusHandler from './utils/status-handler';
import { getToasts } from '../../../../../kibana-services';
import { getToasts } from '../../../../../kibana-services';
import { WzButtonPermissions } from '../../../../../components/common/permissions/button';

import { UI_ERROR_SEVERITIES } from '../../../../../react-services/error-orchestrator/types';
Expand All @@ -47,7 +47,7 @@ class WzStatusActionButtons extends Component {
this.statusHandler = StatusHandler;
this.state = {
isModalVisible: false,
isRestarting: false
isRestarting: false,
};
}

Expand All @@ -72,7 +72,7 @@ class WzStatusActionButtons extends Component {
this.showToast(
'success',
'Restarting cluster, it will take up to 30 seconds.',
3000
3000,
);
} catch (error) {
this.setState({ isRestarting: false });
Expand Down Expand Up @@ -131,9 +131,11 @@ class WzStatusActionButtons extends Component {
this.props.updateLoadingStatus(true);
this.props.updateSelectedNode(node);

const agentsCountByManagerNodes = await this.statusHandler.clusterAgentsCount();
const agentsCountByManagerNodes =
await this.statusHandler.clusterAgentsCount();

const { connection: agentsCount } = agentsCountByManagerNodes?.data?.data?.agent_status;
const { connection: agentsCount } =
agentsCountByManagerNodes?.data?.data?.agent_status;

const agentsActiveCoverage = (
(agentsCount.active / agentsCount.total) *
Expand Down Expand Up @@ -168,7 +170,7 @@ class WzStatusActionButtons extends Component {
error: {
error: error,
message: error.message || error,
title: `${error.name}: Node ${node} is down`
title: `${error.name}: Node ${node} is down`,
},
};
getErrorOrchestrator().handleError(options);
Expand All @@ -192,7 +194,7 @@ class WzStatusActionButtons extends Component {
getToasts().add({
color: color,
title: text,
toastLifeTimeMs: time
toastLifeTimeMs: time,
});
};

Expand All @@ -201,7 +203,7 @@ class WzStatusActionButtons extends Component {
for (const node of listNodes) {
options.push({
value: node.name,
text: `${node.name} (${node.type})`
text: `${node.name} (${node.type})`,
});
}
return options;
Expand All @@ -212,33 +214,35 @@ class WzStatusActionButtons extends Component {
};

render() {
const {
isLoading,
listNodes,
selectedNode,
clusterEnabled,
} = this.props.state;
const { isLoading, listNodes, selectedNode, clusterEnabled } =
this.props.state;

let options = this.transforToOptions(listNodes);

// Select node
const selectNode = (
<EuiSelect
id="selectNode"
options={options}
value={selectedNode}
onChange={this.changeNode}
disabled={isLoading || this.state.isRestarting}
aria-label="Select node"
/>
);
const selectNode = selectedNode ? (
<EuiFlexItem grow={false}>
<EuiSelect
id='selectNode'
options={options}
value={selectedNode}
onChange={this.changeNode}
disabled={isLoading || this.state.isRestarting}
aria-label='Select node'
/>
</EuiFlexItem>
) : null;

// Restart button
const restartButton = (
<WzButtonPermissions
buttonType='empty'
permissions={[clusterEnabled ? {action: 'cluster:restart', resource: 'node:id:*'} : {action: 'manager:restart', resource: '*:*:*'}]}
iconType="refresh"
permissions={[
clusterEnabled
? { action: 'cluster:restart', resource: 'node:id:*' }
: { action: 'manager:restart', resource: '*:*:*' },
]}
iconType='refresh'
onClick={async () => this.setState({ isModalVisible: true })}
isDisabled={isLoading}
isLoading={this.state.isRestarting}
Expand Down Expand Up @@ -268,9 +272,9 @@ class WzStatusActionButtons extends Component {
}
this.setState({ isModalVisible: false });
}}
cancelButtonText="Cancel"
confirmButtonText="Confirm"
defaultFocusedButton="cancel"
cancelButtonText='Cancel'
confirmButtonText='Confirm'
defaultFocusedButton='cancel'
></EuiConfirmModal>
</EuiOverlayMask>
);
Expand All @@ -281,7 +285,7 @@ class WzStatusActionButtons extends Component {
{selectedNode !== null && (
<EuiFlexItem grow={false}>{restartButton}</EuiFlexItem>
)}
{selectedNode && <EuiFlexItem grow={false}>{selectNode}</EuiFlexItem>}
{selectNode}
{modal}
</Fragment>
);
Expand All @@ -290,7 +294,7 @@ class WzStatusActionButtons extends Component {

const mapStateToProps = state => {
return {
state: state.statusReducers
state: state.statusReducers,
};
};

Expand All @@ -299,13 +303,14 @@ const mapDispatchToProps = dispatch => {
updateLoadingStatus: status => dispatch(updateLoadingStatus(status)),
updateListDaemons: listDaemons => dispatch(updateListDaemons(listDaemons)),
updateNodeInfo: nodeInfo => dispatch(updateNodeInfo(nodeInfo)),
updateSelectedNode: selectedNode => dispatch(updateSelectedNode(selectedNode)),
updateSelectedNode: selectedNode =>
dispatch(updateSelectedNode(selectedNode)),
updateStats: stats => dispatch(updateStats(stats)),
updateAgentInfo: agentInfo => dispatch(updateAgentInfo(agentInfo))
updateAgentInfo: agentInfo => dispatch(updateAgentInfo(agentInfo)),
};
};

export default connect(
mapStateToProps,
mapDispatchToProps
mapDispatchToProps,
)(WzStatusActionButtons);
Loading