fix: Fix sub-component references in react-console

Follow-up for 1f3411a. Sub-components (like Grid.Col) are no more exported individually.
patternfly · Nov 9, 2018 · 2425fc6 · 2425fc6
1 parent 11aff34
commit 2425fc6
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/packages/patternfly-3/react-console/package.json b/packages/patternfly-3/react-console/package.json
@@ -48,7 +48,7 @@
   },
   "peerDependencies": {
     "patternfly": "^3.52.1",
-    "patternfly-react": "^2.21.5",
+    "patternfly-react": "^2.22.5",
     "prop-types": "^15.6.1",
     "react": "^16.3.2",
     "react-bootstrap": "^0.32.1",

diff --git a/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.js b/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.js
@@ -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,

diff --git a/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.js b/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.js
@@ -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.noop;
+
 /**
  * SerialConsole Component for PatternFly React
  */

diff --git a/packages/patternfly-3/react-console/src/SerialConsole/SerialConsoleActions.js b/packages/patternfly-3/react-console/src/SerialConsole/SerialConsoleActions.js
@@ -2,7 +2,8 @@ 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.noop;
 
 const SerialConsoleActions = ({
   idPrefix,

diff --git a/packages/patternfly-3/react-console/src/SerialConsole/XTerm.js b/packages/patternfly-3/react-console/src/SerialConsole/XTerm.js
@@ -4,9 +4,11 @@ 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.noop;
+
 /**
  * Wraps terminal to a React Component.
  * Based on cockpit-components-terminal.jsx from the Cockpit project (https://github.com/cockpit-project/cockpit)

diff --git a/packages/patternfly-3/react-console/src/VncConsole/VncActions.js b/packages/patternfly-3/react-console/src/VncConsole/VncActions.js
@@ -1,6 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { DropdownButton, MenuItem, noop } from 'patternfly-react';
+import { MenuItem, helpers } from 'patternfly-react';
+
+// FIXME: DropdownButton is inaccessible after 1f3411a6e708e833e48921380ae736cf5f79862b commit
+import DropdownButton from 'patternfly-react/dist/esm/components/Button/DropdownButton';
+
+const noop  = helpers.noop;
 
 const VncActions = ({ textSendShortcut, textCtrlAltDel, onCtrlAltDel }) => (
   <DropdownButton bsStyle="default" title={textSendShortcut} id="console-send-shortcut" onClick={noop}>

diff --git a/packages/patternfly-3/react-console/src/VncConsole/VncConsole.js b/packages/patternfly-3/react-console/src/VncConsole/VncConsole.js
@@ -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.noop;
+
 const CONNECTING = 'connecting';
 const CONNECTED = 'connected';
 const DISCONNECTED = 'disconnected';