Changes to support bumping eslint-config-airbnb-base from 13.2.0 to 14.0.0

Author: justinlittman

.eslintrc.js

@@ -18,7 +18,7 @@ module.exports = {
     "plugin:import/warnings",
     "plugin:jsx-a11y/recommended",
     "plugin:security/recommended",
-    "airbnb-base/whitespace",
+    "airbnb-base",
     "plugin:cypress/recommended"
   ],
   "parser": "babel-eslint",

__tests__/CognitoUtils.test.js

@@ -95,7 +95,7 @@ describe('CognitoUtils', () => {
     it('resolves with session data when successful', () => {
       const mockError = null
       const mockSession = {}
-      const getSessionSpy = jest.spyOn(user, 'getSession').mockImplementation(callbackFn => callbackFn(mockError, mockSession))
+      const getSessionSpy = jest.spyOn(user, 'getSession').mockImplementation((callbackFn) => callbackFn(mockError, mockSession))
 
 
       return CognitoUtils.getSession(user)
@@ -108,7 +108,7 @@ describe('CognitoUtils', () => {
 
     it('rejects with error info when failing', () => {
       const mockError = 'uh oh!'
-      const getSessionSpy = jest.spyOn(user, 'getSession').mockImplementation(callbackFn => callbackFn(mockError))
+      const getSessionSpy = jest.spyOn(user, 'getSession').mockImplementation((callbackFn) => callbackFn(mockError))
 
 
       return CognitoUtils.getSession(user)
@@ -141,7 +141,7 @@ describe('CognitoUtils', () => {
           jwtToken: token,
         },
       }
-      const getSessionSpy = jest.spyOn(user, 'getSession').mockImplementation(callbackFn => callbackFn(mockError, mockSession))
+      const getSessionSpy = jest.spyOn(user, 'getSession').mockImplementation((callbackFn) => callbackFn(mockError, mockSession))
 
 
       return CognitoUtils.getIdTokenString(user)
@@ -155,7 +155,7 @@ describe('CognitoUtils', () => {
     it('bubbles up the error if obtaining a session fails', () => {
       const mockError = 'refresh token expired (would be more complex error obj IRL)'
       const mockSession = null
-      const getSessionSpy = jest.spyOn(user, 'getSession').mockImplementation(callbackFn => callbackFn(mockError, mockSession))
+      const getSessionSpy = jest.spyOn(user, 'getSession').mockImplementation((callbackFn) => callbackFn(mockError, mockSession))
 
 
       return CognitoUtils.getIdTokenString(user)

__tests__/GraphBuilder.test.js

@@ -87,11 +87,11 @@ describe('GraphBuilder', () => {
       expect(graph.has(propertyTriple)).toBeTruthy()
 
       // An triple with a lang tag
-      const result1 = graph.filter(quad => quad.object.equals(rdf.literal('Very colorful', 'eng'))).toArray()
+      const result1 = graph.filter((quad) => quad.object.equals(rdf.literal('Very colorful', 'eng'))).toArray()
       // An triple without a lang tag
-      const result2 = graph.filter(quad => quad.object.equals(rdf.literal('Sparkly'))).toArray()
+      const result2 = graph.filter((quad) => quad.object.equals(rdf.literal('Sparkly'))).toArray()
       // A triple on a separate resource (bf:Note)
-      const result3 = graph.filter(quad => quad.object.equals(rdf.literal('Shiney'))).toArray()
+      const result3 = graph.filter((quad) => quad.object.equals(rdf.literal('Shiney'))).toArray()
 
       expect(result1.length).toEqual(1)
       expect(result2.length).toEqual(1)
@@ -200,21 +200,21 @@ _:b4 a <http://id.loc.gov/ontologies/bibframe/Note>;
       expect(graph.has(propertyTriple)).toBeTruthy()
       expect(graph.has(generatedByTriple)).toBeTruthy()
 
-      let result = graph.filter(quad => quad.object.equals(rdf.literal('Very colorful')))
+      let result = graph.filter((quad) => quad.object.equals(rdf.literal('Very colorful')))
 
       expect(result.toArray().length).toEqual(1)
 
-      result = graph.filter(quad => quad.object.equals(rdf.literal('Sparkly')))
+      result = graph.filter((quad) => quad.object.equals(rdf.literal('Sparkly')))
       expect(result.toArray().length).toEqual(1)
 
       // _:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://id.loc.gov/ontologies/bibframe/Note> .
-      result = graph.filter(quad => quad.object.equals(rdf.namedNode('http://id.loc.gov/ontologies/bibframe/Note'))
+      result = graph.filter((quad) => quad.object.equals(rdf.namedNode('http://id.loc.gov/ontologies/bibframe/Note'))
         && quad.predicate.equals(rdf.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type')))
       expect(result.toArray().length).toEqual(1)
 
       // There should only be one hasResourceTemplate assertion in the whole graph
       const hasResourceTemplate = rdf.namedNode('http://sinopia.io/vocabulary/hasResourceTemplate')
-      result = graph.filter(quad => quad.predicate.equals(hasResourceTemplate))
+      result = graph.filter((quad) => quad.predicate.equals(hasResourceTemplate))
       expect(result.toArray().length).toEqual(1)
     })
   })
@@ -284,7 +284,7 @@ _:b4 a <http://id.loc.gov/ontologies/bibframe/Note>;
     it('returns the graph without blank node', () => {
       const graph = builder.graph
 
-      const result = graph.filter(quad => quad.object.equals(rdf.namedNode('http://id.loc.gov/ontologies/bibframe/Note'))).toArray()
+      const result = graph.filter((quad) => quad.object.equals(rdf.namedNode('http://id.loc.gov/ontologies/bibframe/Note'))).toArray()
       expect(result.length).toEqual(0)
     })
   })

__tests__/ResourceStateBuilder.test.js

@@ -12,7 +12,7 @@ jest.mock('sinopiaServer')
 describe('ResourceStateBuilder', () => {
   beforeEach(() => {
     sinopiaServer.getResourceTemplate.mockImplementation(getFixtureResourceTemplate)
-    sinopiaServer.foundResourceTemplate.mockImplementation(templateId => resourceTemplateIds.includes(templateId))
+    sinopiaServer.foundResourceTemplate.mockImplementation((templateId) => resourceTemplateIds.includes(templateId))
   })
 
   it('builds the state for literal properties', async () => {

__tests__/ResourceTemplateValidator.test.js

@@ -9,7 +9,7 @@ jest.mock('sinopiaServer')
 
 
 sinopiaServer.getResourceTemplate.mockImplementation(getFixtureResourceTemplate)
-sinopiaServer.foundResourceTemplate.mockImplementation(templateId => resourceTemplateIds.includes(templateId))
+sinopiaServer.foundResourceTemplate.mockImplementation((templateId) => resourceTemplateIds.includes(templateId))
 
 describe('validateResourceTemplate', () => {
   it('returns [] for valid', async () => {

__tests__/components/editor/GroupChoiceModal.test.js

@@ -68,7 +68,7 @@ describe('<GroupChoiceModal />', () => {
 
       const actualGroups = wrapper.find('.modal-body')
         .find('form.group-select-options select option')
-        .map(node => [node.prop('value'), node.text()])
+        .map((node) => [node.prop('value'), node.text()])
 
       expect(actualGroups).toEqual(expectedGroups)
     })

__tests__/components/editor/property/InputListLOC.test.js

@@ -123,7 +123,7 @@ const reduxPath = [
 
 describe('InputListLOC', () => {
   setupModal()
-  global.fetch = jest.fn().mockImplementation(url => Promise.resolve({ json: () => lookups[url] }))
+  global.fetch = jest.fn().mockImplementation((url) => Promise.resolve({ json: () => lookups[url] }))
 
   it('renders when no value', () => {
     const store = createReduxStore(createInitialState())

__tests__/components/editor/property/ResourceList.test.js

@@ -81,7 +81,7 @@ describe('ResultList', () => {
       expect(getByText('Create New')).toBeInTheDocument()
       expect(container.querySelector('button[data-resource-id="resourceTemplate:bf2:Monograph:Instance"]')).toBeInTheDocument()
       expect(getByText('BIBFRAME Instance (resourceTemplate:bf2:Monograph:Instance)', {
-        normalizer: str => getDefaultNormalizer({ trim: false })(str).replace(/\n*/g, ''),
+        normalizer: (str) => getDefaultNormalizer({ trim: false })(str).replace(/\n*/g, ''),
       })).toBeInTheDocument()
     })
   })

__tests__/fixtureLoaderHelper.js

@@ -91,10 +91,10 @@ function loadFixtureResourceTemplates() {
   return result
 }
 
-export const resourceTemplateIds = resourceTemplateId2Json.map(template => template.id)
+export const resourceTemplateIds = resourceTemplateId2Json.map((template) => template.id)
 
 // These are used as fake template search results
-export const resourceTemplateSearchResults = resourceTemplateId2Json.map(template => ({
+export const resourceTemplateSearchResults = resourceTemplateId2Json.map((template) => ({
   id: template.json.id,
   author: template.json.author,
   date: template.json.date,
@@ -125,7 +125,7 @@ export const getFixtureResourceTemplate = (templateId) => {
 
 export const fixtureResourcesInGroupContainer = (group) => {
   const container = `http://spoof.trellis.io/${group}`
-  const ids = resourceTemplateId2Json.map(rt => `${container}/${rt.id}`)
+  const ids = resourceTemplateId2Json.map((rt) => `${container}/${rt.id}`)
 
   return {
     response: {
@@ -147,6 +147,6 @@ export const rtFixturesGroups = () => new Promise((resolve) => {
   })
 })
 
-export const listFixtureResourcesInGroupContainer = group => new Promise((resolve) => {
+export const listFixtureResourcesInGroupContainer = (group) => new Promise((resolve) => {
   resolve(fixtureResourcesInGroupContainer(group))
 })

__tests__/fixtureLoaderHelper.test.js

@@ -19,7 +19,7 @@ describe('fixtureLoaderHelper', () => {
 
   describe('resourceTemplateId2Json', () => {
     it('mapping has id', () => {
-      expect(resourceTemplateId2Json.map(e => e.id)).toEqual(
+      expect(resourceTemplateId2Json.map((e) => e.id)).toEqual(
         expect.arrayContaining([
           'resourceTemplate:bf2:Monograph:Instance',
           'resourceTemplate:bf2:WorkVariantTitle',

__tests__/integration/schemaValidation.test.js

@@ -57,7 +57,7 @@ function dispatchEvt(node, type, data) {
 }
 
 function flushPromises(ui, store, container) {
-  return new Promise(resolve => global.setImmediate(() => {
+  return new Promise((resolve) => global.setImmediate(() => {
     render((<Provider store={store}>{ui}</Provider>), { container })
     resolve(container)
   }))

server.js

@@ -85,7 +85,7 @@ app.all('/profile-edit/server/whichrt', (req, res) => {
 
   if (reqUri !== null) {
     if (versoSpoof.ontologyUrls.includes(reqUri)) {
-      const json = versoSpoof.owlOntUrl2JsonMappings.find(el => reqUri === el.url).json
+      const json = versoSpoof.owlOntUrl2JsonMappings.find((el) => reqUri === el.url).json
 
       res.json(json)
     } else {

src/CognitoUtils.js

@@ -78,7 +78,7 @@ class CognitoUtils {
    * sessionData that's most often useful to other parts of the editor (the JWT ID token string).
    */
   static getIdTokenString(cognitoUser) {
-    return CognitoUtils.getSession(cognitoUser).then(sessionData => sessionData.idToken.jwtToken)
+    return CognitoUtils.getSession(cognitoUser).then((sessionData) => sessionData.idToken.jwtToken)
   }
 
   static handleSignout(currentUser, signedOut) {

src/GraphBuilder.js

@@ -129,7 +129,7 @@ export default class GraphBuilder {
           }
         })
       } else { // It's a deeply nested object
-        Object.keys(value).filter(elem => elem !== 'errors').forEach((key) => {
+        Object.keys(value).filter((elem) => elem !== 'errors').forEach((key) => {
           const nestedValue = value[key]
           const bnode = rdf.blankNode()
 
@@ -151,7 +151,7 @@ export default class GraphBuilder {
     if (value.items && Object.keys(value.items).length > 0) {
       return true
     }
-    return Object.keys(value).some(key => this.hasItemDescendants(value[key]))
+    return Object.keys(value).some((key) => this.hasItemDescendants(value[key]))
   }
 
   /**

src/ResourceStateBuilder.js

@@ -147,7 +147,7 @@ export default class ResourceStateBuilder {
 
     // Among the valueTemplateRefs, find all of the resource templates that match a type.
     // Ideally, only want 1 but need to handle other cases.
-    const childRtIds = await Promise.all(typeQuads.map(async typeQuad => this.selectResourceTemplateId(propertyTemplate, typeQuad.object.value)))
+    const childRtIds = await Promise.all(typeQuads.map(async (typeQuad) => this.selectResourceTemplateId(propertyTemplate, typeQuad.object.value)))
     const compactChildRtIds = _.compact(_.flatten(childRtIds))
 
     // Don't know which to pick, so error.

src/ResourceTemplateValidator.js

@@ -11,7 +11,7 @@ import _ from 'lodash'
  * @param {Array<string>} resourceTemplatesIds that are available
  * @return {Promise<Array<string>>} reasons that validation failed
  */
-export const validateResourceTemplate = async resourceTemplate => [].concat(
+export const validateResourceTemplate = async (resourceTemplate) => [].concat(
   validateRepeatedPropertyTemplates(resourceTemplate),
   validateNoDefaultURIForLiterals(resourceTemplate),
   validateNoDefaultsForTemplateRefs(resourceTemplate),
@@ -182,15 +182,15 @@ const validateUniqueResourceURIs = async (resourceTemplate) => {
     const refs = propertyTemplate.valueConstraint?.valueTemplateRefs || []
     const resourceURIs = {}
     // filter out blank referenced templates elements
-    await Promise.all(refs.filter(resourceTemplateIdRef => !_.isEmpty(resourceTemplateIdRef)).map(async (resourceTemplateIdRef) => {
+    await Promise.all(refs.filter((resourceTemplateIdRef) => !_.isEmpty(resourceTemplateIdRef)).map(async (resourceTemplateIdRef) => {
       const resourceTemplateRef = await fetchResourceTemplate(resourceTemplateIdRef)
       if (resourceTemplateRef) {
         const resourceURI = resourceTemplateRef.resourceURI
         if (!resourceURIs[resourceURI]) resourceURIs[resourceURI] = []
         resourceURIs[resourceURI].push(resourceTemplateIdRef)
       }
     }))
-    const multipleResourceURIs = Object.keys(resourceURIs).filter(resourceURI => resourceURIs[resourceURI].length > 1)
+    const multipleResourceURIs = Object.keys(resourceURIs).filter((resourceURI) => resourceURIs[resourceURI].length > 1)
     multipleResourceURIs.forEach((resourceURI) => {
       // eslint-disable-next-line max-len
       errors.push(formatError(`The following resource templates references for ${propertyTemplate.propertyURI} have the same resource URI (${resourceURI}), but must be unique: ${resourceURIs[resourceURI].join(', ')}`, resourceTemplate))
@@ -200,8 +200,8 @@ const validateUniqueResourceURIs = async (resourceTemplate) => {
 }
 
 // Not using actionCreator/fetchResourceTemplate because want to avoid affecting state.
-const fetchResourceTemplate = async resourceTemplateId => getResourceTemplate(resourceTemplateId, 'ld4p')
-  .then(response => response.response.body)
+const fetchResourceTemplate = async (resourceTemplateId) => getResourceTemplate(resourceTemplateId, 'ld4p')
+  .then((response) => response.response.body)
   .catch((err) => {
     console.error(err.toString())
     return null

src/Utilities.js

@@ -8,15 +8,15 @@ import CryptoJS from 'crypto-js'
 
 export const defaultLanguageId = 'eng'
 
-export const isResourceWithValueTemplateRef = property => property?.type === 'resource'
+export const isResourceWithValueTemplateRef = (property) => property?.type === 'resource'
     && property?.valueConstraint?.valueTemplateRefs?.length > 0
 
 export const groupName = (uri) => {
   const groupSlug = uri.split('/')[4]
   return groupNameFromGroup(groupSlug)
 }
 
-export const groupNameFromGroup = group => Config.groupsInSinopia[group] || 'Unknown'
+export const groupNameFromGroup = (group) => Config.groupsInSinopia[group] || 'Unknown'
 
 export const resourceToName = (uri) => {
   if (!_.isString(uri)) return undefined
@@ -39,7 +39,7 @@ export const isValidURI = (value) => {
  * @param {string} data that is the N3
  * @return {Promise<rdf.Dataset>} a promise that resolves to the loaded dataset
  */
-export const rdfDatasetFromN3 = data => new Promise((resolve, reject) => {
+export const rdfDatasetFromN3 = (data) => new Promise((resolve, reject) => {
   const parser = new N3Parser({ factory: rdf })
   const dataset = rdf.dataset()
   parser.parse(data,
@@ -57,4 +57,4 @@ export const rdfDatasetFromN3 = data => new Promise((resolve, reject) => {
     })
 })
 
-export const generateMD5 = message => CryptoJS.MD5(message).toString()
+export const generateMD5 = (message) => CryptoJS.MD5(message).toString()

src/actionCreators/authenticate.js

@@ -5,8 +5,8 @@ import {
   authenticationFailure, authenticationSuccess, signOutSuccess,
 } from 'actions/index'
 
-export const authenticationFailed = authenticationResult => authenticationFailure(authenticationResult)
+export const authenticationFailed = (authenticationResult) => authenticationFailure(authenticationResult)
 
-export const authenticationSucceeded = authenticationResult => authenticationSuccess(authenticationResult)
+export const authenticationSucceeded = (authenticationResult) => authenticationSuccess(authenticationResult)
 
 export const signedOut = () => signOutSuccess()

src/actionCreators/export.js

@@ -2,12 +2,12 @@ import Config from 'Config'
 import { appendError, clearErrors } from 'actions/index'
 import { exportsReceived } from 'actions/entities'
 
-export const listExports = errorKey => (dispatch) => {
+export const listExports = (errorKey) => (dispatch) => {
   dispatch(clearErrors(errorKey))
   // Not using AWS SDK because requires credentials, which is way too much overhead.
   return fetch(Config.exportBucketUrl)
-    .then(response => response.text())
-    .then(str => (new DOMParser()).parseFromString(str, 'text/xml'))
+    .then((response) => response.text())
+    .then((str) => (new DOMParser()).parseFromString(str, 'text/xml'))
     .then((data) => {
       const elems = data.getElementsByTagName('Key')
       const keys = []
@@ -16,7 +16,7 @@ export const listExports = errorKey => (dispatch) => {
       }
       dispatch(exportsReceived(keys))
     })
-    .catch(err => dispatch(appendError(errorKey, `Error retrieving list of exports: ${err.toString()}`)))
+    .catch((err) => dispatch(appendError(errorKey, `Error retrieving list of exports: ${err.toString()}`)))
 }
 
 export default listExports

src/actionCreators/languages.js

@@ -9,7 +9,7 @@ const loadLanguages = () => (dispatch, getState) => {
 
   dispatch(loadingLanguages())
   return fetch('https://id.loc.gov/vocabulary/iso639-2.json')
-    .then(resp => resp.json())
+    .then((resp) => resp.json())
     .then((json) => {
       dispatch(languagesReceived(json))
     })

src/actionCreators/lookup.js

@@ -3,15 +3,15 @@ import { lookupOptionsRetrieved } from 'actions/entities'
 import shortid from 'shortid'
 
 // A thunk that fetches a lookup, transforms it, and adds to state.
-const fetchLookup = uri => (dispatch, getState) => {
+const fetchLookup = (uri) => (dispatch, getState) => {
   const existingLookup = findLookup(getState(), uri)
   if (existingLookup) {
     return existingLookup
   }
   const url = `${uri}.json`
   return fetch(url)
-    .then(resp => resp.json())
-    .then(json => responseToOptions(json))
+    .then((resp) => resp.json())
+    .then((json) => responseToOptions(json))
     .then((opts) => {
       dispatch(lookupOptionsRetrieved(uri, opts))
       return opts
@@ -34,7 +34,7 @@ const responseToOptions = (json) => {
       const item = Object.getOwnPropertyDescriptor(json, i)
       const uri = item.value['@id']
       const labels = item.value['http://www.loc.gov/mads/rdf/v1#authoritativeLabel']
-      labels.forEach(label => opts.push({ id: newId, label: label['@value'], uri }))
+      labels.forEach((label) => opts.push({ id: newId, label: label['@value'], uri }))
     } catch (err) {
       // Ignore
     }

src/actionCreators/resourceTemplates.js

@@ -24,7 +24,7 @@ export const fetchResourceTemplate = (resourceTemplateId, errorKey) => (dispatch
         dispatch(setResourceTemplate(resourceTemplate))
         return resourceTemplate
       }
-      errors.forEach(error => dispatch(appendError(errorKey, error)))
+      errors.forEach((error) => dispatch(appendError(errorKey, error)))
     }).catch((err) => { throw err })
   }).catch((err) => {
     console.error(err)
@@ -122,7 +122,7 @@ const humanReadableStatus = (status) => {
 
 export const handleUpdateResource = (rts, group) => async (dispatch, getState) => {
   const user = getCurrentUser(getState())
-  const responses = await Promise.all(rts.map(rt => updateResource(rt, group, user, dispatch)))
+  const responses = await Promise.all(rts.map((rt) => updateResource(rt, group, user, dispatch)))
 
   updateStateFromServerResponses(responses, dispatch)
 }