Merge branch '297659-remove-unused-deploy-board-callout-data' into 'master'

Remove unused frontend variables from environments page

See merge request gitlab-org/gitlab!52763

app/assets/javascripts/environments/components/container.vue

@@ -26,26 +26,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    deployBoardsHelpPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    helpCanaryDeploymentsPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    lockPromotionSvgPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    userCalloutsPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
   },
   methods: {
     onChangePage(page) {
@@ -62,14 +42,7 @@ export default {
     <slot name="empty-state"></slot>
 
     <div v-if="!isLoading && environments.length > 0" class="table-holder">
-      <environment-table
-        :environments="environments"
-        :can-read-environment="canReadEnvironment"
-        :user-callouts-path="userCalloutsPath"
-        :lock-promotion-svg-path="lockPromotionSvgPath"
-        :help-canary-deployments-path="helpCanaryDeploymentsPath"
-        :deploy-boards-help-path="deployBoardsHelpPath"
-      />
+      <environment-table :environments="environments" :can-read-environment="canReadEnvironment" />
 
       <table-pagination
         v-if="pagination && pagination.totalPages > 1"

app/assets/javascripts/environments/components/deploy_board.vue

@@ -44,11 +44,6 @@ export default {
       type: Object,
       required: true,
     },
-    deployBoardsHelpPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
     isLoading: {
       type: Boolean,
       required: true,

app/assets/javascripts/environments/components/environments_app.vue

@@ -51,30 +51,10 @@ export default {
       type: String,
       required: true,
     },
-    helpCanaryDeploymentsPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
     helpPagePath: {
       type: String,
       required: true,
     },
-    deployBoardsHelpPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    lockPromotionSvgPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    userCalloutsPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
   },
 
   created() {
@@ -195,10 +175,6 @@ export default {
         :environments="state.environments"
         :pagination="state.paginationInformation"
         :can-read-environment="canReadEnvironment"
-        :user-callouts-path="userCalloutsPath"
-        :lock-promotion-svg-path="lockPromotionSvgPath"
-        :help-canary-deployments-path="helpCanaryDeploymentsPath"
-        :deploy-boards-help-path="deployBoardsHelpPath"
         @onChangePage="onChangePage"
       >
         <template v-if="!isLoading && state.environments.length === 0" #empty-state>

app/assets/javascripts/environments/components/environments_table.vue

@@ -23,31 +23,11 @@ export default {
       required: true,
       default: () => [],
     },
-    deployBoardsHelpPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
     canReadEnvironment: {
       type: Boolean,
       required: false,
       default: false,
     },
-    helpCanaryDeploymentsPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    lockPromotionSvgPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    userCalloutsPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
   },
   data() {
     return {
@@ -189,7 +169,6 @@ export default {
         <div class="deploy-board-container">
           <deploy-board
             :deploy-board-data="model.deployBoardData"
-            :deploy-boards-help-path="deployBoardsHelpPath"
             :is-loading="model.isLoadingDeployBoard"
             :is-empty="model.isEmptyDeployBoard"
             :logs-path="model.logs_path"

app/assets/javascripts/environments/folder/environments_folder_view.vue

@@ -34,21 +34,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    userCalloutsPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    lockPromotionSvgPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    helpCanaryDeploymentsPath: {
-      type: String,
-      required: false,
-      default: '',
-    },
   },
   methods: {
     successCallback(resp) {
@@ -88,9 +73,6 @@ export default {
       :environments="state.environments"
       :pagination="state.paginationInformation"
       :can-read-environment="canReadEnvironment"
-      :user-callouts-path="userCalloutsPath"
-      :lock-promotion-svg-path="lockPromotionSvgPath"
-      :help-canary-deployments-path="helpCanaryDeploymentsPath"
       @onChangePage="onChangePage"
     />
   </div>

app/assets/javascripts/environments/index.js

@@ -30,7 +30,6 @@ export default () => {
         endpoint: environmentsData.environmentsDataEndpoint,
         newEnvironmentPath: environmentsData.newEnvironmentPath,
         helpPagePath: environmentsData.helpPagePath,
-        deployBoardsHelpPath: environmentsData.deployBoardsHelpPath,
         canCreateEnvironment: parseBoolean(environmentsData.canCreateEnvironment),
         canReadEnvironment: parseBoolean(environmentsData.canReadEnvironment),
       };
@@ -41,7 +40,6 @@ export default () => {
           endpoint: this.endpoint,
           newEnvironmentPath: this.newEnvironmentPath,
           helpPagePath: this.helpPagePath,
-          deployBoardsHelpPath: this.deployBoardsHelpPath,
           canCreateEnvironment: this.canCreateEnvironment,
           canReadEnvironment: this.canReadEnvironment,
         },

app/views/projects/environments/index.html.haml

@@ -6,5 +6,4 @@
   "can-create-environment" => can?(current_user, :create_environment, @project).to_s,
   "new-environment-path" => new_project_environment_path(@project),
   "help-page-path" => help_page_path("ci/environments/index.md"),
-  "deploy-boards-help-path" => help_page_path("user/project/deploy_boards", anchor: "enabling-deploy-boards"),
   "project-path" => @project.full_path } }

ee/app/helpers/ee/environments_helper.rb

@@ -4,28 +4,6 @@ module EE
   module EnvironmentsHelper
     extend ::Gitlab::Utils::Override
 
-    override :environments_list_data
-    def environments_list_data
-      ee_environments_list_data = {
-        "user_callouts_path" => user_callouts_path,
-        "lock_promotion_svg_path" => image_path('illustrations/lock_promotion.svg'),
-        "help_canary_deployments_path" => help_page_path('user/project/canary_deployments')
-      }
-
-      super.merge(ee_environments_list_data)
-    end
-
-    override :environments_folder_list_view_data
-    def environments_folder_list_view_data
-      ee_environments_folder_list_view_data = {
-        "user_callouts_path" => user_callouts_path,
-        "lock_promotion_svg_path" => image_path('illustrations/lock_promotion.svg'),
-        "help_canary_deployments_path" => help_page_path('user/project/canary_deployments')
-      }
-
-      super.merge(ee_environments_folder_list_view_data)
-    end
-
     override :project_metrics_data
     def project_metrics_data(project)
       ee_metrics_data = {}