Merge branch 'master' into charts-replace

DEVELOPERS.md

@@ -58,6 +58,15 @@ to accomplish this. To start the server:
 When asked, provide a valid user name (in the form of `user@domain`) and password so
 the application can start in the context of a logged in user.
 
+When the dev server is started, it will attempt to open a new browser window/tab on
+your system default browser to the app's running URL.  This behavior can be modified
+by specifying the `BROWSER` environment variable.  Possible values are:
+    BROWSER=none               # disable the feature
+    BROWSER=google-chrome      # open a new tab in chrome on Linux
+    BROWSER='google chrome'    # open a new tab in chrome on MacOS
+    BROWSER=chrome             # open a new tab in chrome on Windows
+    BROWSER=firefox            # open a new tab in firefox on Linux
+
 
 ### Build
 You can build the static assets from source by:

package.json

@@ -76,6 +76,7 @@
     "bootstrap": "3.4.1",
     "bootstrap-select": "1.13.1",
     "bootstrap-switch": "3.3.4",
+    "classnames": "2.2.6",
     "connected-react-router": "4.3.0",
     "history": "4.7.2",
     "immutable": "3.8.2",

scripts/start.js

@@ -134,9 +134,11 @@ function openBrowser(port, protocol) {
   if (process.env.BROWSER) {
     options.app = process.env.BROWSER
   }
-  opn(protocol + '://localhost:' + port + '/', options).catch(err => {
-    // ignore errors - can happen when starting the server in docker container
-  })
+  if (options.app !== 'none') {
+    opn(protocol + '://localhost:' + port + '/', options).catch(err => {
+      // ignore errors - can happen when starting the server in docker container
+    })
+  }
 }
 
 // We need to provide a custom onError function for httpProxyMiddleware.

src/actions/clusters.js

@@ -11,8 +11,5 @@ export function setClusters (clusters) {
 }
 
 export function getAllClusters () {
-  return {
-    type: GET_ALL_CLUSTERS,
-    payload: {},
-  }
+  return { type: GET_ALL_CLUSTERS }
 }

src/actions/hosts.js

@@ -11,8 +11,5 @@ export function setHosts (hosts) {
 }
 
 export function getAllHosts () {
-  return {
-    type: GET_ALL_HOSTS,
-    payload: {},
-  }
+  return { type: GET_ALL_HOSTS }
 }

src/actions/index.js

