diff --git a/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.js b/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.js index 4b4d32e82a6..15c33ef0810 100644 --- a/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.js +++ b/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.js @@ -3,8 +3,9 @@ import PropTypes from 'prop-types'; import { Grid, Form, Dropdown, MenuItem } from 'patternfly-react'; -import { NONE_TYPE, SERIAL_CONSOLE_TYPE, VNC_CONSOLE_TYPE } from '../common/constants'; +import constants from '../common/constants'; +const { NONE_TYPE, SERIAL_CONSOLE_TYPE, VNC_CONSOLE_TYPE } = constants; const { Row, Col } = Grid; const { Checkbox, FormGroup } = Form; @@ -156,4 +157,6 @@ AccessConsoles.defaultProps = { disconnectByChange: true /** By default, console is unmounted (disconnected) when switching to other type */ }; +AccessConsoles.constants = constants; + export default AccessConsoles; diff --git a/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.stories.js b/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.stories.js index 1cd730f2172..09e04edec07 100644 --- a/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.stories.js +++ b/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.stories.js @@ -8,8 +8,9 @@ import { storybookPackageName } from 'storybook/constants/siteConstants'; import { noop } from 'patternfly-react'; import { AccessConsoles, VncConsole } from '../index'; import { SerialConsoleConnector } from '../SerialConsole/SerialConsole.stories'; // contains mock backend -import { DISCONNECTED } from '../SerialConsole/constants'; -import { SERIAL_CONSOLE_TYPE } from '../common/constants'; +import constants from '../common/constants'; + +const { DISCONNECTED, SERIAL_CONSOLE_TYPE } = constants; const stories = storiesOf(`${storybookPackageName(name)}/AccessConsoles`, module); diff --git a/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.test.js b/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.test.js index cbea0278b28..6913823c914 100644 --- a/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.test.js +++ b/packages/patternfly-3/react-console/src/AccessConsoles/AccessConsoles.test.js @@ -4,9 +4,10 @@ import { noop } from 'patternfly-react'; import { AccessConsoles } from './index'; import { SerialConsole } from '../SerialConsole'; -import { SERIAL_CONSOLE_TYPE, VNC_CONSOLE_TYPE } from '../common/constants'; -import { LOADING } from '../SerialConsole/constants'; import { VncConsole } from '../VncConsole'; +import constants from '../common/constants'; + +const { SERIAL_CONSOLE_TYPE, VNC_CONSOLE_TYPE, LOADING } = constants; const MyVncConsoleTestWrapper = () =>

This can be VncConsole component or a wrapper

