From c416264c595bd0f0f07acf5124207fc1ff19be30 Mon Sep 17 00:00:00 2001
From: Brandon Nicholls <brandon.nicholls@gmail.com>
Date: Tue, 15 Dec 2015 14:17:26 -0700
Subject: [PATCH] React eslint fixes

---
 .eslintrc                                     | 19 +++-
 client/scripts/HttpUtils.js                   |  2 +-
 .../DetailView/AdminDeclarationsSummary.jsx   |  3 +-
 .../Admin/DetailView/DetailView.jsx           |  3 +-
 .../Admin/DetailView/DisclosureDetail.jsx     |  8 +-
 .../Admin/DetailView/EntitySummary.jsx        |  3 +-
 .../Config/Declarations/DeclarationType.jsx   | 10 ++-
 .../Config/General/NewNotification.jsx        |  3 +-
 .../Config/General/Notification.jsx           |  3 +-
 .../Config/General/NotificationDetails.jsx    | 16 ++--
 .../scripts/components/Config/NewQuestion.jsx |  9 +-
 .../components/Config/QuestionnaireConfig.jsx |  6 +-
 client/scripts/components/DatePicker.jsx      |  6 +-
 .../components/DynamicIcons/CheckmarkIcon.jsx |  2 +
 .../DynamicIcons/CompletedStepIcon.jsx        |  2 +
 .../DynamicIcons/CurrentStepIcon.jsx          |  2 +
 .../components/DynamicIcons/FEPlaceHolder.jsx |  2 +
 .../components/DynamicIcons/Gripper.jsx       |  2 +
 .../DynamicIcons/ManualPlaceholder.jsx        |  2 +
 .../components/DynamicIcons/PlusIcon.jsx      |  2 +
 client/scripts/components/GreyButton.jsx      |  2 +
 .../components/User/Archive/ArchiveDetail.jsx |  3 +-
 .../User/Archive/DeclarationsSummary.jsx      |  6 +-
 .../scripts/components/User/CurrencyField.jsx | 15 +++-
 .../components/User/DateRangeField.jsx        | 16 +++-
 .../Entities/EntityFormRelationshipStep.jsx   | 32 +++++--
 .../User/Entities/RelationshipTextField.jsx   |  8 +-
 .../components/User/Entities/Toggle.jsx       |  3 +-
 .../components/User/Entities/ToggleSet.jsx    |  2 +-
 .../components/User/Projects/Entity.jsx       |  3 +-
 .../User/Projects/EntityRelationDialog.jsx    |  9 +-
 .../components/User/Projects/Project.jsx      |  3 +-
 .../User/Projects/ProjectRelationDialog.jsx   |  9 +-
 client/scripts/components/User/TextField.jsx  | 10 ++-
 .../scripts/components/User/ToggleButton.jsx  |  3 +-
 client/scripts/components/VerticalSlider.jsx  |  2 +-
 client/scripts/stores/DisclosureStore.js      |  9 +-
 db/migration/seeds/A.js                       | 90 +++++++++++++++++--
 loadtest/tests/api/coi/config/POST.js         |  2 +-
 .../_id/financial-entities/POST.js            |  2 +-
 package.json                                  |  2 +-
 server/db/DisclosureDB.js                     | 55 +++++++++++-
 server/db/PIReviewDB.js                       | 10 ++-
 server/db/ProjectDB.js                        | 17 +++-
 server/db/TravelLogDB.js                      | 14 ++-
 45 files changed, 356 insertions(+), 76 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 5174c8e9..8d45834b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -22,6 +22,7 @@
             2, 
             { "skipBlankLines": true }
         ],
+        "max-len": [1, 180, 2],
         "no-unexpected-multiline": 2,
         "block-scoped-var": 2,
         "consistent-return": 2,
@@ -50,7 +51,23 @@
         "no-var": 2,
         "object-shorthand": 2,
         "prefer-const": 2,
