Merge branch '236179-pass-error-from-backend-to-security-dashboard' into 'master'

Pass error message from GraphQL for Add Project to Security Dashbard

See merge request gitlab-org/gitlab!40692

ee/app/assets/javascripts/security_dashboard/components/first_class_project_manager/project_manager.vue

@@ -73,6 +73,10 @@ export default {
             mutation: addProjectToSecurityDashboard,
             variables: { id: project.id },
             update(store, { data: results }) {
+              if (!results.addProjectToSecurityDashboard.project) {
+                return;
+              }
+
               const data = store.readQuery({ query: projectsQuery });
               const newProject = results.addProjectToSecurityDashboard.project;
               data.instanceSecurityDashboard.projects.nodes.push({
@@ -82,23 +86,49 @@ export default {
               store.writeQuery({ query: projectsQuery, data });
             },
           })
+          .then(({ data }) => {
+            return {
+              error: data?.addProjectToSecurityDashboard?.errors?.[0],
+              project: data?.addProjectToSecurityDashboard?.project ?? project,
+            };
+          })
           .catch(() => {
-            return { error: true, project };
+            return {
+              error: s__(
+                'SecurityReports|Project was not found or you do not have permission to add this project to Security Dashboards.',
+              ),
+              project,
+            };
           });
       });
 
       return Promise.all(addProjectsPromises)
         .then(response => {
-          const invalidProjects = response.filter(value => value.error).map(value => value.project);
+          const invalidProjects = response.filter(value => value.error);
           this.$emit('handleProjectManipulation', false);
 
           if (invalidProjects.length) {
-            const invalidProjectsMessage = createInvalidProjectMessage(invalidProjects);
-            createFlash(
-              sprintf(s__('SecurityReports|Unable to add %{invalidProjectsMessage}'), {
+            const invalidProjectsByErrorMessage = response.reduce((acc, value) => {
+              acc[value.error] = acc[value.error] ?? [];
+              acc[value.error].push(value.project);
+
+              return acc;
+            }, {});
+
+            const errorMessages = Object.entries(invalidProjectsByErrorMessage).map(
+              ([errorMessage, projects]) => {
+                const invalidProjectsMessage = createInvalidProjectMessage(projects);
+                return sprintf(
+                  s__('SecurityReports|Unable to add %{invalidProjectsMessage}: %{errorMessage}'),
+                  {
                     invalidProjectsMessage,
-              }),
+                    errorMessage,
+                  },
                 );
+              },
+            );
+
+            createFlash(errorMessages.join('<br/>'));
           }
         })
         .finally(() => {

ee/changelogs/unreleased/236179-pass-error-from-backend-to-security-dashboard.yml

+---
+title: Enhance error messages when Adding Projects to Security Dashboard
+merge_request: 40692
+author:
+type: changed

ee/spec/frontend/security_dashboard/components/first_class_project_manager/project_manager_spec.js

@@ -161,7 +161,9 @@ describe('Project Manager component', () => {
       findAddProjectsButton().vm.$emit('click');
       return waitForPromises().then(() => {
         expect(createFlash).toHaveBeenCalledTimes(1);
-        expect(createFlash).toHaveBeenCalledWith('Unable to add Sample Project 1');
+        expect(createFlash).toHaveBeenCalledWith(
+          'Unable to add Sample Project 1: Project was not found or you do not have permission to add this project to Security Dashboards.',
+        );
       });
     });
 
@@ -176,7 +178,7 @@ describe('Project Manager component', () => {
       return waitForPromises().then(() => {
         expect(createFlash).toHaveBeenCalledTimes(1);
         expect(createFlash).toHaveBeenCalledWith(
-          'Unable to add Sample Project 2 and Sample Project 3',
+          'Unable to add Sample Project 2 and Sample Project 3: Project was not found or you do not have permission to add this project to Security Dashboards.',
         );
       });
     });

locale/gitlab.pot

@@ -21924,6 +21924,9 @@ msgstr ""
 msgid "SecurityReports|Project"
 msgstr ""
 
+msgid "SecurityReports|Project was not found or you do not have permission to add this project to Security Dashboards."
+msgstr ""
+
 msgid "SecurityReports|Projects added"
 msgstr ""
 
@@ -21999,7 +22002,7 @@ msgstr ""
 msgid "SecurityReports|To widen your search, change or remove filters above"
 msgstr ""
 
-msgid "SecurityReports|Unable to add %{invalidProjectsMessage}"
+msgid "SecurityReports|Unable to add %{invalidProjectsMessage}: %{errorMessage}"
 msgstr ""
 
 msgid "SecurityReports|Unable to add %{invalidProjects}"