Add more folder to import/order lint rule (#58622)

* Add more folder to import/order lint rule * fix comment * add comment
code-dot-org · May 21, 2024 · a010a9a · a010a9a
1 parent 95997fd
commit a010a9a
Show file tree

Hide file tree

Showing 78 changed files with 411 additions and 268 deletions.
diff --git a/apps/.eslintrc.js b/apps/.eslintrc.js
@@ -213,18 +213,9 @@ module.exports = {
         'src/publicKeyCryptography/*',
         'src/pythonlab/*',
         'src/redux/*',
-        'src/regionalPartnerMiniContact/*',
         'src/sites/**',
-        'src/standaloneVideo/*',
-        'src/storage/**',
         // This one had some problems, see https://github.com/code-dot-org/code-dot-org/pull/58284
         'src/templates/curriculumCatalog/**',
-        'src/third-party/*',
-        'src/types/*',
-        'src/userHeaderEventLogger/*',
-        'src/util/**',
-        'src/weblab/**',
-        'src/weblab2/*',
         'test/integration/**',
         'test/*',
         'test/unit/*',

diff --git a/apps/src/regionalPartnerMiniContact/regionalPartnerMiniContact.js b/apps/src/regionalPartnerMiniContact/regionalPartnerMiniContact.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import React from 'react';
 import ReactDOM from 'react-dom';
+
 import {
   RegionalPartnerMiniContact,
   RegionalPartnerMiniContactPopupLink,

diff --git a/apps/src/standaloneVideo/StandaloneVideo.tsx b/apps/src/standaloneVideo/StandaloneVideo.tsx
@@ -7,15 +7,18 @@
 
 import React, {useEffect} from 'react';
 import {useSelector} from 'react-redux';
-import {useAppDispatch} from '@cdo/apps/util/reduxHooks';
-import Video from './Video';
+
 import {
   sendSuccessReport,
   navigateToNextLevel,
 } from '@cdo/apps/code-studio/progressRedux';
 import {LabState} from '@cdo/apps/lab2/lab2Redux';
 import {VideoLevelData} from '@cdo/apps/lab2/types';
+import {useAppDispatch} from '@cdo/apps/util/reduxHooks';
+
 import standaloneVideoLocale from './locale';
+import Video from './Video';
+
 import styles from './video.module.scss';
 
 const StandaloneVideo: React.FunctionComponent = () => {

diff --git a/apps/src/standaloneVideo/Video.tsx b/apps/src/standaloneVideo/Video.tsx
@@ -1,5 +1,7 @@
 import React, {useLayoutEffect, useState} from 'react';
+
 import standaloneVideoLocale from './locale';
+
 import styles from './video.module.scss';
 
 interface VideoProps {

diff --git a/apps/src/standaloneVideo/locale-do-not-import.js b/apps/src/standaloneVideo/locale-do-not-import.js
@@ -7,8 +7,8 @@
  * which is important for making locale setup work seamlessly in tests.
  */
 
-import safeLoadLocale from '@cdo/apps/util/safeLoadLocale';
 import localeWithI18nStringTracker from '@cdo/apps/util/i18nStringTracker';
+import safeLoadLocale from '@cdo/apps/util/safeLoadLocale';
 
 let locale = safeLoadLocale('standaloneVideo_locale');
 locale = localeWithI18nStringTracker(locale, 'standaloneVideo');

diff --git a/apps/src/standaloneVideo/locale.ts b/apps/src/standaloneVideo/locale.ts
@@ -3,6 +3,7 @@
  * it to the {@link StandaloneVideoLocale} type.
  */
 import {StandaloneVideoLocale} from './types';
+
 const standaloneVideoLocale = require('@cdo/standaloneVideo/locale');
 
 export default standaloneVideoLocale as StandaloneVideoLocale;
diff --git a/apps/src/storage/GetColumnParamPicker.jsx b/apps/src/storage/GetColumnParamPicker.jsx
@@ -1,10 +1,13 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import msg from '@cdo/locale';
-import color from '../util/color';
+
+import fontConstants from '@cdo/apps/fontConstants';
 import {getStore} from '@cdo/apps/redux';
 import BaseDialog from '@cdo/apps/templates/BaseDialog.jsx';
-import fontConstants from '@cdo/apps/fontConstants';
+import msg from '@cdo/locale';
+
+import color from '../util/color';
+
 import {isFirebaseStorage} from './storage';
 
 export const ParamType = {

diff --git a/apps/src/storage/dataBrowser/AddKeyRow.jsx b/apps/src/storage/dataBrowser/AddKeyRow.jsx
@@ -1,15 +1,19 @@
 /** @overview Component for adding a key/value pair row. */
-import PendingButton from '../../templates/PendingButton';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
-import {castValue} from './dataUtils';
-import dataStyles from './data-styles.module.scss';
-import classNames from 'classnames';
-import {WarningType} from '../constants';
+
 import msg from '@cdo/locale';
-import {refreshCurrentDataView} from './loadDataForView';
+
+import PendingButton from '../../templates/PendingButton';
+import {WarningType} from '../constants';
 import {storageBackend} from '../storage';
 
+import {castValue} from './dataUtils';
+import {refreshCurrentDataView} from './loadDataForView';
+
+import dataStyles from './data-styles.module.scss';
+
 const INITIAL_STATE = {
   isAdding: false,
   key: '',

diff --git a/apps/src/storage/dataBrowser/AddTableListRow.jsx b/apps/src/storage/dataBrowser/AddTableListRow.jsx
@@ -1,8 +1,10 @@
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
+
 import msg from '@cdo/locale';
+
 import dataStyles from './data-styles.module.scss';
-import classNames from 'classnames';
 
 const INITIAL_STATE = {
   newTableName: '',

diff --git a/apps/src/storage/dataBrowser/AddTableRow.jsx b/apps/src/storage/dataBrowser/AddTableRow.jsx
@@ -1,13 +1,17 @@
-import {storageBackend} from '../storage';
-import {refreshCurrentDataView} from './loadDataForView';
-import PendingButton from '../../templates/PendingButton';
+import classNames from 'classnames';
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
+
+import msg from '@cdo/locale';
+
+import PendingButton from '../../templates/PendingButton';
+import {storageBackend} from '../storage';
+
 import {castValue} from './dataUtils';
+import {refreshCurrentDataView} from './loadDataForView';
+
 import dataStyles from './data-styles.module.scss';
-import classNames from 'classnames';
-import _ from 'lodash';
-import msg from '@cdo/locale';
 
 const INITIAL_STATE = {
   isAdding: false,

diff --git a/apps/src/storage/dataBrowser/ColumnHeader.jsx b/apps/src/storage/dataBrowser/ColumnHeader.jsx
@@ -1,16 +1,19 @@
 /**
  * @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 classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
+
+import Dialog from '../../templates/Dialog';
+import FontAwesome from '../../templates/FontAwesome';
 import color from '../../util/color';
-import dataStyles from './data-styles.module.scss';
 import {valueOr} from '../../utils';
-import classNames from 'classnames';
+
+import ColumnMenu from './ColumnMenu';
+
 import style from './column-header.module.scss';
+import dataStyles from './data-styles.module.scss';
 
 const INITIAL_STATE = {
   newName: undefined,

diff --git a/apps/src/storage/dataBrowser/ColumnMenu.jsx b/apps/src/storage/dataBrowser/ColumnMenu.jsx
@@ -1,12 +1,15 @@
 /**
  * @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';
+
 import msg from '@cdo/locale';
 
+import FontAwesome from '../../templates/FontAwesome';
+
+import {ColumnType} from './dataUtils';
+
 export default class ColumnMenu extends React.Component {
   static propTypes = {
     coerceColumn: PropTypes.func.isRequired,

diff --git a/apps/src/storage/dataBrowser/ConfirmDeleteButton.jsx b/apps/src/storage/dataBrowser/ConfirmDeleteButton.jsx
@@ -1,9 +1,12 @@
-import React from 'react';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
+import React from 'react';
+
+import msg from '@cdo/locale';
+
 import Dialog from '../../templates/Dialog';
+
 import dataStyles from './data-styles.module.scss';
-import classNames from 'classnames';
-import msg from '@cdo/locale';
 
 class ConfirmDeleteButton extends React.Component {
   static propTypes = {

diff --git a/apps/src/storage/dataBrowser/ConfirmDeleteButton.story.jsx b/apps/src/storage/dataBrowser/ConfirmDeleteButton.story.jsx
@@ -1,6 +1,7 @@
+import {action} from '@storybook/addon-actions';
 import React from 'react';
+
 import ConfirmDeleteButton from './ConfirmDeleteButton';
-import {action} from '@storybook/addon-actions';
 
 export default {
   component: ConfirmDeleteButton,

diff --git a/apps/src/storage/dataBrowser/ConfirmImportButton.jsx b/apps/src/storage/dataBrowser/ConfirmImportButton.jsx
@@ -1,10 +1,13 @@
-import Dialog from '../../templates/Dialog';
-import PendingButton from '../../templates/PendingButton';
-import React from 'react';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
+import React from 'react';
+
 import msg from '@cdo/locale';
+
+import Dialog from '../../templates/Dialog';
+import PendingButton from '../../templates/PendingButton';
+
 import dataStyles from './data-styles.module.scss';
-import classNames from 'classnames';
 
 const INITIAL_STATE = {
   isConfirmDialogOpen: false,

diff --git a/apps/src/storage/dataBrowser/DataBrowser.jsx b/apps/src/storage/dataBrowser/DataBrowser.jsx
@@ -1,15 +1,19 @@
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
+import {connect} from 'react-redux';
+
 import msg from '@cdo/locale';
+
+import {DataView} from '../constants';
+import {changeView, showWarning} from '../redux/data';
+
 import AddTableListRow from './AddTableListRow';
 import EditTableListRow from './EditTableListRow';
 import KVPairs from './KVPairs';
-import dataStyles from './data-styles.module.scss';
-import {connect} from 'react-redux';
-import {changeView, showWarning} from '../redux/data';
-import {DataView} from '../constants';
+
 import style from './data-browser.module.scss';
-import classNames from 'classnames';
+import dataStyles from './data-styles.module.scss';
 
 const tableWidth = 400;
 const buttonColumnWidth = 124;

diff --git a/apps/src/storage/dataBrowser/DataEntryError.jsx b/apps/src/storage/dataBrowser/DataEntryError.jsx
@@ -1,8 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+
 import msg from '@cdo/locale';
-import color from '../../util/color';
+
 import SafeMarkdown from '../../templates/SafeMarkdown';
+import color from '../../util/color';
 
 class DataEntryError extends React.Component {
   static propTypes = {

diff --git a/apps/src/storage/dataBrowser/DataLibraryPane.jsx b/apps/src/storage/dataBrowser/DataLibraryPane.jsx
@@ -1,19 +1,23 @@
-import React from 'react';
+import _ from 'lodash';
 import PropTypes from 'prop-types';
+import React from 'react';
 import {connect} from 'react-redux';
-import {showWarning} from '../redux/data';
+
 import SafeMarkdown from '@cdo/apps/templates/SafeMarkdown';
-import LibraryCategory from './LibraryCategory';
 import SearchBar from '@cdo/apps/templates/SearchBar';
-import {getDatasetInfo} from './dataUtils';
 import msg from '@cdo/locale';
-import PreviewModal from './PreviewModal';
-import {isFirebaseStorage, storageBackend} from '../storage';
-import {WarningType} from '../constants';
+
 import experiments from '../../util/experiments';
-import _ from 'lodash';
-import style from './data-library-pane.module.scss';
+import {WarningType} from '../constants';
+import {showWarning} from '../redux/data';
+import {isFirebaseStorage, storageBackend} from '../storage';
+
+import {getDatasetInfo} from './dataUtils';
+import LibraryCategory from './LibraryCategory';
 import {refreshCurrentDataView} from './loadDataForView';
+import PreviewModal from './PreviewModal';
+
+import style from './data-library-pane.module.scss';
 
 class DataLibraryPane extends React.Component {
   static propTypes = {

diff --git a/apps/src/storage/dataBrowser/DataOverview.jsx b/apps/src/storage/dataBrowser/DataOverview.jsx
@@ -3,17 +3,20 @@
  * existing data tables with controls to edit/delete, and a control to add
  * a new data table.
  */
-import {DataView, WarningType} from '../constants';
-import {storageBackend} from '../storage';
-import {refreshCurrentDataView} from './loadDataForView';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
-import {changeView, showWarning} from '../redux/data';
 import {connect} from 'react-redux';
+
+import {DataView, WarningType} from '../constants';
+import {changeView, showWarning} from '../redux/data';
+import {storageBackend} from '../storage';
+
 import DataBrowser from './DataBrowser';
 import DataLibraryPane from './DataLibraryPane';
+import {refreshCurrentDataView} from './loadDataForView';
+
 import style from './data-overview.module.scss';
-import classNames from 'classnames';
 
 class DataOverview extends React.Component {
   static propTypes = {

diff --git a/apps/src/storage/dataBrowser/DataTable.jsx b/apps/src/storage/dataBrowser/DataTable.jsx
@@ -1,24 +1,28 @@
 /**
  * @overview Component for displaying a data table.
  */
-import AddTableRow from './AddTableRow';
-import EditTableRow from './EditTableRow';
-import ColumnHeader from './ColumnHeader';
-import DataEntryError from './DataEntryError';
-import {storageBackend} from '../storage';
-import FontAwesome from '../../templates/FontAwesome';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
-import {showWarning} from '../redux/data';
-import dataStyles from './data-styles.module.scss';
 import {connect} from 'react-redux';
-import PaginationWrapper from '../../templates/PaginationWrapper';
+
 import msg from '@cdo/locale';
+
+import FontAwesome from '../../templates/FontAwesome';
+import PaginationWrapper from '../../templates/PaginationWrapper';
 import {WarningType} from '../constants';
-import style from './data-table.module.scss';
-import classNames from 'classnames';
+import {showWarning} from '../redux/data';
+import {storageBackend} from '../storage';
+
+import AddTableRow from './AddTableRow';
+import ColumnHeader from './ColumnHeader';
+import DataEntryError from './DataEntryError';
+import EditTableRow from './EditTableRow';
 import {refreshCurrentDataView} from './loadDataForView';
 
+import dataStyles from './data-styles.module.scss';
+import style from './data-table.module.scss';
+
 const MAX_ROWS_PER_PAGE = 500;
 
 const INITIAL_STATE = {