SONAR-20708 Handle project import failures

1 files changed, 23 insertions, 17 deletions

diff --git a/server/sonar-web/src/main/js/apps/create/project/components/NewCodeDefinitionSelection.tsx b/server/sonar-web/src/main/js/apps/create/project/components/NewCodeDefinitionSelection.tsx
index ad08108944f..70e0ebdc98e 100644
--- a/server/sonar-web/src/main/js/apps/create/project/components/NewCodeDefinitionSelection.tsx
+++ b/server/sonar-web/src/main/js/apps/create/project/components/NewCodeDefinitionSelection.tsx
@@ -67,15 +67,7 @@ export default function NewCodeDefinitionSelection(props: Props) {
     if (mutateCount > 0 || isIdle) {
       return;
     }
-    reset();
-    addGlobalSuccessMessage(
-      intl.formatMessage(
-        { id: 'onboarding.create_project.success' },
-        {
-          count: projectCount - failedImports,
-        },
-      ),
-    );
+
     if (failedImports > 0) {
       addGlobalErrorMessage(
         intl.formatMessage(
@@ -87,16 +79,30 @@ export default function NewCodeDefinitionSelection(props: Props) {
       );
     }
 
-    if (projectCount === 1) {
-      if (data) {
-        navigate(getProjectUrl(data.project.key));
+    if (projectCount > failedImports) {
+      addGlobalSuccessMessage(
+        intl.formatMessage(
+          { id: 'onboarding.create_project.success' },
+          {
+            count: projectCount - failedImports,
+          },
+        ),
+      );
+
+      if (projectCount === 1) {
+        if (data) {
+          navigate(getProjectUrl(data.project.key));
+        }
+      } else {
+        navigate({
+          pathname: '/projects',
+          search: queryToSearch({ sort: '-creation_date' }),
+        });
       }
-    } else {
-      navigate({
-        pathname: '/projects',
-        search: queryToSearch({ sort: '-creation_date' }),
-      });
     }
+
+    reset();
+    setFailedImports(0);
   }, [data, projectCount, failedImports, mutateCount, reset, intl, navigate, isIdle]);
 
   React.useEffect(() => {