Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 32 insertions, 0 deletions

diff --git a/app/assets/javascripts/pipeline_schedules/components/table/cells/pipeline_schedule_next_run.vue b/app/assets/javascripts/pipeline_schedules/components/table/cells/pipeline_schedule_next_run.vue
new file mode 100644
index 00000000000..48d59bf6e7c
--- /dev/null
+++ b/app/assets/javascripts/pipeline_schedules/components/table/cells/pipeline_schedule_next_run.vue
@@ -0,0 +1,32 @@
+<script>
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+
+export default {
+  components: {
+    TimeAgoTooltip,
+  },
+  props: {
+    schedule: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    showTimeAgo() {
+      return this.schedule.active && this.schedule.nextRunAt;
+    },
+    realNextRunTime() {
+      return this.schedule.realNextRun;
+    },
+  },
+};
+</script>
+
+<template>
+  <div>
+    <time-ago-tooltip v-if="showTimeAgo" :time="realNextRunTime" />
+    <span v-else data-testid="pipeline-schedule-inactive">
+      {{ s__('PipelineSchedules|Inactive') }}
+    </span>
+  </div>
+</template>