diff --git a/ee/app/serializers/vulnerabilities/feedback_entity.rb b/ee/app/serializers/vulnerabilities/feedback_entity.rb index 445e1b67d78841f3958e95c2abacb23302331350..378d276eef81626ca6f9bf41832671261aa3b531 100644 --- a/ee/app/serializers/vulnerabilities/feedback_entity.rb +++ b/ee/app/serializers/vulnerabilities/feedback_entity.rb @@ -41,8 +41,6 @@ class Vulnerabilities::FeedbackEntity < Grape::Entity project_merge_request_path(feedback.project, feedback.merge_request) end - expose :destroy_vulnerability_feedback_dismissal_path, if: ->(_, _) { can_destroy_feedback? } - expose :category expose :feedback_type expose :branch do |feedback| @@ -56,14 +54,6 @@ class Vulnerabilities::FeedbackEntity < Grape::Entity private - def destroy_vulnerability_feedback_dismissal_path - project_vulnerability_feedback_path(feedback.project, feedback) - end - - def can_destroy_feedback? - can?(current_user, :destroy_vulnerability_feedback, feedback) - end - def can_read_issue? feedback.issue.present? && can?(current_user, :read_issue, feedback.issue) end diff --git a/ee/spec/fixtures/api/schemas/vulnerability_feedback.json b/ee/spec/fixtures/api/schemas/vulnerability_feedback.json index c3d18eea824078f0fe3dd15b566442866bf00c47..a32a6572606a88d11fa8a938432e86c4cf64e1b5 100644 --- a/ee/spec/fixtures/api/schemas/vulnerability_feedback.json +++ b/ee/spec/fixtures/api/schemas/vulnerability_feedback.json @@ -106,9 +106,6 @@ "null" ] }, - "destroy_vulnerability_feedback_dismissal_path": { - "type": "string" - }, "finding_uuid": { "type": [ "string", @@ -126,4 +123,4 @@ } }, "additionalProperties": false -} \ No newline at end of file +} diff --git a/ee/spec/frontend/security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities.js b/ee/spec/frontend/security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities.js index 0c880cb048a63be97834fcbe5e0acb898e7fd940..14de41012b0688511c3e331f414d388044309ffb 100644 --- a/ee/spec/frontend/security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities.js +++ b/ee/spec/frontend/security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities.js @@ -207,7 +207,6 @@ export default [ feedback_type: 'dismissal', branch: 'main', project_fingerprint: '4e5b6966dd100170b4b1ad599c7058cce91b57b4', - destroy_vulnerability_feedback_dismissal_path: 'https://example.com/feedback_dismissal_path', }, state_transitions: [{ to_state: 'dismissed' }], issue_feedback: null, @@ -326,7 +325,6 @@ export default [ feedback_type: 'dismissal', branch: 'main', project_fingerprint: '4e5b6966dd100170b4b1ad599c7058cce91b57b4', - destroy_vulnerability_feedback_dismissal_path: 'https://example.com/feedback_dismissal_path', }, issue_feedback: issueData, issue_links: [issueData], diff --git a/ee/spec/serializers/vulnerabilities/feedback_entity_spec.rb b/ee/spec/serializers/vulnerabilities/feedback_entity_spec.rb index f98a4dde4b3865923670336dfd6e9cfffdd03b7e..1a8ed2bbf6e7302af79200e27e9738a2e2d4201f 100644 --- a/ee/spec/serializers/vulnerabilities/feedback_entity_spec.rb +++ b/ee/spec/serializers/vulnerabilities/feedback_entity_spec.rb @@ -51,7 +51,6 @@ it 'does not include fields related to current user' do is_expected.not_to include(:issue_url) - is_expected.not_to include(:destroy_vulnerability_feedback_dismissal_path) is_expected.not_to include(:merge_request_path) end end @@ -64,16 +63,6 @@ is_expected.not_to include(:issue_url) end end - - context 'when allowed to destroy vulnerability feedback' do - before do - project.add_developer(user) - end - - it 'does not contain destroy vulnerability feedback dismissal path' do - expect(subject).not_to include(:destroy_vulnerability_feedback_dismissal_path) - end - end end context 'when feedback type is merge_request' do @@ -109,41 +98,6 @@ is_expected.not_to include(:merge_request_path) end end - - context 'when allowed to destroy vulnerability feedback' do - before do - project.add_developer(user) - end - - it 'does not contain destroy vulnerability feedback dismissal path' do - expect(subject).not_to include(:destroy_vulnerability_feedback_dismissal_path) - end - end - end - - context 'when feedback type is dismissal' do - let(:feedback) { build_stubbed(:vulnerability_feedback, :dismissal, project: project) } - - context 'when not allowed to destroy vulnerability feedback' do - before do - project.add_guest(user) - end - - it 'does not contain destroy vulnerability feedback dismissal path' do - expect(subject).not_to include(:destroy_vulnerability_feedback_dismissal_path) - end - end - - context 'when allowed to destroy vulnerability feedback' do - before do - stub_licensed_features(security_dashboard: true) - project.add_maintainer(user) - end - - it 'contains destroy vulnerability feedback dismissal path' do - expect(subject).to include(:destroy_vulnerability_feedback_dismissal_path) - end - end end end diff --git a/spec/frontend/vue_shared/security_reports/mock_data.js b/spec/frontend/vue_shared/security_reports/mock_data.js index 96900bc0ce8fcd769983a10b1b1c2cf0df39116b..2e221f05d14d4b29b2746391c8e43bcedc17768b 100644 --- a/spec/frontend/vue_shared/security_reports/mock_data.js +++ b/spec/frontend/vue_shared/security_reports/mock_data.js @@ -113,8 +113,6 @@ export const mockFindings = [ }, }, pipeline: { id: 78375355, path: '/gitlab-org/gitlab-ui/pipelines/78375355' }, - destroy_vulnerability_feedback_dismissal_path: - '/gitlab-org/gitlab-ui/vulnerability_feedback/2528', category: 'dependency_scanning', feedback_type: 'dismissal', branch: 'leipert-dogfood-secure', @@ -196,8 +194,6 @@ export const mockFindings = [ path: '/leipert', }, }, - destroy_vulnerability_feedback_dismissal_path: - '/gitlab-org/gitlab-ui/vulnerability_feedback/4197', category: 'dependency_scanning', feedback_type: 'dismissal', branch: null, @@ -278,8 +274,6 @@ export const mockFindings = [ }, }, pipeline: { id: 78375355, path: '/gitlab-org/gitlab-ui/pipelines/78375355' }, - destroy_vulnerability_feedback_dismissal_path: - '/gitlab-org/gitlab-ui/vulnerability_feedback/2527', category: 'dependency_scanning', feedback_type: 'dismissal', branch: 'leipert-dogfood-secure',