From ab4cc1082a1411b6cdf297f4c1c5729372727f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Thu, 2 Apr 2020 08:07:56 +0200
Subject: [PATCH] [32852] Use the baseRoute in redirecting back from destroyy
 modal

All split and full views have the baseRoute set to go back to the
list/grid/ifc page, so we can use this to decide whether we want to use
the `backRoute`.

In the bug, the backRoute is empty, so we go back to the default
work-packages.list

https://community.openproject.com/wp/32852
---
 .../wp-destroy-modal/wp-destroy.modal.ts      | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/frontend/src/app/components/modals/wp-destroy-modal/wp-destroy.modal.ts b/frontend/src/app/components/modals/wp-destroy-modal/wp-destroy.modal.ts
index 75d6e41ead..c71442f9d9 100644
--- a/frontend/src/app/components/modals/wp-destroy-modal/wp-destroy.modal.ts
+++ b/frontend/src/app/components/modals/wp-destroy-modal/wp-destroy.modal.ts
@@ -28,8 +28,6 @@
 
 import {WorkPackagesListService} from '../../wp-list/wp-list.service';
 import {States} from '../../states.service';
-import {HalResourceNotificationService} from "core-app/modules/hal/services/hal-resource-notification.service";
-import {NotificationsService} from "core-app/modules/common/notifications/notifications.service";
 import {OpModalComponent} from "core-components/op-modals/op-modal.component";
 import {ChangeDetectorRef, Component, ElementRef, Inject, OnInit} from "@angular/core";
 import {OpModalLocalsToken} from "core-components/op-modals/op-modal.service";
@@ -86,7 +84,7 @@ export class WpDestroyModal extends OpModalComponent implements OnInit {
     super.ngOnInit();
 
     this.workPackages = this.locals.workPackages;
-    this.workPackageLabel = this.I18n.t('js.units.workPackage', {count: this.workPackages.length});
+    this.workPackageLabel = this.I18n.t('js.units.workPackage', { count: this.workPackages.length });
 
     // Ugly way to provide the same view bindings as the ng-init in the previous template.
     if (this.workPackages.length === 1) {
@@ -94,19 +92,19 @@ export class WpDestroyModal extends OpModalComponent implements OnInit {
       this.singleWorkPackageChildren = this.singleWorkPackage.children;
     }
 
-    this.text.title = this.I18n.t('js.modals.destroy_work_package.title', {label: this.workPackageLabel}),
+    this.text.title = this.I18n.t('js.modals.destroy_work_package.title', { label: this.workPackageLabel }),
       this.text.text = this.I18n.t('js.modals.destroy_work_package.text', {
         label: this.workPackageLabel,
         count: this.workPackages.length
       });
 
-      this.text.childCount = (wp:WorkPackageResource) => {
-        const count = this.children(wp).length;
-        return this.I18n.t('js.units.child_work_packages', {count: count});
-      };
+    this.text.childCount = (wp:WorkPackageResource) => {
+      const count = this.children(wp).length;
+      return this.I18n.t('js.units.child_work_packages', { count: count });
+    };
 
     this.text.hasChildren = (wp:WorkPackageResource) =>
-      this.I18n.t('js.modals.destroy_work_package.has_children', {childUnits: this.text.childCount(wp)}),
+      this.I18n.t('js.modals.destroy_work_package.has_children', { childUnits: this.text.childCount(wp) }),
 
       this.text.deletesChildren = this.I18n.t('js.modals.destroy_work_package.deletes_children');
   }
@@ -138,12 +136,8 @@ export class WpDestroyModal extends OpModalComponent implements OnInit {
         this.closeMe($event);
         this.wpTableFocus.clear();
 
-        /**
-         * When we are in the list, we expect a refreshed list view.
-         * Otherwise we expect a redirect to where we came from,
-         * since the WP in view (split/full) does not exist any more.
-         */
-        if (this.$state.current.name !== 'work-packages.partitioned.list') {
+        // Go back to a previous list state if we're in a split or full view
+        if (this.$state.current.data.baseRoute) {
           this.backRoutingService.goBack(true);
         }
       })