From bea677d3de87e1b424c3b080a32ce0f76c801e1a Mon Sep 17 00:00:00 2001
From: CD Cabrera <ccabrera@redhat.com>
Date: Mon, 11 Mar 2019 14:32:08 -0400
Subject: [PATCH 1/3] feat(createScanDialog): issues/1 scan creation options

* build, react framework updates
* styles, forms clean up, touchspin form adjustments
* apiConstants, organize, submit scanName, scanSources added
* scanActions, duplicate action addStartScan, associated constant
* scansEditReducer, link scanAction, addStartScan, hide show modal type
* sources view, move lifecycle concepts to sourcesReducer state
* sourcesListItem, restructure and testing updates
* redux actions, constants, reducers clean up and testing updates
* touchspin, component added
* createScanDialog, added scan creation options
---
 package.json                                  |   4 +-
 src/components/app.js                         |   2 +
 .../createScanDialog.test.js.snap             | 265 ++++++++--
 .../createScanDialog/createScanDialog.js      | 464 +++++++++++-------
 .../sourceConstants.test.js.snap              |  59 +++
 .../__snapshots__/sources.test.js.snap        | 216 ++++++++
 .../sourcesListItem.test.js.snap              |  16 +-
 .../sources/__tests__/sourceConstants.test.js |  11 +
 .../sources/__tests__/sources.test.js         |  65 +++
 .../sources/__tests__/sourcesListItem.test.js |  33 +-
 src/components/sources/sourceListItem.js      | 158 +++---
 src/components/sources/sources.js             | 234 +++------
 .../__snapshots__/touchspin.test.js.snap      |  76 +++
 .../touchspin/__tests__/touchspin.test.js     |  34 ++
 src/components/touchspin/touchspin.js         | 191 +++++++
 .../__snapshots__/apiConstants.test.js.snap   |  80 +++
 src/constants/apiConstants.js                 |  90 +++-
 .../credentialsActions.test.js.snap           |   3 +
 .../__snapshots__/scansActions.test.js.snap   |   9 +
 .../__snapshots__/sourcesActions.test.js.snap |   7 +
 .../__tests__/credentialsActions.test.js      |   8 +-
 .../actions/__tests__/scansActions.test.js    |  43 +-
 .../actions/__tests__/sourcesActions.test.js  |  24 +-
 src/redux/actions/scansActions.js             |   7 +
 .../__snapshots__/index.test.js.snap          |  20 +-
 src/redux/constants/scansConstants.js         |  27 +-
 src/redux/constants/sourcesConstants.js       |   2 +-
 .../scansEditReducer.test.js.snap             | 129 +++++
 .../__snapshots__/scansReducer.test.js.snap   | 272 ----------
 .../__snapshots__/sourcesReducer.test.js.snap | 168 +------
 .../__tests__/scansEditReducer.test.js        |  83 ++++
 .../reducers/__tests__/scansReducer.test.js   |   5 +-
 .../reducers/__tests__/sourcesReducer.test.js |  20 +-
 src/redux/reducers/index.js                   |   3 +
 src/redux/reducers/scansEditReducer.js        | 133 +++++
 src/redux/reducers/scansReducer.js            |  56 ---
 src/redux/reducers/sourcesReducer.js          |  58 +--
 src/styles/entitlements/_common.scss          |   5 +
 src/styles/entitlements/_forms.scss           |  35 ++
 src/styles/entitlements/_views.scss           |  10 -
 yarn.lock                                     |  28 +-
 41 files changed, 2059 insertions(+), 1094 deletions(-)
 create mode 100644 src/components/sources/__tests__/__snapshots__/sourceConstants.test.js.snap
 create mode 100644 src/components/sources/__tests__/__snapshots__/sources.test.js.snap
 create mode 100644 src/components/sources/__tests__/sourceConstants.test.js
 create mode 100644 src/components/sources/__tests__/sources.test.js
 create mode 100644 src/components/touchspin/__tests__/__snapshots__/touchspin.test.js.snap
 create mode 100644 src/components/touchspin/__tests__/touchspin.test.js
 create mode 100644 src/components/touchspin/touchspin.js
 create mode 100644 src/redux/actions/__tests__/__snapshots__/credentialsActions.test.js.snap
 create mode 100644 src/redux/actions/__tests__/__snapshots__/scansActions.test.js.snap
 create mode 100644 src/redux/actions/__tests__/__snapshots__/sourcesActions.test.js.snap
 create mode 100644 src/redux/reducers/__tests__/__snapshots__/scansEditReducer.test.js.snap
 create mode 100644 src/redux/reducers/__tests__/scansEditReducer.test.js
 create mode 100644 src/redux/reducers/scansEditReducer.js

diff --git a/package.json b/package.json
index 770468b3..062295b4 100644
--- a/package.json
+++ b/package.json
@@ -90,9 +90,9 @@
     "patternfly": "3.55.0",
     "patternfly-react": "^2.24.3",
     "prop-types": "^15.6.2",
-    "react": "^16.5.1",
+    "react": "^16.8.4",
     "react-bootstrap": "^0.32.4",
-    "react-dom": "^16.5.1",
+    "react-dom": "^16.8.4",
     "react-infinite-scroller": "^1.2.1",
     "react-redux": "^5.0.7",
     "react-router": "^4.3.1",
diff --git a/src/components/app.js b/src/components/app.js
index 9a7e4aeb..9536e964 100644
--- a/src/components/app.js
+++ b/src/components/app.js
@@ -9,6 +9,7 @@ import helpers from '../common/helpers';
 import AboutModal from './aboutModal/aboutModal';
 import AddSourceWizard from './addSourceWizard/addSourceWizard';
 import CreateCredentialDialog from './createCredentialDialog/createCredentialDialog';
+import CreateScanDialog from './createScanDialog/createScanDialog';
 import Content from './content/content';
 import ToastNotificationsList from './toastNotificationsList/toastNotificationsList';
 import ConfirmationModal from './confirmationModal/confirmationModal';
@@ -127,6 +128,7 @@ class App extends React.Component {
           <AboutModal />
           <AddSourceWizard />
           <CreateCredentialDialog />
+          <CreateScanDialog />
         </div>
       </div>
     );
diff --git a/src/components/createScanDialog/__tests__/__snapshots__/createScanDialog.test.js.snap b/src/components/createScanDialog/__tests__/__snapshots__/createScanDialog.test.js.snap
index 03f31acc..f4fde57f 100644
--- a/src/components/createScanDialog/__tests__/__snapshots__/createScanDialog.test.js.snap
+++ b/src/components/createScanDialog/__tests__/__snapshots__/createScanDialog.test.js.snap
@@ -20,41 +20,38 @@ exports[`CreateScanDialog Component should render a basic component 1`] = `
         class="modal-content"
         role="document"
       >
-        <div
-          class="modal-header"
+        <form
+          class="form-horizontal"
         >
-          <button
-            aria-hidden="true"
-            aria-label="Close"
-            class="close"
-            type="button"
+          <div
+            class="modal-header"
           >
-            <span
+            <button
               aria-hidden="true"
-              class="pficon pficon-close"
-            />
-          </button>
-          <h4
-            class="modal-title"
-          >
-            Scan
-          </h4>
-        </div>
-        <div
-          class="modal-body"
-        />
-        <div
-          class="container-fluid"
-        >
-          <form
-            class="form-horizontal"
+              aria-label="Close"
+              class="close"
+              type="button"
+            >
+              <span
+                aria-hidden="true"
+                class="pficon pficon-close"
+              />
+            </button>
+            <h4
+              class="modal-title"
+            >
+              Scan
+            </h4>
+          </div>
+          <div
+            class="modal-body"
           >
             <div
               class="form-group"
             >
               <label
                 class="col-sm-3 control-label"
-                for="scanName"
+                for="generatedid-"
               >
                 Name
               </label>
@@ -63,7 +60,8 @@ exports[`CreateScanDialog Component should render a basic component 1`] = `
               >
                 <input
                   class="form-control"
-                  id="scanName"
+                  id="generatedid-"
+                  maxlength="256"
                   name="scanName"
                   placeholder="Enter a name for the scan"
                   type="text"
@@ -76,6 +74,7 @@ exports[`CreateScanDialog Component should render a basic component 1`] = `
             >
               <label
                 class="col-sm-3 control-label"
+                for="generatedid-"
               >
                 Sources
               </label>
@@ -84,33 +83,205 @@ exports[`CreateScanDialog Component should render a basic component 1`] = `
               >
                 <textarea
                   class="quipucords-form-control form-control"
+                  id="generatedid-"
+                  name="displayScanSources"
                   readonly=""
-                  rows="1"
-                  type="textarea"
+                  rows="2"
                 >
                   test name
                 </textarea>
               </div>
             </div>
-          </form>
-        </div>
-        <div
-          class="modal-footer"
-        >
-          <button
-            class="btn-cancel btn btn-default"
-            type="button"
-          >
-            Cancel
-          </button>
-          <button
-            class="btn btn-primary"
-            disabled=""
-            type="submit"
+            <div
+              class="form-group"
+            >
+              <label
+                class="col-sm-3 control-label"
+                for="scanConcurrency"
+              >
+                Maximum concurrent scans
+              </label>
+              <div
+                class="col-sm-9"
+              >
+                <span
+                  class="cloudmeter-touchspin cloudmeter-scan-dialog-touchspin input-group"
+                >
+                  <span
+                    class="input-group-btn"
+                  >
+                    <button
+                      aria-hidden="true"
+                      class="cloudmeter-touchspin-min-button form-control btn btn-default"
+                      tabindex="-1"
+                      title="Decrease number input"
+                      type="button"
+                    >
+                      <span
+                        aria-hidden="true"
+                        class="fa fa-minus"
+                      />
+                    </button>
+                  </span>
+                  <input
+                    class="cloudmeter-touchspin-input form-control"
+                    id="scanConcurrency"
+                    name="scanConcurrency"
+                    type="text"
+                    value="50"
+                  />
+                  <span
+                    class="input-group-btn"
+                  >
+                    <button
+                      aria-hidden="true"
+                      class="cloudmeter-touchspin-max-button form-control btn btn-default"
+                      tabindex="-1"
+                      title="Increase number input"
+                      type="button"
+                    >
+                      <span
+                        aria-hidden="true"
+                        class="fa fa-plus"
+                      />
+                    </button>
+                  </span>
+                </span>
+                <span
+                  class="help-block"
+                >
+                  Minimum is 1, maximum is 200
+                </span>
+              </div>
+            </div>
+            <div
+              class="form-group"
+            >
+              <label
+                class="col-sm-3 control-label"
+                for="generatedid-"
+              >
+                Additional products to scan for
+              </label>
+              <div
+                class="col-sm-9"
+              >
+                <div
+                  class="checkbox"
+                >
+                  <label
+                    title=""
+                  >
+                    <input
+                      name="jbossEap"
+                      type="checkbox"
+                    />
+                    <abbr
+                      title="Red Hat JBoss Enterprise Application Platform"
+                    >
+                      JBoss EAP
+                    </abbr>
+                  </label>
+                </div>
+                <div
+                  class="checkbox"
+                >
+                  <label
+                    title=""
+                  >
+                    <input
+                      name="jbossFuse"
+                      type="checkbox"
+                    />
+                    <abbr
+                      title="Red Hat Fuse"
+                    >
+                      Fuse
+                    </abbr>
+                  </label>
+                </div>
+                <div
+                  class="checkbox"
+                >
+                  <label
+                    title=""
+                  >
+                    <input
+                      name="jbossWs"
+                      type="checkbox"
+                    />
+                    <abbr
+                      title="Red Hat JBoss Web Server"
+                    >
+                      JBoss Web Server
+                    </abbr>
+                  </label>
+                </div>
+                <div
+                  class="checkbox"
+                >
+                  <label
+                    title=""
+                  >
+                    <input
+                      name="jbossBrms"
+                      type="checkbox"
+                    />
+                    <abbr
+                      title="Red Hat Decision Manager, formerly Red Hat JBoss BRMS"
+                    >
+                      Decision Manager
+                    </abbr>
+                  </label>
+                </div>
+              </div>
+            </div>
+            <div
+              class="form-group"
+            >
+              <label
+                class="col-sm-3 control-label"
+                for="generatedid-"
+              >
+                Scan alternate directories
+              </label>
+              <div
+                class="col-sm-9"
+              >
+                <textarea
+                  class="vertical-scroll form-control"
+                  disabled=""
+                  id="generatedid-"
+                  name="displayScanDirectories"
+                  placeholder="Optional. Enter values separated by commas"
+                  rows="4"
+                />
+                <span
+                  class="help-block"
+                >
+                  Default directories are /, /opt, /app, /home, /usr
+                </span>
+              </div>
+            </div>
+          </div>
+          <div
+            class="modal-footer"
           >
-            Scan
-          </button>
-        </div>
+            <button
+              class="btn-cancel btn btn-default"
+              type="button"
+            >
+              Cancel
+            </button>
+            <button
+              class="btn btn-primary"
+              disabled=""
+              type="submit"
+            >
+              Scan
+            </button>
+          </div>
+        </form>
       </div>
     </div>
   </div>
diff --git a/src/components/createScanDialog/createScanDialog.js b/src/components/createScanDialog/createScanDialog.js
index a19913d2..c09a2fd8 100644
--- a/src/components/createScanDialog/createScanDialog.js
+++ b/src/components/createScanDialog/createScanDialog.js
@@ -1,202 +1,329 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Alert, Modal, Button, Form, Grid, Icon } from 'patternfly-react';
+import { Modal, Button, Form, Icon, Spinner } from 'patternfly-react';
 import { connect, reduxActions, reduxTypes, store } from '../../redux';
+import { FormState } from '../formState/formState';
+import { FormField, fieldValidation } from '../formField/formField';
+import { TouchSpin } from '../touchspin/touchspin';
 import helpers from '../../common/helpers';
