consoles: Allow configuring VNC #1973
+467
−8
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| * This file is part of Cockpit. | ||
| * | ||
| * Copyright 2024 Fsas Technologies Inc. | ||
| * | ||
| * Cockpit is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation; either version 2.1 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Cockpit is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with Cockpit; If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| import React from 'react'; | ||
| import cockpit from 'cockpit'; | ||
| import PropTypes from 'prop-types'; | ||
| import { Button, Form, Modal, ModalVariant } from "@patternfly/react-core"; | ||
| import { DialogsContext } from 'dialogs.jsx'; | ||
|
|
||
| import { ModalError } from 'cockpit-components-inline-notification.jsx'; | ||
| import { VncRow, validateDialogValues } from './vncBody.jsx'; | ||
| import { domainAttachVnc, domainGet } from '../../../libvirtApi/domain.js'; | ||
|
|
||
| const _ = cockpit.gettext; | ||
|
|
||
| export class AddVNC extends React.Component { | ||
| static contextType = DialogsContext; | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
|
Comment on lines
+34
to
+35
There was a problem hiding this comment. These 2 added lines are not executed by any test. |
||
|
|
||
| this.state = { | ||
| dialogError: undefined, | ||
| vncAddress: "", | ||
| vncPort: "", | ||
| vncPassword: "", | ||
| addVncInProgress: false, | ||
| validationErrors: { }, | ||
|
Comment on lines
+37
to
+43
There was a problem hiding this comment. These 7 added lines are not executed by any test. |
||
| }; | ||
| this.add = this.add.bind(this); | ||
| this.onValueChanged = this.onValueChanged.bind(this); | ||
| this.dialogErrorSet = this.dialogErrorSet.bind(this); | ||
|
Comment on lines
+45
to
+47
There was a problem hiding this comment. These 3 added lines are not executed by any test. |
||
| } | ||
|
|
||
| onValueChanged(key, value) { | ||
| const stateDelta = { [key]: value }; | ||
|
Comment on lines
+50
to
+51
There was a problem hiding this comment. These 2 added lines are not executed by any test. |
||
|
|
||
| this.setState(stateDelta); | ||
|
There was a problem hiding this comment. This added line is not executed by any test. |
||
| } | ||
|
|
||
| dialogErrorSet(text, detail) { | ||
| this.setState({ dialogError: text, dialogErrorDetail: detail }); | ||
|
Comment on lines
+56
to
+57
There was a problem hiding this comment. These 2 added lines are not executed by any test. |
||
| } | ||
|
|
||
| add() { | ||
| const Dialogs = this.context; | ||
| const { vm } = this.props; | ||
|
Comment on lines
+60
to
+62
There was a problem hiding this comment. These 3 added lines are not executed by any test. |
||
|
|
||
| const errors = validateDialogValues(this.state); | ||
| if (errors) { | ||
| this.setState({ validationErrors: errors }); | ||
| return; | ||
|
Comment on lines
+64
to
+67
There was a problem hiding this comment. These 4 added lines are not executed by any test. |
||
| } | ||
|
|
||
| this.setState({ addVncInProgress: true }); | ||
| const vncParams = { | ||
| connectionName: vm.connectionName, | ||
| vmName: vm.name, | ||
| vncAddress: this.state.vncAddress || "", | ||
| vncPort: this.state.vncPort || "", | ||
| vncPassword: this.state.vncPassword || "", | ||
|
Comment on lines
+70
to
+76
There was a problem hiding this comment. These 7 added lines are not executed by any test. |
||
| }; | ||
|
|
||
| domainAttachVnc(vncParams) | ||
| .then(() => { | ||
| domainGet({ connectionName: vm.connectionName, id: vm.id }); | ||
| Dialogs.close(); | ||
|
Comment on lines
+79
to
+82
There was a problem hiding this comment. These 4 added lines are not executed by any test. |
||
| }) | ||
| .catch(exc => this.dialogErrorSet(_("VNC device settings could not be saved"), exc.message)) | ||
| .finally(() => this.setState({ addVncInProgress: false })); | ||
|
Comment on lines
+84
to
+85
There was a problem hiding this comment. These 2 added lines are not executed by any test. |
||
| } | ||
|
|
||
| render() { | ||
| const Dialogs = this.context; | ||
| const { idPrefix } = this.props; | ||
|
Comment on lines
+88
to
+90
There was a problem hiding this comment. These 3 added lines are not executed by any test. |
||
|
|
||
| const defaultBody = ( | ||
| <Form onSubmit={e => e.preventDefault()} isHorizontal> | ||
| <VncRow | ||
| idPrefix={idPrefix} | ||
| dialogValues={this.state} | ||
| validationErrors={this.state.validationErrors} | ||
| onValueChanged={this.onValueChanged} /> | ||
| </Form> | ||
|
Comment on lines
+92
to
+99
There was a problem hiding this comment. These 8 added lines are not executed by any test. |
||
| ); | ||
|
|
||
| return ( | ||
| <Modal position="top" variant={ModalVariant.medium} id={`${idPrefix}-dialog`} isOpen onClose={Dialogs.close} className='vnc-add' | ||
| title={_("Add VNC server")} | ||
| footer={ | ||
|
Comment on lines
+102
to
+105
There was a problem hiding this comment. These 4 added lines are not executed by any test. |
||
| <> | ||
| <Button isLoading={this.state.addVncInProgress} | ||
| isDisabled={false} | ||
| id={`${idPrefix}-add`} | ||
| variant='primary' | ||
| onClick={this.add}> | ||
| {_("Add")} | ||
| </Button> | ||
| <Button id={`${idPrefix}-cancel`} variant='link' onClick={Dialogs.close}> | ||
| {_("Cancel")} | ||
| </Button> | ||
|
Comment on lines
+107
to
+116
There was a problem hiding this comment. These 10 added lines are not executed by any test. |
||
| </> | ||
| }> | ||
| {this.state.dialogError && <ModalError dialogError={this.state.dialogError} dialogErrorDetail={this.state.dialogErrorDetail} />} | ||
| {defaultBody} | ||
| </Modal> | ||
|
Comment on lines
+119
to
+121
There was a problem hiding this comment. These 3 added lines are not executed by any test. |
||
| ); | ||
| } | ||
| } | ||
|
|
||
| AddVNC.propTypes = { | ||
| idPrefix: PropTypes.string.isRequired, | ||
| vm: PropTypes.object.isRequired, | ||
| }; | ||
|
|
||
| export default AddVNC; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * This file is part of Cockpit. | ||
| * | ||
| * Copyright 2024 Fsas Technologies Inc. | ||
| * | ||
| * Cockpit is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation; either version 2.1 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Cockpit is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with Cockpit; If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import React, { useState } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { | ||
| FormGroup, FormHelperText, HelperText, HelperTextItem, | ||
| Grid, GridItem, | ||
| InputGroup, TextInput, Button | ||
| } from "@patternfly/react-core"; | ||
| import { EyeIcon, EyeSlashIcon } from "@patternfly/react-icons"; | ||
|
|
||
| import cockpit from 'cockpit'; | ||
|
|
||
| const _ = cockpit.gettext; | ||
|
|
||
| export const VncRow = ({ idPrefix, onValueChanged, dialogValues, validationErrors }) => { | ||
| const [showPassword, setShowPassword] = useState(false); | ||
|
Comment on lines
+33
to
+34
There was a problem hiding this comment. These 2 added lines are not executed by any test. |
||
|
|
||
| return ( | ||
|
There was a problem hiding this comment. This added line is not executed by any test. |
||
| <> | ||
| <Grid hasGutter md={6}> | ||
| <GridItem span={6}> | ||
| <FormGroup fieldId={`${idPrefix}-address`} label={_("Listening address")}> | ||
| <TextInput id={`${idPrefix}-address`} | ||
| value={dialogValues.vncAddress} | ||
| type="text" | ||
| placeholder={_("default")} | ||
| onChange={(event) => onValueChanged('vncAddress', event.target.value)} /> | ||
| </FormGroup> | ||
| </GridItem> | ||
| <GridItem span={6}> | ||
| <FormGroup fieldId={`${idPrefix}-port`} label={_("Listening port")}> | ||
| <TextInput id={`${idPrefix}-port`} | ||
| value={dialogValues.vncPort} | ||
| type="text" | ||
| placeholder={_("automatic")} | ||
| validated={validationErrors.vncPort ? "error" : null} | ||
| onChange={(event) => onValueChanged('vncPort', event.target.value)} /> | ||
| { validationErrors.vncPort && | ||
| <FormHelperText> | ||
| <HelperText> | ||
| <HelperTextItem variant='error'>{validationErrors.vncPort}</HelperTextItem> | ||
| </HelperText> | ||
| </FormHelperText> | ||
|
Comment on lines
+38
to
+61
There was a problem hiding this comment. These 24 added lines are not executed by any test. |
||
| } | ||
| </FormGroup> | ||
| </GridItem> | ||
| </Grid> | ||
| <FormGroup fieldId={`${idPrefix}-password`} label={_("Password")}> | ||
| <InputGroup> | ||
| <TextInput | ||
| id={`${idPrefix}-password`} | ||
| type={showPassword ? "text" : "password"} | ||
| value={dialogValues.vncPassword} | ||
| onChange={(event) => onValueChanged('vncPassword', event.target.value)} /> | ||
| <Button | ||
| variant="control" | ||
| onClick={() => setShowPassword(!showPassword)}> | ||
| { showPassword ? <EyeSlashIcon /> : <EyeIcon /> } | ||
| </Button> | ||
| </InputGroup> | ||
| </FormGroup> | ||
|
Comment on lines
+63
to
+79
There was a problem hiding this comment. These 17 added lines are not executed by any test. |
||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export function validateDialogValues(values) { | ||
| const res = { }; | ||
|
Comment on lines
+84
to
+85
There was a problem hiding this comment. These 2 added lines are not executed by any test. |
||
|
|
||
| if (values.vncPort == "") | ||
| ; // fine | ||
| else if (!values.vncPort.match("^[0-9]+$") || Number(values.vncPort) < 5900) | ||
| res.vncPort = _("Port must be 5900 or larger."); | ||
|
Comment on lines
+87
to
+90
There was a problem hiding this comment. These 4 added lines are not executed by any test. |
||
|
|
||
| return Object.keys(res).length > 0 ? res : null; | ||
|
There was a problem hiding this comment. This added line is not executed by any test. |
||
| } | ||
|
|
||
| VncRow.propTypes = { | ||
| idPrefix: PropTypes.string.isRequired, | ||
| onValueChanged: PropTypes.func.isRequired, | ||
| dialogValues: PropTypes.object.isRequired, | ||
| validationErrors: PropTypes.object.isRequired, | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These 4 added lines are not executed by any test.