From 3e60798e110764cd06a2966c3be8e048b2b9019c Mon Sep 17 00:00:00 2001
From: Scott Hampton <shampton@gitlab.com>
Date: Fri, 11 Jan 2019 09:14:49 -0700
Subject: [PATCH] Backporting environments helper

Allowing the EE to override a helper function to pass more data to vue
---
 .../environments/folder/environments_folder_bundle.js    | 8 ++++----
 app/helpers/environments_helper.rb                       | 9 +++++++++
 app/views/projects/environments/folder.html.haml         | 5 +----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/environments/folder/environments_folder_bundle.js b/app/assets/javascripts/environments/folder/environments_folder_bundle.js
index 3cf6e4ad14d..982e550e73c 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_bundle.js
+++ b/app/assets/javascripts/environments/folder/environments_folder_bundle.js
@@ -15,11 +15,11 @@ export default () =>
       const environmentsData = document.querySelector(this.$options.el).dataset;
 
       return {
-        endpoint: environmentsData.endpoint,
-        folderName: environmentsData.folderName,
+        endpoint: environmentsData.environmentsDataEndpoint,
+        folderName: environmentsData.environmentsDataFolderName,
         cssContainerClass: environmentsData.cssClass,
-        canCreateDeployment: parseBoolean(environmentsData.canCreateDeployment),
-        canReadEnvironment: parseBoolean(environmentsData.canReadEnvironment),
+        canCreateDeployment: parseBoolean(environmentsData.environmentsDataCanCreateDeployment),
+        canReadEnvironment: parseBoolean(environmentsData.environmentsDataCanReadEnvironment),
       };
     },
     render(createElement) {
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 7b22bc8f98f..dca36ac6db1 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -7,6 +7,15 @@ module EnvironmentsHelper
     }
   end
 
+  def environments_folder_list_view_data
+    {
+      "endpoint" => folder_project_environments_path(@project, @folder, format: :json),
+      "folder-name" => @folder,
+      "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
+      "can-read-environment" => can?(current_user, :read_environment, @project).to_s,
+    }
+  end
+
   def metrics_data(project, environment)
     {
       "settings-path" => edit_project_service_path(project, 'prometheus'),
diff --git a/app/views/projects/environments/folder.html.haml b/app/views/projects/environments/folder.html.haml
index b7e1cf85cb7..aebd176af9b 100644
--- a/app/views/projects/environments/folder.html.haml
+++ b/app/views/projects/environments/folder.html.haml
@@ -1,8 +1,5 @@
 - @no_container = true
 - page_title _("Environments")
 
-#environments-folder-list-view{ data: { endpoint: folder_project_environments_path(@project, @folder, format: :json),
-  "folder-name" => @folder,
-  "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
-  "can-read-environment" => can?(current_user, :read_environment, @project).to_s,
+#environments-folder-list-view{ data: { environments_data: environments_folder_list_view_data,
   "css-class" => container_class } }