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.

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 sub-component references in react-console #894

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion packages/patternfly-3/react-console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
"peerDependencies": {
"patternfly": "^3.58.0",
"patternfly-react": "^2.22.5",
"patternfly-react": "^2.24.0",
"prop-types": "^15.6.1",
"react": "^16.3.2",
"react-bootstrap": "^0.32.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import React from 'react';
import PropTypes from 'prop-types';

import { Grid, Row, Col, Form, FormGroup, Dropdown, MenuItem, Checkbox } from 'patternfly-react';
import { Grid, Form, Dropdown, MenuItem } from 'patternfly-react';

import { NONE_TYPE, SERIAL_CONSOLE_TYPE, VNC_CONSOLE_TYPE } from '../common/constants';

const { Row, Col } = Grid;
const { Checkbox, FormGroup } = Form;

class AccessConsoles extends React.Component {
state = {
type: NONE_TYPE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';

import { EmptyState, Button, noop } from 'patternfly-react';
import { EmptyState, Button, helpers } from 'patternfly-react';
import { CONNECTED, DISCONNECTED, LOADING } from './constants';

import XTerm from './XTerm';
import SerialConsoleActions from './SerialConsoleActions';

const { noop } = helpers;

/**
* SerialConsole Component for PatternFly React
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';

import { noop } from 'patternfly-react';
import { helpers } from 'patternfly-react';

const { noop } = helpers;

const SerialConsoleActions = ({
idPrefix,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ import PropTypes from 'prop-types';
import { Terminal } from 'xterm';
import { proposeGeometry } from 'xterm/lib/addons/fit/fit';

import { noop } from 'patternfly-react';
import { debounce } from '../common/helpers';

import { helpers } from 'patternfly-react';

const { noop } = helpers;

/**
* Wraps terminal to a React Component.
* Based on cockpit-components-terminal.jsx from the Cockpit project (https://github.com/cockpit-project/cockpit)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import React from 'react';
import PropTypes from 'prop-types';
import { DropdownButton, MenuItem, noop } from 'patternfly-react';
import { MenuItem, Button, helpers } from 'patternfly-react';

const { Dropdown } = Button;
const { noop } = helpers;

const VncActions = ({ textSendShortcut, textCtrlAltDel, onCtrlAltDel }) => (
<DropdownButton bsStyle="default" title={textSendShortcut} id="console-send-shortcut" onClick={noop}>
<Dropdown bsStyle="default" title={textSendShortcut} id="console-send-shortcut" onClick={noop}>
<MenuItem eventKey="1" onClick={onCtrlAltDel}>
{textCtrlAltDel}
</MenuItem>
</DropdownButton>
</Dropdown>
);

VncActions.propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import * as NovncLog from '@novnc/novnc/core/util/logging';
import RFB from '@novnc/novnc/core/rfb';

import classNames from 'classnames';
import { Toolbar, noop } from 'patternfly-react';
import { Toolbar, helpers } from 'patternfly-react';

import VncActions from './VncActions';

const { noop } = helpers;

const CONNECTING = 'connecting';
const CONNECTED = 'connected';
const DISCONNECTED = 'disconnected';
Expand Down