eslint related file changes

raclim · raclim · commit 15e35486b226 · 2025-07-16T21:58:13.000-04:00
diff --git a/client/common/useKeyDownHandlers.js b/client/common/useKeyDownHandlers.js
@@ -66,3 +66,7 @@ export const DocumentKeyDown = ({ handlers }) => {
 DocumentKeyDown.propTypes = {
   handlers: PropTypes.objectOf(PropTypes.func)
 };
+
+DocumentKeyDown.defaultProps = {
+  handlers: {}
+};
diff --git a/client/index.jsx b/client/index.jsx
@@ -35,12 +35,12 @@ script.src = 'https://foundation-donate-banner.netlify.app/static/js/main.js';
 document.body.appendChild(script);
 
 const App = () => (
-  <>
+  <div>
     <Router history={browserHistory}>
       <SkipLink targetId="play-sketch" text="PlaySketch" />
       <Routing />
     </Router>
-  </>
+  </div>
 );
 
 render(
diff --git a/client/modules/IDE/components/AssetList.jsx b/client/modules/IDE/components/AssetList.jsx
@@ -46,7 +46,7 @@ const AssetList = () => {
               <th>{t('AssetList.HeaderName')}</th>
               <th>{t('AssetList.HeaderSize')}</th>
               <th>{t('AssetList.HeaderSketch')}</th>
-              <th scope="col"></th>
+              <th aria-label="dropdown" scope="col"></th>
             </tr>
           </thead>
           <tbody>
diff --git a/client/modules/IDE/components/Banner.jsx b/client/modules/IDE/components/Banner.jsx
@@ -36,7 +36,7 @@ const Banner = ({ onClose }) => {
     <div className="banner">
       <a href={bannerURL}>{bannerCopy}</a>
       <button className="banner-close-button" onClick={onClose}>
-        <CrossIcon Icon={{ default: '#000', hover: '#333' }} />
+        <CrossIcon icon={{ default: '#000', hover: '#333' }} />
       </button>
     </div>
   );
diff --git a/client/modules/IDE/components/CollectionList/CollectionList.jsx b/client/modules/IDE/components/CollectionList/CollectionList.jsx
@@ -183,7 +183,7 @@ const CollectionList = ({
                   context: mobile ? 'mobile' : ''
                 })
               )}
-              <th scope="col"></th>
+              <th aria-label="dropdown" scope="col"></th>
             </tr>
           </thead>
           <tbody>
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
@@ -9,8 +9,8 @@ import ConsoleInput from './ConsoleInput';
 import UpArrowIcon from '../../../images/up-arrow.svg';
 import DownArrowIcon from '../../../images/down-arrow.svg';
 
-import * as IDEActions from '../../IDE/actions/ide';
-import * as ConsoleActions from '../../IDE/actions/console';
+import * as IDEActions from '../actions/ide';
+import * as ConsoleActions from '../actions/console';
 import { useDidUpdate } from '../hooks/custom-hooks';
 import useHandleMessageEvent from '../hooks/useHandleMessageEvent';
 import { listen } from '../../../utils/dispatcher';
diff --git a/client/modules/IDE/components/ConsoleInput.jsx b/client/modules/IDE/components/ConsoleInput.jsx
@@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux';
 import { Encode } from 'console-feed';
 
 import RightArrowIcon from '../../../images/right-arrow.svg';
-import { dispatchConsoleEvent } from '../../IDE/actions/console';
+import { dispatchConsoleEvent } from '../actions/console';
 import { dispatchMessage, MessageTypes } from '../../../utils/dispatcher';
 
 // heavily inspired by
diff --git a/client/modules/IDE/components/Preferences/index.jsx b/client/modules/IDE/components/Preferences/index.jsx
@@ -120,6 +120,7 @@ export default function Preferences() {
   };
 
   const markdownComponents = useMemo(() => {
+    // eslint-disable-next-line react/no-unstable-nested-components
     const ExternalLink = ({ children, ...props }) => (
       <a {...props} target="_blank">
         {children}
@@ -132,6 +133,7 @@ export default function Preferences() {
       children: undefined
     };
 
+    // eslint-disable-next-line react/no-unstable-nested-components
     const Paragraph = ({ children, ...props }) => (
       <p className="preference__paragraph" {...props}>
         {children}
diff --git a/client/modules/IDE/components/VersionPicker.jsx b/client/modules/IDE/components/VersionPicker.jsx
@@ -10,8 +10,9 @@ import { p5Versions } from '../../../../common/p5Versions';
 import MenuItem from '../../../components/Dropdown/MenuItem';
 import DropdownMenu from '../../../components/Dropdown/DropdownMenu';
 import { updateFileContent } from '../actions/files';
+// eslint-disable-next-line import/no-cycle
 import { CmControllerContext } from '../pages/IDEView';
-import { DropdownArrowIcon } from '../.././../common/icons';
+import { DropdownArrowIcon } from '../../../common/icons';
 
 const VersionPickerButton = styled.div`
   display: flex;
diff --git a/client/modules/IDE/hooks/useP5Version.jsx b/client/modules/IDE/hooks/useP5Version.jsx
@@ -196,6 +196,7 @@ export function P5VersionProvider(props) {
     return null;
   }, [indexSrc]);
 
+  // eslint-disable-next-line react/jsx-no-constructed-context-values
   const value = { indexID, versionInfo };
 
   return (
diff --git a/client/modules/IDE/utils/consoleStyles.js b/client/modules/IDE/utils/consoleStyles.js
@@ -160,14 +160,6 @@ const getConsoleFeedStyle = (theme, fontSize) => {
   };
 
   switch (theme) {
-    case 'light':
-    default:
-      return Object.assign(
-        CONSOLE_FEED_LIGHT_STYLES || {},
-        CONSOLE_FEED_LIGHT_ICONS,
-        CONSOLE_FEED_SIZES,
-        style
-      );
     case 'dark':
       return Object.assign(
         CONSOLE_FEED_DARK_STYLES || {},
@@ -182,6 +174,14 @@ const getConsoleFeedStyle = (theme, fontSize) => {
         CONSOLE_FEED_SIZES,
         style
       );
+    case 'light':
+    default:
+      return Object.assign(
+        CONSOLE_FEED_LIGHT_STYLES || {},
+        CONSOLE_FEED_LIGHT_ICONS,
+        CONSOLE_FEED_SIZES,
+        style
+      );
   }
 };
 
diff --git a/client/test-utils.js b/client/test-utils.js
@@ -12,7 +12,7 @@
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { render } from '@testing-library/react';
-import React from 'react';
+import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { Provider } from 'react-redux';
 import { Router } from 'react-router-dom';
@@ -34,9 +34,10 @@ export * from '@testing-library/react';
 
 const ResponsiveProvider = ({ children, mobile, deviceWidth }) => {
   const width = deviceWidth ?? (mobile ? 400 : 1000);
+  const value = useMemo(() => ({ width }), [width]);
   return (
     // eslint-disable-next-line react/jsx-filename-extension
-    <ResponsiveContext.Provider value={{ width }}>
+    <ResponsiveContext.Provider value={value}>
       {children}
     </ResponsiveContext.Provider>
   );
diff --git a/server/controllers/aws.controller.js b/server/controllers/aws.controller.js
@@ -8,8 +8,9 @@ import {
   DeleteObjectsCommand
 } from '@aws-sdk/client-s3';
 import mongoose from 'mongoose';
-import { getProjectsForUserId } from './project.controller';
+
 import User from '../models/user';
+import Project from '../models/project';
 
 const { ObjectId } = mongoose.Types;
 
@@ -194,7 +195,7 @@ export async function listObjectsInS3ForUser(userId) {
       size: object.Size
     }));
 
-    const projects = await getProjectsForUserId(userId);
+    const projects = await Project.getProjectsForUserId(userId);
     const projectAssets = [];
     let totalSize = 0;
 
@@ -208,23 +209,23 @@ export async function listObjectsInS3ForUser(userId) {
       };
       totalSize += asset.size;
 
-      projects.some((project) => {
-        let found = false;
+      const wasMatched = projects.some((project) =>
         project.files.some((file) => {
           if (!file.url) return false;
           if (file.url.includes(asset.key)) {
-            found = true;
             foundAsset.name = file.name;
             foundAsset.sketchName = project.name;
             foundAsset.sketchId = project.id;
             foundAsset.url = file.url;
             return true;
           }
           return false;
-        });
-        return found;
-      });
-      projectAssets.push(foundAsset);
+        })
+      );
+
+      if (wasMatched) {
+        projectAssets.push(foundAsset);
+      }
     });
 
     return { assets: projectAssets, totalSize };
diff --git a/server/controllers/project.controller/__test__/getProjectsForUser.test.js b/server/controllers/project.controller/__test__/getProjectsForUser.test.js
@@ -6,7 +6,7 @@ import { Request, Response } from 'jest-express';
 import User from '../../../models/user';
 import getProjectsForUser, {
   apiGetProjectsForUser
-} from '../../project.controller/getProjectsForUser';
+} from '../getProjectsForUser';
 
 jest.mock('../../../models/user');
 jest.mock('../../aws.controller');
diff --git a/server/models/project.js b/server/models/project.js
@@ -76,5 +76,21 @@ projectSchema.methods.isSlugUnique = async function isSlugUnique() {
   };
 };
 
+/**
+ * Queries Project collection by userId and returns all Projects that match.
+ * @return {Promise<{ isUnique: boolean; conflictingIds: string[] }>}
+ */
+projectSchema.statics.getProjectsForUserId = async function getProjectsForUserId(
+  userId
+) {
+  const project = this;
+
+  return project
+    .find({ user: userId })
+    .sort('-createdAt')
+    .select('name files id createdAt updatedAt')
+    .exec();
+};
+
 export default mongoose.models.Project ||
   mongoose.model('Project', projectSchema);
diff --git a/server/utils/previewGeneration.js b/server/utils/previewGeneration.js
@@ -1,5 +1,5 @@
-import { resolvePathToFile } from '../utils/filePath';
-import { resolvePathsForElementsWithAttribute } from '../utils/resolveUtils';
+import { resolvePathToFile } from './filePath';
+import { resolvePathsForElementsWithAttribute } from './resolveUtils';
 
 import {
   STRING_REGEX,