@@ -41,10 +41,7 @@ export * from './userMessages'
 export * from './disks'
 
 export function appConfigured () {
-  return {
-    type: APP_CONFIGURED,
-    payload: {},
-  }
+  return { type: APP_CONFIGURED }
 }
 
 export function startSchedulerFixedDelay (delayInSeconds = AppConfiguration.schedulerFixedDelayInSeconds) {
@@ -55,17 +52,11 @@ export function startSchedulerFixedDelay (delayInSeconds = AppConfiguration.sche
 }
 
 export function stopSchedulerFixedDelay () {
-  return {
-    type: STOP_SCHEDULER_FIXED_DELAY,
-    payload: {},
-  }
+  return { type: STOP_SCHEDULER_FIXED_DELAY }
 }
 
 export function persistState () {
-  return {
-    type: PERSIST_STATE,
-    payload: {},
-  }
+  return { type: PERSIST_STATE }
 }
 
 /**
@@ -138,17 +129,11 @@ export function changePage ({ type, id }) {
 }
 
 export function checkTokenExpired () {
-  return {
-    type: CHECK_TOKEN_EXPIRED,
-    payload: {},
-  }
+  return { type: CHECK_TOKEN_EXPIRED }
 }
 
 export function showTokenExpiredMessage () {
-  return {
-    type: SHOW_TOKEN_EXPIRED_MSG,
-    payload: {},
-  }
+  return { type: SHOW_TOKEN_EXPIRED_MSG }
 }
 
 export function getByPage ({ page, shallowFetch = true }) {
@@ -171,10 +156,7 @@ export function setUSBFilter ({ usbFilter }) {
 }
 
 export function getUSBFilter () {
-  return {
-    type: GET_USB_FILTER,
-    payload: {},
-  }
+  return { type: GET_USB_FILTER }
 }
 
 /**
@@ -203,10 +185,7 @@ export function setUserGroups ({ groups }) {
 }
 
 export function getUserGroups () {
-  return {
-    type: GET_USER_GROUPS,
-    payload: {},
-  }
+  return { type: GET_USER_GROUPS }
 }
 
 export function setCpuTopologyOptions ({

src/actions/operatingSystems.js

@@ -14,8 +14,5 @@ export function setOperatingSystems (operatingSystems) {
 }
 
 export function getAllOperatingSystems () {
-  return {
-    type: GET_ALL_OS,
-    payload: {},
-  }
+  return { type: GET_ALL_OS }
 }

src/actions/pendingTasks.js

@@ -61,10 +61,7 @@ export function addSnapshotRestorePendingTask () {
 }
 
 export function removeSnapshotRestorePendingTask () {
-  return {
-    type: REMOVE_SNAPSHOT_RESTORE_PENDING_TASK,
-    payload: {},
-  }
+  return { type: REMOVE_SNAPSHOT_RESTORE_PENDING_TASK }
 }
 
 export function addSnapshotAddPendingTask () {
@@ -78,8 +75,5 @@ export function addSnapshotAddPendingTask () {
 }
 
 export function removeSnapshotAddPendingTask () {
-  return {
-    type: REMOVE_SNAPSHOT_ADD_PENDING_TASK,
-    payload: {},
-  }
+  return { type: REMOVE_SNAPSHOT_ADD_PENDING_TASK }
 }

src/actions/pool.js

@@ -90,11 +90,7 @@ export function getSinglePool ({ poolId }) {
 }
 
 export function updateVmsPoolsCount () {
-  return {
-    type: UPDATE_VMPOOLS_COUNT,
-    payload: {
-    },
-  }
+  return { type: UPDATE_VMPOOLS_COUNT }
 }
 
 export function poolActionInProgress ({ poolId, name, started }) {

src/actions/storageDomains.js

@@ -8,15 +8,11 @@ import {
 } from '_/constants'
 
 export function getAllStorageDomains (): Object {
-  return {
-    type: GET_ALL_STORAGE_DOMAINS,
-  }
+  return { type: GET_ALL_STORAGE_DOMAINS }
 }
 
 export function getIsoFiles (): Object {
-  return {
-    type: GET_ISO_FILES,
-  }
+  return { type: GET_ISO_FILES }
 }
 
 export function setStorageDomains (storageDomains: Array<Object>): Object {

src/actions/templates.js

@@ -14,8 +14,5 @@ export function setTemplates (templates) {
 }
 
 export function getAllTemplates () {
-  return {
-    type: GET_ALL_TEMPLATES,
-    payload: {},
-  }
+  return { type: GET_ALL_TEMPLATES }
 }

src/actions/userMessages.js

@@ -17,10 +17,7 @@ export function addUserMessage ({ message, shortMessage, type = '' }) {
 }
 
 export function clearUserMessages () {
-  return {
-    type: CLEAR_USER_MSGS,
-    payload: {},
-  }
+  return { type: CLEAR_USER_MSGS }
 }
 
 export function setNotificationNotified ({ time }) {

src/actions/vnicProfiles.js

@@ -14,10 +14,7 @@ export function setVnicProfiles ({ vnicProfiles }) {
 }
 
 export function getAllVnicProfiles () {
-  return {
-    type: GET_ALL_VNIC_PROFILES,
-    payload: {},
-  }
+  return { type: GET_ALL_VNIC_PROFILES }
 }
 
 export function addNetworksToVnicProfiles ({ networks }) {

src/components/VmDetails/cards/DetailsCard/FieldValue.js → src/components/EllipsisValue/index.js

@@ -1,8 +1,10 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import { xor } from '_/propTypeExtras'
 import style from './style.css'
+import classnames from 'classnames'
 
-class FieldValue extends React.Component {
+class EllipsisValue extends React.Component {
   constructor (props) {
     super(props)
     this.ref = React.createRef()
@@ -12,11 +14,25 @@ class FieldValue extends React.Component {
 
     this.updateOverflow = this.updateOverflow.bind(this)
   }
+
   componentDidUpdate () {
     this.updateOverflow()
   }
 
+  componentDidMount () {
+    window.addEventListener('resize', this.updateOverflow)
+    this.updateOverflow()
+  }
+
+  componentWillUnmount () {
+    window.removeEventListener('resize', this.updateOverflow)
+  }
+
   updateOverflow () {
+    if (!this.props.children) {
+      return
+    }
+
     const state = { isOverflow: false }
     if (this.ref.current.offsetWidth < this.ref.current.scrollWidth) {
       state.isOverflow = true
@@ -26,25 +42,28 @@ class FieldValue extends React.Component {
     }
   }
 
-  componentDidMount () {
-    window.addEventListener('resize', this.updateOverflow)
-    this.updateOverflow()
-  }
-
-  componentWillUnmount () {
-    window.removeEventListener('resize', this.updateOverflow)
-  }
   render () {
-    const { children, tooltip } = this.props
-    return <span className={style['field-value']} title={this.state.isOverflow ? tooltip : ''} ref={this.ref}>
-      {children}
-    </span>
+    const { className, id, children, tooltip } = this.props
+
+    if (children) {
+      return <span
+        className={classnames(style['field-value'], className)}
+        id={id}
+        title={this.state.isOverflow ? tooltip : ''}
+        ref={this.ref}
+      >
+        {children}
+      </span>
+    }
+    return null
   }
 }
 
-FieldValue.propTypes = {
-  children: PropTypes.oneOfType([ PropTypes.string, PropTypes.node ]).isRequired,
-  tooltip: PropTypes.string.isRequired,
+EllipsisValue.propTypes = {
+  className: PropTypes.string,
+  id: PropTypes.string,
+  children: xor(PropTypes.oneOfType([ PropTypes.string, PropTypes.node ]), 'tooltip'),
+  tooltip: xor(PropTypes.string, 'children'),
 }
 
-export default FieldValue
+export default EllipsisValue

src/components/EllipsisValue/style.css

@@ -0,0 +1,5 @@
+.field-value {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}

src/components/OptionsDialog/actions.js

@@ -31,8 +31,5 @@ export function getSSHKey ({ userId }) {
 }
 
 export function setUnloaded () {
-  return {
-    type: SET_UNLOADED,
-    payload: {},
-  }
+  return { type: SET_UNLOADED }
 }

src/components/VmDetails/cards/DetailsCard/index.js

@@ -31,15 +31,14 @@ import SelectBox from '../../../SelectBox'
 import BaseCard from '../../BaseCard'
 
 import { Grid, Row, Col } from '_/components/Grid'
-import CloudInit from './CloudInit'
+import EllipsisValue from '_/components/EllipsisValue'
+import ExpandCollapseSection from '_/components/ExpandCollapseSection'
 
 import style from './style.css'
 
+import CloudInit from './CloudInit'
 import HotPlugChangeConfirmationModal from './HotPlugConfirmationModal'
 import NextRunChangeConfirmationModal from './NextRunChangeConfirmationModal'
-
-import ExpandCollapseSection from '../../../ExpandCollapseSection'
-import FieldValue from './FieldValue'
 import FieldRow from './FieldRow'
 
 /*
@@ -723,7 +722,7 @@ class DetailsCard extends React.Component {
                 <Col className={style['fields-column']}>
                   <Grid>
                     <FieldRow label={msg.host()} id={`${idPrefix}-host`}>
-                      { <FieldValue tooltip={hostName}>{hostName}</FieldValue> || <NotAvailable tooltip={msg.notAvailableUntilRunning()} id={`${idPrefix}-host-not-available`} /> }
+                      { <EllipsisValue tooltip={hostName}>{hostName}</EllipsisValue> || <NotAvailable tooltip={msg.notAvailableUntilRunning()} id={`${idPrefix}-host-not-available`} /> }
                     </FieldRow>
                     <FieldRow label={msg.ipAddress()} id={`${idPrefix}-ip`}>
                       <React.Fragment>
@@ -739,7 +738,7 @@ class DetailsCard extends React.Component {
                       </React.Fragment>
                     </FieldRow>
                     <FieldRow label={msg.fqdn()} id={`${idPrefix}-fqdn`}>
-                      { <FieldValue tooltip={fqdn}>{fqdn}</FieldValue> || <NotAvailable tooltip={msg.notAvailableUntilRunningAndGuestAgent()} id={`${idPrefix}-fqdn-not-available`} /> }
+                      { <EllipsisValue tooltip={fqdn}>{fqdn}</EllipsisValue> || <NotAvailable tooltip={msg.notAvailableUntilRunningAndGuestAgent()} id={`${idPrefix}-fqdn-not-available`} /> }
                     </FieldRow>
                     <FieldRow label={msg.cluster()} id={`${idPrefix}-cluster`}>
                       { !isFullEdit && clusterName }
@@ -775,10 +774,10 @@ class DetailsCard extends React.Component {
                       { templateName }
                     </FieldRow>
                     <FieldRow label={isEditing ? msg.changeCd() : msg.cd()} id={`${idPrefix}-cdrom`}>
-                      { !isEditing && <FieldValue tooltip={cdImageName}>{cdImageName}</FieldValue> }
+                      { !isEditing && <EllipsisValue tooltip={cdImageName}>{cdImageName}</EllipsisValue> }
                       { isEditing && !canChangeCd &&
                         <div>
-                          <FieldValue tooltip={cdImageName}>{cdImageName}</FieldValue>
+                          <EllipsisValue tooltip={cdImageName}>{cdImageName}</EllipsisValue>
                           <FieldLevelHelp disabled={false} content={msg.cdCanOnlyChangeWhenVmRunning()} inline />
                         </div>
                       }

src/components/VmDetails/cards/DetailsCard/style.css

@@ -53,12 +53,6 @@
   display: inline-block;
 }
 
-.field-value {
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
 button.field-level-help:global(.popover-pf-info) {
   flex-grow: 0;
 }