Skip to content

Commit

Permalink
fix: Fix sub-component references in react-console
Browse files Browse the repository at this point in the history
Follow-up for 1f3411a.

Sub-components (like Grid.Col) are no more exported individually.
  • Loading branch information
mareklibra committed Nov 7, 2018
1 parent 11aff34 commit c02b45f
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';

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

import XTerm from './XTerm';
import SerialConsoleActions from './SerialConsoleActions';
import { noop } from '../common/helpers';

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

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

const SerialConsoleActions = ({
idPrefix,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ 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 { debounce, noop } from '../common/helpers';

/**
* Wraps terminal to a React Component.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
import { DropdownButton, MenuItem, noop } from 'patternfly-react';
import { MenuItem } from 'patternfly-react';

// FIXME: DropdownButton is inaccessible after 1f3411a6e708e833e48921380ae736cf5f79862b commit
import DropdownButton from 'patternfly-react/dist/esm/components/Button/DropdownButton';
import { noop } from '../common/helpers';

const VncActions = ({ textSendShortcut, textCtrlAltDel, onCtrlAltDel }) => (
<DropdownButton bsStyle="default" title={textSendShortcut} id="console-send-shortcut" onClick={noop}>
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 } from 'patternfly-react';

import VncActions from './VncActions';

import { noop } from '../common/helpers';

const CONNECTING = 'connecting';
const CONNECTED = 'connected';
const DISCONNECTED = 'disconnected';
Expand Down
2 changes: 2 additions & 0 deletions packages/patternfly-3/react-console/src/common/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ export const debounce = (func, wait) => {
}
return innerFunc;
};

export const noop = Function.prototype;

0 comments on commit c02b45f

Please sign in to comment.