Skip to content

G
gitlab-ce
Commit a0d2f28e authored by Jose Ivan Vargas's avatar Jose Ivan Vargas
Browse files
Options

Merge branch '262392-remove-vuln-feedback-path' into 'master' 

Remove vulnerability help feedback path

See merge request gitlab-org/gitlab!47961
parents 14a4c5dd c4bbddbb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 64 deletions
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @ a0d2f28e
<script>
import { GlSafeHtmlDirective } from '@gitlab/ui';
import GroupedMetricsReportsApp from 'ee/vue_shared/metrics_reports/grouped_metrics_reports_app.vue';
import reportsMixin from 'ee/vue_shared/security_reports/mixins/reports_mixin';
import { componentNames } from 'ee/reports/components/issue_body';
import MrWidgetLicenses from 'ee/vue_shared/license_compliance/mr_widget_license_report.vue';
import { GlSafeHtmlDirective } from '@gitlab/ui';
import ReportSection from '~/reports/components/report_section.vue';
import BlockingMergeRequestsReport from './components/blocking_merge_requests/blocking_merge_requests_report.vue';
import { s__, __, sprintf } from '~/locale';
import CEWidgetOptions from '~/vue_merge_request_widget/mr_widget_options.vue';
import BlockingMergeRequestsReport from './components/blocking_merge_requests/blocking_merge_requests_report.vue';
import MrWidgetGeoSecondaryNode from './components/states/mr_widget_secondary_geo_node.vue';
import MrWidgetPolicyViolation from './components/states/mr_widget_policy_violation.vue';
// import ExtensionsContainer from '~/vue_merge_request_widget/components/extensions/container';
export default {
components: {
// ExtensionsContainer,
MrWidgetLicenses,
MrWidgetGeoSecondaryNode,
MrWidgetPolicyViolation,
......@@ -271,7 +267,6 @@ export default {
:service="service"
/>
<div class="mr-section-container mr-widget-workflow">
<!-- <extensions-container :mr="mr" /> -->
<blocking-merge-requests-report :mr="mr" />
<grouped-codequality-reports-app
v-if="shouldRenderCodeQuality"
......@@ -336,7 +331,6 @@ export default {
:secret-scanning-help-path="mr.secretScanningHelp"
:can-read-vulnerability-feedback="mr.canReadVulnerabilityFeedback"
:vulnerability-feedback-path="mr.vulnerabilityFeedbackPath"
:vulnerability-feedback-help-path="mr.vulnerabilityFeedbackHelpPath"
:create-vulnerability-feedback-issue-path="mr.createVulnerabilityFeedbackIssuePath"
:create-vulnerability-feedback-merge-request-path="
mr.createVulnerabilityFeedbackMergeRequestPath
......
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @ a0d2f28e
......@@ -16,7 +16,6 @@ export default class MergeRequestStore extends CEMergeRequestStore {
this.canReadVulnerabilities = data.can_read_vulnerabilities;
this.vulnerabilityFeedbackPath = data.vulnerability_feedback_path;
this.canReadVulnerabilityFeedback = data.can_read_vulnerability_feedback;
this.vulnerabilityFeedbackHelpPath = data.vulnerability_feedback_help_path;
this.securityReportsPipelineId = data.pipeline_id;
this.securityReportsPipelineIid = data.pipeline_iid;
this.createVulnerabilityFeedbackIssuePath = data.create_vulnerability_feedback_issue_path;
......
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
View file @ a0d2f28e
......@@ -126,11 +126,6 @@ export default {
required: false,
default: '',
},
vulnerabilityFeedbackHelpPath: {
type: String,
required: false,
default: '',
},
createVulnerabilityFeedbackIssuePath: {
type: String,
required: false,
......@@ -325,7 +320,6 @@ export default {
this.setCanReadVulnerabilityFeedback(this.canReadVulnerabilityFeedback);
this.setVulnerabilityFeedbackPath(this.vulnerabilityFeedbackPath);
this.setVulnerabilityFeedbackHelpPath(this.vulnerabilityFeedbackHelpPath);
this.setCreateVulnerabilityFeedbackIssuePath(this.createVulnerabilityFeedbackIssuePath);
this.setCreateVulnerabilityFeedbackMergeRequestPath(
this.createVulnerabilityFeedbackMergeRequestPath,
......@@ -374,7 +368,6 @@ export default {
'setSourceBranch',
'setCanReadVulnerabilityFeedback',
'setVulnerabilityFeedbackPath',
'setVulnerabilityFeedbackHelpPath',
'setCreateVulnerabilityFeedbackIssuePath',
'setCreateVulnerabilityFeedbackMergeRequestPath',
'setCreateVulnerabilityFeedbackDismissalPath',
......@@ -625,7 +618,6 @@ export default {
<issue-modal
:modal="modal"
:vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath"
:can-create-issue="canCreateIssue"
:can-create-merge-request="canCreateMergeRequest"
:can-dismiss-vulnerability="canDismissVulnerability"
......
ee/app/assets/javascripts/vue_shared/security_reports/store/actions.js
View file @ a0d2f28e
......@@ -36,9 +36,6 @@ export const setCanReadVulnerabilityFeedback = ({ commit }, value) =>
export const setVulnerabilityFeedbackPath = ({ commit }, path) =>
commit(types.SET_VULNERABILITY_FEEDBACK_PATH, path);
export const setVulnerabilityFeedbackHelpPath = ({ commit }, path) =>
commit(types.SET_VULNERABILITY_FEEDBACK_HELP_PATH, path);
export const setCreateVulnerabilityFeedbackIssuePath = ({ commit }, path) =>
commit(types.SET_CREATE_VULNERABILITY_FEEDBACK_ISSUE_PATH, path);
......
ee/app/assets/javascripts/vue_shared/security_reports/store/mutation_types.js
View file @ a0d2f28e
......@@ -3,7 +3,6 @@ export const SET_BASE_BLOB_PATH = 'SET_BASE_BLOB_PATH';
export const SET_SOURCE_BRANCH = 'SET_SOURCE_BRANCH';
export const SET_CAN_READ_VULNERABILITY_FEEDBACK = 'SET_CAN_READ_VULNERABILITY_FEEDBACK';
export const SET_VULNERABILITY_FEEDBACK_PATH = 'SET_VULNERABILITY_FEEDBACK_PATH';
export const SET_VULNERABILITY_FEEDBACK_HELP_PATH = 'SET_VULNERABILITY_FEEDBACK_HELP_PATH';
export const SET_CREATE_VULNERABILITY_FEEDBACK_ISSUE_PATH =
'SET_CREATE_VULNERABILITY_FEEDBACK_ISSUE_PATH';
export const SET_CREATE_VULNERABILITY_FEEDBACK_MERGE_REQUEST_PATH =
......
ee/app/assets/javascripts/vue_shared/security_reports/store/mutations.js
View file @ a0d2f28e
......@@ -25,10 +25,6 @@ export default {
state.vulnerabilityFeedbackPath = path;
},
[types.SET_VULNERABILITY_FEEDBACK_HELP_PATH](state, path) {
state.vulnerabilityFeedbackHelpPath = path;
},
[types.SET_CREATE_VULNERABILITY_FEEDBACK_ISSUE_PATH](state, path) {
state.createVulnerabilityFeedbackIssuePath = path;
},
......
ee/app/assets/javascripts/vue_shared/security_reports/store/state.js
View file @ a0d2f28e
......@@ -16,7 +16,6 @@ export default () => ({
sourceBranch: null,
canReadVulnerabilityFeedback: false,
vulnerabilityFeedbackPath: null,
vulnerabilityFeedbackHelpPath: null,
createVulnerabilityFeedbackIssuePath: null,
createVulnerabilityFeedbackMergeRequestPath: null,
createVulnerabilityFeedbackDismissalPath: null,
......
ee/app/helpers/ee/projects_helper.rb
View file @ a0d2f28e
......@@ -222,7 +222,6 @@ module EE
project: { id: project.id, name: project.name },
project_full_path: project.full_path,
vulnerabilities_export_endpoint: api_v4_security_projects_vulnerability_exports_path(id: project.id),
vulnerability_feedback_help_path: help_page_path("user/application_security/index", anchor: "interacting-with-the-vulnerabilities"),
empty_state_svg_path: image_path('illustrations/security-dashboard-empty-state.svg'),
no_vulnerabilities_svg_path: image_path('illustrations/issues.svg'),
dashboard_documentation: help_page_path('user/application_security/security_dashboard/index'),
......
ee/app/helpers/groups/security_features_helper.rb
View file @ a0d2f28e
......@@ -34,7 +34,6 @@ module Groups::SecurityFeaturesHelper
{
projects_endpoint: expose_url(api_v4_groups_projects_path(id: group.id)),
group_full_path: group.full_path,
vulnerability_feedback_help_path: help_page_path("user/application_security/index", anchor: "interacting-with-the-vulnerabilities"),
no_vulnerabilities_svg_path: image_path('illustrations/issues.svg'),
empty_state_svg_path: image_path('illustrations/security-dashboard-empty-state.svg'),
dashboard_documentation: help_page_path('user/application_security/security_dashboard/index'),
......
ee/app/helpers/security_helper.rb
View file @ a0d2f28e
......@@ -10,7 +10,6 @@ module SecurityHelper
project_add_endpoint: security_projects_path,
project_list_endpoint: security_projects_path,
instance_dashboard_settings_path: settings_security_dashboard_path,
vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities'),
vulnerabilities_export_endpoint: expose_path(api_v4_security_vulnerability_exports_path)
}
end
......
ee/app/helpers/vulnerabilities_helper.rb
View file @ a0d2f28e
......@@ -17,7 +17,6 @@ module VulnerabilitiesHelper
create_mr_url: create_vulnerability_feedback_merge_request_path(vulnerability.finding.project),
discussions_url: discussions_project_security_vulnerability_path(vulnerability.project, vulnerability),
notes_url: project_security_vulnerability_notes_path(vulnerability.project, vulnerability),
vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities'),
related_issues_help_path: help_page_path('user/application_security/index', anchor: 'managing-related-issues-for-a-vulnerability'),
pipeline: vulnerability_pipeline_data(pipeline),
can_modify_related_issues: current_user.can?(:admin_vulnerability_issue_link, vulnerability),
......
ee/app/views/projects/merge_requests/show.html.haml
View file @ a0d2f28e
......@@ -12,7 +12,6 @@
window.gl.mrWidgetData.dast_help_path = '#{help_page_path("user/application_security/dast/index")}';
window.gl.mrWidgetData.dependency_scanning_help_path = '#{help_page_path("user/application_security/dependency_scanning/index")}';
window.gl.mrWidgetData.coverage_fuzzing_help_path = '#{help_page_path("user/application_security/coverage_fuzzing/index")}';
window.gl.mrWidgetData.vulnerability_feedback_help_path = '#{help_page_path("user/application_security/index")}';
window.gl.mrWidgetData.visual_review_app_available = '#{@project.feature_available?(:visual_review_app)}' === 'true';
window.gl.mrWidgetData.license_scanning_comparison_path = '#{license_scanning_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:license_scanning)}'
window.gl.mrWidgetData.container_scanning_comparison_path = '#{container_scanning_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:container_scanning)}'
......
ee/spec/frontend/vue_mr_widget/mock_data.js
View file @ a0d2f28e
......@@ -3,7 +3,6 @@ import mockData, { mockStore } from 'jest/vue_mr_widget/mock_data';
export default {
...mockData,
can_read_vulnerabilities: true,
vulnerability_feedback_help_path: '/help/user/application_security/index',
enabled_reports: {
sast: false,
container_scanning: false,
......
ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js
View file @ a0d2f28e
......@@ -49,7 +49,6 @@ describe('Grouped security reports app', () => {
secretScanningHelpPath: 'path',
canReadVulnerabilityFeedbackPath: true,
vulnerabilityFeedbackPath: 'vulnerability_feedback_path.json',
vulnerabilityFeedbackHelpPath: 'path',
coverageFuzzingHelpPath: 'path',
pipelineId: 123,
projectId: 321,
......
ee/spec/frontend/vue_shared/security_reports/store/actions_spec.js
View file @ a0d2f28e
......@@ -4,7 +4,6 @@ import {
setBaseBlobPath,
setCanReadVulnerabilityFeedback,
setVulnerabilityFeedbackPath,
setVulnerabilityFeedbackHelpPath,
setPipelineId,
requestContainerScanningDiff,
requestDastDiff,
......@@ -187,24 +186,6 @@ describe('security reports actions', () => {
});
});
describe('setVulnerabilityFeedbackHelpPath', () => {
it('should commit set vulnerabulity feedback help path', done => {
testAction(
setVulnerabilityFeedbackHelpPath,
'path',
mockedState,
[
{
type: types.SET_VULNERABILITY_FEEDBACK_HELP_PATH,
payload: 'path',
},
],
[],
done,
);
});
});
describe('setPipelineId', () => {
it('should commit set vulnerability feedback path', done => {
testAction(
......
ee/spec/frontend/vue_shared/security_reports/store/mutations_spec.js
View file @ a0d2f28e
......@@ -49,14 +49,6 @@ describe('EE sast reports mutations', () => {
});
});
describe('SET_VULNERABILITY_FEEDBACK_HELP_PATH', () => {
it('should set the vulnerabilities help path', () => {
mutations[types.SET_VULNERABILITY_FEEDBACK_HELP_PATH](stateCopy, 'vulnerability_help_path');
expect(stateCopy.vulnerabilityFeedbackHelpPath).toEqual('vulnerability_help_path');
});
});
describe('SET_PIPELINE_ID', () => {
it('should set the pipeline id', () => {
mutations[types.SET_PIPELINE_ID](stateCopy, 123);
......
ee/spec/helpers/groups/security_features_helper_spec.rb
View file @ a0d2f28e
......@@ -126,7 +126,6 @@ RSpec.describe Groups::SecurityFeaturesHelper do
projects_endpoint: "http://localhost/api/v4/groups/#{group.id}/projects",
group_full_path: group.full_path,
no_vulnerabilities_svg_path: '/images/illustrations/issues.svg',
vulnerability_feedback_help_path: '/help/user/application_security/index#interacting-with-the-vulnerabilities',
empty_state_svg_path: '/images/illustrations/security-dashboard-empty-state.svg',
dashboard_documentation: '/help/user/application_security/security_dashboard/index',
vulnerabilities_export_endpoint: "/api/v4/security/groups/#{group.id}/vulnerability_exports"
......
ee/spec/helpers/projects_helper_spec.rb
View file @ a0d2f28e
......@@ -150,7 +150,6 @@ RSpec.describe ProjectsHelper do
project: { id: project.id, name: project.name },
project_full_path: project.full_path,
vulnerabilities_export_endpoint: "/api/v4/security/projects/#{project.id}/vulnerability_exports",
vulnerability_feedback_help_path: '/help/user/application_security/index#interacting-with-the-vulnerabilities',
no_vulnerabilities_svg_path: start_with('/assets/illustrations/issues-'),
empty_state_svg_path: start_with('/assets/illustrations/security-dashboard-empty-state'),
dashboard_documentation: '/help/user/application_security/security_dashboard/index',
......
ee/spec/helpers/security_helper_spec.rb
View file @ a0d2f28e
......@@ -15,7 +15,6 @@ RSpec.describe SecurityHelper do
project_add_endpoint: security_projects_path,
project_list_endpoint: security_projects_path,
instance_dashboard_settings_path: settings_security_dashboard_path,
vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities'),
vulnerabilities_export_endpoint: api_v4_security_vulnerability_exports_path
})
end
......
ee/spec/helpers/vulnerabilities_helper_spec.rb
View file @ a0d2f28e
......@@ -65,7 +65,6 @@ RSpec.describe VulnerabilitiesHelper do
create_mr_url: "/#{project.full_path}/-/vulnerability_feedback",
discussions_url: "/#{project.full_path}/-/security/vulnerabilities/#{vulnerability.id}/discussions",
notes_url: "/#{project.full_path}/-/security/vulnerabilities/#{vulnerability.id}/notes",
vulnerability_feedback_help_path: kind_of(String),
related_issues_help_path: kind_of(String),
pipeline: anything,
can_modify_related_issues: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7