fix: Fix layman layer deletion

refs Handle failed layer deletion #3114
hslayers · Jun 17, 2022 · f797f2c · f797f2c
1 parent be5aa7a
commit f797f2c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/projects/hslayers/src/common/layman/layman.service.ts b/projects/hslayers/src/common/layman/layman.service.ts
@@ -99,7 +99,10 @@ export class HsCommonLaymanService {
         this.detectAuthChange(endpoint, app);
         break;
       default:
-        simplifiedResponse = responseBody.message + ' ' + responseBody.detail;
+        simplifiedResponse = responseBody.message;
+        if (responseBody.detail) {
+          simplifiedResponse = simplifiedResponse + ' ' + responseBody.detail;
+        }
     }
     //If response is object, it is an error response
     this.hsToastService.createToastPopupMessage(

diff --git a/...rs/src/components/add-data/catalogue/catalogue-list-item/catalogue-list-item.component.ts b/...rs/src/components/add-data/catalogue/catalogue-list-item/catalogue-list-item.component.ts
@@ -205,10 +205,17 @@ export class HsCatalogueListItemComponent implements OnInit {
     );
     const confirmed = await dialog.waitResult();
     if (confirmed == 'yes') {
-      await this.hsLaymanService.removeLayer(this.app, layer.name);
-      this.appRef.catalogEntries = this.appRef.catalogEntries.filter((item) => {
-        return item.id != layer.id;
-      });
+      const success = await this.hsLaymanService.removeLayer(
+        this.app,
+        layer.name
+      );
+      if (success) {
+        this.appRef.catalogEntries = this.appRef.catalogEntries.filter(
+          (item) => {
+            return item.id != layer.id;
+          }
+        );
+      }
     }
   }
 }
diff --git a/projects/hslayers/src/components/save-map/layman.service.ts b/projects/hslayers/src/components/save-map/layman.service.ts
@@ -875,7 +875,8 @@ export class HsLaymanService implements HsSaverService {
   async removeLayer(
     app: string,
     layer?: Layer<Source> | string
-  ): Promise<void> {
+  ): Promise<boolean> {
+    let success: boolean;
     return new Promise((resolve, reject): void => {
       if (this.deleteQuery) {
         this.deleteQuery.unsubscribe();
@@ -919,6 +920,7 @@ export class HsLaymanService implements HsSaverService {
                       response,
                       app
                     );
+                    success = false;
                   } else {
                     let message = 'LAYMAN.layerSuccessfullyRemoved';
                     if (!layer) {
@@ -936,21 +938,22 @@ export class HsLaymanService implements HsSaverService {
                       },
                       app
                     );
+                    success = true;
                   }
                 }
               ),
               catchError((e) => {
                 this.hsToastService.createToastPopupMessage(
                   this.hsLanguageService.getTranslation(
-                    'COMMON.warning',
+                    'LAYMAN.deleteLayersRequest',
                     undefined,
                     app
                   ),
                   this.hsLanguageService.getTranslationIgnoreNonExisting(
                     'SAVECOMPOSITION',
                     'removeLayerError',
                     {
-                      error: e.error.message,
+                      error: e.error.message ?? e.message,
                       layer:
                         layer instanceof Layer
                           ? (layer as Layer<Source>).get('title')
@@ -961,13 +964,14 @@ export class HsLaymanService implements HsSaverService {
                   {serviceCalledFrom: 'HsLaymanService'},
                   app
                 );
+                success = false;
                 return of(e);
               })
             );
           observables.push(response);
         });
       this.deleteQuery = forkJoin(observables).subscribe(() => {
-        resolve();
+        resolve(success);
       });
     });
   }