From d0d0e807cdaaa169d4fffd3f29c5dc4c98072723 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 11 Mar 2019 10:22:32 +0000
Subject: [PATCH 1/2] Removes ee differences for container.vue

Creates a mixin to include the ee only properties
---
 .../environments/components/container.vue     | 10 ++++---
 .../environments/mixins/container_mixin.js    | 29 +++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/javascripts/environments/mixins/container_mixin.js

diff --git a/app/assets/javascripts/environments/components/container.vue b/app/assets/javascripts/environments/components/container.vue
index bdcdb3aa9227c9..5b9b49e642c4f6 100644
--- a/app/assets/javascripts/environments/components/container.vue
+++ b/app/assets/javascripts/environments/components/container.vue
@@ -1,14 +1,16 @@
 <script>
 import { GlLoadingIcon } from '@gitlab/ui';
-import tablePagination from '../../vue_shared/components/table_pagination.vue';
-import environmentTable from '../components/environments_table.vue';
+import TablePagination from '~/vue_shared/components/table_pagination.vue';
+import containerMixin from 'ee_else_ce/environments/mixins/container_mixin';
+import EnvironmentTable from '../components/environments_table.vue';
 
 export default {
   components: {
-    environmentTable,
-    tablePagination,
+    EnvironmentTable,
+    TablePagination,
     GlLoadingIcon,
   },
+  mixins: [containerMixin],
   props: {
     isLoading: {
       type: Boolean,
diff --git a/app/assets/javascripts/environments/mixins/container_mixin.js b/app/assets/javascripts/environments/mixins/container_mixin.js
new file mode 100644
index 00000000000000..f2907c120f875b
--- /dev/null
+++ b/app/assets/javascripts/environments/mixins/container_mixin.js
@@ -0,0 +1,29 @@
+export default {
+  props: {
+    canaryDeploymentFeatureId: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    showCanaryDeploymentCallout: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    userCalloutsPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    lockPromotionSvgPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    helpCanaryDeploymentsPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
+  },
+};
-- 
GitLab


From dc21232dbccca1a58aa7f94f0bca782a91d77b0b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 11 Mar 2019 10:46:13 +0000
Subject: [PATCH 2/2] Creates EE mixin for container.vue

---
 .../environments/components/container.vue     | 22 -----------------
 .../environments/mixins/container_mixin.js    | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 ee/app/assets/javascripts/environments/mixins/container_mixin.js

diff --git a/app/assets/javascripts/environments/components/container.vue b/app/assets/javascripts/environments/components/container.vue
index 5b9b49e642c4f6..be80661223ca67 100644
--- a/app/assets/javascripts/environments/components/container.vue
+++ b/app/assets/javascripts/environments/components/container.vue
@@ -28,28 +28,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    // ee-only start
-    canaryDeploymentFeatureId: {
-      type: String,
-      required: true,
-    },
-    showCanaryDeploymentCallout: {
-      type: Boolean,
-      required: true,
-    },
-    userCalloutsPath: {
-      type: String,
-      required: true,
-    },
-    lockPromotionSvgPath: {
-      type: String,
-      required: true,
-    },
-    helpCanaryDeploymentsPath: {
-      type: String,
-      required: true,
-    },
-    // ee-only end
   },
   methods: {
     onChangePage(page) {
diff --git a/ee/app/assets/javascripts/environments/mixins/container_mixin.js b/ee/app/assets/javascripts/environments/mixins/container_mixin.js
new file mode 100644
index 00000000000000..eee9b2ba5d0b65
--- /dev/null
+++ b/ee/app/assets/javascripts/environments/mixins/container_mixin.js
@@ -0,0 +1,24 @@
+export default {
+  props: {
+    canaryDeploymentFeatureId: {
+      type: String,
+      required: true,
+    },
+    showCanaryDeploymentCallout: {
+      type: Boolean,
+      required: true,
+    },
+    userCalloutsPath: {
+      type: String,
+      required: true,
+    },
+    lockPromotionSvgPath: {
+      type: String,
+      required: true,
+    },
+    helpCanaryDeploymentsPath: {
+      type: String,
+      required: true,
+    },
+  },
+};
-- 
GitLab