Fixing additional comments moved by jscodeshift

Author: jmkulwik

apps/src/code-studio/pd/workshop_dashboard/components/date_picker.jsx

@@ -1,14 +1,11 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-
 /**
  * DatePicker control.
  * It's basically a wrapper around react-datepicker (with limited props) that displays
  * as a React-Bootstrap select with a calendar icon Addon.
  */
-
+import React from 'react';
+import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import ReactDatePicker from 'react-datepicker';
 import {DATE_FORMAT} from '../workshopConstants';

apps/src/code-studio/pd/workshop_dashboard/components/survey_results_header.jsx

@@ -1,7 +1,7 @@
+/** Workshop Survey page. Displays survey results. ...*/
+
 import $ from 'jquery';
 import _ from 'lodash';
-
-/** Workshop Survey page. Displays survey results. ...*/
 import PropTypes from 'prop-types';
 import React from 'react';
 import {

apps/src/code-studio/pd/workshop_dashboard/components/workshop_table_loader.jsx

@@ -1,14 +1,12 @@
-import $ from 'jquery';
-import _ from 'lodash';
-
 /**
  * Loader for table displaying workshop summaries based on a supplied query.
  * It requires exactly one child component that expects workshops in its props.
  * It runs the query specified in queryUrl and passes resulting workshop data to the child
  * component or displays "None" if no workshops are returned.
  * It optionally handles deleting workshops.
  */
-
+import $ from 'jquery';
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import ReactDOM from 'react-dom';

apps/src/code-studio/pd/workshop_dashboard/workshop.jsx

@@ -1,13 +1,11 @@
-import $ from 'jquery';
-import _ from 'lodash';
-
 /**
  * Workshop view / edit. Displays and optionally edits details for a workshop.
  * Routes:
  *   /workshops/:workshopId
  *   /Workshops/:workshopId/edit
  */
-
+import $ from 'jquery';
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';

apps/src/gamelab/AnimationTab/ItemLoopToggle.jsx

@@ -1,9 +1,7 @@
+/** @file controls below an animation looping toggle */
 import React from 'react';
 import {OverlayTrigger, Tooltip} from "react-bootstrap";
-
-/** @file controls below an animation looping toggle */
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 
 const styles = {

apps/src/gamelab/AnimationTab/ListItemButtons.jsx

@@ -1,10 +1,8 @@
+/** @file controls below an animation thumbnail */
 import React from 'react';
 import {OverlayTrigger, Tooltip} from "react-bootstrap";
 import color from "../../util/color";
-
-/** @file controls below an animation thumbnail */
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import SpeedSlider from '../../templates/SpeedSlider';
 import ItemLoopToggle from './ItemLoopToggle';

apps/src/gamelab/AnimationTab/NewListItem.jsx

@@ -1,9 +1,7 @@
+/** List item placeholder for adding a new item */
 import React from 'react';
 import color from '../../util/color';
-
-/** List item placeholder for adding a new item */
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 
 const styles = {

apps/src/gamelab/GameLabView.jsx

@@ -1,8 +1,7 @@
-import classNames from 'classnames';
-import {connect} from 'react-redux';
-
 /** @file Top-level view for GameLab */
 /* global dashboard */
+import classNames from 'classnames';
+import {connect} from 'react-redux';
 import PropTypes from 'prop-types';
 import React from 'react';
 import AnimationTab from './AnimationTab/AnimationTab';

apps/src/storage/dataBrowser/AddKeyRow.jsx

@@ -1,10 +1,7 @@
+/** @overview Component for adding a key/value pair row. */
 import FirebaseStorage from '../firebaseStorage';
 import PendingButton from '../../templates/PendingButton';
-
-/** @overview Component for adding a key/value pair row. */
-
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import React from 'react';
 import { castValue } from './dataUtils';

apps/src/storage/dataBrowser/ColumnHeader.jsx

@@ -1,13 +1,10 @@
-import ColumnMenu from './ColumnMenu';
-import Dialog from '../../templates/Dialog';
-import FontAwesome from '../../templates/FontAwesome';
-
 /**
  * @overview Component for adding a new column to the specified table.
  */
-
+import ColumnMenu from './ColumnMenu';
+import Dialog from '../../templates/Dialog';
+import FontAwesome from '../../templates/FontAwesome';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import React from 'react';
 import color from "../../util/color";

apps/src/storage/dataBrowser/ColumnMenu.jsx

@@ -1,10 +1,8 @@
-import { ColumnType } from './dataUtils';
-import FontAwesome from '../../templates/FontAwesome';
-
 /**
  * @overview Component for the dropdown menu and icon in the column header.
  */
-
+import { ColumnType } from './dataUtils';
+import FontAwesome from '../../templates/FontAwesome';
 import PropTypes from 'prop-types';
 import React from 'react';
 

apps/src/storage/dataBrowser/DataOverview.jsx

@@ -1,17 +1,14 @@
-import AddTableListRow from './AddTableListRow';
-import { DataView } from '../constants';
-import EditLink from './EditLink';
-import EditTableListRow from './EditTableListRow';
-import FirebaseStorage from '../firebaseStorage';
-
 /**
  * @overview Component containing a link to edit key/value pairs, a list of
  * existing data tables with controls to edit/delete, and a control to add
  * a new data table.
  */
-
+import AddTableListRow from './AddTableListRow';
+import { DataView } from '../constants';
+import EditLink from './EditLink';
+import EditTableListRow from './EditTableListRow';
+import FirebaseStorage from '../firebaseStorage';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import React from 'react';
 import msg from '@cdo/locale';

apps/src/storage/dataBrowser/DataProperties.jsx

@@ -1,15 +1,12 @@
+/**
+ * @overview Component for editing key/value pairs.
+ */
 import _ from 'lodash';
 import AddKeyRow from './AddKeyRow';
 import { DataView } from '../constants';
 import EditKeyRow from './EditKeyRow';
 import FontAwesome from '../../templates/FontAwesome';
-
-/**
- * @overview Component for editing key/value pairs.
- */
-
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import React from 'react';
 import { changeView, showWarning } from '../redux/data';

apps/src/storage/dataBrowser/DataTable.jsx

@@ -1,17 +1,14 @@
+/**
+ * @overview Component for editing a data table.
+ */
 import TableControls from './TableControls';
 import AddTableRow from './AddTableRow';
 import { DataView } from '../constants';
 import EditTableRow from './EditTableRow';
 import ColumnHeader from './ColumnHeader';
 import FirebaseStorage from '../firebaseStorage';
 import FontAwesome from '../../templates/FontAwesome';
-
-/**
- * @overview Component for editing a data table.
- */
-
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import React from 'react';
 import { changeView, showWarning } from '../redux/data';

apps/src/storage/dataBrowser/TableControls.jsx

@@ -1,17 +1,13 @@
-import ConfirmDeleteButton from './ConfirmDeleteButton';
-import ConfirmImportButton from './ConfirmImportButton';
-
 /**
  * @overview Component containing UI controls for modifying the table, including
  * import, export, adding a new column, and deleting the entire table.
  */
-
+import ConfirmDeleteButton from './ConfirmDeleteButton';
+import ConfirmImportButton from './ConfirmImportButton';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import React from 'react';
 import applabMsg from '@cdo/applab/locale';
-
 import * as dataStyles from './dataStyles';
 
 const styles = {

apps/src/templates/Button.jsx

@@ -1,14 +1,11 @@
-import _ from 'lodash';
-import React from 'react';
-
 /**
  * New style button.
  * This particular button is designed to operate in contexts where we have a solid
  * background. When we're a button on top of an image, we may want something different.
  */
-
+import _ from 'lodash';
+import React from 'react';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import color from "@cdo/apps/util/color";
 import FontAwesome from '@cdo/apps/templates/FontAwesome';

apps/src/templates/Certificate.jsx

@@ -1,13 +1,10 @@
+/* global dashboard */
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import $ from 'jquery';
 import i18n from '@cdo/locale';
 import color from '../util/color';
-
-/* global dashboard */
-
 import PropTypes from 'prop-types';
-
 import queryString from 'query-string';
 import SocialShare from './SocialShare';
 import LargeChevronLink from './LargeChevronLink';

apps/src/templates/CodeWorkspaceContainer.jsx

@@ -1,14 +1,11 @@
-import $ from 'jquery';
-import React from 'react';
-import ReactDOM from 'react-dom';
-
 /**
  * A non-protected div that wraps our ProtectedStatefulDiv codeWorkspace, allowing
  * us to position it vertically. Causes resize events to fire when receiving new props
  */
-
+import $ from 'jquery';
+import React from 'react';
+import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import { connect } from 'react-redux';
 import * as utils from '../utils';

apps/src/templates/ResizablePanes.jsx

@@ -1,15 +1,13 @@
-import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
-import _ from 'lodash';
-
 /** @file Divide a region into a set of panels and allow resizing them.
  *
  *  Similar to react-split-pane (MIT license) but supports more than two panes
  *  and works with React 0.14.7.
  *  @see https://github.com/tomkp/react-split-pane
  */
+import React, { Component } from 'react';
+import ReactDOM from 'react-dom';
+import _ from 'lodash';
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 
 const styles = {

apps/src/templates/census2017/CensusMap.jsx

@@ -1,8 +1,6 @@
-import $ from 'jquery';
-
 /* global google */
 import PropTypes from 'prop-types';
-
+import $ from 'jquery';
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 

apps/src/templates/instructions/InlineFeedback.jsx

@@ -1,9 +1,7 @@
+/* eslint-disable react/no-danger */
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-
-/* eslint-disable react/no-danger */
 import PropTypes from 'prop-types';
-
 import Radium from 'radium';
 import ChatBubble from './ChatBubble';
 import { convertXmlToBlockly } from './utils';

apps/src/templates/instructions/TopInstructions.jsx

@@ -1,8 +1,6 @@
-
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
-
 import TopInstructionsCSF from './TopInstructionsCSF';
 import TopInstructionsCSP from './TopInstructionsCSP';
 

apps/src/templates/studioHomepages/UiTips.jsx

@@ -1,13 +1,11 @@
-import $ from 'jquery';
-
 // UiTips: A small manager for showing UI tips, particularly for new or changed UI.
 // Note that "triggered" tips (e.g. show a tip when the user clicks a certain
 // DOM element) work on elements outside of the React DOM.  The current
 // implementation is limited in that it expects a single instance of UiTips
 // per page, and it expects that instance to live for the duration of the page.
 // It doesn't do proper cleanup of the click handler for the non-React component
 // if UiTips goes away.
-
+import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import UiTip from './UiTip';