Merge branch 'djadmin-dast-remove-scanned-resources' into 'master'

Remove DAST scanned resources from MR Security Report

See merge request gitlab-org/gitlab!61551

ee/app/assets/javascripts/vue_shared/security_reports/graphql/mr_security_report_summary.graphql

@@ -4,13 +4,16 @@ query($fullPath: ID!, $pipelineIid: ID!) {
       securityReportSummary {
         dast {
           scannedResourcesCsvPath
-          scannedResourcesCount
-          scannedResources {
-            nodes {
-              requestMethod
-              url
-            }
-          }
+          # The commented out fields will be added back by
+          # https://gitlab.com/gitlab-org/gitlab/-/issues/321586
+          #
+          # scannedResourcesCount
+          # scannedResources {
+          #   nodes {
+          #     requestMethod
+          #     url
+          #   }
+          # }
         }
       }
     }

ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue

@@ -606,6 +606,16 @@ export default {
                 :download-link="dastDownloadLink"
               />
             </template>
+            <template v-else-if="dastDownloadLink">
+              <gl-link
+                download
+                :href="dastDownloadLink"
+                class="gl-ml-1"
+                data-testid="download-link"
+              >
+                ({{ s__('SecurityReports|Download scanned resources') }})
+              </gl-link>
+            </template>
           </summary-row>
           <grouped-issues-list
             v-if="hasDastIssues"

ee/changelogs/unreleased/djadmin-dast-remove-scanned-resources.yml

+---
+title: Add option to downlaod DAST scanned resources in MR Security Reports
+merge_request: 61551
+author:
+type: changed

ee/spec/frontend/vue_shared/security_reports/grouped_security_reports_app_spec.js

@@ -599,6 +599,39 @@ describe('Grouped security reports app', () => {
         expect(wrapper.find('[data-testid="dast-ci-job-link"]').exists()).toBe(false);
       });
     });
+
+    it('show download option when scanned resources are not available', () => {
+      mock.onGet(DAST_DIFF_ENDPOINT).reply(200, {
+        ...dastDiffSuccessMock,
+        base_report_out_of_date: true,
+      });
+
+      const summaryWithoutScannedResources = {
+        scannedResourcesCsvPath: 'http://test',
+      };
+
+      createWrapper(
+        {
+          ...props,
+          enabledReports: {
+            dast: true,
+          },
+        },
+        {
+          data: {
+            dastSummary: summaryWithoutScannedResources,
+          },
+        },
+      );
+
+      return waitForMutation(wrapper.vm.$store, types.RECEIVE_DAST_DIFF_SUCCESS).then(() => {
+        const findDownloadLink = wrapper.find('[data-testid="download-link"]');
+
+        expect(wrapper.text()).toContain('Download scanned resources');
+        expect(findDownloadLink.exists()).toBe(true);
+        expect(findDownloadLink.attributes('href')).toBe('http://test');
+      });
+    });
   });
 
   describe('secret scanning reports', () => {