Enhance AutoFix Indicator on Vulnerability Report Page
What does this MR do?
This MR solves #258811 (closed).
It introduces are more detailed Auto-fix vulnerability Indicator to the vulnerability List Page.
NOTE: The Backend ticket is not yet picked up, this feature is currently hidden behind a flag to reproduce on your local machine:
- enter rails console by entering
rails c
in you gitlab directory - run
Feature.enable(:secure_vulnerability_autofix_indicator)
- apply the attached patch
Patch:
Patch:
diff --git a/ee/app/assets/javascripts/security_dashboard/graphql/project_vulnerabilities_autofix.query.graphql b/ee/app/assets/javascripts/security_dashboard/graphql/project_vulnerabilities_autofix.query.graphql
index ddc5fd10df4..aa0b3cec2bd 100644
--- a/ee/app/assets/javascripts/security_dashboard/graphql/project_vulnerabilities_autofix.query.graphql
+++ b/ee/app/assets/javascripts/security_dashboard/graphql/project_vulnerabilities_autofix.query.graphql
@@ -23,8 +23,8 @@ query project(
) {
nodes {
...Vulnerability
- solutions
- mergeRequest {
+ solutions @client
+ mergeRequest @client {
url
status
autoFix
diff --git a/ee/app/assets/javascripts/security_dashboard/graphql/provider.js b/ee/app/assets/javascripts/security_dashboard/graphql/provider.js
index 125b92677d5..908287c2551 100644
--- a/ee/app/assets/javascripts/security_dashboard/graphql/provider.js
+++ b/ee/app/assets/javascripts/security_dashboard/graphql/provider.js
@@ -3,6 +3,7 @@ import VueApollo from 'vue-apollo';
import { IntrospectionFragmentMatcher } from 'apollo-cache-inmemory';
import createDefaultClient from '~/lib/graphql';
import introspectionQueryResultData from './fragmentTypes.json';
+import resolvers from './resolver';
Vue.use(VueApollo);
@@ -12,15 +13,12 @@ const fragmentMatcher = new IntrospectionFragmentMatcher({
introspectionQueryResultData,
});
-const defaultClient = createDefaultClient(
- {},
- {
- cacheConfig: {
- fragmentMatcher,
- },
- assumeImmutableResults: true,
+const defaultClient = createDefaultClient(resolvers, {
+ cacheConfig: {
+ fragmentMatcher,
},
-);
+ assumeImmutableResults: true,
+});
export default new VueApollo({
defaultClient,
diff --git a/ee/app/assets/javascripts/security_dashboard/graphql/resolver.js b/ee/app/assets/javascripts/security_dashboard/graphql/resolver.js
new file mode 100644
index 00000000000..fc73cf2d1a9
--- /dev/null
+++ b/ee/app/assets/javascripts/security_dashboard/graphql/resolver.js
@@ -0,0 +1,16 @@
+const resolvers = {
+ Vulnerability: {
+ solutions: () => true,
+ mergeRequest: () => {
+ return {
+ url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48820',
+ status: 'status_warning',
+ autoFix: true,
+ id: 48820,
+ __typename: 'mergeRequestDetail',
+ };
+ },
+ },
+};
+
+export default resolvers;
Screenshots (strongly suggested)
Does this MR meet the acceptance criteria?
Conformity
- [-] Changelog entry
-
Documentation (if required) - [-] Code review guidelines
- [-] Merge request performance guidelines
- [-] Style guides
- [-] Database guides
- [-] Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Edited by Jannik Lehmann