Skip to content

Enhance AutoFix Indicator on Vulnerability Report Page

Jannik Lehmann requested to merge auto-fix-indicator-second-iteration into master

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:

  1. enter rails console by entering rails c in you gitlab directory
  2. run Feature.enable(:secure_vulnerability_autofix_indicator)
  3. 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)

Screenshot_2020-12-14_at_16.24.56

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

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

Merge request reports