List errors from compilation in toast if there are any

Altinn · Dec 6, 2023 · 82539f5 · 82539f5
1 parent dd82f2a
commit 82539f5
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 6 deletions.
diff --git a/backend/src/DataModeling/Converter/Csharp/Compiler.cs b/backend/src/DataModeling/Converter/Csharp/Compiler.cs
@@ -37,12 +37,12 @@ public static Assembly CompileToAssembly(string csharpCode)
                         diagnostic.Severity == DiagnosticSeverity.Error);
 
                     var errors = new StringBuilder();
-                    List<string> customErrorMessages = new ();
+                    List<string> customErrorMessages = new();
                     foreach (Diagnostic diagnostic in failures)
                     {
                         string errorMessage = $"{diagnostic.Id}: {diagnostic.GetMessage()}";
                         errors.AppendLine(errorMessage);
-                        customErrorMessages.Add(errorMessage);
+                        customErrorMessages.Add(diagnostic.GetMessage());
                     }
 
                     throw new CsharpCompilationException($"// Compiler // CompileToAssembly // Csharp compilation failed with errors: {errors}", customErrorMessages);

diff --git a/backend/src/DataModeling/Converter/Csharp/JsonMetadataToCsharpConverter.cs b/backend/src/DataModeling/Converter/Csharp/JsonMetadataToCsharpConverter.cs
@@ -40,6 +40,7 @@ public string CreateModelFromMetadata(ModelMetadata serviceMetadata)
             CreateModelFromMetadataRecursive(classes, serviceMetadata.Elements.Values.First(el => el.ParentElement == null), serviceMetadata, serviceMetadata.TargetNamespace);
 
             StringBuilder writer = new StringBuilder()
+                .AppendLine("using System;")
                 .AppendLine("using System.Collections.Generic;")
                 .AppendLine("using System.ComponentModel.DataAnnotations;")
                 .AppendLine("using System.Linq;")

diff --git a/backend/src/Designer/Filters/DataModeling/DataModelingErrorCodes.cs b/backend/src/Designer/Filters/DataModeling/DataModelingErrorCodes.cs
@@ -6,6 +6,5 @@ public static class DataModelingErrorCodes
         public const string XmlSchemaConvertError = "DM_02";
         public const string JsonSchemaConvertError = "DM_03";
         public const string ModelMetadataConvertError = "DM_04";
-        public const string CsharpCompilationError = "DM_05";
     }
 }
diff --git a/backend/src/Designer/Filters/DataModeling/DataModelingExceptionFilterAttribute.cs b/backend/src/Designer/Filters/DataModeling/DataModelingExceptionFilterAttribute.cs
@@ -22,7 +22,7 @@ public override void OnException(ExceptionContext context)
 
             if (context.Exception is CsharpCompilationException compilationException)
             {
-                context.Result = new ObjectResult(ProblemDetailsUtils.GenerateProblemDetails(context.Exception, DataModelingErrorCodes.CsharpCompilationError, HttpStatusCode.BadRequest, compilationException.CustomErrorMessages)) { StatusCode = (int)HttpStatusCode.BadRequest };
+                context.Result = new ObjectResult(ProblemDetailsUtils.GenerateProblemDetails(context.Exception, DataModelingErrorCodes.CsharpGenerationError, HttpStatusCode.BadRequest, compilationException.CustomErrorMessages)) { StatusCode = (int)HttpStatusCode.BadRequest };
             }
 
             if (context.Exception is CsharpGenerationException)

diff --git a/backend/tests/DataModeling.Tests/Assertions/TypeAssertions.cs b/backend/tests/DataModeling.Tests/Assertions/TypeAssertions.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
+using Altinn.Studio.DataModeling.Converter.Csharp;
 using FluentAssertions;
 using SharedResources.Tests;
 using Xunit;

diff --git a/frontend/language/src/nb.json b/frontend/language/src/nb.json
@@ -65,6 +65,7 @@
   "administration.service_saved_name_administration_description": "Benyttes (sammen med eier) som unik identifikator for appen både i URLer og APIer. Kan ikke endres etter at appen er satt i produksjon.",
   "administration.success": "Applikasjonen er tilgjengelig i miljøet.",
   "administration.unavailable": "Applikasjonen er midlertidig utilgjengelig i miljøet.",
+  "api_errors.DM_01": "Noe gikk galt under bygging av datamodellen.",
   "api_errors.GT_01": "Deling av endringer mislyktes. Vennligst prøv igjen.",
   "api_errors.ResourceNotFound": "Fant ikke en fil applikasjonen din prøvde å få tak i.",
   "app_create_release.application_builds_based_on": "Applikasjonen bygges basert på",

diff --git a/frontend/packages/shared/src/contexts/ServicesContext.tsx b/frontend/packages/shared/src/contexts/ServicesContext.tsx
@@ -59,7 +59,26 @@ const handleError = (
     const errorMessageKey = `api_errors.${errorCode}`;
 
     if (i18n.exists(errorMessageKey)) {
-      toast.error(t(errorMessageKey), { toastId: errorMessageKey });
+      const mainErrorMessage = t(errorMessageKey);
+      toast.error(mainErrorMessage, { toastId: errorMessageKey });
+
+      const customErrorMessages = error?.response?.data?.customErrorMessages;
+      if (customErrorMessages && customErrorMessages.length > 0) {
+        toast.update(errorMessageKey, {
+          render: () => (
+            <div>
+              <p>{mainErrorMessage}</p>
+              <ul>
+                {customErrorMessages.map((errorMessage, index) => (
+                  <li key={index}>{errorMessage}</li>
+                ))}
+              </ul>
+            </div>
+          ),
+        });
+        customErrorMessages.forEach((cem) => toast.bind(cem));
+      }
+
       return;
     }
   }

diff --git a/frontend/packages/shared/src/types/api/ApiError.ts b/frontend/packages/shared/src/types/api/ApiError.ts
@@ -5,4 +5,5 @@ export interface ApiError {
   title?: string;
   type?: string;
   errorCode?: string;
-};
+  customErrorMessages?: string[];
+}