-        "prefer-template": 2
+        "prefer-template": 2,
+        "react/jsx-closing-bracket-location": 2,
+        "react/jsx-curly-spacing": 2,
+        "react/jsx-indent-props": [2, 2],
+        "react/jsx-key": 2,
+        "react/jsx-no-duplicate-props": 2,
+        "react/jsx-no-undef": 2,
+        "react/jsx-pascal-case": 2,
+        "react/jsx-uses-react": 2,
+        "react/jsx-uses-vars": 2,
+        "react/no-did-mount-set-state": 2,
+        "react/no-did-update-set-state": 2,
+        "react/no-direct-mutation-state": 2,
+        "react/no-unknown-property": 2,
+        "react/prefer-es6-class": 2,
+        "react/require-extension": [2, { "extensions": [".js", ".jsx"] }],
+        "react/self-closing-comp": 2
     },
     "env": {
         "es6": true,
diff --git a/client/scripts/HttpUtils.js b/client/scripts/HttpUtils.js
index a6b85290..0c131e7b 100644
--- a/client/scripts/HttpUtils.js
+++ b/client/scripts/HttpUtils.js
@@ -18,7 +18,7 @@
 
 import defaults from 'superagent-defaults';
 import cookies from 'cookies-js';
-import {UNAUTHORIZED} from './HTTPStatusCodes';
+import {UNAUTHORIZED} from '../../HTTPStatusCodes';
 
 export function processResponse(callback) {
   return (err, res) => {
diff --git a/client/scripts/components/Admin/DetailView/AdminDeclarationsSummary.jsx b/client/scripts/components/Admin/DetailView/AdminDeclarationsSummary.jsx
index bcd29b1a..d5eefcdc 100644
--- a/client/scripts/components/Admin/DetailView/AdminDeclarationsSummary.jsx
+++ b/client/scripts/components/Admin/DetailView/AdminDeclarationsSummary.jsx
@@ -149,7 +149,8 @@ export class AdminDeclarationsSummary extends React.Component {
 
         return (
           <div key={`proj${project.id}`}
-            style={index === uniqueProjects.length - 1 ? styles.lastrelationship : styles.relationship}>
+            style={index === uniqueProjects.length - 1 ? styles.lastrelationship : styles.relationship}
+          >
             <div style={styles.name}>{project.name}</div>
             <div style={styles.field}>
               <label style={styles.label}>Project Type:</label>
diff --git a/client/scripts/components/Admin/DetailView/DetailView.jsx b/client/scripts/components/Admin/DetailView/DetailView.jsx
index 948fb50e..0ef5cb8a 100644
--- a/client/scripts/components/Admin/DetailView/DetailView.jsx
+++ b/client/scripts/components/Admin/DetailView/DetailView.jsx
@@ -132,7 +132,8 @@ export class DetailView extends React.Component {
       sidePanel = (
         <AdditionalReviewPanel
           managementPlan={managementPlan}
-          readonly={readOnly}/>
+          readonly={readOnly}
+        />
       );
     }
     else if (this.state.applicationState.commentSummaryShowing) {
diff --git a/client/scripts/components/Admin/DetailView/DisclosureDetail.jsx b/client/scripts/components/Admin/DetailView/DisclosureDetail.jsx
index 7d1e90d7..9cf4a2e2 100644
--- a/client/scripts/components/Admin/DetailView/DisclosureDetail.jsx
+++ b/client/scripts/components/Admin/DetailView/DisclosureDetail.jsx
@@ -207,11 +207,15 @@ export class DisclosureDetail extends React.Component {
           </span>
           <span style={{display: 'inline-block'}}>
             <ApprovalConfirmation id={this.props.disclosure.id} style={styles.confirmation} />
-            <RejectionConfirmation id={this.props.disclosure.id} canReject={piComments.length > 0 } style={styles.rejection} />
+            <RejectionConfirmation id={this.props.disclosure.id} canReject={piComments.length > 0} style={styles.rejection} />
             <ActionButtons
               style={styles.actionButtons}
               showAttachments={this.props.disclosure.files.length > 0}
-              readonly={this.props.disclosure.statusCd === COIConstants.DISCLOSURE_STATUS.UP_TO_DATE || this.props.disclosure.statusCd === COIConstants.DISCLOSURE_STATUS.UPDATES_REQUIRED}/>
+              readonly={
+                this.props.disclosure.statusCd === COIConstants.DISCLOSURE_STATUS.UP_TO_DATE ||
+                this.props.disclosure.statusCd === COIConstants.DISCLOSURE_STATUS.UPDATES_REQUIRED
+              }
+            />
           </span>
         </div>
       </div>
diff --git a/client/scripts/components/Admin/DetailView/EntitySummary.jsx b/client/scripts/components/Admin/DetailView/EntitySummary.jsx
index dc5920f2..5c5baad6 100644
--- a/client/scripts/components/Admin/DetailView/EntitySummary.jsx
+++ b/client/scripts/components/Admin/DetailView/EntitySummary.jsx
@@ -183,7 +183,8 @@ export default class EntitySummary extends React.Component {
               color: window.colorBlindModeOn ? 'black' : '#0095A0',
               borderBottom: `1px dotted ${window.colorBlindModeOn ? 'black' : '#0095A0'}`
             }}
-            href={`/api/coi/files/${encodeURIComponent(file.id)}`}>
+            href={`/api/coi/files/${encodeURIComponent(file.id)}`}
+          >
               {file.name}
           </a>
         </div>
diff --git a/client/scripts/components/Config/Declarations/DeclarationType.jsx b/client/scripts/components/Config/Declarations/DeclarationType.jsx
index 61976d8c..76746bb3 100644
--- a/client/scripts/components/Config/Declarations/DeclarationType.jsx
+++ b/client/scripts/components/Config/Declarations/DeclarationType.jsx
@@ -113,7 +113,15 @@ export default class DeclarationType extends React.Component {
     if (this.typeIsBeingEdited(type)) {
       jsx = (
         <span>
-          <input ref="typeName" type="text" style={styles.textbox} defaultValue={type.description} value={this.getNewValue(type)} onKeyUp={this.lookForEnter} onChange={this.nameChanged} />
+          <input
+            ref="typeName"
+            type="text"
+            style={styles.textbox}
+            defaultValue={type.description}
+            value={this.getNewValue(type)}
+            onKeyUp={this.lookForEnter}
+            onChange={this.nameChanged}
+          />
           <DoneLink style={styles.editLink} onClick={this.doneEditing} />
         </span>
       );
diff --git a/client/scripts/components/Config/General/NewNotification.jsx b/client/scripts/components/Config/General/NewNotification.jsx
index d457347b..e9cebde1 100644
--- a/client/scripts/components/Config/General/NewNotification.jsx
+++ b/client/scripts/components/Config/General/NewNotification.jsx
@@ -68,7 +68,8 @@ export default class NewNotifications extends React.Component {
           onChange={this.setReminderText}
           style={styles.expirationMessage}
           placeholder="Enter the reminder text here"
-          value={this.props.reminderText}>
+          value={this.props.reminderText}
+        >
         </textarea>
       </div>
     );
diff --git a/client/scripts/components/Config/General/Notification.jsx b/client/scripts/components/Config/General/Notification.jsx
index 73b3a668..b528b73f 100644
--- a/client/scripts/components/Config/General/Notification.jsx
+++ b/client/scripts/components/Config/General/Notification.jsx
@@ -102,7 +102,8 @@ export default class Notification extends React.Component {
           ref="reminderText"
           style={styles.reminderTextbox}
           placeholder="Enter the reminder text here"
-          defaultValue={this.props.reminderText}>
+          defaultValue={this.props.reminderText}
+        >
         </textarea>
       );
 
diff --git a/client/scripts/components/Config/General/NotificationDetails.jsx b/client/scripts/components/Config/General/NotificationDetails.jsx
index fa98de3e..0243fb4a 100644
--- a/client/scripts/components/Config/General/NotificationDetails.jsx
+++ b/client/scripts/components/Config/General/NotificationDetails.jsx
@@ -125,13 +125,15 @@ export default class NotificationDetails extends React.Component {
     let notifications;
     if (this.props.notifications && this.props.notifications.length > 0) {
       notifications = this.props.notifications.map((notification, index) => {
-        return <Notification
-                  key={index}
-                  id={notification.id}
-                  warningValue={notification.warningValue}
-                  warningPeriod={notification.warningPeriod}
-                  reminderText={notification.reminderText}
-               />;
+        return (
+          <Notification
+            key={index}
+            id={notification.id}
+            warningValue={notification.warningValue}
+            warningPeriod={notification.warningPeriod}
+            reminderText={notification.reminderText}
+          />
+        );
       });
     }
 
diff --git a/client/scripts/components/Config/NewQuestion.jsx b/client/scripts/components/Config/NewQuestion.jsx
index a77796c4..c9739bf7 100644
--- a/client/scripts/components/Config/NewQuestion.jsx
+++ b/client/scripts/components/Config/NewQuestion.jsx
@@ -198,7 +198,14 @@ export default class NewQuestion extends React.Component {
         <span style={styles.requiredSelectionsSection}>
           <label style={styles.label} htmlFor="requiredNumSelections">SELECTIONS REQUIRED</label>
           <div>
-            <input style={styles.textbox} type="number" id="requiredNumSelections" ref="requiredNumSelections" onChange={this.requiredSelectionsChanged} value={this.props.question.question.requiredNumSelections} />
+            <input
+              style={styles.textbox}
+              type="number"
+              id="requiredNumSelections"
+              ref="requiredNumSelections"
+              onChange={this.requiredSelectionsChanged}
+              value={this.props.question.question.requiredNumSelections}
+            />
           </div>
         </span>
       );
diff --git a/client/scripts/components/Config/QuestionnaireConfig.jsx b/client/scripts/components/Config/QuestionnaireConfig.jsx
index 018e9152..51b5c9fd 100644
--- a/client/scripts/components/Config/QuestionnaireConfig.jsx
+++ b/client/scripts/components/Config/QuestionnaireConfig.jsx
@@ -342,7 +342,8 @@ class QuestionnaireConfig extends React.Component {
           text={question.question.text}
           isSubQuestion={false}
           top={question.question.top}
-          style={questionStyle} />
+          style={questionStyle}
+        />
       );
 
       this.findSubQuestions(question.id).forEach(subQuestion => {
@@ -362,7 +363,8 @@ class QuestionnaireConfig extends React.Component {
             isSubQuestion={true}
             top={subQuestion.question.top}
             style={{cursor: 'move'}}
-            displayCriteria={subQuestion.question.displayCriteria} />
+            displayCriteria={subQuestion.question.displayCriteria}
+          />
         );
       });
     });
diff --git a/client/scripts/components/DatePicker.jsx b/client/scripts/components/DatePicker.jsx
index c4abd23b..b3808884 100644
--- a/client/scripts/components/DatePicker.jsx
+++ b/client/scripts/components/DatePicker.jsx
@@ -87,7 +87,8 @@ export class DatePicker extends ResponsiveComponent {
           value={this.props.value ? formatDate(this.props.value) : ''}
           placeholder="Select a date"
           onFocus={this.showCalendar}
-          style={merge(styles.textField, this.props.textFieldStyle)} />
+          style={merge(styles.textField, this.props.textFieldStyle)}
+        />
 
         <DayPicker
           style={styles.calendar}
@@ -95,7 +96,8 @@ export class DatePicker extends ResponsiveComponent {
           enableOutsideDays={true}
           numberOfMonths={1}
           canChangeMonth={true}
-          onDayClick={this.dayClicked} />
+          onDayClick={this.dayClicked}
+        />
       </div>
     );
   }
diff --git a/client/scripts/components/DynamicIcons/CheckmarkIcon.jsx b/client/scripts/components/DynamicIcons/CheckmarkIcon.jsx
index 7a22a917..f66a42d3 100644
--- a/client/scripts/components/DynamicIcons/CheckmarkIcon.jsx
+++ b/client/scripts/components/DynamicIcons/CheckmarkIcon.jsx
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+/* eslint-disable max-len */
+
 import React from 'react';
 
 export default function CheckmarkIcon(props: Object): React.Element {
diff --git a/client/scripts/components/DynamicIcons/CompletedStepIcon.jsx b/client/scripts/components/DynamicIcons/CompletedStepIcon.jsx
index cfe537c2..45dbaf7c 100644
--- a/client/scripts/components/DynamicIcons/CompletedStepIcon.jsx
+++ b/client/scripts/components/DynamicIcons/CompletedStepIcon.jsx
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+/* eslint-disable react/jsx-closing-bracket-location */
+
 import React from 'react';
 
 export function CompletedStepIcon(props: Object): React.Element {
diff --git a/client/scripts/components/DynamicIcons/CurrentStepIcon.jsx b/client/scripts/components/DynamicIcons/CurrentStepIcon.jsx
index 199603fa..8187cf02 100644
--- a/client/scripts/components/DynamicIcons/CurrentStepIcon.jsx
+++ b/client/scripts/components/DynamicIcons/CurrentStepIcon.jsx
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+/* eslint-disable */
+
 import React from 'react';
 
 export function CurrentStepIcon(props: Object): React.Element {
diff --git a/client/scripts/components/DynamicIcons/FEPlaceHolder.jsx b/client/scripts/components/DynamicIcons/FEPlaceHolder.jsx
index 890377ef..f89332c7 100644
--- a/client/scripts/components/DynamicIcons/FEPlaceHolder.jsx
+++ b/client/scripts/components/DynamicIcons/FEPlaceHolder.jsx
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+/* eslint-disable react/jsx-closing-bracket-location, react/jsx-pascal-case */
+
 import React from 'react';
 
 export function FEPlaceHolder(props: Object): React.Element {
diff --git a/client/scripts/components/DynamicIcons/Gripper.jsx b/client/scripts/components/DynamicIcons/Gripper.jsx
index 4ecf6856..fbdd4b05 100644
--- a/client/scripts/components/DynamicIcons/Gripper.jsx
+++ b/client/scripts/components/DynamicIcons/Gripper.jsx
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+/* eslint-disable max-len */
+
 import React from 'react';
 
 export default function Gripper(props: Object): React.Element {
diff --git a/client/scripts/components/DynamicIcons/ManualPlaceholder.jsx b/client/scripts/components/DynamicIcons/ManualPlaceholder.jsx
index 72fc1986..c512ef17 100644
--- a/client/scripts/components/DynamicIcons/ManualPlaceholder.jsx
+++ b/client/scripts/components/DynamicIcons/ManualPlaceholder.jsx
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+/* eslint-disable react/jsx-closing-bracket-location, react/jsx-pascal-case */
+
 import React from 'react';
 
 export function ManualPlaceholder(props: Object): React.Element {
diff --git a/client/scripts/components/DynamicIcons/PlusIcon.jsx b/client/scripts/components/DynamicIcons/PlusIcon.jsx
index 1d1dae0b..e0e35f78 100644
--- a/client/scripts/components/DynamicIcons/PlusIcon.jsx
+++ b/client/scripts/components/DynamicIcons/PlusIcon.jsx
@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+/* eslint-disable max-len, react/jsx-closing-bracket-location */
+
 import React from 'react';
 
 export function PlusIcon(props: Object): React.Element {
diff --git a/client/scripts/components/GreyButton.jsx b/client/scripts/components/GreyButton.jsx
index 2fcd5efa..dfc0616a 100644
--- a/client/scripts/components/GreyButton.jsx
+++ b/client/scripts/components/GreyButton.jsx
@@ -16,6 +16,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
+/* eslint-disable react/jsx-key */
+
 import React from 'react'; // eslint-disable-line no-unused-vars
 import {merge} from '../merge';
 
diff --git a/client/scripts/components/User/Archive/ArchiveDetail.jsx b/client/scripts/components/User/Archive/ArchiveDetail.jsx
index 3332998f..66935b69 100644
--- a/client/scripts/components/User/Archive/ArchiveDetail.jsx
+++ b/client/scripts/components/User/Archive/ArchiveDetail.jsx
@@ -66,7 +66,8 @@ export default class extends React.Component {
             declarations={disclosure.declarations}
             projectTypes={this.props.config.projectTypes}
             declarationTypes={this.props.config.declarationTypes}
-            id={disclosure.id} />
+            id={disclosure.id}
+          />
         </div>
       );
     }
diff --git a/client/scripts/components/User/Archive/DeclarationsSummary.jsx b/client/scripts/components/User/Archive/DeclarationsSummary.jsx
index dbdd3b5f..36cedb41 100644
--- a/client/scripts/components/User/Archive/DeclarationsSummary.jsx
+++ b/client/scripts/components/User/Archive/DeclarationsSummary.jsx
@@ -149,8 +149,10 @@ export default class extends React.Component {
         });
 
         return (
-          <div key={`proj${project.id}`}
-            style={index === uniqueProjects.length - 1 ? styles.lastrelationship : styles.relationship}>
+          <div
+            key={`proj${project.id}`}
+            style={index === uniqueProjects.length - 1 ? styles.lastrelationship : styles.relationship}
+          >
             <div style={styles.name}>{project.name}</div>
             <div style={styles.field}>
               <label style={styles.label}>Project Type:</label>
diff --git a/client/scripts/components/User/CurrencyField.jsx b/client/scripts/components/User/CurrencyField.jsx
index e797fd6f..daeba3ac 100644
--- a/client/scripts/components/User/CurrencyField.jsx
+++ b/client/scripts/components/User/CurrencyField.jsx
@@ -56,11 +56,20 @@ export default class NumericField extends TextField {
 
     return (
       <div style={this.props.styles.container}>
-        <label htmlFor={this.props.id} style={this.getLabelStyle(this.props.invalid, this.props.styles.label)}>{this.props.label}</label>
+        <label htmlFor={this.props.id} style={this.getLabelStyle(this.props.invalid, this.props.styles.label)}>
+          {this.props.label}
+        </label>
         <div style={{position: 'relative'}}>
           <span style={styles.currency}>$</span>
-          <input id={this.props.id} type='text' onChange={this.onChange} name={this.props.name} style={this.getInputStyle(this.props.invalid, inputStyle)}
-                 value={this.props.value} onKeyPress={this.validateNumeric}/>
+          <input
+            id={this.props.id}
+            type='text'
+            onChange={this.onChange}
+            name={this.props.name}
+            style={this.getInputStyle(this.props.invalid, inputStyle)}
+            value={this.props.value}
+            onKeyPress={this.validateNumeric}
+          />
         </div>
       </div>
     );
diff --git a/client/scripts/components/User/DateRangeField.jsx b/client/scripts/components/User/DateRangeField.jsx
index 93f7554f..27254eca 100644
--- a/client/scripts/components/User/DateRangeField.jsx
+++ b/client/scripts/components/User/DateRangeField.jsx
@@ -63,9 +63,21 @@ export default class TextField extends React.Component {
       <div style={this.props.styles.container}>
         <label htmlFor={this.props.id} style={this.getLabelStyle(invalid, this.props.styles.label)}>{this.props.label}</label>
         <div id={this.props.id} style={{width: '98%'}}>
-          <DatePicker id="startDate" onChange={this.onStartDateChange} value={this.props.startDate} style={styles.date} textFieldStyle={this.getInputStyle(this.props.startDateInvalid, this.props.styles.input)}/>
+          <DatePicker
+            id="startDate"
+            onChange={this.onStartDateChange}
+            value={this.props.startDate}
+            style={styles.date}
+            textFieldStyle={this.getInputStyle(this.props.startDateInvalid, this.props.styles.input)}
+          />
           <span style={styles.dateMiddle}>TO</span>
-          <DatePicker id="endDate" onChange={this.onEndDateChange} value={this.props.endDate} style={styles.date} textFieldStyle={this.getInputStyle(this.props.endDateInvalid, this.props.styles.input)}/>
+          <DatePicker
+            id="endDate"
+            onChange={this.onEndDateChange}
+            value={this.props.endDate}
+            style={styles.date}
+            textFieldStyle={this.getInputStyle(this.props.endDateInvalid, this.props.styles.input)}
+          />
         </div>
       </div>
     );
diff --git a/client/scripts/components/User/Entities/EntityFormRelationshipStep.jsx b/client/scripts/components/User/Entities/EntityFormRelationshipStep.jsx
index 1211375e..b4c44508 100644
--- a/client/scripts/components/User/Entities/EntityFormRelationshipStep.jsx
+++ b/client/scripts/components/User/Entities/EntityFormRelationshipStep.jsx
@@ -271,8 +271,12 @@ export class EntityFormRelationshipStep extends React.Component {
         amountSection = (
           <div style={styles.amountSection}>
             <div style={labelStyle}>AMOUNT</div>
-            <select onChange={this.amountSelected} ref="amountSelect"
-                    value={this.props.appState.potentialRelationship.amountCd} style={dropDownStyle}>
+            <select
+              onChange={this.amountSelected}
+              ref="amountSelect"
+              value={this.props.appState.potentialRelationship.amountCd}
+              style={dropDownStyle}
+            >
               <option value="">--SELECT--</option>
               {amountTypeOptions}
             </select>
@@ -320,10 +324,10 @@ export class EntityFormRelationshipStep extends React.Component {
     if (this.state.relation !== '' && this.state.matrixType.reasonEnabled === 1) {
       reason = (
         <RelationshipTextField
-        invalid={this.props.validating && validationErrors.travelReason ? true : false}
-        onChange={this.reasonChanged}
-        value={this.props.appState.potentialRelationship.travel.reason}
-        label='Reason'
+          invalid={this.props.validating && validationErrors.travelReason ? true : false}
+          onChange={this.reasonChanged}
+          value={this.props.appState.potentialRelationship.travel.reason}
+          label='Reason'
         />
       );
     }
@@ -389,8 +393,12 @@ export class EntityFormRelationshipStep extends React.Component {
         commentTextboxStyle = merge(commentTextboxStyle, styles.invalidField);
       }
 
-      const relationshipPersonTypeOptions = window.config.relationshipPersonTypes.map(option => {
-        return <option key={option.typeCd} value={option.typeCd}>{option.description}</option>;
+      const relationshipPersonTypeOptions = window.config.relationshipPersonTypes.map(personType => {
+        return (
+          <option key={personType.typeCd} value={personType.typeCd}>
+            {personType.description}
+          </option>
+        );
       });
 
       const htmlId = Math.floor(Math.random() * 1000000000);
@@ -445,7 +453,13 @@ export class EntityFormRelationshipStep extends React.Component {
               <div style={styles.commentArea}>
                 <label htmlFor={htmlId} style={commentStyle}>COMMENTS</label>
                 <div>
-                  <textarea id={htmlId} onChange={this.commentChanged} value={this.props.appState.potentialRelationship.comments} style={commentTextboxStyle} ref="commentTextArea" />
+                  <textarea
+                    id={htmlId}
+                    onChange={this.commentChanged}
+                    value={this.props.appState.potentialRelationship.comments}
+                    style={commentTextboxStyle}
+                    ref="commentTextArea"
+                  />
                 </div>
               </div>
               <div style={styles.addButtonSection}>
diff --git a/client/scripts/components/User/Entities/RelationshipTextField.jsx b/client/scripts/components/User/Entities/RelationshipTextField.jsx
index 4121f93d..ce08eb14 100644
--- a/client/scripts/components/User/Entities/RelationshipTextField.jsx
+++ b/client/scripts/components/User/Entities/RelationshipTextField.jsx
@@ -59,8 +59,12 @@ export default class RelationshipTextField extends React.Component {
     return (
       <div style={styles.container}>
         <div style={this.getLabelStyle(this.props.invalid)}>{this.props.label}</div>
-        <input type='text' onChange={this.onChange} style={this.getInputStyle(this.props.invalid, styles.textBox)}
-               value={this.props.value}/>
+        <input
+          type='text'
+          onChange={this.onChange}
+          style={this.getInputStyle(this.props.invalid, styles.textBox)}
+          value={this.props.value}
+        />
       </div>
     );
   }
diff --git a/client/scripts/components/User/Entities/Toggle.jsx b/client/scripts/components/User/Entities/Toggle.jsx
index ee88eb8e..88a15788 100644
--- a/client/scripts/components/User/Entities/Toggle.jsx
+++ b/client/scripts/components/User/Entities/Toggle.jsx
@@ -65,7 +65,8 @@ export class Toggle extends ResponsiveComponent {
     return (
       <button
         onClick={this.toggle}
-        style={merge(this.props.selected ? styles.selected : styles.container, this.props.style)}>
+        style={merge(this.props.selected ? styles.selected : styles.container, this.props.style)}
+      >
         {this.props.text}
       </button>
     );
diff --git a/client/scripts/components/User/Entities/ToggleSet.jsx b/client/scripts/components/User/Entities/ToggleSet.jsx
index 95be42ca..85027e2f 100644
--- a/client/scripts/components/User/Entities/ToggleSet.jsx
+++ b/client/scripts/components/User/Entities/ToggleSet.jsx
@@ -67,7 +67,7 @@ export class ToggleSet extends ResponsiveComponent {
           selected={this.state.value === value.typeCd}
           onClick={this.change}
           key={value.typeCd}
-         />
+        />
       );
     });
 
diff --git a/client/scripts/components/User/Projects/Entity.jsx b/client/scripts/components/User/Projects/Entity.jsx
index 23af1fe6..34477933 100644
--- a/client/scripts/components/User/Projects/Entity.jsx
+++ b/client/scripts/components/User/Projects/Entity.jsx
@@ -146,7 +146,8 @@ export class Entity extends ResponsiveComponent {
           entityCount={this.props.entityCount}
           onSave={this.toggleDialog}
           onNext={this.props.onNext}
-          onPrevious={this.props.onPrevious} />
+          onPrevious={this.props.onPrevious}
+        />
       );
     }
 
diff --git a/client/scripts/components/User/Projects/EntityRelationDialog.jsx b/client/scripts/components/User/Projects/EntityRelationDialog.jsx
index 0ca65d39..34b3815b 100644
--- a/client/scripts/components/User/Projects/EntityRelationDialog.jsx
+++ b/client/scripts/components/User/Projects/EntityRelationDialog.jsx
@@ -137,9 +137,14 @@ export class EntityRelationDialog extends ResponsiveComponent {
       );
     });
 
-    const declarationTypeOptions = this.props.declarationTypes.map(option => {
+    const declarationTypeOptions = this.props.declarationTypes.map(declarationType => {
       return (
-        <option key={option.typeCd} value={option.typeCd}>{option.description}</option>
+        <option
+          key={declarationType.typeCd}
+          value={declarationType.typeCd}
+        >
+          {declarationType.description}
+        </option>
       );
     });
 
diff --git a/client/scripts/components/User/Projects/Project.jsx b/client/scripts/components/User/Projects/Project.jsx
index 9b0a9ecd..dcc962d9 100644
--- a/client/scripts/components/User/Projects/Project.jsx
+++ b/client/scripts/components/User/Projects/Project.jsx
@@ -137,7 +137,8 @@ export class Project extends React.Component {
           projectCount={this.props.projectCount}
           onSave={this.toggleDialog}
           onNext={this.props.onNext}
-          onPrevious={this.props.onPrevious} />
+          onPrevious={this.props.onPrevious}
+        />
       );
     }
 
diff --git a/client/scripts/components/User/Projects/ProjectRelationDialog.jsx b/client/scripts/components/User/Projects/ProjectRelationDialog.jsx
index fc302243..2e82b078 100644
--- a/client/scripts/components/User/Projects/ProjectRelationDialog.jsx
+++ b/client/scripts/components/User/Projects/ProjectRelationDialog.jsx
@@ -147,9 +147,14 @@ export class ProjectRelationDialog extends ResponsiveComponent {
       );
     });
 
-    const declarationTypeOptions = this.props.declarationTypes.map(option => {
+    const declarationTypeOptions = this.props.declarationTypes.map(declarationType => {
       return (
-        <option key={option.typeCd} value={option.typeCd}>{option.description}</option>
+        <option
+          key={declarationType.typeCd}
+          value={declarationType.typeCd}
+        >
+          {declarationType.description}
+        </option>
       );
     });
 
diff --git a/client/scripts/components/User/TextField.jsx b/client/scripts/components/User/TextField.jsx
index 41dbf646..198b3dab 100644
--- a/client/scripts/components/User/TextField.jsx
+++ b/client/scripts/components/User/TextField.jsx
@@ -44,8 +44,14 @@ export default class TextField extends React.Component {
     return (
       <div style={this.props.styles.container}>
         <label htmlFor={this.props.id} style={this.getLabelStyle(this.props.invalid, this.props.styles.label)}>{this.props.label}</label>
-        <input id={this.props.id} type='text' onChange={this.onChange} name={this.props.name} style={this.getInputStyle(this.props.invalid, this.props.styles.input)}
-               value={this.props.value}/>
+        <input
+          id={this.props.id}
+          type='text'
+          onChange={this.onChange}
+          name={this.props.name}
+          style={this.getInputStyle(this.props.invalid, this.props.styles.input)}
+          value={this.props.value}
+        />
       </div>
     );
   }
diff --git a/client/scripts/components/User/ToggleButton.jsx b/client/scripts/components/User/ToggleButton.jsx
index c7b9bd83..144086c7 100644
--- a/client/scripts/components/User/ToggleButton.jsx
+++ b/client/scripts/components/User/ToggleButton.jsx
@@ -76,7 +76,8 @@ export default class ToggleButton extends React.Component {
           )
         }
         onClick={this.clicked}
-        value={this.props.value.code}>
+        value={this.props.value.code}
+      >
         {this.props.value.description}
         {arrow}
       </button>
diff --git a/client/scripts/components/VerticalSlider.jsx b/client/scripts/components/VerticalSlider.jsx
index 6561f169..d91ca2d4 100644
--- a/client/scripts/components/VerticalSlider.jsx
+++ b/client/scripts/components/VerticalSlider.jsx
@@ -27,7 +27,7 @@ export default class VerticalSlider extends React.Component {
   }
 
   componentDidMount() {
-    this.setState({
+    this.setState({ // eslint-disable-line react/no-did-mount-set-state
       height: this.refs.content.clientHeight
     });
   }
diff --git a/client/scripts/stores/DisclosureStore.js b/client/scripts/stores/DisclosureStore.js
index bd143a5b..08abfb86 100644
--- a/client/scripts/stores/DisclosureStore.js
+++ b/client/scripts/stores/DisclosureStore.js
@@ -537,9 +537,10 @@ class _DisclosureStore extends AutoBindingStore {
 
     const formData = new FormData();
     formData.append('entity', JSON.stringify(entity));
-    createRequest().put(`/api/coi/disclosures/${this.applicationState.currentDisclosureState.disclosure.id}/financial-entities/${entity.id}`)
-    .send(formData)
-    .end(processResponse(() => {}));
+    createRequest()
+      .put(`/api/coi/disclosures/${this.applicationState.currentDisclosureState.disclosure.id}/financial-entities/${entity.id}`)
+      .send(formData)
+      .end(processResponse(() => {}));
   }
 
   setEntityType(params) {
@@ -673,7 +674,7 @@ class _DisclosureStore extends AutoBindingStore {
 
     const relation = this.applicationState.potentialRelationship;
 
-    relation.id = COIConstants.TMP_PLACEHOLDER + new Date().getTime();
+    relation.id = `${COIConstants.TMP_PLACEHOLDER}${new Date().getTime()}`;
     const matrixType = window.config.matrixTypes.find(matrix => {
       return matrix.typeCd === relation.relationshipCd;
     });
diff --git a/db/migration/seeds/A.js b/db/migration/seeds/A.js
index 32e56dfd..c2aa8477 100644
--- a/db/migration/seeds/A.js
+++ b/db/migration/seeds/A.js
@@ -23,7 +23,8 @@
       no-var,
       object-shorthand,
       prefer-template,
-      prefer-arrow-callback
+      prefer-arrow-callback,
+      max-len
 */
 
 var hashCode = require('../../../hash');
@@ -281,7 +282,18 @@ function insertFakeProject(knex, userId) {
 
 function insertInitialArchiveConfig(query) {
   return Promise.all([
-    query.select('type_cd as typeCd', 'description', 'enabled', 'type_enabled as typeEnabled', 'amount_enabled as amountEnabled', 'destination_enabled as destinationEnabled', 'date_enabled as dateEnabled', 'reason_enabled as reasonEnabled').from('relationship_category_type'),
+    query
+      .select(
+        'type_cd as typeCd',
+        'description',
+        'enabled',
+        'type_enabled as typeEnabled',
+        'amount_enabled as amountEnabled',
+        'destination_enabled as destinationEnabled',
+        'date_enabled as dateEnabled',
+        'reason_enabled as reasonEnabled'
+      )
+      .from('relationship_category_type'),
     query.select('type_cd as typeCd', 'relationship_cd as relationshipCd', 'description', 'active').from('relationship_type').where('active', true),
     query.select('type_cd as typeCd', 'relationship_cd as relationshipCd', 'description', 'active').from('relationship_amount_type').where('active', true),
     query.select('type_cd as typeCd', 'description', 'active').from('relationship_person_type').where('active', true),
@@ -290,12 +302,38 @@ function insertInitialArchiveConfig(query) {
     query.select('id', 'reminder_text as reminderText', 'warning_value as warningValue', 'warning_period as warningPeriod', 'active').from('notification'),
     query.select('id', 'type_cd as typeCd', 'version').from('questionnaire').limit(1).where('type_cd', 1).orderBy('version', 'desc').then(function(result) {
       if (result[0]) {
-        return query.select('id', 'active', 'questionnaire_id as questionnaireId', 'parent', 'question').from('questionnaire_question as qq').where({questionnaire_id: result[0].id, active: true});
+        return query
+          .select(
+            'id',
+            'active',
+            'questionnaire_id as questionnaireId',
+            'parent',
+            'question'
+          )
+          .from(
+            'questionnaire_question as qq'
+          )
+          .where({
+            questionnaire_id: result[0].id,
+            active: true
+          });
       }
     }),
     query.select('id', 'type_cd as typeCd', 'version').from('questionnaire').limit(1).where('type_cd', 2).orderBy('version', 'desc').then(function(result) {
       if (result[0]) {
-        return query.select('id', 'active', 'questionnaire_id as questionnaireId', 'parent', 'question').from('questionnaire_question as qq').where({questionnaire_id: result[0].id, active: true});
+        return query
+          .select(
+            'id',
+            'active',
+            'questionnaire_id as questionnaireId',
+            'parent',
+            'question'
+          )
+          .from('questionnaire_question as qq')
+          .where({
+            questionnaire_id: result[0].id,
+            active: true
+          });
       }
     }),
     query.select('status_cd as statusCd', 'description').from('disclosure_status'),
@@ -415,7 +453,16 @@ exports.seed = function(knex, Promise) {
     console.log('Seed - relationship_type');
     return Promise.all([
       knex('relationship_category_type')
-        .insert({type_cd: 1, description: 'Ownership', enabled: true, type_enabled: true, amount_enabled: true, destination_enabled: false, date_enabled: false, reason_enabled: false})
+        .insert({
+          type_cd: 1,
+          description: 'Ownership',
+          enabled: true,
+          type_enabled: true,
+          amount_enabled: true,
+          destination_enabled: false,
+          date_enabled: false,
+          reason_enabled: false
+        })
         .then(function(){
           return Promise.all([
             knex('relationship_type').insert({relationship_cd: 1, description: 'Stock', active: true})
@@ -429,7 +476,16 @@ exports.seed = function(knex, Promise) {
           ]);
         }),
       knex('relationship_category_type')
-        .insert({type_cd: 2, description: 'Offices/Positions', enabled: true, type_enabled: true, amount_enabled: true, destination_enabled: false, date_enabled: false, reason_enabled: false})
+        .insert({
+          type_cd: 2,
+          description: 'Offices/Positions',
+          enabled: true,
+          type_enabled: true,
+          amount_enabled: true,
+          destination_enabled: false,
+          date_enabled: false,
+          reason_enabled: false
+        })
         .then(function() {
           return Promise.all([
             knex('relationship_type').insert({relationship_cd: 2, description: 'Board Member', active: true})
@@ -444,7 +500,16 @@ exports.seed = function(knex, Promise) {
           ]);
         }),
       knex('relationship_category_type')
-        .insert({type_cd: 3, description: 'Paid Activities', enabled: true, type_enabled: false, amount_enabled: true, destination_enabled: false, date_enabled: false, reason_enabled: false})
+        .insert({
+          type_cd: 3,
+          description: 'Paid Activities',
+          enabled: true,
+          type_enabled: false,
+          amount_enabled: true,
+          destination_enabled: false,
+          date_enabled: false,
+          reason_enabled: false
+        })
         .then(function() {
           return knex('relationship_amount_type').insert({relationship_cd: 3, description: '$1 - $5,000', active: true})
             .then(function() {return knex('relationship_amount_type').insert({relationship_cd: 3, description: '$5,001 - $10,000', active: true});})
@@ -453,7 +518,16 @@ exports.seed = function(knex, Promise) {
             .then(function() {return knex('relationship_amount_type').insert({relationship_cd: 3, description: 'Does not apply', active: true});});
         }),
       knex('relationship_category_type')
-        .insert({type_cd: 4, description: 'Intellectual Property', enabled: true, type_enabled: true, amount_enabled: true, destination_enabled: false, date_enabled: false, reason_enabled: false})
+        .insert({
+          type_cd: 4,
+          description: 'Intellectual Property',
+          enabled: true,
+          type_enabled: true,
+          amount_enabled: true,
+          destination_enabled: false,
+          date_enabled: false,
+          reason_enabled: false
+        })
         .then(function() {
           return Promise.all([
             knex('relationship_type').insert({relationship_cd: 4, description: 'Royalty Income', active: true})
diff --git a/loadtest/tests/api/coi/config/POST.js b/loadtest/tests/api/coi/config/POST.js
index 9b984625..046dbe7f 100644
--- a/loadtest/tests/api/coi/config/POST.js
+++ b/loadtest/tests/api/coi/config/POST.js
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
-/* eslint-disable quotes */
+/* eslint-disable quotes, max-len */
 import LoadTest from '../../../../LoadTest';
 
 export class Test extends LoadTest {
diff --git a/loadtest/tests/api/coi/disclosures/_id/financial-entities/POST.js b/loadtest/tests/api/coi/disclosures/_id/financial-entities/POST.js
index f024d38f..c8a8d85e 100644
--- a/loadtest/tests/api/coi/disclosures/_id/financial-entities/POST.js
+++ b/loadtest/tests/api/coi/disclosures/_id/financial-entities/POST.js
@@ -28,7 +28,7 @@ export class Test extends LoadTest {
     this.CONCURRENT_REQUESTS = 10;
     this.method = 'POST';
 
-    this.postData = new Buffer(`\r\n------WebKitFormBoundaryTf0LsICBksypVtu7\r\nContent-Disposition: form-data; name="entity"\r\n\r\n{"active":1,"answers":[{"questionId":7,"answer":{"value":"No"}},{"questionId":6,"answer":{"value":["County Government"]}},{"questionId":8,"answer":{"value":"No"}},{"questionId":9,"answer":{"value":"d"}}],"name":"fsdfs","relationships":[{"personCd":1,"relationshipCd":1,"typeCd":1,"amountCd":1,"comments":"d","travel":{},"id":"TMP1448660628733","amount":"$1 - $5,000","type":"Stock","relationship":"Ownership","person":"Self"}]}\r\n------WebKitFormBoundaryTf0LsICBksypVtu7--`);
+    this.postData = new Buffer(`\r\n------WebKitFormBoundaryTf0LsICBksypVtu7\r\nContent-Disposition: form-data; name="entity"\r\n\r\n{"active":1,"answers":[{"questionId":7,"answer":{"value":"No"}},{"questionId":6,"answer":{"value":["County Government"]}},{"questionId":8,"answer":{"value":"No"}},{"questionId":9,"answer":{"value":"d"}}],"name":"fsdfs","relationships":[{"personCd":1,"relationshipCd":1,"typeCd":1,"amountCd":1,"comments":"d","travel":{},"id":"TMP1448660628733","amount":"$1 - $5,000","type":"Stock","relationship":"Ownership","person":"Self"}]}\r\n------WebKitFormBoundaryTf0LsICBksypVtu7--`); // eslint-disable-line max-len
 
     this.id = 0;
     this.alreadyAccessed = true;
diff --git a/package.json b/package.json
index 890f726d..baaec29c 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "babel-loader": "5.0.0",
     "babel-plugin-rewire": "0.1.22",
     "eslint": "1.9.0",
-    "eslint-plugin-react": "3.8.0",
+    "eslint-plugin-react": "3.11.3",
     "file": "0.2.2",
     "jsdom": "7.0.2",
     "mocha": "2.2.4",
diff --git a/server/db/DisclosureDB.js b/server/db/DisclosureDB.js
index 67778fad..2257959d 100644
--- a/server/db/DisclosureDB.js
+++ b/server/db/DisclosureDB.js
@@ -412,7 +412,18 @@ const retrieveComments = (dbInfo, userId, disclosureId) => {
   const knex = getKnex(dbInfo);
 
   return knex('comment')
-    .select('id', 'disclosure_id as disclosureId', 'topic_section as topicSection', 'topic_id as topicId', 'text', 'author', 'user_id as userId', 'date', 'pi_visible as piVisible', 'reviewer_visible as reviewerVisible')
+    .select(
+      'id',
+      'disclosure_id as disclosureId',
+      'topic_section as topicSection',
+      'topic_id as topicId',
+      'text',
+      'author',
+      'user_id as userId',
+      'date',
+      'pi_visible as piVisible',
+      'reviewer_visible as reviewerVisible'
+    )
     .where('disclosure_id', disclosureId)
     .then(comments => {
       comments.forEach(comment => {
@@ -488,7 +499,21 @@ const getDisclosure = (knex, userInfo, disclosureId) => {
     criteria.user_id = userInfo.schoolId;
   }
 
-  return knex.select('de.id', 'de.type_cd as typeCd', 'de.title', 'de.disposition_type_cd as dispositionTypeCd', 'de.status_cd as statusCd', 'de.submitted_by as submittedBy', 'de.submitted_date as submittedDate', 'de.revised_date as revisedDate', 'de.start_date as startDate', 'de.expired_date as expiredDate', 'de.last_review_date as lastReviewDate', 'de.config_id as configId')
+  return knex
+    .select(
+      'de.id',
+      'de.type_cd as typeCd',
+      'de.title',
+      'de.disposition_type_cd as dispositionTypeCd',
+      'de.status_cd as statusCd',
+      'de.submitted_by as submittedBy',
+      'de.submitted_date as submittedDate',
+      'de.revised_date as revisedDate',
+      'de.start_date as startDate',
+      'de.expired_date as expiredDate',
+      'de.last_review_date as lastReviewDate',
+      'de.config_id as configId'
+    )
     .from('disclosure as de')
     .where(criteria);
 };
@@ -507,7 +532,20 @@ export const get = (dbInfo, userInfo, disclosureId) => {
       .from('disclosure_answer as da')
       .innerJoin('questionnaire_answer as qa', 'qa.id', 'da.questionnaire_answer_id')
       .where('da.disclosure_id', disclosureId),
-    knex.select('d.id as id', 'd.project_id as projectId', 'd.fin_entity_id as finEntityId', 'd.type_cd as typeCd', 'd.comments as comments', 'p.title as projectTitle', 'fe.name as entityName', 'p.type_cd as projectTypeCd', 'p.sponsor_name as sponsorName', 'pp.role_cd as roleCd', 'fe.active as finEntityActive')
+    knex
+      .select(
+        'd.id as id',
+        'd.project_id as projectId',
+        'd.fin_entity_id as finEntityId',
+        'd.type_cd as typeCd',
+        'd.comments as comments',
+        'p.title as projectTitle',
+        'fe.name as entityName',
+        'p.type_cd as projectTypeCd',
+        'p.sponsor_name as sponsorName',
+        'pp.role_cd as roleCd',
+        'fe.active as finEntityActive'
+      )
       .from('declaration as d')
       .innerJoin('fin_entity as fe', 'fe.id', 'd.fin_entity_id')
       .innerJoin('project as p', 'p.id', 'd.project_id')
@@ -556,7 +594,16 @@ export const get = (dbInfo, userInfo, disclosureId) => {
     });
 
     return Promise.all([
-      knex.select('r.id', 'r.fin_entity_id as finEntityId', 'r.relationship_cd as relationshipCd', 'r.person_cd as personCd', 'r.type_cd as typeCd', 'r.amount_cd as amountCd', 'r.comments')
+      knex
+        .select(
+          'r.id',
+          'r.fin_entity_id as finEntityId',
+          'r.relationship_cd as relationshipCd',
+          'r.person_cd as personCd',
+          'r.type_cd as typeCd',
+          'r.amount_cd as amountCd',
+          'r.comments'
+        )
         .from('relationship as r')
         .whereIn('fin_entity_id', disclosure.entities.map(entity => { return entity.id; }))
         .andWhereNot('status', COIConstants.RELATIONSHIP_STATUS.PENDING)
diff --git a/server/db/PIReviewDB.js b/server/db/PIReviewDB.js
index f1200a05..c53e3e44 100644
--- a/server/db/PIReviewDB.js
+++ b/server/db/PIReviewDB.js
@@ -391,7 +391,15 @@ const getEntitiesAnswers = (knex, entityIDs) => {
 };
 
 const getRelationships = (knex, entityIDs) => {
-  return knex.select('r.id', 'r.comments as comments', 'r.relationship_cd as relationshipCd', 'r.person_cd as personCd', 'r.type_cd as typeCd', 'r.amount_cd as amountCd', 'r.fin_entity_id as finEntityId')
+  return knex
+    .select('r.id',
+      'r.comments as comments',
+      'r.relationship_cd as relationshipCd',
+      'r.person_cd as personCd',
+      'r.type_cd as typeCd',
+      'r.amount_cd as amountCd',
+      'r.fin_entity_id as finEntityId'
+    )
     .from('relationship as r')
     .where('fin_entity_id', 'in', entityIDs)
     .andWhereNot('status', COIConstants.RELATIONSHIP_STATUS.PENDING)
diff --git a/server/db/ProjectDB.js b/server/db/ProjectDB.js
index aa921cd3..1135e3d6 100644
--- a/server/db/ProjectDB.js
+++ b/server/db/ProjectDB.js
@@ -81,10 +81,23 @@ const saveProjectPersons = (dbInfo, persons, projectId) => {
           if (personIdResult.find(pr => {
             return pr.person_id === person.personId && pr.source_person_type === person.sourcePersonType;
           })) {
-            return knex('project_person').update({'active': true, 'role_cd': person.roleCode}).where({'person_id': person.personId, 'source_person_type': person.sourcePersonType, 'project_id': projectId});
+            return knex('project_person')
+              .update({'active': true, 'role_cd': person.roleCode})
+              .where({
+                'person_id': person.personId,
+                'source_person_type': person.sourcePersonType,
+                'project_id': projectId
+              });
           }
 
-          return knex('project_person').insert({'active': true, 'role_cd': person.roleCode, 'person_id': person.personId, 'source_person_type': person.sourcePersonType, 'project_id': projectId}, 'id');
+          return knex('project_person')
+            .insert({
+              'active': true,
+              'role_cd': person.roleCode,
+              'person_id': person.personId,
+              'source_person_type': person.sourcePersonType,
+              'project_id': projectId
+            }, 'id');
         });
 
         const deactiveQueries = personIdResult.filter(pr => {
diff --git a/server/db/TravelLogDB.js b/server/db/TravelLogDB.js
index ae85328f..4bc3fb39 100644
--- a/server/db/TravelLogDB.js
+++ b/server/db/TravelLogDB.js
@@ -50,7 +50,19 @@ export const getTravelLogEntries = (dbInfo, userId, sortColumn, sortDirection, f
       break;
   }
 
-  const query = knex.select('fe.name as entityName', 't.amount', 't.start_date as startDate', 't.end_date as endDate', 't.destination', 't.reason', 'r.status as status', 'r.disclosed_date as disclosedDate', 'r.id as relationshipId', 'r.active as active')
+  const query = knex
+    .select(
+      'fe.name as entityName',
+      't.amount',
+      't.start_date as startDate',
+      't.end_date as endDate',
+      't.destination',
+      't.reason',
+      'r.status as status',
+      'r.disclosed_date as disclosedDate',
+      'r.id as relationshipId',
+      'r.active as active'
+    )
     .from('travel_relationship as t')
     .innerJoin('relationship as r', 'r.id', 't.relationship_id' )
     .innerJoin('fin_entity as fe', 'fe.id', 'r.fin_entity_id')