Enable object-shorthand eslint rule

evm/src/helpersV2.ts

@@ -242,7 +242,7 @@ export function decodeRunRequest(log?: ethers.providers.Log): RunRequest {
     id: toHex(requestId),
     jobId: log.topics[1],
     payment: toHex(payment),
-    requester: requester,
+    requester,
     topic: log.topics[0],
   }
 }

explorer/client/src/__tests__/reducers/jobRuns.test.ts

@@ -38,7 +38,7 @@ describe('reducers/jobRuns', () => {
       })
       const action: FetchJobRunsSucceededAction = {
         type: 'FETCH_JOB_RUNS_SUCCEEDED',
-        data: data,
+        data,
       }
       const state = reducer(INITIAL_STATE, action)
 
@@ -66,7 +66,7 @@ describe('reducers/jobRuns', () => {
       })
       const action: FetchJobRunSucceededAction = {
         type: 'FETCH_JOB_RUN_SUCCEEDED',
-        data: data,
+        data,
       }
       const state = reducer(INITIAL_STATE, action)
 

explorer/client/src/__tests__/reducers/jobRunsIndex.test.ts

@@ -22,7 +22,7 @@ describe('reducers/jobRunsIndex', () => {
         type: 'FETCH_JOB_RUNS_SUCCEEDED',
         data: {
           chainlinkNodes: [],
-          jobRuns: jobRuns,
+          jobRuns,
           meta: {
             currentPageJobRuns: {
               data: jobRuns,
@@ -51,7 +51,7 @@ describe('reducers/jobRunsIndex', () => {
       })
       const action: FetchJobRunSucceededAction = {
         type: 'FETCH_JOB_RUN_SUCCEEDED',
-        data: data,
+        data,
       }
       const state = reducer(INITIAL_STATE, action)
 

explorer/client/src/__tests__/utils/status.test.ts

@@ -18,7 +18,7 @@ describe('utils/status', () => {
     const taskRuns: TaskRun[] = [COMPLETED_ETHTX_WITHOUT_STATUS]
     const jobRun = partialAsFull<JobRun>({
       status: 'in_progress',
-      taskRuns: taskRuns,
+      taskRuns,
     })
 
     const [text, unfulfilledEthTx] = status(jobRun)
@@ -30,7 +30,7 @@ describe('utils/status', () => {
     const taskRuns: TaskRun[] = [COMPLETED_ETHTX_WITH_STATUS]
     const jobRun = partialAsFull<JobRun>({
       status: 'in_progress',
-      taskRuns: taskRuns,
+      taskRuns,
     })
 
     const [text, unfulfilledEthTx] = status(jobRun)
@@ -50,7 +50,7 @@ describe('utils/status', () => {
     const taskRuns: TaskRun[] = [COMPLETED_ETHTX_WITHOUT_STATUS]
     const jobRun = partialAsFull<JobRun>({
       status: 'error',
-      taskRuns: taskRuns,
+      taskRuns,
     })
 
     const [text, unfulfilledEthTx] = status(jobRun)
@@ -62,7 +62,7 @@ describe('utils/status', () => {
     const taskRuns: TaskRun[] = [COMPLETED_ETHTX_WITH_STATUS]
     const jobRun = partialAsFull<JobRun>({
       status: 'error',
-      taskRuns: taskRuns,
+      taskRuns,
     })
 
     const [text, unfulfilledEthTx] = status(jobRun)
@@ -82,7 +82,7 @@ describe('utils/status', () => {
     const taskRuns: TaskRun[] = [COMPLETED_ETHTX_WITHOUT_STATUS]
     const jobRun = partialAsFull<JobRun>({
       status: 'completed',
-      taskRuns: taskRuns,
+      taskRuns,
     })
 
     const [text, unfulfilledEthTx] = status(jobRun)
@@ -94,7 +94,7 @@ describe('utils/status', () => {
     const taskRuns: TaskRun[] = [COMPLETED_ETHTX_WITH_STATUS]
     const jobRun = partialAsFull<JobRun>({
       status: 'completed',
-      taskRuns: taskRuns,
+      taskRuns,
     })
 
     const [text, unfulfilledEthTx] = status(jobRun)

explorer/client/src/actions/helpers.ts

@@ -68,7 +68,7 @@ export function request<
           } else {
             dispatch({
               type: 'NOTIFY_ERROR',
-              error: error,
+              error,
             })
           }
         })

explorer/src/controllers/admin/nodes.ts

@@ -41,7 +41,7 @@ router.post('/nodes', async (req, res) => {
       return res.status(httpStatus.CREATED).json({
         id: savedNode.id,
         accessKey: savedNode.accessKey,
-        secret: secret,
+        secret,
       })
     } catch (e) {
       if (

explorer/src/controllers/jobRuns.ts

@@ -17,7 +17,7 @@ const searchParams = (req: Request): SearchParams => {
 
   return {
     searchQuery: req.query.query,
-    page: page,
+    page,
     limit: size,
   }
 }

explorer/src/entity/ChainlinkNode.ts

@@ -106,7 +106,7 @@ export const deleteChainlinkNode = async (db: Connection, name: string) => {
     .delete()
     .from(ChainlinkNode)
     .where('name = :name', {
-      name: name,
+      name,
     })
     .execute()
 }

explorer/src/serializers/chainlinkNodesSerializer.ts

@@ -12,7 +12,7 @@ const chainlinkNodesSerializer = (
   const opts = {
     attributes: BASE_ATTRIBUTES,
     keyForAttribute: 'camelCase',
-    meta: { count: count },
+    meta: { count },
   } as SerializerOptions
 
   return new JSONAPISerializer('chainlink_nodes', opts).serialize(

explorer/src/serializers/jobRunsSerializer.ts

@@ -8,7 +8,7 @@ import { BASE_ATTRIBUTES, chainlinkNode } from './jobRunSerializer'
 const jobRunsSerializer = (runs: JobRun[], runCount: number) => {
   const opts = {
     attributes: BASE_ATTRIBUTES,
-    chainlinkNode: chainlinkNode,
+    chainlinkNode,
     keyForAttribute: 'camelCase',
     meta: { count: runCount },
   } as SerializerOptions

operator_ui/__tests__/connectors/reducers/notifications.test.js

@@ -72,12 +72,12 @@ describe('connectors/reducers/notifications', () => {
 
     const component = () => {}
     const props = {}
-    const action = { type: NOTIFY_SUCCESS, component: component, props: props }
+    const action = { type: NOTIFY_SUCCESS, component, props }
     const state = reducer(previousState, action)
 
     expect(state.notifications).toEqual({
       errors: [],
-      successes: [{ component: component, props: props }],
+      successes: [{ component, props }],
       currentUrl: null,
     })
   })
@@ -95,12 +95,12 @@ describe('connectors/reducers/notifications', () => {
       const error = {
         errors: [{ detail: 'Error 1' }, { detail: 'Error 2' }],
       }
-      const action = { type: NOTIFY_ERROR, component: component, error: error }
+      const action = { type: NOTIFY_ERROR, component, error }
       const state = reducer(previousState, action)
 
       expect(state.notifications.errors).toEqual([
-        { component: component, props: { msg: 'Error 1' } },
-        { component: component, props: { msg: 'Error 2' } },
+        { component, props: { msg: 'Error 1' } },
+        { component, props: { msg: 'Error 2' } },
       ])
     })
 
@@ -114,11 +114,11 @@ describe('connectors/reducers/notifications', () => {
 
       const component = () => {}
       const error = { message: 'Single Error' }
-      const action = { type: NOTIFY_ERROR, component: component, error: error }
+      const action = { type: NOTIFY_ERROR, component, error }
       const state = reducer(previousState, action)
 
       expect(state.notifications.errors).toEqual([
-        { component: component, props: { msg: 'Single Error' } },
+        { component, props: { msg: 'Single Error' } },
       ])
     })
 
@@ -132,7 +132,7 @@ describe('connectors/reducers/notifications', () => {
 
       const component = () => {}
       const error = {}
-      const action = { type: NOTIFY_ERROR, component: component, error: error }
+      const action = { type: NOTIFY_ERROR, component, error }
       const state = reducer(previousState, action)
 
       expect(state.notifications.errors).toEqual([{}])
@@ -148,7 +148,7 @@ describe('connectors/reducers/notifications', () => {
 
       const component = () => {}
       const error = {}
-      const action = { type: NOTIFY_ERROR, component: component, error: error }
+      const action = { type: NOTIFY_ERROR, component, error }
       const state = reducer(previousState, action)
 
       expect(state.notifications.successes).toEqual([])

operator_ui/__tests__/containers/JobRuns/Index.test.js

@@ -35,7 +35,7 @@ describe('containers/JobRuns/Index', () => {
     const runsResponse = jsonApiJobSpecRunFactory([{ jobId: jobSpecId }])
     global.fetch.getOnce(globPath('/v2/runs'), runsResponse)
 
-    const props = { match: { params: { jobSpecId: jobSpecId } } }
+    const props = { match: { params: { jobSpecId } } }
     const wrapper = mountIndex(props)
 
     await syncFetch(wrapper)
@@ -52,7 +52,7 @@ describe('containers/JobRuns/Index', () => {
     )
     global.fetch.getOnce(globPath('/v2/runs'), pageOneResponse)
 
-    const props = { match: { params: { jobSpecId: jobSpecId } }, pageSize: 1 }
+    const props = { match: { params: { jobSpecId } }, pageSize: 1 }
     const wrapper = mountIndex(props)
 
     await syncFetch(wrapper)
@@ -104,7 +104,7 @@ describe('containers/JobRuns/Index', () => {
     const runsResponse = jsonApiJobSpecRunFactory([])
     await global.fetch.getOnce(globPath('/v2/runs'), runsResponse)
 
-    const props = { match: { params: { jobSpecId: jobSpecId } } }
+    const props = { match: { params: { jobSpecId } } }
     const wrapper = mountIndex(props)
 
     await syncFetch(wrapper)

operator_ui/__tests__/containers/JobRuns/Show/Overview.test.js

@@ -52,7 +52,7 @@ describe('containers/JobRuns/Show/Overview', () => {
     global.fetch.getOnce(globPath(`/v2/runs/${jobRunId}`), jobRunResponse)
 
     const props = {
-      match: { params: { jobSpecId: jobSpecId, jobRunId: jobRunId } },
+      match: { params: { jobSpecId, jobRunId } },
     }
     const wrapper = mountShow(props)
 

operator_ui/__tests__/containers/Jobs/Show.test.js

@@ -45,7 +45,7 @@ describe('containers/Jobs/Show', () => {
     ])
     global.fetch.getOnce(globPath('/v2/runs'), jobRunResponse)
 
-    const props = { match: { params: { jobSpecId: jobSpecId } } }
+    const props = { match: { params: { jobSpecId } } }
     const wrapper = mountShow(props)
 
     await syncFetch(wrapper)
@@ -75,7 +75,7 @@ describe('containers/Jobs/Show', () => {
     global.fetch.getOnce(globPath(`/v2/specs/${jobSpecId}`), jobSpecResponse)
     global.fetch.getOnce(globPath('/v2/runs'), jobRunsResponse)
 
-    const props = { match: { params: { jobSpecId: jobSpecId } } }
+    const props = { match: { params: { jobSpecId } } }
     const wrapper = mountShow(props)
 
     await syncFetch(wrapper)

operator_ui/__tests__/containers/Notifications.test.js

@@ -31,8 +31,8 @@ describe('containers/Notifications', () => {
     ]
     const state = {
       notifications: {
-        successes: successes,
-        errors: errors,
+        successes,
+        errors,
         currentUrl: null,
       },
     }

operator_ui/src/actions.ts

@@ -19,10 +19,10 @@ type Errors =
   | jsonapi.ServerError
   | jsonapi.UnknownResponseError
 
-const createAction = (type: string) => ({ type: type })
+const createAction = (type: string) => ({ type })
 
 const createErrorAction = (error: Error, type: string) => ({
-  type: type,
+  type,
   error: error.stack,
 })
 
@@ -56,7 +56,7 @@ interface Match {
 export const matchRoute = (match: Match) => {
   return {
     type: RouterActionType.MATCH_ROUTE,
-    match: match,
+    match,
   }
 }
 
@@ -65,17 +65,17 @@ export const NOTIFY_SUCCESS = 'NOTIFY_SUCCESS'
 export const notifySuccess = (component: React.ReactNode, props: object) => {
   return {
     type: NOTIFY_SUCCESS,
-    component: component,
-    props: props,
+    component,
+    props,
   }
 }
 
 export const NOTIFY_ERROR = 'NOTIFY_ERROR'
 
 export const notifyError = (component: React.ReactNode, error: Error) => ({
   type: NOTIFY_ERROR,
-  component: component,
-  error: error,
+  component,
+  error,
 })
 
 export const REQUEST_SIGNIN = 'REQUEST_SIGNIN'
@@ -161,7 +161,7 @@ export const RECEIVE_DELETE_ERROR = 'RECEIVE_DELETE_ERROR'
 
 const receiveDeleteSuccess = (id: string) => ({
   type: RECEIVE_DELETE_SUCCESS,
-  id: id,
+  id,
 })
 
 export const REQUEST_UPDATE = 'REQUEST_UPDATE'
@@ -170,7 +170,7 @@ export const RECEIVE_UPDATE_ERROR = 'RECEIVE_UPDATE_ERROR'
 
 const receiveUpdateSuccess = (response: Response) => ({
   type: RECEIVE_UPDATE_SUCCESS,
-  response: response,
+  response,
 })
 
 export const submitSignIn = (data: Parameter<typeof api.createSession>) =>

operator_ui/src/connectors/redux/reducers/notifications.js

@@ -55,13 +55,13 @@ export default (state = initialState, action = {}) => {
 
       if (error.errors) {
         errorNotifications = error.errors.map(e => ({
-          component: component,
+          component,
           props: { msg: e.detail },
         }))
       } else if (error.message) {
         errorNotifications = [
           {
-            component: component,
+            component,
             props: { msg: error.message },
           },
         ]

operator_ui/src/containers/JobRuns/Index.js

@@ -81,10 +81,10 @@ export const Index = useHooks(props => {
       ? parseInt(props.match.params.jobRunsPage, 10) || FIRST_PAGE
       : FIRST_PAGE
     setPage(queryPage)
-    fetchJobRuns({ jobSpecId: jobSpecId, page: queryPage, size: pageSize })
+    fetchJobRuns({ jobSpecId, page: queryPage, size: pageSize })
   }, [])
   const handleChangePage = (_, pageNum) => {
-    fetchJobRuns({ jobSpecId: jobSpecId, page: pageNum, size: pageSize })
+    fetchJobRuns({ jobSpecId, page: pageNum, size: pageSize })
     setPage(pageNum)
   }
 

operator_ui/src/containers/Jobs/RegionalNav.tsx

@@ -249,7 +249,7 @@ const RegionalNav = ({
                   <Button
                     href={{
                       pathname: '/jobs/new',
-                      state: { definition: definition },
+                      state: { definition },
                     }}
                     component={BaseLink}
                     className={classes.duplicate}

operator_ui/src/containers/Jobs/Show.tsx

@@ -188,7 +188,7 @@ export const Show = useHooks(
       document.title = 'Show Job'
       fetchJob(jobSpecId)
       fetchJobRuns({
-        jobSpecId: jobSpecId,
+        jobSpecId,
         page: DEFAULT_PAGE,
         size: RECENT_RUNS_COUNT,
       })