Merge branch 'ee-move-permission-check-manual-actions-on-deployments' into 'master'

Move manual actions permission check to BE

See merge request gitlab-org/gitlab-ee!9422

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

@@ -22,10 +22,6 @@ export default {
       type: Object,
       required: true,
     },
-    canCreateDeployment: {
-      type: Boolean,
-      required: true,
-    },
     canReadEnvironment: {
       type: Boolean,
       required: true,
@@ -75,7 +71,6 @@ export default {
     <div v-if="!isLoading && environments.length > 0" class="table-holder">
       <environment-table
         :environments="environments"
-        :can-create-deployment="canCreateDeployment"
         :can-read-environment="canReadEnvironment"
         :canary-deployment-feature-id="canaryDeploymentFeatureId"
         :show-canary-deployment-callout="showCanaryDeploymentCallout"

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

@@ -47,12 +47,6 @@ export default {
       default: () => ({}),
     },
 
-    canCreateDeployment: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-
     canReadEnvironment: {
       type: Boolean,
       required: false,
@@ -151,7 +145,7 @@ export default {
     },
 
     actions() {
-      if (!this.model || !this.model.last_deployment || !this.canCreateDeployment) {
+      if (!this.model || !this.model.last_deployment) {
         return [];
       }
 
@@ -576,7 +570,7 @@ export default {
         />
 
         <rollback-component
-          v-if="canRetry && canCreateDeployment"
+          v-if="canRetry"
           :is-last-deployment="isLastDeployment"
           :retry-url="retryUrl"
         />

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

@@ -24,10 +24,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    canCreateDeployment: {
-      type: Boolean,
-      required: true,
-    },
     canReadEnvironment: {
       type: Boolean,
       required: true,
@@ -138,7 +134,6 @@ export default {
       :is-loading="isLoading"
       :environments="state.environments"
       :pagination="state.paginationInformation"
-      :can-create-deployment="canCreateDeployment"
       :can-read-environment="canReadEnvironment"
       :canary-deployment-feature-id="canaryDeploymentFeatureId"
       :show-canary-deployment-callout="showCanaryDeploymentCallout"

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

@@ -33,12 +33,6 @@ export default {
       default: false,
     },
 
-    canCreateDeployment: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-
     // ee-only start
     canaryDeploymentFeatureId: {
       type: String,
@@ -105,7 +99,6 @@ export default {
         is="environment-item"
         :key="`environment-item-${i}`"
         :model="model"
-        :can-create-deployment="canCreateDeployment"
         :can-read-environment="canReadEnvironment"
       />
 
@@ -135,7 +128,6 @@ export default {
             v-for="(children, index) in model.children"
             :key="`env-item-${i}-${index}`"
             :model="children"
-            :can-create-deployment="canCreateDeployment"
             :can-read-environment="canReadEnvironment"
           />
 

app/assets/javascripts/environments/folder/environments_folder_bundle.js

@@ -25,7 +25,6 @@ export default () =>
         endpoint: environmentsData.environmentsDataEndpoint,
         folderName: environmentsData.environmentsDataFolderName,
         cssContainerClass: environmentsData.cssClass,
-        canCreateDeployment: parseBoolean(environmentsData.environmentsDataCanCreateDeployment),
         canReadEnvironment: parseBoolean(environmentsData.environmentsDataCanReadEnvironment),
       };
     },
@@ -35,7 +34,6 @@ export default () =>
           endpoint: this.endpoint,
           folderName: this.folderName,
           cssContainerClass: this.cssContainerClass,
-          canCreateDeployment: this.canCreateDeployment,
           canReadEnvironment: this.canReadEnvironment,
           // ee-only start
           canaryDeploymentFeatureId: this.canaryDeploymentFeatureId,

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

@@ -23,10 +23,6 @@ export default {
       type: String,
       required: true,
     },
-    canCreateDeployment: {
-      type: Boolean,
-      required: true,
-    },
     canReadEnvironment: {
       type: Boolean,
       required: true,
@@ -77,7 +73,6 @@ export default {
       :is-loading="isLoading"
       :environments="state.environments"
       :pagination="state.paginationInformation"
-      :can-create-deployment="canCreateDeployment"
       :can-read-environment="canReadEnvironment"
       :canary-deployment-feature-id="canaryDeploymentFeatureId"
       :show-canary-deployment-callout="showCanaryDeploymentCallout"

app/assets/javascripts/environments/index.js

@@ -27,7 +27,6 @@ export default () =>
         helpPagePath: environmentsData.helpPagePath,
         cssContainerClass: environmentsData.cssClass,
         canCreateEnvironment: parseBoolean(environmentsData.canCreateEnvironment),
-        canCreateDeployment: parseBoolean(environmentsData.canCreateDeployment),
         canReadEnvironment: parseBoolean(environmentsData.canReadEnvironment),
       };
     },
@@ -39,7 +38,6 @@ export default () =>
           helpPagePath: this.helpPagePath,
           cssContainerClass: this.cssContainerClass,
           canCreateEnvironment: this.canCreateEnvironment,
-          canCreateDeployment: this.canCreateDeployment,
           canReadEnvironment: this.canReadEnvironment,
           // ee-only start
           canaryDeploymentFeatureId: this.canaryDeploymentFeatureId,

app/helpers/environments_helper.rb

@@ -13,7 +13,6 @@ module EnvironmentsHelper
     {
       "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

app/serializers/deployment_entity.rb

@@ -24,6 +24,12 @@ class DeploymentEntity < Grape::Entity
   expose :user, using: UserEntity
   expose :commit, using: CommitEntity
   expose :deployable, using: JobEntity
-  expose :manual_actions, using: JobEntity
-  expose :scheduled_actions, using: JobEntity
+  expose :manual_actions, using: JobEntity, if: -> (*) { can_create_deployment? }
+  expose :scheduled_actions, using: JobEntity, if: -> (*) { can_create_deployment? }
+
+  private
+
+  def can_create_deployment?
+    can?(request.current_user, :create_deployment, request.project)
+  end
 end

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

@@ -2,7 +2,6 @@
 - page_title _("Environments")
 
 #environments-list-view{ data: { environments_data: environments_list_data,
-  "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
   "can-read-environment" => can?(current_user, :read_environment, @project).to_s,
   "can-create-environment" => can?(current_user, :create_environment, @project).to_s,
   "new-environment-path" => new_project_environment_path(@project),

changelogs/unreleased/move-permission-check-manual-actions-on-deployments.yml

+---
+title: Move permission check of manual actions of deployments
+merge_request: 24660
+author:
+type: other

spec/javascripts/environments/environment_item_spec.js

@@ -26,7 +26,6 @@ describe('Environment item', () => {
       component = new EnvironmentItem({
         propsData: {
           model: mockItem,
-          canCreateDeployment: false,
           canReadEnvironment: true,
           toggleDeployBoard: () => {},
           store: {},
@@ -121,7 +120,6 @@ describe('Environment item', () => {
       component = new EnvironmentItem({
         propsData: {
           model: environment,
-          canCreateDeployment: true,
           canReadEnvironment: true,
           toggleDeployBoard: () => {},
           store: {},

spec/javascripts/environments/environment_table_spec.js

@@ -27,7 +27,6 @@ describe('Environment table', () => {
 
     vm = mountComponent(Component, {
       environments: [mockItem],
-      canCreateDeployment: false,
       canReadEnvironment: true,
       // ee-only start
       canaryDeploymentFeatureId: 'canary_deployment',

spec/javascripts/environments/environments_app_spec.js

@@ -9,7 +9,6 @@ describe('Environment', () => {
   const mockData = {
     endpoint: 'environments.json',
     canCreateEnvironment: true,
-    canCreateDeployment: true,
     canReadEnvironment: true,
     cssContainerClass: 'container',
     newEnvironmentPath: 'environments/new',

spec/javascripts/environments/folder/environments_folder_view_spec.js

@@ -13,7 +13,6 @@ describe('Environments Folder View', () => {
   const mockData = {
     endpoint: 'environments.json',
     folderName: 'review',
-    canCreateDeployment: true,
     canReadEnvironment: true,
     cssContainerClass: 'container',
     // ee-only start

spec/serializers/deployment_entity_spec.rb

 require 'spec_helper'
 
 describe DeploymentEntity do
-  let(:user) { create(:user) }
+  let(:user) { developer }
+  let(:developer) { create(:user) }
+  let(:reporter) { create(:user) }
+  let(:project) { create(:project) }
   let(:request) { double('request') }
-  let(:deployment) { create(:deployment) }
+  let(:deployment) { create(:deployment, deployable: build, project: project) }
+  let(:build) { create(:ci_build, :manual, pipeline: pipeline) }
+  let(:pipeline) { create(:ci_pipeline, project: project, user: user) }
   let(:entity) { described_class.new(deployment, request: request) }
   subject { entity.as_json }
 
   before do
+    project.add_developer(developer)
+    project.add_reporter(reporter)
     allow(request).to receive(:current_user).and_return(user)
+    allow(request).to receive(:project).and_return(project)
   end
 
   it 'exposes internal deployment id' do
@@ -23,6 +31,24 @@ describe DeploymentEntity do
     expect(subject).to include(:created_at)
   end
 
+  context 'when the pipeline has another manual action' do
+    let(:other_build) { create(:ci_build, :manual, name: 'another deploy', pipeline: pipeline) }
+    let!(:other_deployment) { create(:deployment, deployable: other_build) }
+
+    it 'returns another manual action' do
+      expect(subject[:manual_actions].count).to eq(1)
+      expect(subject[:manual_actions].first[:name]).to eq('another deploy')
+    end
+
+    context 'when user is a reporter' do
+      let(:user) { reporter }
+
+      it 'returns another manual action' do
+        expect(subject[:manual_actions]).not_to be_present
+      end
+    end
+  end
+
   describe 'scheduled_actions' do
     let(:project) { create(:project, :repository) }
     let(:pipeline) { create(:ci_pipeline, project: project, user: user) }

spec/serializers/environment_serializer_spec.rb

@@ -10,6 +10,10 @@ describe EnvironmentSerializer do
       .represent(resource)
   end
 
+  before do
+    project.add_developer(user)
+  end
+
   context 'when there is a single object provided' do
     let(:project) { create(:project, :repository) }
     let(:deployable) { create(:ci_build) }