Remove custom normalizer for non JSON-API compliant payload

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

@@ -31,14 +31,7 @@ describe('containers/JobRuns/Index', () => {
   it('renders the runs for the job spec', async () => {
     expect.assertions(2)
 
-    const runsResponse = jsonApiJobSpecRunFactory(
-      [
-        {
-          jobId: jobSpecId
-        }
-      ],
-      jobSpecId
-    )
+    const runsResponse = jsonApiJobSpecRunFactory([{ jobId: jobSpecId }])
     global.fetch.getOnce(
       `/v2/runs?sort=-createdAt&page=1&size=25&jobSpecId=${jobSpecId}`,
       runsResponse
@@ -56,8 +49,7 @@ describe('containers/JobRuns/Index', () => {
     expect.assertions(12)
 
     const pageOneResponse = jsonApiJobSpecRunFactory(
-      [{ id: 'ID-ON-FIRST-PAGE' }],
-      jobSpecId,
+      [{ id: 'ID-ON-FIRST-PAGE', jobId: jobSpecId }],
       3
     )
     global.fetch.getOnce(
@@ -73,8 +65,7 @@ describe('containers/JobRuns/Index', () => {
     expect(wrapper.text()).not.toContain('ID-ON-SECOND-PAGE')
 
     const pageTwoResponse = jsonApiJobSpecRunFactory(
-      [{ id: 'ID-ON-SECOND-PAGE' }],
-      jobSpecId,
+      [{ id: 'ID-ON-SECOND-PAGE', jobId: jobSpecId }],
       3
     )
     global.fetch.getOnce(
@@ -98,8 +89,7 @@ describe('containers/JobRuns/Index', () => {
     expect(wrapper.text()).not.toContain('ID-ON-SECOND-PAGE')
 
     const pageThreeResponse = jsonApiJobSpecRunFactory(
-      [{ id: 'ID-ON-THIRD-PAGE' }],
-      jobSpecId,
+      [{ id: 'ID-ON-THIRD-PAGE', jobId: jobSpecId }],
       3
     )
     global.fetch.getOnce(
@@ -128,7 +118,7 @@ describe('containers/JobRuns/Index', () => {
   it('displays an empty message', async () => {
     expect.assertions(1)
 
-    const runsResponse = jsonApiJobSpecRunFactory([], jobSpecId)
+    const runsResponse = jsonApiJobSpecRunFactory([])
     global.fetch.getOnce(
       `/v2/runs?sort=-createdAt&page=1&size=25&jobSpecId=${jobSpecId}`,
       runsResponse

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

@@ -21,29 +21,25 @@ const mountShow = props =>
 describe('containers/Jobs/Show', () => {
   const jobSpecId = 'c60b9927eeae43168ddbe92584937b1b'
   const jobRunId = 'ad24b72c12f441b99b9877bcf6cb506e'
+
   it('renders the details of the job spec, its latest runs and task list entries,', async () => {
     expect.assertions(7)
 
     const minuteAgo = isoDate(Date.now() - MINUTE_MS)
     const jobSpecResponse = jsonApiJobSpecFactory({
       id: jobSpecId,
       initiators: [{ type: 'web' }],
-      createdAt: minuteAgo,
-      runs: [
-        {
-          id: 'runA',
-          status: 'pending',
-          result: { data: { value: '8400.00' } }
-        }
-      ]
+      createdAt: minuteAgo
     })
+    global.fetch.getOnce(`/v2/specs/${jobSpecId}`, jobSpecResponse)
+
     const jobRunResponse = jsonApiJobSpecRunsFactory([
       {
         id: jobRunId,
-        jobId: jobSpecId
+        jobId: jobSpecId,
+        status: 'pending'
       }
     ])
-    global.fetch.getOnce(`/v2/specs/${jobSpecId}`, jobSpecResponse)
     global.fetch.getOnce(
       `/v2/runs?sort=-createdAt&page=1&size=5&jobSpecId=${jobSpecId}`,
       jobRunResponse

operator_ui/src/actions.ts

@@ -273,41 +273,6 @@ const request = (type, requestData, normalizeData, ...apiArgs) => {
   }
 }
 
-const normalizeFetchJob = json => {
-  const attrs = Object.assign({}, json.data.attributes)
-  const runs = attrs.runs
-  delete attrs.runs
-
-  const validJsonApi = Object.assign(
-    {},
-    json,
-    {
-      data: {
-        id: json.data.id,
-        type: json.data.type,
-        attributes: attrs,
-        relationships: {
-          runs: {
-            data: (runs || []).map(r => ({
-              type: 'runs',
-              id: r.id
-            }))
-          }
-        }
-      }
-    },
-    {
-      included: (runs || []).map(r => ({
-        type: 'runs',
-        id: r.id,
-        attributes: r
-      }))
-    }
-  )
-
-  return normalize(validJsonApi, { camelizeKeys: false })
-}
-
 export const fetchAccountBalance = () =>
   request('ACCOUNT_BALANCE', api.getAccountBalance, json => normalize(json))
 
@@ -329,7 +294,7 @@ export const fetchRecentlyCreatedJobs = size =>
   )
 
 export const fetchJob = id =>
-  request('JOB', api.getJobSpec, json => normalizeFetchJob(json), id)
+  request('JOB', api.getJobSpec, json => normalize(json), id)
 
 export const fetchJobRuns = (opts: api.JobSpecRunsOpts) =>
   request(

operator_ui/support/factories/jsonApiJobSpecRuns.js

@@ -1,31 +1,33 @@
 import uuid from 'uuid/v4'
 import { decamelizeKeys } from 'humps'
 
-export default (jobs, jobSpecId, count) => {
-  const j = jobs || []
-  const jc = count || j.length
+export default (runs, count) => {
+  const r = runs || []
+  const rc = count || r.length
 
   return decamelizeKeys({
-    meta: { count: jc },
-    data: j.map(c => {
+    meta: { count: rc },
+    data: r.map(c => {
       const config = c || {}
       const id = config.id || uuid().replace(/-/g, '')
+      const jobId = config.jobId || uuid().replace(/-/g, '')
+      const status = config.status || 'completed'
 
       return {
         id: id,
         type: 'runs',
         attributes: {
           id: id,
-          jobId: jobSpecId,
+          jobId: jobId,
           result: {
             jobRunId: id,
             data: {
               value: { result: 'value' }
             },
-            status: 'completed',
+            status: status,
             error: null
           },
-          status: 'completed',
+          status: status,
           createdAt: '2018-06-18T15:49:33.015913563-04:00',
           finishedAt: '2018-06-18T15:49:33.023078819-04:00'
         }