; diff --git a/packages/patternfly-3/react-console/src/DesktopViewer/DesktopViewer.test.js b/packages/patternfly-3/react-console/src/DesktopViewer/DesktopViewer.test.js index 9b1a3c2ce0b..83fdb9e133b 100644 --- a/packages/patternfly-3/react-console/src/DesktopViewer/DesktopViewer.test.js +++ b/packages/patternfly-3/react-console/src/DesktopViewer/DesktopViewer.test.js @@ -5,7 +5,9 @@ import { render, mount } from 'enzyme'; import DesktopViewer from './DesktopViewer'; import MoreInformationDefaultContent from './MoreInformationDefaultContent'; import { generateVVFile } from './vvFileGenerator'; -import { SPICE_CONSOLE_TYPE } from '../common/constants'; +import constants from '../common/constants'; + +const { SPICE_CONSOLE_TYPE } = constants; const spice = { address: 'my.host.com', diff --git a/packages/patternfly-3/react-console/src/DesktopViewer/vvFileGenerator.js b/packages/patternfly-3/react-console/src/DesktopViewer/vvFileGenerator.js index b641021c07e..dc3a227fc03 100644 --- a/packages/patternfly-3/react-console/src/DesktopViewer/vvFileGenerator.js +++ b/packages/patternfly-3/react-console/src/DesktopViewer/vvFileGenerator.js @@ -1,7 +1,8 @@ import 'blob-polyfill'; import { saveAs } from 'file-saver'; +import constants from '../common/constants'; -import { VNC_CONSOLE_TYPE, SPICE_CONSOLE_TYPE } from '../common/constants'; +const { VNC_CONSOLE_TYPE, SPICE_CONSOLE_TYPE } = constants; export function downloadFile(fileName, content, mimeType) { const blob = new Blob([content], { type: mimeType }); diff --git a/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.js b/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.js index 550dd150a1e..bae6ec6c7bc 100644 --- a/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.js +++ b/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.js @@ -3,8 +3,9 @@ import PropTypes from 'prop-types'; import classNames from 'classnames'; import { EmptyState, Button, helpers } from 'patternfly-react'; -import { CONNECTED, DISCONNECTED, LOADING } from './constants'; +import constants from '../common/constants'; +const { CONNECTED, DISCONNECTED, LOADING } = constants; import XTerm from './XTerm'; import SerialConsoleActions from './SerialConsoleActions'; @@ -139,7 +140,7 @@ SerialConsole.propTypes = { onTitleChanged: PropTypes.func, /** Connection status, a value from [''connected', 'disconnected', 'loading']. Default is 'loading' for a not matching value. */ - status: PropTypes.string.isRequired, + status: PropTypes.oneOf([CONNECTED, DISCONNECTED, LOADING]).isRequired, id: PropTypes.string, /** Size of the terminal component */ diff --git a/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.stories.js b/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.stories.js index b546305884f..01434d96e10 100644 --- a/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.stories.js +++ b/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.stories.js @@ -7,7 +7,9 @@ import { defaultTemplate } from 'storybook/decorators/storyTemplates'; import { storybookPackageName } from 'storybook/constants/siteConstants'; import { SerialConsole } from './index'; -import { CONNECTED, DISCONNECTED, LOADING } from './constants'; +import constants from '../common/constants'; + +const { CONNECTED, DISCONNECTED, LOADING } = constants; import { name } from '../../package.json'; diff --git a/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.test.js b/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.test.js index 9c276d5feb5..e1cabdcc5ed 100644 --- a/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.test.js +++ b/packages/patternfly-3/react-console/src/SerialConsole/SerialConsole.test.js @@ -2,7 +2,9 @@ import React from 'react'; import { shallow, render } from 'enzyme'; import SerialConsole from './SerialConsole'; -import { CONNECTED, DISCONNECTED, LOADING } from './constants'; +import constants from '../common/constants'; + +const { CONNECTED, DISCONNECTED, LOADING } = constants; test('SerialConsole in the LOADING state', () => { const view = shallow( diff --git a/packages/patternfly-3/react-console/src/SerialConsole/constants.js b/packages/patternfly-3/react-console/src/SerialConsole/constants.js deleted file mode 100644 index eebc5142c48..00000000000 --- a/packages/patternfly-3/react-console/src/SerialConsole/constants.js +++ /dev/null @@ -1,3 +0,0 @@ -export const CONNECTED = 'connected'; -export const DISCONNECTED = 'disconnected'; -export const LOADING = 'loading'; diff --git a/packages/patternfly-3/react-console/src/VncConsole/VncConsole.js b/packages/patternfly-3/react-console/src/VncConsole/VncConsole.js index f1c76a1c9ee..caf97d79e03 100644 --- a/packages/patternfly-3/react-console/src/VncConsole/VncConsole.js +++ b/packages/patternfly-3/react-console/src/VncConsole/VncConsole.js @@ -8,13 +8,11 @@ import classNames from 'classnames'; import { Toolbar, helpers } from 'patternfly-react'; import VncActions from './VncActions'; +import constants from '../common/constants'; +const { CONNECTED, CONNECTING, DISCONNECTED } = constants; const { noop } = helpers; -const CONNECTING = 'connecting'; -const CONNECTED = 'connected'; -const DISCONNECTED = 'disconnected'; - /* eslint no-console: ["warn", { allow: ["error"] }] */ class VncConsole extends React.Component { diff --git a/packages/patternfly-3/react-console/src/common/constants.js b/packages/patternfly-3/react-console/src/common/constants.js index 752d3264754..8fb94d18b8f 100644 --- a/packages/patternfly-3/react-console/src/common/constants.js +++ b/packages/patternfly-3/react-console/src/common/constants.js @@ -1,4 +1,23 @@ -export const NONE_TYPE = '_none_'; -export const SERIAL_CONSOLE_TYPE = 'SerialConsole'; -export const SPICE_CONSOLE_TYPE = 'SpiceConsole'; -export const VNC_CONSOLE_TYPE = 'VncConsole'; +const NONE_TYPE = '_none_'; +const SERIAL_CONSOLE_TYPE = 'SerialConsole'; +const SPICE_CONSOLE_TYPE = 'SpiceConsole'; +const VNC_CONSOLE_TYPE = 'VncConsole'; + +const CONNECTING = 'connecting'; +const CONNECTED = 'connected'; +const DISCONNECTED = 'disconnected'; +const LOADING = 'loading'; + +const constants = { + NONE_TYPE, + SERIAL_CONSOLE_TYPE, + SPICE_CONSOLE_TYPE, + VNC_CONSOLE_TYPE, + + CONNECTING, + CONNECTED, + DISCONNECTED, + LOADING +}; + +export default constants; diff --git a/packages/patternfly-3/react-console/src/index.js b/packages/patternfly-3/react-console/src/index.js index 706e4238461..a12d989fcd7 100644 --- a/packages/patternfly-3/react-console/src/index.js +++ b/packages/patternfly-3/react-console/src/index.js @@ -1,6 +1,3 @@ -export * from './common/helpers'; -export * from './common/constants'; - export * from './SerialConsole'; export * from './VncConsole'; export * from './AccessConsoles';