Merge pull request #1232 from DSD-DBS/fix-t4c-repo-warnings

fix: Properly show T4C repo deletion warnings
DSD-DBS · Dec 12, 2023 · f6d7c3d · f6d7c3d
2 parents f6e8fb9 + 204b971
commit f6d7c3d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 20 deletions.
diff --git a/backend/capellacollab/settings/modelsources/t4c/repositories/routes.py b/backend/capellacollab/settings/modelsources/t4c/repositories/routes.py
@@ -252,11 +252,12 @@ def create_single_warning_response_model(
     title: str, reason: str | tuple[str, ...], technical: str
 ) -> core_models.ResponseModel:
     return core_models.ResponseModel(
+        errors=[],
         warnings=[
             core_models.Message(
                 title=title,
                 reason=reason,
                 technical=technical,
             )
-        ]
+        ],
     )
diff --git a/frontend/src/app/general/error-handling/error-handling.interceptor.ts b/frontend/src/app/general/error-handling/error-handling.interceptor.ts
@@ -52,16 +52,9 @@ export class ErrorHandlingInterceptor implements HttpInterceptor {
                 );
               }
             }
-            if (body?.warnings) {
-              for (const warning of body.warnings) {
-                if (warning.reason && Array.isArray(warning.reason)) {
-                  warning.reason = warning.reason.join(' ');
-                }
-                this.toastService.showWarning(
-                  warning.title || '',
-                  warning.reason || '',
-                );
-              }
+            const warnings = body?.warnings;
+            if (warnings) {
+              this.displayWarningInToaster(warnings);
             }
           }
         },
@@ -97,10 +90,15 @@ export class ErrorHandlingInterceptor implements HttpInterceptor {
               'Please check your internet connection and refresh the page!',
             );
           } else {
-            this.toastService.showError(
-              'An error occurred!',
-              'Please try again!',
-            );
+            const warnings = err.error?.warnings;
+            if (warnings) {
+              this.displayWarningInToaster(warnings);
+            } else {
+              this.toastService.showError(
+                'An error occurred!',
+                'Please try again!',
+              );
+            }
           }
         },
       }),
@@ -163,6 +161,15 @@ export class ErrorHandlingInterceptor implements HttpInterceptor {
     throw err;
   }
 
+  private displayWarningInToaster(warnings: ErrorDetail[]): void {
+    for (const warning of warnings) {
+      if (warning.reason && Array.isArray(warning.reason)) {
+        warning.reason = warning.reason.join(' ');
+      }
+      this.toastService.showWarning(warning.title || '', warning.reason || '');
+    }
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private isErrorHandlingSkipped(request: HttpRequest<any>) {
     return request.context.get(SKIP_ERROR_HANDLING);

diff --git a/...gs/t4c-instance-settings/t4c-repo-deletion-dialog/t4c-repo-deletion-dialog.component.html b/...gs/t4c-instance-settings/t4c-repo-deletion-dialog/t4c-repo-deletion-dialog.component.html
@@ -16,7 +16,7 @@ <h1>Remove T4C repository</h1>
     <p><b>The deletion cannot be undone!</b></p>
   </div>
   Please type in the name of the repository to confirm the deletion: <br />
-  <form (submit)="remoteRepository()">
+  <form (submit)="removeRepository()">
     <mat-form-field appearance="fill">
       <mat-label>Repository name</mat-label>
       <input

diff --git a/...ings/t4c-instance-settings/t4c-repo-deletion-dialog/t4c-repo-deletion-dialog.component.ts b/...ings/t4c-instance-settings/t4c-repo-deletion-dialog/t4c-repo-deletion-dialog.component.ts
@@ -12,6 +12,7 @@ import {
   Validators,
 } from '@angular/forms';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { finalize } from 'rxjs';
 import {
   T4CRepoService,
   T4CRepository,
@@ -34,13 +35,17 @@ export class T4CRepoDeletionDialogComponent {
     @Inject(MAT_DIALOG_DATA) public repo: T4CRepository,
   ) {}
 
-  remoteRepository(): void {
+  removeRepository(): void {
     if (this.repositoryNameForm.valid) {
       this.repoService
         .deleteRepository(this.repo.instance.id, this.repo.id)
-        .subscribe(() => {
-          this.dialogRef.close(true);
-        });
+        .pipe(
+          finalize(() => {
+            this.repoService.loadRepositories(this.repo.instance.id);
+            this.dialogRef.close(true);
+          }),
+        )
+        .subscribe();
     }
   }