fix: Back to keymap link disappeared when saved or cancelled macro action item (#2353)

Author: ert78gb

packages/uhk-web/src/app/components/back-to/back-to.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs';
 
@@ -17,7 +17,8 @@ export class BackToComponent implements OnDestroy {
 
     private routeSubscription: Subscription;
 
-    constructor(private route: ActivatedRoute) {
+    constructor(private route: ActivatedRoute,
+                private cdRef: ChangeDetectorRef) {
         this.routeSubscription = route.queryParams.subscribe(params => {
             if (params.backUrl) {
                 const backUrl = new URL(params.backUrl, window.location.origin);
@@ -30,6 +31,8 @@ export class BackToComponent implements OnDestroy {
             } else {
                 this.backUrl = undefined;
             }
+
+            cdRef.markForCheck();
         });
     }
 

packages/uhk-web/src/app/components/macro/edit/macro-edit.component.ts

@@ -61,6 +61,8 @@ export class MacroEditComponent implements OnDestroy {
 
     @ViewChild(SplitComponent) split: SplitComponent;
 
+    private backUrl: string;
+    private backUrlText: string;
     private subscriptions = new Subscription();
 
     constructor(private store: Store<AppState>,
@@ -89,6 +91,9 @@ export class MacroEditComponent implements OnDestroy {
         this.smartMacroDocUrl$ = store.select(selectSmartMacroDocUrl);
         this.smartMacroPanelVisibility$ = store.select(getSmartMacroPanelVisibility);
         this.subscriptions.add(this.route.queryParams.subscribe(params => {
+            this.backUrl = params.backUrl;
+            this.backUrlText = params.backText;
+
             if (params.actionIndex) {
                 if (params.actionIndex === 'new') {
                     this.selectedMacroActionIdModel = {
@@ -146,6 +151,8 @@ export class MacroEditComponent implements OnDestroy {
         this.router.navigate([], {
             queryParams: {
                 actionIndex: model?.id,
+                backText: this.backUrlText,
+                backUrl: this.backUrl,
                 inlineEdit: model?.inlineEdit
             }
         });
@@ -173,7 +180,12 @@ export class MacroEditComponent implements OnDestroy {
 
     private hideActiveEditor(): void {
         if (!this.selectedMacroActionIdModel?.inlineEdit) {
-            this.router.navigate([]);
+            this.router.navigate([], {
+                queryParams: {
+                    backText: this.backUrlText,
+                    backUrl: this.backUrl,
+                },
+            });
         }
     }
 }