+import apiTypes from '../../constants/apiConstants';
 
 class CreateScanDialog extends React.Component {
-  static validateScanName(scanName) {
-    return scanName && scanName.length > 0;
-  }
-
-  state = {
-    scanName: '',
-    validScanName: false
+  onClose = () => {
+    store.dispatch({
+      type: reduxTypes.scans.EDIT_SCAN_HIDE
+    });
   };
 
-  componentWillReceiveProps(nextProps) {
-    const { show } = this.props;
+  onValidateForm = ({ checked = {}, values = {} }) => {
+    const errors = {};
+
+    errors.scanName = fieldValidation.isEmpty(values.scanName);
 
-    if (nextProps.show && !show) {
-      this.setState({ scanName: '', validScanName: false });
-      store.dispatch({
-        type: reduxTypes.scans.RESET_SCAN_ADD_STATUS
-      });
+    if (!checked.jbossEap && !checked.jbossFuse && !checked.jbossWs && !checked.jbossBrms) {
+      errors.scanDirectories = !fieldValidation.isEmpty(values.scanDirectories);
+    } else {
+      errors.scanDirectories = values.scanDirectories.filter(dir => !/^\//.test(dir)).length > 0;
     }
-  }
 
-  onCreateScan = () => {
-    const { sources, addScan } = this.props;
-    const { scanName } = this.state;
+    return errors;
+  };
+
+  onSubmit = ({ checked, values }) => {
+    const { addScan, startScan } = this.props;
 
-    const data = {
-      name: scanName,
-      sources: sources.map(item => item.id)
+    const scan = {
+      [apiTypes.API_SUBMIT_SCAN_NAME]: values.scanName,
+      [apiTypes.API_SUBMIT_SCAN_SOURCES]: values.scanSources
     };
 
-    addScan(data).then(
-      response => this.notifyAddStatus(false, response.value),
-      error => this.notifyAddStatus(true, error)
+    helpers.setPropIfDefined(
+      scan,
+      [apiTypes.API_SUBMIT_SCAN_OPTIONS, apiTypes.API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY],
+      values.scanConcurrency
     );
-  };
 
-  onUpdateScanName = event => {
-    this.setState({
-      scanName: event.target.value,
-      validScanName: CreateScanDialog.validateScanName(event.target.value)
-    });
-  };
+    helpers.setPropIfDefined(
+      scan,
+      [
+        apiTypes.API_SUBMIT_SCAN_OPTIONS,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_BRMS
+      ],
+      checked.jbossBrms
+    );
+
+    helpers.setPropIfDefined(
+      scan,
+      [
+        apiTypes.API_SUBMIT_SCAN_OPTIONS,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_EAP
+      ],
+      checked.jbossEap
+    );
 
-  onScanNameKeyPress = keyEvent => {
-    const { scanName, validScanName } = this.state;
+    helpers.setPropIfDefined(
+      scan,
+      [
+        apiTypes.API_SUBMIT_SCAN_OPTIONS,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_FUSE
+      ],
+      checked.jbossFuse
+    );
+
+    helpers.setPropIfDefined(
+      scan,
+      [
+        apiTypes.API_SUBMIT_SCAN_OPTIONS,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_WS
+      ],
+      checked.jbossWs
+    );
 
-    if (keyEvent.key === 'Enter' && scanName && validScanName) {
-      keyEvent.stopPropagation();
-      keyEvent.preventDefault();
-      this.onCreateScan();
+    if (checked.jbossEap || checked.jbossFuse || checked.jbossWs || checked.jbossBrms) {
+      scan[apiTypes.API_SUBMIT_SCAN_OPTIONS][apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH][
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS
+      ] = values.scanDirectories;
     }
-  };
 
-  onErrorDismissed = () => {
-    store.dispatch({
-      type: reduxTypes.scans.RESET_SCAN_ADD_STATUS
-    });
+    const addThenStartScan = async data => {
+      const addResponse = await addScan(data);
+      await startScan(addResponse.value.data[apiTypes.API_RESPONSE_SCAN_ID]);
+    };
+
+    addThenStartScan(scan).then(
+      () => {
+        this.onClose();
+
+        store.dispatch({
+          type: reduxTypes.toastNotifications.TOAST_ADD,
+          alertType: 'success',
+          message: (
+            <span>
+              Started scan <strong>{values.scanName}</strong>.
+            </span>
+          )
+        });
+
+        store.dispatch({
+          type: reduxTypes.sources.UPDATE_SOURCES
+        });
+      },
+      () => {
+        const { props } = this;
+
+        if (!props.show) {
+          store.dispatch({
+            type: reduxTypes.toastNotifications.TOAST_ADD,
+            alertType: 'error',
+            header: `Error creating scan ${values.scanName}`,
+            message: props.errorMessage
+          });
+        }
+      }
+    );
   };
 
-  notifyStartStatus(error, results) {
-    const { onClose } = this.props;
-    const { scanName } = this.state;
-
-    if (error) {
-      store.dispatch({
-        type: reduxTypes.toastNotifications.TOAST_ADD,
-        alertType: 'error',
-        header: 'Error',
-        message: helpers.getMessageFromResults(results).message
-      });
-    } else {
-      store.dispatch({
-        type: reduxTypes.toastNotifications.TOAST_ADD,
-        alertType: 'success',
-        message: (
-          <span>
-            Started scan <strong>{scanName}</strong>.
-          </span>
-        )
-      });
-    }
-    onClose(true);
+  renderNameSources({ values, errors, touched, handleOnEvent }) {
+    const { submitErrorMessages } = this.props;
+
+    return (
+      <React.Fragment>
+        <FormField
+          label="Name"
+          error={(touched.scanName && errors.scanName) || submitErrorMessages.scanName}
+          errorMessage={submitErrorMessages.scanName || 'A scan name is required'}
+        >
+          <Form.FormControl
+            type="text"
+            autoFocus
+            name="scanName"
+            value={values.scanName}
+            maxLength={256}
+            placeholder="Enter a name for the scan"
+            onChange={handleOnEvent}
+          />
+        </FormField>
+        <FormField label="Sources" error={submitErrorMessages.scanSources} errorMessage={submitErrorMessages.scanName}>
+          <Form.FormControl
+            className="quipucords-form-control"
+            componentClass="textarea"
+            name="displayScanSources"
+            value={values.displayScanSources}
+            rows={2}
+            readOnly
+          />
+        </FormField>
+      </React.Fragment>
+    );
   }
 
-  startNewScan(newScan) {
-    const { startScan } = this.props;
+  renderConcurrentScans({ values, handleOnEvent }) {
+    const { submitErrorMessages } = this.props;
 
-    startScan(newScan.id).then(
-      response => this.notifyStartStatus(false, response.value),
-      error => this.notifyStartStatus(true, error)
+    return (
+      <FormField
+        label="Maximum concurrent scans"
+        error={submitErrorMessages.scanConcurrency}
+        errorMessage={submitErrorMessages.scanConcurrency}
+        id="scanConcurrency"
+      >
+        <TouchSpin
+          name="scanConcurrency"
+          className="cloudmeter-scan-dialog-touchspin"
+          minValue={1}
+          maxValue={200}
+          value={values.scanConcurrency}
+          onChange={handleOnEvent}
+        />
+        <Form.HelpBlock>Minimum is 1, maximum is 200</Form.HelpBlock>
+      </FormField>
     );
   }
 
-  notifyAddStatus(error, results) {
-    const { scanName } = this.state;
+  renderAdditionalProducts({ checked, errors, handleOnEventCustom, handleOnEvent, touched, values }) {
+    const { submitErrorMessages } = this.props;
 
-    if (error) {
-      store.dispatch({
-        type: reduxTypes.toastNotifications.TOAST_ADD,
-        alertType: 'error',
-        header: 'Error',
-        message: helpers.getMessageFromResults(results).message
-      });
-    } else {
-      store.dispatch({
-        type: reduxTypes.toastNotifications.TOAST_ADD,
-        alertType: 'success',
-        message: (
-          <span>
-            Added scan <strong>{scanName}</strong>.
-          </span>
-        )
-      });
-
-      this.startNewScan(results.data);
-    }
-  }
+    const onCheck = event => {
+      const element = event.target;
+      const isChecked = { ...checked };
 
-  renderErrorMessage() {
-    const { action } = this.props;
+      isChecked[element.name] = element.checked;
 
-    if (action && action.error) {
-      return (
-        <Alert type="error" onDismiss={this.onErrorDismissed}>
-          <strong>Error</strong> {action.errorMessage}
-        </Alert>
-      );
-    }
+      if (!isChecked.jbossEap && !isChecked.jbossFuse && !isChecked.jbossWs && !isChecked.jbossBrms) {
+        handleOnEventCustom([
+          {
+            name: 'scanDirectories',
+            value: []
+          },
+          {
+            name: 'displayScanDirectories',
+            value: ''
+          },
+          {
+            name: element.name,
+            checked: element.checked
+          }
+        ]);
+      } else {
+        handleOnEvent(event);
+      }
+    };
+
+    const onChangeDirectories = event => {
+      const { value } = event.target;
+
+      let updatedDirs = (value || '').replace(/\\n|\\r|\s/g, ',').split(',');
+      updatedDirs = updatedDirs.filter(host => host !== '');
+
+      handleOnEventCustom([
+        {
+          name: 'scanDirectories',
+          value: updatedDirs
+        },
+        {
+          name: 'displayScanDirectories',
+          value
+        }
+      ]);
+    };
 
-    return null;
+    return (
+      <React.Fragment>
+        <FormField label="Additional&nbsp;products to scan for">
+          <Form.Checkbox name="jbossEap" checked={checked.jbossEap} onChange={onCheck}>
+            <abbr title="Red Hat JBoss Enterprise Application Platform">JBoss EAP</abbr>
+          </Form.Checkbox>
+          <Form.Checkbox name="jbossFuse" checked={checked.jbossFuse} onChange={onCheck}>
+            <abbr title="Red Hat Fuse">Fuse</abbr>
+          </Form.Checkbox>
+          <Form.Checkbox name="jbossWs" checked={checked.jbossWs} onChange={onCheck}>
+            <abbr title="Red Hat JBoss Web Server">JBoss Web Server</abbr>
+          </Form.Checkbox>
+          <Form.Checkbox name="jbossBrms" checked={checked.jbossBrms} onChange={onCheck}>
+            <abbr title="Red Hat Decision Manager, formerly Red Hat JBoss BRMS">Decision Manager</abbr>
+          </Form.Checkbox>
+        </FormField>
+        <FormField
+          label="Scan&nbsp;alternate directories"
+          error={(touched.scanDirectories && errors.scanDirectories) || submitErrorMessages.scanDirectories}
+          errorMessage={submitErrorMessages.scanDirectories || `Directories must begin with a root reference (/)`}
+        >
+          <Form.FormControl
+            disabled={!checked.jbossEap && !checked.jbossFuse && !checked.jbossWs && !checked.jbossBrms}
+            componentClass="textarea"
+            name="displayScanDirectories"
+            className="vertical-scroll"
+            value={values.displayScanDirectories}
+            rows={4}
+            placeholder="Optional. Enter values separated by commas"
+            onChange={onChangeDirectories}
+          />
+          <Form.HelpBlock>Default directories are /, /opt, /app, /home, /usr</Form.HelpBlock>
+        </FormField>
+      </React.Fragment>
+    );
   }
 
   render() {
-    const { show, sources, onClose } = this.props;
-    const { scanName, validScanName } = this.state;
+    const { pending, show, sources } = this.props;
 
     if (!sources || sources.length === 0 || !sources[0]) {
       return null;
     }
 
     return (
-      <Modal show={show} onHide={onClose}>
-        <Modal.Header>
-          <button type="button" className="close" onClick={onClose} aria-hidden="true" aria-label="Close">
-            <Icon type="pf" name="close" />
-          </button>
-          <Modal.Title>Scan</Modal.Title>
-        </Modal.Header>
-        <Modal.Body />
-        <Grid fluid>
-          {this.renderErrorMessage()}
-          <Form horizontal onSubmit={this.onCreateScan}>
-            <Form.FormGroup controlId="scanName">
-              <Grid.Col componentClass={Form.ControlLabel} sm={3}>
-                Name
-              </Grid.Col>
-              <Grid.Col sm={9}>
-                <Form.FormControl
-                  type="text"
-                  name="scanName"
-                  autoFocus
-                  value={scanName}
-                  placeholder="Enter a name for the scan"
-                  onChange={e => this.onUpdateScanName(e)}
-                  onKeyPress={e => this.onScanNameKeyPress(e)}
-                />
-              </Grid.Col>
-            </Form.FormGroup>
-            <Form.FormGroup>
-              <Grid.Col componentClass={Form.ControlLabel} sm={3}>
-                Sources
-              </Grid.Col>
-              <Grid.Col sm={9}>
-                <Form.FormControl
-                  className="quipucords-form-control"
-                  componentClass="textarea"
-                  type="textarea"
-                  readOnly
-                  rows={sources.length}
-                  value={sources.map(item => item.name).join('\n')}
-                />
-              </Grid.Col>
-            </Form.FormGroup>
-          </Form>
-        </Grid>
-        <Modal.Footer>
-          <Button bsStyle="default" className="btn-cancel" onClick={onClose}>
-            Cancel
-          </Button>
-          <Button bsStyle="primary" type="submit" onClick={this.onCreateScan} disabled={!validScanName}>
-            Scan
-          </Button>
-        </Modal.Footer>
+      <Modal show={show} onHide={this.onClose}>
+        <FormState
+          validateOnMount
+          setValues={{
+            displayScanDirectories: '',
+            displayScanSources: sources.map(item => item.name).join(', '),
+            scanConcurrency: 50,
+            scanDirectories: [],
+            jbossEap: false,
+            jbossFuse: false,
+            jbossWs: false,
+            jbossBrms: false,
+            scanName: '',
+            scanSources: sources.map(item => item.id)
+          }}
+          validate={this.onValidateForm}
+          onSubmit={this.onSubmit}
+        >
+          {({ handleOnSubmit, isValid, ...options }) => (
+            <Form horizontal onSubmit={handleOnSubmit}>
+              <Modal.Header>
+                <button type="button" className="close" onClick={this.onClose} aria-hidden="true" aria-label="Close">
+                  <Icon type="pf" name="close" />
+                </button>
+                <Modal.Title>Scan</Modal.Title>
+              </Modal.Header>
+              <Modal.Body>
+                {pending && (
+                  <React.Fragment>
+                    <Spinner loading size="lg" className="blank-slate-pf-icon" />
+                    <div className="text-center">Scan updating...</div>
+                  </React.Fragment>
+                )}
+                {!pending && this.renderNameSources(options)}
+                {!pending && this.renderConcurrentScans(options)}
+                {!pending && this.renderAdditionalProducts(options)}
+              </Modal.Body>
+              <Modal.Footer>
+                <Button bsStyle="default" className="btn-cancel" onClick={this.onClose}>
+                  Cancel
+                </Button>
+                <Button bsStyle="primary" type="submit" disabled={!isValid}>
+                  Scan
+                </Button>
+              </Modal.Footer>
+            </Form>
+          )}
+        </FormState>
       </Modal>
     );
   }
@@ -204,27 +331,32 @@ class CreateScanDialog extends React.Component {
 
 CreateScanDialog.propTypes = {
   addScan: PropTypes.func,
-  startScan: PropTypes.func,
+  pending: PropTypes.bool,
   show: PropTypes.bool.isRequired,
   sources: PropTypes.array,
-  onClose: PropTypes.func,
-  action: PropTypes.object
+  startScan: PropTypes.func,
+  submitErrorMessages: PropTypes.shape({
+    scanConcurrency: PropTypes.string,
+    scanDirectories: PropTypes.string,
+    scanName: PropTypes.string,
+    scanSources: PropTypes.string
+  })
 };
 
 CreateScanDialog.defaultProps = {
   addScan: helpers.noop,
-  startScan: helpers.noop,
+  pending: false,
   sources: [],
-  onClose: helpers.noop,
-  action: {}
+  startScan: helpers.noop,
+  submitErrorMessages: {}
 };
 
 const mapDispatchToProps = dispatch => ({
   addScan: data => dispatch(reduxActions.scans.addScan(data)),
-  startScan: data => dispatch(reduxActions.scans.startScan(data))
+  startScan: data => dispatch(reduxActions.scans.addStartScan(data))
 });
 
-const mapStateToProps = state => ({ action: state.scans.action });
+const mapStateToProps = state => ({ ...state.scansEdit });
 
 const ConnectedCreateScanDialog = connect(
   mapStateToProps,
diff --git a/src/components/sources/__tests__/__snapshots__/sourceConstants.test.js.snap b/src/components/sources/__tests__/__snapshots__/sourceConstants.test.js.snap
new file mode 100644
index 00000000..1fa9dc90
--- /dev/null
+++ b/src/components/sources/__tests__/__snapshots__/sourceConstants.test.js.snap
@@ -0,0 +1,59 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SourceTypes Should have specific sourceFilterFields properties: sourceFilterFields 1`] = `
+Array [
+  Object {
+    "filterType": "text",
+    "id": "search_by_name",
+    "placeholder": "Filter by Name",
+    "title": "Name",
+  },
+  Object {
+    "filterType": "text",
+    "id": "search_credentials_by_name",
+    "placeholder": "Filter by Credential Name",
+    "title": "Credential",
+  },
+  Object {
+    "filterType": "select",
+    "filterValues": Array [
+      Object {
+        "id": "network",
+        "title": "Network",
+      },
+      Object {
+        "id": "satellite",
+        "title": "Satellite",
+      },
+      Object {
+        "id": "vcenter",
+        "title": "VCenter",
+      },
+    ],
+    "id": "source_type",
+    "placeholder": "Filter by Source Type",
+    "title": "Source Type",
+  },
+]
+`;
+
+exports[`SourceTypes Should have specific sourceSortFields properties: sourceSortFields 1`] = `
+Array [
+  Object {
+    "id": "name",
+    "isNumeric": false,
+    "title": "Name",
+  },
+  Object {
+    "id": "source_type",
+    "isNumeric": false,
+    "title": "Source Type",
+  },
+  Object {
+    "id": "most_recent_connect_scan__start_time",
+    "isNumeric": true,
+    "sortAscending": false,
+    "title": "Most Recent",
+  },
+]
+`;
diff --git a/src/components/sources/__tests__/__snapshots__/sources.test.js.snap b/src/components/sources/__tests__/__snapshots__/sources.test.js.snap
new file mode 100644
index 00000000..ea0be91a
--- /dev/null
+++ b/src/components/sources/__tests__/__snapshots__/sources.test.js.snap
@@ -0,0 +1,216 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Sources Component should render a connected component with default props: connected 1`] = `
+<Sources
+  error={false}
+  errorMessage={null}
+  fulfilled={false}
+  getSources={[Function]}
+  lastRefresh={0}
+  pending={false}
+  sources={Array []}
+  updateSources={false}
+  viewOptions={Object {}}
+/>
+`;
+
+exports[`Sources Component should render a non-connected component in error state: error 1`] = `
+<div
+  class="blank-slate-pf"
+>
+  <div
+    class="alert alert-danger"
+  >
+    <span
+      aria-hidden="true"
+      class="pficon pficon-error-circle-o"
+    />
+    <span>
+      Error retrieving sources: 
+    </span>
+  </div>
+</div>
+`;
+
+exports[`Sources Component should render a non-connected component in fulfilled state: fulfilled 1`] = `
+<div
+  className="quipucords-view-container"
+>
+  <ViewToolbar
+    actions={
+      <div
+        className="form-group"
+      >
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="primary"
+          disabled={false}
+          onClick={[Function]}
+        >
+          Add
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="default"
+          disabled={true}
+          onClick={[Function]}
+        >
+          Scan
+        </Button>
+      </div>
+    }
+    activeFilters={Array []}
+    filterFields={
+      Array [
+        Object {
+          "filterType": "text",
+          "id": "search_by_name",
+          "placeholder": "Filter by Name",
+          "title": "Name",
+        },
+        Object {
+          "filterType": "text",
+          "id": "search_credentials_by_name",
+          "placeholder": "Filter by Credential Name",
+          "title": "Credential",
+        },
+        Object {
+          "filterType": "select",
+          "filterValues": Array [
+            Object {
+              "id": "network",
+              "title": "Network",
+            },
+            Object {
+              "id": "satellite",
+              "title": "Satellite",
+            },
+            Object {
+              "id": "vcenter",
+              "title": "VCenter",
+            },
+          ],
+          "id": "source_type",
+          "placeholder": "Filter by Source Type",
+          "title": "Source Type",
+        },
+      ]
+    }
+    filterType={Object {}}
+    filterValue=""
+    itemsType="Source"
+    itemsTypePlural="Sources"
+    lastRefresh={0}
+    onRefresh={[Function]}
+    selectedCount={0}
+    selectedItems={Array []}
+    sortAscending={true}
+    sortFields={
+      Array [
+        Object {
+          "id": "name",
+          "isNumeric": false,
+          "title": "Name",
+        },
+        Object {
+          "id": "source_type",
+          "isNumeric": false,
+          "title": "Source Type",
+        },
+        Object {
+          "id": "most_recent_connect_scan__start_time",
+          "isNumeric": true,
+          "sortAscending": false,
+          "title": "Most Recent",
+        },
+      ]
+    }
+    sortType={Object {}}
+    totalCount={0}
+    viewType="SOURCES_VIEW"
+  />
+  <ViewPaginationRow
+    currentPage={0}
+    pageSize={0}
+    selectedItems={Array []}
+    totalCount={0}
+    totalPages={0}
+    viewType="SOURCES_VIEW"
+  />
+  <div
+    className="quipucords-list-container"
+  >
+    <ListView
+      className="quipicords-list-view"
+    >
+      <Connect(SourceListItem)
+        item={
+          Object {
+            "id": "1",
+            "name": "lorem",
+          }
+        }
+        key="1"
+        lastRefresh={0}
+      />
+    </ListView>
+  </div>
+</div>
+`;
+
+exports[`Sources Component should render a non-connected component in pending state: pending 1`] = `
+<div
+  class="quipucords-view-container"
+/>
+`;
+
+exports[`Sources Component should render a non-connected component with empty state: empty state 1`] = `
+<div
+  class="container-fluid"
+>
+  <div
+    class="row"
+  >
+    <div
+      class="blank-slate-pf full-page-blank-slate"
+    >
+      <div
+        class="blank-slate-pf-icon"
+      >
+        <span
+          aria-hidden="true"
+          class="pficon pficon-add-circle-o"
+        />
+      </div>
+      <h4
+        class="h1 blank-slate-pf-title"
+      >
+        Welcome to  Entitlements Reporting
+      </h4>
+      <p
+        class="blank-slate-pf-info"
+      >
+        Begin by adding one or more sources. A source contains a collection of network information, 
+        <br />
+        including systems management solution information, IP addresses, or host names, in addition to 
+        <br />
+        SSH ports and credentials.
+      </p>
+      <div
+        class="blank-slate-pf-main-action"
+      >
+        <button
+          class="btn btn-lg btn-primary"
+          type="button"
+        >
+          Add Source
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/src/components/sources/__tests__/__snapshots__/sourcesListItem.test.js.snap b/src/components/sources/__tests__/__snapshots__/sourcesListItem.test.js.snap
index dc28ca36..0c3df64d 100644
--- a/src/components/sources/__tests__/__snapshots__/sourcesListItem.test.js.snap
+++ b/src/components/sources/__tests__/__snapshots__/sourcesListItem.test.js.snap
@@ -1,6 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SourceListItem Component should render a basic component 1`] = `
+exports[`SourceListItem Component should render a connected component with default props: connected 1`] = `
+<SourceListItem
+  deleteSource={[Function]}
+  item={
+    Object {
+      "id": 1,
+      "source_type": "network",
+    }
+  }
+  lastRefresh={0}
+  selectedSources={Array []}
+/>
+`;
+
+exports[`SourceListItem Component should render a non-connected component: non-connected 1`] = `
 <div
   class="list-group-item list-view-pf-stacked list-view-pf-top-align"
 >
diff --git a/src/components/sources/__tests__/sourceConstants.test.js b/src/components/sources/__tests__/sourceConstants.test.js
new file mode 100644
index 00000000..802f043b
--- /dev/null
+++ b/src/components/sources/__tests__/sourceConstants.test.js
@@ -0,0 +1,11 @@
+import { SourceFilterFields, SourceSortFields } from '../sourceConstants';
+
+describe('SourceTypes', () => {
+  it('Should have specific sourceFilterFields properties', () => {
+    expect(SourceFilterFields).toMatchSnapshot('sourceFilterFields');
+  });
+
+  it('Should have specific sourceSortFields properties', () => {
+    expect(SourceSortFields).toMatchSnapshot('sourceSortFields');
+  });
+});
diff --git a/src/components/sources/__tests__/sources.test.js b/src/components/sources/__tests__/sources.test.js
new file mode 100644
index 00000000..0dbcadd0
--- /dev/null
+++ b/src/components/sources/__tests__/sources.test.js
@@ -0,0 +1,65 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { mount, shallow } from 'enzyme';
+import { ConnectedSources, Sources } from '../sources';
+import { apiTypes } from '../../../constants/apiConstants';
+
+describe('Sources Component', () => {
+  const generateEmptyStore = (obj = {}) => configureMockStore()(obj);
+
+  it('should render a connected component with default props', () => {
+    const store = generateEmptyStore({ sources: { view: {} }, viewOptions: {} });
+    const component = shallow(<ConnectedSources />, { context: { store } });
+
+    expect(component).toMatchSnapshot('connected');
+  });
+
+  it('should render a non-connected component in error state', () => {
+    const props = {
+      error: true
+    };
+
+    const component = shallow(<Sources {...props} />);
+
+    expect(component.render()).toMatchSnapshot('error');
+  });
+
+  it('should render a non-connected component in pending state', () => {
+    const props = {
+      pending: true,
+      sources: []
+    };
+
+    const component = shallow(<Sources {...props} />);
+
+    expect(component.render()).toMatchSnapshot('pending');
+  });
+
+  it('should render a non-connected component in fulfilled state', () => {
+    const props = {
+      fulfilled: true,
+      sources: [
+        {
+          [apiTypes.API_RESPONSE_SOURCE_ID]: '1',
+          [apiTypes.API_RESPONSE_SOURCE_NAME]: 'lorem'
+        }
+      ],
+      viewOptions: {
+        selectedItems: []
+      }
+    };
+
+    const component = shallow(<Sources {...props} />);
+
+    expect(component).toMatchSnapshot('fulfilled');
+  });
+
+  it('should render a non-connected component with empty state', () => {
+    const props = {};
+
+    const component = mount(<Sources {...props} />);
+
+    expect(component.find('button').length).toEqual(1);
+    expect(component.render()).toMatchSnapshot('empty state');
+  });
+});
diff --git a/src/components/sources/__tests__/sourcesListItem.test.js b/src/components/sources/__tests__/sourcesListItem.test.js
index a579abdc..50d2330d 100644
--- a/src/components/sources/__tests__/sourcesListItem.test.js
+++ b/src/components/sources/__tests__/sourcesListItem.test.js
@@ -1,23 +1,36 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
-import { mount } from 'enzyme';
-import SourceListItem from '../sourceListItem';
-import { viewTypes } from '../../../redux/constants';
+import { mount, shallow } from 'enzyme';
+import { ConnectedSourceListItem, SourceListItem } from '../sourceListItem';
+import { reduxTypes } from '../../../redux';
+import { apiTypes } from '../../../constants/apiConstants';
 
 describe('SourceListItem Component', () => {
-  const generateEmptyStore = () => configureMockStore()({ sources: {}, viewOptions: { [viewTypes.SOURCES_VIEW]: {} } });
+  const generateEmptyStore = (obj = {}) => configureMockStore()(obj);
 
-  it('should render a basic component', () => {
-    const store = generateEmptyStore();
+  it('should render a connected component with default props', () => {
+    const store = generateEmptyStore({ sources: { view: {} }, viewOptions: { [reduxTypes.view.SOURCES_VIEW]: {} } });
     const props = {
       item: {
-        id: 1,
-        source_type: 'network'
+        [apiTypes.API_RESPONSE_SOURCE_ID]: 1,
+        [apiTypes.API_RESPONSE_SOURCE_SOURCE_TYPE]: 'network'
       }
     };
+    const component = shallow(<ConnectedSourceListItem {...props} />, { context: { store } });
 
-    const component = mount(<SourceListItem {...props} />, { context: { store } });
+    expect(component).toMatchSnapshot('connected');
+  });
+
+  it('should render a non-connected component', () => {
+    const props = {
+      item: {
+        [apiTypes.API_RESPONSE_SOURCE_ID]: 1,
+        [apiTypes.API_RESPONSE_SOURCE_SOURCE_TYPE]: 'network'
+      }
+    };
+
+    const component = mount(<SourceListItem {...props} />);
 
-    expect(component.render()).toMatchSnapshot();
+    expect(component.render()).toMatchSnapshot('non-connected');
   });
 });
diff --git a/src/components/sources/sourceListItem.js b/src/components/sources/sourceListItem.js
index bed03ddc..594eef1a 100644
--- a/src/components/sources/sourceListItem.js
+++ b/src/components/sources/sourceListItem.js
@@ -4,29 +4,25 @@ import cx from 'classnames';
 import { Button, Checkbox, Grid, Icon, ListView } from 'patternfly-react';
 import _find from 'lodash/find';
 import _get from 'lodash/get';
-import _isEqual from 'lodash/isEqual';
 import _size from 'lodash/size';
 import * as moment from 'moment';
-import { connect, reduxTypes, store } from '../../redux';
+import { connect, reduxActions, reduxTypes, store } from '../../redux';
 import { helpers } from '../../common/helpers';
 import { dictionary } from '../../constants/dictionaryConstants';
 import SourceCredentialsList from './sourceCredentialsList';
 import ScanHostList from '../scanHostList/scanHostList';
 import ToolTip from '../tooltip/tooltip';
 import ListStatusItem from '../listStatusItem/listStatusItem';
+import { apiTypes } from '../../constants/apiConstants';
 
 class SourceListItem extends React.Component {
   static isSelected(item, selectedSources) {
     return _find(selectedSources, nextSelected => nextSelected.id === item.id) !== undefined;
   }
 
-  componentWillReceiveProps(nextProps) {
-    const { lastRefresh } = this.props;
-    // Check for changes resulting in a fetch
-    if (!_isEqual(nextProps.lastRefresh, lastRefresh)) {
-      this.closeExpandIfNoData(this.expandType());
-    }
-  }
+  state = {
+    expandType: null
+  };
 
   onItemSelectChange = () => {
     const { item, selectedSources } = this.props;
@@ -40,52 +36,80 @@ class SourceListItem extends React.Component {
     });
   };
 
-  onToggleExpand = expandType => {
-    const { item } = this.props;
+  onToggleExpand = toggleExpandType => {
+    const { expandType } = this.state;
+    const toggle = expandType === toggleExpandType ? null : toggleExpandType;
 
-    if (expandType === this.expandType()) {
-      store.dispatch({
-        type: reduxTypes.view.EXPAND_ITEM,
-        viewType: reduxTypes.view.SOURCES_VIEW,
-        item
-      });
-    } else {
-      store.dispatch({
-        type: reduxTypes.view.EXPAND_ITEM,
-        viewType: reduxTypes.view.SOURCES_VIEW,
-        item,
-        expandType
-      });
-    }
+    this.setState({ expandType: toggle });
   };
 
   onCloseExpand = () => {
-    const { item } = this.props;
-    store.dispatch({
-      type: reduxTypes.view.EXPAND_ITEM,
-      viewType: reduxTypes.view.SOURCES_VIEW,
-      item
-    });
+    this.setState({ expandType: null });
   };
 
-  expandType() {
-    const { item, expandedSources } = this.props;
+  onDelete = source => {
+    const { deleteSource } = this.props;
 
-    return _get(_find(expandedSources, nextExpanded => nextExpanded.id === item.id), 'expandType');
-  }
+    const onConfirm = () => {
+      store.dispatch({
+        type: reduxTypes.confirmationModal.CONFIRMATION_MODAL_HIDE
+      });
 
-  closeExpandIfNoData(expandType) {
-    const { item } = this.props;
+      deleteSource(source[apiTypes.API_RESPONSE_SOURCE_ID]).then(
+        () => {
+          store.dispatch({
+            type: reduxTypes.toastNotifications.TOAST_ADD,
+            alertType: 'success',
+            message: (
+              <span>
+                Deleted source <strong>{source[apiTypes.API_RESPONSE_SOURCE_NAME]}</strong>.
+              </span>
+            )
+          });
+
+          store.dispatch({
+            type: reduxTypes.view.DESELECT_ITEM,
+            viewType: reduxTypes.view.SOURCES_VIEW,
+            item: source
+          });
+        },
+        error => {
+          store.dispatch({
+            type: reduxTypes.toastNotifications.TOAST_ADD,
+            alertType: 'error',
+            header: 'Error',
+            message: helpers.getMessageFromResults(error).message
+          });
+        }
+      );
+    };
 
-    if (expandType === 'okHosts' || expandType === 'failedHosts') {
-      const okHostCount = _get(item, 'connection.source_systems_scanned', 0);
-      const failedHostCount = _get(item, 'connection.source_systems_failed', 0);
+    store.dispatch({
+      type: reduxTypes.confirmationModal.CONFIRMATION_MODAL_SHOW,
+      title: 'Delete Source',
+      heading: (
+        <span>
+          Are you sure you want to delete the source <strong>{source[apiTypes.API_RESPONSE_SOURCE_NAME]}</strong>?
+        </span>
+      ),
+      confirmButtonText: 'Delete',
+      onConfirm
+    });
+  };
 
-      if ((expandType === 'okHosts' && okHostCount === 0) || (expandType === 'failedHosts' && failedHostCount === 0)) {
-        this.onCloseExpand();
-      }
-    }
-  }
+  onEdit = source => {
+    store.dispatch({
+      type: reduxTypes.sources.EDIT_SOURCE_SHOW,
+      source
+    });
+  };
+
+  onScan = source => {
+    store.dispatch({
+      type: reduxTypes.scans.EDIT_SCAN_SHOW,
+      sources: [source]
+    });
+  };
 
   renderSourceType() {
     const { item } = this.props;
@@ -99,31 +123,29 @@ class SourceListItem extends React.Component {
   }
 
   renderActions() {
-    const { item, onEdit, onDelete, onScan } = this.props;
+    const { item } = this.props;
 
     return (
       <span>
         <ToolTip tooltip="Edit">
-          <Button onClick={() => onEdit(item)} bsStyle="link" key="editButton">
+          <Button onClick={() => this.onEdit(item)} bsStyle="link">
             <Icon type="pf" name="edit" aria-label="Edit" />
           </Button>
         </ToolTip>
         <ToolTip tooltip="Delete">
-          <Button onClick={() => onDelete(item)} bsStyle="link" key="removeButton">
+          <Button onClick={() => this.onDelete(item)} bsStyle="link">
             <Icon type="pf" name="delete" aria-label="Delete" />
           </Button>
         </ToolTip>
-        <Button onClick={() => onScan(item)} key="scanButton">
-          Scan
-        </Button>
+        <Button onClick={() => this.onScan(item)}>Scan</Button>
       </span>
     );
   }
 
   renderStatusItems() {
+    const { expandType } = this.state;
     const { item } = this.props;
 
-    const expandType = this.expandType();
     const credentialCount = _size(_get(item, 'credentials', []));
     let okHostCount = _get(item, 'connection.source_systems_scanned', 0);
     let failedHostCount = _get(item, 'connection.source_systems_failed', 0);
@@ -210,9 +232,10 @@ class SourceListItem extends React.Component {
   }
 
   renderExpansionContents() {
+    const { expandType } = this.state;
     const { item, lastRefresh } = this.props;
 
-    switch (this.expandType()) {
+    switch (expandType) {
       case 'okHosts':
         return (
           <ScanHostList
@@ -351,6 +374,7 @@ class SourceListItem extends React.Component {
   }
 
   render() {
+    const { expandType } = this.state;
     const { item, selectedSources } = this.props;
     const selected = SourceListItem.isSelected(item, selectedSources);
 
@@ -368,7 +392,7 @@ class SourceListItem extends React.Component {
         description={this.renderDescription()}
         additionalInfo={this.renderStatusItems()}
         compoundExpand
-        compoundExpanded={this.expandType() !== undefined}
+        compoundExpanded={expandType !== null}
         onCloseCompoundExpand={this.onCloseExpand}
       >
         {this.renderExpansionContents()}
@@ -378,30 +402,30 @@ class SourceListItem extends React.Component {
 }
 
 SourceListItem.propTypes = {
+  deleteSource: PropTypes.func,
   item: PropTypes.object.isRequired,
   lastRefresh: PropTypes.number,
-  onEdit: PropTypes.func,
-  onDelete: PropTypes.func,
-  onScan: PropTypes.func,
-  selectedSources: PropTypes.array,
-  expandedSources: PropTypes.array
+  selectedSources: PropTypes.array
 };
 
 SourceListItem.defaultProps = {
+  deleteSource: helpers.noop,
   lastRefresh: 0,
-  onEdit: helpers.noop,
-  onDelete: helpers.noop,
-  onScan: helpers.noop,
-  selectedSources: [],
-  expandedSources: []
+  selectedSources: []
 };
 
+const mapDispatchToProps = dispatch => ({
+  deleteSource: id => dispatch(reduxActions.sources.deleteSource(id))
+});
+
 const mapStateToProps = state =>
   Object.assign({
-    selectedSources: state.viewOptions[reduxTypes.view.SOURCES_VIEW].selectedItems,
-    expandedSources: state.viewOptions[reduxTypes.view.SOURCES_VIEW].expandedItems
+    selectedSources: state.viewOptions[reduxTypes.view.SOURCES_VIEW].selectedItems
   });
 
-const ConnectedSourceListItem = connect(mapStateToProps)(SourceListItem);
+const ConnectedSourceListItem = connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(SourceListItem);
 
 export { ConnectedSourceListItem as default, ConnectedSourceListItem, SourceListItem };
diff --git a/src/components/sources/sources.js b/src/components/sources/sources.js
index d8eb4131..666b9e09 100644
--- a/src/components/sources/sources.js
+++ b/src/components/sources/sources.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Alert, Button, EmptyState, ListView, Modal } from 'patternfly-react';
-import _get from 'lodash/get';
+import { Alert, Button, EmptyState, ListView, Modal, Spinner } from 'patternfly-react';
 import _size from 'lodash/size';
 import { connect, reduxActions, reduxTypes, store } from '../../redux';
 import helpers from '../../common/helpers';
@@ -9,66 +8,21 @@ import ViewToolbar from '../viewToolbar/viewToolbar';
 import ViewPaginationRow from '../viewPaginationRow/viewPaginationRow';
 import SourcesEmptyState from './sourcesEmptyState';
 import SourceListItem from './sourceListItem';
-import CreateScanDialog from '../createScanDialog/createScanDialog';
 import { SourceFilterFields, SourceSortFields } from './sourceConstants';
+import { apiTypes } from '../../constants/apiConstants';
 
 class Sources extends React.Component {
-  static notifyDeleteStatus(item, error, results) {
-    try {
-      if (error) {
-        store.dispatch({
-          type: reduxTypes.toastNotifications.TOAST_ADD,
-          alertType: 'error',
-          header: 'Error',
-          message: helpers.getMessageFromResults(results).message
-        });
-      } else {
-        store.dispatch({
-          type: reduxTypes.toastNotifications.TOAST_ADD,
-          alertType: 'success',
-          message: (
-            <span>
-              Deleted source <strong>{_get(item, 'name')}</strong>.
-            </span>
-          )
-        });
-
-        store.dispatch({
-          type: reduxTypes.view.DESELECT_ITEM,
-          viewType: reduxTypes.view.SOURCES_VIEW,
-          item
-        });
-      }
-    } catch (e) {
-      console.warn(e);
-    }
-  }
-
-  state = {
-    scanDialogShown: false,
-    multiSourceScan: false,
-    currentScanSource: null,
-    lastRefresh: null
-  };
-
   componentDidMount() {
-    this.onRefresh();
-  }
+    const { getSources, viewOptions } = this.props;
 
-  componentWillReceiveProps(nextProps) {
-    const { viewOptions, updateSources, deleted, fulfilled } = this.props;
+    getSources(helpers.createViewQueryObject(viewOptions));
+  }
 
-    // Check for changes resulting in a fetch
-    if (helpers.viewPropsChanged(nextProps.viewOptions, viewOptions)) {
-      this.onRefresh(nextProps);
-    }
+  componentDidUpdate() {
+    const { getSources, updateSources, viewOptions } = this.props;
 
-    if ((nextProps.updateSources && !updateSources) || (nextProps.deleted && !deleted)) {
-      this.onRefresh();
-    }
-
-    if (nextProps.fulfilled && !fulfilled) {
-      this.setState({ lastRefresh: Date.now() });
+    if (updateSources) {
+      getSources(helpers.createViewQueryObject(viewOptions));
     }
   }
 
@@ -78,56 +32,19 @@ class Sources extends React.Component {
     });
   };
 
-  onEditSource = item => {
-    store.dispatch({
-      type: reduxTypes.sources.EDIT_SOURCE_SHOW,
-      source: item
-    });
-  };
-
-  onScanSource = source => {
-    this.setState({
-      scanDialogShown: true,
-      multiSourceScan: false,
-      currentScanSource: source
-    });
-  };
-
   onScanSources = () => {
-    this.setState({ scanDialogShown: true, multiSourceScan: true });
-  };
-
-  onHideScanDialog = updated => {
-    this.setState({ scanDialogShown: false });
-
-    if (updated) {
-      this.onRefresh();
-    }
-  };
-
-  onHandleDeleteSource = item => {
-    const heading = (
-      <span>
-        Are you sure you want to delete the source <strong>{item.name}</strong>?
-      </span>
-    );
-
-    const onConfirm = () => this.doDeleteSource(item);
+    const { viewOptions } = this.props;
 
     store.dispatch({
-      type: reduxTypes.confirmationModal.CONFIRMATION_MODAL_SHOW,
-      title: 'Delete Source',
-      heading,
-      confirmButtonText: 'Delete',
-      onConfirm
+      type: reduxTypes.scans.EDIT_SCAN_SHOW,
+      sources: viewOptions.selectedItems
     });
   };
 
-  onRefresh = props => {
-    const { getSources, viewOptions } = this.props;
-    const options = _get(props, 'viewOptions') || viewOptions;
-
-    getSources(helpers.createViewQueryObject(options));
+  onRefresh = () => {
+    store.dispatch({
+      type: reduxTypes.sources.UPDATE_SOURCES
+    });
   };
 
   onClearFilters = () => {
@@ -137,19 +54,6 @@ class Sources extends React.Component {
     });
   };
 
-  doDeleteSource(item) {
-    const { deleteSource } = this.props;
-
-    store.dispatch({
-      type: reduxTypes.confirmationModal.CONFIRMATION_MODAL_HIDE
-    });
-
-    deleteSource(item.id).then(
-      response => Sources.notifyDeleteStatus(item, false, response.value),
-      error => Sources.notifyDeleteStatus(item, true, error)
-    );
-  }
-
   renderSourceActions() {
     const { viewOptions } = this.props;
 
@@ -175,8 +79,8 @@ class Sources extends React.Component {
       return (
         <Modal bsSize="lg" backdrop={false} show animation={false}>
           <Modal.Body>
-            <div className="spinner spinner-xl" />
-            <div className="text-center">Loading sources...</div>
+            <Spinner loading size="lg" className="blank-slate-pf-icon" />
+            <div className="text-center">Loading...</div>
           </Modal.Body>
         </Modal>
       );
@@ -185,21 +89,14 @@ class Sources extends React.Component {
     return null;
   }
 
-  renderSourcesList(items) {
-    const { lastRefresh } = this.state;
+  renderSourcesList(sources) {
+    const { lastRefresh } = this.props;
 
-    if (_size(items)) {
+    if (sources.length) {
       return (
         <ListView className="quipicords-list-view">
-          {items.map(item => (
-            <SourceListItem
-              item={item}
-              key={item.id}
-              lastRefresh={lastRefresh}
-              onEdit={this.onEditSource}
-              onDelete={this.onHandleDeleteSource}
-              onScan={this.onScanSource}
-            />
+          {sources.map(source => (
+            <SourceListItem item={source} key={source[apiTypes.API_RESPONSE_SOURCE_ID]} lastRefresh={lastRefresh} />
           ))}
         </ListView>
       );
@@ -219,8 +116,7 @@ class Sources extends React.Component {
   }
 
   render() {
-    const { error, errorMessage, sources, viewOptions } = this.props;
-    const { scanDialogShown, multiSourceScan, currentScanSource, lastRefresh } = this.state;
+    const { error, errorMessage, lastRefresh, pending, sources, viewOptions } = this.props;
 
     if (error) {
       return (
@@ -233,84 +129,66 @@ class Sources extends React.Component {
       );
     }
 
-    if (_size(sources) || _size(viewOptions.activeFilters)) {
+    if (pending && !sources.length) {
+      return <div className="quipucords-view-container">{this.renderPendingMessage()}</div>;
+    }
+
+    if (sources.length || _size(viewOptions.activeFilters)) {
       return (
-        <React.Fragment>
-          <div className="quipucords-view-container">
-            <ViewToolbar
-              viewType={reduxTypes.view.SOURCES_VIEW}
-              filterFields={SourceFilterFields}
-              sortFields={SourceSortFields}
-              onRefresh={this.onRefresh}
-              lastRefresh={lastRefresh}
-              actions={this.renderSourceActions()}
-              itemsType="Source"
-              itemsTypePlural="Sources"
-              selectedCount={viewOptions.selectedItems.length}
-              {...viewOptions}
-            />
-            <ViewPaginationRow viewType={reduxTypes.view.SOURCES_VIEW} {...viewOptions} />
-            <div className="quipucords-list-container">{this.renderSourcesList(sources)}</div>
-          </div>
-          {this.renderPendingMessage()}
-          <CreateScanDialog
-            show={scanDialogShown}
-            sources={multiSourceScan ? viewOptions.selectedItems : [currentScanSource]}
-            onClose={this.onHideScanDialog}
+        <div className="quipucords-view-container">
+          <ViewToolbar
+            viewType={reduxTypes.view.SOURCES_VIEW}
+            filterFields={SourceFilterFields}
+            sortFields={SourceSortFields}
+            onRefresh={this.onRefresh}
+            lastRefresh={lastRefresh}
+            actions={this.renderSourceActions()}
+            itemsType="Source"
+            itemsTypePlural="Sources"
+            selectedCount={viewOptions.selectedItems.length}
+            {...viewOptions}
           />
-        </React.Fragment>
+          <ViewPaginationRow viewType={reduxTypes.view.SOURCES_VIEW} {...viewOptions} />
+          <div className="quipucords-list-container">{this.renderSourcesList(sources)}</div>
+          {this.renderPendingMessage()}
+        </div>
       );
     }
 
-    return (
-      <React.Fragment>
-        <SourcesEmptyState onAddSource={this.onShowAddSourceWizard} />
-        {this.renderPendingMessage()}
-      </React.Fragment>
-    );
+    return <SourcesEmptyState onAddSource={this.onShowAddSourceWizard} />;
   }
 }
 
 Sources.propTypes = {
-  getSources: PropTypes.func,
-  deleteSource: PropTypes.func,
   error: PropTypes.bool,
   errorMessage: PropTypes.string,
+  fulfilled: PropTypes.bool,
+  getSources: PropTypes.func,
+  lastRefresh: PropTypes.number,
   pending: PropTypes.bool,
   sources: PropTypes.array,
-  lastRefresh: PropTypes.object,
-  viewOptions: PropTypes.object,
-  fulfilled: PropTypes.bool,
   updateSources: PropTypes.bool,
-  deleted: PropTypes.bool
+  viewOptions: PropTypes.object
 };
 
 Sources.defaultProps = {
-  getSources: helpers.noop,
-  deleteSource: helpers.noop,
   error: false,
   errorMessage: null,
+  fulfilled: false,
+  getSources: helpers.noop,
+  lastRefresh: 0,
   pending: false,
   sources: [],
-  lastRefresh: {},
-  viewOptions: {},
-  fulfilled: false,
   updateSources: false,
-  deleted: false
+  viewOptions: {}
 };
 
 const mapDispatchToProps = dispatch => ({
-  getSources: queryObj => dispatch(reduxActions.sources.getSources(queryObj)),
-  deleteSource: id => dispatch(reduxActions.sources.deleteSource(id))
+  getSources: queryObj => dispatch(reduxActions.sources.getSources(queryObj))
 });
 
 const mapStateToProps = state =>
-  Object.assign(
-    {},
-    state.sources.view,
-    { viewOptions: state.viewOptions[reduxTypes.view.SOURCES_VIEW] },
-    { deleted: state.sources.update.fulfilled }
-  );
+  Object.assign({}, state.sources.view, { viewOptions: state.viewOptions[reduxTypes.view.SOURCES_VIEW] });
 
 const ConnectedSources = connect(
   mapStateToProps,
diff --git a/src/components/touchspin/__tests__/__snapshots__/touchspin.test.js.snap b/src/components/touchspin/__tests__/__snapshots__/touchspin.test.js.snap
new file mode 100644
index 00000000..15a38e6c
--- /dev/null
+++ b/src/components/touchspin/__tests__/__snapshots__/touchspin.test.js.snap
@@ -0,0 +1,76 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TouchSpin Component should render a basic component: basic render 1`] = `
+<span
+  class="cloudmeter-touchspin  input-group"
+>
+  <span
+    class="input-group-btn"
+  >
+    <button
+      aria-hidden="true"
+      class="cloudmeter-touchspin-min-button form-control btn btn-default"
+      tabindex="-1"
+      title="Decrease number input"
+      type="button"
+    >
+      <span
+        aria-hidden="true"
+        class="fa fa-minus"
+      />
+    </button>
+  </span>
+  <input
+    class="cloudmeter-touchspin-input form-control"
+    name="lorem"
+    type="text"
+    value="50"
+  />
+  <span
+    class="input-group-btn"
+  >
+    <button
+      aria-hidden="true"
+      class="cloudmeter-touchspin-max-button form-control btn btn-default"
+      tabindex="-1"
+      title="Increase number input"
+      type="button"
+    >
+      <span
+        aria-hidden="true"
+        class="fa fa-plus"
+      />
+    </button>
+  </span>
+</span>
+`;
+
+exports[`TouchSpin Component should render a basic component: initial props 1`] = `
+Object {
+  "className": "",
+  "labelMax": <Icon
+    name="plus"
+    type="fa"
+  />,
+  "labelMaxDescription": "Increase number input",
+  "labelMin": <Icon
+    name="minus"
+    type="fa"
+  />,
+  "labelMinDescription": "Decrease number input",
+  "maxValue": 100,
+  "minValue": 0,
+  "name": "lorem",
+  "onChange": [Function],
+  "value": 50,
+}
+`;
+
+exports[`TouchSpin Component should render a basic component: initial state 1`] = `
+Object {
+  "displayValue": 50,
+  "maxValue": 100,
+  "minValue": 0,
+  "value": 50,
+}
+`;
diff --git a/src/components/touchspin/__tests__/touchspin.test.js b/src/components/touchspin/__tests__/touchspin.test.js
new file mode 100644
index 00000000..e7375af9
--- /dev/null
+++ b/src/components/touchspin/__tests__/touchspin.test.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import { TouchSpin } from '../touchspin';
+
+describe('TouchSpin Component', () => {
+  it('should render a basic component', () => {
+    const props = {
+      name: 'lorem'
+    };
+
+    const component = mount(<TouchSpin {...props} />);
+
+    const componentInstance = component.instance();
+    expect(componentInstance.props).toMatchSnapshot('initial props');
+    expect(componentInstance.state).toMatchSnapshot('initial state');
+
+    expect(component.render()).toMatchSnapshot('basic render');
+  });
+
+  it('should handle onchange events', () => {
+    const props = {
+      name: 'lorem',
+      onChange: jest.fn()
+    };
+
+    const component = mount(<TouchSpin {...props} />);
+
+    component.find('button[title="Decrease number input"]').simulate('click');
+    expect(props.onChange).toHaveBeenCalledTimes(1);
+
+    component.find('button[title="Increase number input"]').simulate('click');
+    expect(props.onChange).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/src/components/touchspin/touchspin.js b/src/components/touchspin/touchspin.js
new file mode 100644
index 00000000..c11ce5a8
--- /dev/null
+++ b/src/components/touchspin/touchspin.js
@@ -0,0 +1,191 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Form, Icon, InputGroup, Button } from 'patternfly-react';
+import helpers from '../../common/helpers';
+
+class TouchSpin extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      displayValue: Number.parseInt(props.value, 10),
+      maxValue: Number.parseInt(props.maxValue, 10),
+      minValue: Number.parseInt(props.minValue, 10),
+      value: Number.parseInt(props.value, 10)
+    };
+
+    this.timer = null;
+  }
+
+  onFocusMax = () => {
+    const { maxValue, value } = this.state;
+
+    const setTimer = (time = 500) => {
+      clearTimeout(this.timer);
+
+      this.timer = setTimeout(() => {
+        this.onMax();
+
+        if (value < maxValue) {
+          setTimer(0);
+        }
+      }, time);
+    };
+
+    setTimer();
+  };
+
+  onFocusMin = () => {
+    const { minValue, value } = this.state;
+
+    const setTimer = (time = 500) => {
+      clearTimeout(this.timer);
+
+      this.timer = setTimeout(() => {
+        this.onMin();
+
+        if (value > minValue) {
+          setTimer(0);
+        }
+      }, time);
+    };
+
+    setTimer();
+  };
+
+  onBlur = () => {
+    clearTimeout(this.timer);
+  };
+
+  onMin = () => {
+    const { maxValue, minValue, value } = this.state;
+    let updatedValue = value - 1 > minValue ? value - 1 : minValue;
+
+    if (updatedValue > maxValue) {
+      updatedValue = maxValue;
+    }
+
+    this.onUpdateValue({ target: { value: updatedValue } });
+  };
+
+  onMax = () => {
+    const { maxValue, minValue, value } = this.state;
+    let updatedValue = value + 1 < maxValue ? value + 1 : maxValue;
+
+    if (updatedValue < minValue) {
+      updatedValue = minValue;
+    }
+
+    this.onUpdateValue({ target: { value: updatedValue } });
+  };
+
+  onUpdateValue = event => {
+    const { maxValue, minValue } = this.state;
+    const { name, onChange } = this.props;
+    const { value } = event.target;
+
+    let parsedValue = Number.parseInt(value, 10);
+    parsedValue = Number.isNaN(parsedValue) ? minValue : parsedValue;
+
+    const maxDisabled = parsedValue > maxValue;
+    const minDisabled = parsedValue < minValue;
+
+    clearTimeout(this.timer);
+
+    this.setState({
+      displayValue: value,
+      value: parsedValue,
+      maxDisabled,
+      minDisabled
+    });
+
+    const mockTarget = {
+      ...event.target,
+      name,
+      value: parsedValue
+    };
+
+    const mockEvent = {
+      ...mockTarget,
+      target: { ...mockTarget },
+      currentTarget: { ...mockTarget },
+      persist: helpers.noop
+    };
+
+    return onChange(mockEvent);
+  };
+
+  render() {
+    const { displayValue, maxDisabled, minDisabled } = this.state;
+    const { className, labelMax, labelMaxDescription, labelMin, labelMinDescription, name } = this.props;
+
+    return (
+      <InputGroup className={`cloudmeter-touchspin ${className}`}>
+        <InputGroup.Button>
+          <Button
+            onClick={this.onMin}
+            onMouseDown={this.onFocusMin}
+            onMouseUp={this.onBlur}
+            onMouseLeave={this.onBlur}
+            className="cloudmeter-touchspin-min-button form-control"
+            aria-hidden
+            tabIndex={-1}
+            title={labelMinDescription}
+            disabled={minDisabled}
+          >
+            {labelMin}
+          </Button>
+        </InputGroup.Button>
+        <Form.FormControl
+          type="text"
+          name={name}
+          value={displayValue}
+          className="cloudmeter-touchspin-input"
+          onChange={this.onUpdateValue}
+        />
+        <InputGroup.Button>
+          <Button
+            onClick={this.onMax}
+            onMouseDown={this.onFocusMax}
+            onMouseUp={this.onBlur}
+            onMouseLeave={this.onBlur}
+            className="cloudmeter-touchspin-max-button form-control"
+            aria-hidden
+            tabIndex={-1}
+            title={labelMaxDescription}
+            disabled={maxDisabled}
+          >
+            {labelMax}
+          </Button>
+        </InputGroup.Button>
+      </InputGroup>
+    );
+  }
+}
+
+TouchSpin.propTypes = {
+  className: PropTypes.string,
+  labelMax: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+  labelMaxDescription: PropTypes.string,
+  labelMin: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+  labelMinDescription: PropTypes.string,
+  maxValue: PropTypes.number,
+  minValue: PropTypes.number,
+  name: PropTypes.string.isRequired,
+  onChange: PropTypes.func,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
+};
+
+TouchSpin.defaultProps = {
+  className: '',
+  labelMax: <Icon type="fa" name="plus" />,
+  labelMaxDescription: 'Increase number input',
+  labelMin: <Icon type="fa" name="minus" />,
+  labelMinDescription: 'Decrease number input',
+  maxValue: 100,
+  minValue: 0,
+  onChange: helpers.noop,
+  value: 50
+};
+
+export { TouchSpin as default, TouchSpin };
diff --git a/src/constants/__tests__/__snapshots__/apiConstants.test.js.snap b/src/constants/__tests__/__snapshots__/apiConstants.test.js.snap
index fb52b10e..0e5a9ae5 100644
--- a/src/constants/__tests__/__snapshots__/apiConstants.test.js.snap
+++ b/src/constants/__tests__/__snapshots__/apiConstants.test.js.snap
@@ -10,10 +10,20 @@ Object {
   "API_RESPONSE_JOBS_RESULTS": "results",
   "API_RESPONSE_SCANS_COUNT": "count",
   "API_RESPONSE_SCANS_RESULTS": "results",
+  "API_RESPONSE_SCAN_ID": "id",
   "API_RESPONSE_SOURCES_COUNT": "count",
   "API_RESPONSE_SOURCES_RESULTS": "results",
+  "API_RESPONSE_SOURCE_CONNECTION": "connection",
+  "API_RESPONSE_SOURCE_CONNECTION_END_TIME": "end_time",
+  "API_RESPONSE_SOURCE_CONNECTION_ID": "id",
+  "API_RESPONSE_SOURCE_CONNECTION_START_TIME": "start_time",
+  "API_RESPONSE_SOURCE_CONNECTION_STATUS": "status",
+  "API_RESPONSE_SOURCE_CONNECTION_SYS_FAILED": "source_systems_failed",
+  "API_RESPONSE_SOURCE_CONNECTION_SYS_SCANNED": "source_systems_scanned",
+  "API_RESPONSE_SOURCE_CONNECTION_SYS_UNREACHABLE": "source_systems_unreachable",
   "API_RESPONSE_SOURCE_CREDENTIALS": "credentials",
   "API_RESPONSE_SOURCE_CREDENTIALS_ID": "id",
+  "API_RESPONSE_SOURCE_CREDENTIALS_NAME": "name",
   "API_RESPONSE_SOURCE_HOSTS": "hosts",
   "API_RESPONSE_SOURCE_ID": "id",
   "API_RESPONSE_SOURCE_NAME": "name",
@@ -28,6 +38,16 @@ Object {
   "API_RESPONSE_STATUS_BUILD": "build",
   "API_RESPONSE_STATUS_SERVER_VERSION": "server_version",
   "API_RESPONSE_USER_USERNAME": "username",
+  "API_SUBMIT_SCAN_NAME": "name",
+  "API_SUBMIT_SCAN_OPTIONS": "options",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH": "enabled_extended_product_search",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_BRMS": "jboss_brms",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS": "search_directories",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_EAP": "jboss_eap",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_FUSE": "jboss_fuse",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_WS": "jboss_ws",
+  "API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY": "max_concurrency",
+  "API_SUBMIT_SCAN_SOURCES": "sources",
   "API_SUBMIT_SOURCE_CREDENTIALS": "credentials",
   "API_SUBMIT_SOURCE_HOSTS": "hosts",
   "API_SUBMIT_SOURCE_ID": "id",
@@ -48,10 +68,20 @@ Object {
     "API_RESPONSE_JOBS_RESULTS": "results",
     "API_RESPONSE_SCANS_COUNT": "count",
     "API_RESPONSE_SCANS_RESULTS": "results",
+    "API_RESPONSE_SCAN_ID": "id",
     "API_RESPONSE_SOURCES_COUNT": "count",
     "API_RESPONSE_SOURCES_RESULTS": "results",
+    "API_RESPONSE_SOURCE_CONNECTION": "connection",
+    "API_RESPONSE_SOURCE_CONNECTION_END_TIME": "end_time",
+    "API_RESPONSE_SOURCE_CONNECTION_ID": "id",
+    "API_RESPONSE_SOURCE_CONNECTION_START_TIME": "start_time",
+    "API_RESPONSE_SOURCE_CONNECTION_STATUS": "status",
+    "API_RESPONSE_SOURCE_CONNECTION_SYS_FAILED": "source_systems_failed",
+    "API_RESPONSE_SOURCE_CONNECTION_SYS_SCANNED": "source_systems_scanned",
+    "API_RESPONSE_SOURCE_CONNECTION_SYS_UNREACHABLE": "source_systems_unreachable",
     "API_RESPONSE_SOURCE_CREDENTIALS": "credentials",
     "API_RESPONSE_SOURCE_CREDENTIALS_ID": "id",
+    "API_RESPONSE_SOURCE_CREDENTIALS_NAME": "name",
     "API_RESPONSE_SOURCE_HOSTS": "hosts",
     "API_RESPONSE_SOURCE_ID": "id",
     "API_RESPONSE_SOURCE_NAME": "name",
@@ -66,6 +96,16 @@ Object {
     "API_RESPONSE_STATUS_BUILD": "build",
     "API_RESPONSE_STATUS_SERVER_VERSION": "server_version",
     "API_RESPONSE_USER_USERNAME": "username",
+    "API_SUBMIT_SCAN_NAME": "name",
+    "API_SUBMIT_SCAN_OPTIONS": "options",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH": "enabled_extended_product_search",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_BRMS": "jboss_brms",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS": "search_directories",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_EAP": "jboss_eap",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_FUSE": "jboss_fuse",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_WS": "jboss_ws",
+    "API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY": "max_concurrency",
+    "API_SUBMIT_SCAN_SOURCES": "sources",
     "API_SUBMIT_SOURCE_CREDENTIALS": "credentials",
     "API_SUBMIT_SOURCE_HOSTS": "hosts",
     "API_SUBMIT_SOURCE_ID": "id",
@@ -87,10 +127,20 @@ Object {
     "API_RESPONSE_JOBS_RESULTS": "results",
     "API_RESPONSE_SCANS_COUNT": "count",
     "API_RESPONSE_SCANS_RESULTS": "results",
+    "API_RESPONSE_SCAN_ID": "id",
     "API_RESPONSE_SOURCES_COUNT": "count",
     "API_RESPONSE_SOURCES_RESULTS": "results",
+    "API_RESPONSE_SOURCE_CONNECTION": "connection",
+    "API_RESPONSE_SOURCE_CONNECTION_END_TIME": "end_time",
+    "API_RESPONSE_SOURCE_CONNECTION_ID": "id",
+    "API_RESPONSE_SOURCE_CONNECTION_START_TIME": "start_time",
+    "API_RESPONSE_SOURCE_CONNECTION_STATUS": "status",
+    "API_RESPONSE_SOURCE_CONNECTION_SYS_FAILED": "source_systems_failed",
+    "API_RESPONSE_SOURCE_CONNECTION_SYS_SCANNED": "source_systems_scanned",
+    "API_RESPONSE_SOURCE_CONNECTION_SYS_UNREACHABLE": "source_systems_unreachable",
     "API_RESPONSE_SOURCE_CREDENTIALS": "credentials",
     "API_RESPONSE_SOURCE_CREDENTIALS_ID": "id",
+    "API_RESPONSE_SOURCE_CREDENTIALS_NAME": "name",
     "API_RESPONSE_SOURCE_HOSTS": "hosts",
     "API_RESPONSE_SOURCE_ID": "id",
     "API_RESPONSE_SOURCE_NAME": "name",
@@ -105,6 +155,16 @@ Object {
     "API_RESPONSE_STATUS_BUILD": "build",
     "API_RESPONSE_STATUS_SERVER_VERSION": "server_version",
     "API_RESPONSE_USER_USERNAME": "username",
+    "API_SUBMIT_SCAN_NAME": "name",
+    "API_SUBMIT_SCAN_OPTIONS": "options",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH": "enabled_extended_product_search",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_BRMS": "jboss_brms",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS": "search_directories",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_EAP": "jboss_eap",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_FUSE": "jboss_fuse",
+    "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_WS": "jboss_ws",
+    "API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY": "max_concurrency",
+    "API_SUBMIT_SCAN_SOURCES": "sources",
     "API_SUBMIT_SOURCE_CREDENTIALS": "credentials",
     "API_SUBMIT_SOURCE_HOSTS": "hosts",
     "API_SUBMIT_SOURCE_ID": "id",
@@ -130,10 +190,20 @@ Object {
   "API_RESPONSE_JOBS_RESULTS": "results",
   "API_RESPONSE_SCANS_COUNT": "count",
   "API_RESPONSE_SCANS_RESULTS": "results",
+  "API_RESPONSE_SCAN_ID": "id",
   "API_RESPONSE_SOURCES_COUNT": "count",
   "API_RESPONSE_SOURCES_RESULTS": "results",
+  "API_RESPONSE_SOURCE_CONNECTION": "connection",
+  "API_RESPONSE_SOURCE_CONNECTION_END_TIME": "end_time",
+  "API_RESPONSE_SOURCE_CONNECTION_ID": "id",
+  "API_RESPONSE_SOURCE_CONNECTION_START_TIME": "start_time",
+  "API_RESPONSE_SOURCE_CONNECTION_STATUS": "status",
+  "API_RESPONSE_SOURCE_CONNECTION_SYS_FAILED": "source_systems_failed",
+  "API_RESPONSE_SOURCE_CONNECTION_SYS_SCANNED": "source_systems_scanned",
+  "API_RESPONSE_SOURCE_CONNECTION_SYS_UNREACHABLE": "source_systems_unreachable",
   "API_RESPONSE_SOURCE_CREDENTIALS": "credentials",
   "API_RESPONSE_SOURCE_CREDENTIALS_ID": "id",
+  "API_RESPONSE_SOURCE_CREDENTIALS_NAME": "name",
   "API_RESPONSE_SOURCE_HOSTS": "hosts",
   "API_RESPONSE_SOURCE_ID": "id",
   "API_RESPONSE_SOURCE_NAME": "name",
@@ -148,6 +218,16 @@ Object {
   "API_RESPONSE_STATUS_BUILD": "build",
   "API_RESPONSE_STATUS_SERVER_VERSION": "server_version",
   "API_RESPONSE_USER_USERNAME": "username",
+  "API_SUBMIT_SCAN_NAME": "name",
+  "API_SUBMIT_SCAN_OPTIONS": "options",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH": "enabled_extended_product_search",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_BRMS": "jboss_brms",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS": "search_directories",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_EAP": "jboss_eap",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_FUSE": "jboss_fuse",
+  "API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_WS": "jboss_ws",
+  "API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY": "max_concurrency",
+  "API_SUBMIT_SCAN_SOURCES": "sources",
   "API_SUBMIT_SOURCE_CREDENTIALS": "credentials",
   "API_SUBMIT_SOURCE_HOSTS": "hosts",
   "API_SUBMIT_SOURCE_ID": "id",
diff --git a/src/constants/apiConstants.js b/src/constants/apiConstants.js
index 9771c85e..1c91d126 100644
--- a/src/constants/apiConstants.js
+++ b/src/constants/apiConstants.js
@@ -1,20 +1,28 @@
-const API_RESPONSE_CREDENTIALS_COUNT = 'count';
-const API_RESPONSE_CREDENTIALS_RESULTS = 'results';
-
 const API_RESPONSE_CREDENTIAL_CRED_TYPE = 'cred_type';
 const API_RESPONSE_CREDENTIAL_NAME = 'name';
 const API_RESPONSE_CREDENTIAL_ID = 'id';
 
+const API_RESPONSE_CREDENTIALS_COUNT = 'count';
+const API_RESPONSE_CREDENTIALS_RESULTS = 'results';
+
+const API_RESPONSE_SCAN_ID = 'id';
+
 const API_RESPONSE_SCANS_COUNT = 'count';
 const API_RESPONSE_SCANS_RESULTS = 'results';
 
 const API_RESPONSE_JOBS_RESULTS = 'results';
 
-const API_RESPONSE_SOURCES_COUNT = 'count';
-const API_RESPONSE_SOURCES_RESULTS = 'results';
-
+const API_RESPONSE_SOURCE_CONNECTION = 'connection';
+const API_RESPONSE_SOURCE_CONNECTION_END_TIME = 'end_time';
+const API_RESPONSE_SOURCE_CONNECTION_ID = 'id';
+const API_RESPONSE_SOURCE_CONNECTION_START_TIME = 'start_time';
+const API_RESPONSE_SOURCE_CONNECTION_STATUS = 'status';
+const API_RESPONSE_SOURCE_CONNECTION_SYS_FAILED = 'source_systems_failed';
+const API_RESPONSE_SOURCE_CONNECTION_SYS_SCANNED = 'source_systems_scanned';
+const API_RESPONSE_SOURCE_CONNECTION_SYS_UNREACHABLE = 'source_systems_unreachable';
 const API_RESPONSE_SOURCE_CREDENTIALS = 'credentials';
 const API_RESPONSE_SOURCE_CREDENTIALS_ID = 'id';
+const API_RESPONSE_SOURCE_CREDENTIALS_NAME = 'name';
 const API_RESPONSE_SOURCE_HOSTS = 'hosts';
 const API_RESPONSE_SOURCE_ID = 'id';
 const API_RESPONSE_SOURCE_NAME = 'name';
@@ -26,12 +34,26 @@ const API_RESPONSE_SOURCE_OPTIONS_PARAMIKO = 'use_paramiko';
 const API_RESPONSE_SOURCE_PORT = 'port';
 const API_RESPONSE_SOURCE_SOURCE_TYPE = 'source_type';
 
+const API_RESPONSE_SOURCES_COUNT = 'count';
+const API_RESPONSE_SOURCES_RESULTS = 'results';
+
 const API_RESPONSE_STATUS_API_VERSION = 'api_version';
 const API_RESPONSE_STATUS_BUILD = 'build';
 const API_RESPONSE_STATUS_SERVER_VERSION = 'server_version';
 
 const API_RESPONSE_USER_USERNAME = 'username';
 
+const API_SUBMIT_SCAN_NAME = 'name';
+const API_SUBMIT_SCAN_OPTIONS = 'options';
+const API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY = 'max_concurrency';
+const API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH = 'enabled_extended_product_search';
+const API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_BRMS = 'jboss_brms';
+const API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS = 'search_directories';
+const API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_EAP = 'jboss_eap';
+const API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_FUSE = 'jboss_fuse';
+const API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_WS = 'jboss_ws';
+const API_SUBMIT_SCAN_SOURCES = 'sources';
+
 const API_SUBMIT_SOURCE_CREDENTIALS = 'credentials';
 const API_SUBMIT_SOURCE_HOSTS = 'hosts';
 const API_SUBMIT_SOURCE_ID = 'id';
@@ -45,18 +67,26 @@ const API_SUBMIT_SOURCE_PORT = 'port';
 const API_SUBMIT_SOURCE_SOURCE_TYPE = 'source_type';
 
 const apiTypes = {
-  API_RESPONSE_CREDENTIALS_COUNT,
-  API_RESPONSE_CREDENTIALS_RESULTS,
   API_RESPONSE_CREDENTIAL_CRED_TYPE,
   API_RESPONSE_CREDENTIAL_NAME,
   API_RESPONSE_CREDENTIAL_ID,
+  API_RESPONSE_CREDENTIALS_COUNT,
+  API_RESPONSE_CREDENTIALS_RESULTS,
+  API_RESPONSE_SCAN_ID,
   API_RESPONSE_SCANS_COUNT,
   API_RESPONSE_SCANS_RESULTS,
   API_RESPONSE_JOBS_RESULTS,
-  API_RESPONSE_SOURCES_COUNT,
-  API_RESPONSE_SOURCES_RESULTS,
+  API_RESPONSE_SOURCE_CONNECTION,
+  API_RESPONSE_SOURCE_CONNECTION_END_TIME,
+  API_RESPONSE_SOURCE_CONNECTION_ID,
+  API_RESPONSE_SOURCE_CONNECTION_START_TIME,
+  API_RESPONSE_SOURCE_CONNECTION_STATUS,
+  API_RESPONSE_SOURCE_CONNECTION_SYS_FAILED,
+  API_RESPONSE_SOURCE_CONNECTION_SYS_SCANNED,
+  API_RESPONSE_SOURCE_CONNECTION_SYS_UNREACHABLE,
   API_RESPONSE_SOURCE_CREDENTIALS,
   API_RESPONSE_SOURCE_CREDENTIALS_ID,
+  API_RESPONSE_SOURCE_CREDENTIALS_NAME,
   API_RESPONSE_SOURCE_HOSTS,
   API_RESPONSE_SOURCE_ID,
   API_RESPONSE_SOURCE_NAME,
@@ -67,10 +97,22 @@ const apiTypes = {
   API_RESPONSE_SOURCE_OPTIONS_PARAMIKO,
   API_RESPONSE_SOURCE_PORT,
   API_RESPONSE_SOURCE_SOURCE_TYPE,
+  API_RESPONSE_SOURCES_COUNT,
+  API_RESPONSE_SOURCES_RESULTS,
   API_RESPONSE_STATUS_API_VERSION,
   API_RESPONSE_STATUS_BUILD,
   API_RESPONSE_STATUS_SERVER_VERSION,
   API_RESPONSE_USER_USERNAME,
+  API_SUBMIT_SCAN_NAME,
+  API_SUBMIT_SCAN_OPTIONS,
+  API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_BRMS,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_EAP,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_FUSE,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_WS,
+  API_SUBMIT_SCAN_SOURCES,
   API_SUBMIT_SOURCE_CREDENTIALS,
   API_SUBMIT_SOURCE_HOSTS,
   API_SUBMIT_SOURCE_ID,
@@ -87,18 +129,26 @@ const apiTypes = {
 export {
   apiTypes as default,
   apiTypes,
-  API_RESPONSE_CREDENTIALS_COUNT,
-  API_RESPONSE_CREDENTIALS_RESULTS,
   API_RESPONSE_CREDENTIAL_CRED_TYPE,
   API_RESPONSE_CREDENTIAL_NAME,
   API_RESPONSE_CREDENTIAL_ID,
+  API_RESPONSE_CREDENTIALS_COUNT,
+  API_RESPONSE_CREDENTIALS_RESULTS,
+  API_RESPONSE_SCAN_ID,
   API_RESPONSE_SCANS_COUNT,
   API_RESPONSE_SCANS_RESULTS,
   API_RESPONSE_JOBS_RESULTS,
-  API_RESPONSE_SOURCES_COUNT,
-  API_RESPONSE_SOURCES_RESULTS,
+  API_RESPONSE_SOURCE_CONNECTION,
+  API_RESPONSE_SOURCE_CONNECTION_END_TIME,
+  API_RESPONSE_SOURCE_CONNECTION_ID,
+  API_RESPONSE_SOURCE_CONNECTION_START_TIME,
+  API_RESPONSE_SOURCE_CONNECTION_STATUS,
+  API_RESPONSE_SOURCE_CONNECTION_SYS_FAILED,
+  API_RESPONSE_SOURCE_CONNECTION_SYS_SCANNED,
+  API_RESPONSE_SOURCE_CONNECTION_SYS_UNREACHABLE,
   API_RESPONSE_SOURCE_CREDENTIALS,
   API_RESPONSE_SOURCE_CREDENTIALS_ID,
+  API_RESPONSE_SOURCE_CREDENTIALS_NAME,
   API_RESPONSE_SOURCE_HOSTS,
   API_RESPONSE_SOURCE_ID,
   API_RESPONSE_SOURCE_NAME,
@@ -109,10 +159,22 @@ export {
   API_RESPONSE_SOURCE_OPTIONS_PARAMIKO,
   API_RESPONSE_SOURCE_PORT,
   API_RESPONSE_SOURCE_SOURCE_TYPE,
+  API_RESPONSE_SOURCES_COUNT,
+  API_RESPONSE_SOURCES_RESULTS,
   API_RESPONSE_STATUS_API_VERSION,
   API_RESPONSE_STATUS_BUILD,
   API_RESPONSE_STATUS_SERVER_VERSION,
   API_RESPONSE_USER_USERNAME,
+  API_SUBMIT_SCAN_NAME,
+  API_SUBMIT_SCAN_OPTIONS,
+  API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_BRMS,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_EAP,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_FUSE,
+  API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_WS,
+  API_SUBMIT_SCAN_SOURCES,
   API_SUBMIT_SOURCE_CREDENTIALS,
   API_SUBMIT_SOURCE_HOSTS,
   API_SUBMIT_SOURCE_ID,
diff --git a/src/redux/actions/__tests__/__snapshots__/credentialsActions.test.js.snap b/src/redux/actions/__tests__/__snapshots__/credentialsActions.test.js.snap
new file mode 100644
index 00000000..d3ac004a
--- /dev/null
+++ b/src/redux/actions/__tests__/__snapshots__/credentialsActions.test.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CredentialsActions Should return response content for getCredential method: getCredential 1`] = `"GET_CREDENTIAL_FULFILLED"`;
diff --git a/src/redux/actions/__tests__/__snapshots__/scansActions.test.js.snap b/src/redux/actions/__tests__/__snapshots__/scansActions.test.js.snap
new file mode 100644
index 00000000..b9c13f83
--- /dev/null
+++ b/src/redux/actions/__tests__/__snapshots__/scansActions.test.js.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ScansActions Should return response content for addStartScan method: addStartScan 1`] = `"ADD_START_SCAN_FULFILLED"`;
+
+exports[`ScansActions Should return response content for getScanJob method: getScanJob 1`] = `"GET_SCAN_JOB_FULFILLED"`;
+
+exports[`ScansActions Should return response content for updatePartialScan method: updatePartialScan 1`] = `"UPDATE_SCAN_FULFILLED"`;
+
+exports[`ScansActions Should return response content for updateScan method: updateScan 1`] = `"UPDATE_SCAN_FULFILLED"`;
diff --git a/src/redux/actions/__tests__/__snapshots__/sourcesActions.test.js.snap b/src/redux/actions/__tests__/__snapshots__/sourcesActions.test.js.snap
new file mode 100644
index 00000000..a7ad7ada
--- /dev/null
+++ b/src/redux/actions/__tests__/__snapshots__/sourcesActions.test.js.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SourcesActions Should have a defined deleteSource method: deleteSource 1`] = `"DELETE_SOURCE_FULFILLED"`;
+
+exports[`SourcesActions Should have a defined deleteSources method: deleteSources 1`] = `"DELETE_SOURCES_FULFILLED"`;
+
+exports[`SourcesActions Should return response content for getSource method: getSource 1`] = `"GET_SOURCE_FULFILLED"`;
diff --git a/src/redux/actions/__tests__/credentialsActions.test.js b/src/redux/actions/__tests__/credentialsActions.test.js
index ba56a77e..8dacf8aa 100644
--- a/src/redux/actions/__tests__/credentialsActions.test.js
+++ b/src/redux/actions/__tests__/credentialsActions.test.js
@@ -46,10 +46,14 @@ describe('CredentialsActions', () => {
     });
   });
 
-  it('Should return response content for getCredential method', () => {
+  it('Should return response content for getCredential method', done => {
+    const store = generateStore();
     const dispatcher = credentialsActions.getCredential();
 
-    expect(dispatcher).toBeDefined();
+    dispatcher(store.dispatch).then(value => {
+      expect(value.action.type).toMatchSnapshot('getCredential');
+      done();
+    });
   });
 
   it('Should return response content for getCredentials method', done => {
diff --git a/src/redux/actions/__tests__/scansActions.test.js b/src/redux/actions/__tests__/scansActions.test.js
index a0e4daec..60c74687 100644
--- a/src/redux/actions/__tests__/scansActions.test.js
+++ b/src/redux/actions/__tests__/scansActions.test.js
@@ -1,7 +1,7 @@
 import promiseMiddleware from 'redux-promise-middleware';
 import { applyMiddleware, combineReducers, createStore } from 'redux';
 import moxios from 'moxios';
-import { scansReducer } from '../../reducers';
+import { scansReducer, scansEditReducer } from '../../reducers';
 import { scansActions } from '..';
 
 describe('ScansActions', () => {
@@ -9,7 +9,8 @@ describe('ScansActions', () => {
   const generateStore = () =>
     createStore(
       combineReducers({
-        scans: scansReducer
+        scans: scansReducer,
+        scansEdit: scansEditReducer
       }),
       applyMiddleware(...middleware)
     );
@@ -37,9 +38,19 @@ describe('ScansActions', () => {
     const dispatcher = scansActions.addScan();
 
     dispatcher(store.dispatch).then(() => {
-      const response = store.getState().scans;
+      const response = store.getState().scansEdit;
+
+      expect(response.add).toEqual(true);
+      done();
+    });
+  });
+
+  it('Should return response content for addStartScan method', done => {
+    const store = generateStore();
+    const dispatcher = scansActions.addStartScan();
 
-      expect(response.action.add).toEqual(true);
+    dispatcher(store.dispatch).then(value => {
+      expect(value.action.type).toMatchSnapshot('addStartScan');
       done();
     });
   });
@@ -68,16 +79,24 @@ describe('ScansActions', () => {
     });
   });
 
-  it('Should return response content for updateScan method', () => {
+  it('Should return response content for updateScan method', done => {
+    const store = generateStore();
     const dispatcher = scansActions.updateScan();
 
-    expect(dispatcher).toBeDefined();
+    dispatcher(store.dispatch).then(value => {
+      expect(value.action.type).toMatchSnapshot('updateScan');
+      done();
+    });
   });
 
-  it('Should return response content for updatePartialScan method', () => {
+  it('Should return response content for updatePartialScan method', done => {
+    const store = generateStore();
     const dispatcher = scansActions.updatePartialScan();
 
-    expect(dispatcher).toBeDefined();
+    dispatcher(store.dispatch).then(value => {
+      expect(value.action.type).toMatchSnapshot('updatePartialScan');
+      done();
+    });
   });
 
   it('Should return response content for deleteScan method', done => {
@@ -116,10 +135,14 @@ describe('ScansActions', () => {
     });
   });
 
-  it('Should return response content for getScanJob method', () => {
+  it('Should return response content for getScanJob method', done => {
+    const store = generateStore();
     const dispatcher = scansActions.getScanJob();
 
-    expect(dispatcher).toBeDefined();
+    dispatcher(store.dispatch).then(value => {
+      expect(value.action.type).toMatchSnapshot('getScanJob');
+      done();
+    });
   });
 
   it('Should return response content for getConnectionScanResults method', done => {
diff --git a/src/redux/actions/__tests__/sourcesActions.test.js b/src/redux/actions/__tests__/sourcesActions.test.js
index 0c33206f..bd50b6d7 100644
--- a/src/redux/actions/__tests__/sourcesActions.test.js
+++ b/src/redux/actions/__tests__/sourcesActions.test.js
@@ -48,26 +48,22 @@ describe('SourcesActions', () => {
     });
   });
 
-  it('Should return response content for deleteSource method', done => {
+  it('Should have a defined deleteSource method', done => {
     const store = generateStore();
     const dispatcher = sourcesActions.deleteSource();
 
-    dispatcher(store.dispatch).then(() => {
-      const response = store.getState().sources;
-
-      expect(response.update.delete).toEqual(true);
+    dispatcher(store.dispatch).then(value => {
+      expect(value.action.type).toMatchSnapshot('deleteSource');
       done();
     });
   });
 
-  it('Should return response content for deleteSources method', done => {
+  it('Should have a defined deleteSources method', done => {
     const store = generateStore();
     const dispatcher = sourcesActions.deleteSources();
 
-    dispatcher(store.dispatch).then(() => {
-      const response = store.getState().sources;
-
-      expect(response.update.delete).toEqual(true);
+    dispatcher(store.dispatch).then(value => {
+      expect(value.action.type).toMatchSnapshot('deleteSources');
       done();
     });
   });
@@ -84,10 +80,14 @@ describe('SourcesActions', () => {
     });
   });
 
-  it('Should return response content for getSource method', () => {
+  it('Should return response content for getSource method', done => {
+    const store = generateStore();
     const dispatcher = sourcesActions.getSource();
 
-    expect(dispatcher).toBeDefined();
+    dispatcher(store.dispatch).then(value => {
+      expect(value.action.type).toMatchSnapshot('getSource');
+      done();
+    });
   });
 
   it('Should return response content for getSources method', done => {
diff --git a/src/redux/actions/scansActions.js b/src/redux/actions/scansActions.js
index b7373ae1..ca3a2a42 100644
--- a/src/redux/actions/scansActions.js
+++ b/src/redux/actions/scansActions.js
@@ -7,6 +7,12 @@ const addScan = data => dispatch =>
     payload: scansService.addScan(data)
   });
 
+const addStartScan = id => dispatch =>
+  dispatch({
+    type: scansTypes.ADD_START_SCAN,
+    payload: scansService.startScan(id)
+  });
+
 const getScan = id => dispatch =>
   dispatch({
     type: scansTypes.GET_SCAN,
@@ -87,6 +93,7 @@ const restartScan = id => dispatch =>
 
 export {
   addScan,
+  addStartScan,
   getScan,
   getScans,
   updateScan,
diff --git a/src/redux/constants/__tests__/__snapshots__/index.test.js.snap b/src/redux/constants/__tests__/__snapshots__/index.test.js.snap
index 4e7d07ee..c13b13f5 100644
--- a/src/redux/constants/__tests__/__snapshots__/index.test.js.snap
+++ b/src/redux/constants/__tests__/__snapshots__/index.test.js.snap
@@ -55,8 +55,11 @@ Object {
     },
     "scans": Object {
       "ADD_SCAN": "ADD_SCAN",
+      "ADD_START_SCAN": "ADD_START_SCAN",
       "CANCEL_SCAN": "CANCEL_SCAN",
       "DELETE_SCAN": "DELETE_SCAN",
+      "EDIT_SCAN_HIDE": "EDIT_SCAN_HIDE",
+      "EDIT_SCAN_SHOW": "EDIT_SCAN_SHOW",
       "GET_MERGE_SCAN_RESULTS": "GET_MERGE_SCAN_RESULTS",
       "GET_SCAN": "GET_SCAN",
       "GET_SCANS": "GET_SCANS",
@@ -76,7 +79,7 @@ Object {
       "ADD_SOURCE": "ADD_SOURCE",
       "CREATE_SOURCE_SHOW": "CREATE_SOURCE_SHOW",
       "DELETE_SOURCE": "DELETE_SOURCE",
-      "DELETE_SOURCES": "DELETES_SOURCE",
+      "DELETE_SOURCES": "DELETE_SOURCES",
       "EDIT_SOURCE_SHOW": "EDIT_SOURCE_SHOW",
       "GET_SCANS_SOURCES": "GET_SCANS_SOURCES",
       "GET_SOURCE": "GET_SOURCE",
@@ -165,8 +168,11 @@ Object {
     },
     "scans": Object {
       "ADD_SCAN": "ADD_SCAN",
+      "ADD_START_SCAN": "ADD_START_SCAN",
       "CANCEL_SCAN": "CANCEL_SCAN",
       "DELETE_SCAN": "DELETE_SCAN",
+      "EDIT_SCAN_HIDE": "EDIT_SCAN_HIDE",
+      "EDIT_SCAN_SHOW": "EDIT_SCAN_SHOW",
       "GET_MERGE_SCAN_RESULTS": "GET_MERGE_SCAN_RESULTS",
       "GET_SCAN": "GET_SCAN",
       "GET_SCANS": "GET_SCANS",
@@ -186,7 +192,7 @@ Object {
       "ADD_SOURCE": "ADD_SOURCE",
       "CREATE_SOURCE_SHOW": "CREATE_SOURCE_SHOW",
       "DELETE_SOURCE": "DELETE_SOURCE",
-      "DELETE_SOURCES": "DELETES_SOURCE",
+      "DELETE_SOURCES": "DELETE_SOURCES",
       "EDIT_SOURCE_SHOW": "EDIT_SOURCE_SHOW",
       "GET_SCANS_SOURCES": "GET_SCANS_SOURCES",
       "GET_SOURCE": "GET_SOURCE",
@@ -245,8 +251,11 @@ Object {
   },
   "scansTypes": Object {
     "ADD_SCAN": "ADD_SCAN",
+    "ADD_START_SCAN": "ADD_START_SCAN",
     "CANCEL_SCAN": "CANCEL_SCAN",
     "DELETE_SCAN": "DELETE_SCAN",
+    "EDIT_SCAN_HIDE": "EDIT_SCAN_HIDE",
+    "EDIT_SCAN_SHOW": "EDIT_SCAN_SHOW",
     "GET_MERGE_SCAN_RESULTS": "GET_MERGE_SCAN_RESULTS",
     "GET_SCAN": "GET_SCAN",
     "GET_SCANS": "GET_SCANS",
@@ -266,7 +275,7 @@ Object {
     "ADD_SOURCE": "ADD_SOURCE",
     "CREATE_SOURCE_SHOW": "CREATE_SOURCE_SHOW",
     "DELETE_SOURCE": "DELETE_SOURCE",
-    "DELETE_SOURCES": "DELETES_SOURCE",
+    "DELETE_SOURCES": "DELETE_SOURCES",
     "EDIT_SOURCE_SHOW": "EDIT_SOURCE_SHOW",
     "GET_SCANS_SOURCES": "GET_SCANS_SOURCES",
     "GET_SOURCE": "GET_SOURCE",
@@ -354,8 +363,11 @@ Object {
   },
   "scans": Object {
     "ADD_SCAN": "ADD_SCAN",
+    "ADD_START_SCAN": "ADD_START_SCAN",
     "CANCEL_SCAN": "CANCEL_SCAN",
     "DELETE_SCAN": "DELETE_SCAN",
+    "EDIT_SCAN_HIDE": "EDIT_SCAN_HIDE",
+    "EDIT_SCAN_SHOW": "EDIT_SCAN_SHOW",
     "GET_MERGE_SCAN_RESULTS": "GET_MERGE_SCAN_RESULTS",
     "GET_SCAN": "GET_SCAN",
     "GET_SCANS": "GET_SCANS",
@@ -375,7 +387,7 @@ Object {
     "ADD_SOURCE": "ADD_SOURCE",
     "CREATE_SOURCE_SHOW": "CREATE_SOURCE_SHOW",
     "DELETE_SOURCE": "DELETE_SOURCE",
-    "DELETE_SOURCES": "DELETES_SOURCE",
+    "DELETE_SOURCES": "DELETE_SOURCES",
     "EDIT_SOURCE_SHOW": "EDIT_SOURCE_SHOW",
     "GET_SCANS_SOURCES": "GET_SCANS_SOURCES",
     "GET_SOURCE": "GET_SOURCE",
diff --git a/src/redux/constants/scansConstants.js b/src/redux/constants/scansConstants.js
index 1252106b..aad84a22 100644
--- a/src/redux/constants/scansConstants.js
+++ b/src/redux/constants/scansConstants.js
@@ -1,25 +1,34 @@
 const ADD_SCAN = 'ADD_SCAN';
-const RESET_SCAN_ADD_STATUS = 'RESET_SCAN_ADD_STATUS';
+const ADD_START_SCAN = 'ADD_START_SCAN';
 const DELETE_SCAN = 'DELETE_SCAN';
+const RESET_SCAN_ADD_STATUS = 'RESET_SCAN_ADD_STATUS';
+const UPDATE_SCAN = 'UPDATE_SCAN';
+
+const GET_MERGE_SCAN_RESULTS = 'GET_MERGE_SCAN_RESULTS';
 const GET_SCAN = 'GET_SCAN';
 const GET_SCANS = 'GET_SCANS';
 const GET_SCAN_CONNECTION_RESULTS = 'GET_SCAN_CONNECTION_RESULTS';
 const GET_SCAN_INSPECTION_RESULTS = 'GET_SCAN_INSPECTION_RESULTS';
 const GET_SCAN_JOB = 'GET_SCAN_JOB';
 const GET_SCAN_JOBS = 'GET_SCAN_JOBS';
+
 const START_SCAN = 'START_SCAN';
 const CANCEL_SCAN = 'CANCEL_SCAN';
 const PAUSE_SCAN = 'PAUSE_SCAN';
 const RESTART_SCAN = 'RESTART_SCAN';
-const UPDATE_SCAN = 'UPDATE_SCAN';
-const GET_MERGE_SCAN_RESULTS = 'GET_MERGE_SCAN_RESULTS';
-const MERGE_SCAN_DIALOG_SHOW = 'MERGE_SCAN_DIALOG_SHOW';
+
+const EDIT_SCAN_HIDE = 'EDIT_SCAN_HIDE';
+const EDIT_SCAN_SHOW = 'EDIT_SCAN_SHOW';
 const MERGE_SCAN_DIALOG_HIDE = 'MERGE_SCAN_DIALOG_HIDE';
+const MERGE_SCAN_DIALOG_SHOW = 'MERGE_SCAN_DIALOG_SHOW';
 
 export {
   ADD_SCAN,
-  RESET_SCAN_ADD_STATUS,
+  ADD_START_SCAN,
   DELETE_SCAN,
+  RESET_SCAN_ADD_STATUS,
+  UPDATE_SCAN,
+  GET_MERGE_SCAN_RESULTS,
   GET_SCAN,
   GET_SCANS,
   GET_SCAN_CONNECTION_RESULTS,
@@ -30,8 +39,8 @@ export {
   CANCEL_SCAN,
   PAUSE_SCAN,
   RESTART_SCAN,
-  UPDATE_SCAN,
-  GET_MERGE_SCAN_RESULTS,
-  MERGE_SCAN_DIALOG_SHOW,
-  MERGE_SCAN_DIALOG_HIDE
+  EDIT_SCAN_HIDE,
+  EDIT_SCAN_SHOW,
+  MERGE_SCAN_DIALOG_HIDE,
+  MERGE_SCAN_DIALOG_SHOW
 };
diff --git a/src/redux/constants/sourcesConstants.js b/src/redux/constants/sourcesConstants.js
index a54b5df3..4a321714 100644
--- a/src/redux/constants/sourcesConstants.js
+++ b/src/redux/constants/sourcesConstants.js
@@ -1,6 +1,6 @@
 const ADD_SOURCE = 'ADD_SOURCE';
 const DELETE_SOURCE = 'DELETE_SOURCE';
-const DELETE_SOURCES = 'DELETES_SOURCE';
+const DELETE_SOURCES = 'DELETE_SOURCES';
 const GET_SCANS_SOURCES = 'GET_SCANS_SOURCES';
 const GET_SOURCE = 'GET_SOURCE';
 const GET_SOURCES = 'GET_SOURCES';
diff --git a/src/redux/reducers/__tests__/__snapshots__/scansEditReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/scansEditReducer.test.js.snap
new file mode 100644
index 00000000..81c00751
--- /dev/null
+++ b/src/redux/reducers/__tests__/__snapshots__/scansEditReducer.test.js.snap
@@ -0,0 +1,129 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ScansEditReducer should handle all defined error types: rejected types ADD_SCAN 1`] = `
+Object {
+  "result": Object {
+    "add": true,
+    "error": true,
+    "errorMessage": "ERROR",
+    "fulfilled": false,
+    "pending": false,
+    "show": false,
+    "sources": Array [],
+    "start": false,
+  },
+  "type": "ADD_SCAN_REJECTED",
+}
+`;
+
+exports[`ScansEditReducer should handle all defined error types: rejected types ADD_START_SCAN 1`] = `
+Object {
+  "result": Object {
+    "add": false,
+    "error": true,
+    "errorMessage": "ERROR",
+    "fulfilled": false,
+    "pending": false,
+    "show": false,
+    "sources": Array [],
+    "start": true,
+  },
+  "type": "ADD_START_SCAN_REJECTED",
+}
+`;
+
+exports[`ScansEditReducer should handle all defined fulfilled types: fulfilled types ADD_SCAN 1`] = `
+Object {
+  "result": Object {
+    "add": true,
+    "error": false,
+    "errorMessage": "",
+    "fulfilled": true,
+    "pending": false,
+    "show": false,
+    "sources": Array [],
+    "start": false,
+  },
+  "type": "ADD_SCAN_FULFILLED",
+}
+`;
+
+exports[`ScansEditReducer should handle all defined fulfilled types: fulfilled types ADD_START_SCAN 1`] = `
+Object {
+  "result": Object {
+    "add": false,
+    "error": false,
+    "errorMessage": "",
+    "fulfilled": true,
+    "pending": false,
+    "show": false,
+    "sources": Array [],
+    "start": true,
+  },
+  "type": "ADD_START_SCAN_FULFILLED",
+}
+`;
+
+exports[`ScansEditReducer should handle all defined pending types: pending types ADD_SCAN 1`] = `
+Object {
+  "result": Object {
+    "add": true,
+    "error": false,
+    "errorMessage": "",
+    "fulfilled": false,
+    "pending": true,
+    "show": false,
+    "sources": Array [],
+    "start": false,
+  },
+  "type": "ADD_SCAN_PENDING",
+}
+`;
+
+exports[`ScansEditReducer should handle all defined pending types: pending types ADD_START_SCAN 1`] = `
+Object {
+  "result": Object {
+    "add": false,
+    "error": false,
+    "errorMessage": "",
+    "fulfilled": false,
+    "pending": true,
+    "show": false,
+    "sources": Array [],
+    "start": true,
+  },
+  "type": "ADD_START_SCAN_PENDING",
+}
+`;
+
+exports[`ScansEditReducer should handle specific defined types: defined type EDIT_SCAN_HIDE 1`] = `
+Object {
+  "result": Object {
+    "add": false,
+    "error": false,
+    "errorMessage": "",
+    "fulfilled": false,
+    "pending": false,
+    "show": false,
+    "sources": Array [],
+    "start": false,
+  },
+  "type": "EDIT_SCAN_HIDE",
+}
+`;
+
+exports[`ScansEditReducer should handle specific defined types: defined type EDIT_SCAN_SHOW 1`] = `
+Object {
+  "result": Object {
+    "add": false,
+    "error": false,
+    "errorMessage": "",
+    "fulfilled": false,
+    "pending": false,
+    "show": true,
+    "sources": undefined,
+    "start": false,
+  },
+  "type": "EDIT_SCAN_SHOW",
+}
+`;
diff --git a/src/redux/reducers/__tests__/__snapshots__/scansReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/scansReducer.test.js.snap
index 28cc3e7c..e611b302 100644
--- a/src/redux/reducers/__tests__/__snapshots__/scansReducer.test.js.snap
+++ b/src/redux/reducers/__tests__/__snapshots__/scansReducer.test.js.snap
@@ -1,73 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ScansReducer should handle all defined error types: rejected types ADD_SCAN 1`] = `
-Object {
-  "result": Object {
-    "action": Object {
-      "add": true,
-      "cancel": false,
-      "error": true,
-      "errorMessage": "ERROR",
-      "fulfilled": false,
-      "pause": false,
-      "pending": false,
-      "restart": false,
-      "start": false,
-    },
-    "connectionResults": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "results": Array [],
-    },
-    "detail": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "scan": Object {},
-    },
-    "inspectionResults": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "results": Array [],
-    },
-    "jobs": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "jobs": Array [],
-      "pending": false,
-    },
-    "merge_dialog": Object {
-      "details": false,
-      "scans": Array [],
-      "show": false,
-    },
-    "update": Object {
-      "delete": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "lastRefresh": 0,
-      "pending": false,
-      "scans": Array [],
-      "sourcesCount": 0,
-    },
-  },
-  "type": "ADD_SCAN_REJECTED",
-}
-`;
-
 exports[`ScansReducer should handle all defined error types: rejected types CANCEL_SCAN 1`] = `
 Object {
   "result": Object {
@@ -748,74 +680,6 @@ Object {
 }
 `;
 
-exports[`ScansReducer should handle all defined fulfilled types: fulfilled types ADD_SCAN 1`] = `
-Object {
-  "result": Object {
-    "action": Object {
-      "add": true,
-      "cancel": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": true,
-      "pause": false,
-      "pending": false,
-      "restart": false,
-      "start": false,
-    },
-    "connectionResults": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "results": Array [],
-    },
-    "detail": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "scan": Object {},
-    },
-    "inspectionResults": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "results": Array [],
-    },
-    "jobs": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "jobs": Array [],
-      "pending": false,
-    },
-    "merge_dialog": Object {
-      "details": false,
-      "scans": Array [],
-      "show": false,
-    },
-    "update": Object {
-      "delete": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "lastRefresh": 0,
-      "pending": false,
-      "scans": Array [],
-      "sourcesCount": 0,
-    },
-  },
-  "type": "ADD_SCAN_FULFILLED",
-}
-`;
-
 exports[`ScansReducer should handle all defined fulfilled types: fulfilled types CANCEL_SCAN 1`] = `
 Object {
   "result": Object {
@@ -1498,74 +1362,6 @@ Object {
 }
 `;
 
-exports[`ScansReducer should handle all defined pending types: pending types ADD_SCAN 1`] = `
-Object {
-  "result": Object {
-    "action": Object {
-      "add": true,
-      "cancel": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pause": false,
-      "pending": true,
-      "restart": false,
-      "start": false,
-    },
-    "connectionResults": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "results": Array [],
-    },
-    "detail": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "scan": Object {},
-    },
-    "inspectionResults": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "results": Array [],
-    },
-    "jobs": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "jobs": Array [],
-      "pending": false,
-    },
-    "merge_dialog": Object {
-      "details": false,
-      "scans": Array [],
-      "show": false,
-    },
-    "update": Object {
-      "delete": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "lastRefresh": 0,
-      "pending": false,
-      "scans": Array [],
-      "sourcesCount": 0,
-    },
-  },
-  "type": "ADD_SCAN_PENDING",
-}
-`;
-
 exports[`ScansReducer should handle all defined pending types: pending types CANCEL_SCAN 1`] = `
 Object {
   "result": Object {
@@ -2381,71 +2177,3 @@ Object {
   "type": "MERGE_SCAN_DIALOG_SHOW",
 }
 `;
-
-exports[`ScansReducer should handle specific defined types: defined type RESET_SCAN_ADD_STATUS 1`] = `
-Object {
-  "result": Object {
-    "action": Object {
-      "add": false,
-      "cancel": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pause": false,
-      "pending": false,
-      "restart": false,
-      "start": false,
-    },
-    "connectionResults": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "results": Array [],
-    },
-    "detail": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "scan": Object {},
-    },
-    "inspectionResults": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "results": Array [],
-    },
-    "jobs": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "jobs": Array [],
-      "pending": false,
-    },
-    "merge_dialog": Object {
-      "details": false,
-      "scans": Array [],
-      "show": false,
-    },
-    "update": Object {
-      "delete": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "lastRefresh": 0,
-      "pending": false,
-      "scans": Array [],
-      "sourcesCount": 0,
-    },
-  },
-  "type": "RESET_SCAN_ADD_STATUS",
-}
-`;
diff --git a/src/redux/reducers/__tests__/__snapshots__/sourcesReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/sourcesReducer.test.js.snap
index bccaaccb..79d177c9 100644
--- a/src/redux/reducers/__tests__/__snapshots__/sourcesReducer.test.js.snap
+++ b/src/redux/reducers/__tests__/__snapshots__/sourcesReducer.test.js.snap
@@ -1,68 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SourcesReducer should handle all defined error types: rejected types DELETE_SOURCE 1`] = `
-Object {
-  "result": Object {
-    "update": Object {
-      "delete": true,
-      "error": true,
-      "errorMessage": "ERROR",
-      "fulfilled": false,
-      "pending": false,
-      "sourceId": "",
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "sources": Array [],
-      "updateSources": false,
-    },
-  },
-  "type": "DELETE_SOURCE_REJECTED",
-}
-`;
-
-exports[`SourcesReducer should handle all defined error types: rejected types DELETES_SOURCE 1`] = `
-Object {
-  "result": Object {
-    "update": Object {
-      "delete": true,
-      "error": true,
-      "errorMessage": "ERROR",
-      "fulfilled": false,
-      "pending": false,
-      "sourceId": "",
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "sources": Array [],
-      "updateSources": false,
-    },
-  },
-  "type": "DELETES_SOURCE_REJECTED",
-}
-`;
-
 exports[`SourcesReducer should handle all defined error types: rejected types GET_SOURCES 1`] = `
 Object {
   "result": Object {
-    "update": Object {
-      "delete": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "sourceId": "",
-    },
     "view": Object {
       "error": true,
       "errorMessage": "ERROR",
       "fulfilled": false,
+      "lastRefresh": 0,
       "pending": false,
       "sources": Array [],
       "updateSources": false,
@@ -72,69 +17,14 @@ Object {
 }
 `;
 
-exports[`SourcesReducer should handle all defined fulfilled types: fulfilled types DELETE_SOURCE 1`] = `
-Object {
-  "result": Object {
-    "update": Object {
-      "delete": true,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": true,
-      "pending": false,
-      "sourceId": "",
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "sources": Array [],
-      "updateSources": false,
-    },
-  },
-  "type": "DELETE_SOURCE_FULFILLED",
-}
-`;
-
-exports[`SourcesReducer should handle all defined fulfilled types: fulfilled types DELETES_SOURCE 1`] = `
-Object {
-  "result": Object {
-    "update": Object {
-      "delete": true,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": true,
-      "pending": false,
-      "sourceId": "",
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "sources": Array [],
-      "updateSources": false,
-    },
-  },
-  "type": "DELETES_SOURCE_FULFILLED",
-}
-`;
-
 exports[`SourcesReducer should handle all defined fulfilled types: fulfilled types GET_SOURCES 1`] = `
 Object {
   "result": Object {
-    "update": Object {
-      "delete": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "sourceId": "",
-    },
     "view": Object {
       "error": false,
       "errorMessage": "",
       "fulfilled": true,
+      "lastRefresh": 0,
       "pending": false,
       "sources": Array [],
       "updateSources": false,
@@ -144,74 +34,36 @@ Object {
 }
 `;
 
-exports[`SourcesReducer should handle all defined pending types: pending types DELETE_SOURCE 1`] = `
+exports[`SourcesReducer should handle all defined pending types: pending types GET_SOURCES 1`] = `
 Object {
   "result": Object {
-    "update": Object {
-      "delete": true,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": true,
-      "sourceId": "",
-    },
     "view": Object {
       "error": false,
       "errorMessage": "",
       "fulfilled": false,
-      "pending": false,
-      "sources": Array [],
-      "updateSources": false,
-    },
-  },
-  "type": "DELETE_SOURCE_PENDING",
-}
-`;
-
-exports[`SourcesReducer should handle all defined pending types: pending types DELETES_SOURCE 1`] = `
-Object {
-  "result": Object {
-    "update": Object {
-      "delete": true,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
+      "lastRefresh": 0,
       "pending": true,
-      "sourceId": "",
-    },
-    "view": Object {
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
       "sources": Array [],
       "updateSources": false,
     },
   },
-  "type": "DELETES_SOURCE_PENDING",
+  "type": "GET_SOURCES_PENDING",
 }
 `;
 
-exports[`SourcesReducer should handle all defined pending types: pending types GET_SOURCES 1`] = `
+exports[`SourcesReducer should handle specific defined types: defined type UPDATE_SOURCES 1`] = `
 Object {
   "result": Object {
-    "update": Object {
-      "delete": false,
-      "error": false,
-      "errorMessage": "",
-      "fulfilled": false,
-      "pending": false,
-      "sourceId": "",
-    },
     "view": Object {
       "error": false,
       "errorMessage": "",
       "fulfilled": false,
-      "pending": true,
+      "lastRefresh": 0,
+      "pending": false,
       "sources": Array [],
-      "updateSources": false,
+      "updateSources": true,
     },
   },
-  "type": "GET_SOURCES_PENDING",
+  "type": "UPDATE_SOURCES",
 }
 `;
diff --git a/src/redux/reducers/__tests__/scansEditReducer.test.js b/src/redux/reducers/__tests__/scansEditReducer.test.js
new file mode 100644
index 00000000..0ec5d8e9
--- /dev/null
+++ b/src/redux/reducers/__tests__/scansEditReducer.test.js
@@ -0,0 +1,83 @@
+import { scansEditReducer } from '../scansEditReducer';
+import { scansTypes as types } from '../../constants';
+import helpers from '../../../common/helpers';
+
+describe('ScansEditReducer', () => {
+  it('should return the initial state', () => {
+    expect(scansEditReducer.initialState).toBeDefined();
+  });
+
+  it('should handle specific defined types', () => {
+    const specificTypes = [types.EDIT_SCAN_SHOW, types.EDIT_SCAN_HIDE];
+
+    specificTypes.forEach(value => {
+      const dispatched = {
+        type: value
+      };
+
+      const resultState = scansEditReducer(undefined, dispatched);
+
+      expect({ type: value, result: resultState }).toMatchSnapshot(`defined type ${value}`);
+    });
+  });
+
+  it('should handle all defined error types', () => {
+    const specificTypes = [types.ADD_SCAN, types.ADD_START_SCAN];
+
+    specificTypes.forEach(value => {
+      const dispatched = {
+        type: helpers.REJECTED_ACTION(value),
+        error: true,
+        payload: {
+          message: 'MESSAGE',
+          response: {
+            status: 0,
+            statusText: 'ERROR TEST',
+            data: {
+              detail: 'ERROR'
+            }
+          }
+        }
+      };
+
+      const resultState = scansEditReducer(undefined, dispatched);
+
+      expect({ type: helpers.REJECTED_ACTION(value), result: resultState }).toMatchSnapshot(`rejected types ${value}`);
+    });
+  });
+
+  it('should handle all defined pending types', () => {
+    const specificTypes = [types.ADD_SCAN, types.ADD_START_SCAN];
+
+    specificTypes.forEach(value => {
+      const dispatched = {
+        type: helpers.PENDING_ACTION(value)
+      };
+
+      const resultState = scansEditReducer(undefined, dispatched);
+
+      expect({ type: helpers.PENDING_ACTION(value), result: resultState }).toMatchSnapshot(`pending types ${value}`);
+    });
+  });
+
+  it('should handle all defined fulfilled types', () => {
+    const specificTypes = [types.ADD_SCAN, types.ADD_START_SCAN];
+
+    specificTypes.forEach(value => {
+      const dispatched = {
+        type: helpers.FULFILLED_ACTION(value),
+        payload: {
+          data: {
+            test: 'success'
+          }
+        }
+      };
+
+      const resultState = scansEditReducer(undefined, dispatched);
+
+      expect({ type: helpers.FULFILLED_ACTION(value), result: resultState }).toMatchSnapshot(
+        `fulfilled types ${value}`
+      );
+    });
+  });
+});
diff --git a/src/redux/reducers/__tests__/scansReducer.test.js b/src/redux/reducers/__tests__/scansReducer.test.js
index f3dbd28b..1e5e2dad 100644
--- a/src/redux/reducers/__tests__/scansReducer.test.js
+++ b/src/redux/reducers/__tests__/scansReducer.test.js
@@ -8,7 +8,7 @@ describe('ScansReducer', () => {
   });
 
   it('should handle specific defined types', () => {
-    const specificTypes = [types.RESET_SCAN_ADD_STATUS, types.MERGE_SCAN_DIALOG_SHOW, types.MERGE_SCAN_DIALOG_HIDE];
+    const specificTypes = [types.MERGE_SCAN_DIALOG_SHOW, types.MERGE_SCAN_DIALOG_HIDE];
 
     specificTypes.forEach(value => {
       const dispatched = {
@@ -28,7 +28,6 @@ describe('ScansReducer', () => {
       types.GET_SCAN_CONNECTION_RESULTS,
       types.GET_SCAN_INSPECTION_RESULTS,
       types.GET_SCAN_JOBS,
-      types.ADD_SCAN,
       types.START_SCAN,
       types.CANCEL_SCAN,
       types.PAUSE_SCAN,
@@ -65,7 +64,6 @@ describe('ScansReducer', () => {
       types.GET_SCAN_CONNECTION_RESULTS,
       types.GET_SCAN_INSPECTION_RESULTS,
       types.GET_SCAN_JOBS,
-      types.ADD_SCAN,
       types.START_SCAN,
       types.CANCEL_SCAN,
       types.PAUSE_SCAN,
@@ -91,7 +89,6 @@ describe('ScansReducer', () => {
       types.GET_SCAN_CONNECTION_RESULTS,
       types.GET_SCAN_INSPECTION_RESULTS,
       types.GET_SCAN_JOBS,
-      types.ADD_SCAN,
       types.START_SCAN,
       types.CANCEL_SCAN,
       types.PAUSE_SCAN,
diff --git a/src/redux/reducers/__tests__/sourcesReducer.test.js b/src/redux/reducers/__tests__/sourcesReducer.test.js
index 98f6cdeb..b3c016e4 100644
--- a/src/redux/reducers/__tests__/sourcesReducer.test.js
+++ b/src/redux/reducers/__tests__/sourcesReducer.test.js
@@ -7,8 +7,22 @@ describe('SourcesReducer', () => {
     expect(sourcesReducer.initialState).toBeDefined();
   });
 
+  it('should handle specific defined types', () => {
+    const specificTypes = [types.UPDATE_SOURCES];
+
+    specificTypes.forEach(value => {
+      const dispatched = {
+        type: value
+      };
+
+      const resultState = sourcesReducer(undefined, dispatched);
+
+      expect({ type: value, result: resultState }).toMatchSnapshot(`defined type ${value}`);
+    });
+  });
+
   it('should handle all defined error types', () => {
-    const specificTypes = [types.DELETE_SOURCE, types.DELETE_SOURCES, types.GET_SOURCES];
+    const specificTypes = [types.GET_SOURCES];
 
     specificTypes.forEach(value => {
       const dispatched = {
@@ -33,7 +47,7 @@ describe('SourcesReducer', () => {
   });
 
   it('should handle all defined pending types', () => {
-    const specificTypes = [types.DELETE_SOURCE, types.DELETE_SOURCES, types.GET_SOURCES];
+    const specificTypes = [types.GET_SOURCES];
 
     specificTypes.forEach(value => {
       const dispatched = {
@@ -47,7 +61,7 @@ describe('SourcesReducer', () => {
   });
 
   it('should handle all defined fulfilled types', () => {
-    const specificTypes = [types.DELETE_SOURCE, types.DELETE_SOURCES, types.GET_SOURCES];
+    const specificTypes = [types.GET_SOURCES];
 
     specificTypes.forEach(value => {
       const dispatched = {
diff --git a/src/redux/reducers/index.js b/src/redux/reducers/index.js
index c3335f50..b34d8983 100644
--- a/src/redux/reducers/index.js
+++ b/src/redux/reducers/index.js
@@ -7,6 +7,7 @@ import credentialsReducer from './credentialsReducer';
 import factsReducer from './factsReducer';
 import reportsReducer from './reportsReducer';
 import scansReducer from './scansReducer';
+import scansEditReducer from './scansEditReducer';
 import sourcesReducer from './sourcesReducer';
 import statusReducer from './statusReducer';
 import toastNotificationsReducer from './toastNotificationsReducer';
@@ -21,6 +22,7 @@ const reducers = {
   facts: factsReducer,
   reports: reportsReducer,
   scans: scansReducer,
+  scansEdit: scansEditReducer,
   sources: sourcesReducer,
   status: statusReducer,
   toastNotifications: toastNotificationsReducer,
@@ -40,6 +42,7 @@ export {
   factsReducer,
   reportsReducer,
   scansReducer,
+  scansEditReducer,
   sourcesReducer,
   statusReducer,
   toastNotificationsReducer,
diff --git a/src/redux/reducers/scansEditReducer.js b/src/redux/reducers/scansEditReducer.js
new file mode 100644
index 00000000..ecf4b707
--- /dev/null
+++ b/src/redux/reducers/scansEditReducer.js
@@ -0,0 +1,133 @@
+import helpers from '../../common/helpers';
+import { scansTypes } from '../constants';
+
+const initialState = {
+  add: false,
+  error: false,
+  errorMessage: '',
+  fulfilled: false,
+  pending: false,
+  show: false,
+  sources: [],
+  start: false
+};
+
+const scansEditReducer = (state = initialState, action) => {
+  switch (action.type) {
+    case scansTypes.EDIT_SCAN_SHOW:
+      return helpers.setStateProp(
+        null,
+        {
+          show: true,
+          sources: action.sources
+        },
+        {
+          state,
+          initialState
+        }
+      );
+
+    case scansTypes.EDIT_SCAN_HIDE:
+      return helpers.setStateProp(
+        null,
+        {
+          show: false
+        },
+        {
+          state,
+          initialState
+        }
+      );
+
+    case helpers.REJECTED_ACTION(scansTypes.ADD_SCAN):
+      return helpers.setStateProp(
+        null,
+        {
+          pending: false,
+          add: true,
+          error: action.error,
+          errorMessage: helpers.getMessageFromResults(action.payload).message
+        },
+        {
+          state,
+          reset: false
+        }
+      );
+
+    case helpers.PENDING_ACTION(scansTypes.ADD_SCAN):
+      return helpers.setStateProp(
+        null,
+        {
+          add: true,
+          pending: true
+        },
+        {
+          state,
+          reset: false
+        }
+      );
+
+    case helpers.FULFILLED_ACTION(scansTypes.ADD_SCAN):
+      return helpers.setStateProp(
+        null,
+        {
+          add: true,
+          pending: false,
+          fulfilled: true
+        },
+        {
+          state,
+          reset: false
+        }
+      );
+
+    case helpers.REJECTED_ACTION(scansTypes.ADD_START_SCAN):
+      return helpers.setStateProp(
+        null,
+        {
+          pending: false,
+          start: true,
+          error: action.error,
+          errorMessage: helpers.getMessageFromResults(action.payload).message
+        },
+        {
+          state,
+          reset: false
+        }
+      );
+
+    case helpers.PENDING_ACTION(scansTypes.ADD_START_SCAN):
+      return helpers.setStateProp(
+        null,
+        {
+          start: true,
+          pending: true
+        },
+        {
+          state,
+          reset: false
+        }
+      );
+
+    case helpers.FULFILLED_ACTION(scansTypes.ADD_START_SCAN):
+      return helpers.setStateProp(
+        null,
+        {
+          start: true,
+          pending: false,
+          fulfilled: true
+        },
+        {
+          state,
+          reset: false
+        }
+      );
+
+    default:
+      return state;
+  }
+};
+
+scansEditReducer.initialState = initialState;
+
+export { scansEditReducer as default, initialState, scansEditReducer };
diff --git a/src/redux/reducers/scansReducer.js b/src/redux/reducers/scansReducer.js
index c51bcbec..4258a398 100644
--- a/src/redux/reducers/scansReducer.js
+++ b/src/redux/reducers/scansReducer.js
@@ -273,62 +273,6 @@ const scansReducer = (state = initialState, action) => {
         }
       );
 
-    case helpers.REJECTED_ACTION(scansTypes.ADD_SCAN):
-      return helpers.setStateProp(
-        'action',
-        {
-          pending: false,
-          add: true,
-          error: action.error,
-          errorMessage: helpers.getMessageFromResults(action.payload).message
-        },
-        {
-          state,
-          initialState
-        }
-      );
-
-    case helpers.PENDING_ACTION(scansTypes.ADD_SCAN):
-      return helpers.setStateProp(
-        'action',
-        {
-          add: true,
-          pending: true
-        },
-        {
-          state,
-          initialState
-        }
-      );
-
-    case helpers.FULFILLED_ACTION(scansTypes.ADD_SCAN):
-      return helpers.setStateProp(
-        'action',
-        {
-          add: true,
-          pending: false,
-          fulfilled: true
-        },
-        {
-          state,
-          initialState
-        }
-      );
-
-    case scansTypes.RESET_SCAN_ADD_STATUS:
-      return helpers.setStateProp(
-        'action',
-        {
-          error: false,
-          errorMessage: '',
-          fulfilled: false
-        },
-        {
-          state,
-          reset: false
-        }
-      );
-
     case helpers.REJECTED_ACTION(scansTypes.START_SCAN):
       return helpers.setStateProp(
         'action',
diff --git a/src/redux/reducers/sourcesReducer.js b/src/redux/reducers/sourcesReducer.js
index df396d0d..8e5ae202 100644
--- a/src/redux/reducers/sourcesReducer.js
+++ b/src/redux/reducers/sourcesReducer.js
@@ -8,17 +8,9 @@ const initialState = {
     errorMessage: '',
     pending: false,
     fulfilled: false,
+    lastRefresh: 0,
     sources: [],
     updateSources: false
-  },
-
-  update: {
-    error: false,
-    errorMessage: '',
-    pending: false,
-    fulfilled: false,
-    sourceId: '',
-    delete: false
   }
 };
 
@@ -36,49 +28,6 @@ const sourcesReducer = (state = initialState, action) => {
         }
       );
 
-    case helpers.REJECTED_ACTION(sourcesTypes.DELETE_SOURCE):
-    case helpers.REJECTED_ACTION(sourcesTypes.DELETE_SOURCES):
-      return helpers.setStateProp(
-        'update',
-        {
-          error: action.error,
-          errorMessage: helpers.getMessageFromResults(action.payload).message,
-          delete: true
-        },
-        {
-          state,
-          initialState
-        }
-      );
-
-    case helpers.PENDING_ACTION(sourcesTypes.DELETE_SOURCE):
-    case helpers.PENDING_ACTION(sourcesTypes.DELETE_SOURCES):
-      return helpers.setStateProp(
-        'update',
-        {
-          pending: true,
-          delete: true
-        },
-        {
-          state,
-          initialState
-        }
-      );
-
-    case helpers.FULFILLED_ACTION(sourcesTypes.DELETE_SOURCE):
-    case helpers.FULFILLED_ACTION(sourcesTypes.DELETE_SOURCES):
-      return helpers.setStateProp(
-        'update',
-        {
-          fulfilled: true,
-          delete: true
-        },
-        {
-          state,
-          initialState
-        }
-      );
-
     case helpers.REJECTED_ACTION(sourcesTypes.GET_SOURCES):
       return helpers.setStateProp(
         'view',
@@ -109,8 +58,9 @@ const sourcesReducer = (state = initialState, action) => {
       return helpers.setStateProp(
         'view',
         {
-          sources: (action.payload.data && action.payload.data[apiTypes.API_RESPONSE_SOURCES_RESULTS]) || [],
-          fulfilled: true
+          fulfilled: true,
+          lastRefresh: (action.payload.headers && new Date(action.payload.headers.date).getTime()) || 0,
+          sources: (action.payload.data && action.payload.data[apiTypes.API_RESPONSE_SOURCES_RESULTS]) || []
         },
         {
           state,
diff --git a/src/styles/entitlements/_common.scss b/src/styles/entitlements/_common.scss
index 7b41fdbf..1d8bd2ab 100644
--- a/src/styles/entitlements/_common.scss
+++ b/src/styles/entitlements/_common.scss
@@ -7,3 +7,8 @@
 
   @keyframes fadein { 0%{opacity:0} 100%{opacity:1} }
 }
+
+.label abbr, label abbr {
+  border-bottom: none;
+  text-decoration: none;
+}
diff --git a/src/styles/entitlements/_forms.scss b/src/styles/entitlements/_forms.scss
index 9b601bbb..173eae2f 100644
--- a/src/styles/entitlements/_forms.scss
+++ b/src/styles/entitlements/_forms.scss
@@ -5,6 +5,10 @@
   }
 }
 
+textarea.vertical-scroll {
+  resize: vertical;
+}
+
 .quipucords-dropdownselect {
   &.dropdown {
     width:100%;
@@ -46,3 +50,34 @@
     }
   }
 }
+
+.cloudmeter-touchspin {
+  &.cloudmeter-scan-dialog-touchspin {
+    width: 30%;
+  }
+
+  &.form-group {
+    margin-left: 0;
+    margin-right: 0;
+  }
+
+  .cloudmeter-touchspin-input,
+  .cloudmeter-touchspin-max-button {
+    left: -1px;
+  }
+}
+
+.quipucords-form-control.form-control[readonly] {
+  background-color: $color-pf-white;
+  border: 0;
+  color: inherit;
+  font-weight: 700;
+
+  &[type=textarea] {
+    resize: none;
+  }
+}
+
+textarea.quipucords-form-control.form-control[readonly] {
+  resize: none;
+}
diff --git a/src/styles/entitlements/_views.scss b/src/styles/entitlements/_views.scss
index 006b3cdd..28786163 100644
--- a/src/styles/entitlements/_views.scss
+++ b/src/styles/entitlements/_views.scss
@@ -252,16 +252,6 @@
   }
 }
 
-.quipucords-form-control.form-control[readonly] {
-  background-color: $color-pf-white;
-  border: 0;
-  color: inherit;
-  font-weight: 700;
-  &[type=textarea] {
-    resize: none;
-  }
-}
-
 .quipucords-scan-list-item .list-view-pf-left {
   overflow: hidden;
   padding-top: 6px;
diff --git a/yarn.lock b/yarn.lock
index acf45b36..72b095b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8720,15 +8720,15 @@ react-dev-utils@^5.0.2:
     strip-ansi "3.0.1"
     text-table "0.2.0"
 
-react-dom@^16.5.1:
-  version "16.8.3"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.3.tgz#ae236029e66210783ac81999d3015dfc475b9c32"
-  integrity sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA==
+react-dom@^16.8.4:
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48"
+  integrity sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.3"
+    scheduler "^0.13.4"
 
 react-error-overlay@^4.0.1:
   version "4.0.1"
@@ -8908,15 +8908,15 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react@^16.5.1:
-  version "16.8.3"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
-  integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
+react@^16.8.4:
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768"
+  integrity sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.3"
+    scheduler "^0.13.4"
 
 reactabular-table@^8.14.0:
   version "8.14.0"
@@ -9515,10 +9515,10 @@ scheduler@^0.11.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-scheduler@^0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.3.tgz#bed3c5850f62ea9c716a4d781f9daeb9b2a58896"
-  integrity sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ==
+scheduler@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298"
+  integrity sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"

From 400696fb58ea01dbab4a1936e2ad6dad0d803129 Mon Sep 17 00:00:00 2001
From: CD Cabrera <ccabrera@redhat.com>
Date: Thu, 21 Mar 2019 03:55:05 -0400
Subject: [PATCH 2/3] fix(scansEditReducers): improve error messages

* scansEditReducer, submit error messaging
* helpers, getMessages expanded
---
 .../__snapshots__/helpers.test.js.snap        |  6 +--
 src/common/__tests__/helpers.test.js          | 11 ++++-
 src/common/helpers.js                         | 49 ++++++++++++++-----
 .../scansEditReducer.test.js.snap             |  8 +++
 src/redux/reducers/scansEditReducer.js        | 35 ++++++++++++-
 5 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/src/common/__tests__/__snapshots__/helpers.test.js.snap b/src/common/__tests__/__snapshots__/helpers.test.js.snap
index ba7395d2..6e6301ce 100644
--- a/src/common/__tests__/__snapshots__/helpers.test.js.snap
+++ b/src/common/__tests__/__snapshots__/helpers.test.js.snap
@@ -30,14 +30,14 @@ exports[`Helpers should handle http status 400 level error messages from respons
 
 exports[`Helpers should handle http status 400 level error messages from response: 400 fallback again error message 1`] = `"Request failed with status code XXX"`;
 
-exports[`Helpers should handle http status 400 level error messages from response: 400 fallback error message 1`] = `""`;
+exports[`Helpers should handle http status 400 level error messages from response: 400 fallback error message 1`] = `"{\\"ipsum\\":{\\"sed\\":\\"nulla sed consequat urna\\",\\"dolor\\":{\\"sit\\":\\"sit dolor\\\\nconsequat urna\\",\\"placerat\\":\\"\\"}}}"`;
 
 exports[`Helpers should handle http status 400 level error messages from response: 400 fallback yet again error message 1`] = `"XXX Request failed"`;
 
-exports[`Helpers should handle http status 400 level error messages from response: 400 filtered blank message 1`] = `""`;
-
 exports[`Helpers should handle http status 400 level error messages from response: 400 filtered message 1`] = `"Lorem ipsum dolor sit"`;
 
+exports[`Helpers should handle http status 400 level error messages from response: 400 filtered object message 1`] = `"{\\"sit\\":[\\"sit dolor\\",\\"consequat urna\\"],\\"placerat\\":[{\\"ante\\":\\"sed placerat ante\\"}]"`;
+
 exports[`Helpers should handle http status 500 level error messages from response: 500 level error message 1`] = `"500 Lorem ipsum dolor sit"`;
 
 exports[`Helpers should handle http status 500 level error messages from response: 500 level fallback again error message 1`] = `"500 Request failed with status code XXX"`;
diff --git a/src/common/__tests__/helpers.test.js b/src/common/__tests__/helpers.test.js
index 99592c13..adc041cd 100644
--- a/src/common/__tests__/helpers.test.js
+++ b/src/common/__tests__/helpers.test.js
@@ -127,7 +127,14 @@ describe('Helpers', () => {
     const payload = {
       response: {
         data: {
-          lorem: ['Lorem ipsum dolor sit']
+          lorem: ['Lorem ipsum dolor sit'],
+          ipsum: {
+            sed: 'nulla sed consequat urna',
+            dolor: {
+              sit: ['sit dolor', 'consequat urna'],
+              placerat: [{ ante: 'sed placerat ante' }]
+            }
+          }
         },
         status: 400,
         statusText: 'Bad Request',
@@ -143,7 +150,7 @@ describe('Helpers', () => {
 
     expect(helpers.getMessageFromResults(payload, 'lorem').message).toMatchSnapshot('400 filtered message');
 
-    expect(helpers.getMessageFromResults(payload, 'dolor').message).toMatchSnapshot('400 filtered blank message');
+    expect(helpers.getMessageFromResults(payload, 'dolor').message).toMatchSnapshot('400 filtered object message');
 
     delete payload.response.data.lorem;
     expect(helpers.getMessageFromResults(payload).message).toMatchSnapshot('400 fallback error message');
diff --git a/src/common/helpers.js b/src/common/helpers.js
index f2db5a58..6409db0e 100644
--- a/src/common/helpers.js
+++ b/src/common/helpers.js
@@ -199,13 +199,11 @@ const getMessageFromResults = (results, filter = null) => {
     return messages;
   }
 
-  const getMessages = (messageObjectArrayString, filterField) => {
+  const getMessages = messageObjectArrayString => {
     const parsed = {};
-    const parsedFiltered = {};
-    const filterFields = (Array.isArray(filterField) && filterField) || (filterField && [filterField]) || [];
 
     if (messageObjectArrayString && typeof messageObjectArrayString === 'string') {
-      return messageObjectArrayString.replace(/\[object\sObject\]/g, '');
+      return messageObjectArrayString.replace(/\[object\sObject]/g, '');
     }
 
     if (Array.isArray(messageObjectArrayString)) {
@@ -213,21 +211,50 @@ const getMessageFromResults = (results, filter = null) => {
     }
 
     Object.keys(messageObjectArrayString).forEach(key => {
-      const message = getMessages(messageObjectArrayString[key]);
+      parsed[key] = getMessages(messageObjectArrayString[key]);
+    });
 
-      if (filterFields.length && filterFields.includes(key)) {
-        parsedFiltered[key] = message;
-      }
+    return parsed;
+  };
+
+  const filtered = (messageObjectArrayString, filterField) => {
+    const parsed = {};
+    const str = JSON.stringify(messageObjectArrayString);
+    const filterFields = (Array.isArray(filterField) && filterField) || (filterField && [filterField]) || [];
+
+    filterFields.forEach(val => {
+      const match = str.match(new RegExp(`"${val}":(\\[(.*?)]]?|{(.*?)}]?|"(.*?)"),?`));
 
-      parsed[key] = message;
+      if (match && match[1]) {
+        parsed[val] = match[1]; // eslint-disable-line
+
+        if (match && match[2]) {
+          parsed[val] = JSON.parse(match[1]);
+
+          if (Array.isArray(parsed[val])) {
+            parsed[val] = parsed[val].join(', ');
+          } else if (typeof parsed[val] !== 'string') {
+            parsed[val] = Object.values(parsed[val]).join(', ');
+          }
+
+          parsed[val] = parsed[val].replace(/,?\s?\[object\sObject]/, '');
+        }
+      }
     });
 
-    return filterFields.length ? parsedFiltered : parsed;
+    return parsed;
   };
 
-  messages.messages = getMessages(messageResponse || detailResponse, filter);
+  messages.messages =
+    (filter && filtered(messageResponse || detailResponse, filter)) || getMessages(messageResponse || detailResponse);
   messages.message = `${displayStatus}${Object.values(messages.messages).join('\n')}`;
 
+  if (messages.message === '[object Object]') {
+    messages.message = JSON.stringify(messages.messages);
+  } else {
+    messages.message = messages.message.replace(/\n?\[object\sObject]/g, '');
+  }
+
   return messages;
 };
 
diff --git a/src/redux/reducers/__tests__/__snapshots__/scansEditReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/scansEditReducer.test.js.snap
index 81c00751..845e6c28 100644
--- a/src/redux/reducers/__tests__/__snapshots__/scansEditReducer.test.js.snap
+++ b/src/redux/reducers/__tests__/__snapshots__/scansEditReducer.test.js.snap
@@ -11,6 +11,7 @@ Object {
     "show": false,
     "sources": Array [],
     "start": false,
+    "submitErrorMessages": Object {},
   },
   "type": "ADD_SCAN_REJECTED",
 }
@@ -27,6 +28,7 @@ Object {
     "show": false,
     "sources": Array [],
     "start": true,
+    "submitErrorMessages": Object {},
   },
   "type": "ADD_START_SCAN_REJECTED",
 }
@@ -43,6 +45,7 @@ Object {
     "show": false,
     "sources": Array [],
     "start": false,
+    "submitErrorMessages": Object {},
   },
   "type": "ADD_SCAN_FULFILLED",
 }
@@ -59,6 +62,7 @@ Object {
     "show": false,
     "sources": Array [],
     "start": true,
+    "submitErrorMessages": Object {},
   },
   "type": "ADD_START_SCAN_FULFILLED",
 }
@@ -75,6 +79,7 @@ Object {
     "show": false,
     "sources": Array [],
     "start": false,
+    "submitErrorMessages": Object {},
   },
   "type": "ADD_SCAN_PENDING",
 }
@@ -91,6 +96,7 @@ Object {
     "show": false,
     "sources": Array [],
     "start": true,
+    "submitErrorMessages": Object {},
   },
   "type": "ADD_START_SCAN_PENDING",
 }
@@ -107,6 +113,7 @@ Object {
     "show": false,
     "sources": Array [],
     "start": false,
+    "submitErrorMessages": Object {},
   },
   "type": "EDIT_SCAN_HIDE",
 }
@@ -123,6 +130,7 @@ Object {
     "show": true,
     "sources": undefined,
     "start": false,
+    "submitErrorMessages": Object {},
   },
   "type": "EDIT_SCAN_SHOW",
 }
diff --git a/src/redux/reducers/scansEditReducer.js b/src/redux/reducers/scansEditReducer.js
index ecf4b707..ce49bf43 100644
--- a/src/redux/reducers/scansEditReducer.js
+++ b/src/redux/reducers/scansEditReducer.js
@@ -1,5 +1,6 @@
 import helpers from '../../common/helpers';
 import { scansTypes } from '../constants';
+import apiTypes from '../../constants/apiConstants';
 
 const initialState = {
   add: false,
@@ -9,7 +10,8 @@ const initialState = {
   pending: false,
   show: false,
   sources: [],
-  start: false
+  start: false,
+  submitErrorMessages: {}
 };
 
 const scansEditReducer = (state = initialState, action) => {
@@ -40,13 +42,42 @@ const scansEditReducer = (state = initialState, action) => {
       );
 
     case helpers.REJECTED_ACTION(scansTypes.ADD_SCAN):
+      const filterProperties = [
+        apiTypes.API_SUBMIT_SCAN_NAME,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS,
+        apiTypes.API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY,
+        apiTypes.API_SUBMIT_SCAN_SOURCES
+      ];
+
+      const rejectedErrors = helpers.getMessageFromResults(action.payload, filterProperties);
+      const messages = {};
+
+      Object.keys(rejectedErrors.messages || {}).forEach(key => {
+        if (apiTypes.API_SUBMIT_SCAN_NAME === key) {
+          messages.scanName = rejectedErrors.messages[key];
+        }
+
+        if (apiTypes.API_SUBMIT_SCAN_OPTIONS_EXTENDED_SEARCH_DIRS === key) {
+          messages.scanDirectories = rejectedErrors.messages[key];
+        }
+
+        if (apiTypes.API_SUBMIT_SCAN_OPTIONS_MAX_CONCURRENCY === key) {
+          messages.scanConcurrency = rejectedErrors.messages[key];
+        }
+
+        if (apiTypes.API_SUBMIT_SCAN_SOURCES === key) {
+          messages.scanSources = rejectedErrors.messages[key];
+        }
+      });
+
       return helpers.setStateProp(
         null,
         {
           pending: false,
           add: true,
           error: action.error,
-          errorMessage: helpers.getMessageFromResults(action.payload).message
+          errorMessage: helpers.getMessageFromResults(action.payload).message,
+          submitErrorMessages: messages
         },
         {
           state,

From a33d8ebd99a6ecc054fae6fa3ab08c252185fdb9 Mon Sep 17 00:00:00 2001
From: CD Cabrera <ccabrera@redhat.com>
Date: Mon, 25 Mar 2019 10:49:41 -0400
Subject: [PATCH 3/3] DEV review updates

---
 .../__tests__/__snapshots__/addSourceWizard.test.js.snap        | 2 ++
 src/components/addSourceWizard/addSourceWizard.js               | 2 +-
 .../__tests__/__snapshots__/createScanDialog.test.js.snap       | 1 +
 src/components/createScanDialog/createScanDialog.js             | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/addSourceWizard/__tests__/__snapshots__/addSourceWizard.test.js.snap b/src/components/addSourceWizard/__tests__/__snapshots__/addSourceWizard.test.js.snap
index c71d0a40..dfce5f95 100644
--- a/src/components/addSourceWizard/__tests__/__snapshots__/addSourceWizard.test.js.snap
+++ b/src/components/addSourceWizard/__tests__/__snapshots__/addSourceWizard.test.js.snap
@@ -13,6 +13,7 @@ exports[`AddSourceWizard Component should display update steps: connected update
     title="Edit Source"
   />
   <WizardBody
+    aria-live="polite"
     className=""
   >
     <WizardSteps
@@ -130,6 +131,7 @@ exports[`AddSourceWizard Component should render a connected component: connecte
     title="Add Source"
   />
   <WizardBody
+    aria-live="polite"
     className=""
   >
     <WizardSteps
diff --git a/src/components/addSourceWizard/addSourceWizard.js b/src/components/addSourceWizard/addSourceWizard.js
index 786b7eeb..6d4beca1 100644
--- a/src/components/addSourceWizard/addSourceWizard.js
+++ b/src/components/addSourceWizard/addSourceWizard.js
@@ -163,7 +163,7 @@ class AddSourceWizard extends React.Component {
     return (
       <Wizard show={show}>
         <Wizard.Header onClose={this.onCancel} title={edit ? 'Edit Source' : 'Add Source'} />
-        <Wizard.Body>
+        <Wizard.Body aria-live="polite">
           <Wizard.Steps steps={this.renderWizardSteps()} />
           <Wizard.Row>
             <Wizard.Main>
diff --git a/src/components/createScanDialog/__tests__/__snapshots__/createScanDialog.test.js.snap b/src/components/createScanDialog/__tests__/__snapshots__/createScanDialog.test.js.snap
index f4fde57f..9ca92500 100644
--- a/src/components/createScanDialog/__tests__/__snapshots__/createScanDialog.test.js.snap
+++ b/src/components/createScanDialog/__tests__/__snapshots__/createScanDialog.test.js.snap
@@ -44,6 +44,7 @@ exports[`CreateScanDialog Component should render a basic component 1`] = `
             </h4>
           </div>
           <div
+            aria-live="polite"
             class="modal-body"
           >
             <div
diff --git a/src/components/createScanDialog/createScanDialog.js b/src/components/createScanDialog/createScanDialog.js
index c09a2fd8..073549a2 100644
--- a/src/components/createScanDialog/createScanDialog.js
+++ b/src/components/createScanDialog/createScanDialog.js
@@ -302,7 +302,7 @@ class CreateScanDialog extends React.Component {
                 </button>
                 <Modal.Title>Scan</Modal.Title>
               </Modal.Header>
-              <Modal.Body>
+              <Modal.Body aria-live="polite">
                 {pending && (
                   <React.Fragment>
                     <Spinner loading size="lg" className="blank-slate-pf-icon" />