Add latest changes from gitlab-org/gitlab@master

2 files changed, 73 insertions, 1 deletions

diff --git a/app/assets/javascripts/environments/components/deployment.vue b/app/assets/javascripts/environments/components/deployment.vue
index 292f9a366c3..ef43ca6bc33 100644
--- a/app/assets/javascripts/environments/components/deployment.vue
+++ b/app/assets/javascripts/environments/components/deployment.vue
@@ -1,13 +1,25 @@
 <script>
+import DeploymentStatusBadge from './deployment_status_badge.vue';
+
 export default {
+  components: {
+    DeploymentStatusBadge,
+  },
   props: {
     deployment: {
       type: Object,
       required: true,
     },
   },
+  computed: {
+    status() {
+      return this.deployment?.status;
+    },
+  },
 };
 </script>
 <template>
-  <div></div>
+  <div>
+    <deployment-status-badge v-if="status" :status="status" />
+  </div>
 </template>
diff --git a/app/assets/javascripts/environments/components/deployment_status_badge.vue b/app/assets/javascripts/environments/components/deployment_status_badge.vue
new file mode 100644
index 00000000000..5a026911766
--- /dev/null
+++ b/app/assets/javascripts/environments/components/deployment_status_badge.vue
@@ -0,0 +1,60 @@
+<script>
+import { GlBadge } from '@gitlab/ui';
+import { s__ } from '~/locale';
+
+const STATUS_TEXT = {
+  created: s__('Deployment|Created'),
+  running: s__('Deployment|Running'),
+  success: s__('Deployment|Success'),
+  failed: s__('Deployment|Failed'),
+  canceled: s__('Deployment|Cancelled'),
+  skipped: s__('Deployment|Skipped'),
+  blocked: s__('Deployment|Waiting'),
+};
+
+const STATUS_VARIANT = {
+  success: 'success',
+  running: 'info',
+  failed: 'danger',
+  created: 'neutral',
+  canceled: 'neutral',
+  skipped: 'neutral',
+  blocked: 'neutral',
+};
+
+const STATUS_ICON = {
+  success: 'status_success',
+  running: 'status_running',
+  failed: 'status_failed',
+  created: 'status_created',
+  canceled: 'status_canceled',
+  skipped: 'status_skipped',
+  blocked: 'status_manual',
+};
+
+export default {
+  components: {
+    GlBadge,
+  },
+  props: {
+    status: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    icon() {
+      return STATUS_ICON[this.status];
+    },
+    text() {
+      return STATUS_TEXT[this.status];
+    },
+    variant() {
+      return STATUS_VARIANT[this.status];
+    },
+  },
+};
+</script>
+<template>
+  <gl-badge v-if="status" :icon="icon" :variant="variant">{{ text }}</gl-badge>
+</template>