1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/unwrapping_utils.js b/app/assets/javascripts/pipelines/components/unwrapping_utils.js
index 2d24beb8323..d42a11c3aba 100644
--- a/app/assets/javascripts/pipelines/components/unwrapping_utils.js
+++ b/app/assets/javascripts/pipelines/components/unwrapping_utils.js
@@ -1,4 +1,5 @@
 import { reportToSentry } from '../utils';
+import { EXPLICIT_NEEDS_PROPERTY, NEEDS_PROPERTY } from '../constants';
 
 const unwrapGroups = (stages) => {
   return stages.map((stage, idx) => {
@@ -27,12 +28,16 @@ const unwrapNodesWithName = (jobArray, prop, field = 'name') => {
   }
 
   return jobArray.map((job) => {
-    return { ...job, [prop]: job[prop].nodes.map((item) => item[field] || '') };
+    if (job[prop]) {
+      return { ...job, [prop]: job[prop].nodes.map((item) => item[field] || '') };
+    }
+    return job;
   });
 };
 
 const unwrapJobWithNeeds = (denodedJobArray) => {
-  return unwrapNodesWithName(denodedJobArray, 'needs');
+  const explicitNeedsUnwrapped = unwrapNodesWithName(denodedJobArray, EXPLICIT_NEEDS_PROPERTY);
+  return unwrapNodesWithName(explicitNeedsUnwrapped, NEEDS_PROPERTY);
 };
 
 const unwrapStagesWithNeedsAndLookup = (denodedStages) => {