Merge branch 'pb-stuck-job-in-progress-ux' into 'master'

Add warning icon beside in progress if stuck

See merge request gitlab-org/gitlab!58427

app/assets/javascripts/pipelines/components/pipelines_list/time_ago.vue

@@ -25,6 +25,9 @@ export default {
     skipped() {
       return this.pipeline?.details?.status?.label === 'skipped';
     },
+    stuck() {
+      return this.pipeline.flags.stuck;
+    },
     durationFormatted() {
       const date = new Date(this.duration * 1000);
 
@@ -67,7 +70,20 @@ export default {
     </div>
     <div :class="legacyTableMobileClass">
       <span v-if="showInProgress" data-testid="pipeline-in-progress">
-        <gl-icon name="hourglass" class="gl-vertical-align-baseline! gl-mr-2" :size="12" />
+        <gl-icon
+          v-if="stuck"
+          name="warning"
+          class="gl-mr-2"
+          :size="12"
+          data-testid="warning-icon"
+        />
+        <gl-icon
+          v-else
+          name="hourglass"
+          class="gl-vertical-align-baseline! gl-mr-2"
+          :size="12"
+          data-testid="hourglass-icon"
+        />
         {{ s__('Pipeline|In progress') }}
       </span>
 

changelogs/unreleased/pb-stuck-job-in-progress-ux.yml

+---
+title: Add warning icon beside in progress text if pipeline is stuck
+merge_request: 58427
+author:
+type: changed

spec/frontend/pipelines/time_ago_spec.js

 import { GlIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import TimeAgo from '~/pipelines/components/pipelines_list/time_ago.vue';
 
 describe('Timeago component', () => {
   let wrapper;
 
-  const createComponent = (props = {}) => {
-    wrapper = shallowMount(TimeAgo, {
+  const defaultProps = { duration: 0, finished_at: '' };
+
+  const createComponent = (props = defaultProps, stuck = false) => {
+    wrapper = extendedWrapper(
+      shallowMount(TimeAgo, {
         propsData: {
           pipeline: {
             details: {
               ...props,
             },
+            flags: {
+              stuck,
+            },
           },
         },
         data() {
@@ -19,7 +26,8 @@ describe('Timeago component', () => {
             iconTimerSvg: `<svg></svg>`,
           };
         },
-    });
+      }),
+    );
   };
 
   afterEach(() => {
@@ -29,8 +37,10 @@ describe('Timeago component', () => {
 
   const duration = () => wrapper.find('.duration');
   const finishedAt = () => wrapper.find('.finished-at');
-  const findInProgress = () => wrapper.find('[data-testid="pipeline-in-progress"]');
-  const findSkipped = () => wrapper.find('[data-testid="pipeline-skipped"]');
+  const findInProgress = () => wrapper.findByTestId('pipeline-in-progress');
+  const findSkipped = () => wrapper.findByTestId('pipeline-skipped');
+  const findHourGlassIcon = () => wrapper.findByTestId('hourglass-icon');
+  const findWarningIcon = () => wrapper.findByTestId('warning-icon');
 
   describe('with duration', () => {
     beforeEach(() => {
@@ -47,7 +57,7 @@ describe('Timeago component', () => {
 
   describe('without duration', () => {
     beforeEach(() => {
-      createComponent({ duration: 0, finished_at: '' });
+      createComponent();
     });
 
     it('should not render duration and timer svg', () => {
@@ -72,7 +82,7 @@ describe('Timeago component', () => {
 
   describe('without finishedTime', () => {
     beforeEach(() => {
-      createComponent({ duration: 0, finished_at: '' });
+      createComponent();
     });
 
     it('should not render time and calendar icon', () => {
@@ -99,6 +109,15 @@ describe('Timeago component', () => {
         expect(findSkipped().exists()).toBe(false);
       },
     );
+
+    it('should show warning icon beside in progress if pipeline is stuck', () => {
+      const stuck = true;
+
+      createComponent(defaultProps, stuck);
+
+      expect(findWarningIcon().exists()).toBe(true);
+      expect(findHourGlassIcon().exists()).toBe(false);
+    });
   });
 
   describe('skipped', () => {