Remove no-underscore-dangle eslint rule (keystonejs#388)

* Remove no-underscore-dangle eslint rule Closes keystonejs#387 * Remove eslint disable line comments for no-underscore-dangle
mbrowne · Sep 27, 2018 · 474e963 · 474e963
1 parent f2b9545
commit 474e963
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 18 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,7 +14,6 @@ module.exports = {
     'no-shadow': 'warn',
     'no-trailing-spaces': 'error',
     'no-undef': 'error',
-    'no-underscore-dangle': 'error',
     'no-unused-expressions': 'error',
     'no-unused-vars': [
       'error',

diff --git a/packages/admin-ui/client/pages/Item/index.js b/packages/admin-ui/client/pages/Item/index.js
@@ -292,7 +292,7 @@ const ItemDetails = withRouter(
         <ClippyIcon />
       );
       const listHref = `${adminPath}/${list.path}`;
-      const titleText = item._label_; // eslint-disable-line no-underscore-dangle
+      const titleText = item._label_;
       return (
         <Fragment>
           {updateErrorMessage ? (

diff --git a/packages/core/List/index.js b/packages/core/List/index.js
@@ -915,7 +915,6 @@ module.exports = class List {
   }
 
   async manyQuery(args, context, queryName) {
-    // eslint-disable-next-line no-underscore-dangle
     return this._tryManyQuery(args, context, queryName, queryArgs =>
       this.adapter.itemsQuery(queryArgs)
     );
@@ -927,7 +926,6 @@ module.exports = class List {
       // on what the user requested
       // Evalutation takes place in ../Keystone/index.js
       getCount: () => {
-        // eslint-disable-next-line no-underscore-dangle
         return this._tryManyQuery(args, context, queryName, queryArgs =>
           this.adapter.itemsQueryMeta(queryArgs).then(({ count }) => count)
         );

diff --git a/packages/fields/tests/idFilterTests.js b/packages/fields/tests/idFilterTests.js
@@ -21,7 +21,6 @@ const getIDs = async keystone => {
     .exec()
     .then(data => {
       data.forEach(entry => {
-        // eslint-disable-next-line no-underscore-dangle
         IDs[entry.name] = entry._id.toString();
       });
     });

diff --git a/packages/fields/types/Relationship/Implementation.js b/packages/fields/types/Relationship/Implementation.js
@@ -102,7 +102,6 @@ class Relationship extends Implementation {
         [this.path]: (item, _, context) => {
           // The field may have already been filled in during an early DB lookup
           // (ie; joining when doing a filter)
-          // eslint-disable-next-line no-underscore-dangle
           const id = item[this.path] && item[this.path]._id ? item[this.path]._id : item[this.path];
 
           if (!id) {
@@ -126,9 +125,7 @@ class Relationship extends Implementation {
           .map(value => {
             // The field may have already been filled in during an early DB lookup
             // (ie; joining when doing a filter)
-            // eslint-disable-next-line no-underscore-dangle
             if (value && value._id) {
-              // eslint-disable-next-line no-underscore-dangle
               return value._id;
             }
 

diff --git a/packages/fields/types/Relationship/views/Cell.js b/packages/fields/types/Relationship/views/Cell.js
@@ -11,7 +11,7 @@ export default ({ data, field, Link }) => {
         <Fragment key={item.id}>
           {!!index ? ', ' : ''}
           <Link path={refList.path} id={item.id}>
-            {item._label_ /* eslint-disable-line no-underscore-dangle */}
+            {item._label_}
           </Link>
         </Fragment>
       ))}

diff --git a/packages/fields/types/Relationship/views/Field.js b/packages/fields/types/Relationship/views/Field.js
@@ -79,7 +79,7 @@ export default class RelationshipField extends Component {
 
               const options = data[refList.gqlNames.listQueryName].map(listData => ({
                 value: pick(listData, ['id']),
-                label: listData._label_, // eslint-disable-line no-underscore-dangle
+                label: listData._label_,
               }));
 
               let value = null;

diff --git a/packages/mongo-join-builder/tests/mongo-results.test.js b/packages/mongo-join-builder/tests/mongo-results.test.js
@@ -303,7 +303,6 @@ describe('Testing against real data', () => {
             [table]: parentData[table].map(id => {
               return (
                 parentData[keyOfRelationship].find(
-                  // eslint-disable-next-line no-underscore-dangle
                   relatedItem => relatedItem._id.toString() === id.toString()
                 ) || id
               );
@@ -528,7 +527,6 @@ describe('Testing against real data', () => {
             [table]: parentData[table].map(id => {
               return (
                 parentData[keyOfRelationship].find(
-                  // eslint-disable-next-line no-underscore-dangle
                   relatedItem => relatedItem._id.toString() === id.toString()
                 ) || id
               );
@@ -628,7 +626,6 @@ describe('Testing against real data', () => {
             [table]: parentData[table].map(id => {
               return (
                 parentData[keyOfRelationship].find(
-                  // eslint-disable-next-line no-underscore-dangle
                   relatedItem => relatedItem._id.toString() === id.toString()
                 ) || id
               );
@@ -734,7 +731,6 @@ describe('Testing against real data', () => {
             [table]: parentData[table].map(id => {
               return (
                 parentData[keyOfRelationship].find(
-                  // eslint-disable-next-line no-underscore-dangle
                   relatedItem => relatedItem._id.toString() === id.toString()
                 ) || id
               );

diff --git a/projects/access-control/cypress/plugins/index.js b/projects/access-control/cypress/plugins/index.js
@@ -34,7 +34,6 @@ module.exports = async (on, config) => {
           if (error) {
             return reject(error);
           }
-          // eslint-disable-next-line no-underscore-dangle
           resolve(items.map(item => Object.assign({}, item, { id: item._id })));
         })
       );

diff --git a/projects/access-control/cypress/support/commands.js b/projects/access-control/cypress/support/commands.js
@@ -81,7 +81,6 @@ function graphqlOperation(type) {
       // (process.env.NODE_ENV !== 'production'), so this may error at some
       // point. If so, we need another way of attaching a global graphql query
       // lib to the window from within the app for testing.
-      // eslint-disable-next-line no-underscore-dangle
       win.__APOLLO_CLIENT__[type]({
         [type === 'mutate' ? 'mutation' : type]: operation,
         // Avoid anything which may be cached when loading the admin UI - we

diff --git a/projects/basic/cypress/support/commands.js b/projects/basic/cypress/support/commands.js
@@ -79,7 +79,6 @@ function graphqlOperation(type) {
       // (process.env.NODE_ENV !== 'production'), so this may error at some
       // point. If so, we need another way of attaching a global graphql query
       // lib to the window from within the app for testing.
-      // eslint-disable-next-line no-underscore-dangle
       win.__APOLLO_CLIENT__[type]({
         [type === 'mutate' ? 'mutation' : type]: operation,
       })

diff --git a/projects/login/cypress/support/commands.js b/projects/login/cypress/support/commands.js
@@ -81,7 +81,6 @@ function graphqlOperation(type) {
       // (process.env.NODE_ENV !== 'production'), so this may error at some
       // point. If so, we need another way of attaching a global graphql query
       // lib to the window from within the app for testing.
-      // eslint-disable-next-line no-underscore-dangle
       win.__APOLLO_CLIENT__[type]({
         [type === 'mutate' ? 'mutation' : type]: operation,
         // Avoid anything which may be cached when loading the admin UI - we